Merge pull request #4662 from ccfiel/develop

undo reconciled journal entry record
diff --git a/README.md b/README.md
index 00b7c5a..a17ee9f 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@
 
 Use of the ERPNext name and logo is additionally allowed in the following situations:
 
-All other ERPNext-related businesses or projects can use the ERPNext name and logo to refer to and explain their services, but they cannot use them as part of a product, project, service, domain, or company name and they cannot use them in any way that suggests an affiliation with or endorsement by the ERPNext or WebNotes or the ERPNext open source project. For example, a consulting company can describe its business as “123 Web Services, offering ERPNext consulting for small businesses,” but cannot call its business “The ERPNext Consulting Company.”
+All other ERPNext-related businesses or projects can use the ERPNext name and logo to refer to and explain their services, but they cannot use them as part of a product, project, service, domain, or company name and they cannot use them in any way that suggests an affiliation with or endorsement by ERPNext or Frappe Technologies or the ERPNext open source project. For example, a consulting company can describe its business as “123 Web Services, offering ERPNext consulting for small businesses,” but cannot call its business “The ERPNext Consulting Company.”
 
 Similarly, it’s OK to use the ERPNext logo as part of a page that describes your products or services, but it is not OK to use it as part of your company or product logo or branding itself. Under no circumstances is it permitted to use ERPNext as part of a top-level domain name.
 
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index ef456d0..fd1e63e 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.13.1'
+__version__ = '6.17.0'
diff --git a/erpnext/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js
index a2eb714..703397e 100644
--- a/erpnext/accounts/doctype/account/account.js
+++ b/erpnext/accounts/doctype/account/account.js
@@ -48,13 +48,13 @@
 
 cur_frm.cscript.add_toolbar_buttons = function(doc) {
 	cur_frm.add_custom_button(__('Chart of Accounts'),
-		function() { frappe.set_route("Accounts Browser", "Account"); }, 'icon-sitemap')
+		function() { frappe.set_route("Accounts Browser", "Account"); }, __("View"))
 
 	if (doc.is_group == 1) {
-		cur_frm.add_custom_button(__('Convert to non-Group'),
+		cur_frm.add_custom_button(__('Group to Non-Group'),
 			function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet', 'btn-default');
 	} else if (cint(doc.is_group) == 0) {
-		cur_frm.add_custom_button(__('View Ledger'), function() {
+		cur_frm.add_custom_button(__('Ledger'), function() {
 			frappe.route_options = {
 				"account": doc.name,
 				"from_date": sys_defaults.year_start_date,
@@ -62,9 +62,9 @@
 				"company": doc.company
 			};
 			frappe.set_route("query-report", "General Ledger");
-		}, "icon-table");
+		}, __("View"));
 
-		cur_frm.add_custom_button(__('Convert to Group'),
+		cur_frm.add_custom_button(__('Group to Group'),
 			function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet', 'btn-default')
 	}
 }
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index 5c6aecd..1f9c74d 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -23,8 +23,11 @@
 			frappe.db.get_value("Company", self.company, "abbr")
 
 	def validate(self):
+		if frappe.local.flags.allow_unverified_charts:
+			return
 		self.validate_parent()
 		self.validate_root_details()
+		self.validate_group_or_ledger()
 		self.set_root_and_report_type()
 		self.validate_mandatory()
 		self.validate_warehouse_account()
@@ -78,6 +81,20 @@
 				
 		if not self.parent_account and not self.is_group:
 			frappe.throw(_("Root Account must be a group"))
+			
+	def validate_group_or_ledger(self):
+		if self.get("__islocal"):
+			return
+		
+		existing_is_group = frappe.db.get_value("Account", self.name, "is_group")
+		if self.is_group != existing_is_group:
+			if self.check_gle_exists():
+				throw(_("Account with existing transaction cannot be converted to ledger"))
+			elif self.is_group:
+				if self.account_type:
+					throw(_("Cannot covert to Group because Account Type is selected."))
+			elif self.check_if_child_exists():
+				throw(_("Account with child nodes cannot be set as ledger"))
 
 	def validate_frozen_accounts_modifier(self):
 		old_value = frappe.db.get_value("Account", self.name, "freeze_account")
@@ -199,6 +216,10 @@
 
 			if val != [self.is_group, self.root_type, self.company]:
 				throw(_("""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""))
+				
+			if self.is_group and frappe.db.get_value("Account", new, "parent_account") == old:
+				frappe.db.set_value("Account", new, "parent_account", 
+					frappe.db.get_value("Account", old, "parent_account"))
 
 		return new_account
 
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 bfb5240..91469d9 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
@@ -8,7 +8,7 @@
 
 def create_charts(chart_name, company):
 	chart = get_chart(chart_name)
-
+	
 	if chart:
 		accounts = []
 
@@ -40,9 +40,9 @@
 						"account_currency": frappe.db.get_value("Company", company, "default_currency")
 					})
 
-					if root_account:
+					if root_account or frappe.local.flags.allow_unverified_charts:
 						account.flags.ignore_mandatory = True
-
+						
 					account.insert()
 
 					accounts.append(account_name_in_db)
@@ -67,13 +67,17 @@
 		from erpnext.accounts.doctype.account.chart_of_accounts.verified import standard_chart_of_accounts
 		return standard_chart_of_accounts.get()
 	else:
-		path = os.path.join(os.path.dirname(__file__), "verified")
-		for fname in os.listdir(path):
-			if fname.endswith(".json"):
-				with open(os.path.join(path, fname), "r") as f:
-					chart = f.read()
-					if chart and json.loads(chart).get("name") == chart_name:
-						return json.loads(chart).get("tree")
+		folders = ("verified",)
+		if frappe.local.flags.allow_unverified_charts:
+			folders = ("verified", "unverified")
+		for folder in folders:
+			path = os.path.join(os.path.dirname(__file__), folder)
+			for fname in os.listdir(path):
+				if fname.endswith(".json"):
+					with open(os.path.join(path, fname), "r") as f:
+						chart = f.read()
+						if chart and json.loads(chart).get("name") == chart_name:
+							return json.loads(chart).get("tree")
 
 @frappe.whitelist()
 def get_charts_for_country(country):
@@ -82,24 +86,22 @@
 	def _get_chart_name(content):
 		if content:
 			content = json.loads(content)
-			if content and content.get("is_active", "No") == "Yes" and content.get("disabled", "No") == "No":
+			if content and content.get("disabled", "No") == "No":
 				charts.append(content["name"])
 
 	country_code = frappe.db.get_value("Country", country, "code")
 	if country_code:
-		path = os.path.join(os.path.dirname(__file__), "verified")
-		for fname in os.listdir(path):
-			if fname.startswith(country_code) and fname.endswith(".json"):
-				with open(os.path.join(path, fname), "r") as f:
-					_get_chart_name(f.read())
+		folders = ("verified",)
+		if frappe.local.flags.allow_unverified_charts:
+			folders = ("verified", "unverified")
 
-	# countries_use_OHADA_system = ["Benin", "Burkina Faso", "Cameroon", "Central African Republic", "Comoros",
-	# 	"Congo", "Ivory Coast", "Gabon", "Guinea", "Guinea Bissau", "Equatorial Guinea", "Mali", "Niger",
-	# 	"Replica of Democratic Congo", "Senegal", "Chad", "Togo"]
-	#
-	# if country in countries_use_OHADA_system:
-	# 	with open(os.path.join(os.path.dirname(__file__), "syscohada_syscohada_chart_template.json"), "r") as f:
-	# 		_get_chart_name(f.read())
+		for folder in folders:
+			path = os.path.join(os.path.dirname(__file__), folder)
+
+			for fname in os.listdir(path):
+				if fname.startswith(country_code) and fname.endswith(".json"):
+					with open(os.path.join(path, fname), "r") as f:
+						_get_chart_name(f.read())
 
 	if len(charts) != 1:
 		charts.append("Standard")
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/at_austria_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/at_austria_chart_template.json
index 489bba7..3b07d51 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/at_austria_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/at_austria_chart_template.json
@@ -1,7 +1,6 @@
 {
     "country_code": "at",
     "name": "Austria - Chart of Accounts",
-	"is_active": "Yes",
     "tree": {
         "Summe Abschreibungen und Aufwendungen": {
             "7010 bis 7080 Abschreibungen auf das Anlageverm\u00f6gen (ausgenommen Finanzanlagen)": {},
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/be_l10nbe_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/be_l10nbe_chart_template.json
index c7e7db8..051e554 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/be_l10nbe_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/be_l10nbe_chart_template.json
@@ -1,7 +1,6 @@
 {
     "country_code": "be",
     "name": "Belgian PCMN",
-	"disabled": "Yes",
     "tree": {
         "CLASSE 1": {
             "BENEFICE (PERTE) REPORTE(E)": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/br_l10n_br_account_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/br_l10n_br_account_chart_template.json
index 3942871..65f5f3b 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/br_l10n_br_account_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/br_l10n_br_account_chart_template.json
@@ -1,7 +1,6 @@
 {
     "country_code": "br",
     "name": "Planilha de Contas Brasileira",
-	"is_active": "No",
     "tree": {
         "ATIVO": {
             "CIRCULANTE": {
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
index 3b2e7ff..ed4cd40 100644
--- 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
@@ -1,7 +1,6 @@
 {
     "country_code": "ca",
     "name": "Chart of Accounts for english-speaking provinces",
-	"is_active": "Yes",
     "tree": {
         "ASSETS": {
             "CURRENT ASSETS": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_fr_chart_template_fr.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_fr_chart_template_fr.json
index 676e3ec..41fe453 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_fr_chart_template_fr.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_fr_chart_template_fr.json
@@ -1,7 +1,6 @@
 {
     "country_code": "ca",
     "name": "Plan comptable pour les provinces francophones",
-	"is_active": "Yes",
     "tree": {
         "ACTIF": {
             "ACTIFS COURANTS": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ch_l10nch_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ch_l10nch_chart_template.json
index a6c1440..f8d467c 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ch_l10nch_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ch_l10nch_chart_template.json
@@ -1,7 +1,6 @@
 {
     "country_code": "ch",
     "name": "Plan comptable STERCHI",
-	"is_active": "Yes",
 	"disabled": "Yes",
     "tree": {
         "Actif": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/co_vauxoo_mx_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/co_vauxoo_mx_chart_template.json
index f2e973f..4ac3465 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/co_vauxoo_mx_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/co_vauxoo_mx_chart_template.json
@@ -1,7 +1,6 @@
 {
     "country_code": "co",
     "name": "Unique Account Chart - PUC",
-	"is_active": "Yes",
     "tree": {
         "ACTIVO": {
             "DEUDORES": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_0.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_0.json
index cb1f54d..f81d1e3 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_0.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_0.json
@@ -1,7 +1,6 @@
 {
     "country_code": "cr",
     "name": "Costa Rica - Company 0",
-	"is_active": "Yes",
     "tree": {
         "0-Activo": {
             "0-Activo circulante": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_x.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_x.json
index 0257d05..a36586e 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_x.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_x.json
@@ -1,7 +1,6 @@
 {
     "country_code": "cr",
     "name": "Costa Rica - Company 1",
-	"is_active": "Yes",
     "tree": {
         "xActivo": {
             "root_type": "Asset",
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_chart_de_skr04.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_chart_de_skr04.json
index f4d1fcc..c8ed2ee 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_chart_de_skr04.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_chart_de_skr04.json
@@ -1,7 +1,7 @@
 {
     "country_code": "de",
     "name": "Deutscher Kontenplan SKR04",
-	"is_active": "Yes",
+	"disabled": "Yes",
     "tree": {
         "Bilanz - Aktiva": {
             "Anlageverm\u00f6gen": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_de_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_de_chart_template.json
index 4b16c86..2f9782a 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_de_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_de_chart_template.json
@@ -1,7 +1,6 @@
 {
     "country_code": "de",
     "name": "Deutscher Kontenplan SKR03",
-	"is_active": "No",
 	"disabled": "Yes",
     "tree": {
         "Aktiva": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/es_account_chart_template_common.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/es_account_chart_template_common.json
index 5c70ee2..122edaa 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/es_account_chart_template_common.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/es_account_chart_template_common.json
@@ -1,6 +1,7 @@
 {
     "country_code": "es", 
     "name": "PGCE com\u00fan", 
+	"disabled": "Yes",
     "tree": {
         "Acreedores y deudores por operaciones comerciales": {
             "Acreedores varios": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/et_l10n_et.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/et_l10n_et.json
index 71a39df..d7b1964 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/et_l10n_et.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/et_l10n_et.json
@@ -1,7 +1,6 @@
 {
     "country_code": "et",
     "name": "Ethiopia Tax and Account Chart Template",
-	"is_active": "Yes",
     "tree": {
         "ASSETS": {
             "Cash and Cash Equivalents": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/gt_cuentas_plantilla.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/gt_cuentas_plantilla.json
index 8f8e777..5b4f352 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/gt_cuentas_plantilla.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/gt_cuentas_plantilla.json
@@ -1,7 +1,6 @@
 {
     "country_code": "gt",
     "name": "Plantilla de cuentas de Guatemala (sencilla)",
-	"is_active": "Yes",
     "tree": {
         "Activo": {
             "Activo Corriente": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hn_cuentas_plantilla.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hn_cuentas_plantilla.json
index 34caff6..1c06a2e 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hn_cuentas_plantilla.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hn_cuentas_plantilla.json
@@ -1,7 +1,6 @@
 {
     "country_code": "hn",
     "name": "Plantilla de cuentas de Honduras (sencilla)",
-	"is_active": "Yes",
     "tree": {
         "Activo": {
             "Activo Corriente": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/lu_lu_2011_chart_1.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/lu_lu_2011_chart_1.json
index 1dc5293..c304684 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/lu_lu_2011_chart_1.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/lu_lu_2011_chart_1.json
@@ -1,6 +1,7 @@
 {
     "country_code": "lu", 
     "name": "PCMN Luxembourg", 
+	"disabled": "Yes",
     "tree": {
         "TOTAL CLASSES 1 A 5": {
             "CLASSE 1 - COMPTES DE CAPITAUX, DE PROVISIONS ET DE DETTES FINANCIERES": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pa_l10npa_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pa_l10npa_chart_template.json
index 59809c9..de16044 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pa_l10npa_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pa_l10npa_chart_template.json
@@ -1,7 +1,6 @@
 {
     "country_code": "pa",
     "name": "Plan de Cuentas",
-	"is_active": "Yes",
     "tree": {
         "ACTIVOS": {
             "Activo Fijo": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ro_ro_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ro_ro_chart_template.json
index 64f5412..ef43897 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ro_ro_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ro_ro_chart_template.json
@@ -1,6 +1,7 @@
 {
     "country_code": "ro",
     "name": "Romania - Chart of Accounts",
+	"disabled": "Yes",
     "tree": {
         "CONTURI FINANCIARE": {
             "CONTURI DE BILANT": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/sg_sg_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/sg_sg_chart_template.json
deleted file mode 100644
index e46f317..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/sg_sg_chart_template.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-    "country_code": "sg",
-    "name": "Singapore Chart of Accounts",
-	"is_active": "Yes",
-    "tree": {
-        "Assets": {
-            "Cash and cash equivalents": {
-                "Cash on hand": {
-                    "account_type": "Cash"
-                },
-                "Client trust account": {
-                    "account_type": "Cash"
-                },
-                "Current": {
-                    "account_type": "Bank"
-                },
-                "Money market": {
-                    "account_type": "Cash"
-                },
-                "Rents held in trust": {
-                    "account_type": "Cash"
-                },
-                "Savings": {
-                    "account_type": "Cash"
-                },
-                "account_type": "Cash"
-            },
-            "Current assets": {
-                "Allowance for bad debts": {},
-                "Development costs": {},
-                "Employee cash advances": {},
-                "Inventory": {},
-                "Investments - other": {},
-                "Loans to officers": {},
-                "Loans to others": {},
-                "Loans to shareholders": {},
-                "Other Current Assets": {},
-                "Prepaid expenses": {},
-                "Retainage": {},
-                "Undeposited funds": {}
-            },
-            "Non-current assets": {
-                "Accumulated amortization of non-current assets": {},
-                "Available-for-sale financial assets": {},
-                "Deferred tax": {},
-                "Goodwill": {},
-                "Intangible Assets": {},
-                "Investments": {},
-                "Lease Buyout": {},
-                "Licences": {},
-                "Organisational costs": {},
-                "Other intangible assets": {},
-                "Other non-current assets": {},
-                "Prepayments and accrued income": {},
-                "Security Deposits": {}
-            },
-            "Property, plant and equipment": {
-                "Accumulated amortisation": {},
-                "Accumulated depletion": {},
-                "Accumulated depreciation": {},
-                "Buildings": {},
-                "Depletable assets": {},
-                "Furniture and fixtures": {},
-                "Leasehold improvements": {},
-                "Machinery and equipment": {},
-                "Other Assets": {},
-                "Vehicles": {}
-            },
-            "Purchase Tax Receivable": {
-                "Purchase Tax Account 0% EP": {},
-                "Purchase Tax Account 0% ME": {},
-                "Purchase Tax Account 0% NR": {},
-                "Purchase Tax Account 0% OP": {},
-                "Purchase Tax Account 0% ZP": {},
-                "Purchase Tax Account 7% BL": {},
-                "Purchase Tax Account 7% IM": {},
-                "Purchase Tax Account 7% TX-E33": {},
-                "Purchase Tax Account 7% TX-N33": {},
-                "Purchase Tax Account 7% TX-RE": {},
-                "Purchase Tax Account 7% TX7": {},
-                "Purchase Tax Account MES": {}
-            },
-            "Trade and other receivable": {
-                "Other Receivable Account": {
-                    "account_type": "Receivable"
-                },
-                "Trade Receivable Account": {
-                    "account_type": "Receivable"
-                },
-                "account_type": "Receivable"
-            },
-			"root_type": "Asset"
-        },
-        "Liabilities": {
-            "Current liabilities": {
-                "Client Trust Accounts - Liabilities": {},
-                "Current Tax Liability": {},
-                "Current portion of employee benefits obligations": {},
-                "Current portion of obligations under finance leases": {},
-                "GST Payable": {},
-                "Insurance Payable": {},
-                "Interest payables": {},
-                "Line of Credit": {},
-                "Loan Payable": {},
-                "Payroll Clearing": {},
-                "Payroll liabilities": {},
-                "Prepaid Expenses Payable": {},
-                "Provision for warranty obligations": {},
-                "Rents in trust - Liability": {},
-                "Short term borrowings": {}
-            },
-            "Equity": {
-                "Accumulated Adjustment": {},
-                "Opening Balance Equity": {},
-                "Ordinary shares": {},
-                "Owner's Equity": {},
-                "Paid-in capital or surplus": {},
-                "Partner's Equity": {},
-                "Preferred shares": {},
-                "Retained Earnings": {},
-                "Share capital": {},
-                "Treasury Shares": {}
-            },
-            "Non-current liabilities": {
-                "Accruals and Deferred Income": {},
-                "Bank loans": {},
-                "Long term borrowings": {},
-                "Long term employee benefit obligations": {},
-                "Notes Payable": {},
-                "Obligations under finance leases": {},
-                "Other non-current liabilities": {},
-                "Shareholder Notes Payable": {}
-            },
-            "Sale Tax Payables": {
-                " Sales Tax Account 0% ES33": {},
-                "Sales Tax Account 0% ESN33": {},
-                "Sales Tax Account 0% OS": {},
-                "Sales Tax Account 0% ZR": {},
-                "Sales Tax Account 7% DS": {},
-                "Sales Tax Account 7% SR": {}
-            },
-            "Trade and other payables": {
-                "Other Payable Account": {
-                    "account_type": "Payable"
-                },
-                "Trade Payable Account": {
-                    "account_type": "Payable"
-                },
-                "account_type": "Payable"
-            },
-			"root_type": "Liability"
-        },
-        "Cost of sales": {
-            "Cost of Good Sold": {
-                "Cost of Labour - COS": {},
-                "Equipment rental - COS": {},
-                "Freight and delivery - COS": {},
-                "Other costs of sales - COS": {},
-                "Supplies and materials - COS": {}
-            },
-			"root_type": "Expense"
-        },
-        "Income": {
-            "Other revenue": {
-                "Dividend revenue": {},
-                "Gain/loss on sale of fixed assets or investments": {},
-                "Interest earned": {},
-                "Other investment revenue": {},
-                "Other miscellaneous revenue": {},
-                "Tax-exempt interest": {}
-            },
-            "Revenue": {
-                "Discounts/refunds given": {},
-                "Non-profit revenue": {},
-                "Other primary revenue": {},
-                "Sales of product revenue": {},
-                "Service/fee revenue": {},
-                "Unapplied cash payment income": {}
-            },
-			"root_type": "Income"
-        },
-        "Indirect Expenses": {
-            "Expenses": {
-                "Administrative expenses": {},
-                "Advertising/promotional": {},
-                "Auto": {},
-                "Bad debts": {},
-                "Bank charges": {},
-                "Charitable contributions": {},
-                "Cost of labour": {},
-                "Distribution costs": {},
-                "Dues and subscriptions": {},
-                "Entertainment": {},
-                "Equipment rental": {},
-                "Finance costs": {},
-                "Insurance": {},
-                "Interest paid": {},
-                "Legal and professional fees": {},
-                "Meals and entertainment": {},
-                "Other miscellaneous service cost": {},
-                "Payroll expenses": {},
-                "Promotional meals": {},
-                "Rent or lease of buildings": {},
-                "Repair and maintenance": {},
-                "Shipping, freight, and delivery": {},
-                "Supplies": {},
-                "Taxes paid": {},
-                "Travel": {},
-                "Travel meals": {},
-                "Unapplied cash bill payment expense": {},
-                "Utilities": {}
-            },
-            "Other Expenses": {
-                "Amortisation": {},
-                "Depreciation": {},
-                "Exchange Gain or Loss": {},
-                "Other Expense": {},
-                "Penalties and settlements": {}
-            },
-			"root_type": "Expense"
-        }
-    }
-}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/si_gd_chart.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/si_gd_chart.json
index 443054e..3f687dc 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/si_gd_chart.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/si_gd_chart.json
@@ -1,6 +1,7 @@
 {
     "country_code": "si", 
     "name": "Kontni na\u010drt za gospodarske dru\u017ebe", 
+	"disabled": "Yes",
     "tree": {
         "DOLGORO\u010cNA SREDSTVA": {
             "DANA DOLGORO\u010cNA POSOJILA IN TERJATVE ZA NEVPLA\u010cANI VPOKLICANI KAPITAL": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/th_chart.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/th_chart.json
index 6e8ff71..dffcf35 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/th_chart.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/th_chart.json
@@ -1,7 +1,6 @@
 {
     "country_code": "th",
     "name": "Thailand Chart of Accounts",
-	"is_active": "Yes",
     "tree": {
         "Assets": {
             "Account Receivable": {},
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/uy_uy_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/uy_uy_chart_template.json
index 326fa65..04633cc 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/uy_uy_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/uy_uy_chart_template.json
@@ -1,7 +1,6 @@
 {
     "country_code": "uy",
     "name": "Plan de Cuentas",
-	"is_active": "Yes",
     "tree": {
         "ACTIVO": {
             "ACTIVO CORRIENTE": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
index 1ba0931..734e4d0 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
@@ -1,7 +1,6 @@
 {
     "country_code": "ae",
     "name": "U.A.E Chart of Accounts",
-	"is_active": "Yes",
     "tree": {
         "Assets": {
             "Current Assets": {
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 ceb37cc..81c4fdf 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
@@ -1,7 +1,6 @@
 {
   "country_code": "gt",
   "name": "Cuentas de Guatemala",
-  "is_active": "Yes",
   "tree": {
     "Activos": {
       "Activo Corriente": {
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 254e2b7..c300894 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
@@ -1,7 +1,6 @@
 {
     "country_code": "in",
     "name": "Chart of Accounts - India",
-	"is_active": "Yes",
     "tree": {
 	    "Application of Funds (Assets)": {
 	        "Current Assets": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json
index bea2c6d..d55b77e 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json
@@ -1,7 +1,6 @@
 {
 	"country_code": "ni",
 	"name": "Catalogo de Cuentas Nicaragua",
-	"is_active": "Yes",
 	"tree": {
 		"Activo": {
 			"Activo Corriente": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_default_coa.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_default_coa.json
new file mode 100644
index 0000000..a62be37
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_default_coa.json
@@ -0,0 +1,273 @@
+{
+	"country_code": "sg",
+	"name": "Singapore Default Chart of Accounts",
+	"tree": {
+		"Assets": {
+			"Current assets": {
+				"Accounts Receivable": {
+					"Credit Cards": {
+						"AMEX Receivable": {},
+						"CUP Receivale": {},
+						"MC Receivable": {},
+						"NETS Receivable": {},
+						"VISA Receivable": {}
+					},
+					"Debtors": {
+						"account_type": "Receivable"
+					}
+				},
+				"Bank Accounts": {
+					"Paypal Account": {
+						"account_type": "Bank"
+					},
+					"account_type": "Bank"
+				},
+				"Cash in Hand": {
+					"Cash in Transit": {
+						"account_type": "Cash"
+					},
+					"Petty Cash": {
+						"account_type": "Cash"
+					}
+				},
+				"Loans and Advances-Assets": {
+					"Prepayments": {}
+				},
+				"Securities and Deposits": {
+					"Bank Guarantees": {},
+					"Bank Deposits": {},
+					"Rental Deposits": {}
+				},
+				"Stock Assets": {
+					"account_type": "Stock",
+					"is_group": 1
+				},
+				"Tax Assets": {
+					"GST-Input": {}
+				}
+			},
+			"Non-current assets": {
+				"Fixed Assets": {
+					"Accumulated Depreciation": {
+						"AccDep-Equipment-ICT": {},
+						"AccDep-Furniture and Fixtures": {},
+						"AccDep-Equipment-Office": {},
+						"AccDep-Motor Vehicle": {},
+						"AccDep-Plant and Machinery": {}
+					},
+					"Equipment-ICT": {},
+					"Furniture and Fixtures": {},
+					"Equipment-Office": {},
+					"Motor Vehicle": {},
+					"Plant and Machinery": {}
+				},
+				"Non-Fixed Assets": {
+					"Goodwill": {},
+					"Investments": {
+						"Investments-Associated Company": {},
+						"Investments-Subsidiary": {}
+					}
+				},
+				"Shares": {
+					"Shares-Quoted": {},
+					"Shares-Unquoted": {}
+				}
+			},
+			"Temporary Accunts": {
+				"Temporary Opening": {
+					"account_type": "Temporary"
+				}
+			},
+			"root_type": "Asset"
+		},
+		"Liabilities": {
+			"Current liabilities": {
+				"Accounts Payable": {
+					"Creditors":{
+						"account_type": "Payable"
+					}
+			 	},
+			 	"Duties and Taxes": {
+					"account_type": "Tax",
+					"Deferred Tax Liabilities-Current": {},
+					"GST-Output": {},
+					"Income Tax Payable": {}
+				},
+				"Loans-Current": {
+					"Amount Owing to Directors": {},
+					"Bank Overdaft Account": {},
+					"Secured Loans": {},
+					"Unsecured Loans": {}
+				},
+				"Provision and Accruals": {
+					"Accruals": {
+					  "Accr-CPF": {},
+					  "Accr-Sundry": {},
+					  "Accr-Withholding Tax": {}
+					},
+					"Provisions": {
+						"Prov-Audit Fee": {},
+						"Prov-Others": {},
+						"Prov-Tax Fee": {},
+						"Prov-Bonus": {
+						  "Prov-Bonus-Executive": {},
+						  "Prov-Bonus-Non Executive": {}
+						}
+					}
+				},
+				"Sponsorship Funds": {},
+				"Stock Liabilities": {
+					"Stock Received But Not Billed": {
+					       "account_type": "Stock Received But Not Billed"
+					}
+				}
+			},
+			"Non-current liabilities": {
+				"Deferred Tax Liabilities": {},
+				"Loans-Non Current": {}
+			},
+			"Capital Account": {
+				"Reserves and Surplus": {},
+				"Shareholder Funds": {}
+			},
+		"root_type": "Liability"
+		},
+		"Equity": {
+			"Share Capital": {},
+			"Current Year Earnings": {},
+			"Proposed Dividends": {},
+			"Retained Earnings": {},
+			"root_type": "Equity"
+		},
+		"Income": {
+			"Direct Income": {
+				"Management Income": {},
+				"Sales Income": {}
+			},
+			"Indirect Income": {
+				"Government Grants": {},
+				"Interest Income": {
+			"Current Account Interest Earned": {},
+			"Fixed Deposit Interest Earned": {}
+				},
+				"Other Income": {},
+				"Service Charges": {}
+			},
+			"root_type": "Income"
+		},
+		"Expenses": {
+			"Expenses-Administrative": {
+				"Audit Fees": {},
+				"Bank charges and interest": {},
+				"Currency Exchange Differences": {},
+				"Insurance": {},
+				"Interest on Loan": {},
+				"Legal and Professional Fees": {},
+				"Loss on Disposal of FA": {},
+				"Postal and Courier Charges": {},
+				"Printing and Stationery": {},
+				"Secretarial Fees": {},
+				"Tax Agent Fees": {}
+			},
+			"Expenses-Direct": {
+				"Cost of Goods Sold": {
+					"account_type": "Cost of Goods Sold"
+				},
+				"Cost of Sales": {},
+				"Expenses Included in Valuation": {
+					"account_type": "Expenses Included In Valuation"
+				},
+				"Stock Adjustment": {
+					"account_type": "Stock Adjustment"
+				}
+			},
+			"Expenses-Marketing": {
+				"Advertising and Promotion": {},
+				"Graphic Design Fees": {},
+				"Internet Marketing": {}
+			},
+			"Expenses-Operating": {
+				"Cleaning Costs": {},
+				"Commission Charges": {
+					"Comm-Credit Card": {},
+					"Comm-NETS": {},
+					"Comm-Paypal": {}
+				},
+				"Communication Costs": {
+				  "Internet Connection": {},
+				  "Telephone Costs": {}
+				},
+				"Entertainment Expenses": {},
+				"General Expenses": {},
+			   "Licence Fees": {},
+			   "Rental Costs": {
+					"Rental-Premises": {},
+					"Rental-Equipment": {},
+					"Rental-Storage": {}
+				},
+				"Repairs and Maintenance": {
+					"R&M-ICT": {},
+					"R&M-Building": {},
+					"R&M-Fixtures & Furniture": {},
+					"R&M-Office": {},
+					"R&M-Plant & Machinery": {}
+				},
+				"Service Fees": {},
+				"Subscription Fees": {
+					"Publication Subscriptions": {},
+					"TV Subscriptions": {}
+				},
+				"Travel Expenses": {},
+				"Utilities": {
+					"Utility-Electricity": {},
+					"Utility-Gas": {},
+					"Utility-Refuse Removal": {},
+					"Utility-Water": {}
+				}
+			},
+			"Expenses-Other": {
+				"Bad Debts Written Off": {},
+				"Depreciation": {
+					"Dep-ICT Equipment": {},
+					"Dep-Fixtures & Furniture": {},
+					"Dep-Motor Vehicle": {},
+					"Dep-Office Equipment": {},
+					"Dep-Plant & Machinery": {},
+					"Dep-Renovation": {}
+				},
+				"Donations": {},
+				"Round Off": {},
+				"Tax Expenses": {
+					"Tax Expenses": {}
+				}
+			},
+			"Expenses-Staff": {
+				"Bonuses": {
+					"Bonus-Executive": {},
+					"Bonus-Non Executive": {},
+					"Bonus-Performance": {}
+				},
+				"CPF": {},
+				"Directors Fees": {},
+				"FWL": {},
+				"Incentives": {},
+				"Medical Expenses": {},
+				"Salaries": {
+					"Casual Labour": {},
+					"Salary-Executive": {},
+					"Salary-Non Executive-Full Time": {},
+					"Salary-Non Executive-Part Time": {}
+				},
+				"SDF": {},
+				"Security Expenses": {},
+				"Staff Advertising": {},
+				"Staff Commission Paid": {},
+				"Staff Meals": {},
+				"Staff Training": {},
+				"Staff Transport": {},
+				"Staff Welfare": {}
+			},
+			"root_type": "Expense"
+		}
+	}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_fnb_coa.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_fnb_coa.json
new file mode 100644
index 0000000..fb84f20
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_fnb_coa.json
@@ -0,0 +1,343 @@
+{
+	"country_code": "sg",
+	"name": "Singapore F&B Chart of Accounts",
+	"tree": {
+		"Assets": {
+			"Current assets": {
+				"Accounts Receivable": {
+					"Credit Cards": {
+						"AMEX Receivable": {},
+						"CUP Receivale": {},
+						"MC Receivable": {},
+						"NETS Receivable": {},
+						"VISA Receivable": {}
+					},
+					"Debtors": {
+						"account_type": "Receivable"
+					}
+				},
+				"Bank Accounts": {
+					"Paypal Account": {
+						"account_type": "Bank"
+					},
+					"account_type": "Bank"
+				},
+				"Cash in Hand": {
+					"Cash in Transit": {
+						"account_type": "Cash"
+					},
+					"Petty Cash": {
+						"account_type": "Cash"
+					}
+				},
+				"Loans and Advances-Assets": {
+					"Prepayments": {}
+				},
+				"Securities and Deposits": {
+					"Bank Guarantees": {},
+					"Bank Deposits": {},
+					"Rental Deposits": {}
+				},
+				"Stock Assets": {
+					"account_type": "Stock",
+					"is_group": 1
+				},
+				"Tax Assets": {
+					"GST-Input": {}
+				}
+			},
+			"Non-current assets": {
+				"Fixed Assets": {
+					"Accumulated Depreciation": {
+						"AccDep-Equipment-AV": {},
+						"AccDep-Equipment-Bar": {},
+						"AccDep-Equipment-ICT": {},
+						"AccDep-Equipment-Electrical": {},
+						"AccDep-Furniture and Fixtures": {},
+						"AccDep-Equipment-Kitchen": {},
+						"AccDep-Equipment-Lighting": {},
+						"AccDep-Equipment-Office": {},
+						"AccDep-Motor Vehicle": {},
+						"AccDep-Plant and Machinery": {},
+						"AccDep-Renovation": {}
+					},
+					"Equipment-AV": {},
+					"Equipment-Bar": {},
+					"Equipment-ICT": {},
+					"Equipment-Electrical": {},
+					"Furniture and Fixtures": {},
+					"Equipment-Kitchen": {},
+					"Equipment-Lighting": {},
+					"Equipment-Office": {},
+					"Motor Vehicle": {},
+					"Plant and Machinery": {},
+					"Renovation": {}
+				},
+				"Non-Fixed Assets": {
+					"Goodwill": {},
+					"Investments": {
+						"Investments-Associated Company": {},
+						"Investments-Subsidiary": {}
+					}
+				},
+				"Shares": {
+					  "Shares-Quoted": {},
+					  "Shares-Unquoted": {}
+				}
+			},
+			"Temporary Accunts": {
+				"Temporary Opening": {
+					"account_type": "Temporary"
+				}
+			},
+			"root_type": "Asset"
+		},
+		"Liabilities": {
+			"Current liabilities": {
+				"Accounts Payable": {
+					"Creditors":{
+						"account_type": "Payable"
+					}
+			 	},
+			 	"Duties and Taxes": {
+					"account_type": "Tax",
+					"Deferred Tax Liabilities-Current": {},
+					"GST-Output": {},
+					"Income Tax Payable": {}
+				},
+				"Loans-Current": {
+					"Amount Owing to Directors": {},
+					"Bank Overdaft Account": {},
+					"Secured Loans": {},
+					"Unsecured Loans": {}
+				},
+				"Provision and Accruals": {
+					"Accruals": {
+						"Accr-CPF": {},
+						"Accr-Incentives": {},
+						"Accr-OCR Employee Card": {},
+						"Accr-Paypal Credit": {},
+						"Accr-Sundry": {},
+						"Accr-Tips": {},
+						"Accr-Withholding Tax": {}
+					},
+					"Provisions": {
+						"Prov-Audit Fee": {},
+						"Prov-Others": {},
+						"Prov-Tax Fee": {},
+						"Prov-Bonus": {
+							"Prov-Bonus-Executive": {},
+							"Prov-Bonus-Non Executive": {}
+						}
+					}
+				},
+				"Sponsorship Funds": {},
+				"Stock Liabilities": {
+					"Stock Received But Not Billed": {
+						"account_type": "Stock Received But Not Billed"
+					}
+				}
+			},
+			"Non-current liabilities": {
+				"Deferred Tax Liabilities": {},
+				"Loans-Non Current": {}
+			},
+			"Capital Account": {
+				"Reserves and Surplus": {},
+				"Shareholder Funds": {}
+			},
+		"root_type": "Liability"
+		},
+		"Equity": {
+			"Share Capital": {},
+			"Current Year Earnings": {},
+			"Proposed Dividends": {},
+			"Retained Earnings": {},
+			"root_type": "Equity"
+		},
+		"Income": {
+			"Direct Income": {
+				"Management Income": {},
+				"Sales Income": {
+					"Sales-Food": {},
+					"Sales-Beverage": {},
+					"Sales-Events and Functions": {},
+					"Sales-Merchandise": {},
+					"Sales-Pool Tables": {},
+					"Sales-Tobacco": {},
+					"Sales-Rental": {}
+				}
+			},
+			"Indirect Income": {
+				"Government Grants": {},
+				"Interest Income": {
+					"Current Account Interest Earned": {},
+					"Fixed Deposit Interest Earned": {}
+				},
+				"Other Income": {},
+				"Service Charges": {}
+			},
+			"root_type": "Income"
+		},
+		"Expenses": {
+			"Expenses-Administrative": {
+				"Admin Management Fees": {},
+				"Audit Fees": {},
+				"Auto": {},
+				"Bank charges and interest": {},
+				"Currency Exchange Differences": {},
+				"Insurance": {},
+				"Interest on Loan": {},
+				"Legal and Professional Fees": {},
+				"Loss on Disposal of FA": {},
+				"Postal and Courier Charges": {},
+				"Printing and Stationery": {},
+				"Secretarial Fees": {},
+				"Tax Agent Fees": {}
+			},
+			"Expenses-Direct": {
+				"Cost of Goods Sold": {
+					"account_type": "Cost of Goods Sold"
+				},
+				"Cost of Sales": {
+					"COS-Food": {},
+					"COS-Beverage": {},
+					"COS-Tobacco": {},
+					"COS-Events and Functions": {},
+					"COS-Merchandise": {}
+				},
+				"Expenses Included in Valuation": {
+					"account_type": "Expenses Included In Valuation"
+				},
+				"Stock Adjustment": {
+					"account_type": "Stock Adjustment"
+				}
+			},
+			"Expenses-Marketing": {
+				"Advertising and Promotion": {},
+				"Graphic Design Fees": {},
+				"Internet Marketing": {
+					"Marketing-Social Media": {},
+					"Marketing-Website": {}
+				}
+			},
+			"Expenses-Operating": {
+				"Cleaning Costs": {
+					"Cleaning-Kitchen": {},
+					"Cleaning-Laundry": {},
+					"Cleaning-Outlet": {}
+				},
+				"Commission Charges": {
+					"Comm-Credit Card": {},
+					"Comm-NETS": {},
+					"Comm-Paypal": {}
+				},
+				"Communication Costs": {
+					  "Internet Connection": {},
+					  "Telephone Costs": {}
+				},
+				"Disposals": {
+					"Disposals-Food": {},
+					"Disposals-Beverage": {},
+					"Disposals-Merchandise": {},
+					"Disposals-Others": {}
+				},
+				"Entertainment Expenses": {
+					"DJ Costs": {},
+					"Live Band Costs": {},
+					"Recorded Music Costs": {}
+				},
+				"FoC Accounts": {
+					"FoC-ENT": {},
+					"FoC-OC": {}
+				},
+				"General Expenses": {},
+				"Landscaping Costs": {},
+				"Licence Fees": {},
+				"Operational Supplies": {
+					"Supplies-Bar": {},
+					"Supplies-Guest": {},
+					"Supplies-Kitchen": {},
+					"Supplies-Restaurant": {},
+					"Supplies-Stewarding": {}
+				},
+				"Rental Costs": {
+					"Rental-Premises": {},
+					"Rental-Equipment": {},
+					"Rental-Storage": {}
+				},
+				"Repairs and Maintenance": {
+					"R&M-ICT": {},
+					"R&M-AV": {},
+					"R&M-Building": {},
+					"R&M-Electrical & Lighting": {},
+					"R&M-Fixtures & Furniture": {},
+					"R&M-Kitchen & Bar": {},
+					"R&M-Office": {},
+					"R&M-Plant & Machinery": {}
+				},
+				"Service Fees": {},
+				"Subscription Fees": {
+					"Publication Subscriptions": {},
+					"TV Subscriptions": {}
+				},
+				"Travel Expenses": {},
+				"Utilities": {
+					"Utility-Electricity": {},
+					"Utility-Gas": {},
+					"Utility-Refuse Removal": {},
+					"Utility-Water": {}
+				}
+			},
+			"Expenses-Other": {
+				"Bad Debts Written Off": {},
+				"Depreciation": {
+					"Dep-AV Equipment": {},
+					"Dep-Bar Equipment": {},
+					"Dep-ICT Equipment": {},
+					"Dep-Electrical Equipment": {},
+					"Dep-Fixtures & Furniture": {},
+					"Dep-Kitchen Equipment": {},
+					"Dep-Lighting Equipment": {},
+					"Dep-Motor Vehicle": {},
+					"Dep-Office Equipment": {},
+					"Dep-Plant & Machinery": {},
+					"Dep-Renovation": {}
+				},
+				"Donations": {},
+				"Round Off": {},
+				"Tax Expenses": {
+					"Tax Expenses": {}
+				}
+			},
+			"Expenses-Staff": {
+				"Bonuses": {
+					"Bonus-Executive": {},
+					"Bonus-Non Executive": {},
+					"Bonus-Performance": {}
+				},
+				"CPF": {},
+				"Directors Fees": {},
+				"FWL": {},
+				"Incentives": {},
+				"Medical Expenses": {},
+				"Salaries": {
+					"Casual Labour": {},
+					"Salary-Executive": {},
+					"Salary-Non Executive-Full Time": {},
+					"Salary-Non Executive-Part Time": {}
+				},
+				"SDF": {},
+				"Security Expenses": {},
+				"Staff Advertising": {},
+				"Staff Commission Paid": {},
+				"Staff Meals": {},
+				"Staff Training": {},
+				"Staff Transport": {},
+				"Staff Uniforms": {},
+				"Staff Welfare": {}
+			},
+			"root_type": "Expense"
+		}
+	}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index 1b933ce..1ba9221 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -21,9 +21,11 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Make Accounting Entry For Every Stock Movement", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -43,9 +45,11 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Accounts Frozen Upto", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -65,10 +69,12 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Role Allowed to Set Frozen Accounts & Edit Frozen Entries", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Role", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -88,10 +94,12 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Credit Controller", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Role", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -110,10 +118,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Check Supplier Invoice Number Uniqueness", 
+   "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, 
@@ -131,7 +141,8 @@
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
- "modified": "2015-07-14 00:51:48.095525", 
+ "max_attachments": 0, 
+ "modified": "2015-12-24 21:42:01.274459", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Accounts Settings", 
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
index 7b528bc..d6d8822 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
@@ -26,7 +26,7 @@
 				t2.parent = t1.name and t2.account = %s
 				and t1.posting_date >= %s and t1.posting_date <= %s and t1.docstatus=1
 				and ifnull(t1.is_opening, 'No') = 'No' %s
-				order by t1.posting_date""" %
+				order by t1.posting_date DESC, t1.name DESC""" %
 				('%s', '%s', '%s', condition), (self.bank_account, self.from_date, self.to_date), as_dict=1)
 
 		self.set('journal_entries', [])
diff --git a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
index 5d74c3f..d770a93 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
+++ b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
@@ -16,7 +16,7 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "label": "Voucher ID", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,7 +31,8 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0
+   "unique": 0, 
+   "width": "50"
   }, 
   {
    "allow_on_submit": 0, 
@@ -56,7 +57,8 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0
+   "unique": 0, 
+   "width": "15"
   }, 
   {
    "allow_on_submit": 0, 
@@ -67,7 +69,7 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Debit", 
    "length": 0, 
    "no_copy": 0, 
@@ -93,7 +95,7 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Credit", 
    "length": 0, 
    "no_copy": 0, 
@@ -143,7 +145,7 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -268,7 +270,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2015-12-04 11:01:24.286320", 
+ "modified": "2016-01-19 12:06:17.568428", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation Detail", 
@@ -277,4 +279,4 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "version": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.js b/erpnext/accounts/doctype/cost_center/cost_center.js
index e4db510..f66459b 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.js
+++ b/erpnext/accounts/doctype/cost_center/cost_center.js
@@ -51,7 +51,7 @@
 	cur_frm.set_intro(intro_txt);
 
 	cur_frm.add_custom_button(__('Chart of Cost Centers'),
-		function() { frappe.set_route("Accounts Browser", "Cost Center"); }, 'icon-sitemap')
+		function() { frappe.set_route("Accounts Browser", "Cost Center"); }, __("View"))
 }
 
 cur_frm.cscript.parent_cost_center = function(doc, cdt, cdn) {
@@ -62,12 +62,12 @@
 
 cur_frm.cscript.hide_unhide_group_ledger = function(doc) {
 	if (doc.is_group == 1) {
-		cur_frm.add_custom_button(__('Convert to non-Group'),
-			function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet',
+		cur_frm.add_custom_button(__('Convert to Non-Group'),
+			function() { cur_frm.cscript.convert_to_ledger(); }, "icon-retweet",
 				"btn-default")
 	} else if (doc.is_group == 0) {
 		cur_frm.add_custom_button(__('Convert to Group'),
-			function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet',
+			function() { cur_frm.cscript.convert_to_group(); }, "icon-retweet",
 				"btn-default")
 	}
 }
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
index cca01a4..e7812c3 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
@@ -14,7 +14,7 @@
 		this.frm.toggle_enable('year_end_date', doc.__islocal)
 
 		if (!doc.__islocal && (doc.name != sys_defaults.fiscal_year)) {
-			this.frm.add_custom_button(__("Set as Default"),
+			this.frm.add_custom_button(__("Default"),
 				this.frm.cscript.set_as_default, "icon-star");
 			this.frm.set_intro(__("To set this Fiscal Year as Default, click on 'Set as Default'"));
 		} else {
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
index 1baed41..9456924 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
@@ -20,14 +20,15 @@
 		msgprint(_("{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.").format(self.name))
 
 	def validate(self):
-		year_start_end_dates = frappe.db.sql("""select year_start_date, year_end_date
-			from `tabFiscal Year` where name=%s""", (self.name))
-
 		self.validate_dates()
 
-		if year_start_end_dates:
-			if getdate(self.year_start_date) != year_start_end_dates[0][0] or getdate(self.year_end_date) != year_start_end_dates[0][1]:
-				frappe.throw(_("Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved."))
+		if not self.is_new():
+			year_start_end_dates = frappe.db.sql("""select year_start_date, year_end_date
+				from `tabFiscal Year` where name=%s""", (self.name))
+
+			if year_start_end_dates:
+				if getdate(self.year_start_date) != year_start_end_dates[0][0] or getdate(self.year_end_date) != year_start_end_dates[0][1]:
+					frappe.throw(_("Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved."))
 
 	def validate_dates(self):
 		if getdate(self.year_start_date) > getdate(self.year_end_date):
@@ -63,6 +64,6 @@
 			end_year = cstr(new_fy.year_end_date.year)
 			new_fy.year = start_year if start_year==end_year else (start_year + "-" + end_year)
 
-			new_fy.insert()
+			new_fy.insert(ignore_permissions=True)
 		except frappe.NameError:
 			pass
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index 479eaaf..76f6ee5 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -11,7 +11,7 @@
 		frm.cscript.voucher_type(frm.doc);
 
 		if(frm.doc.docstatus==1) {
-			frm.add_custom_button(__('View Ledger'), function() {
+			frm.add_custom_button(__('Ledger'), function() {
 				frappe.route_options = {
 					"voucher_no": frm.doc.name,
 					"from_date": frm.doc.posting_date,
@@ -347,6 +347,7 @@
 				callback: function(r) {
 					if(r.message) {
 						$.extend(d, r.message);
+						erpnext.journal_entry.set_debit_credit_in_company_currency(frm, dt, dn);
 						refresh_field('accounts');
 					}
 				}
@@ -355,11 +356,11 @@
 	},
 
 	debit_in_account_currency: function(frm, cdt, cdn) {
-		erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
+		erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
 	},
 
 	credit_in_account_currency: function(frm, cdt, cdn) {
-		erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
+		erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
 	},
 
 	debit: function(frm, dt, dn) {
@@ -368,6 +369,17 @@
 
 	credit: function(frm, dt, dn) {
 		cur_frm.cscript.update_totals(frm.doc);
+	},
+	
+	exchange_rate: function(frm, cdt, cdn) {
+		var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
+		var row = locals[cdt][cdn];
+
+		if(row.account_currency == company_currency || !frm.doc.multi_currency) {
+			frappe.model.set_value(cdt, cdn, "exchange_rate", 1);
+		}
+		
+		erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 	}
 })
 
@@ -395,8 +407,6 @@
 	},
 
 	set_debit_credit_in_company_currency: function(frm, cdt, cdn) {
-		erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
-
 		var row = locals[cdt][cdn];
 
 		frappe.model.set_value(cdt, cdn, "debit",
@@ -413,7 +423,8 @@
 		var row = locals[cdt][cdn];
 
 		if(row.account_currency == company_currency || !frm.doc.multi_currency) {
-			frappe.model.set_value(cdt, cdn, "exchange_rate", 1);
+			row.exchange_rate = 1;
+			erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 		} else if (!row.exchange_rate || row.exchange_rate == 1 || row.account_type == "Bank") {
 			frappe.call({
 				method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_exchange_rate",
@@ -429,11 +440,15 @@
 				},
 				callback: function(r) {
 					if(r.message) {
-						frappe.model.set_value(cdt, cdn, "exchange_rate", r.message);
+						row.exchange_rate = r.message;
+						erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 					}
 				}
 			})
+		} else {
+			erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 		}
+		refresh_field("exchange_rate", cdn, "accounts");
 	},
 
 	quick_entry: function(frm) {
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index ec22483..9c39f0d 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -105,6 +105,12 @@
 					elif d.reference_type in ("Sales Order", "Purchase Order") and d.is_advance != "Yes":
 						frappe.throw(_("Row {0}: Payment against Sales/Purchase Order should always be marked as advance").format(d.idx))
 
+				if d.is_advance == "Yes":
+					if d.party_type == 'Customer' and flt(d.debit) > 0:
+						frappe.throw(_("Row {0}: Advance against Customer must be credit").format(d.idx))
+					elif d.party_type == 'Supplier' and flt(d.credit) > 0:
+						frappe.throw(_("Row {0}: Advance against Supplier must be debit").format(d.idx))
+
 	def validate_against_jv(self):
 		for d in self.get('accounts'):
 			if d.reference_type=="Journal Entry":
@@ -274,10 +280,14 @@
 		alternate_currency = []
 		for d in self.get("accounts"):
 			account = frappe.db.get_value("Account", d.account, ["account_currency", "account_type"], as_dict=1)
-			d.account_currency = account.account_currency or self.company_currency
-			d.account_type = account.account_type
+			if account:
+				d.account_currency = account.account_currency
+				d.account_type = account.account_type
 
-			if d.account_currency!=self.company_currency and d.account_currency not in alternate_currency:
+			if not d.account_currency:
+				d.account_currency = self.company_currency
+
+			if d.account_currency != self.company_currency and d.account_currency not in alternate_currency:
 				alternate_currency.append(d.account_currency)
 
 		if alternate_currency:
@@ -341,6 +351,7 @@
 	def set_print_format_fields(self):
 		total_amount = 0.0
 		bank_account_currency = None
+		self.pay_to_recd_from = None
 		for d in self.get('accounts'):
 			if d.party_type and d.party:
 				if not self.pay_to_recd_from:
@@ -350,7 +361,10 @@
 			elif frappe.db.get_value("Account", d.account, "account_type") in ["Bank", "Cash"]:
 				total_amount += (d.debit_in_account_currency or d.credit_in_account_currency)
 				bank_account_currency = d.account_currency
-
+		
+		if not self.pay_to_recd_from:
+			total_amount = 0
+		
 		self.set_total_amount(total_amount, bank_account_currency)
 
 	def set_total_amount(self, amt, currency):
@@ -498,7 +512,7 @@
 			d.party_balance = party_balance[(d.party_type, d.party)]
 
 @frappe.whitelist()
-def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None):
+def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None, account=None):
 	from erpnext.accounts.doctype.sales_invoice.sales_invoice import get_bank_cash_account
 	if mode_of_payment:
 		account = get_bank_cash_account(mode_of_payment, company)
@@ -506,16 +520,18 @@
 			account.update({"balance": get_balance_on(account.get("account"))})
 			return account
 
-	if voucher_type=="Bank Entry":
-		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})
-	elif voucher_type=="Cash Entry":
-		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})
+	if not account:
+		if voucher_type=="Bank Entry":
+			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})
+				
+		elif voucher_type=="Cash Entry":
+			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})
 
 	if account:
 		account_details = frappe.db.get_value("Account", account,
@@ -528,7 +544,7 @@
 		}
 
 @frappe.whitelist()
-def get_payment_entry_against_order(dt, dn):
+def get_payment_entry_against_order(dt, dn, amount=None, journal_entry=False, bank_account=None):
 	ref_doc = frappe.get_doc(dt, dn)
 
 	if flt(ref_doc.per_billed, 2) > 0:
@@ -546,10 +562,11 @@
 	party_account = get_party_account(party_type, ref_doc.get(party_type.lower()), ref_doc.company)
 	party_account_currency = get_account_currency(party_account)
 
-	if party_account_currency == ref_doc.company_currency:
-		amount = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid)
-	else:
-		amount = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid)
+	if not amount:
+		if party_account_currency == ref_doc.company_currency:
+			amount = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid)
+		else:
+			amount = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid)
 
 	return get_payment_entry(ref_doc, {
 		"party_type": party_type,
@@ -559,11 +576,13 @@
 		"amount_field_bank": amount_field_bank,
 		"amount": amount,
 		"remarks": 'Advance Payment received against {0} {1}'.format(dt, dn),
-		"is_advance": "Yes"
+		"is_advance": "Yes",
+		"bank_account": bank_account,
+		"journal_entry": journal_entry
 	})
 
 @frappe.whitelist()
-def get_payment_entry_against_invoice(dt, dn):
+def get_payment_entry_against_invoice(dt, dn, amount=None, journal_entry=False, bank_account=None):
 	ref_doc = frappe.get_doc(dt, dn)
 	if dt == "Sales Invoice":
 		party_type = "Customer"
@@ -587,24 +606,28 @@
 		"party_account_currency": ref_doc.party_account_currency,
 		"amount_field_party": amount_field_party,
 		"amount_field_bank": amount_field_bank,
-		"amount": abs(ref_doc.outstanding_amount),
+		"amount": amount if amount else abs(ref_doc.outstanding_amount),
 		"remarks": 'Payment received against {0} {1}. {2}'.format(dt, dn, ref_doc.remarks),
-		"is_advance": "No"
+		"is_advance": "No",
+		"bank_account": bank_account,
+		"journal_entry": journal_entry
 	})
 
 def get_payment_entry(ref_doc, args):
 	cost_center = frappe.db.get_value("Company", ref_doc.company, "cost_center")
-	exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"),
-		ref_doc.company, ref_doc.doctype, ref_doc.name)
+	exchange_rate = 1
+	if args.get("party_account"):
+		exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"),
+			ref_doc.company, ref_doc.doctype, ref_doc.name)
 
-	jv = frappe.new_doc("Journal Entry")
-	jv.update({
+	je = frappe.new_doc("Journal Entry")
+	je.update({
 		"voucher_type": "Bank Entry",
 		"company": ref_doc.company,
 		"remark": args.get("remarks")
 	})
 
-	party_row = jv.append("accounts", {
+	party_row = je.append("accounts", {
 		"account": args.get("party_account"),
 		"party_type": args.get("party_type"),
 		"party": ref_doc.get(args.get("party_type").lower()),
@@ -621,8 +644,10 @@
 		"reference_name": ref_doc.name
 	})
 
-	bank_row = jv.append("accounts")
-	bank_account = get_default_bank_cash_account(ref_doc.company, "Bank Entry")
+	bank_row = je.append("accounts")
+	
+	#make it bank_details
+	bank_account = get_default_bank_cash_account(ref_doc.company, "Bank Entry", account=args.get("bank_account"))
 	if bank_account:
 		bank_row.update(bank_account)
 		bank_row.exchange_rate = get_exchange_rate(bank_account["account"],
@@ -638,12 +663,12 @@
 	# set multi currency check
 	if party_row.account_currency != ref_doc.company_currency \
 		or (bank_row.account_currency and bank_row.account_currency != ref_doc.company_currency):
-			jv.multi_currency = 1
+			je.multi_currency = 1
 
-	jv.set_amounts_in_company_currency()
-	jv.set_total_debit_credit()
-
-	return jv.as_dict()
+	je.set_amounts_in_company_currency()
+	je.set_total_debit_credit()
+	
+	return je if args.get("journal_entry") else je.as_dict()
 
 @frappe.whitelist()
 def get_opening_accounts(company):
diff --git a/erpnext/accounts/doctype/payment_gateway/__init__.py b/erpnext/accounts/doctype/payment_gateway/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_gateway/__init__.py
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.json b/erpnext/accounts/doctype/payment_gateway/payment_gateway.json
new file mode 100644
index 0000000..3f1da8f
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_gateway/payment_gateway.json
@@ -0,0 +1,118 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:gateway", 
+ "creation": "2015-12-15 22:26:45.221162", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "gateway", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Gateway", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "in_create": 1, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-01-18 03:58:22.588834", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Payment Gateway", 
+ "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": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "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": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "System Manager", 
+   "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 Manager", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }
+ ], 
+ "read_only": 1, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
new file mode 100644
index 0000000..80799e3
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
@@ -0,0 +1,10 @@
+# -*- 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 PaymentGateway(Document):
+	pass
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/test_payment_gateway.py b/erpnext/accounts/doctype/payment_gateway/test_payment_gateway.py
new file mode 100644
index 0000000..2faf1a7
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_gateway/test_payment_gateway.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Payment Gateway')
+
+class TestPaymentGateway(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/payment_gateway_account/__init__.py b/erpnext/accounts/doctype/payment_gateway_account/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_gateway_account/__init__.py
diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js
new file mode 100644
index 0000000..c9bdc9b
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js
@@ -0,0 +1,6 @@
+cur_frm.cscript.refresh = function(doc, dt, dn){
+	if(!doc.__islocal){
+		var df = frappe.meta.get_docfield(doc.doctype, "gateway", doc.name);
+		df.read_only = 1;
+	}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
new file mode 100644
index 0000000..579c2c2
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
@@ -0,0 +1,293 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "creation": "2015-12-23 21:31:52.699821", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "gateway", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment Gateway", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Gateway", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "is_default", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Is Default", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "payment_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "currency", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "payment_account.account_currency", 
+   "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, 
+   "fieldname": "payment_request_message", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Please click on the link below to make your payment", 
+   "fieldname": "message", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Default Payment Request Message", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Click here to make a payment", 
+   "fieldname": "payment_url_message", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment URL Message", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "payment_success_url", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment Success URL", 
+   "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, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-01-18 03:53:50.534673", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Payment Gateway Account", 
+ "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": "Administrator", 
+   "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
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.py b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.py
new file mode 100644
index 0000000..dd971ad
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.py
@@ -0,0 +1,24 @@
+# -*- 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 PaymentGatewayAccount(Document):
+	def autoname(self):
+		self.name = self.gateway + " - " + self.currency
+		
+	def validate(self):
+		self.update_default_payment_gateway()
+		self.set_as_default_if_not_set()
+	
+	def update_default_payment_gateway(self):
+		if self.is_default:
+			frappe.db.sql("""update `tabPayment Gateway Account` set is_default = 0
+				where is_default = 1 """)
+		
+	def set_as_default_if_not_set(self):
+		if not frappe.db.get_value("Payment Gateway Account", {"is_default": 1, "name": ("!=", self.name)}, "name"):
+			self.is_default = 1
diff --git a/erpnext/accounts/doctype/payment_gateway_account/test_payment_gateway_account.py b/erpnext/accounts/doctype/payment_gateway_account/test_payment_gateway_account.py
new file mode 100644
index 0000000..84c3bc4
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_gateway_account/test_payment_gateway_account.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Payment Gateway Account')
+
+class TestPaymentGatewayAccount(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
index eb84cb0..5075f15 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -47,6 +47,11 @@
 
 	refresh: function() {
 		this.frm.disable_save();
+		this.toggle_primary_action();
+	},
+
+	onload_post_render: function() {
+		this.toggle_primary_action();
 	},
 
 	party: function() {
@@ -75,6 +80,7 @@
 			method: 'get_unreconciled_entries',
 			callback: function(r, rt) {
 				me.set_invoice_options();
+				me.toggle_primary_action();
 			}
 		});
 
@@ -87,10 +93,11 @@
 			method: 'reconcile',
 			callback: function(r, rt) {
 				me.set_invoice_options();
+				me.toggle_primary_action();
 			}
 		});
 	},
-	
+
 	set_invoice_options: function() {
 		var invoices = [];
 
@@ -107,6 +114,20 @@
 		});
 
 		refresh_field("payments");
+	},
+
+	toggle_primary_action: function() {
+		if ((this.frm.doc.payments || []).length) {
+			this.frm.fields_dict.reconcile.$input
+				&& this.frm.fields_dict.reconcile.$input.addClass("btn-primary");
+			this.frm.fields_dict.get_unreconciled_entries.$input
+				&& this.frm.fields_dict.get_unreconciled_entries.$input.removeClass("btn-primary");
+		} else {
+			this.frm.fields_dict.reconcile.$input
+				&& this.frm.fields_dict.reconcile.$input.removeClass("btn-primary");
+			this.frm.fields_dict.get_unreconciled_entries.$input
+				&& this.frm.fields_dict.get_unreconciled_entries.$input.addClass("btn-primary");
+		}
 	}
 
 });
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
index c889288..ef617b0 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -19,10 +19,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -41,10 +43,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Party Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "DocType", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -64,10 +68,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Party", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "party_type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -86,11 +92,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Receivable / Payable Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -109,10 +117,12 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Bank / Cash Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -131,9 +141,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -151,10 +163,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "From Date", 
+   "label": "From Invoice Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -172,10 +186,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "To Date", 
+   "label": "To Invoice Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -193,10 +209,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Minimum Amount", 
+   "label": "Minimum Invoice Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -214,10 +232,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Maximum Amount", 
+   "label": "Maximum Invoice Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -236,9 +256,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Get Unreconciled Entries", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -257,9 +279,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Unreconciled Payment Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -278,10 +302,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Payments", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Payment Reconciliation Payment", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -300,9 +326,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reconcile", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -321,9 +349,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Invoice/Journal Entry Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -342,10 +372,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Invoices", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Payment Reconciliation Invoice", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -357,12 +389,15 @@
  "hide_heading": 0, 
  "hide_toolbar": 1, 
  "icon": "icon-resize-horizontal", 
+ "idx": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
- "modified": "2015-09-21 03:41:24.672227", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-01-04 02:26:58.807921", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Reconciliation", 
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 8354556..832a346 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -18,8 +18,6 @@
 		dr_or_cr = "credit_in_account_currency" if self.party_type == "Customer" \
 			else "debit_in_account_currency"
 
-		cond = self.check_condition()
-
 		bank_account_condition = "t2.against_account like %(bank_cash_account)s" \
 				if self.bank_cash_account else "1=1"
 
@@ -34,7 +32,6 @@
 				and t2.party_type = %(party_type)s and t2.party = %(party)s
 				and t2.account = %(account)s and {dr_or_cr} > 0
 				and (t2.reference_type is null or t2.reference_type in ('', 'Sales Order', 'Purchase Order'))
-				{cond}
 				and (CASE
 					WHEN t1.voucher_type in ('Debit Note', 'Credit Note')
 					THEN 1=1
@@ -42,7 +39,6 @@
 				END)
 			""".format(**{
 				"dr_or_cr": dr_or_cr,
-				"cond": cond,
 				"bank_account_condition": bank_account_condition,
 			}), {
 				"party_type": self.party_type,
@@ -158,8 +154,8 @@
 			frappe.throw(_("Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row"))
 
 	def check_condition(self):
-		cond = " and posting_date >= {0}".format(frappe.db.escape(self.from_date)) if self.from_date else ""
-		cond += " and posting_date <= {0}".format(frappe.db.escape(self.to_date)) if self.to_date else ""
+		cond = " and posting_date >= '{0}'".format(frappe.db.escape(self.from_date)) if self.from_date else ""
+		cond += " and posting_date <= '{0}'".format(frappe.db.escape(self.to_date)) if self.to_date else ""
 
 		if self.party_type == "Customer":
 			dr_or_cr = "debit_in_account_currency"
diff --git a/erpnext/accounts/doctype/payment_request/__init__.py b/erpnext/accounts/doctype/payment_request/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_request/__init__.py
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js
new file mode 100644
index 0000000..b519dee
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_request/payment_request.js
@@ -0,0 +1,34 @@
+cur_frm.add_fetch("payment_gateway", "payment_account", "payment_account")
+cur_frm.add_fetch("payment_gateway", "gateway", "gateway")
+cur_frm.add_fetch("payment_gateway", "message", "message")
+cur_frm.add_fetch("payment_gateway", "payment_url_message", "payment_url_message")
+cur_frm.add_fetch("payment_gateway", "payment_success_url", "payment_success_url")
+
+frappe.ui.form.on("Payment Request", "onload", function(frm, dt, dn){
+	if (frm.doc.reference_doctype) {
+		frappe.call({
+			method:"erpnext.accounts.doctype.payment_request.payment_request.get_print_format_list",
+			args: {"ref_doctype": frm.doc.reference_doctype},
+			callback:function(r){
+				set_field_options("print_format", r.message["print_format"])
+			}
+		})
+	}
+})
+
+frappe.ui.form.on("Payment Request", "refresh", function(frm) {
+	frm.add_custom_button(__('Resend Payment Email'), function(){
+		frappe.call({
+			method: "erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email",
+			args: {"docname": frm.doc.name},
+			freeze: true,
+			freeze_message: __("Sending"),
+			callback: function(r){
+				if(!r.exc) {
+					frappe.msgprint(__("Message Sent"));
+				}
+			}
+		});
+	});
+});
+
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
new file mode 100644
index 0000000..7655b58
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -0,0 +1,678 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "PR.######", 
+ "creation": "2015-12-15 22:23:24.745065", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "payment_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment Details", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "currency", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Currency", 
+   "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, 
+   "depends_on": "eval:doc.reference_doctype==\"Sales Order\"", 
+   "fieldname": "make_sales_invoice", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Make Sales Invoice", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Draft", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nDraft\nInitiated\nPaid\nFailed\nCancelled", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "payment_gateway", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment Gateway", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Gateway Account", 
+   "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, 
+   "fieldname": "payment_success_url", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment Success URL", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "gateway", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Gateway", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "payment_gateway.gateway", 
+   "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, 
+   "fieldname": "payment_account", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "payment_gateway.payment_account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "recipient_and_message", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Recipient and Message", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "", 
+   "fieldname": "print_format", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Print Format", 
+   "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": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "mute_email", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Mute Email", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "email_to", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Email To", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "subject", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Subject", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "message", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Message", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "payment_url_message", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment URL Message", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "payment_url", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "payment_url", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "reference_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Reference Details", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "reference_doctype", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Reference Doctype", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "reference_name", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Reference Name", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "reference_doctype", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Payment Request", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-01-11 05:49:28.342786", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Payment Request", 
+ "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": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "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": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
new file mode 100644
index 0000000..9e29697
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -0,0 +1,234 @@
+# -*- 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.model.document import Document
+from frappe.utils import flt, nowdate, get_url, cstr
+from erpnext.accounts.party import get_party_account
+from erpnext.accounts.utils import get_account_currency, get_balance_on
+from erpnext.accounts.doctype.journal_entry.journal_entry import (get_payment_entry_against_invoice, 
+get_payment_entry_against_order)
+
+from itertools import chain
+
+class PaymentRequest(Document):		
+	def validate(self):
+		self.validate_payment_gateway_account()
+		self.validate_payment_request()
+		self.validate_currency()
+
+	def validate_payment_request(self):
+		if frappe.db.get_value("Payment Request", {"reference_name": self.reference_name, 
+			"name": ("!=", self.name), "status": ("not in", ["Initiated", "Paid"]), "docstatus": 1}, "name"):
+			frappe.throw(_("Payment Request already exists {0}".fomart(self.reference_name)))
+	
+	def validate_currency(self):
+		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
+		if ref_doc.currency != frappe.db.get_value("Account", self.payment_account, "account_currency"):
+			frappe.throw(_("Transaction currency must be same as Payment Gateway currency"))
+			
+	def validate_payment_gateway_account(self):
+		if not self.payment_gateway:
+			frappe.throw(_("Payment Gateway Account is not configured"))
+			
+	def validate_payment_gateway(self):
+		if self.gateway == "PayPal":
+			if not frappe.db.get_value("PayPal Settings", None, "api_username"):
+				if not frappe.conf.paypal_username:
+					frappe.throw(_("PayPal Settings missing"))
+			
+	def on_submit(self):
+		if not self.mute_email:
+			self.send_payment_request()
+			self.send_email()
+
+		self.make_communication_entry()
+	
+	def on_cancel(self):
+		self.set_as_cancelled()
+		
+	def on_update_after_submit(self):
+		pass
+	
+	def set_status(self):
+		pass
+	
+	def get_payment_url(self):
+		pass
+	
+	def make_invoice(self):
+		if self.make_sales_invoice:
+			from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
+			si = make_sales_invoice(self.reference_name, ignore_permissions=True)
+			si = si.insert(ignore_permissions=True)
+			si.submit()
+	
+	def send_payment_request(self):
+		self.payment_url = get_url("/api/method/erpnext.accounts.doctype.payment_request.payment_request.generate_payment_request?name={0}".format(self.name))
+		if self.payment_url:
+			frappe.db.set_value(self.doctype, self.name, "status", "Initiated")
+			
+	def set_as_paid(self):
+		if frappe.session.user == "Guest":
+			frappe.set_user("Administrator")
+			
+		jv = self.create_journal_entry()
+		self.make_invoice()
+		
+		return jv
+		
+	def create_journal_entry(self):
+		"""create entry"""
+		payment_details = {
+			"amount": self.amount,
+			"journal_entry": True,
+			"bank_account": self.payment_account
+		}
+		
+		frappe.flags.ignore_account_permission = True
+				
+		if self.reference_doctype == "Sales Order":
+			jv = get_payment_entry_against_order(self.reference_doctype, self.reference_name,\
+			 amount=self.amount, journal_entry=True, bank_account=self.payment_account)
+			
+		if self.reference_doctype == "Sales Invoice":
+			jv = get_payment_entry_against_invoice(self.reference_doctype, self.reference_name,\
+			 amount=self.amount, journal_entry=True, bank_account=self.payment_account)
+			
+		jv.update({
+			"voucher_type": "Journal Entry",
+			"posting_date": nowdate()
+		})		
+		jv.insert(ignore_permissions=True)
+		jv.submit()
+		
+		#set status as paid for Payment Request
+		frappe.db.set_value(self.doctype, self.name, "status", "Paid")
+		
+		return jv
+		
+	def send_email(self):
+		"""send email with payment link"""
+		frappe.sendmail(recipients=self.email_to, sender=None, subject=self.subject,
+			message=self.get_message(), attachments=[frappe.attach_print(self.reference_doctype, 
+			self.reference_name, file_name=self.reference_name, print_format=self.print_format)])
+						
+	def get_message(self):
+		"""return message with payment gateway link"""
+		return  cstr(self.message) + " <a href='{0}'>{1}</a>".format(self.payment_url, \
+			self.payment_url_message or _(" Click here to pay"))
+		
+	def set_failed(self):
+		pass
+	
+	def set_as_cancelled(self):
+		frappe.db.set_value(self.doctype, self.name, "status", "Cancelled")
+	
+	def make_communication_entry(self):
+		"""Make communication entry"""
+		comm = frappe.get_doc({
+			"doctype":"Communication",
+			"subject": self.subject,
+			"content": self.get_message(),
+			"sent_or_received": "Sent",
+			"reference_doctype": self.reference_doctype,
+			"reference_name": self.reference_name
+		})
+		comm.insert(ignore_permissions=True)
+	
+	def get_payment_success_url(self):
+		return self.payment_success_url
+
+@frappe.whitelist(allow_guest=True)
+def make_payment_request(**args):
+	"""Make payment request"""
+	
+	args = frappe._dict(args)
+	ref_doc = frappe.get_doc(args.dt, args.dn)
+	gateway_account = get_gateway_details(args)
+	
+	pr = frappe.new_doc("Payment Request")
+	pr.update({
+		"payment_gateway": gateway_account.name,
+		"gateway": gateway_account.gateway,
+		"payment_account": gateway_account.payment_account,
+		"currency": ref_doc.currency,
+		"make_sales_invoice": args.cart or 0,
+		"amount": get_amount(ref_doc, args.dt),
+		"mute_email": args.mute_email or 0,
+		"email_to": args.recipient_id or "",
+		"subject": "Payment Request for %s"%args.dn,
+		"message": gateway_account.message,
+		"payment_url_message": gateway_account.payment_url_message,
+		"payment_success_url": gateway_account.payment_success_url,
+		"reference_doctype": args.dt,
+		"reference_name": args.dn
+	})
+	
+	if args.return_doc:
+		return pr
+		
+	if args.submit_doc:
+		pr.insert(ignore_permissions=True)
+		pr.submit()
+		
+		if args.cart:
+			generate_payment_request(pr.name)
+			frappe.db.commit()
+		
+		if not args.cart:	
+			return pr
+			
+	return pr.as_dict()
+
+def get_amount(ref_doc, dt):
+	"""get amount based on doctype"""
+	if dt == "Sales Order":
+		amount = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid)
+
+	if dt == "Sales Invoice":
+		amount = abs(ref_doc.outstanding_amount)
+	
+	if amount > 0:
+		return amount
+	else:
+		frappe.throw(_("Payment Entry is already created"))
+		
+def get_gateway_details(args):
+	"""return gateway and payment account of default payment gateway"""
+	if args.payemnt_gateway:
+		gateway_account = frappe.db.get_value("Payment Gateway Account", args.payemnt_gateway, 
+			["name", "gateway", "payment_account", "message", "payment_url_message", "payment_success_url"],
+			 as_dict=1)
+	
+	gateway_account = frappe.db.get_value("Payment Gateway Account", {"is_default": 1}, 
+		["name", "gateway", "payment_account", "message", "payment_url_message", "payment_success_url"], 
+			as_dict=1)
+	
+	if not gateway_account:
+		frappe.throw(_("Payment Gateway Account is not configured"))
+	
+	return gateway_account
+
+@frappe.whitelist()
+def get_print_format_list(ref_doctype):
+	print_format_list = ["Standard"]
+	
+	print_format_list.extend([p.name for p in frappe.get_all("Print Format", 
+		filters={"doc_type": ref_doctype})])
+	
+	return {
+		"print_format": print_format_list
+	}
+
+@frappe.whitelist(allow_guest=True)
+def generate_payment_request(name):
+	frappe.get_doc("Payment Request", name).run_method("get_payment_url")
+	
+@frappe.whitelist(allow_guest=True)
+def resend_payment_email(docname):
+	return frappe.get_doc("Payment Request", docname).send_email()
+		
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_request/payment_request_list.js b/erpnext/accounts/doctype/payment_request/payment_request_list.js
new file mode 100644
index 0000000..0caf1c2
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_request/payment_request_list.js
@@ -0,0 +1,17 @@
+frappe.listview_settings['Payment Request'] = {
+	add_fields: ["status"],
+	get_indicator: function(doc) {
+		if(doc.status == "Draft") {
+			return [__("Draft"), "darkgrey", "status,=,Draft"];
+		}
+		else if(doc.status == "Initiated") {
+			return [__("Initiated"), "green", "status,=,Initiated"];
+		}
+		else if(doc.status == "Paid") {
+			return [__("Paid"), "blue", "status,=,Paid"];
+		}
+		else if(doc.status == "Cancelled") {
+			return [__("Cancelled"), "orange", "status,=,Cancelled"];
+		}
+	}	
+}
diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py
new file mode 100644
index 0000000..a1e975a
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py
@@ -0,0 +1,79 @@
+# -*- 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.selling.doctype.sales_order.test_sales_order import make_sales_order
+from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request
+from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+# test_records = frappe.get_test_records('Payment Request')
+
+test_dependencies = ["Currency Exchange", "Journal Entry", "Contact", "Address"]
+
+payment_gateway = {
+	"doctype": "Payment Gateway",
+	"gateway": "_Test Gateway"
+}
+
+payment_method = [
+	{
+		"doctype": "Payment Gateway Account",
+		"is_default": 1,
+		"gateway": "_Test Gateway",
+		"payment_account": "_Test Bank - _TC",
+		"currency": "INR"
+	},
+	{
+		"doctype": "Payment Gateway Account",
+		"gateway": "_Test Gateway",
+		"payment_account": "_Test Bank - _TC",
+		"currency": "USD"
+	}
+]
+
+class TestPaymentRequest(unittest.TestCase):
+	def setUp(self):
+		if not frappe.db.get_value("Payment Gateway", payment_gateway["gateway"], "name"):
+			frappe.get_doc(payment_gateway).insert(ignore_permissions=True)
+			
+		for method in payment_method:
+			if not frappe.db.get_value("Payment Gateway Account", {"gateway": method["gateway"], 
+				"currency": method["currency"]}, "name"):
+				frappe.get_doc(method).insert(ignore_permissions=True)
+			
+	def test_payment_request_linkings(self):
+		SO_INR = make_sales_order(currency="INR")
+		pr = make_payment_request(dt="Sales Order", dn=SO_INR.name, recipient_id="saurabh@erpnext.com")
+		
+		self.assertEquals(pr.reference_doctype, "Sales Order")
+		self.assertEquals(pr.reference_name, SO_INR.name)
+		self.assertEquals(pr.currency, "INR")
+		
+		SI_USD = create_sales_invoice(currency="USD", conversion_rate=50)
+		pr = make_payment_request(dt="Sales Invoice", dn=SI_USD.name, recipient_id="saurabh@erpnext.com")
+
+		self.assertEquals(pr.reference_doctype, "Sales Invoice")
+		self.assertEquals(pr.reference_name, SI_USD.name)
+		self.assertEquals(pr.currency, "USD")
+	
+	def test_payment_entry(self):
+		SO_INR = make_sales_order(currency="INR")
+		pr = make_payment_request(dt="Sales Order", dn=SO_INR.name, recipient_id="saurabh@erpnext.com", 
+			mute_email=1, submit_doc=1)	 
+		jv = pr.set_as_paid()
+		
+		SO_INR = frappe.get_doc("Sales Order", SO_INR.name)
+		
+		self.assertEquals(SO_INR.advance_paid, jv.total_debit)
+		
+		SI_USD = create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC",
+			currency="USD", conversion_rate=50)
+
+		pr = make_payment_request(dt="Sales Invoice", dn=SI_USD.name, recipient_id="saurabh@erpnext.com",
+			mute_email=1, return_doc=1, payemnt_gateway="_Test Gateway - USD")
+		
+		self.assertRaises(frappe.ValidationError, pr.save)
+		
+		
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index a9c7ce7..eb77ae2 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -1,8 +1,8 @@
 {
  "allow_copy": 0, 
  "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "PRULE.#####", 
+ "allow_rename": 1, 
+ "autoname": "field:title", 
  "creation": "2014-02-21 15:02:51", 
  "custom": 0, 
  "docstatus": 0, 
@@ -24,6 +24,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -47,6 +48,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -71,6 +73,7 @@
    "options": "\nItem Code\nItem Group\nBrand", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -95,6 +98,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -119,6 +123,7 @@
    "options": "Brand", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -143,6 +148,7 @@
    "options": "Item Group", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -165,6 +171,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -189,6 +196,7 @@
    "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -211,6 +219,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -233,6 +242,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -255,6 +265,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -277,6 +288,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -299,6 +311,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -323,6 +336,7 @@
    "options": "\nCustomer\nCustomer Group\nTerritory\nSales Partner\nCampaign\nSupplier\nSupplier Type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -347,6 +361,7 @@
    "options": "Customer", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -371,6 +386,7 @@
    "options": "Customer Group", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -395,6 +411,7 @@
    "options": "Territory", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -419,6 +436,7 @@
    "options": "Sales Partner", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -443,6 +461,7 @@
    "options": "Campaign", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -467,6 +486,7 @@
    "options": "Supplier", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -491,6 +511,7 @@
    "options": "Supplier Type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -513,6 +534,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -535,6 +557,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -557,6 +580,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -579,6 +603,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -601,6 +626,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -624,6 +650,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -646,6 +673,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -667,6 +695,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -690,6 +719,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -712,6 +742,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -736,6 +767,7 @@
    "options": "\nPrice\nDiscount Percentage", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -757,6 +789,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -780,6 +813,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -803,6 +837,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -827,6 +862,7 @@
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -850,6 +886,7 @@
    "options": "Simple", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -872,6 +909,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -890,7 +928,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:51.958974", 
+ "modified": "2016-01-15 04:05:11.633824", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Pricing Rule", 
@@ -1001,5 +1039,5 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "title"
+ "title_field": ""
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index d835e76..fcc1f92 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -76,7 +76,7 @@
 def apply_pricing_rule(args):
 	"""
 		args = {
-			"item_list": [{"doctype": "", "name": "", "item_code": "", "brand": "", "item_group": ""}, ...],
+			"items": [{"doctype": "", "name": "", "item_code": "", "brand": "", "item_group": ""}, ...],
 			"customer": "something",
 			"customer_group": "something",
 			"territory": "something",
@@ -97,18 +97,17 @@
 		args = json.loads(args)
 
 	args = frappe._dict(args)
-
+	
+	if not args.transaction_type:
+		set_transaction_type(args)
+				
 	# list of dictionaries
 	out = []
 
-	if args.get("parenttype") == "Material Request": return out
+	if args.get("doctype") == "Material Request": return out
 
-	if not args.transaction_type:
-		args.transaction_type = "buying" if frappe.get_meta(args.parenttype).get_field("supplier") \
-			else "selling"
-
-	item_list = args.get("item_list")
-	args.pop("item_list")
+	item_list = args.get("items")
+	args.pop("items")
 
 	for item in item_list:
 		args_copy = copy.deepcopy(args)
@@ -138,13 +137,17 @@
 		if not args.item_group:
 			frappe.throw(_("Item Group not mentioned in item master for item {0}").format(args.item_code))
 
-	if args.customer and not (args.customer_group and args.territory):
-		customer = frappe.db.get_value("Customer", args.customer, ["customer_group", "territory"])
-		if customer:
-			args.customer_group, args.territory = customer
+	if args.transaction_type=="selling":
+		if args.customer and not (args.customer_group and args.territory):
+			customer = frappe.db.get_value("Customer", args.customer, ["customer_group", "territory"])
+			if customer:
+				args.customer_group, args.territory = customer
+				
+		args.supplier = args.supplier_type = None
 
 	elif args.supplier and not args.supplier_type:
 		args.supplier_type = frappe.db.get_value("Supplier", args.supplier, "supplier_type")
+		args.customer = args.customer_group = args.territory = None
 
 	pricing_rules = get_pricing_rules(args)
 	pricing_rule = filter_pricing_rules(args, pricing_rules)
@@ -184,9 +187,12 @@
 
 
 	conditions = ""
+	values =  {"item_code": args.get("item_code"), "brand": args.get("brand")}
+
 	for field in ["company", "customer", "supplier", "supplier_type", "campaign", "sales_partner"]:
 		if args.get(field):
 			conditions += " and ifnull("+field+", '') in (%("+field+")s, '')"
+			values[field] = args.get(field)
 		else:
 			conditions += " and ifnull("+field+", '') = ''"
 
@@ -194,12 +200,15 @@
 		group_condition = _get_tree_conditions(parenttype)
 		if group_condition:
 			conditions += " and " + group_condition
+
 	if not args.price_list: args.price_list = None
 	conditions += " and ifnull(for_price_list, '') in (%(price_list)s, '')"
+	values["price_list"] = args.get("price_list")
 
 	if args.get("transaction_date"):
 		conditions += """ and %(transaction_date)s between ifnull(valid_from, '2000-01-01')
 			and ifnull(valid_upto, '2500-12-31')"""
+		values['transaction_date'] = args.get('transaction_date')
 
 	item_group_condition = _get_tree_conditions("Item Group", False)
 	if item_group_condition: item_group_condition = " or " + item_group_condition
@@ -210,7 +219,8 @@
 			and {transaction_type} = 1 {conditions}
 		order by priority desc, name desc""".format(
 			item_group_condition=item_group_condition,
-			transaction_type=args.transaction_type, conditions=conditions), args, as_dict=1)
+			transaction_type= args.transaction_type,
+			conditions=conditions), values, as_dict=1)
 
 def filter_pricing_rules(args, pricing_rules):
 	# filter for qty
@@ -267,3 +277,14 @@
 			if filtered_rules: break
 
 	return filtered_rules or pricing_rules
+
+def set_transaction_type(args):
+	if args.doctype in ("Opportunity", "Quotation", "Sales Order", "Delivery Note", "Sales Invoice"):
+		args.transaction_type = "selling"
+	elif args.doctype in ("Material Request", "Supplier Quotation", "Purchase Order", 
+		"Purchase Receipt", "Purchase Invoice"):
+			args.transaction_type = "buying"
+	elif args.customer:
+		args.transaction_type = "selling"
+	else:
+		args.transaction_type = "buying"
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
index 2a43814..bdd7431 100644
--- a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
@@ -31,22 +31,22 @@
 			"company": "_Test Company",
 			"price_list": "_Test Price List",
 			"currency": "_Test Currency",
-			"parenttype": "Sales Order",
+			"doctype": "Sales Order",
 			"conversion_rate": 1,
 			"price_list_currency": "_Test Currency",
 			"plc_conversion_rate": 1,
 			"order_type": "Sales",
-			"transaction_type": "selling",
 			"customer": "_Test Customer",
-			"doctype": "Sales Order Item",
 			"name": None
 		})
 		details = get_item_details(args)
 		self.assertEquals(details.get("discount_percentage"), 10)
-
+		
 		prule = frappe.get_doc(test_record.copy())
 		prule.applicable_for = "Customer"
+		prule.title = "_Test Pricing Rule for Customer"
 		self.assertRaises(MandatoryError, prule.insert)
+		
 		prule.customer = "_Test Customer"
 		prule.discount_percentage = 20
 		prule.insert()
@@ -56,16 +56,18 @@
 		prule = frappe.get_doc(test_record.copy())
 		prule.apply_on = "Item Group"
 		prule.item_group = "All Item Groups"
+		prule.title = "_Test Pricing Rule for Item Group"
 		prule.discount_percentage = 15
 		prule.insert()
-
-		args.customer = None
+		
+		args.customer = "_Test Customer 1"
 		details = get_item_details(args)
 		self.assertEquals(details.get("discount_percentage"), 10)
 
 		prule = frappe.get_doc(test_record.copy())
 		prule.applicable_for = "Campaign"
 		prule.campaign = "_Test Campaign"
+		prule.title = "_Test Pricing Rule for Campaign"
 		prule.discount_percentage = 5
 		prule.priority = 8
 		prule.insert()
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 6eb29fa..d3a72d6 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -25,13 +25,14 @@
 		if(!doc.is_return) {
 			if(doc.docstatus==1) {
 				if(doc.outstanding_amount != 0) {
-					this.frm.add_custom_button(__('Payment'), this.make_bank_entry).addClass("btn-primary");
+					this.frm.add_custom_button(__('Payment'), this.make_bank_entry, __("Make"));
+					cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 				}
-				cur_frm.add_custom_button(__('Debit Note'), this.make_debit_note);
+				cur_frm.add_custom_button(__('Debit Note'), this.make_debit_note, __("Make"));
 			}
 
 			if(doc.docstatus===0) {
-				cur_frm.add_custom_button(__('From Purchase Order'), function() {
+				cur_frm.add_custom_button(__('Purchase Order'), function() {
 					frappe.model.map_current_doc({
 						method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice",
 						source_doctype: "Purchase Order",
@@ -43,9 +44,9 @@
 							company: cur_frm.doc.company
 						}
 					})
-				});
+				}, __("Get items from"));
 
-				cur_frm.add_custom_button(__('From Purchase Receipt'), function() {
+				cur_frm.add_custom_button(__('Purchase Receipt'), function() {
 					frappe.model.map_current_doc({
 						method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice",
 						source_doctype: "Purchase Receipt",
@@ -56,7 +57,7 @@
 							company: cur_frm.doc.company
 						}
 					})
-				});
+				}, __("Get items from"));
 			}
 		}
 	},
@@ -76,7 +77,7 @@
 			me.apply_pricing_rule();
 		})
 	},
-	
+
 	credit_to: function() {
 		var me = this;
 		if(this.frm.doc.credit_to) {
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 3ed1939..92fee00 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1157,6 +1157,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "base_discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "column_break_46", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1180,6 +1205,30 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "discount_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1205,31 +1254,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "base_discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 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, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "section_break_49", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2463,7 +2487,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2015-12-01 00:49:02.736868", 
+ "modified": "2015-12-17 16:18:58.177334", 
  "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 d916b61..5d91426 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -11,6 +11,7 @@
 from erpnext.controllers.buying_controller import BuyingController
 from erpnext.accounts.party import get_party_account, get_due_date
 from erpnext.accounts.utils import get_account_currency
+from erpnext.stock.doctype.purchase_receipt.purchase_receipt import update_billed_amount_based_on_po
 
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
@@ -150,14 +151,14 @@
 		against_accounts = []
 		stock_items = self.get_stock_items()
 		for item in self.get("items"):
-			# in case of auto inventory accounting, 
+			# in case of auto inventory accounting,
 			# against expense account is always "Stock Received But Not Billed"
 			# for a stock item and if not epening entry and not drop-ship entry
-			
+
 			if auto_accounting_for_stock and item.item_code in stock_items \
-				and self.is_opening == 'No' and (not item.po_detail or 
+				and self.is_opening == 'No' and (not item.po_detail or
 					not frappe.db.get_value("Purchase Order Item", item.po_detail, "delivered_by_supplier")):
-				
+
 				item.expense_account = stock_not_billed_account
 				item.cost_center = None
 
@@ -246,6 +247,7 @@
 			self.update_against_document_in_jv()
 			self.update_prevdoc_status()
 			self.update_billing_status_for_zero_amount_refdoc("Purchase Order")
+			self.update_billing_status_in_pr()
 
 		self.update_project()
 
@@ -259,15 +261,19 @@
 		gl_entries = []
 
 		# parent's gl entry
-		if self.base_grand_total:
+		if self.grand_total:
+			# Didnot use base_grand_total to book rounding loss gle
+			grand_total_in_company_currency = flt(self.grand_total * self.conversion_rate, 
+				self.precision("grand_total"))
+			
 			gl_entries.append(
 				self.get_gl_dict({
 					"account": self.credit_to,
 					"party_type": "Supplier",
 					"party": self.supplier,
 					"against": self.against_expense_account,
-					"credit": self.base_grand_total,
-					"credit_in_account_currency": self.base_grand_total \
+					"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,
 					"against_voucher": self.return_against if cint(self.is_return) else self.name,
 					"against_voucher_type": self.doctype,
@@ -407,6 +413,8 @@
 
 			self.update_prevdoc_status()
 			self.update_billing_status_for_zero_amount_refdoc("Purchase Order")
+			self.update_billing_status_in_pr()
+
 		self.make_gl_entries_on_cancel()
 		self.update_project()
 
@@ -431,6 +439,21 @@
 				if pi:
 					frappe.throw("Supplier Invoice No exists in Purchase Invoice {0}".format(pi))
 
+	def update_billing_status_in_pr(self, update_modified=True):
+		updated_pr = []
+		for d in self.get("items"):
+			if d.pr_detail:
+				billed_amt = frappe.db.sql("""select sum(amount) from `tabPurchase Invoice Item`
+					where pr_detail=%s and docstatus=1""", d.pr_detail)
+				billed_amt = billed_amt and billed_amt[0][0] or 0
+				frappe.db.set_value("Purchase Receipt Item", d.pr_detail, "billed_amt", billed_amt, update_modified=update_modified)
+				updated_pr.append(d.purchase_receipt)
+			elif d.po_detail:
+				updated_pr += update_billed_amount_based_on_po(d.po_detail, update_modified)
+
+		for pr in set(updated_pr):
+			frappe.get_doc("Purchase Receipt", pr).update_billing_percentage(update_modified=update_modified)
+
 @frappe.whitelist()
 def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
 	from erpnext.controllers.queries import get_match_cond
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 1b541cf..1725b7e 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -50,15 +50,16 @@
 		if(doc.update_stock) this.show_stock_ledger();
 
 		if(doc.docstatus==1 && !doc.is_return) {
-			
+
 			var is_delivered_by_supplier = false;
-			
+
 			is_delivered_by_supplier = cur_frm.doc.items.some(function(item){
 				return item.is_delivered_by_supplier ? true : false;
 			})
-			
+
 			cur_frm.add_custom_button(doc.update_stock ? __('Sales Return') : __('Credit Note'),
-				this.make_sales_return);
+				this.make_sales_return, __("Make"));
+			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 
 			if(cint(doc.update_stock)!=1) {
 				// show Make Delivery Note button only if Sales Invoice is not created from Delivery Note
@@ -69,12 +70,13 @@
 					});
 
 				if(!from_delivery_note && !is_delivered_by_supplier) {
-					cur_frm.add_custom_button(__('Delivery'), cur_frm.cscript['Make Delivery Note']).addClass("btn-primary");
+					cur_frm.add_custom_button(__('Delivery'), cur_frm.cscript['Delivery Note'], __("Make"));
 				}
 			}
 
 			if(doc.outstanding_amount!=0 && !cint(doc.is_return)) {
-				cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry).addClass("btn-primary");
+				cur_frm.add_custom_button(__('Payment Request'), this.make_payment_request, __("Make"));
+				cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry, __("Make"));
 			}
 
 		}
@@ -104,7 +106,7 @@
 	},
 
 	sales_order_btn: function() {
-		this.$sales_order_btn = cur_frm.add_custom_button(__('From Sales Order'),
+		this.$sales_order_btn = cur_frm.add_custom_button(__('Sales Order'),
 			function() {
 				frappe.model.map_current_doc({
 					method: "erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice",
@@ -117,11 +119,11 @@
 						company: cur_frm.doc.company
 					}
 				})
-			});
+			}, __("Get items from"));
 	},
 
 	delivery_note_btn: function() {
-		this.$delivery_note_btn = cur_frm.add_custom_button(__('From Delivery Note'),
+		this.$delivery_note_btn = cur_frm.add_custom_button(__('Delivery Note'),
 			function() {
 				frappe.model.map_current_doc({
 					method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice",
@@ -137,7 +139,7 @@
 						};
 					}
 				});
-			});
+			}, __("Get items from"));
 	},
 
 	tc_name: function() {
@@ -435,9 +437,11 @@
 	})
 
 	if(cur_frm.doc.is_pos) {
-		cur_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" href="#Form/Sales Invoice/New Sales Invoice">New</a>');
+		cur_frm.msgbox = frappe.msgprint(format('<a class="btn btn-primary" \
+			onclick="cur_frm.print_preview.printit(true)" style="margin-right: 5px;">{0}</a>\
+			<a class="btn btn-default" href="javascript:new_doc(cur_frm.doctype);">{1}</a>', [
+			__('Print'), __('New')
+		]));
 
 	} else if(cint(frappe.boot.notification_settings.sales_invoice)) {
 		cur_frm.email_doc(frappe.boot.notification_settings.sales_invoice_message);
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 6705979..9106891 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -26,6 +26,7 @@
    "options": "icon-user", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -50,6 +51,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -75,6 +77,7 @@
    "options": "SINV-\nSINV-RET-", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -100,6 +103,7 @@
    "options": "Customer", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -125,6 +129,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -147,6 +152,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -169,6 +175,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -191,6 +198,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -213,6 +221,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -237,6 +246,7 @@
    "oldfieldtype": "Check", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -261,6 +271,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -283,6 +294,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -308,6 +320,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -332,6 +345,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -357,6 +371,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -382,6 +397,7 @@
    "options": "Sales Invoice", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -407,6 +423,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -431,6 +448,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -454,6 +472,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -477,6 +496,7 @@
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -502,6 +522,7 @@
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -528,6 +549,7 @@
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -549,6 +571,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -575,6 +598,7 @@
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -598,6 +622,7 @@
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -622,6 +647,7 @@
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -644,6 +670,7 @@
    "no_copy": 1, 
    "permlevel": 1, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -668,6 +695,7 @@
    "options": "icon-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -692,6 +720,7 @@
    "oldfieldtype": "Check", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -717,6 +746,7 @@
    "options": "Sales Invoice Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -740,6 +770,7 @@
    "options": "icon-suitcase", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -763,6 +794,7 @@
    "options": "Packed Item", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -785,6 +817,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -806,6 +839,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -830,6 +864,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -855,6 +890,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -876,6 +912,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -900,6 +937,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -923,6 +961,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -947,6 +986,7 @@
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -972,6 +1012,7 @@
    "options": "Sales Taxes and Charges Template", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -993,6 +1034,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1017,6 +1059,7 @@
    "options": "Shipping Rule", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1038,6 +1081,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1063,6 +1107,7 @@
    "options": "Sales Taxes and Charges", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1086,6 +1131,7 @@
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1107,6 +1153,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1132,6 +1179,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1154,6 +1202,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1177,6 +1226,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1201,6 +1251,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1226,50 +1277,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
-   "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, 
-   "fieldname": "column_break_51", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 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, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1294,6 +1302,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1305,6 +1314,76 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "column_break_51", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "totals", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1318,6 +1397,7 @@
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1343,6 +1423,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1368,6 +1449,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1393,6 +1475,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1415,6 +1498,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1441,6 +1525,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1466,6 +1551,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1490,6 +1576,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1515,6 +1602,7 @@
    "options": "party_account_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1540,6 +1628,7 @@
    "options": "party_account_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1565,6 +1654,7 @@
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1589,6 +1679,7 @@
    "options": "get_advances", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1614,6 +1705,7 @@
    "options": "Sales Invoice Advance", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1639,6 +1731,7 @@
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1664,6 +1757,7 @@
    "options": "Mode of Payment", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1690,6 +1784,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1712,6 +1807,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1739,6 +1835,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1763,6 +1860,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1787,6 +1885,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1812,6 +1911,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1836,6 +1936,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1859,6 +1960,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1882,6 +1984,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1906,6 +2009,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1930,6 +2034,7 @@
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1955,6 +2060,7 @@
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1980,6 +2086,7 @@
    "options": "Terms and Conditions", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2004,6 +2111,7 @@
    "oldfieldtype": "Text Editor", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2027,6 +2135,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2052,6 +2161,7 @@
    "options": "Letter Head", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2074,6 +2184,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2099,6 +2210,7 @@
    "options": "Print Heading", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -2123,6 +2235,7 @@
    "options": "icon-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2148,6 +2261,7 @@
    "options": "Project", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2172,6 +2286,7 @@
    "options": "Territory", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -2196,6 +2311,7 @@
    "options": "Customer Group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2217,6 +2333,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2241,6 +2358,7 @@
    "options": "Address", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2264,6 +2382,7 @@
    "options": "Contact", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2290,6 +2409,7 @@
    "options": "Campaign", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2315,6 +2435,7 @@
    "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2339,6 +2460,7 @@
    "options": "icon-file-text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2365,6 +2487,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -2389,6 +2512,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2416,6 +2540,7 @@
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2439,6 +2564,7 @@
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2462,6 +2588,7 @@
    "options": "C-Form", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2484,6 +2611,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2508,6 +2636,7 @@
    "oldfieldtype": "Time", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2533,6 +2662,7 @@
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -2557,6 +2687,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2582,6 +2713,7 @@
    "options": "icon-group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2607,6 +2739,7 @@
    "options": "Sales Partner", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2629,6 +2762,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2654,6 +2788,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2679,6 +2814,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2702,6 +2838,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2727,6 +2864,7 @@
    "options": "Sales Team", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2752,6 +2890,7 @@
    "options": "icon-time", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2773,6 +2912,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2798,6 +2938,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2823,6 +2964,7 @@
    "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2847,6 +2989,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2871,6 +3014,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2895,6 +3039,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2919,6 +3064,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2940,6 +3086,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2965,6 +3112,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2989,6 +3137,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -3013,6 +3162,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -3038,6 +3188,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -3062,6 +3213,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -3080,7 +3232,8 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:55.906783", 
+ "menu_index": 0, 
+ "modified": "2015-12-17 16:19:15.963267", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice", 
@@ -3172,5 +3325,6 @@
  "search_fields": "posting_date, due_date, customer, fiscal_year, base_grand_total, outstanding_amount", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "title"
+ "title_field": "title", 
+ "version": 0
 }
\ 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 7ad50d5..e87794a 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -12,6 +12,7 @@
 
 from erpnext.controllers.selling_controller import SellingController
 from erpnext.accounts.utils import get_account_currency
+from erpnext.stock.doctype.delivery_note.delivery_note import update_billed_amount_based_on_so
 
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
@@ -98,6 +99,7 @@
 
 		self.update_status_updater_args()
 		self.update_prevdoc_status()
+		self.update_billing_status_in_dn()
 
 		# this sequence because outstanding may get -ve
 		self.make_gl_entries()
@@ -111,6 +113,7 @@
 
 		self.update_time_log_batch(self.name)
 
+
 	def before_cancel(self):
 		self.update_time_log_batch(None)
 
@@ -129,6 +132,7 @@
 
 		self.update_status_updater_args()
 		self.update_prevdoc_status()
+		self.update_billing_status_in_dn()
 
 		if not self.is_return:
 			self.update_billing_status_for_zero_amount_refdoc("Sales Order")
@@ -296,6 +300,9 @@
 		account = frappe.db.get_value("Account", self.debit_to,
 			["account_type", "report_type", "account_currency"], as_dict=True)
 
+		if not account:
+			frappe.throw(_("Debit To is required"))
+
 		if account.report_type != "Balance Sheet":
 			frappe.throw(_("Debit To account must be a Balance Sheet account"))
 
@@ -381,7 +388,7 @@
 
 	def validate_warehouse(self):
 		super(SalesInvoice, self).validate_warehouse()
-		
+
 		for d in self.get('items'):
 			if not d.warehouse:
 				frappe.throw(_("Warehouse required at Row No {0}").format(d.idx))
@@ -410,7 +417,7 @@
 		if self.c_form_applicable == 'Yes' and self.c_form_no:
 			msgprint(_("Please remove this Invoice {0} from C-Form {1}")
 				.format(self.name, self.c_form_no), raise_exception = 1)
-	
+
 	def validate_dropship_item(self):
 		for item in self.items:
 			if item.sales_order:
@@ -524,14 +531,18 @@
 
 	def make_customer_gl_entry(self, gl_entries):
 		if self.grand_total:
+			# Didnot use base_grand_total to book rounding loss gle
+			grand_total_in_company_currency = flt(self.grand_total * self.conversion_rate, 
+				self.precision("grand_total"))
+				
 			gl_entries.append(
 				self.get_gl_dict({
 					"account": self.debit_to,
 					"party_type": "Customer",
 					"party": self.customer,
 					"against": self.against_income_account,
-					"debit": self.base_grand_total,
-					"debit_in_account_currency": self.base_grand_total \
+					"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,
 					"against_voucher": self.return_against if cint(self.is_return) else self.name,
 					"against_voucher_type": self.doctype
@@ -630,6 +641,21 @@
 				}, write_off_account_currency)
 			)
 
+	def update_billing_status_in_dn(self, update_modified=True):
+		updated_delivery_notes = []
+		for d in self.get("items"):
+			if d.dn_detail:
+				billed_amt = frappe.db.sql("""select sum(amount) from `tabSales Invoice Item`
+					where dn_detail=%s and docstatus=1""", d.dn_detail)
+				billed_amt = billed_amt and billed_amt[0][0] or 0
+				frappe.db.set_value("Delivery Note Item", d.dn_detail, "billed_amt", billed_amt, update_modified=update_modified)
+				updated_delivery_notes.append(d.delivery_note)
+			elif d.so_detail:
+				updated_delivery_notes += update_billed_amount_based_on_so(d.so_detail, update_modified)
+
+		for dn in set(updated_delivery_notes):
+			frappe.get_doc("Delivery Note", dn).update_billing_percentage(update_modified=update_modified)
+
 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_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index 51e2ebc..8e9be7e 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -23,6 +23,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -48,6 +49,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -69,6 +71,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -93,6 +96,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -115,6 +119,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -138,6 +143,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -162,6 +168,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -186,6 +193,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -210,6 +218,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -233,6 +242,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -255,6 +265,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -279,6 +290,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -304,6 +316,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -329,6 +342,7 @@
    "oldfieldtype": "Float", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -350,6 +364,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -373,6 +388,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -398,6 +414,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -419,6 +436,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -444,6 +462,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -469,6 +488,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -490,6 +510,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -515,6 +536,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -540,6 +562,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -563,6 +586,7 @@
    "options": "Pricing Rule", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -585,6 +609,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -609,6 +634,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -633,6 +659,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -655,6 +682,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -679,6 +707,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -703,6 +732,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -727,6 +757,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -750,6 +781,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -772,6 +804,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -797,6 +830,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -822,6 +856,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -844,6 +879,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -870,6 +906,7 @@
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -895,6 +932,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -920,6 +958,7 @@
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -944,6 +983,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -968,6 +1008,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -991,6 +1032,7 @@
    "options": "Batch", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1017,6 +1059,7 @@
    "options": "Item Group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1041,6 +1084,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1065,6 +1109,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1086,6 +1131,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1109,6 +1155,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1135,6 +1182,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1158,6 +1206,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1181,6 +1230,7 @@
    "options": "Time Log Batch", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1197,7 +1247,7 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Sales Order", 
    "length": 0, 
    "no_copy": 1, 
@@ -1206,6 +1256,7 @@
    "options": "Sales Order", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1230,6 +1281,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1252,6 +1304,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1277,6 +1330,7 @@
    "options": "Delivery Note", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1301,6 +1355,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1325,6 +1380,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1347,6 +1403,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1369,6 +1426,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -1386,7 +1444,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:56.335017", 
+ "modified": "2016-01-06 02:23:06.432442", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Item", 
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 49a7bd0..6488288 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -141,6 +141,8 @@
 
 	round_off_gle.update({
 		"account": round_off_account,
+		"debit_in_account_currency": abs(debit_credit_diff) if debit_credit_diff < 0 else 0,
+		"credit_in_account_currency": debit_credit_diff if debit_credit_diff > 0 else 0,
 		"debit": abs(debit_credit_diff) if debit_credit_diff < 0 else 0,
 		"credit": debit_credit_diff if debit_credit_diff > 0 else 0,
 		"cost_center": round_off_cost_center,
diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js
index c60713a..f1e3f16 100644
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.js
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js
@@ -66,7 +66,7 @@
 			$.each(r.message, function(i, v) {
 				$('<option>').html(v).attr('value', v).appendTo(wrapper.$company_select);
 			});
-			wrapper.$company_select.val(frappe.defaults.get_user_default("company") || r.message[0]).change();
+			wrapper.$company_select.val(frappe.defaults.get_user_default("Company") || r.message[0]).change();
 		}
 	});
 }
diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js
index 9034f3e..a228c43 100644
--- a/erpnext/accounts/report/accounts_payable/accounts_payable.js
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js
@@ -8,7 +8,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"supplier",
diff --git a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
index 9e4c906..b01c8bc 100644
--- a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
+++ b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
@@ -8,7 +8,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"supplier",
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
index d400527..3816c6f 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
@@ -8,7 +8,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"customer",
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 89fc52c..39fe5c4 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -68,6 +68,7 @@
 				"label": _("Currency"),
 				"fieldtype": "Data",
 				"width": 100,
+				"hidden": 1
 			},
 			_("Remarks") + "::200"
 		]
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
index b52c2cf..0fe6bc6 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
@@ -8,7 +8,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"customer",
diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.py b/erpnext/accounts/report/balance_sheet/balance_sheet.py
index 65d429c..0a2a9e3 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.py
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.py
@@ -13,7 +13,8 @@
 	asset = get_data(filters.company, "Asset", "Debit", period_list)
 	liability = get_data(filters.company, "Liability", "Credit", period_list)
 	equity = get_data(filters.company, "Equity", "Credit", period_list)
-	provisional_profit_loss = get_provisional_profit_loss(asset, liability, equity, period_list)
+	provisional_profit_loss = get_provisional_profit_loss(asset, liability, equity, 
+		period_list, filters.company)
 
 	data = []
 	data.extend(asset or [])
@@ -26,12 +27,13 @@
 
 	return columns, data
 
-def get_provisional_profit_loss(asset, liability, equity, period_list):
+def get_provisional_profit_loss(asset, liability, equity, period_list, company):
 	if asset and (liability or equity):
 		provisional_profit_loss = {
 			"account_name": "'" + _("Provisional Profit / Loss (Credit)") + "'",
 			"account": None,
-			"warn_if_negative": True
+			"warn_if_negative": True,
+			"currency": frappe.db.get_value("Company", company, "default_currency")
 		}
 
 		has_value = False
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
index ee77085..dd1609a 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
@@ -1,8 +1,8 @@
-<div style="margin-bottom: 7px;" class="text-center">
+<div style="margin-bottom: 7px;">
 	{%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %}
 </div>
 <h2 class="text-center">{%= __("Bank Reconciliation Statement") %}</h2>
-<h4 class="text-center">{%= filters.account %}</h4>
+<h4 class="text-center">{%= filters.account && (filters.account + ", "+filters.report_date)  || "" %} {%= filters.company %}</h4>
 <hr>
 <table class="table table-bordered">
 	<thead>
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
index 6ff1eea..581a7c8 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
@@ -39,18 +39,18 @@
 		+ amounts_not_reflected_in_system
 
 	data += [
-		get_balance_row(_("System Balance"), balance_as_per_system, account_currency),
+		get_balance_row(_("Bank Statement balance as per General Ledger"), balance_as_per_system, account_currency),
 		{},
 		{
-			"journal_entry": '"' + _("Amounts not reflected in bank") + '"',
+			"journal_entry": _("Outstanding Cheques and Deposits to clear"),
 			"debit": total_debit,
 			"credit": total_credit,
 			"account_currency": account_currency
 		},
-		get_balance_row(_("Amounts not reflected in system"), amounts_not_reflected_in_system, 
+		get_balance_row(_("Cheques and Deposits incorrectly cleared"), amounts_not_reflected_in_system, 
 			account_currency),
 		{},
-		get_balance_row(_("Expected balance as per bank"), bank_bal, account_currency)
+		get_balance_row(_("Calculated Bank Statement balance"), bank_bal, account_currency)
 	]
 
 	return columns, data
@@ -129,22 +129,22 @@
 			and jvd.account = %(account)s and jv.posting_date <= %(report_date)s
 			and ifnull(jv.clearance_date, '4000-01-01') > %(report_date)s
 			and ifnull(jv.is_opening, 'No') = 'No'
-		order by jv.name DESC""", filters, as_dict=1)
+		order by jv.posting_date DESC,jv.name DESC""", filters, as_dict=1)
 
 	return entries
 
 def get_balance_row(label, amount, account_currency):
 	if amount > 0:
 		return {
-			"journal_entry": '"' + label + '"',
+			"journal_entry": label,
 			"debit": amount,
 			"credit": 0,
 			"account_currency": account_currency
 		}
 	else:
 		return {
-			"journal_entry": '"' + label + '"',
+			"journal_entry": label,
 			"debit": 0,
 			"credit": abs(amount),
 			"account_currency": account_currency
-		}
\ No newline at end of file
+		}
diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
index 27745a0..a58b8f2 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
@@ -14,7 +14,12 @@
 			fieldname: "period",
 			label: __("Period"),
 			fieldtype: "Select",
-			options: "Monthly\nQuarterly\nHalf-Yearly\nYearly",
+			options: [
+				{ "value": "Monthly", "label": __("Monthly") },
+				{ "value": "Quarterly", "label": __("Quarterly") },
+				{ "value": "Half-Yearly", "label": __("Half-Yearly") },
+				{ "value": "Yearly", "label": __("Yearly") }
+			],
 			default: "Monthly"
 		},
 		{
@@ -22,7 +27,7 @@
 			label: __("Company"),
 			fieldtype: "Link",
 			options: "Company",
-			default: frappe.defaults.get_user_default("company")
+			default: frappe.defaults.get_user_default("Company")
 		},
 	]
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.py b/erpnext/accounts/report/cash_flow/cash_flow.py
index 3e5efea..1fda16a 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -2,71 +2,138 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
+import frappe
 from frappe import _
-from erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data, get_data_account_type, add_total_row_account)
+from erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data)
 from erpnext.accounts.report.profit_and_loss_statement.profit_and_loss_statement import get_net_profit_loss
 
 
 def execute(filters=None):
-    period_list = get_period_list(filters.fiscal_year, filters.periodicity)
+	period_list = get_period_list(filters.fiscal_year, filters.periodicity)
 
-    operation_accounts = {"section_name": "Operations",
-                          "section_footer": _("Net Cash from Operations"),
-                          "section_header": _("Cash Flow from Operations"),
-                          "account_types": [{"account_type": "Depreciation", "label": _("Depreciation")},
-                                            {"account_type": "Receivable", "label": _("Net Change in Accounts Receivable")},
-                                            {"account_type": "Payable", "label": _("Net Change in Accounts Payable")},
-                                            {"account_type": "Warehouse", "label": _("Net Change in Inventory")}]}
+	operation_accounts = {
+		"section_name": "Operations",
+		"section_footer": _("Net Cash from Operations"),
+		"section_header": _("Cash Flow from Operations"),
+		"account_types": [
+			{"account_type": "Depreciation", "label": _("Depreciation")},
+			{"account_type": "Receivable", "label": _("Net Change in Accounts Receivable")},
+			{"account_type": "Payable", "label": _("Net Change in Accounts Payable")},
+			{"account_type": "Warehouse", "label": _("Net Change in Inventory")}
+		]
+	}
 
-    investing_accounts = {"section_name": "Investing",
-                          "section_footer": _("Net Cash from Investing"),
-                          "section_header": _("Cash Flow from Investing"),
-                          "account_types": [{"account_type": "Fixed Asset", "label": _("Net Change in Fixed Asset")},
-                                            ]}
+	investing_accounts = {
+		"section_name": "Investing",
+		"section_footer": _("Net Cash from Investing"),
+		"section_header": _("Cash Flow from Investing"),
+		"account_types": [
+			{"account_type": "Fixed Asset", "label": _("Net Change in Fixed Asset")}
+		]
+	}
 
-    financing_accounts = {"section_name": "Financing",
-                          "section_footer": _("Net Cash from Financing"),
-                          "section_header": _("Cash Flow from Financing"),
-                          "account_types": [{"account_type": "Equity", "label": _("Net Change in Equity")},
-                                            ]}
+	financing_accounts = {
+		"section_name": "Financing",
+		"section_footer": _("Net Cash from Financing"),
+		"section_header": _("Cash Flow from Financing"),
+		"account_types": [
+			{"account_type": "Equity", "label": _("Net Change in Equity")}
+		]
+	}
 
-    # combine all cash flow accounts for iteration
-    cash_flow_accounts = []
-    cash_flow_accounts.append(operation_accounts)
-    cash_flow_accounts.append(investing_accounts)
-    cash_flow_accounts.append(financing_accounts)
+	# combine all cash flow accounts for iteration
+	cash_flow_accounts = []
+	cash_flow_accounts.append(operation_accounts)
+	cash_flow_accounts.append(investing_accounts)
+	cash_flow_accounts.append(financing_accounts)
 
-    # compute net income
-    income = get_data(filters.company, "Income", "Credit", period_list, ignore_closing_entries=True)
-    expense = get_data(filters.company, "Expense", "Debit", period_list, ignore_closing_entries=True)
-    net_profit_loss = get_net_profit_loss(income, expense, period_list)
+	# compute net profit / loss
+	income = get_data(filters.company, "Income", "Credit", period_list, ignore_closing_entries=True)
+	expense = get_data(filters.company, "Expense", "Debit", period_list, ignore_closing_entries=True)
+	net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company)
 
-    data = []
+	data = []
 
-    for cash_flow_account in cash_flow_accounts:
+	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+	
+	for cash_flow_account in cash_flow_accounts:
 
-        section_data = []
-        value = {"account_name": cash_flow_account['section_header'], "parent_account": None,
-                 "indent": 0.0, "account": cash_flow_account['section_header']}
-        data.append(value)
+		section_data = []
+		data.append({
+			"account_name": cash_flow_account['section_header'], 
+			"parent_account": None,
+			"indent": 0.0, 
+			"account": cash_flow_account['section_header']
+		})
 
-        if len(data) == 1:
-            # add first net income in operations section
-            if net_profit_loss:
-                net_profit_loss.update({"indent": 1, "parent_account": operation_accounts['section_header']})
-                data.append(net_profit_loss)
-                section_data.append(net_profit_loss)
+		if len(data) == 1:
+			# add first net income in operations section
+			if net_profit_loss:
+				net_profit_loss.update({
+					"indent": 1, 
+					"parent_account": operation_accounts['section_header']
+				})
+				data.append(net_profit_loss)
+				section_data.append(net_profit_loss)
 
-        for account in cash_flow_account['account_types']:
-            account_data = get_data_account_type(filters.company, account['account_type'], period_list)
-            account_data.update({"account_name": account['label'], "indent": 1,
-                                 "parent_account": cash_flow_account['section_header']})
-            data.append(account_data)
-            section_data.append(account_data)
+		for account in cash_flow_account['account_types']:
+			account_data = get_account_type_based_data(filters.company, account['account_type'], period_list)
+			account_data.update({
+				"account_name": account['label'], 
+				"indent": 1,
+				"parent_account": cash_flow_account['section_header'],
+				"currency": company_currency
+			})
+			data.append(account_data)
+			section_data.append(account_data)
 
-        add_total_row_account(data, section_data, cash_flow_account['section_footer'], period_list)
+		add_total_row_account(data, section_data, cash_flow_account['section_footer'], 
+			period_list, company_currency)
 
-    add_total_row_account(data, data, _("Net Change in Cash"), period_list)
-    columns = get_columns(period_list)
+	add_total_row_account(data, data, _("Net Change in Cash"), period_list, company_currency)
+	columns = get_columns(period_list)
 
-    return columns, data
+	return columns, data
+
+
+def get_account_type_based_data(company, account_type, period_list):
+	data = {}
+	for period in period_list:
+		gl_sum = frappe.db.sql_list("""
+			select sum(credit) - sum(debit)
+			from `tabGL Entry`
+			where company=%s and posting_date >= %s and posting_date <= %s 
+				and voucher_type != 'Period Closing Voucher'
+				and account in ( SELECT name FROM tabAccount WHERE account_type = %s)
+		""", (company, period['from_date'], period['to_date'], account_type))
+		
+		if gl_sum and gl_sum[0]:
+			amount = gl_sum[0]
+			if account_type == "Depreciation":
+				amount *= -1
+		else:
+			amount = 0
+		
+		data.update({
+			"from_date": period['from_date'], 
+			"to_date": period['to_date'], 
+			period["key"]: amount
+		})
+	return data
+
+
+def add_total_row_account(out, data, label, period_list, currency):
+	total_row = {
+		"account_name": "'" + _("{0}").format(label) + "'",
+		"account": None,
+		"currency": currency
+	}
+
+	for row in data:
+		if row.get("parent_account"):
+			for period in period_list:
+				total_row.setdefault(period.key, 0.0)
+				total_row[period.key] += row.get(period.key, 0.0)
+
+	out.append(total_row)
+	out.append({})
\ No newline at end of file
diff --git a/erpnext/accounts/report/financial_statements.html b/erpnext/accounts/report/financial_statements.html
index c086944..84cad16 100644
--- a/erpnext/accounts/report/financial_statements.html
+++ b/erpnext/accounts/report/financial_statements.html
@@ -45,7 +45,7 @@
 					<td class="text-right">
 						{% var fieldname = report.columns[i].field; %}
 						{% if (!is_null(row[fieldname])) { %}
-							{%= format_currency(row[fieldname]) %}
+							{%= format_currency(row[fieldname], row.currency) %}
 						{% } %}
 					</td>
 				{% } %}
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index c6a7ab5..f15b734 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -80,6 +80,8 @@
 		return None
 
 	accounts, accounts_by_name = filter_accounts(accounts)
+	
+	company_currency = frappe.db.get_value("Company", company, "default_currency")
 
 	gl_entries_by_account = {}
 	for root in frappe.db.sql("""select lft, rgt from tabAccount
@@ -90,10 +92,10 @@
 
 	calculate_values(accounts_by_name, gl_entries_by_account, period_list)
 	accumulate_values_into_parents(accounts, accounts_by_name, period_list)
-	out = prepare_data(accounts, balance_must_be, period_list)
+	out = prepare_data(accounts, balance_must_be, period_list, company_currency)
 
 	if out:
-		add_total_row(out, balance_must_be, period_list)
+		add_total_row(out, balance_must_be, period_list, company_currency)
 
 	return out
 
@@ -114,7 +116,7 @@
 				accounts_by_name[d.parent_account][period.key] = accounts_by_name[d.parent_account].get(period.key, 0.0) + \
 					d.get(period.key, 0.0)
 
-def prepare_data(accounts, balance_must_be, period_list):
+def prepare_data(accounts, balance_must_be, period_list, company_currency):
 	out = []
 	year_start_date = period_list[0]["year_start_date"].strftime("%Y-%m-%d")
 	year_end_date = period_list[-1]["year_end_date"].strftime("%Y-%m-%d")
@@ -128,7 +130,8 @@
 			"parent_account": d.parent_account,
 			"indent": flt(d.indent),
 			"from_date": year_start_date,
-			"to_date": year_end_date
+			"to_date": year_end_date,
+			"currency": company_currency
 		}
 		for period in period_list:
 			if d.get(period.key):
@@ -146,10 +149,11 @@
 
 	return out
 
-def add_total_row(out, balance_must_be, period_list):
+def add_total_row(out, balance_must_be, period_list, company_currency):
 	total_row = {
 		"account_name": "'" + _("Total ({0})").format(balance_must_be) + "'",
-		"account": None
+		"account": None,
+		"currency": company_currency
 	}
 
 	for row in out:
@@ -241,7 +245,7 @@
 
 	return gl_entries_by_account
 
-def get_columns(period_list):
+def get_columns(period_list, company=None):
 	columns = [{
 		"fieldname": "account",
 		"label": _("Account"),
@@ -249,46 +253,22 @@
 		"options": "Account",
 		"width": 300
 	}]
+	if company:
+		columns.append({
+			"fieldname": "currency",
+			"label": _("Currency"),
+			"fieldtype": "Link",
+			"options": "Currency",
+			"hidden": 1
+		})
+	
 	for period in period_list:
 		columns.append({
 			"fieldname": period.key,
 			"label": period.label,
 			"fieldtype": "Currency",
+			"options": "currency",
 			"width": 150
 		})
 
-	return columns
-
-
-def get_data_account_type(company, account_type, period_list):
-    data = {}
-    for period in period_list:
-        gl_sum = frappe.db.sql_list("""select sum(credit) - sum(debit) FROM `tabGL Entry`
-                                    where company='%s' and posting_date >= '%s' and posting_date <= '%s' and
-                                    account in ( SELECT name FROM tabAccount WHERE account_type = '%s')""" %
-                                    (company, period['from_date'], period['to_date'], account_type))
-        if gl_sum[0]:
-            amount = gl_sum[0]
-            if account_type == "Depreciation":
-                amount *= -1
-        else:
-            amount = 0
-        data.update({"from_date": period['from_date'], "to_date": period['to_date'], period["key"]: amount})
-    return data
-
-
-def add_total_row_account(out, data, label, period_list):
-    # print out
-    total_row = {
-        "account_name": "'" + _("{0}").format(label) + "'",
-        "account": None
-    }
-
-    for row in data:
-        if row.get("parent_account"):
-            for period in period_list:
-                total_row.setdefault(period.key, 0.0)
-                total_row[period.key] += row.get(period.key, 0.0)
-
-    out.append(total_row)
-    out.append({})
+	return columns
\ No newline at end of file
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index b4d9b9f..79bea22 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -8,7 +8,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company"),
+			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
 		{
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.js b/erpnext/accounts/report/gross_profit/gross_profit.js
index 9035626..1f7d24d 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.js
+++ b/erpnext/accounts/report/gross_profit/gross_profit.js
@@ -9,7 +9,7 @@
 			"fieldtype": "Link",
 			"options": "Company",
 			"reqd": 1,
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"from_date",
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index 8d9684c..3c90fe2 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -7,7 +7,9 @@
 from frappe.utils import flt
 
 def execute(filters=None):
-	if not filters: filters = {}
+	if not filters: filters = frappe._dict()
+	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+	
 	gross_profit_data = GrossProfitGenerator(filters)
 
 	data = []
@@ -43,6 +45,8 @@
 		row = []
 		for col in group_wise_columns.get(scrub(filters.group_by)):
 			row.append(src.get(col))
+			
+		row.append(company_currency)
 		data.append(row)
 
 	return columns, data
@@ -60,15 +64,15 @@
 		"description": _("Description"),
 		"warehouse": _("Warehouse") + ":Link/Warehouse",
 		"qty": _("Qty") + ":Float",
-		"base_rate": _("Avg. Selling Rate") + ":Currency",
-		"buying_rate": _("Avg. Buying Rate") + ":Currency",
-		"base_amount": _("Selling Amount") + ":Currency",
-		"buying_amount": _("Buying Amount") + ":Currency",
-		"gross_profit": _("Gross Profit") + ":Currency",
+		"base_rate": _("Avg. Selling Rate") + ":Currency/currency",
+		"buying_rate": _("Avg. Buying Rate") + ":Currency/currency",
+		"base_amount": _("Selling Amount") + ":Currency/currency",
+		"buying_amount": _("Buying Amount") + ":Currency/currency",
+		"gross_profit": _("Gross Profit") + ":Currency/currency",
 		"gross_profit_percent": _("Gross Profit %") + ":Percent",
 		"project": _("Project") + ":Link/Project",
 		"sales_person": _("Sales person"),
-		"allocated_amount": _("Allocated Amount") + ":Currency",
+		"allocated_amount": _("Allocated Amount") + ":Currency/currency",
 		"customer": _("Customer") + ":Link/Customer",
 		"customer_group": _("Customer Group") + ":Link/Customer Group",
 		"territory": _("Territory") + ":Link/Territory"
@@ -76,6 +80,13 @@
 
 	for col in group_wise_columns.get(scrub(filters.group_by)):
 		columns.append(column_map.get(col))
+				
+	columns.append({
+		"fieldname": "currency",
+		"label" : _("Currency"),
+		"fieldtype": "Link",
+		"options": "Currency"
+	})
 
 	return columns
 
diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
index edaddc3..941aa87 100644
--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
@@ -33,7 +33,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }
diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js
index f9468a4..d322406 100644
--- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js
+++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js
@@ -27,7 +27,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }
diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
index 952540c..0408361 100644
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
@@ -9,7 +9,7 @@
 			fieldtype: "Link",
 			options: "Company",
 			reqd: 1,
-			default: frappe.defaults.get_user_default("company")
+			default: frappe.defaults.get_user_default("Company")
 		},
 		{
 			fieldname: "from_date",
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
index 0431eb6..d26a3fc 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
@@ -9,10 +9,10 @@
 
 def execute(filters=None):
 	period_list = get_period_list(filters.fiscal_year, filters.periodicity)
-
+	
 	income = get_data(filters.company, "Income", "Credit", period_list, ignore_closing_entries=True)
 	expense = get_data(filters.company, "Expense", "Debit", period_list, ignore_closing_entries=True)
-	net_profit_loss = get_net_profit_loss(income, expense, period_list)
+	net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company)
 
 	data = []
 	data.extend(income or [])
@@ -20,16 +20,17 @@
 	if net_profit_loss:
 		data.append(net_profit_loss)
 
-	columns = get_columns(period_list)
+	columns = get_columns(period_list, filters.company)
 
 	return columns, data
 
-def get_net_profit_loss(income, expense, period_list):
+def get_net_profit_loss(income, expense, period_list, company):
 	if income and expense:
 		net_profit_loss = {
 			"account_name": "'" + _("Net Profit / Loss") + "'",
 			"account": None,
-			"warn_if_negative": True
+			"warn_if_negative": True,
+			"currency": frappe.db.get_value("Company", company, "default_currency")
 		}
 
 		for period in period_list:
diff --git a/erpnext/accounts/report/purchase_register/purchase_register.js b/erpnext/accounts/report/purchase_register/purchase_register.js
index 450d0ef..15300c3 100644
--- a/erpnext/accounts/report/purchase_register/purchase_register.js
+++ b/erpnext/accounts/report/purchase_register/purchase_register.js
@@ -27,7 +27,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }
diff --git a/erpnext/accounts/report/sales_register/sales_register.js b/erpnext/accounts/report/sales_register/sales_register.js
index 2f798f3..4764255 100644
--- a/erpnext/accounts/report/sales_register/sales_register.js
+++ b/erpnext/accounts/report/sales_register/sales_register.js
@@ -27,7 +27,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.js b/erpnext/accounts/report/trial_balance/trial_balance.js
index fad8789..97c8f6c 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.js
+++ b/erpnext/accounts/report/trial_balance/trial_balance.js
@@ -10,7 +10,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company"),
+			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
 		{
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py
index 13e8743..f0524c0 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py
@@ -16,6 +16,8 @@
 	return columns, data
 
 def validate_filters(filters):
+	if not filters.fiscal_year:
+		frappe.throw(_("Fiscal Year {0} is required"))
 	filters.year_start_date, filters.year_end_date = frappe.db.get_value("Fiscal Year", filters.fiscal_year,
 		["year_start_date", "year_end_date"])
 	filters.year_start_date = getdate(filters.year_start_date)
diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
index 45d7bc0..f479c93 100644
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
@@ -8,7 +8,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company"),
+			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
 		{
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 25ae482..6f02a54 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -247,7 +247,7 @@
 
 	# will work as update after submit
 	jv_obj.flags.ignore_validate_update_after_submit = True
-	jv_obj.save()
+	jv_obj.save(ignore_permissions=True)
 
 def remove_against_link_from_jv(ref_type, ref_no):
 	linked_jv = frappe.db.sql_list("""select parent from `tabJournal Entry Account`
@@ -383,7 +383,7 @@
 def get_currency_precision(currency=None):
 	if not currency:
 		currency = frappe.db.get_value("Company",
-			frappe.db.get_default("company"), "default_currency", cache=True)
+			frappe.db.get_default("Company"), "default_currency", cache=True)
 	currency_format = frappe.db.get_value("Currency", currency, "number_format", cache=True)
 
 	from frappe.utils import get_number_format_info
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js
index 2fb3bc7..c856e28 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -59,7 +59,8 @@
 		this.frm.toggle_display("supplier_name",
 			(this.supplier_name && this.frm.doc.supplier_name!==this.frm.doc.supplier));
 
-		if(this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request") {
+		if(this.frm.docstatus==0 &&
+			(this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request")) {
 			this.set_from_product_bundle();
 		}
 
@@ -166,9 +167,9 @@
 
 	set_from_product_bundle: function() {
 		var me = this;
-		this.frm.add_custom_button(__("From Product Bundle"), function() {
+		this.frm.add_custom_button(__("Product Bundle"), function() {
 			erpnext.buying.get_items_from_product_bundle(me.frm);
-		});
+		}, __("Get items from"));
 	}
 });
 
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index c0fc95c..e23b0d4 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -41,46 +41,61 @@
 		if(doc.docstatus == 1 && !in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
 			if (this.frm.has_perm("submit")) {
 				if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) {
-					cur_frm.add_custom_button(__('Stop'), this.stop_purchase_order);
+					cur_frm.add_custom_button(__('Stop'), this.stop_purchase_order, __("Status"));
 				}
 
-				cur_frm.add_custom_button(__('Close'), this.close_purchase_order);
+				cur_frm.add_custom_button(__('Close'), this.close_purchase_order, __("Status"));
 			}
 
-			if(flt(doc.per_billed)==0) {
-				cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry);
-			}
 
 			if(is_drop_ship && doc.status!="Delivered"){
-				cur_frm.add_custom_button(__('Mark as Delivered'),
-					 this.delivered_by_supplier).addClass("btn-primary");
+				cur_frm.add_custom_button(__('Delivered'),
+					 this.delivered_by_supplier, __("Status"));
+
+				cur_frm.page.set_inner_btn_group_as_primary(__("Status"));
 			}
 		} else if(doc.docstatus===0) {
 			cur_frm.cscript.add_from_mappers();
 		}
 
+		if(doc.docstatus == 1 && in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
+			if (this.frm.has_perm("submit")) {
+				cur_frm.add_custom_button(__('Re-open'), this.unstop_purchase_order, __("Status"));
+			}
+		}
+
 		if(doc.docstatus == 1 && !in_list(["Stopped", "Closed"], doc.status)) {
 			if(flt(doc.per_received, 2) < 100 && allow_receipt) {
-				cur_frm.add_custom_button(__('Receive'), this.make_purchase_receipt).addClass("btn-primary");
+				cur_frm.add_custom_button(__('Receive'), this.make_purchase_receipt, __("Make"));
 
 				if(doc.is_subcontracted==="Yes") {
-					cur_frm.add_custom_button(__('Transfer Material to Supplier'),
-						function() { me.make_stock_entry(); });
+					cur_frm.add_custom_button(__('Material to Supplier'),
+						function() { me.make_stock_entry(); }, __("Transfer"));
 				}
 			}
 
 			if(flt(doc.per_billed, 2) < 100)
 				cur_frm.add_custom_button(__('Invoice'),
-					this.make_purchase_invoice).addClass("btn-primary");
-		}
+					this.make_purchase_invoice, __("Make"));
 
-		if(doc.docstatus == 1 && in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
-			if (this.frm.has_perm("submit")) {
-				cur_frm.add_custom_button(__('Re-open'), this.unstop_purchase_order).addClass("btn-primary");
+			if(flt(doc.per_billed)==0 && doc.status != "Delivered") {
+				cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry, __("Make"));
 			}
+			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
+
 		}
 	},
 
+	get_items_from_open_material_requests: function() {
+		frappe.model.map_current_doc({
+			method: "erpnext.stock.doctype.material_request.material_request.make_purchase_order_based_on_supplier",
+			source_name: this.frm.doc.supplier,
+			get_query_filters: {
+				docstatus: ["!=", 2],
+			}
+		});
+	},
+
 	make_stock_entry: function() {
 		var items = $.map(cur_frm.doc.items, function(d) { return d.bom ? d.item_code : false; });
 		var me = this;
@@ -124,7 +139,7 @@
 	},
 
 	add_from_mappers: function() {
-		cur_frm.add_custom_button(__('From Material Request'),
+		cur_frm.add_custom_button(__('Material Request'),
 			function() {
 				frappe.model.map_current_doc({
 					method: "erpnext.stock.doctype.material_request.material_request.make_purchase_order",
@@ -137,10 +152,9 @@
 						company: cur_frm.doc.company
 					}
 				})
-			}
-		);
+			}, __("Add items from"));
 
-		cur_frm.add_custom_button(__('From Supplier Quotation'),
+		cur_frm.add_custom_button(__('Supplier Quotation'),
 			function() {
 				frappe.model.map_current_doc({
 					method: "erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_purchase_order",
@@ -151,20 +165,8 @@
 						company: cur_frm.doc.company
 					}
 				})
-			}
-		);
+			}, __("Add items from"));
 
-		cur_frm.add_custom_button(__('For Supplier'),
-			function() {
-				frappe.model.map_current_doc({
-					method: "erpnext.stock.doctype.material_request.material_request.make_purchase_order_based_on_supplier",
-					source_doctype: "Supplier",
-					get_query_filters: {
-						docstatus: ["!=", 2],
-					}
-				})
-			}
-		);
 	},
 
 	tc_name: function() {
@@ -204,6 +206,17 @@
 
 	delivered_by_supplier: function(){
 		cur_frm.cscript.update_status('Deliver', 'Delivered')
+	},
+
+	get_last_purchase_rate: function() {
+		frappe.call({
+			"method": "get_last_purchase_rate",
+			"doc": cur_frm.doc,
+			callback: function(r, rt) {
+				cur_frm.dirty();
+				cur_frm.cscript.calculate_taxes_and_totals();
+			}
+		})
 	}
 
 });
@@ -253,54 +266,12 @@
 	}
 }
 
-cur_frm.pformat.indent_no = function(doc, cdt, cdn){
-	//function to make row of table
-
-	var make_row = function(title,val1, val2, bold){
-		var bstart = '<b>'; var bend = '</b>';
-
-		return '<tr><td style="width:39%;">'+(bold?bstart:'')+title+(bold?bend:'')+'</td>'
-		 +'<td style="width:61%;text-align:left;">'+val1+(val2?' ('+dateutil.str_to_user(val2)+')':'')+'</td>'
-		 +'</tr>'
-	}
-
-	out ='';
-
-	var cl = doc.items || [];
-
-	// outer table
-	var out='<div><table class="noborder" style="width:100%"><tr><td style="width: 50%"></td><td>';
-
-	// main table
-	out +='<table class="noborder" style="width:100%">';
-
-	// add rows
-	if(cl.length){
-		prevdoc_list = new Array();
-		for(var i=0;i<cl.length;i++){
-			if(cl[i].prevdoc_doctype == 'Material Request' && cl[i].prevdoc_docname && prevdoc_list.indexOf(cl[i].prevdoc_docname) == -1) {
-				prevdoc_list.push(cl[i].prevdoc_docname);
-				if(prevdoc_list.length ==1)
-					out += make_row(cl[i].prevdoc_doctype, cl[i].prevdoc_docname, null,0);
-				else
-					out += make_row('', cl[i].prevdoc_docname,null,0);
-			}
-		}
-	}
-
-	out +='</table></td></tr></table></div>';
-
-	return out;
-}
-
 cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 	if(cint(frappe.boot.notification_settings.purchase_order)) {
 		cur_frm.email_doc(frappe.boot.notification_settings.purchase_order_message);
 	}
 }
 
-
-
 cur_frm.cscript.schedule_date = function(doc, cdt, cdn) {
 	erpnext.utils.copy_value_in_all_row(doc, cdt, cdn, "items", "schedule_date");
 }
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 85e14f3..277229a 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -115,6 +115,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "eval:doc.supplier && doc.docstatus===0 && !(doc.items && doc.items.length)", 
+   "fieldname": "get_items_from_open_material_requests", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Get Items from Open Material Requests", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "default": "No", 
    "fieldname": "is_subcontracted", 
    "fieldtype": "Select", 
@@ -851,6 +876,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "eval:doc.docstatus===0 && (doc.items && doc.items.length)", 
+   "fieldname": "get_last_purchase_rate", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Get last purchase rate", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "sb_last_purchase", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1353,6 +1403,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "base_discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "column_break_45", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1376,6 +1451,30 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "discount_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1401,31 +1500,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "base_discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 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, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "totals_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2434,7 +2508,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-12-01 00:48:11.749313", 
+ "modified": "2016-01-15 04:13:35.179163", 
  "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 b10b72f..f68935f 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -8,6 +8,7 @@
 from frappe import msgprint, _, throw
 from frappe.model.mapper import get_mapped_doc
 from erpnext.controllers.buying_controller import BuyingController
+from erpnext.stock.doctype.item.item import get_last_purchase_details
 from erpnext.stock.stock_balance import update_bin_qty, get_ordered_qty
 from frappe.desk.notifications import clear_doctype_notifications
 
@@ -83,6 +84,34 @@
 			if d.prevdoc_detail_docname and not d.schedule_date:
 				d.schedule_date = frappe.db.get_value("Material Request Item",
 						d.prevdoc_detail_docname, "schedule_date")
+						
+
+	def get_last_purchase_rate(self):
+		"""get last purchase rates for all items"""
+		
+		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)
+
+				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.rate = d.base_rate / conversion_rate
+				else:
+					# if no last purchase found, reset all values to 0
+					for field in ("base_price_list_rate", "base_rate", 
+						"price_list_rate", "rate", "discount_percentage"):
+							d.set(field, 0)
+
+					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.rate = item_last_purchase_rate
 
 	# Check for Stopped status
 	def check_for_stopped_or_closed_status(self, pc_obj):
@@ -140,7 +169,7 @@
 		clear_doctype_notifications(self)
 
 	def on_submit(self):
-		if self.has_drop_ship_item():
+		if self.is_against_so():
 			self.update_status_updater()
 
 		super(PurchaseOrder, self).on_submit()
@@ -157,8 +186,10 @@
 		purchase_controller.update_last_purchase_rate(self, is_submit = 1)
 
 	def on_cancel(self):
-		if self.has_drop_ship_item():
+		if self.is_against_so():
 			self.update_status_updater()
+			
+		if self.has_drop_ship_item():
 			self.update_delivered_qty_in_sales_order()
 
 		pc_obj = frappe.get_doc('Purchase Common')
@@ -222,13 +253,10 @@
 			so.notify_update()
 
 	def has_drop_ship_item(self):
-		is_drop_ship = False
-
-		for item in self.items:
-			if item.delivered_by_supplier == 1:
-				is_drop_ship = True
-
-		return is_drop_ship
+		return any([d.delivered_by_supplier for d in self.items])
+		
+	def is_against_so(self):
+		return any([d.prevdoc_doctype for d in self.items if d.prevdoc_doctype=="Sales Order"])
 
 	def set_received_qty_for_drop_ship_items(self):
 		for item in self.items:
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 16e09b1..0d08796 100755
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -26,6 +26,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -49,6 +50,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -73,6 +75,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -95,6 +98,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -111,7 +115,7 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Reqd By Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -119,6 +123,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -142,6 +147,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -166,6 +172,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -189,6 +196,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -212,6 +220,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -236,6 +245,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -258,6 +268,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -282,6 +293,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "60px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -309,6 +321,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -332,6 +345,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -357,6 +371,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -383,6 +398,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -406,6 +422,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -429,6 +446,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -452,6 +470,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -473,6 +492,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -496,6 +516,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -517,6 +538,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -542,6 +564,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -567,6 +590,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -588,6 +612,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -613,6 +638,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -640,6 +666,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -663,6 +690,7 @@
    "options": "Pricing Rule", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -685,6 +713,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -709,6 +738,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -733,6 +763,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -755,6 +786,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -779,6 +811,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -803,6 +836,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -825,6 +859,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -850,6 +885,7 @@
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -873,6 +909,7 @@
    "options": "Project", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -898,6 +935,7 @@
    "options": "DocType", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -923,6 +961,7 @@
    "options": "prevdoc_doctype", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -949,6 +988,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -972,6 +1012,7 @@
    "options": "Supplier Quotation", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -995,6 +1036,7 @@
    "options": "Supplier Quotation Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1018,6 +1060,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1039,6 +1082,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1065,6 +1109,7 @@
    "options": "Item Group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1090,6 +1135,7 @@
    "options": "Brand", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1114,6 +1160,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1138,6 +1185,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1164,6 +1212,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1188,6 +1237,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1211,6 +1261,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1236,6 +1287,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -1260,6 +1312,7 @@
    "oldfieldtype": "Check", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1277,7 +1330,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-19 02:53:19.301428", 
+ "modified": "2016-01-06 02:21:10.407871", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order Item", 
diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index 646dfbf..136514a 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -1,31 +1,51 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-cur_frm.cscript.refresh = function(doc, dt, dn) {
-	cur_frm.cscript.make_dashboard(doc);
+frappe.ui.form.on("Supplier", {
+	refresh: function(frm) {
+		frm.cscript.make_dashboard(frm.doc);
 
-	if(frappe.defaults.get_default("supp_master_name")!="Naming Series") {
-		cur_frm.toggle_display("naming_series", false);
-	} else {
-		erpnext.toggle_naming_series();
-	}
+		if(frappe.defaults.get_default("supp_master_name")!="Naming Series") {
+			frm.toggle_display("naming_series", false);
+		} else {
+			erpnext.toggle_naming_series();
+		}
 
-	if(doc.__islocal){
-    	hide_field(['address_html','contact_html']);
-		erpnext.utils.clear_address_and_contact(cur_frm);
-	}
-	else{
-	  	unhide_field(['address_html','contact_html']);
-		erpnext.utils.render_address_and_contact(cur_frm)
-  }
-}
+		if(frm.doc.__islocal){
+	    	hide_field(['address_html','contact_html']);
+			erpnext.utils.clear_address_and_contact(frm);
+		}
+		else {
+		  	unhide_field(['address_html','contact_html']);
+			erpnext.utils.render_address_and_contact(frm);
+		}
+
+		frm.events.add_custom_buttons(frm);
+	},
+	add_custom_buttons: function(frm) {
+		["Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice"].forEach(function(doctype, i) {
+			if(frappe.model.can_read(doctype)) {
+				frm.add_custom_button(__(doctype), function() {
+					frappe.route_options = {"supplier": frm.doc.name};
+					frappe.set_route("List", doctype);
+				}, __("View"));
+			}
+			if(frappe.model.can_create(doctype)) {
+				frm.add_custom_button(__(doctype), function() {
+					frappe.route_options = {"supplier": frm.doc.name};
+					new_doc(doctype);
+				}, __("Make"));
+			}
+		});
+	},
+});
 
 cur_frm.cscript.make_dashboard = function(doc) {
 	cur_frm.dashboard.reset();
 	if(doc.__islocal)
 		return;
 	if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager"))
-		cur_frm.dashboard.set_headline('<span class="text-muted">Loading...</span>')
+		cur_frm.dashboard.set_headline('<span class="text-muted">' + __('Loading') + '</span>')
 
 	cur_frm.dashboard.add_doctype_badge("Supplier Quotation", "supplier");
 	cur_frm.dashboard.add_doctype_badge("Purchase Order", "supplier");
@@ -41,7 +61,7 @@
 		callback: function(r) {
 			if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) {
 				cur_frm.dashboard.set_headline(
-					__("Total Billing This Year: ") + "<b>"
+					__("Total billing this year") + ": <b>"
 					+ format_currency(r.message.billing_this_year, cur_frm.doc.party_account_currency)
 					+ '</b> / <span class="text-muted">' + __("Total Unpaid") + ": <b>"
 					+ format_currency(r.message.total_unpaid, cur_frm.doc.party_account_currency)
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 498154b..9f78eab 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -473,30 +473,6 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "communications", 
-   "fieldtype": "Table", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Communications", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Communication", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
@@ -509,7 +485,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-12-08 12:52:56.827461", 
+ "modified": "2016-01-06 02:35:18.285473", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier", 
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
index 67c8795..2e314e0 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
@@ -9,11 +9,12 @@
 		this._super();
 
 		if (this.frm.doc.docstatus === 1) {
-			cur_frm.add_custom_button(__("Make Purchase Order"), this.make_purchase_order,
-				frappe.boot.doctype_icons["Journal Entry"]);
+			cur_frm.add_custom_button(__("Purchase Order"), this.make_purchase_order,
+				__("Make"));
+			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 		}
 		else if (this.frm.doc.docstatus===0) {
-			cur_frm.add_custom_button(__('From Material Request'),
+			cur_frm.add_custom_button(__('Material Request'),
 				function() {
 					frappe.model.map_current_doc({
 						method: "erpnext.stock.doctype.material_request.material_request.make_supplier_quotation",
@@ -26,7 +27,7 @@
 							company: cur_frm.doc.company
 						}
 					})
-				}, "icon-download", "btn-default");
+				}, __("Get items from"));
 		}
 	},
 
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index a904be8..a102ae0 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -1084,6 +1084,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "base_discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "column_break_43", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1107,6 +1132,30 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "discount_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1132,31 +1181,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "base_discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 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, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "section_break_46", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1690,7 +1714,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2015-12-01 00:48:50.969833", 
+ "modified": "2015-12-17 16:18:29.855942", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 
diff --git a/erpnext/change_log/v6/v6.16.3.md b/erpnext/change_log/v6/v6.16.3.md
new file mode 100644
index 0000000..7fe1ad5
--- /dev/null
+++ b/erpnext/change_log/v6/v6.16.3.md
@@ -0,0 +1,6 @@
+- Track billed status of a Delivery Note (DN) or Purchase Receipt (PR)
+	- Added new status **To Bill** and **Completed** in Delivery Note and Purchase Receipt
+	- The system looks for Invoices directly created from Delivery Note / Purchase Receipt *(Workflow: Order -> DN/PR -> Invoice)* and allocates these amounts directly to the DN/PR
+	- Next, it looks for Invoices not created from Delivery Note / Purchase Receipt, but from an Order *(Workflow: Order -> Invoice, Order -> DN/PR)* and the DN/PR is selected based on FIFO for allocating the billed amount
+- In Stock Entry, re-calculate Additional Costs and Amount on changing Quantity or Rate
+- Chart of Accounts for Singapore
diff --git a/erpnext/change_log/v6/v6_14_0.md b/erpnext/change_log/v6/v6_14_0.md
new file mode 100644
index 0000000..b3a3b4e
--- /dev/null
+++ b/erpnext/change_log/v6/v6_14_0.md
@@ -0,0 +1,7 @@
+- **Cash Flow Report**
+	- Thank you [Chris Ian Fiel](https://discuss.erpnext.com/users/ccfiel/activity) for this much needed report!
+	- You can access this report from *Accounts > Main Reports > Cash Flow*
+- **Additional Discount Percentage**
+	- Enter a percentage value to calculate Additional Discount Amount
+	- Apply such a discount in the POS screen
+	- Available in all Selling and Buying transactions
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index 8a27394..859764d 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -33,6 +33,11 @@
 					"description": _("Supplier database.")
 				},
 				{
+					"type": "doctype",
+					"name": "Payment Request",
+					"description": _("Payment Request")
+				},
+				{
 					"type": "page",
 					"name": "Accounts Browser",
 					"icon": "icon-sitemap",
@@ -84,6 +89,11 @@
 					"description": _("Financial / accounting year.")
 				},
 				{
+					"type": "doctype",
+					"name": "Payment Gateway Account",
+					"description": _("Setup Gateway accounts.")
+				},
+				{
 					"type": "page",
 					"name": "Accounts Browser",
 					"icon": "icon-sitemap",
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index c3fe141..863ad6d 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -2,72 +2,84 @@
 from frappe import _
 
 def get_data():
-	return {
-		"Accounts": {
+	return [
+		{
+			"module_name": "Accounts",
 			"color": "#3498db",
 			"icon": "octicon octicon-repo",
 			"type": "module"
 		},
-		"Buying": {
+		{
+			"module_name": "CRM",
+			"color": "#EF4DB6",
+			"icon": "octicon octicon-broadcast",
+			"type": "module"
+		},
+		{
+			"module_name": "Selling",
+			"color": "#1abc9c",
+			"icon": "icon-tag",
+			"icon": "octicon octicon-tag",
+			"type": "module"
+		},
+		{
+			"module_name": "Buying",
 			"color": "#c0392b",
 			"icon": "icon-shopping-cart",
 			"icon": "octicon octicon-briefcase",
 			"type": "module"
 		},
-		"HR": {
+		{
+			"module_name": "HR",
 			"color": "#2ecc71",
 			"icon": "icon-group",
 			"icon": "octicon octicon-organization",
 			"label": _("Human Resources"),
 			"type": "module"
 		},
-		"Manufacturing": {
+		{
+			"module_name": "Manufacturing",
 			"color": "#7f8c8d",
 			"icon": "icon-cogs",
 			"icon": "octicon octicon-tools",
 			"type": "module"
 		},
-		"POS": {
+		{
+			"module_name": "POS",
 			"color": "#589494",
 			"icon": "icon-th",
 			"icon": "octicon octicon-credit-card",
 			"type": "page",
-			"link": "pos"
+			"link": "pos",
+			"label": _("POS")
 		},
-		"Projects": {
+		{
+			"module_name": "Projects",
 			"color": "#8e44ad",
 			"icon": "icon-puzzle-piece",
 			"icon": "octicon octicon-rocket",
 			"type": "module"
 		},
-		"Selling": {
-			"color": "#1abc9c",
-			"icon": "icon-tag",
-			"icon": "octicon octicon-tag",
-			"type": "module"
-		},
-		"CRM": {
-			"color": "#EF4DB6",
-			"icon": "octicon octicon-broadcast",
-			"type": "module"
-		},
-		"Stock": {
+		{
+			"module_name": "Stock",
 			"color": "#f39c12",
 			"icon": "icon-truck",
 			"icon": "octicon octicon-package",
 			"type": "module"
 		},
-		"Support": {
+		{
+			"module_name": "Support",
 			"color": "#2c3e50",
 			"icon": "icon-phone",
 			"icon": "octicon octicon-issue-opened",
 			"type": "module"
 		},
-		"Learn": {
+		{
+			"module_name": "Learn",
 			"color": "#FF888B",
-			"force_show": True,
 			"icon": "octicon octicon-device-camera-video",
 			"type": "module",
-			"is_help": True
+			"is_help": True,
+			"label": _("Learn")
 		}
-	}
+	]
diff --git a/erpnext/config/learn.py b/erpnext/config/learn.py
index 6557f52..426449b 100644
--- a/erpnext/config/learn.py
+++ b/erpnext/config/learn.py
@@ -21,6 +21,11 @@
 					"label": _("Customizing Forms"),
 					"youtube_id": "pJhL9mmxV_U"
 				},
+				{
+					"type": "help",
+					"label": _("Report Builder"),
+					"youtube_id": "y0o5iYZOioU"
+				},
 			]
 
 		},
@@ -57,6 +62,16 @@
 					"label": _("Workflow"),
 					"youtube_id": "yObJUg9FxFs"
 				},
+				{
+					"type": "help",
+					"label": _("Email Account"),
+					"youtube_id": "YFYe0DrB95o"
+				},
+				{
+					"type": "help",
+					"label": _("File Manager"),
+					"youtube_id": "4-osLW3E_Rk"
+				},
 			]
 		},
 		{
@@ -76,7 +91,12 @@
 					"type": "help",
 					"label": _("Opening Accounting Balance"),
 					"youtube_id": "kdgM20Q-q68"
-				}
+				},
+				{
+					"type": "help",
+					"label": _("Advance Payments"),
+					"youtube_id": "J46-6qtyZ9U"
+				},
 			]
 		},
 		{
@@ -111,7 +131,17 @@
 					"type": "help",
 					"label": _("Point-of-Sale"),
 					"youtube_id": "4WkelWkbP_c"
-				}
+				},
+				{
+					"type": "help",
+					"label": _("Product Bundle"),
+					"youtube_id": "yk3kPrRyRRc"
+				},
+				{
+					"type": "help",
+					"label": _("Drop Ship"),
+					"youtube_id": "hUc0hu_XLdo"
+				},
 			]
 		},
 		{
@@ -152,6 +182,11 @@
 					"label": _("Managing Subcontracting"),
 					"youtube_id": "ThiMCC2DtKo"
 				},
+				{
+					"type": "help",
+					"label": _("Quality Inspection"),
+					"youtube_id": "WmtcF3Y40Fs"
+				},
 			]
 		},
 		{
@@ -235,4 +270,19 @@
 				},
 			]
 		},
+		{
+			"label": _("Website"),
+			"items": [
+				{
+					"type": "help",
+					"label": _("Publish Items on Website"),
+					"youtube_id": "W31LBBNzbgc"
+				},
+				{
+					"type": "help",
+					"label": _("Shopping Cart"),
+					"youtube_id": "xkrYO-KFukM"
+				},
+			]
+		},
 	]
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 861ec8e..5c84112 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -133,13 +133,13 @@
 	def set_missing_item_details(self):
 		"""set missing item values"""
 		from erpnext.stock.get_item_details import get_item_details
-		
+
 		if self.doctype == "Purchase Invoice":
 			auto_accounting_for_stock = cint(frappe.defaults.get_global_default("auto_accounting_for_stock"))
 
 			if auto_accounting_for_stock:
 				stock_not_billed_account = self.get_company_default("stock_received_but_not_billed")
-				
+
 			stock_items = self.get_stock_items()
 
 		if hasattr(self, "items"):
@@ -151,6 +151,10 @@
 				if item.get("item_code"):
 					args = parent_dict.copy()
 					args.update(item.as_dict())
+
+					args["doctype"] = self.doctype
+					args["name"] = self.name
+
 					if not args.get("transaction_date"):
 						args["transaction_date"] = args.get("posting_date")
 
@@ -178,13 +182,13 @@
 						if item.price_list_rate:
 							item.rate = flt(item.price_list_rate *
 								(1.0 - (flt(item.discount_percentage) / 100.0)), item.precision("rate"))
-								
+
 					if self.doctype == "Purchase Invoice":
 						if auto_accounting_for_stock and item.item_code in stock_items \
 							and self.is_opening == 'No' \
-							and (not item.po_detail or not frappe.db.get_value("Purchase Order Item", 
+							and (not item.po_detail or not frappe.db.get_value("Purchase Order Item",
 								item.po_detail, "delivered_by_supplier")):
-				
+
 								item.expense_account = stock_not_billed_account
 								item.cost_center = None
 
diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py
index 5890b5d..3508277 100644
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -12,7 +12,7 @@
 class ItemTemplateCannotHaveStock(frappe.ValidationError): pass
 
 @frappe.whitelist()
-def get_variant(item, args):
+def get_variant(template, args, variant=None):
 	"""Validates Attributes and their Values, then looks for an exactly matching Item Variant
 
 		:param item: Template Item
@@ -24,9 +24,9 @@
 	if not args:
 		frappe.throw(_("Please specify at least one attribute in the Attributes table"))
 
-	validate_item_variant_attributes(item, args)
+	validate_item_variant_attributes(template, args)
 
-	return find_variant(item, args)
+	return find_variant(template, args, variant)
 
 def validate_item_variant_attributes(item, args):
 	attribute_values = {}
@@ -65,7 +65,7 @@
 			frappe.throw(_("Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values").format(
 				value, attribute))
 
-def find_variant(item, args):
+def find_variant(template, args, variant_item_code=None):
 	conditions = ["""(iv_attribute.attribute="{0}" and iv_attribute.attribute_value="{1}")"""\
 		.format(frappe.db.escape(key), frappe.db.escape(cstr(value))) for key, value in args.items()]
 
@@ -79,8 +79,8 @@
 		where variant_of=%s and exists (
 			select name from `tabItem Variant Attribute` iv_attribute
 				where iv_attribute.parent=item.name
-				and ({conditions})
-		)""".format(conditions=conditions), item)
+				and ({conditions}) and parent != %s
+		)""".format(conditions=conditions), (template, cstr(variant_item_code)))
 
 	for variant in possible_variants:
 		variant = frappe.get_doc("Item", variant)
diff --git a/erpnext/controllers/js/contact_address_common.js b/erpnext/controllers/js/contact_address_common.js
index df3323f..c51ff46 100644
--- a/erpnext/controllers/js/contact_address_common.js
+++ b/erpnext/controllers/js/contact_address_common.js
@@ -33,7 +33,7 @@
 							cur_frm.set_value("address_title", cur_frm.doc.customer_name);
 				}
 			}
-			if(["Supplier", "Supplier Quotation", "Purchase Order", "Purchase Invoice", "Purchase Receipt"]
+			else if(["Supplier", "Supplier Quotation", "Purchase Order", "Purchase Invoice", "Purchase Receipt"]
 				.indexOf(doctype)!==-1) {
 				var refdoc = frappe.get_doc(doctype, docname);
 				cur_frm.set_value("supplier", refdoc.supplier || refdoc.name);
@@ -41,7 +41,7 @@
 				if(cur_frm.doc.doctype==="Address")
 					cur_frm.set_value("address_title", cur_frm.doc.supplier_name);
 			}
-			if(["Lead", "Opportunity", "Quotation"]
+			else if(["Lead", "Opportunity", "Quotation"]
 				.indexOf(doctype)!==-1) {
 				var refdoc = frappe.get_doc(doctype, docname);
 
@@ -53,6 +53,9 @@
 							cur_frm.set_value("address_title", cur_frm.doc.lead_name);
 				}
 			}
+			else if(doctype == "Sales Partner") {
+				cur_frm.set_value("sales_partner", docname);
+			}
 		}
 	}
 }
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 3c262f1..ca431ce 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -158,7 +158,7 @@
 def item_query(doctype, txt, searchfield, start, page_len, filters):
 	conditions = []
 
-	return frappe.db.sql("""select tabItem.name,
+	return frappe.db.sql("""select tabItem.name,tabItem.item_group,
 		if(length(tabItem.item_name) > 40,
 			concat(substr(tabItem.item_name, 1, 40), "..."), item_name) as item_name,
 		if(length(tabItem.description) > 40, \
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index c6c7111..868720a 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -96,6 +96,9 @@
 							if s not in ref_serial_nos:
 								frappe.throw(_("Row # {0}: Serial No {1} does not match with {2} {3}")
 									.format(d.idx, s, doc.doctype, doc.return_against))
+									
+				if not d.warehouse:
+					frappe.throw(_("Warehouse is mandatory"))
 
 			items_returned = True
 
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index 73e9d7f..32724a9 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -52,13 +52,15 @@
 	],
 	"Delivery Note": [
 		["Draft", None],
-		["Submitted", "eval:self.docstatus==1"],
+		["To Bill", "eval:self.per_billed < 100 and self.docstatus == 1"],
+		["Completed", "eval:self.per_billed == 100 and self.docstatus == 1"],
 		["Cancelled", "eval:self.docstatus==2"],
 		["Closed", "eval:self.status=='Closed'"],
 	],
 	"Purchase Receipt": [
 		["Draft", None],
-		["Submitted", "eval:self.docstatus==1"],
+		["To Bill", "eval:self.per_billed < 100 and self.docstatus == 1"],
+		["Completed", "eval:self.per_billed == 100 and self.docstatus == 1"],
 		["Cancelled", "eval:self.docstatus==2"],
 		["Closed", "eval:self.status=='Closed'"],
 	]
@@ -79,7 +81,7 @@
 	def set_status(self, update=False, status=None, update_modified=True):
 		if self.is_new():
 			return
-				
+
 		if self.doctype in status_map:
 			_status = self.status
 
@@ -102,9 +104,9 @@
 
 			if self.status != _status and self.status not in ("Submitted", "Cancelled"):
 				self.add_comment("Label", _(self.status))
-			
+
 			if update:
-				frappe.db.set_value(self.doctype, self.name, "status", self.status, 
+				frappe.db.set_value(self.doctype, self.name, "status", self.status,
 					update_modified=update_modified)
 
 	def validate_qty(self):
@@ -153,7 +155,6 @@
 		# check if overflow is within tolerance
 		tolerance, self.tolerance, self.global_tolerance = get_tolerance_for(item['item_code'],
 			self.tolerance, self.global_tolerance)
-
 		overflow_percent = ((item[args['target_field']] - item[args['target_ref_field']]) /
 		 	item[args['target_ref_field']]) * 100
 
@@ -166,10 +167,10 @@
 			throw(_("{0} must be reduced by {1} or you should increase overflow tolerance")
 				.format(_(item["target_ref_field"].title()), item["reduce_by"]))
 
-	def update_qty(self, change_modified=True):
+	def update_qty(self, update_modified=True):
 		"""Updates qty or amount at row level
 
-			:param change_modified: If true, updates `modified` and `modified_by` for target parent doc
+			:param update_modified: If true, updates `modified` and `modified_by` for target parent doc
 		"""
 		for args in self.status_updater:
 			# condition to include current record (if submit or no if cancel)
@@ -178,22 +179,19 @@
 			else:
 				args['cond'] = ' and parent!="%s"' % self.name.replace('"', '\"')
 
-			args['set_modified'] = ''
-			if change_modified:
-				args['set_modified'] = ', modified = now(), modified_by = "{0}"'\
-					.format(frappe.db.escape(frappe.session.user))
-
-			self._update_children(args)
+			self._update_children(args, update_modified)
 
 			if "percent_join_field" in args:
-				self._update_percent_field(args)
+				self._update_percent_field_in_targets(args, update_modified)
 
-	def _update_children(self, args):
+	def _update_children(self, args, update_modified):
 		"""Update quantities or amount in child table"""
 		for d in self.get_all_children():
 			if d.doctype != args['source_dt']:
 				continue
 
+			self._update_modified(args, update_modified)
+
 			# updates qty in the child table
 			args['detail_id'] = d.get(args['join_field'])
 
@@ -212,44 +210,58 @@
 				if not args.get("extra_cond"): args["extra_cond"] = ""
 
 				frappe.db.sql("""update `tab%(target_dt)s`
-					set %(target_field)s = (select ifnull(sum(%(source_field)s), 0)
-						from `tab%(source_dt)s` where `%(join_field)s`="%(detail_id)s"
-						and (docstatus=1 %(cond)s) %(extra_cond)s) %(second_source_condition)s
+					set %(target_field)s = (
+						(select ifnull(sum(%(source_field)s), 0)
+							from `tab%(source_dt)s` where `%(join_field)s`="%(detail_id)s"
+							and (docstatus=1 %(cond)s) %(extra_cond)s)
+						%(second_source_condition)s
+					)
+					%(update_modified)s
 					where name='%(detail_id)s'""" % args)
 
-	def _update_percent_field(self, args):
+	def _update_percent_field_in_targets(self, args, update_modified=True):
 		"""Update percent field in parent transaction"""
-		unique_transactions = set([d.get(args['percent_join_field']) for d in self.get_all_children(args['source_dt'])])
+		distinct_transactions = set([d.get(args['percent_join_field'])
+			for d in self.get_all_children(args['source_dt'])])
 
-		for name in unique_transactions:
-			if not name:
-				continue
+		for name in distinct_transactions:
+			if name:
+				args['name'] = name
+				self._update_percent_field(args, update_modified)
 
-			args['name'] = name
+	def _update_percent_field(self, args, update_modified=True):
+		"""Update percent field in parent transaction"""
 
-			# update percent complete in the parent table
-			if args.get('target_parent_field'):
-				frappe.db.sql("""update `tab%(target_parent_dt)s`
-					set %(target_parent_field)s = round(
-						ifnull((select
-							ifnull(sum(if(%(target_ref_field)s > %(target_field)s, %(target_field)s, %(target_ref_field)s)), 0)
-							/ sum(%(target_ref_field)s) * 100
-						from `tab%(target_dt)s` where parent="%(name)s"), 0), 2)
-						%(set_modified)s
-					where name='%(name)s'""" % args)
+		self._update_modified(args, update_modified)
 
-			# update field
-			if args.get('status_field'):
-				frappe.db.sql("""update `tab%(target_parent_dt)s`
-					set %(status_field)s = if(%(target_parent_field)s<0.001,
-						'Not %(keyword)s', if(%(target_parent_field)s>=99.99,
-						'Fully %(keyword)s', 'Partly %(keyword)s'))
-					where name='%(name)s'""" % args)
+		if args.get('target_parent_field'):
+			frappe.db.sql("""update `tab%(target_parent_dt)s`
+				set %(target_parent_field)s = round(
+					ifnull((select
+						ifnull(sum(if(%(target_ref_field)s > %(target_field)s, %(target_field)s, %(target_ref_field)s)), 0)
+						/ sum(%(target_ref_field)s) * 100
+					from `tab%(target_dt)s` where parent="%(name)s"), 0), 2)
+					%(update_modified)s
+				where name='%(name)s'""" % args)
 
-			if args.get("set_modified"):
-				target = frappe.get_doc(args["target_parent_dt"], name)
-				target.set_status(update=True)
-				target.notify_update()
+		# update field
+		if args.get('status_field'):
+			frappe.db.sql("""update `tab%(target_parent_dt)s`
+				set %(status_field)s = if(%(target_parent_field)s<0.001,
+					'Not %(keyword)s', if(%(target_parent_field)s>=99.99,
+					'Fully %(keyword)s', 'Partly %(keyword)s'))
+				where name='%(name)s'""" % args)
+
+		if update_modified:
+			target = frappe.get_doc(args["target_parent_dt"], args["name"])
+			target.set_status(update=True)
+			target.notify_update()
+
+	def _update_modified(self, args, update_modified):
+		args['update_modified'] = ''
+		if update_modified:
+			args['update_modified'] = ', modified = now(), modified_by = "{0}"'\
+				.format(frappe.db.escape(frappe.session.user))
 
 	def update_billing_status_for_zero_amount_refdoc(self, ref_dt):
 		ref_fieldname = ref_dt.lower().replace(" ", "_")
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 6e860c5..4c6a320 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -218,14 +218,14 @@
 
 		return serialized_items
 
-	def get_incoming_rate_for_sales_return(self, item_code, warehouse, against_document):
+	def get_incoming_rate_for_sales_return(self, item_code, against_document):
 		incoming_rate = 0.0
 		if against_document and item_code:
 			incoming_rate = frappe.db.sql("""select abs(stock_value_difference / actual_qty)
 				from `tabStock Ledger Entry`
 				where voucher_type = %s and voucher_no = %s
-					and item_code = %s and warehouse=%s limit 1""",
-				(self.doctype, against_document, item_code, warehouse))
+					and item_code = %s limit 1""",
+				(self.doctype, against_document, item_code))
 			incoming_rate = incoming_rate[0][0] if incoming_rate else 0.0
 
 		return incoming_rate
@@ -257,8 +257,7 @@
 			if frappe.db.get_value("Item", d.item_code, "is_stock_item") == 1 and flt(d.qty):
 				return_rate = 0
 				if cint(self.is_return) and self.return_against and self.docstatus==1:
-					return_rate = self.get_incoming_rate_for_sales_return(d.item_code,
-						d.warehouse, self.return_against)
+					return_rate = self.get_incoming_rate_for_sales_return(d.item_code, self.return_against)
 
 				# On cancellation or if return entry submission, make stock ledger entry for
 				# target warehouse first, to update serial no values properly
@@ -312,6 +311,16 @@
 
 		for w in warehouses:
 			validate_warehouse_company(w, self.company)
+			
+	def update_billing_percentage(self, update_modified=True):
+		self._update_percent_field({
+			"target_dt": self.doctype + " Item",
+			"target_parent_dt": self.doctype,
+			"target_parent_field": "per_billed",
+			"target_ref_field": "amount",
+			"target_field": "billed_amt",
+			"name": self.name,
+		}, update_modified)
 
 def update_gl_entries_after(posting_date, posting_time, for_warehouses=None, for_items=None,
 		warehouse_account=None):
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index b348da6..f4fb8a9 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -4,8 +4,8 @@
 from __future__ import unicode_literals
 import json
 import frappe
-from frappe import _
-from frappe.utils import cint, flt, rounded
+from frappe import _, scrub
+from frappe.utils import cint, flt, round_based_on_smallest_currency_fraction
 from erpnext.setup.utils import get_company_currency
 from erpnext.controllers.accounts_controller import validate_conversion_rate, \
 	validate_taxes_and_charges, validate_inclusive_tax
@@ -20,6 +20,7 @@
 		self._calculate()
 
 		if self.doc.meta.get_field("discount_amount"):
+			self.set_discount_amount()
 			self.apply_discount_amount()
 
 		if self.doc.doctype in ["Sales Invoice", "Purchase Invoice"]:
@@ -318,13 +319,23 @@
 		self.doc.round_floats_in(self.doc, ["grand_total", "base_grand_total"])
 
 		if self.doc.meta.get_field("rounded_total"):
-			self.doc.rounded_total = rounded(self.doc.grand_total)
+			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"):
-			self.doc.base_rounded_total = rounded(self.doc.base_grand_total)
+			company_currency = get_company_currency(self.doc.company)
+			
+			self.doc.base_rounded_total = \
+				round_based_on_smallest_currency_fraction(self.doc.base_grand_total, 
+					company_currency, self.doc.precision("base_rounded_total"))
 
 	def _cleanup(self):
 		for tax in self.doc.get("taxes"):
 			tax.item_wise_tax_detail = json.dumps(tax.item_wise_tax_detail, separators=(',', ':'))
+			
+	def set_discount_amount(self):
+		if not self.doc.discount_amount and self.doc.additional_discount_percentage:
+			self.doc.discount_amount = flt(flt(self.doc.get(scrub(self.doc.apply_discount_on))) 
+				* self.doc.additional_discount_percentage / 100, self.doc.precision("discount_amount"))
 
 	def apply_discount_amount(self):
 		if self.doc.discount_amount:
@@ -402,8 +413,9 @@
 			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(self.doc.base_grand_total  - self.doc.total_advance 
-				- flt(self.doc.base_write_off_amount), self.doc.precision("grand_total"))
+			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 == "Sales Invoice":
 			self.doc.round_floats_in(self.doc, ["paid_amount"])
diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js
index 1dc8eb2..be3cd82 100644
--- a/erpnext/crm/doctype/lead/lead.js
+++ b/erpnext/crm/doctype/lead/lead.js
@@ -27,12 +27,10 @@
 		erpnext.toggle_naming_series();
 
 		if(!this.frm.doc.__islocal && this.frm.doc.__onload && !this.frm.doc.__onload.is_customer) {
-			this.frm.add_custom_button(__("Create Customer"), this.create_customer,
-				frappe.boot.doctype_icons["Customer"], "btn-default");
-			this.frm.add_custom_button(__("Create Opportunity"), this.create_opportunity,
-				frappe.boot.doctype_icons["Opportunity"], "btn-default");
-			this.frm.add_custom_button(__("Make Quotation"), this.make_quotation,
-				frappe.boot.doctype_icons["Quotation"], "btn-default");
+			this.frm.add_custom_button(__("Customer"), this.create_customer, __("Make"));
+			this.frm.add_custom_button(__("Opportunity"), this.create_opportunity, __("Make"));
+			this.frm.add_custom_button(__("Quotation"), this.make_quotation, __("Make"));
+			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 		}
 
 		if(!this.frm.doc.__islocal) {
@@ -55,7 +53,7 @@
 			frm: cur_frm
 		})
 	},
-	
+
 	make_quotation: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.crm.doctype.lead.lead.make_quotation",
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index 0e72865..ea06f53 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -90,7 +90,7 @@
 			target.customer_type = "Individual"
 			target.customer_name = source.lead_name
 
-		target.customer_group = frappe.db.get_default("customer_group")
+		target.customer_group = frappe.db.get_default("Customer Group")
 
 	doclist = get_mapped_doc("Lead", source_name,
 		{"Lead": {
diff --git a/erpnext/crm/doctype/newsletter/newsletter.py b/erpnext/crm/doctype/newsletter/newsletter.py
index 8b8395e..548ccf7 100644
--- a/erpnext/crm/doctype/newsletter/newsletter.py
+++ b/erpnext/crm/doctype/newsletter/newsletter.py
@@ -121,7 +121,7 @@
 		"lead_name": real_name or email_id,
 		"status": "Lead",
 		"naming_series": get_default_naming_series("Lead"),
-		"company": frappe.db.get_default("company"),
+		"company": frappe.db.get_default("Company"),
 		"source": "Email"
 	})
 	lead.insert()
diff --git a/erpnext/crm/doctype/newsletter_list/newsletter_list.js b/erpnext/crm/doctype/newsletter_list/newsletter_list.js
index ed0ac5e..d6cda45 100644
--- a/erpnext/crm/doctype/newsletter_list/newsletter_list.js
+++ b/erpnext/crm/doctype/newsletter_list/newsletter_list.js
@@ -3,7 +3,7 @@
 		frm.add_custom_button(__("View Subscribers"), function() {
 			frappe.route_options = {"newsletter_list": frm.doc.name};
 			frappe.set_route("Report", "Newsletter List Subscriber");
-		});
+		}, __("View"));
 
 		frm.add_custom_button(__("Import Subscribers"), function() {
 			frappe.prompt({fieldtype:"Select", options: frm.doc.__onload.import_types,
@@ -19,7 +19,7 @@
 						}
 					})
 				}, __("Import Subscribers"), __("Import"));
-		});
+		}, __("Action"));
 
 		frm.add_custom_button(__("Add Subscribers"), function() {
 			frappe.prompt({fieldtype:"Text",
@@ -35,12 +35,12 @@
 						}
 					})
 				}, __("Add Subscribers"), __("Add"));
-		});
+		}, __("Action"));
 
 		frm.add_custom_button(__("New Newsletter"), function() {
 			frappe.route_options = {"newsletter_list": frm.doc.name};
 			new_doc("Newsletter");
-		});
+		}, __("Action"));
 
 	}
 });
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index 0ee0201..af4e387 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -29,8 +29,8 @@
 
 		if(!this.frm.doc.status)
 			set_multiple(cdt, cdn, { status:'Draft' });
-		if(!this.frm.doc.company && frappe.defaults.get_user_default("company"))
-			set_multiple(cdt, cdn, { company:frappe.defaults.get_user_default("company") });
+		if(!this.frm.doc.company && frappe.defaults.get_user_default("Company"))
+			set_multiple(cdt, cdn, { company:frappe.defaults.get_user_default("Company") });
 		if(!this.frm.doc.fiscal_year && sys_defaults.fiscal_year)
 			set_multiple(cdt, cdn, { fiscal_year:sys_defaults.fiscal_year });
 
@@ -78,30 +78,31 @@
 cur_frm.cscript.refresh = function(doc, cdt, cdn) {
 	erpnext.toggle_naming_series();
 
-	if(doc.status!=="Lost") {
-		cur_frm.add_custom_button(__('Create Quotation'),
-			cur_frm.cscript.create_quotation, frappe.boot.doctype_icons["Quotation"],
-			"btn-default");
-		if(doc.status!=="Quotation")
-			cur_frm.add_custom_button(__('Opportunity Lost'),
-				cur_frm.cscript['Declare Opportunity Lost'], "icon-remove", "btn-default");
-	}
-
 	var frm = cur_frm;
 	if(frm.perm[0].write && doc.docstatus==0) {
 		if(frm.doc.status==="Open") {
-			frm.add_custom_button("Close", function() {
+			frm.add_custom_button(__("Close"), function() {
 				frm.set_value("status", "Closed");
 				frm.save();
-			});
+			}, __("Status"));
 		} else {
-			frm.add_custom_button("Reopen", function() {
+			frm.add_custom_button(__("Reopen"), function() {
 				frm.set_value("status", "Open");
 				frm.save();
-			});
+			}, __("Status"));
 		}
 	}
 
+	if(doc.status!=="Lost") {
+		if(doc.status!=="Quotation") {
+			cur_frm.add_custom_button(__('Lost'),
+				cur_frm.cscript['Declare Opportunity Lost'], __("Status"));
+		}
+
+		cur_frm.add_custom_button(__('Quotation'),cur_frm.cscript.create_quotation, __("Make"));
+		cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
+	}
+
 }
 
 cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
diff --git a/erpnext/docs/assets/img/accounts/multi-currency/customer.png b/erpnext/docs/assets/img/accounts/multi-currency/customer.png
index 35408c9..da13dac 100644
--- a/erpnext/docs/assets/img/accounts/multi-currency/customer.png
+++ b/erpnext/docs/assets/img/accounts/multi-currency/customer.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/pr-details-1.png b/erpnext/docs/assets/img/accounts/pr-details-1.png
new file mode 100644
index 0000000..12e40a6
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/pr-details-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/pr-details-2.png b/erpnext/docs/assets/img/accounts/pr-details-2.png
new file mode 100644
index 0000000..43122e3
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/pr-details-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/pr-email.png b/erpnext/docs/assets/img/accounts/pr-email.png
new file mode 100644
index 0000000..de1a868
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/pr-email.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/pr-from-si.png b/erpnext/docs/assets/img/accounts/pr-from-si.png
new file mode 100644
index 0000000..c9e654a
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/pr-from-si.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/pr-from-so.png b/erpnext/docs/assets/img/accounts/pr-from-so.png
new file mode 100644
index 0000000..b41ea4f
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/pr-from-so.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/recurring.gif b/erpnext/docs/assets/img/accounts/recurring.gif
new file mode 100644
index 0000000..39e2376
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/recurring.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_223.png b/erpnext/docs/assets/img/articles/$SGrab_223.png
deleted file mode 100644
index 5091620..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_223.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_238.png b/erpnext/docs/assets/img/articles/$SGrab_238.png
deleted file mode 100644
index 5f59d4f..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_238.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_241.png b/erpnext/docs/assets/img/articles/$SGrab_241.png
deleted file mode 100644
index ad74fc4..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_241.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_242.png b/erpnext/docs/assets/img/articles/$SGrab_242.png
deleted file mode 100644
index 751fbb1..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_242.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_316.png b/erpnext/docs/assets/img/articles/$SGrab_316.png
deleted file mode 100644
index 79eea96..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_316.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_317.png b/erpnext/docs/assets/img/articles/$SGrab_317.png
deleted file mode 100644
index b80e98c..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_317.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_318.png b/erpnext/docs/assets/img/articles/$SGrab_318.png
deleted file mode 100644
index 6aa68be..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_318.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_349.png b/erpnext/docs/assets/img/articles/$SGrab_349.png
deleted file mode 100644
index dec8468..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_349.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_350.png b/erpnext/docs/assets/img/articles/$SGrab_350.png
deleted file mode 100644
index aa5793a..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_350.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_352.png b/erpnext/docs/assets/img/articles/$SGrab_352.png
deleted file mode 100644
index 0c34c11..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_352.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_353.png b/erpnext/docs/assets/img/articles/$SGrab_353.png
deleted file mode 100644
index 159d2e2..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_353.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_383.png b/erpnext/docs/assets/img/articles/$SGrab_383.png
deleted file mode 100644
index 720ecdf..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_383.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_384.png b/erpnext/docs/assets/img/articles/$SGrab_384.png
deleted file mode 100644
index d67bcb2..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_384.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_385.png b/erpnext/docs/assets/img/articles/$SGrab_385.png
deleted file mode 100644
index c2cad13..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_385.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_386.png b/erpnext/docs/assets/img/articles/$SGrab_386.png
deleted file mode 100644
index e530064..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_386.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_387.png b/erpnext/docs/assets/img/articles/$SGrab_387.png
deleted file mode 100644
index c7ec59b..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_387.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_389.png b/erpnext/docs/assets/img/articles/$SGrab_389.png
deleted file mode 100644
index ee1b8cb..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_389.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_390.png b/erpnext/docs/assets/img/articles/$SGrab_390.png
deleted file mode 100644
index b936c07..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_390.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_391.png b/erpnext/docs/assets/img/articles/$SGrab_391.png
deleted file mode 100644
index 79595ae..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_391.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_392.png b/erpnext/docs/assets/img/articles/$SGrab_392.png
deleted file mode 100644
index 677e7c9..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_392.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_393.png b/erpnext/docs/assets/img/articles/$SGrab_393.png
deleted file mode 100644
index 9ba5acf..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_393.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_394.png b/erpnext/docs/assets/img/articles/$SGrab_394.png
deleted file mode 100644
index 222a5dc..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_394.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_418.png b/erpnext/docs/assets/img/articles/$SGrab_418.png
deleted file mode 100644
index f778921..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_418.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_419.png b/erpnext/docs/assets/img/articles/$SGrab_419.png
deleted file mode 100644
index c396ba7..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_419.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_420.png b/erpnext/docs/assets/img/articles/$SGrab_420.png
deleted file mode 100644
index 9b3522e..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_420.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_428.png b/erpnext/docs/assets/img/articles/$SGrab_428.png
deleted file mode 100644
index 4ef2c60..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_428.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_429.png b/erpnext/docs/assets/img/articles/$SGrab_429.png
deleted file mode 100644
index 80039fa..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_429.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/SGrab_250.png b/erpnext/docs/assets/img/articles/SGrab_250.png
deleted file mode 100644
index d0a24e0..0000000
--- a/erpnext/docs/assets/img/articles/SGrab_250.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/SGrab_342.png b/erpnext/docs/assets/img/articles/SGrab_342.png
deleted file mode 100644
index c56f211..0000000
--- a/erpnext/docs/assets/img/articles/SGrab_342.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/SGrab_343.png b/erpnext/docs/assets/img/articles/SGrab_343.png
deleted file mode 100644
index 6dd89db..0000000
--- a/erpnext/docs/assets/img/articles/SGrab_343.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/SGrab_344.png b/erpnext/docs/assets/img/articles/SGrab_344.png
deleted file mode 100644
index ce78397..0000000
--- a/erpnext/docs/assets/img/articles/SGrab_344.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-05 at 4.35.12 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-05 at 4.35.12 pm.png
deleted file mode 100644
index 804192a..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-05 at 4.35.12 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-16 at 2.52.56 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-16 at 2.52.56 pm.png
deleted file mode 100644
index e20b65f..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-16 at 2.52.56 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.10.35 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.10.35 pm.png
deleted file mode 100644
index bdbf34c..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.10.35 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.11.58 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.11.58 pm.png
deleted file mode 100644
index 151a0ca..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.11.58 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.13.16 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.13.16 pm.png
deleted file mode 100644
index c491c0a..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.13.16 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.14.46 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.14.46 pm.png
deleted file mode 100644
index 63701a3..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.14.46 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.15.27 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.15.27 pm.png
deleted file mode 100644
index d016ec0..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.15.27 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.13.50 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.13.50 pm.png
deleted file mode 100644
index f446efc..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.13.50 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.20.52 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.20.52 pm.png
deleted file mode 100644
index 404a1cd..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.20.52 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 3.52.10 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 3.52.10 pm.png
deleted file mode 100644
index ae9f7fc..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 3.52.10 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 3.58.45 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 3.58.45 pm.png
deleted file mode 100644
index cc16776..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 3.58.45 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 4.10.37 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 4.10.37 pm.png
deleted file mode 100644
index 186732c..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 4.10.37 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 4.20.30 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 4.20.30 pm.png
deleted file mode 100644
index 1095cb5..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 4.20.30 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.26.23 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.26.23 pm.png
deleted file mode 100644
index d4efcf4..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.26.23 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.27.31 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.27.31 pm.png
deleted file mode 100644
index 8b4f089..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.27.31 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.28.05 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.28.05 pm.png
deleted file mode 100644
index dc52a73..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.28.05 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.30.27 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.30.27 pm.png
deleted file mode 100644
index dab2750..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.30.27 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.31.01 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.31.01 pm.png
deleted file mode 100644
index 3e14711..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.31.01 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.33.24 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.33.24 pm.png
deleted file mode 100644
index 0dd14f6..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.33.24 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.36.29 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.36.29 pm.png
deleted file mode 100644
index b848b23..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.36.29 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_001f1e2ff.png b/erpnext/docs/assets/img/articles/Selection_001f1e2ff.png
deleted file mode 100644
index 43f9ceb..0000000
--- a/erpnext/docs/assets/img/articles/Selection_001f1e2ff.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_0027e4d09.png b/erpnext/docs/assets/img/articles/Selection_0027e4d09.png
deleted file mode 100644
index 488906d..0000000
--- a/erpnext/docs/assets/img/articles/Selection_0027e4d09.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_003bf981b.png b/erpnext/docs/assets/img/articles/Selection_003bf981b.png
deleted file mode 100644
index 1595e1f..0000000
--- a/erpnext/docs/assets/img/articles/Selection_003bf981b.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_005d73bc7.png b/erpnext/docs/assets/img/articles/Selection_005d73bc7.png
deleted file mode 100644
index 13b6861..0000000
--- a/erpnext/docs/assets/img/articles/Selection_005d73bc7.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_0124080f1.png b/erpnext/docs/assets/img/articles/Selection_0124080f1.png
deleted file mode 100644
index cca65ac..0000000
--- a/erpnext/docs/assets/img/articles/Selection_0124080f1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_014.png b/erpnext/docs/assets/img/articles/Selection_014.png
deleted file mode 100644
index f830942..0000000
--- a/erpnext/docs/assets/img/articles/Selection_014.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_014dd1559.png b/erpnext/docs/assets/img/articles/Selection_014dd1559.png
deleted file mode 100644
index 1e4d65c..0000000
--- a/erpnext/docs/assets/img/articles/Selection_014dd1559.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_019811b13.png b/erpnext/docs/assets/img/articles/Selection_019811b13.png
deleted file mode 100644
index dc669b8..0000000
--- a/erpnext/docs/assets/img/articles/Selection_019811b13.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_021ac61a5.png b/erpnext/docs/assets/img/articles/Selection_021ac61a5.png
deleted file mode 100644
index 49ad7e3..0000000
--- a/erpnext/docs/assets/img/articles/Selection_021ac61a5.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_046.png b/erpnext/docs/assets/img/articles/Selection_046.png
deleted file mode 100644
index ec00c01..0000000
--- a/erpnext/docs/assets/img/articles/Selection_046.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_049.png b/erpnext/docs/assets/img/articles/Selection_049.png
deleted file mode 100644
index 2cf490e..0000000
--- a/erpnext/docs/assets/img/articles/Selection_049.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_052.png b/erpnext/docs/assets/img/articles/Selection_052.png
deleted file mode 100644
index 33b758d..0000000
--- a/erpnext/docs/assets/img/articles/Selection_052.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_052f7b160.png b/erpnext/docs/assets/img/articles/Selection_052f7b160.png
deleted file mode 100644
index 0ed575e..0000000
--- a/erpnext/docs/assets/img/articles/Selection_052f7b160.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_053.png b/erpnext/docs/assets/img/articles/Selection_053.png
deleted file mode 100644
index d9e509e..0000000
--- a/erpnext/docs/assets/img/articles/Selection_053.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_054.png b/erpnext/docs/assets/img/articles/Selection_054.png
deleted file mode 100644
index a17b1ea..0000000
--- a/erpnext/docs/assets/img/articles/Selection_054.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_061.png b/erpnext/docs/assets/img/articles/Selection_061.png
deleted file mode 100644
index 176d8c5..0000000
--- a/erpnext/docs/assets/img/articles/Selection_061.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_062.png b/erpnext/docs/assets/img/articles/Selection_062.png
deleted file mode 100644
index a230c93..0000000
--- a/erpnext/docs/assets/img/articles/Selection_062.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_071.png b/erpnext/docs/assets/img/articles/Selection_071.png
deleted file mode 100644
index 86b7cff..0000000
--- a/erpnext/docs/assets/img/articles/Selection_071.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_072.png b/erpnext/docs/assets/img/articles/Selection_072.png
deleted file mode 100644
index e8dd519..0000000
--- a/erpnext/docs/assets/img/articles/Selection_072.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_080.png b/erpnext/docs/assets/img/articles/Selection_080.png
deleted file mode 100644
index a1acd6c..0000000
--- a/erpnext/docs/assets/img/articles/Selection_080.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_084.png b/erpnext/docs/assets/img/articles/Selection_084.png
deleted file mode 100644
index a346a74..0000000
--- a/erpnext/docs/assets/img/articles/Selection_084.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_085.png b/erpnext/docs/assets/img/articles/Selection_085.png
deleted file mode 100644
index d8a5151..0000000
--- a/erpnext/docs/assets/img/articles/Selection_085.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_440.png b/erpnext/docs/assets/img/articles/Selection_440.png
deleted file mode 100644
index 63fb04c..0000000
--- a/erpnext/docs/assets/img/articles/Selection_440.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_442.png b/erpnext/docs/assets/img/articles/Selection_442.png
deleted file mode 100644
index 55d0735..0000000
--- a/erpnext/docs/assets/img/articles/Selection_442.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_443.png b/erpnext/docs/assets/img/articles/Selection_443.png
deleted file mode 100644
index 6d045f2..0000000
--- a/erpnext/docs/assets/img/articles/Selection_443.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_445.png b/erpnext/docs/assets/img/articles/Selection_445.png
deleted file mode 100644
index bab8185..0000000
--- a/erpnext/docs/assets/img/articles/Selection_445.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_446.png b/erpnext/docs/assets/img/articles/Selection_446.png
deleted file mode 100644
index ecd0edd..0000000
--- a/erpnext/docs/assets/img/articles/Selection_446.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_447.png b/erpnext/docs/assets/img/articles/Selection_447.png
deleted file mode 100644
index 683c289..0000000
--- a/erpnext/docs/assets/img/articles/Selection_447.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_576.png b/erpnext/docs/assets/img/articles/Selection_576.png
deleted file mode 100644
index 5bc4f70..0000000
--- a/erpnext/docs/assets/img/articles/Selection_576.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_577.png b/erpnext/docs/assets/img/articles/Selection_577.png
deleted file mode 100644
index abf08a1..0000000
--- a/erpnext/docs/assets/img/articles/Selection_577.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_578.png b/erpnext/docs/assets/img/articles/Selection_578.png
deleted file mode 100644
index db33446..0000000
--- a/erpnext/docs/assets/img/articles/Selection_578.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Sselection_013.png b/erpnext/docs/assets/img/articles/Sselection_013.png
deleted file mode 100644
index 046de3c..0000000
--- a/erpnext/docs/assets/img/articles/Sselection_013.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Supplier Item Code in Purchase Order.png b/erpnext/docs/assets/img/articles/Supplier Item Code in Purchase Order.png
deleted file mode 100644
index 2fc511c..0000000
--- a/erpnext/docs/assets/img/articles/Supplier Item Code in Purchase Order.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Supplier Item Code.png b/erpnext/docs/assets/img/articles/Supplier Item Code.png
deleted file mode 100644
index cea3f14..0000000
--- a/erpnext/docs/assets/img/articles/Supplier Item Code.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/allow-on-submit-1.png b/erpnext/docs/assets/img/articles/allow-on-submit-1.png
new file mode 100644
index 0000000..7fba049
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/allow-on-submit-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/allow-on-submit-2.png b/erpnext/docs/assets/img/articles/allow-on-submit-2.png
new file mode 100644
index 0000000..861e0cb
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/allow-on-submit-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/allow-on-submit-3.png b/erpnext/docs/assets/img/articles/allow-on-submit-3.png
new file mode 100644
index 0000000..c833207
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/allow-on-submit-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/allowance-percentage-1.png b/erpnext/docs/assets/img/articles/allowance-percentage-1.png
new file mode 100644
index 0000000..4fbed90
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/allowance-percentage-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/allowance-percentage-2.png b/erpnext/docs/assets/img/articles/allowance-percentage-2.png
new file mode 100644
index 0000000..a7b9688
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/allowance-percentage-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/allowance_percentage.png b/erpnext/docs/assets/img/articles/allowance_percentage.png
deleted file mode 100644
index 519a837..0000000
--- a/erpnext/docs/assets/img/articles/allowance_percentage.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/allowance_percentage_item.png b/erpnext/docs/assets/img/articles/allowance_percentage_item.png
deleted file mode 100644
index 3d30fdc..0000000
--- a/erpnext/docs/assets/img/articles/allowance_percentage_item.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/barcode-feature-setup.png b/erpnext/docs/assets/img/articles/barcode-feature-setup.png
new file mode 100644
index 0000000..0a097ef
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/barcode-feature-setup.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/barcode-item-master.png b/erpnext/docs/assets/img/articles/barcode-item-master.png
new file mode 100644
index 0000000..57b5fcc
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/barcode-item-master.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/barcode-item-selection.gif b/erpnext/docs/assets/img/articles/barcode-item-selection.gif
new file mode 100644
index 0000000..55f3465
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/barcode-item-selection.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/batchwise-stock-1.png b/erpnext/docs/assets/img/articles/batchwise-stock-1.png
new file mode 100644
index 0000000..4477425
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/batchwise-stock-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/batchwise-stock-2.png b/erpnext/docs/assets/img/articles/batchwise-stock-2.png
new file mode 100644
index 0000000..5d9b9b4
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/batchwise-stock-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/batchwise-stock-3.png b/erpnext/docs/assets/img/articles/batchwise-stock-3.png
new file mode 100644
index 0000000..2fa7712
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/batchwise-stock-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/batchwise-stock-4.png b/erpnext/docs/assets/img/articles/batchwise-stock-4.png
new file mode 100644
index 0000000..e6a22f3
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/batchwise-stock-4.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/change-language-1.png b/erpnext/docs/assets/img/articles/change-language-1.png
new file mode 100644
index 0000000..7d87d8f
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/change-language-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/change-language-2.png b/erpnext/docs/assets/img/articles/change-language-2.png
new file mode 100644
index 0000000..bc8bdd2
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/change-language-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/change-language-3.png b/erpnext/docs/assets/img/articles/change-language-3.png
new file mode 100644
index 0000000..13f2cff
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/change-language-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/change-parent-1.png b/erpnext/docs/assets/img/articles/change-parent-1.png
new file mode 100644
index 0000000..c1cd86b
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/change-parent-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/change-parent-2.png b/erpnext/docs/assets/img/articles/change-parent-2.png
new file mode 100644
index 0000000..2ba16e9
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/change-parent-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/change-parent-3.png b/erpnext/docs/assets/img/articles/change-parent-3.png
new file mode 100644
index 0000000..819e849
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/change-parent-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/change-parent-account-1.gif b/erpnext/docs/assets/img/articles/change-parent-account-1.gif
new file mode 100644
index 0000000..ad2ef28
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/change-parent-account-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/change-password-1.png b/erpnext/docs/assets/img/articles/change-password-1.png
new file mode 100644
index 0000000..70b5700
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/change-password-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/change-password-2.png b/erpnext/docs/assets/img/articles/change-password-2.png
new file mode 100644
index 0000000..3dacaef
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/change-password-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/current-no-1.png b/erpnext/docs/assets/img/articles/current-no-1.png
new file mode 100644
index 0000000..de748e8
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/current-no-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/current-no-2.png b/erpnext/docs/assets/img/articles/current-no-2.png
new file mode 100644
index 0000000..7793098
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/current-no-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/current-no-3.png b/erpnext/docs/assets/img/articles/current-no-3.png
new file mode 100644
index 0000000..c0dbb7c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/current-no-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/delete-report-1.png b/erpnext/docs/assets/img/articles/delete-report-1.png
new file mode 100644
index 0000000..902fb50
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/delete-report-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/delete-report-2.png b/erpnext/docs/assets/img/articles/delete-report-2.png
new file mode 100644
index 0000000..86077eb
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/delete-report-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/delete-report-3.png b/erpnext/docs/assets/img/articles/delete-report-3.png
new file mode 100644
index 0000000..8b370c7
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/delete-report-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/delivery-note-barcode.png b/erpnext/docs/assets/img/articles/delivery-note-barcode.png
deleted file mode 100644
index 25814c6..0000000
--- a/erpnext/docs/assets/img/articles/delivery-note-barcode.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/depreciation-1.png b/erpnext/docs/assets/img/articles/depreciation-1.png
new file mode 100644
index 0000000..a161638
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/depreciation-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/depreciation-2.png b/erpnext/docs/assets/img/articles/depreciation-2.png
new file mode 100644
index 0000000..edc0444
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/depreciation-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/depreciation-3.png b/erpnext/docs/assets/img/articles/depreciation-3.png
new file mode 100644
index 0000000..dc3a599
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/depreciation-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/depreciation-4.png b/erpnext/docs/assets/img/articles/depreciation-4.png
new file mode 100644
index 0000000..237a233
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/depreciation-4.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/difference-account-1.png b/erpnext/docs/assets/img/articles/difference-account-1.png
new file mode 100644
index 0000000..d812b70
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/difference-account-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/difference-entry-1.png b/erpnext/docs/assets/img/articles/difference-entry-1.png
new file mode 100644
index 0000000..231b331
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/difference-entry-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/difference-entry-2.gif b/erpnext/docs/assets/img/articles/difference-entry-2.gif
new file mode 100644
index 0000000..74c924f
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/difference-entry-2.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/dynamic-field-1.gif b/erpnext/docs/assets/img/articles/dynamic-field-1.gif
new file mode 100644
index 0000000..53d8d4d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/dynamic-field-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/dynamic-field-2.png b/erpnext/docs/assets/img/articles/dynamic-field-2.png
new file mode 100644
index 0000000..db550fa
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/dynamic-field-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/dynamic-field-3.gif b/erpnext/docs/assets/img/articles/dynamic-field-3.gif
new file mode 100644
index 0000000..1914495
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/dynamic-field-3.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/dynamic-field-4.gif b/erpnext/docs/assets/img/articles/dynamic-field-4.gif
new file mode 100644
index 0000000..c2b12e0
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/dynamic-field-4.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/edit-submitted-doc-1.png b/erpnext/docs/assets/img/articles/edit-submitted-doc-1.png
new file mode 100644
index 0000000..11d6d13
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/edit-submitted-doc-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/edit-submitted-doc-2.png b/erpnext/docs/assets/img/articles/edit-submitted-doc-2.png
new file mode 100644
index 0000000..7244465
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/edit-submitted-doc-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/edit-submitted-doc-3.png b/erpnext/docs/assets/img/articles/edit-submitted-doc-3.png
new file mode 100644
index 0000000..83f3f36
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/edit-submitted-doc-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/editing-uom-in-po.gif b/erpnext/docs/assets/img/articles/editing-uom-in-po.gif
new file mode 100644
index 0000000..d59ff58
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/editing-uom-in-po.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/exchange-rate-difference-1.png b/erpnext/docs/assets/img/articles/exchange-rate-difference-1.png
new file mode 100644
index 0000000..e142578
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/exchange-rate-difference-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/exchange-rate-difference-2.gif b/erpnext/docs/assets/img/articles/exchange-rate-difference-2.gif
new file mode 100644
index 0000000..0e4a009
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/exchange-rate-difference-2.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/feature-setup-barcode.png b/erpnext/docs/assets/img/articles/feature-setup-barcode.png
deleted file mode 100644
index 667e3a1..0000000
--- a/erpnext/docs/assets/img/articles/feature-setup-barcode.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/fiscal-year-error-1.png b/erpnext/docs/assets/img/articles/fiscal-year-error-1.png
new file mode 100644
index 0000000..9e3b28c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/fiscal-year-error-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/fiscal-year-error-2.png b/erpnext/docs/assets/img/articles/fiscal-year-error-2.png
new file mode 100644
index 0000000..73e3895
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/fiscal-year-error-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/fixed-asset-dep-1.gif b/erpnext/docs/assets/img/articles/fixed-asset-dep-1.gif
new file mode 100644
index 0000000..e6330ad
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/fixed-asset-dep-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/fixed-asset-dep-2.png b/erpnext/docs/assets/img/articles/fixed-asset-dep-2.png
new file mode 100644
index 0000000..0679403
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/fixed-asset-dep-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/fixed-asset-dep-2.textClipping b/erpnext/docs/assets/img/articles/fixed-asset-dep-2.textClipping
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/fixed-asset-dep-2.textClipping
diff --git a/erpnext/docs/assets/img/articles/for-supplier-1.gif b/erpnext/docs/assets/img/articles/for-supplier-1.gif
new file mode 100644
index 0000000..821bc28
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/for-supplier-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/for-supplier-2.png b/erpnext/docs/assets/img/articles/for-supplier-2.png
new file mode 100644
index 0000000..20ebde7
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/for-supplier-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/for-supplier-3.png b/erpnext/docs/assets/img/articles/for-supplier-3.png
new file mode 100644
index 0000000..4d00d5e
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/for-supplier-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/frozen-date-1.png b/erpnext/docs/assets/img/articles/frozen-date-1.png
new file mode 100644
index 0000000..1700a08
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/frozen-date-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/frozen-date-2.png b/erpnext/docs/assets/img/articles/frozen-date-2.png
new file mode 100644
index 0000000..4068502
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/frozen-date-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/frozen-date-3.png b/erpnext/docs/assets/img/articles/frozen-date-3.png
new file mode 100644
index 0000000..586261b
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/frozen-date-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/hide-rounded-total-1.png b/erpnext/docs/assets/img/articles/hide-rounded-total-1.png
new file mode 100644
index 0000000..a6c8562
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/hide-rounded-total-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/hide-rounded-total-2.png b/erpnext/docs/assets/img/articles/hide-rounded-total-2.png
new file mode 100644
index 0000000..a79644f
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/hide-rounded-total-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/item-barcode.png b/erpnext/docs/assets/img/articles/item-barcode.png
deleted file mode 100644
index 6fd0f72..0000000
--- a/erpnext/docs/assets/img/articles/item-barcode.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/item-purchase-uom-conversion.png b/erpnext/docs/assets/img/articles/item-purchase-uom-conversion.png
new file mode 100644
index 0000000..e076e2e
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/item-purchase-uom-conversion.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/kb_allowonsubmit_checkinform.png b/erpnext/docs/assets/img/articles/kb_allowonsubmit_checkinform.png
deleted file mode 100644
index 3feb746..0000000
--- a/erpnext/docs/assets/img/articles/kb_allowonsubmit_checkinform.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/kb_custom_name.png b/erpnext/docs/assets/img/articles/kb_custom_name.png
deleted file mode 100644
index 4914201..0000000
--- a/erpnext/docs/assets/img/articles/kb_custom_name.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/kb_po_forsupp.png b/erpnext/docs/assets/img/articles/kb_po_forsupp.png
deleted file mode 100644
index 4c336af..0000000
--- a/erpnext/docs/assets/img/articles/kb_po_forsupp.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/kb_po_itemtable.png b/erpnext/docs/assets/img/articles/kb_po_itemtable.png
deleted file mode 100644
index ec7b406..0000000
--- a/erpnext/docs/assets/img/articles/kb_po_itemtable.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/kb_po_popup.png b/erpnext/docs/assets/img/articles/kb_po_popup.png
deleted file mode 100644
index f642fdd..0000000
--- a/erpnext/docs/assets/img/articles/kb_po_popup.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/link-field-1.gif b/erpnext/docs/assets/img/articles/link-field-1.gif
new file mode 100644
index 0000000..24cd01d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/link-field-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/link-field-2.png b/erpnext/docs/assets/img/articles/link-field-2.png
new file mode 100644
index 0000000..af9fdc9
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/link-field-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/maintain-stock-1.png b/erpnext/docs/assets/img/articles/maintain-stock-1.png
new file mode 100644
index 0000000..c38b88f
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/maintain-stock-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/managing-assets-1.png b/erpnext/docs/assets/img/articles/managing-assets-1.png
new file mode 100644
index 0000000..772037e
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/managing-assets-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/max-attachment-1.png b/erpnext/docs/assets/img/articles/max-attachment-1.png
new file mode 100644
index 0000000..e2b0b25
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/max-attachment-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/max-attachment-2.png b/erpnext/docs/assets/img/articles/max-attachment-2.png
new file mode 100644
index 0000000..8677a50
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/max-attachment-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/module-visibility-1.gif b/erpnext/docs/assets/img/articles/module-visibility-1.gif
new file mode 100644
index 0000000..4c38cb7
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/module-visibility-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/multiple-currency-1.gif b/erpnext/docs/assets/img/articles/multiple-currency-1.gif
new file mode 100644
index 0000000..e853dc0
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/multiple-currency-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/multiple-currency-2.png b/erpnext/docs/assets/img/articles/multiple-currency-2.png
new file mode 100644
index 0000000..655c146
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/multiple-currency-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-company-1.png b/erpnext/docs/assets/img/articles/new-company-1.png
new file mode 100644
index 0000000..a0b5c8b
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-company-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-company-2.png b/erpnext/docs/assets/img/articles/new-company-2.png
new file mode 100644
index 0000000..430a1bd
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-company-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-company-3.png b/erpnext/docs/assets/img/articles/new-company-3.png
new file mode 100644
index 0000000..06793e9
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-company-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/overwrite-1.gif b/erpnext/docs/assets/img/articles/overwrite-1.gif
new file mode 100644
index 0000000..1ed4294
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/overwrite-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/overwrite-2.png b/erpnext/docs/assets/img/articles/overwrite-2.png
new file mode 100644
index 0000000..6ea628a
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/overwrite-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/overwrite-3.gif b/erpnext/docs/assets/img/articles/overwrite-3.gif
new file mode 100644
index 0000000..99e40c4
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/overwrite-3.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/overwrite-4.png b/erpnext/docs/assets/img/articles/overwrite-4.png
new file mode 100644
index 0000000..eb2ce16
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/overwrite-4.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/owner-restriction-1.png b/erpnext/docs/assets/img/articles/owner-restriction-1.png
new file mode 100644
index 0000000..048a418
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/owner-restriction-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/owner-restriction-2.png b/erpnext/docs/assets/img/articles/owner-restriction-2.png
new file mode 100644
index 0000000..38ecb30
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/owner-restriction-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/po-conversion-factor.png b/erpnext/docs/assets/img/articles/po-conversion-factor.png
new file mode 100644
index 0000000..00ef8cd
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/po-conversion-factor.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/po-qty-in-stock-uom.png b/erpnext/docs/assets/img/articles/po-qty-in-stock-uom.png
new file mode 100644
index 0000000..48381f6
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/po-qty-in-stock-uom.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/po-stock-uom-ledger.png b/erpnext/docs/assets/img/articles/po-stock-uom-ledger.png
new file mode 100644
index 0000000..14bbc64
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/po-stock-uom-ledger.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/pos-view.gif b/erpnext/docs/assets/img/articles/pos-view.gif
new file mode 100644
index 0000000..af25f16
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/pos-view.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/post-dated-1.gif b/erpnext/docs/assets/img/articles/post-dated-1.gif
new file mode 100644
index 0000000..3bb03b5
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/post-dated-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/precision-1.png b/erpnext/docs/assets/img/articles/precision-1.png
new file mode 100644
index 0000000..bf8e33e
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/precision-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/precision-2.png b/erpnext/docs/assets/img/articles/precision-2.png
new file mode 100644
index 0000000..ea194d4
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/precision-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/precision-fieldwise.png b/erpnext/docs/assets/img/articles/precision-fieldwise.png
deleted file mode 100644
index 45ad6c0..0000000
--- a/erpnext/docs/assets/img/articles/precision-fieldwise.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/precision-global.png b/erpnext/docs/assets/img/articles/precision-global.png
deleted file mode 100644
index 6a5cbc0..0000000
--- a/erpnext/docs/assets/img/articles/precision-global.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/pricing-rule-application.png b/erpnext/docs/assets/img/articles/pricing-rule-application.png
new file mode 100644
index 0000000..7a1fbb5
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/pricing-rule-application.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/pricing-rule-disable.png b/erpnext/docs/assets/img/articles/pricing-rule-disable.png
new file mode 100644
index 0000000..06edc78
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/pricing-rule-disable.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/pricing-rule-discount.png b/erpnext/docs/assets/img/articles/pricing-rule-discount.png
new file mode 100644
index 0000000..8912360
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/pricing-rule-discount.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/pricing-rule-for.png b/erpnext/docs/assets/img/articles/pricing-rule-for.png
new file mode 100644
index 0000000..a75e790
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/pricing-rule-for.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/pricing-rule-on.png b/erpnext/docs/assets/img/articles/pricing-rule-on.png
new file mode 100644
index 0000000..4997ce2
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/pricing-rule-on.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/pricing-rule-price.png b/erpnext/docs/assets/img/articles/pricing-rule-price.png
new file mode 100644
index 0000000..afa6ab2
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/pricing-rule-price.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/pricing-rule-priority.png b/erpnext/docs/assets/img/articles/pricing-rule-priority.png
new file mode 100644
index 0000000..f40b544
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/pricing-rule-priority.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/pricing-rule-qty.png b/erpnext/docs/assets/img/articles/pricing-rule-qty.png
new file mode 100644
index 0000000..e99d7d6
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/pricing-rule-qty.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/pricing-rule-validity.png b/erpnext/docs/assets/img/articles/pricing-rule-validity.png
new file mode 100644
index 0000000..bf40c67
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/pricing-rule-validity.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/print-visible-1.png b/erpnext/docs/assets/img/articles/print-visible-1.png
new file mode 100644
index 0000000..22f4676
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/print-visible-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/print-visible-2.gif b/erpnext/docs/assets/img/articles/print-visible-2.gif
new file mode 100644
index 0000000..d1e2173
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/print-visible-2.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/project-cost-center-1.png b/erpnext/docs/assets/img/articles/project-cost-center-1.png
new file mode 100644
index 0000000..1c8e1b2
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/project-cost-center-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/project-cost-center-2.png b/erpnext/docs/assets/img/articles/project-cost-center-2.png
new file mode 100644
index 0000000..6076601
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/project-cost-center-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/project-cost-center-3.png b/erpnext/docs/assets/img/articles/project-cost-center-3.png
new file mode 100644
index 0000000..99bfb96
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/project-cost-center-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/project-cost-center-4.png b/erpnext/docs/assets/img/articles/project-cost-center-4.png
new file mode 100644
index 0000000..973e5d5
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/project-cost-center-4.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/project-cost-center-5.png b/erpnext/docs/assets/img/articles/project-cost-center-5.png
new file mode 100644
index 0000000..4312899
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/project-cost-center-5.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/project-cost-center-6.png b/erpnext/docs/assets/img/articles/project-cost-center-6.png
new file mode 100644
index 0000000..fa856de
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/project-cost-center-6.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/purchase-other-charges-1.png b/erpnext/docs/assets/img/articles/purchase-other-charges-1.png
new file mode 100644
index 0000000..f22660d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/purchase-other-charges-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/rename-user-1.png b/erpnext/docs/assets/img/articles/rename-user-1.png
new file mode 100644
index 0000000..b141869
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/rename-user-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/rename-user-2.png b/erpnext/docs/assets/img/articles/rename-user-2.png
new file mode 100644
index 0000000..53ef944
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/rename-user-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/reorder-request-1.png b/erpnext/docs/assets/img/articles/reorder-request-1.png
new file mode 100644
index 0000000..ca9b2b0
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/reorder-request-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/reorder-request-2.png b/erpnext/docs/assets/img/articles/reorder-request-2.png
new file mode 100644
index 0000000..7ed3b03
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/reorder-request-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/reorder-request-3.png b/erpnext/docs/assets/img/articles/reorder-request-3.png
new file mode 100644
index 0000000..a4e4f07
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/reorder-request-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/repack-1.png b/erpnext/docs/assets/img/articles/repack-1.png
new file mode 100644
index 0000000..d084299
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/repack-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/repack-2.png b/erpnext/docs/assets/img/articles/repack-2.png
new file mode 100644
index 0000000..5b0f4df
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/repack-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/search-by-1.png b/erpnext/docs/assets/img/articles/search-by-1.png
new file mode 100644
index 0000000..044ed2c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/search-by-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/search-by-2.png b/erpnext/docs/assets/img/articles/search-by-2.png
new file mode 100644
index 0000000..9a3f60d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/search-by-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/serial-naming-1.png b/erpnext/docs/assets/img/articles/serial-naming-1.png
new file mode 100644
index 0000000..964363a
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/serial-naming-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/serial-naming-2.png b/erpnext/docs/assets/img/articles/serial-naming-2.png
new file mode 100644
index 0000000..12336df
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/serial-naming-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/serial-naming-3.png b/erpnext/docs/assets/img/articles/serial-naming-3.png
new file mode 100644
index 0000000..17ecdcf
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/serial-naming-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/serial-naming-4.png b/erpnext/docs/assets/img/articles/serial-naming-4.png
new file mode 100644
index 0000000..6b3d52c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/serial-naming-4.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/set-language-1.gif b/erpnext/docs/assets/img/articles/set-language-1.gif
new file mode 100644
index 0000000..3f1a3ef
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/set-language-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/set-language-2.gif b/erpnext/docs/assets/img/articles/set-language-2.gif
new file mode 100644
index 0000000..62d24cf
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/set-language-2.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/sort-order-1.png b/erpnext/docs/assets/img/articles/sort-order-1.png
new file mode 100644
index 0000000..aa38eee
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/sort-order-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/sort-order-2.png b/erpnext/docs/assets/img/articles/sort-order-2.png
new file mode 100644
index 0000000..445e88a
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/sort-order-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/stock-entry-issue.png b/erpnext/docs/assets/img/articles/stock-entry-issue.png
new file mode 100644
index 0000000..eb47037
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/stock-entry-issue.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/stock-entry-manufacture-transfer.gif b/erpnext/docs/assets/img/articles/stock-entry-manufacture-transfer.gif
new file mode 100644
index 0000000..20379ff
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/stock-entry-manufacture-transfer.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/stock-entry-manufacture.gif b/erpnext/docs/assets/img/articles/stock-entry-manufacture.gif
new file mode 100644
index 0000000..a36c18d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/stock-entry-manufacture.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/stock-entry-receipt.png b/erpnext/docs/assets/img/articles/stock-entry-receipt.png
new file mode 100644
index 0000000..44f62aa
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/stock-entry-receipt.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/stock-entry-subcontract.gif b/erpnext/docs/assets/img/articles/stock-entry-subcontract.gif
new file mode 100644
index 0000000..f952654
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/stock-entry-subcontract.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/stock-entry-transfer.png b/erpnext/docs/assets/img/articles/stock-entry-transfer.png
new file mode 100644
index 0000000..04bd881
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/stock-entry-transfer.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/supplier-item-code-in-purchase-order.png b/erpnext/docs/assets/img/articles/supplier-item-code-in-purchase-order.png
new file mode 100644
index 0000000..ad00657
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/supplier-item-code-in-purchase-order.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/supplier-item-code.png b/erpnext/docs/assets/img/articles/supplier-item-code.png
new file mode 100644
index 0000000..1ad1b16
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/supplier-item-code.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/territory-1.gif b/erpnext/docs/assets/img/articles/territory-1.gif
new file mode 100644
index 0000000..5a578d1
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/territory-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/territory-2.png b/erpnext/docs/assets/img/articles/territory-2.png
new file mode 100644
index 0000000..4ce6c62
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/territory-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/territory-3.png b/erpnext/docs/assets/img/articles/territory-3.png
new file mode 100644
index 0000000..24f6111
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/territory-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/uom-fraction-1.png b/erpnext/docs/assets/img/articles/uom-fraction-1.png
new file mode 100644
index 0000000..081627b
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/uom-fraction-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/uom-fraction-2.png b/erpnext/docs/assets/img/articles/uom-fraction-2.png
new file mode 100644
index 0000000..831106b
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/uom-fraction-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/update-stock.png b/erpnext/docs/assets/img/articles/update-stock.png
new file mode 100644
index 0000000..9b21d6d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/update-stock.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/leave-allocation-tool.png b/erpnext/docs/assets/img/human-resources/leave-allocation-tool.png
new file mode 100644
index 0000000..c79bd95
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/leave-allocation-tool.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/leave-block-list.png b/erpnext/docs/assets/img/human-resources/leave-block-list.png
new file mode 100644
index 0000000..bd0aa15
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/leave-block-list.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/manual-leave-allocation.png b/erpnext/docs/assets/img/human-resources/manual-leave-allocation.png
new file mode 100644
index 0000000..67ad814
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/manual-leave-allocation.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/new-leave-application.png b/erpnext/docs/assets/img/human-resources/new-leave-application.png
new file mode 100644
index 0000000..e02b7dd
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/new-leave-application.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/new-leave-type.png b/erpnext/docs/assets/img/human-resources/new-leave-type.png
new file mode 100644
index 0000000..3004b09
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/new-leave-type.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/key-workflows.png b/erpnext/docs/assets/img/setup/key-workflows.png
new file mode 100644
index 0000000..b62b09e
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/key-workflows.png
Binary files differ
diff --git a/erpnext/docs/assets/img/videos/conf-2015.jpg b/erpnext/docs/assets/img/videos/conf-2015.jpg
new file mode 100644
index 0000000..c8f0591
--- /dev/null
+++ b/erpnext/docs/assets/img/videos/conf-2015.jpg
Binary files differ
diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.item_variant.html b/erpnext/docs/current/api/controllers/erpnext.controllers.item_variant.html
index 3720e82..39f6545 100644
--- a/erpnext/docs/current/api/controllers/erpnext.controllers.item_variant.html
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.item_variant.html
@@ -100,7 +100,7 @@
         <a name="erpnext.controllers.item_variant.find_variant" href="#erpnext.controllers.item_variant.find_variant" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		erpnext.controllers.item_variant.<b>find_variant</b>
-        <i class="text-muted">(item, args)</i>
+        <i class="text-muted">(template, args, variant_item_code=None)</i>
     </p>
 	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
 </div>
@@ -118,7 +118,7 @@
         <a name="erpnext.controllers.item_variant.get_variant" href="#erpnext.controllers.item_variant.get_variant" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		erpnext.controllers.item_variant.<b>get_variant</b>
-        <i class="text-muted">(item, args)</i>
+        <i class="text-muted">(template, args, variant=None)</i>
     </p>
 	<div class="docs-attr-desc"><p>Validates Attributes and their Values, then looks for an exactly matching Item Variant</p>
 
diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html b/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html
index eb34f9b..fddc5d7 100644
--- a/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html
@@ -33,7 +33,7 @@
         <a name="_update_children" href="#_update_children" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>_update_children</b>
-        <i class="text-muted">(self, args)</i>
+        <i class="text-muted">(self, args, update_modified)</i>
     </p>
 	<div class="docs-attr-desc"><p>Update quantities or amount in child table</p>
 </div>
@@ -44,10 +44,38 @@
     
     
 	<p class="docs-attr-name">
+        <a name="_update_modified" href="#_update_modified" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>_update_modified</b>
+        <i class="text-muted">(self, args, update_modified)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="_update_percent_field" href="#_update_percent_field" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>_update_percent_field</b>
-        <i class="text-muted">(self, args)</i>
+        <i class="text-muted">(self, args, update_modified=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Update percent field in parent transaction</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="_update_percent_field_in_targets" href="#_update_percent_field_in_targets" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>_update_percent_field_in_targets</b>
+        <i class="text-muted">(self, args, update_modified=True)</i>
     </p>
 	<div class="docs-attr-desc"><p>Update percent field in parent transaction</p>
 </div>
@@ -131,14 +159,14 @@
         <a name="update_qty" href="#update_qty" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>update_qty</b>
-        <i class="text-muted">(self, change_modified=True)</i>
+        <i class="text-muted">(self, update_modified=True)</i>
     </p>
 	<div class="docs-attr-desc"><p>Updates qty or amount at row level</p>
 
 <p><strong>Parameters:</strong></p>
 
 <ul>
-<li><strong><code>change_modified</code></strong> -  If true, updates <code>modified</code> and <code>modified_by</code> for target parent doc</li>
+<li><strong><code>update_modified</code></strong> -  If true, updates <code>modified</code> and <code>modified_by</code> for target parent doc</li>
 </ul>
 </div>
 	<br>
diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html b/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html
index fd3dc8c..f0833eb 100644
--- a/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html
@@ -195,6 +195,20 @@
     
     
 	<p class="docs-attr-name">
+        <a name="update_billing_percentage" href="#update_billing_percentage" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_billing_percentage</b>
+        <i class="text-muted">(self, update_modified=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="update_reserved_qty" href="#update_reserved_qty" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>update_reserved_qty</b>
diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html b/erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html
index f0c8a32..27f4ccd 100644
--- a/erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html
@@ -336,6 +336,20 @@
     
     
 	<p class="docs-attr-name">
+        <a name="set_discount_amount" href="#set_discount_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_discount_amount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="set_item_wise_tax" href="#set_item_wise_tax" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>set_item_wise_tax</b>
diff --git a/erpnext/docs/current/api/setup/erpnext.setup.install.html b/erpnext/docs/current/api/setup/erpnext.setup.install.html
index a1c18af..02c58d2 100644
--- a/erpnext/docs/current/api/setup/erpnext.setup.install.html
+++ b/erpnext/docs/current/api/setup/erpnext.setup.install.html
@@ -50,6 +50,22 @@
     
     
 	<p class="docs-attr-name">
+        <a name="erpnext.setup.install.check_setup_wizard_not_completed" href="#erpnext.setup.install.check_setup_wizard_not_completed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.install.<b>check_setup_wizard_not_completed</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="erpnext.setup.install.feature_setup" href="#erpnext.setup.install.feature_setup" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		erpnext.setup.install.<b>feature_setup</b>
diff --git a/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html
index 83a4a23..db1c3f3 100644
--- a/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html
+++ b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html
@@ -34,6 +34,22 @@
     
     
 	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_bank_account" href="#erpnext.setup.setup_wizard.setup_wizard.create_bank_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_bank_account</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="erpnext.setup.setup_wizard.setup_wizard.create_contact" href="#erpnext.setup.setup_wizard.setup_wizard.create_contact" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		erpnext.setup.setup_wizard.setup_wizard.<b>create_contact</b>
diff --git a/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html b/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html
index 8724808..bce01a4 100644
--- a/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html
+++ b/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html
@@ -23,23 +23,34 @@
         <a name="erpnext.stock.get_item_details.apply_price_list" href="#erpnext.stock.get_item_details.apply_price_list" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		erpnext.stock.get_item_details.<b>apply_price_list</b>
-        <i class="text-muted">(args)</i>
+        <i class="text-muted">(args, as_doc=False)</i>
     </p>
-	<div class="docs-attr-desc"><p>args = {
-    "item<em>list": [{"doctype": "", "name": "", "item</em>code": "", "brand": "", "item<em>group": ""}, ...],
-    "conversion</em>rate": 1.0,
-    "selling<em>price</em>list": None,
-    "price<em>list</em>currency": None,
-    "plc<em>conversion</em>rate": 1.0,
-    "parenttype": "",
-    "parent": "",
+	<div class="docs-attr-desc"><p>Apply pricelist on a document-like dict object and return as
+{'parent': dict, 'children': list}</p>
+
+<p><strong>Parameters:</strong></p>
+
+<ul>
+<li><strong><code>args</code></strong> -  See below</li>
+<li><p><strong><code>as_doc</code></strong> -  Updates value in the passed dict</p>
+
+<p>args = {
+    "doctype": "",
+    "name": "",
+    "items": [{"doctype": "", "name": "", "item<em>code": "", "brand": "", "item</em>group": ""}, ...],
+    "conversion<em>rate": 1.0,
+    "selling</em>price<em>list": None,
+    "price</em>list<em>currency": None,
+    "plc</em>conversion<em>rate": 1.0,
+    "doctype": "",
+    "name": "",
     "supplier": None,
-    "transaction<em>date": None,
-    "conversion</em>rate": 1.0,
-    "buying<em>price</em>list": None,
-    "transaction<em>type": "selling",
+    "transaction</em>date": None,
+    "conversion<em>rate": 1.0,
+    "buying</em>price<em>list": None,
     "ignore</em>pricing_rule": 0/1
-}</p>
+}</p></li>
+</ul>
 </div>
 	<br>
 
@@ -251,16 +262,15 @@
     "selling<em>price</em>list": None,
     "price<em>list</em>currency": None,
     "plc<em>conversion</em>rate": 1.0,
-    "parenttype": "",
-    "parent": "",
+    "doctype": "",
+    "name": "",
     "supplier": None,
     "transaction<em>date": None,
     "conversion</em>rate": 1.0,
     "buying<em>price</em>list": None,
     "is<em>subcontracted": "Yes" / "No",
-    "transaction</em>type": "selling",
-    "ignore<em>pricing</em>rule": 0/1
-    "project_name": ""
+    "ignore</em>pricing<em>rule": 0/1
+    "project</em>name": ""
 }</p>
 </div>
 	<br>
@@ -373,7 +383,7 @@
         <a name="erpnext.stock.get_item_details.get_price_list_rate_for" href="#erpnext.stock.get_item_details.get_price_list_rate_for" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		erpnext.stock.get_item_details.<b>get_price_list_rate_for</b>
-        <i class="text-muted">(args, item_code)</i>
+        <i class="text-muted">(price_list, item_code)</i>
     </p>
 	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
 </div>
diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html
index 6d00ab1..01071ee 100644
--- a/erpnext/docs/current/index.html
+++ b/erpnext/docs/current/index.html
@@ -35,7 +35,7 @@
 			Version
 		</td>
 		<td>
-			<code>6.12.11</code>
+			<code>6.17.0</code>
 		</td>
 	</tr>
 </table>
diff --git a/erpnext/docs/current/models/accounts/account.html b/erpnext/docs/current/models/accounts/account.html
index e70c6c2..37c774e 100644
--- a/erpnext/docs/current/models/accounts/account.html
+++ b/erpnext/docs/current/models/accounts/account.html
@@ -210,6 +210,7 @@
                 <pre>
 Bank
 Cash
+Depreciation
 Tax
 Chargeable
 Warehouse
@@ -581,6 +582,20 @@
     
     
 	<p class="docs-attr-name">
+        <a name="validate_group_or_ledger" href="#validate_group_or_ledger" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_group_or_ledger</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="validate_mandatory" href="#validate_mandatory" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>validate_mandatory</b>
@@ -849,6 +864,15 @@
             <li>
 
 
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_gateway_account">Payment Gateway Account</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
 <a href="https://frappe.github.io/erpnext/current/models/accounts/payment_reconciliation">Payment Reconciliation</a>
 
 </li>
@@ -945,10 +969,6 @@
 			
         
 			
-        
-			
-        
-			
             <li>
 
 
diff --git a/erpnext/docs/current/models/accounts/journal_entry.html b/erpnext/docs/current/models/accounts/journal_entry.html
index 4aab93c..fb29c5c 100644
--- a/erpnext/docs/current/models/accounts/journal_entry.html
+++ b/erpnext/docs/current/models/accounts/journal_entry.html
@@ -1215,7 +1215,7 @@
         <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_default_bank_cash_account</b>
-        <i class="text-muted">(company, voucher_type, mode_of_payment=None)</i>
+        <i class="text-muted">(company, voucher_type, mode_of_payment=None, account=None)</i>
     </p>
 	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
 </div>
@@ -1321,7 +1321,7 @@
         <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_payment_entry_against_invoice</b>
-        <i class="text-muted">(dt, dn)</i>
+        <i class="text-muted">(dt, dn, amount=None, journal_entry=False, bank_account=None)</i>
     </p>
 	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
 </div>
@@ -1339,7 +1339,7 @@
         <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_payment_entry_against_order</b>
-        <i class="text-muted">(dt, dn)</i>
+        <i class="text-muted">(dt, dn, amount=None, journal_entry=False, bank_account=None)</i>
     </p>
 	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
 </div>
diff --git a/erpnext/docs/current/models/accounts/payment_gateway.html b/erpnext/docs/current/models/accounts/payment_gateway.html
new file mode 100644
index 0000000..9707ba6
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/payment_gateway.html
@@ -0,0 +1,101 @@
+<!-- title: Payment Gateway -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/payment_gateway"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabPayment Gateway</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>gateway</code></td>
+            <td >
+                Data</td>
+            <td >
+                Gateway
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.payment_gateway.payment_gateway</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PaymentGateway</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_gateway_account">Payment Gateway Account</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file
diff --git a/erpnext/docs/current/models/accounts/payment_gateway_account.html b/erpnext/docs/current/models/accounts/payment_gateway_account.html
new file mode 100644
index 0000000..d48bdcd
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/payment_gateway_account.html
@@ -0,0 +1,273 @@
+<!-- title: Payment Gateway Account -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/payment_gateway_account"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabPayment Gateway Account</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>gateway</code></td>
+            <td >
+                Link</td>
+            <td >
+                Payment Gateway
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_gateway">Payment Gateway</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>is_default</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Default
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break_4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>payment_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Payment Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>currency</code></td>
+            <td >
+                Read Only</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                <pre>payment_account.account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>payment_request_message</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>message</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Default Payment Request Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>payment_url_message</code></td>
+            <td >
+                Data</td>
+            <td >
+                Payment URL Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>payment_success_url</code></td>
+            <td >
+                Data</td>
+            <td >
+                Payment Success URL
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.payment_gateway_account.payment_gateway_account</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PaymentGatewayAccount</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_as_default_if_not_set" href="#set_as_default_if_not_set" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_as_default_if_not_set</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_default_payment_gateway" href="#update_default_payment_gateway" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_default_payment_gateway</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_request">Payment Request</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file
diff --git a/erpnext/docs/current/models/accounts/payment_reconciliation.html b/erpnext/docs/current/models/accounts/payment_reconciliation.html
index 25a1ede..02e9dae 100644
--- a/erpnext/docs/current/models/accounts/payment_reconciliation.html
+++ b/erpnext/docs/current/models/accounts/payment_reconciliation.html
@@ -152,7 +152,7 @@
             <td >
                 Date</td>
             <td >
-                From Date
+                From Invoice Date
                 
             </td>
             <td></td>
@@ -164,7 +164,7 @@
             <td >
                 Date</td>
             <td >
-                To Date
+                To Invoice Date
                 
             </td>
             <td></td>
@@ -176,7 +176,7 @@
             <td >
                 Currency</td>
             <td >
-                Minimum Amount
+                Minimum Invoice Amount
                 
             </td>
             <td></td>
@@ -188,7 +188,7 @@
             <td >
                 Currency</td>
             <td >
-                Maximum Amount
+                Maximum Invoice Amount
                 
             </td>
             <td></td>
diff --git a/erpnext/docs/current/models/accounts/payment_request.html b/erpnext/docs/current/models/accounts/payment_request.html
new file mode 100644
index 0000000..668fff8
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/payment_request.html
@@ -0,0 +1,810 @@
+<!-- title: Payment Request -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/payment_request"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabPayment Request</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>payment_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Payment Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>make_sales_invoice</code></td>
+            <td >
+                Check</td>
+            <td >
+                Make Sales Invoice
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>column_break_5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Draft
+Initiated
+Paid
+Failed
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>section_break_7</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>payment_gateway</code></td>
+            <td >
+                Link</td>
+            <td >
+                Payment Gateway
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_gateway_account">Payment Gateway Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>payment_success_url</code></td>
+            <td >
+                Data</td>
+            <td >
+                Payment Success URL
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>column_break_9</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>gateway</code></td>
+            <td >
+                Read Only</td>
+            <td >
+                Gateway
+                
+            </td>
+            <td>
+                <pre>payment_gateway.gateway</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>payment_account</code></td>
+            <td >
+                Read Only</td>
+            <td >
+                Payment Account
+                
+            </td>
+            <td>
+                <pre>payment_gateway.payment_account</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>13</td>
+            <td ><code>recipient_and_message</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Recipient and Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>print_format</code></td>
+            <td >
+                Select</td>
+            <td >
+                Print Format
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>mute_email</code></td>
+            <td >
+                Check</td>
+            <td class="text-muted" title="Hidden">
+                Mute Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>email_to</code></td>
+            <td >
+                Data</td>
+            <td >
+                Email To
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>subject</code></td>
+            <td >
+                Data</td>
+            <td >
+                Subject
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>message</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>payment_url_message</code></td>
+            <td >
+                Data</td>
+            <td >
+                Payment URL Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>payment_url</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                payment_url
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>21</td>
+            <td ><code>reference_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Reference Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>reference_doctype</code></td>
+            <td >
+                Link</td>
+            <td >
+                Reference Doctype
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>reference_name</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Reference Name
+                
+            </td>
+            <td>
+                <pre>reference_doctype</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_request">Payment Request</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.payment_request.payment_request</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PaymentRequest</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_journal_entry" href="#create_journal_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_journal_entry</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>create entry</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_message" href="#get_message" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_message</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>return message with payment gateway link</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_payment_success_url" href="#get_payment_success_url" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_payment_success_url</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_payment_url" href="#get_payment_url" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_payment_url</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_communication_entry" href="#make_communication_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_communication_entry</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Make communication entry</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_invoice" href="#make_invoice" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_invoice</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update_after_submit" href="#on_update_after_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update_after_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="send_email" href="#send_email" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>send_email</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>send email with payment link</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="send_payment_request" href="#send_payment_request" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>send_payment_request</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_as_cancelled" href="#set_as_cancelled" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_as_cancelled</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_as_paid" href="#set_as_paid" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_as_paid</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_failed" href="#set_failed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_failed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_status" href="#set_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_status</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_currency" href="#validate_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_currency</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_payment_gateway" href="#validate_payment_gateway" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_payment_gateway</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_payment_gateway_account" href="#validate_payment_gateway_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_payment_gateway_account</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_payment_request" href="#validate_payment_request" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_payment_request</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.payment_request.payment_request.generate_payment_request</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.payment_request.payment_request.generate_payment_request" href="#erpnext.accounts.doctype.payment_request.payment_request.generate_payment_request" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.payment_request.payment_request.<b>generate_payment_request</b>
+        <i class="text-muted">(name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.payment_request.payment_request.get_amount" href="#erpnext.accounts.doctype.payment_request.payment_request.get_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.payment_request.payment_request.<b>get_amount</b>
+        <i class="text-muted">(ref_doc, dt)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get amount based on doctype</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.payment_request.payment_request.get_gateway_details" href="#erpnext.accounts.doctype.payment_request.payment_request.get_gateway_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.payment_request.payment_request.<b>get_gateway_details</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>return gateway and payment account of default payment gateway</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.payment_request.payment_request.get_print_format_list</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.payment_request.payment_request.get_print_format_list" href="#erpnext.accounts.doctype.payment_request.payment_request.get_print_format_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.payment_request.payment_request.<b>get_print_format_list</b>
+        <i class="text-muted">(ref_doctype)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.payment_request.payment_request.make_payment_request</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.payment_request.payment_request.make_payment_request" href="#erpnext.accounts.doctype.payment_request.payment_request.make_payment_request" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.payment_request.payment_request.<b>make_payment_request</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p>Make payment request</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email" href="#erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.payment_request.payment_request.<b>resend_payment_email</b>
+        <i class="text-muted">(docname)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_request">Payment Request</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file
diff --git a/erpnext/docs/current/models/accounts/pricing_rule.html b/erpnext/docs/current/models/accounts/pricing_rule.html
index 67e561f..5539128 100644
--- a/erpnext/docs/current/models/accounts/pricing_rule.html
+++ b/erpnext/docs/current/models/accounts/pricing_rule.html
@@ -814,21 +814,21 @@
         <i class="text-muted">(args)</i>
     </p>
 	<div class="docs-attr-desc"><p>args = {
-    "item<em>list": [{"doctype": "", "name": "", "item</em>code": "", "brand": "", "item<em>group": ""}, ...],
+    "items": [{"doctype": "", "name": "", "item<em>code": "", "brand": "", "item</em>group": ""}, ...],
     "customer": "something",
-    "customer</em>group": "something",
+    "customer<em>group": "something",
     "territory": "something",
     "supplier": "something",
-    "supplier<em>type": "something",
+    "supplier</em>type": "something",
     "currency": "something",
-    "conversion</em>rate": "something",
-    "price<em>list": "something",
-    "plc</em>conversion<em>rate": "something",
+    "conversion<em>rate": "something",
+    "price</em>list": "something",
+    "plc<em>conversion</em>rate": "something",
     "company": "something",
-    "transaction</em>date": "something",
+    "transaction<em>date": "something",
     "campaign": "something",
-    "sales<em>partner": "something",
-    "ignore</em>pricing_rule": "something"
+    "sales</em>partner": "something",
+    "ignore<em>pricing</em>rule": "something"
 }</p>
 </div>
 	<br>
diff --git a/erpnext/docs/current/models/accounts/purchase_invoice.html b/erpnext/docs/current/models/accounts/purchase_invoice.html
index 31658d8..1bdbcbf 100644
--- a/erpnext/docs/current/models/accounts/purchase_invoice.html
+++ b/erpnext/docs/current/models/accounts/purchase_invoice.html
@@ -717,32 +717,6 @@
         
         <tr >
             <td>47</td>
-            <td ><code>column_break_46</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>48</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>49</td>
             <td ><code>base_discount_amount</code></td>
             <td >
                 Currency</td>
@@ -755,8 +729,46 @@
             </td>
         </tr>
         
-        <tr class="info">
+        <tr >
+            <td>48</td>
+            <td ><code>column_break_46</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
             <td>50</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>51</td>
             <td ><code>section_break_49</code></td>
             <td >
                 Section Break</td>
@@ -768,7 +780,7 @@
         </tr>
         
         <tr >
-            <td>51</td>
+            <td>52</td>
             <td ><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -782,7 +794,7 @@
         </tr>
         
         <tr >
-            <td>52</td>
+            <td>53</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -794,7 +806,7 @@
         </tr>
         
         <tr >
-            <td>53</td>
+            <td>54</td>
             <td ><code>column_break8</code></td>
             <td class="info">
                 Column Break</td>
@@ -806,7 +818,7 @@
         </tr>
         
         <tr >
-            <td>54</td>
+            <td>55</td>
             <td ><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -820,7 +832,7 @@
         </tr>
         
         <tr >
-            <td>55</td>
+            <td>56</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -832,7 +844,7 @@
         </tr>
         
         <tr >
-            <td>56</td>
+            <td>57</td>
             <td ><code>total_advance</code></td>
             <td >
                 Currency</td>
@@ -846,7 +858,7 @@
         </tr>
         
         <tr >
-            <td>57</td>
+            <td>58</td>
             <td ><code>outstanding_amount</code></td>
             <td >
                 Currency</td>
@@ -860,7 +872,7 @@
         </tr>
         
         <tr class="info">
-            <td>58</td>
+            <td>59</td>
             <td ><code>write_off</code></td>
             <td >
                 Section Break</td>
@@ -872,7 +884,7 @@
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>60</td>
             <td ><code>write_off_amount</code></td>
             <td >
                 Currency</td>
@@ -886,7 +898,7 @@
         </tr>
         
         <tr >
-            <td>60</td>
+            <td>61</td>
             <td ><code>base_write_off_amount</code></td>
             <td >
                 Currency</td>
@@ -900,7 +912,7 @@
         </tr>
         
         <tr >
-            <td>61</td>
+            <td>62</td>
             <td ><code>column_break_61</code></td>
             <td class="info">
                 Column Break</td>
@@ -912,7 +924,7 @@
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>63</td>
             <td ><code>write_off_account</code></td>
             <td >
                 Link</td>
@@ -933,7 +945,7 @@
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>64</td>
             <td ><code>write_off_cost_center</code></td>
             <td >
                 Link</td>
@@ -954,7 +966,7 @@
         </tr>
         
         <tr class="info">
-            <td>64</td>
+            <td>65</td>
             <td ><code>advances_section</code></td>
             <td >
                 Section Break</td>
@@ -968,7 +980,7 @@
         </tr>
         
         <tr >
-            <td>65</td>
+            <td>66</td>
             <td ><code>get_advances_paid</code></td>
             <td >
                 Button</td>
@@ -982,7 +994,7 @@
         </tr>
         
         <tr >
-            <td>66</td>
+            <td>67</td>
             <td ><code>advances</code></td>
             <td >
                 Table</td>
@@ -1003,7 +1015,7 @@
         </tr>
         
         <tr class="info">
-            <td>67</td>
+            <td>68</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -1017,7 +1029,7 @@
         </tr>
         
         <tr >
-            <td>68</td>
+            <td>69</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -1038,7 +1050,7 @@
         </tr>
         
         <tr >
-            <td>69</td>
+            <td>70</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -1050,7 +1062,7 @@
         </tr>
         
         <tr class="info">
-            <td>70</td>
+            <td>71</td>
             <td ><code>contact_section</code></td>
             <td >
                 Section Break</td>
@@ -1064,7 +1076,7 @@
         </tr>
         
         <tr >
-            <td>71</td>
+            <td>72</td>
             <td ><code>supplier_address</code></td>
             <td >
                 Link</td>
@@ -1085,7 +1097,7 @@
         </tr>
         
         <tr >
-            <td>72</td>
+            <td>73</td>
             <td ><code>col_break23</code></td>
             <td class="info">
                 Column Break</td>
@@ -1097,7 +1109,7 @@
         </tr>
         
         <tr >
-            <td>73</td>
+            <td>74</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -1118,7 +1130,7 @@
         </tr>
         
         <tr class="info">
-            <td>74</td>
+            <td>75</td>
             <td ><code>printing_settings</code></td>
             <td >
                 Section Break</td>
@@ -1130,7 +1142,7 @@
         </tr>
         
         <tr >
-            <td>75</td>
+            <td>76</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1151,7 +1163,7 @@
         </tr>
         
         <tr >
-            <td>76</td>
+            <td>77</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1172,7 +1184,7 @@
         </tr>
         
         <tr class="info">
-            <td>77</td>
+            <td>78</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -1186,7 +1198,7 @@
         </tr>
         
         <tr >
-            <td>78</td>
+            <td>79</td>
             <td class="danger" title="Mandatory"><code>credit_to</code></td>
             <td >
                 Link</td>
@@ -1207,7 +1219,7 @@
         </tr>
         
         <tr >
-            <td>79</td>
+            <td>80</td>
             <td ><code>party_account_currency</code></td>
             <td >
                 Link</td>
@@ -1228,7 +1240,7 @@
         </tr>
         
         <tr >
-            <td>80</td>
+            <td>81</td>
             <td ><code>is_opening</code></td>
             <td >
                 Select</td>
@@ -1243,7 +1255,7 @@
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>82</td>
             <td ><code>due_date</code></td>
             <td >
                 Date</td>
@@ -1255,7 +1267,7 @@
         </tr>
         
         <tr >
-            <td>82</td>
+            <td>83</td>
             <td ><code>against_expense_account</code></td>
             <td >
                 Small Text</td>
@@ -1267,7 +1279,7 @@
         </tr>
         
         <tr >
-            <td>83</td>
+            <td>84</td>
             <td ><code>column_break_63</code></td>
             <td class="info">
                 Column Break</td>
@@ -1279,7 +1291,7 @@
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>85</td>
             <td ><code>mode_of_payment</code></td>
             <td >
                 Link</td>
@@ -1300,7 +1312,7 @@
         </tr>
         
         <tr >
-            <td>85</td>
+            <td>86</td>
             <td ><code>fiscal_year</code></td>
             <td >
                 Link</td>
@@ -1321,7 +1333,7 @@
         </tr>
         
         <tr >
-            <td>86</td>
+            <td>87</td>
             <td ><code>remarks</code></td>
             <td >
                 Small Text</td>
@@ -1333,7 +1345,7 @@
         </tr>
         
         <tr class="info">
-            <td>87</td>
+            <td>88</td>
             <td ><code>recurring_invoice</code></td>
             <td >
                 Section Break</td>
@@ -1347,7 +1359,7 @@
         </tr>
         
         <tr >
-            <td>88</td>
+            <td>89</td>
             <td ><code>is_recurring</code></td>
             <td >
                 Check</td>
@@ -1359,7 +1371,7 @@
         </tr>
         
         <tr >
-            <td>89</td>
+            <td>90</td>
             <td ><code>recurring_type</code></td>
             <td >
                 Select</td>
@@ -1377,7 +1389,7 @@
         </tr>
         
         <tr >
-            <td>90</td>
+            <td>91</td>
             <td ><code>from_date</code></td>
             <td >
                 Date</td>
@@ -1390,7 +1402,7 @@
         </tr>
         
         <tr >
-            <td>91</td>
+            <td>92</td>
             <td ><code>to_date</code></td>
             <td >
                 Date</td>
@@ -1403,7 +1415,7 @@
         </tr>
         
         <tr >
-            <td>92</td>
+            <td>93</td>
             <td ><code>repeat_on_day_of_month</code></td>
             <td >
                 Int</td>
@@ -1416,7 +1428,7 @@
         </tr>
         
         <tr >
-            <td>93</td>
+            <td>94</td>
             <td ><code>end_date</code></td>
             <td >
                 Date</td>
@@ -1429,7 +1441,7 @@
         </tr>
         
         <tr >
-            <td>94</td>
+            <td>95</td>
             <td ><code>column_break_82</code></td>
             <td class="info">
                 Column Break</td>
@@ -1441,7 +1453,7 @@
         </tr>
         
         <tr >
-            <td>95</td>
+            <td>96</td>
             <td ><code>next_date</code></td>
             <td >
                 Date</td>
@@ -1454,7 +1466,7 @@
         </tr>
         
         <tr >
-            <td>96</td>
+            <td>97</td>
             <td ><code>recurring_id</code></td>
             <td >
                 Data</td>
@@ -1467,7 +1479,7 @@
         </tr>
         
         <tr >
-            <td>97</td>
+            <td>98</td>
             <td ><code>notification_email_address</code></td>
             <td >
                 Small Text</td>
@@ -1480,7 +1492,7 @@
         </tr>
         
         <tr >
-            <td>98</td>
+            <td>99</td>
             <td ><code>recurring_print_format</code></td>
             <td >
                 Link</td>
@@ -1739,6 +1751,20 @@
     
     
 	<p class="docs-attr-name">
+        <a name="update_billing_status_in_pr" href="#update_billing_status_in_pr" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_billing_status_in_pr</b>
+        <i class="text-muted">(self, update_modified=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="update_project" href="#update_project" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>update_project</b>
diff --git a/erpnext/docs/current/models/accounts/sales_invoice.html b/erpnext/docs/current/models/accounts/sales_invoice.html
index a6fc564..07e3212 100644
--- a/erpnext/docs/current/models/accounts/sales_invoice.html
+++ b/erpnext/docs/current/models/accounts/sales_invoice.html
@@ -810,32 +810,6 @@
         
         <tr >
             <td>53</td>
-            <td ><code>column_break_51</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>54</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>55</td>
             <td ><code>base_discount_amount</code></td>
             <td >
                 Currency</td>
@@ -848,8 +822,46 @@
             </td>
         </tr>
         
-        <tr class="info">
+        <tr >
+            <td>54</td>
+            <td ><code>column_break_51</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
             <td>56</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>57</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -863,7 +875,7 @@
         </tr>
         
         <tr >
-            <td>57</td>
+            <td>58</td>
             <td class="danger" title="Mandatory"><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -877,7 +889,7 @@
         </tr>
         
         <tr >
-            <td>58</td>
+            <td>59</td>
             <td ><code>base_rounded_total</code></td>
             <td >
                 Currency</td>
@@ -891,7 +903,7 @@
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>60</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -904,7 +916,7 @@
         </tr>
         
         <tr >
-            <td>60</td>
+            <td>61</td>
             <td ><code>column_break5</code></td>
             <td class="info">
                 Column Break</td>
@@ -916,7 +928,7 @@
         </tr>
         
         <tr >
-            <td>61</td>
+            <td>62</td>
             <td class="danger" title="Mandatory"><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -930,7 +942,7 @@
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>63</td>
             <td ><code>rounded_total</code></td>
             <td >
                 Currency</td>
@@ -944,7 +956,7 @@
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>64</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -956,7 +968,7 @@
         </tr>
         
         <tr >
-            <td>64</td>
+            <td>65</td>
             <td ><code>total_advance</code></td>
             <td >
                 Currency</td>
@@ -970,7 +982,7 @@
         </tr>
         
         <tr >
-            <td>65</td>
+            <td>66</td>
             <td ><code>outstanding_amount</code></td>
             <td >
                 Currency</td>
@@ -984,7 +996,7 @@
         </tr>
         
         <tr class="info">
-            <td>66</td>
+            <td>67</td>
             <td ><code>advances_section</code></td>
             <td >
                 Section Break</td>
@@ -998,7 +1010,7 @@
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>68</td>
             <td ><code>get_advances_received</code></td>
             <td >
                 Button</td>
@@ -1012,7 +1024,7 @@
         </tr>
         
         <tr >
-            <td>68</td>
+            <td>69</td>
             <td ><code>advances</code></td>
             <td >
                 Table</td>
@@ -1033,7 +1045,7 @@
         </tr>
         
         <tr class="info">
-            <td>69</td>
+            <td>70</td>
             <td ><code>payments_section</code></td>
             <td >
                 Section Break</td>
@@ -1047,7 +1059,7 @@
         </tr>
         
         <tr >
-            <td>70</td>
+            <td>71</td>
             <td ><code>mode_of_payment</code></td>
             <td >
                 Link</td>
@@ -1068,7 +1080,7 @@
         </tr>
         
         <tr >
-            <td>71</td>
+            <td>72</td>
             <td ><code>cash_bank_account</code></td>
             <td >
                 Link</td>
@@ -1089,7 +1101,7 @@
         </tr>
         
         <tr >
-            <td>72</td>
+            <td>73</td>
             <td ><code>column_break3</code></td>
             <td class="info">
                 Column Break</td>
@@ -1101,7 +1113,7 @@
         </tr>
         
         <tr >
-            <td>73</td>
+            <td>74</td>
             <td ><code>paid_amount</code></td>
             <td >
                 Currency</td>
@@ -1115,7 +1127,7 @@
         </tr>
         
         <tr >
-            <td>74</td>
+            <td>75</td>
             <td ><code>base_paid_amount</code></td>
             <td >
                 Currency</td>
@@ -1129,7 +1141,7 @@
         </tr>
         
         <tr class="info">
-            <td>75</td>
+            <td>76</td>
             <td ><code>column_break4</code></td>
             <td >
                 Section Break</td>
@@ -1141,7 +1153,7 @@
         </tr>
         
         <tr >
-            <td>76</td>
+            <td>77</td>
             <td ><code>write_off_amount</code></td>
             <td >
                 Currency</td>
@@ -1155,7 +1167,7 @@
         </tr>
         
         <tr >
-            <td>77</td>
+            <td>78</td>
             <td ><code>base_write_off_amount</code></td>
             <td >
                 Currency</td>
@@ -1169,7 +1181,7 @@
         </tr>
         
         <tr >
-            <td>78</td>
+            <td>79</td>
             <td ><code>write_off_outstanding_amount_automatically</code></td>
             <td >
                 Check</td>
@@ -1181,7 +1193,7 @@
         </tr>
         
         <tr >
-            <td>79</td>
+            <td>80</td>
             <td ><code>column_break_74</code></td>
             <td class="info">
                 Column Break</td>
@@ -1193,7 +1205,7 @@
         </tr>
         
         <tr >
-            <td>80</td>
+            <td>81</td>
             <td ><code>write_off_account</code></td>
             <td >
                 Link</td>
@@ -1214,7 +1226,7 @@
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>82</td>
             <td ><code>write_off_cost_center</code></td>
             <td >
                 Link</td>
@@ -1235,7 +1247,7 @@
         </tr>
         
         <tr class="info">
-            <td>82</td>
+            <td>83</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -1247,7 +1259,7 @@
         </tr>
         
         <tr >
-            <td>83</td>
+            <td>84</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -1268,7 +1280,7 @@
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>85</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -1280,7 +1292,7 @@
         </tr>
         
         <tr class="info">
-            <td>85</td>
+            <td>86</td>
             <td ><code>edit_printing_settings</code></td>
             <td >
                 Section Break</td>
@@ -1292,7 +1304,7 @@
         </tr>
         
         <tr >
-            <td>86</td>
+            <td>87</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1313,7 +1325,7 @@
         </tr>
         
         <tr >
-            <td>87</td>
+            <td>88</td>
             <td ><code>column_break_84</code></td>
             <td class="info">
                 Column Break</td>
@@ -1325,7 +1337,7 @@
         </tr>
         
         <tr >
-            <td>88</td>
+            <td>89</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1346,7 +1358,7 @@
         </tr>
         
         <tr class="info">
-            <td>89</td>
+            <td>90</td>
             <td ><code>contact_section</code></td>
             <td >
                 Section Break</td>
@@ -1360,7 +1372,7 @@
         </tr>
         
         <tr >
-            <td>90</td>
+            <td>91</td>
             <td ><code>project_name</code></td>
             <td >
                 Link</td>
@@ -1381,7 +1393,7 @@
         </tr>
         
         <tr >
-            <td>91</td>
+            <td>92</td>
             <td class="danger" title="Mandatory"><code>territory</code></td>
             <td >
                 Link</td>
@@ -1402,7 +1414,7 @@
         </tr>
         
         <tr >
-            <td>92</td>
+            <td>93</td>
             <td ><code>customer_group</code></td>
             <td >
                 Link</td>
@@ -1423,7 +1435,7 @@
         </tr>
         
         <tr >
-            <td>93</td>
+            <td>94</td>
             <td ><code>col_break23</code></td>
             <td class="info">
                 Column Break</td>
@@ -1435,7 +1447,7 @@
         </tr>
         
         <tr >
-            <td>94</td>
+            <td>95</td>
             <td ><code>customer_address</code></td>
             <td >
                 Link</td>
@@ -1456,7 +1468,7 @@
         </tr>
         
         <tr >
-            <td>95</td>
+            <td>96</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -1477,7 +1489,7 @@
         </tr>
         
         <tr >
-            <td>96</td>
+            <td>97</td>
             <td ><code>campaign</code></td>
             <td >
                 Link</td>
@@ -1498,7 +1510,7 @@
         </tr>
         
         <tr >
-            <td>97</td>
+            <td>98</td>
             <td ><code>source</code></td>
             <td >
                 Select</td>
@@ -1521,7 +1533,7 @@
         </tr>
         
         <tr class="info">
-            <td>98</td>
+            <td>99</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -1535,7 +1547,7 @@
         </tr>
         
         <tr >
-            <td>99</td>
+            <td>100</td>
             <td class="danger" title="Mandatory"><code>debit_to</code></td>
             <td >
                 Link</td>
@@ -1556,7 +1568,7 @@
         </tr>
         
         <tr >
-            <td>100</td>
+            <td>101</td>
             <td ><code>party_account_currency</code></td>
             <td >
                 Link</td>
@@ -1577,7 +1589,7 @@
         </tr>
         
         <tr >
-            <td>101</td>
+            <td>102</td>
             <td ><code>is_opening</code></td>
             <td >
                 Select</td>
@@ -1592,7 +1604,7 @@
         </tr>
         
         <tr >
-            <td>102</td>
+            <td>103</td>
             <td ><code>c_form_applicable</code></td>
             <td >
                 Select</td>
@@ -1607,7 +1619,7 @@
         </tr>
         
         <tr >
-            <td>103</td>
+            <td>104</td>
             <td ><code>c_form_no</code></td>
             <td >
                 Link</td>
@@ -1628,7 +1640,7 @@
         </tr>
         
         <tr >
-            <td>104</td>
+            <td>105</td>
             <td ><code>column_break8</code></td>
             <td class="info">
                 Column Break</td>
@@ -1640,7 +1652,7 @@
         </tr>
         
         <tr >
-            <td>105</td>
+            <td>106</td>
             <td ><code>posting_time</code></td>
             <td >
                 Time</td>
@@ -1652,7 +1664,7 @@
         </tr>
         
         <tr >
-            <td>106</td>
+            <td>107</td>
             <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
             <td >
                 Link</td>
@@ -1673,7 +1685,7 @@
         </tr>
         
         <tr >
-            <td>107</td>
+            <td>108</td>
             <td ><code>remarks</code></td>
             <td >
                 Small Text</td>
@@ -1685,7 +1697,7 @@
         </tr>
         
         <tr class="info">
-            <td>108</td>
+            <td>109</td>
             <td ><code>sales_team_section_break</code></td>
             <td >
                 Section Break</td>
@@ -1699,7 +1711,7 @@
         </tr>
         
         <tr >
-            <td>109</td>
+            <td>110</td>
             <td ><code>sales_partner</code></td>
             <td >
                 Link</td>
@@ -1720,7 +1732,7 @@
         </tr>
         
         <tr >
-            <td>110</td>
+            <td>111</td>
             <td ><code>column_break10</code></td>
             <td class="info">
                 Column Break</td>
@@ -1732,7 +1744,7 @@
         </tr>
         
         <tr >
-            <td>111</td>
+            <td>112</td>
             <td ><code>commission_rate</code></td>
             <td >
                 Float</td>
@@ -1744,7 +1756,7 @@
         </tr>
         
         <tr >
-            <td>112</td>
+            <td>113</td>
             <td ><code>total_commission</code></td>
             <td >
                 Currency</td>
@@ -1758,7 +1770,7 @@
         </tr>
         
         <tr class="info">
-            <td>113</td>
+            <td>114</td>
             <td ><code>section_break2</code></td>
             <td >
                 Section Break</td>
@@ -1770,7 +1782,7 @@
         </tr>
         
         <tr >
-            <td>114</td>
+            <td>115</td>
             <td ><code>sales_team</code></td>
             <td >
                 Table</td>
@@ -1791,7 +1803,7 @@
         </tr>
         
         <tr class="info">
-            <td>115</td>
+            <td>116</td>
             <td ><code>recurring_invoice</code></td>
             <td >
                 Section Break</td>
@@ -1805,7 +1817,7 @@
         </tr>
         
         <tr >
-            <td>116</td>
+            <td>117</td>
             <td ><code>column_break11</code></td>
             <td class="info">
                 Column Break</td>
@@ -1817,7 +1829,7 @@
         </tr>
         
         <tr >
-            <td>117</td>
+            <td>118</td>
             <td ><code>is_recurring</code></td>
             <td >
                 Check</td>
@@ -1830,7 +1842,7 @@
         </tr>
         
         <tr >
-            <td>118</td>
+            <td>119</td>
             <td ><code>recurring_type</code></td>
             <td >
                 Select</td>
@@ -1849,7 +1861,7 @@
         </tr>
         
         <tr >
-            <td>119</td>
+            <td>120</td>
             <td ><code>from_date</code></td>
             <td >
                 Date</td>
@@ -1862,7 +1874,7 @@
         </tr>
         
         <tr >
-            <td>120</td>
+            <td>121</td>
             <td ><code>to_date</code></td>
             <td >
                 Date</td>
@@ -1875,7 +1887,7 @@
         </tr>
         
         <tr >
-            <td>121</td>
+            <td>122</td>
             <td ><code>repeat_on_day_of_month</code></td>
             <td >
                 Int</td>
@@ -1888,7 +1900,7 @@
         </tr>
         
         <tr >
-            <td>122</td>
+            <td>123</td>
             <td ><code>end_date</code></td>
             <td >
                 Date</td>
@@ -1901,7 +1913,7 @@
         </tr>
         
         <tr >
-            <td>123</td>
+            <td>124</td>
             <td ><code>column_break12</code></td>
             <td class="info">
                 Column Break</td>
@@ -1913,7 +1925,7 @@
         </tr>
         
         <tr >
-            <td>124</td>
+            <td>125</td>
             <td ><code>next_date</code></td>
             <td >
                 Date</td>
@@ -1927,7 +1939,7 @@
         </tr>
         
         <tr >
-            <td>125</td>
+            <td>126</td>
             <td ><code>recurring_id</code></td>
             <td >
                 Data</td>
@@ -1940,7 +1952,7 @@
         </tr>
         
         <tr >
-            <td>126</td>
+            <td>127</td>
             <td ><code>notification_email_address</code></td>
             <td >
                 Small Text</td>
@@ -1953,7 +1965,7 @@
         </tr>
         
         <tr >
-            <td>127</td>
+            <td>128</td>
             <td ><code>recurring_print_format</code></td>
             <td >
                 Link</td>
@@ -1974,7 +1986,7 @@
         </tr>
         
         <tr >
-            <td>128</td>
+            <td>129</td>
             <td ><code>against_income_account</code></td>
             <td >
                 Small Text</td>
@@ -2350,6 +2362,20 @@
     
     
 	<p class="docs-attr-name">
+        <a name="update_billing_status_in_dn" href="#update_billing_status_in_dn" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_billing_status_in_dn</b>
+        <i class="text-muted">(self, update_modified=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="update_current_stock" href="#update_current_stock" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>update_current_stock</b>
diff --git a/erpnext/docs/current/models/buying/purchase_order.html b/erpnext/docs/current/models/buying/purchase_order.html
index 0ca4863..c627191 100644
--- a/erpnext/docs/current/models/buying/purchase_order.html
+++ b/erpnext/docs/current/models/buying/purchase_order.html
@@ -101,6 +101,18 @@
         
         <tr >
             <td>5</td>
+            <td ><code>get_items_from_open_material_requests</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Items from Open Material Requests
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
             <td ><code>is_subcontracted</code></td>
             <td >
                 Select</td>
@@ -115,7 +127,7 @@
         </tr>
         
         <tr >
-            <td>6</td>
+            <td>7</td>
             <td ><code>supplier_name</code></td>
             <td >
                 Data</td>
@@ -127,7 +139,7 @@
         </tr>
         
         <tr >
-            <td>7</td>
+            <td>8</td>
             <td ><code>address_display</code></td>
             <td >
                 Small Text</td>
@@ -139,7 +151,7 @@
         </tr>
         
         <tr >
-            <td>8</td>
+            <td>9</td>
             <td ><code>contact_display</code></td>
             <td >
                 Small Text</td>
@@ -151,7 +163,7 @@
         </tr>
         
         <tr >
-            <td>9</td>
+            <td>10</td>
             <td ><code>contact_mobile</code></td>
             <td >
                 Small Text</td>
@@ -163,7 +175,7 @@
         </tr>
         
         <tr >
-            <td>10</td>
+            <td>11</td>
             <td ><code>contact_email</code></td>
             <td >
                 Small Text</td>
@@ -175,7 +187,7 @@
         </tr>
         
         <tr >
-            <td>11</td>
+            <td>12</td>
             <td ><code>column_break1</code></td>
             <td class="info">
                 Column Break</td>
@@ -187,7 +199,7 @@
         </tr>
         
         <tr >
-            <td>12</td>
+            <td>13</td>
             <td class="danger" title="Mandatory"><code>transaction_date</code></td>
             <td >
                 Date</td>
@@ -199,7 +211,7 @@
         </tr>
         
         <tr >
-            <td>13</td>
+            <td>14</td>
             <td ><code>amended_from</code></td>
             <td >
                 Link</td>
@@ -220,7 +232,7 @@
         </tr>
         
         <tr >
-            <td>14</td>
+            <td>15</td>
             <td class="danger" title="Mandatory"><code>company</code></td>
             <td >
                 Link</td>
@@ -241,7 +253,7 @@
         </tr>
         
         <tr class="info">
-            <td>15</td>
+            <td>16</td>
             <td ><code>drop_ship</code></td>
             <td >
                 Section Break</td>
@@ -253,7 +265,7 @@
         </tr>
         
         <tr >
-            <td>16</td>
+            <td>17</td>
             <td ><code>customer</code></td>
             <td >
                 Link</td>
@@ -274,7 +286,7 @@
         </tr>
         
         <tr >
-            <td>17</td>
+            <td>18</td>
             <td ><code>customer_name</code></td>
             <td >
                 Data</td>
@@ -286,7 +298,7 @@
         </tr>
         
         <tr >
-            <td>18</td>
+            <td>19</td>
             <td ><code>column_break_19</code></td>
             <td class="info">
                 Column Break</td>
@@ -298,7 +310,7 @@
         </tr>
         
         <tr >
-            <td>19</td>
+            <td>20</td>
             <td ><code>customer_address</code></td>
             <td >
                 Link</td>
@@ -319,7 +331,7 @@
         </tr>
         
         <tr >
-            <td>20</td>
+            <td>21</td>
             <td ><code>customer_contact_person</code></td>
             <td >
                 Link</td>
@@ -340,7 +352,7 @@
         </tr>
         
         <tr >
-            <td>21</td>
+            <td>22</td>
             <td ><code>customer_address_display</code></td>
             <td >
                 Small Text</td>
@@ -352,7 +364,7 @@
         </tr>
         
         <tr >
-            <td>22</td>
+            <td>23</td>
             <td ><code>customer_contact_display</code></td>
             <td >
                 Small Text</td>
@@ -364,7 +376,7 @@
         </tr>
         
         <tr >
-            <td>23</td>
+            <td>24</td>
             <td ><code>customer_contact_mobile</code></td>
             <td >
                 Small Text</td>
@@ -376,7 +388,7 @@
         </tr>
         
         <tr >
-            <td>24</td>
+            <td>25</td>
             <td ><code>customer_contact_email</code></td>
             <td >
                 Small Text</td>
@@ -388,7 +400,7 @@
         </tr>
         
         <tr class="info">
-            <td>25</td>
+            <td>26</td>
             <td ><code>currency_and_price_list</code></td>
             <td >
                 Section Break</td>
@@ -402,7 +414,7 @@
         </tr>
         
         <tr >
-            <td>26</td>
+            <td>27</td>
             <td class="danger" title="Mandatory"><code>currency</code></td>
             <td >
                 Link</td>
@@ -423,7 +435,7 @@
         </tr>
         
         <tr >
-            <td>27</td>
+            <td>28</td>
             <td class="danger" title="Mandatory"><code>conversion_rate</code></td>
             <td >
                 Float</td>
@@ -435,7 +447,7 @@
         </tr>
         
         <tr >
-            <td>28</td>
+            <td>29</td>
             <td ><code>cb_price_list</code></td>
             <td class="info">
                 Column Break</td>
@@ -447,7 +459,7 @@
         </tr>
         
         <tr >
-            <td>29</td>
+            <td>30</td>
             <td ><code>buying_price_list</code></td>
             <td >
                 Link</td>
@@ -468,7 +480,7 @@
         </tr>
         
         <tr >
-            <td>30</td>
+            <td>31</td>
             <td ><code>price_list_currency</code></td>
             <td >
                 Link</td>
@@ -489,7 +501,7 @@
         </tr>
         
         <tr >
-            <td>31</td>
+            <td>32</td>
             <td ><code>plc_conversion_rate</code></td>
             <td >
                 Float</td>
@@ -501,7 +513,7 @@
         </tr>
         
         <tr >
-            <td>32</td>
+            <td>33</td>
             <td ><code>ignore_pricing_rule</code></td>
             <td >
                 Check</td>
@@ -513,7 +525,7 @@
         </tr>
         
         <tr class="info">
-            <td>33</td>
+            <td>34</td>
             <td ><code>items_section</code></td>
             <td >
                 Section Break</td>
@@ -527,7 +539,7 @@
         </tr>
         
         <tr >
-            <td>34</td>
+            <td>35</td>
             <td ><code>items</code></td>
             <td >
                 Table</td>
@@ -547,8 +559,20 @@
             </td>
         </tr>
         
+        <tr >
+            <td>36</td>
+            <td ><code>get_last_purchase_rate</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get last purchase rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
         <tr class="info">
-            <td>35</td>
+            <td>37</td>
             <td ><code>sb_last_purchase</code></td>
             <td >
                 Section Break</td>
@@ -560,7 +584,7 @@
         </tr>
         
         <tr >
-            <td>36</td>
+            <td>38</td>
             <td ><code>base_total</code></td>
             <td >
                 Currency</td>
@@ -574,7 +598,7 @@
         </tr>
         
         <tr >
-            <td>37</td>
+            <td>39</td>
             <td ><code>base_net_total</code></td>
             <td >
                 Currency</td>
@@ -588,7 +612,7 @@
         </tr>
         
         <tr >
-            <td>38</td>
+            <td>40</td>
             <td ><code>column_break_26</code></td>
             <td class="info">
                 Column Break</td>
@@ -600,7 +624,7 @@
         </tr>
         
         <tr >
-            <td>39</td>
+            <td>41</td>
             <td ><code>total</code></td>
             <td >
                 Currency</td>
@@ -614,7 +638,7 @@
         </tr>
         
         <tr >
-            <td>40</td>
+            <td>42</td>
             <td ><code>net_total</code></td>
             <td >
                 Currency</td>
@@ -628,7 +652,7 @@
         </tr>
         
         <tr class="info">
-            <td>41</td>
+            <td>43</td>
             <td ><code>taxes_section</code></td>
             <td >
                 Section Break</td>
@@ -642,7 +666,7 @@
         </tr>
         
         <tr >
-            <td>42</td>
+            <td>44</td>
             <td ><code>taxes_and_charges</code></td>
             <td >
                 Link</td>
@@ -663,7 +687,7 @@
         </tr>
         
         <tr >
-            <td>43</td>
+            <td>45</td>
             <td ><code>taxes</code></td>
             <td >
                 Table</td>
@@ -684,7 +708,7 @@
         </tr>
         
         <tr >
-            <td>44</td>
+            <td>46</td>
             <td ><code>other_charges_calculation</code></td>
             <td >
                 HTML</td>
@@ -696,7 +720,7 @@
         </tr>
         
         <tr class="info">
-            <td>45</td>
+            <td>47</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -710,7 +734,7 @@
         </tr>
         
         <tr >
-            <td>46</td>
+            <td>48</td>
             <td ><code>base_taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -724,7 +748,7 @@
         </tr>
         
         <tr >
-            <td>47</td>
+            <td>49</td>
             <td ><code>base_taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -738,7 +762,7 @@
         </tr>
         
         <tr >
-            <td>48</td>
+            <td>50</td>
             <td ><code>base_total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -752,7 +776,7 @@
         </tr>
         
         <tr >
-            <td>49</td>
+            <td>51</td>
             <td ><code>column_break_39</code></td>
             <td class="info">
                 Column Break</td>
@@ -764,7 +788,7 @@
         </tr>
         
         <tr >
-            <td>50</td>
+            <td>52</td>
             <td ><code>taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -778,7 +802,7 @@
         </tr>
         
         <tr >
-            <td>51</td>
+            <td>53</td>
             <td ><code>taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -792,7 +816,7 @@
         </tr>
         
         <tr >
-            <td>52</td>
+            <td>54</td>
             <td ><code>total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -806,7 +830,7 @@
         </tr>
         
         <tr class="info">
-            <td>53</td>
+            <td>55</td>
             <td ><code>discount_section</code></td>
             <td >
                 Section Break</td>
@@ -818,7 +842,7 @@
         </tr>
         
         <tr >
-            <td>54</td>
+            <td>56</td>
             <td ><code>apply_discount_on</code></td>
             <td >
                 Select</td>
@@ -834,32 +858,6 @@
         </tr>
         
         <tr >
-            <td>55</td>
-            <td ><code>column_break_45</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>56</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
             <td>57</td>
             <td ><code>base_discount_amount</code></td>
             <td >
@@ -873,8 +871,46 @@
             </td>
         </tr>
         
-        <tr class="info">
+        <tr >
             <td>58</td>
+            <td ><code>column_break_45</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>59</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>60</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>61</td>
             <td ><code>totals_section</code></td>
             <td >
                 Section Break</td>
@@ -886,7 +922,7 @@
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>62</td>
             <td ><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -900,7 +936,7 @@
         </tr>
         
         <tr >
-            <td>60</td>
+            <td>63</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -913,7 +949,7 @@
         </tr>
         
         <tr >
-            <td>61</td>
+            <td>64</td>
             <td ><code>base_rounded_total</code></td>
             <td >
                 Currency</td>
@@ -927,7 +963,7 @@
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>65</td>
             <td ><code>advance_paid</code></td>
             <td >
                 Currency</td>
@@ -939,7 +975,7 @@
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>66</td>
             <td ><code>column_break4</code></td>
             <td class="info">
                 Column Break</td>
@@ -951,7 +987,7 @@
         </tr>
         
         <tr >
-            <td>64</td>
+            <td>67</td>
             <td ><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -965,7 +1001,7 @@
         </tr>
         
         <tr >
-            <td>65</td>
+            <td>68</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -977,7 +1013,7 @@
         </tr>
         
         <tr class="info">
-            <td>66</td>
+            <td>69</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -991,7 +1027,7 @@
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>70</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -1012,7 +1048,7 @@
         </tr>
         
         <tr >
-            <td>68</td>
+            <td>71</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -1024,7 +1060,7 @@
         </tr>
         
         <tr class="info">
-            <td>69</td>
+            <td>72</td>
             <td ><code>contact_section</code></td>
             <td >
                 Section Break</td>
@@ -1038,7 +1074,7 @@
         </tr>
         
         <tr >
-            <td>70</td>
+            <td>73</td>
             <td ><code>supplier_address</code></td>
             <td >
                 Link</td>
@@ -1059,7 +1095,7 @@
         </tr>
         
         <tr >
-            <td>71</td>
+            <td>74</td>
             <td ><code>cb_contact</code></td>
             <td class="info">
                 Column Break</td>
@@ -1071,7 +1107,7 @@
         </tr>
         
         <tr >
-            <td>72</td>
+            <td>75</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -1092,7 +1128,7 @@
         </tr>
         
         <tr class="info">
-            <td>73</td>
+            <td>76</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -1104,7 +1140,7 @@
         </tr>
         
         <tr >
-            <td>74</td>
+            <td>77</td>
             <td class="danger" title="Mandatory"><code>status</code></td>
             <td >
                 Select</td>
@@ -1127,7 +1163,7 @@
         </tr>
         
         <tr >
-            <td>75</td>
+            <td>78</td>
             <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
             <td >
                 Link</td>
@@ -1148,7 +1184,7 @@
         </tr>
         
         <tr >
-            <td>76</td>
+            <td>79</td>
             <td ><code>ref_sq</code></td>
             <td >
                 Data</td>
@@ -1160,7 +1196,7 @@
         </tr>
         
         <tr >
-            <td>77</td>
+            <td>80</td>
             <td ><code>column_break_74</code></td>
             <td class="info">
                 Column Break</td>
@@ -1172,7 +1208,7 @@
         </tr>
         
         <tr >
-            <td>78</td>
+            <td>81</td>
             <td ><code>per_received</code></td>
             <td >
                 Percent</td>
@@ -1184,7 +1220,7 @@
         </tr>
         
         <tr >
-            <td>79</td>
+            <td>82</td>
             <td ><code>per_billed</code></td>
             <td >
                 Percent</td>
@@ -1196,7 +1232,7 @@
         </tr>
         
         <tr class="info">
-            <td>80</td>
+            <td>83</td>
             <td ><code>column_break5</code></td>
             <td >
                 Section Break</td>
@@ -1208,7 +1244,7 @@
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>84</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1229,7 +1265,7 @@
         </tr>
         
         <tr >
-            <td>82</td>
+            <td>85</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1250,7 +1286,7 @@
         </tr>
         
         <tr class="info">
-            <td>83</td>
+            <td>86</td>
             <td ><code>raw_material_details</code></td>
             <td >
                 Section Break</td>
@@ -1264,7 +1300,7 @@
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>87</td>
             <td ><code>supplied_items</code></td>
             <td >
                 Table</td>
@@ -1285,7 +1321,7 @@
         </tr>
         
         <tr class="info">
-            <td>85</td>
+            <td>88</td>
             <td ><code>recurring_order</code></td>
             <td >
                 Section Break</td>
@@ -1299,7 +1335,7 @@
         </tr>
         
         <tr >
-            <td>86</td>
+            <td>89</td>
             <td ><code>column_break</code></td>
             <td class="info">
                 Column Break</td>
@@ -1311,7 +1347,7 @@
         </tr>
         
         <tr >
-            <td>87</td>
+            <td>90</td>
             <td ><code>is_recurring</code></td>
             <td >
                 Check</td>
@@ -1323,7 +1359,7 @@
         </tr>
         
         <tr >
-            <td>88</td>
+            <td>91</td>
             <td ><code>recurring_type</code></td>
             <td >
                 Select</td>
@@ -1340,7 +1376,7 @@
         </tr>
         
         <tr >
-            <td>89</td>
+            <td>92</td>
             <td ><code>from_date</code></td>
             <td >
                 Date</td>
@@ -1353,7 +1389,7 @@
         </tr>
         
         <tr >
-            <td>90</td>
+            <td>93</td>
             <td ><code>to_date</code></td>
             <td >
                 Date</td>
@@ -1366,7 +1402,7 @@
         </tr>
         
         <tr >
-            <td>91</td>
+            <td>94</td>
             <td ><code>repeat_on_day_of_month</code></td>
             <td >
                 Int</td>
@@ -1379,7 +1415,7 @@
         </tr>
         
         <tr >
-            <td>92</td>
+            <td>95</td>
             <td ><code>end_date</code></td>
             <td >
                 Date</td>
@@ -1392,7 +1428,7 @@
         </tr>
         
         <tr >
-            <td>93</td>
+            <td>96</td>
             <td ><code>column_break83</code></td>
             <td class="info">
                 Column Break</td>
@@ -1404,7 +1440,7 @@
         </tr>
         
         <tr >
-            <td>94</td>
+            <td>97</td>
             <td ><code>next_date</code></td>
             <td >
                 Date</td>
@@ -1417,7 +1453,7 @@
         </tr>
         
         <tr >
-            <td>95</td>
+            <td>98</td>
             <td ><code>recurring_id</code></td>
             <td >
                 Data</td>
@@ -1429,7 +1465,7 @@
         </tr>
         
         <tr >
-            <td>96</td>
+            <td>99</td>
             <td ><code>notification_email_address</code></td>
             <td >
                 Small Text</td>
@@ -1442,7 +1478,7 @@
         </tr>
         
         <tr >
-            <td>97</td>
+            <td>100</td>
             <td ><code>recurring_print_format</code></td>
             <td >
                 Link</td>
@@ -1544,6 +1580,20 @@
     
     
 	<p class="docs-attr-name">
+        <a name="get_last_purchase_rate" href="#get_last_purchase_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_last_purchase_rate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get last purchase rates for all items</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="get_schedule_dates" href="#get_schedule_dates" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>get_schedule_dates</b>
@@ -1572,6 +1622,20 @@
     
     
 	<p class="docs-attr-name">
+        <a name="is_against_so" href="#is_against_so" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>is_against_so</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="on_cancel" href="#on_cancel" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>on_cancel</b>
diff --git a/erpnext/docs/current/models/buying/supplier.html b/erpnext/docs/current/models/buying/supplier.html
index 6c7564a..a4e2cd4 100644
--- a/erpnext/docs/current/models/buying/supplier.html
+++ b/erpnext/docs/current/models/buying/supplier.html
@@ -310,27 +310,6 @@
             <td></td>
         </tr>
         
-        <tr >
-            <td>20</td>
-            <td ><code>communications</code></td>
-            <td >
-                Table</td>
-            <td class="text-muted" title="Hidden">
-                Communications
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/core/communication">Communication</a>
-
-
-                
-            </td>
-        </tr>
-        
     </tbody>
 </table>
 
diff --git a/erpnext/docs/current/models/buying/supplier_quotation.html b/erpnext/docs/current/models/buying/supplier_quotation.html
index ebb63df..6938735 100644
--- a/erpnext/docs/current/models/buying/supplier_quotation.html
+++ b/erpnext/docs/current/models/buying/supplier_quotation.html
@@ -673,32 +673,6 @@
         
         <tr >
             <td>44</td>
-            <td ><code>column_break_43</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>45</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>46</td>
             <td ><code>base_discount_amount</code></td>
             <td >
                 Currency</td>
@@ -711,8 +685,46 @@
             </td>
         </tr>
         
-        <tr class="info">
+        <tr >
+            <td>45</td>
+            <td ><code>column_break_43</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
             <td>47</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>48</td>
             <td ><code>section_break_46</code></td>
             <td >
                 Section Break</td>
@@ -724,7 +736,7 @@
         </tr>
         
         <tr >
-            <td>48</td>
+            <td>49</td>
             <td ><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -738,7 +750,7 @@
         </tr>
         
         <tr >
-            <td>49</td>
+            <td>50</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -750,7 +762,7 @@
         </tr>
         
         <tr >
-            <td>50</td>
+            <td>51</td>
             <td ><code>base_rounded_total</code></td>
             <td >
                 Currency</td>
@@ -764,7 +776,7 @@
         </tr>
         
         <tr >
-            <td>51</td>
+            <td>52</td>
             <td ><code>column_break4</code></td>
             <td class="info">
                 Column Break</td>
@@ -776,7 +788,7 @@
         </tr>
         
         <tr >
-            <td>52</td>
+            <td>53</td>
             <td ><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -790,7 +802,7 @@
         </tr>
         
         <tr >
-            <td>53</td>
+            <td>54</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -802,7 +814,7 @@
         </tr>
         
         <tr class="info">
-            <td>54</td>
+            <td>55</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -816,7 +828,7 @@
         </tr>
         
         <tr >
-            <td>55</td>
+            <td>56</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -837,7 +849,7 @@
         </tr>
         
         <tr >
-            <td>56</td>
+            <td>57</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -849,7 +861,7 @@
         </tr>
         
         <tr class="info">
-            <td>57</td>
+            <td>58</td>
             <td ><code>contact_section</code></td>
             <td >
                 Section Break</td>
@@ -863,7 +875,7 @@
         </tr>
         
         <tr >
-            <td>58</td>
+            <td>59</td>
             <td ><code>supplier_address</code></td>
             <td >
                 Link</td>
@@ -884,7 +896,7 @@
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>60</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -905,7 +917,7 @@
         </tr>
         
         <tr class="info">
-            <td>60</td>
+            <td>61</td>
             <td ><code>printing_settings</code></td>
             <td >
                 Section Break</td>
@@ -917,7 +929,7 @@
         </tr>
         
         <tr >
-            <td>61</td>
+            <td>62</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -938,7 +950,7 @@
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>63</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -959,7 +971,7 @@
         </tr>
         
         <tr class="info">
-            <td>63</td>
+            <td>64</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -973,7 +985,7 @@
         </tr>
         
         <tr >
-            <td>64</td>
+            <td>65</td>
             <td class="danger" title="Mandatory"><code>status</code></td>
             <td >
                 Select</td>
@@ -991,7 +1003,7 @@
         </tr>
         
         <tr >
-            <td>65</td>
+            <td>66</td>
             <td ><code>is_subcontracted</code></td>
             <td >
                 Select</td>
@@ -1007,7 +1019,7 @@
         </tr>
         
         <tr >
-            <td>66</td>
+            <td>67</td>
             <td ><code>column_break_57</code></td>
             <td class="info">
                 Column Break</td>
@@ -1019,7 +1031,7 @@
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>68</td>
             <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
             <td >
                 Link</td>
diff --git a/erpnext/docs/current/models/hr/employee.html b/erpnext/docs/current/models/hr/employee.html
index 75d2d3d..5b76c2b 100644
--- a/erpnext/docs/current/models/hr/employee.html
+++ b/erpnext/docs/current/models/hr/employee.html
@@ -679,18 +679,6 @@
         
         <tr >
             <td>45</td>
-            <td ><code>emergency_contact_details</code></td>
-            <td >
-                HTML</td>
-            <td >
-                Emergency Contact Details
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>46</td>
             <td ><code>person_to_be_contacted</code></td>
             <td >
                 Data</td>
@@ -702,7 +690,7 @@
         </tr>
         
         <tr >
-            <td>47</td>
+            <td>46</td>
             <td ><code>relation</code></td>
             <td >
                 Data</td>
@@ -714,7 +702,7 @@
         </tr>
         
         <tr >
-            <td>48</td>
+            <td>47</td>
             <td ><code>emergency_phone_number</code></td>
             <td >
                 Data</td>
@@ -726,7 +714,7 @@
         </tr>
         
         <tr >
-            <td>49</td>
+            <td>48</td>
             <td ><code>column_break4</code></td>
             <td class="info">
                 Column Break</td>
@@ -738,7 +726,7 @@
         </tr>
         
         <tr >
-            <td>50</td>
+            <td>49</td>
             <td ><code>permanent_accommodation_type</code></td>
             <td >
                 Select</td>
@@ -754,7 +742,7 @@
         </tr>
         
         <tr >
-            <td>51</td>
+            <td>50</td>
             <td ><code>permanent_address</code></td>
             <td >
                 Small Text</td>
@@ -766,7 +754,7 @@
         </tr>
         
         <tr >
-            <td>52</td>
+            <td>51</td>
             <td ><code>current_accommodation_type</code></td>
             <td >
                 Select</td>
@@ -782,7 +770,7 @@
         </tr>
         
         <tr >
-            <td>53</td>
+            <td>52</td>
             <td ><code>current_address</code></td>
             <td >
                 Small Text</td>
@@ -794,7 +782,7 @@
         </tr>
         
         <tr class="info">
-            <td>54</td>
+            <td>53</td>
             <td ><code>sb53</code></td>
             <td >
                 Section Break</td>
@@ -806,7 +794,7 @@
         </tr>
         
         <tr >
-            <td>55</td>
+            <td>54</td>
             <td ><code>bio</code></td>
             <td >
                 Text Editor</td>
@@ -819,7 +807,7 @@
         </tr>
         
         <tr class="info">
-            <td>56</td>
+            <td>55</td>
             <td ><code>personal_details</code></td>
             <td >
                 Section Break</td>
@@ -831,7 +819,7 @@
         </tr>
         
         <tr >
-            <td>57</td>
+            <td>56</td>
             <td ><code>column_break5</code></td>
             <td class="info">
                 Column Break</td>
@@ -843,7 +831,7 @@
         </tr>
         
         <tr >
-            <td>58</td>
+            <td>57</td>
             <td ><code>passport_number</code></td>
             <td >
                 Data</td>
@@ -855,7 +843,7 @@
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>58</td>
             <td ><code>date_of_issue</code></td>
             <td >
                 Date</td>
@@ -867,7 +855,7 @@
         </tr>
         
         <tr >
-            <td>60</td>
+            <td>59</td>
             <td ><code>valid_upto</code></td>
             <td >
                 Date</td>
@@ -879,7 +867,7 @@
         </tr>
         
         <tr >
-            <td>61</td>
+            <td>60</td>
             <td ><code>place_of_issue</code></td>
             <td >
                 Data</td>
@@ -891,7 +879,7 @@
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>61</td>
             <td ><code>column_break6</code></td>
             <td class="info">
                 Column Break</td>
@@ -903,7 +891,7 @@
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>62</td>
             <td ><code>marital_status</code></td>
             <td >
                 Select</td>
@@ -921,7 +909,7 @@
         </tr>
         
         <tr >
-            <td>64</td>
+            <td>63</td>
             <td ><code>blood_group</code></td>
             <td >
                 Select</td>
@@ -943,7 +931,7 @@
         </tr>
         
         <tr >
-            <td>65</td>
+            <td>64</td>
             <td ><code>family_background</code></td>
             <td >
                 Small Text</td>
@@ -956,7 +944,7 @@
         </tr>
         
         <tr >
-            <td>66</td>
+            <td>65</td>
             <td ><code>health_details</code></td>
             <td >
                 Small Text</td>
@@ -969,7 +957,7 @@
         </tr>
         
         <tr class="info">
-            <td>67</td>
+            <td>66</td>
             <td ><code>educational_qualification</code></td>
             <td >
                 Section Break</td>
@@ -981,7 +969,7 @@
         </tr>
         
         <tr >
-            <td>68</td>
+            <td>67</td>
             <td ><code>education</code></td>
             <td >
                 Table</td>
@@ -1002,7 +990,7 @@
         </tr>
         
         <tr class="info">
-            <td>69</td>
+            <td>68</td>
             <td ><code>previous_work_experience</code></td>
             <td >
                 Section Break</td>
@@ -1016,7 +1004,7 @@
         </tr>
         
         <tr >
-            <td>70</td>
+            <td>69</td>
             <td ><code>external_work_history</code></td>
             <td >
                 Table</td>
@@ -1037,7 +1025,7 @@
         </tr>
         
         <tr class="info">
-            <td>71</td>
+            <td>70</td>
             <td ><code>history_in_company</code></td>
             <td >
                 Section Break</td>
@@ -1051,7 +1039,7 @@
         </tr>
         
         <tr >
-            <td>72</td>
+            <td>71</td>
             <td ><code>internal_work_history</code></td>
             <td >
                 Table</td>
@@ -1072,7 +1060,7 @@
         </tr>
         
         <tr class="info">
-            <td>73</td>
+            <td>72</td>
             <td ><code>exit</code></td>
             <td >
                 Section Break</td>
@@ -1084,7 +1072,7 @@
         </tr>
         
         <tr >
-            <td>74</td>
+            <td>73</td>
             <td ><code>column_break7</code></td>
             <td class="info">
                 Column Break</td>
@@ -1096,7 +1084,7 @@
         </tr>
         
         <tr >
-            <td>75</td>
+            <td>74</td>
             <td ><code>resignation_letter_date</code></td>
             <td >
                 Date</td>
@@ -1108,7 +1096,7 @@
         </tr>
         
         <tr >
-            <td>76</td>
+            <td>75</td>
             <td ><code>relieving_date</code></td>
             <td >
                 Date</td>
@@ -1120,7 +1108,7 @@
         </tr>
         
         <tr >
-            <td>77</td>
+            <td>76</td>
             <td ><code>reason_for_leaving</code></td>
             <td >
                 Data</td>
@@ -1132,7 +1120,7 @@
         </tr>
         
         <tr >
-            <td>78</td>
+            <td>77</td>
             <td ><code>leave_encashed</code></td>
             <td >
                 Select</td>
@@ -1148,7 +1136,7 @@
         </tr>
         
         <tr >
-            <td>79</td>
+            <td>78</td>
             <td ><code>encashment_date</code></td>
             <td >
                 Date</td>
@@ -1160,7 +1148,7 @@
         </tr>
         
         <tr >
-            <td>80</td>
+            <td>79</td>
             <td ><code>exit_interview_details</code></td>
             <td class="info">
                 Column Break</td>
@@ -1172,7 +1160,7 @@
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>80</td>
             <td ><code>held_on</code></td>
             <td >
                 Date</td>
@@ -1184,7 +1172,7 @@
         </tr>
         
         <tr >
-            <td>82</td>
+            <td>81</td>
             <td ><code>reason_for_resignation</code></td>
             <td >
                 Select</td>
@@ -1200,7 +1188,7 @@
         </tr>
         
         <tr >
-            <td>83</td>
+            <td>82</td>
             <td ><code>new_workplace</code></td>
             <td >
                 Data</td>
@@ -1212,7 +1200,7 @@
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>83</td>
             <td ><code>feedback</code></td>
             <td >
                 Small Text</td>
diff --git a/erpnext/docs/current/models/hr/job_applicant.html b/erpnext/docs/current/models/hr/job_applicant.html
index 00578de..603689e 100644
--- a/erpnext/docs/current/models/hr/job_applicant.html
+++ b/erpnext/docs/current/models/hr/job_applicant.html
@@ -138,27 +138,6 @@
             <td></td>
         </tr>
         
-        <tr >
-            <td>8</td>
-            <td ><code>communications</code></td>
-            <td >
-                Table</td>
-            <td class="text-muted" title="Hidden">
-                Communications
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/core/communication">Communication</a>
-
-
-                
-            </td>
-        </tr>
-        
     </tbody>
 </table>
 
diff --git a/erpnext/docs/current/models/hr/salary_slip.html b/erpnext/docs/current/models/hr/salary_slip.html
index 742ee94..07b1f83 100644
--- a/erpnext/docs/current/models/hr/salary_slip.html
+++ b/erpnext/docs/current/models/hr/salary_slip.html
@@ -366,18 +366,6 @@
         
         <tr >
             <td>21</td>
-            <td ><code>html_21</code></td>
-            <td >
-                HTML</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>22</td>
             <td ><code>earnings</code></td>
             <td >
                 Table</td>
@@ -398,7 +386,7 @@
         </tr>
         
         <tr >
-            <td>23</td>
+            <td>22</td>
             <td ><code>deduction</code></td>
             <td class="info">
                 Column Break</td>
@@ -410,19 +398,7 @@
         </tr>
         
         <tr >
-            <td>24</td>
-            <td ><code>html_24</code></td>
-            <td >
-                HTML</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>25</td>
+            <td>23</td>
             <td ><code>deductions</code></td>
             <td >
                 Table</td>
@@ -443,7 +419,7 @@
         </tr>
         
         <tr class="info">
-            <td>26</td>
+            <td>24</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -455,7 +431,7 @@
         </tr>
         
         <tr >
-            <td>27</td>
+            <td>25</td>
             <td ><code>column_break_25</code></td>
             <td class="info">
                 Column Break</td>
@@ -467,7 +443,7 @@
         </tr>
         
         <tr >
-            <td>28</td>
+            <td>26</td>
             <td ><code>column_break_26</code></td>
             <td class="info">
                 Column Break</td>
@@ -479,7 +455,7 @@
         </tr>
         
         <tr >
-            <td>29</td>
+            <td>27</td>
             <td ><code>arrear_amount</code></td>
             <td >
                 Currency</td>
@@ -493,7 +469,7 @@
         </tr>
         
         <tr >
-            <td>30</td>
+            <td>28</td>
             <td ><code>leave_encashment_amount</code></td>
             <td >
                 Currency</td>
@@ -507,7 +483,7 @@
         </tr>
         
         <tr >
-            <td>31</td>
+            <td>29</td>
             <td ><code>gross_pay</code></td>
             <td >
                 Currency</td>
@@ -521,7 +497,7 @@
         </tr>
         
         <tr >
-            <td>32</td>
+            <td>30</td>
             <td ><code>total_deduction</code></td>
             <td >
                 Currency</td>
@@ -535,7 +511,7 @@
         </tr>
         
         <tr >
-            <td>33</td>
+            <td>31</td>
             <td ><code>net_pay</code></td>
             <td >
                 Currency</td>
@@ -550,7 +526,7 @@
         </tr>
         
         <tr >
-            <td>34</td>
+            <td>32</td>
             <td ><code>rounded_total</code></td>
             <td >
                 Currency</td>
@@ -564,7 +540,7 @@
         </tr>
         
         <tr >
-            <td>35</td>
+            <td>33</td>
             <td ><code>total_in_words</code></td>
             <td >
                 Data</td>
diff --git a/erpnext/docs/current/models/projects/time_log.html b/erpnext/docs/current/models/projects/time_log.html
index 2276314..b37e0b5 100644
--- a/erpnext/docs/current/models/projects/time_log.html
+++ b/erpnext/docs/current/models/projects/time_log.html
@@ -40,110 +40,6 @@
         
         <tr >
             <td>1</td>
-            <td class="danger" title="Mandatory"><code>naming_series</code></td>
-            <td >
-                Select</td>
-            <td >
-                Series
-                
-            </td>
-            <td>
-                <pre>TL-</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>2</td>
-            <td ><code>column_break_2</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>3</td>
-            <td ><code>status</code></td>
-            <td >
-                Select</td>
-            <td >
-                Status
-                
-            </td>
-            <td>
-                <pre>Draft
-Submitted
-Batched for Billing
-Billed
-Cancelled</pre>
-            </td>
-        </tr>
-        
-        <tr class="info">
-            <td>4</td>
-            <td ><code>section_break_4</code></td>
-            <td >
-                Section Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>5</td>
-            <td class="danger" title="Mandatory"><code>from_time</code></td>
-            <td >
-                Datetime</td>
-            <td >
-                From Time
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>6</td>
-            <td ><code>hours</code></td>
-            <td >
-                Float</td>
-            <td >
-                Hours
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>7</td>
-            <td class="danger" title="Mandatory"><code>to_time</code></td>
-            <td >
-                Datetime</td>
-            <td >
-                To Time
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>8</td>
-            <td ><code>column_break_8</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>9</td>
             <td ><code>activity_type</code></td>
             <td >
                 Link</td>
@@ -164,7 +60,21 @@
         </tr>
         
         <tr >
-            <td>10</td>
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>TL-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
             <td ><code>project</code></td>
             <td >
                 Link</td>
@@ -185,7 +95,7 @@
         </tr>
         
         <tr >
-            <td>11</td>
+            <td>4</td>
             <td ><code>task</code></td>
             <td >
                 Link</td>
@@ -205,8 +115,110 @@
             </td>
         </tr>
         
+        <tr >
+            <td>5</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Draft
+Submitted
+Batched for Billing
+Billed
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>column_break_2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>from_time</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                From Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>hours</code></td>
+            <td >
+                Float</td>
+            <td >
+                Hours
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td class="danger" title="Mandatory"><code>to_time</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                To Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>billable</code></td>
+            <td >
+                Check</td>
+            <td >
+                Billable
+                
+            </td>
+            <td></td>
+        </tr>
+        
         <tr class="info">
+            <td>11</td>
+            <td ><code>section_break_7</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
             <td>12</td>
+            <td ><code>note</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Note
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>13</td>
             <td ><code>section_break_12</code></td>
             <td >
                 Section Break</td>
@@ -218,7 +230,7 @@
         </tr>
         
         <tr >
-            <td>13</td>
+            <td>14</td>
             <td ><code>user</code></td>
             <td >
                 Link</td>
@@ -239,7 +251,7 @@
         </tr>
         
         <tr >
-            <td>14</td>
+            <td>15</td>
             <td ><code>employee</code></td>
             <td >
                 Link</td>
@@ -260,7 +272,7 @@
         </tr>
         
         <tr >
-            <td>15</td>
+            <td>16</td>
             <td ><code>column_break_3</code></td>
             <td class="info">
                 Column Break</td>
@@ -272,7 +284,7 @@
         </tr>
         
         <tr >
-            <td>16</td>
+            <td>17</td>
             <td ><code>for_manufacturing</code></td>
             <td >
                 Check</td>
@@ -283,18 +295,6 @@
             <td></td>
         </tr>
         
-        <tr >
-            <td>17</td>
-            <td ><code>billable</code></td>
-            <td >
-                Check</td>
-            <td >
-                Billable
-                
-            </td>
-            <td></td>
-        </tr>
-        
         <tr class="info">
             <td>18</td>
             <td ><code>section_break_11</code></td>
@@ -409,30 +409,6 @@
         
         <tr class="info">
             <td>25</td>
-            <td ><code>section_break_7</code></td>
-            <td >
-                Section Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>26</td>
-            <td ><code>note</code></td>
-            <td >
-                Text Editor</td>
-            <td >
-                Note
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr class="info">
-            <td>27</td>
             <td ><code>section_break_24</code></td>
             <td >
                 Section Break</td>
@@ -444,7 +420,7 @@
         </tr>
         
         <tr >
-            <td>28</td>
+            <td>26</td>
             <td ><code>costing_rate</code></td>
             <td >
                 Currency</td>
@@ -456,7 +432,7 @@
         </tr>
         
         <tr >
-            <td>29</td>
+            <td>27</td>
             <td ><code>costing_amount</code></td>
             <td >
                 Currency</td>
@@ -468,7 +444,7 @@
         </tr>
         
         <tr >
-            <td>30</td>
+            <td>28</td>
             <td ><code>column_break_25</code></td>
             <td class="info">
                 Column Break</td>
@@ -480,7 +456,7 @@
         </tr>
         
         <tr >
-            <td>31</td>
+            <td>29</td>
             <td ><code>billing_rate</code></td>
             <td >
                 Currency</td>
@@ -492,7 +468,19 @@
         </tr>
         
         <tr >
-            <td>32</td>
+            <td>30</td>
+            <td ><code>additional_cost</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Cost
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
             <td ><code>billing_amount</code></td>
             <td >
                 Currency</td>
@@ -505,7 +493,7 @@
         </tr>
         
         <tr class="info">
-            <td>33</td>
+            <td>32</td>
             <td ><code>section_break_29</code></td>
             <td >
                 Section Break</td>
@@ -517,7 +505,7 @@
         </tr>
         
         <tr >
-            <td>34</td>
+            <td>33</td>
             <td ><code>time_log_batch</code></td>
             <td >
                 Link</td>
@@ -539,7 +527,7 @@
         </tr>
         
         <tr >
-            <td>35</td>
+            <td>34</td>
             <td ><code>sales_invoice</code></td>
             <td >
                 Link</td>
@@ -561,7 +549,7 @@
         </tr>
         
         <tr >
-            <td>36</td>
+            <td>35</td>
             <td ><code>amended_from</code></td>
             <td >
                 Link</td>
@@ -582,7 +570,7 @@
         </tr>
         
         <tr >
-            <td>37</td>
+            <td>36</td>
             <td ><code>title</code></td>
             <td >
                 Data</td>
diff --git a/erpnext/docs/current/models/selling/customer.html b/erpnext/docs/current/models/selling/customer.html
index 00ee8b3..d171796 100644
--- a/erpnext/docs/current/models/selling/customer.html
+++ b/erpnext/docs/current/models/selling/customer.html
@@ -502,27 +502,6 @@
             </td>
         </tr>
         
-        <tr >
-            <td>32</td>
-            <td ><code>communications</code></td>
-            <td >
-                Table</td>
-            <td class="text-muted" title="Hidden">
-                Communications
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/core/communication">Communication</a>
-
-
-                
-            </td>
-        </tr>
-        
     </tbody>
 </table>
 
diff --git a/erpnext/docs/current/models/selling/quotation.html b/erpnext/docs/current/models/selling/quotation.html
index 9f6f4ea..145e4db 100644
--- a/erpnext/docs/current/models/selling/quotation.html
+++ b/erpnext/docs/current/models/selling/quotation.html
@@ -728,32 +728,6 @@
         
         <tr >
             <td>47</td>
-            <td ><code>column_break_46</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>48</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>49</td>
             <td ><code>base_discount_amount</code></td>
             <td >
                 Currency</td>
@@ -766,8 +740,46 @@
             </td>
         </tr>
         
-        <tr class="info">
+        <tr >
+            <td>48</td>
+            <td ><code>column_break_46</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
             <td>50</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>51</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -781,7 +793,7 @@
         </tr>
         
         <tr >
-            <td>51</td>
+            <td>52</td>
             <td ><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -795,7 +807,7 @@
         </tr>
         
         <tr >
-            <td>52</td>
+            <td>53</td>
             <td ><code>base_rounded_total</code></td>
             <td >
                 Currency</td>
@@ -809,7 +821,7 @@
         </tr>
         
         <tr >
-            <td>53</td>
+            <td>54</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -822,7 +834,7 @@
         </tr>
         
         <tr >
-            <td>54</td>
+            <td>55</td>
             <td ><code>column_break3</code></td>
             <td class="info">
                 Column Break</td>
@@ -834,7 +846,7 @@
         </tr>
         
         <tr >
-            <td>55</td>
+            <td>56</td>
             <td ><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -848,7 +860,7 @@
         </tr>
         
         <tr >
-            <td>56</td>
+            <td>57</td>
             <td ><code>rounded_total</code></td>
             <td >
                 Currency</td>
@@ -862,7 +874,7 @@
         </tr>
         
         <tr >
-            <td>57</td>
+            <td>58</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -874,7 +886,7 @@
         </tr>
         
         <tr class="info">
-            <td>58</td>
+            <td>59</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -888,7 +900,7 @@
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>60</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -909,7 +921,7 @@
         </tr>
         
         <tr >
-            <td>60</td>
+            <td>61</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -921,7 +933,7 @@
         </tr>
         
         <tr class="info">
-            <td>61</td>
+            <td>62</td>
             <td ><code>contact_section</code></td>
             <td >
                 Section Break</td>
@@ -935,7 +947,7 @@
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>63</td>
             <td class="danger" title="Mandatory"><code>territory</code></td>
             <td >
                 Link</td>
@@ -956,7 +968,7 @@
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>64</td>
             <td ><code>customer_group</code></td>
             <td >
                 Link</td>
@@ -977,7 +989,7 @@
         </tr>
         
         <tr >
-            <td>64</td>
+            <td>65</td>
             <td ><code>shipping_address_name</code></td>
             <td >
                 Link</td>
@@ -998,7 +1010,7 @@
         </tr>
         
         <tr >
-            <td>65</td>
+            <td>66</td>
             <td ><code>shipping_address</code></td>
             <td >
                 Small Text</td>
@@ -1010,7 +1022,7 @@
         </tr>
         
         <tr >
-            <td>66</td>
+            <td>67</td>
             <td ><code>col_break98</code></td>
             <td class="info">
                 Column Break</td>
@@ -1022,7 +1034,7 @@
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>68</td>
             <td ><code>customer_address</code></td>
             <td >
                 Link</td>
@@ -1043,7 +1055,7 @@
         </tr>
         
         <tr >
-            <td>68</td>
+            <td>69</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -1064,7 +1076,7 @@
         </tr>
         
         <tr class="info">
-            <td>69</td>
+            <td>70</td>
             <td ><code>print_settings</code></td>
             <td >
                 Section Break</td>
@@ -1076,7 +1088,7 @@
         </tr>
         
         <tr >
-            <td>70</td>
+            <td>71</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1097,7 +1109,7 @@
         </tr>
         
         <tr >
-            <td>71</td>
+            <td>72</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1118,7 +1130,7 @@
         </tr>
         
         <tr class="info">
-            <td>72</td>
+            <td>73</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -1132,7 +1144,7 @@
         </tr>
         
         <tr >
-            <td>73</td>
+            <td>74</td>
             <td ><code>campaign</code></td>
             <td >
                 Link</td>
@@ -1153,7 +1165,7 @@
         </tr>
         
         <tr >
-            <td>74</td>
+            <td>75</td>
             <td ><code>source</code></td>
             <td >
                 Select</td>
@@ -1176,7 +1188,7 @@
         </tr>
         
         <tr >
-            <td>75</td>
+            <td>76</td>
             <td ><code>order_lost_reason</code></td>
             <td >
                 Small Text</td>
@@ -1188,7 +1200,7 @@
         </tr>
         
         <tr >
-            <td>76</td>
+            <td>77</td>
             <td ><code>column_break4</code></td>
             <td class="info">
                 Column Break</td>
@@ -1200,7 +1212,7 @@
         </tr>
         
         <tr >
-            <td>77</td>
+            <td>78</td>
             <td class="danger" title="Mandatory"><code>status</code></td>
             <td >
                 Select</td>
@@ -1220,7 +1232,7 @@
         </tr>
         
         <tr >
-            <td>78</td>
+            <td>79</td>
             <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
             <td >
                 Link</td>
@@ -1241,7 +1253,7 @@
         </tr>
         
         <tr >
-            <td>79</td>
+            <td>80</td>
             <td ><code>enq_det</code></td>
             <td >
                 Text</td>
diff --git a/erpnext/docs/current/models/selling/sales_order.html b/erpnext/docs/current/models/selling/sales_order.html
index 48daddd..aadc664 100644
--- a/erpnext/docs/current/models/selling/sales_order.html
+++ b/erpnext/docs/current/models/selling/sales_order.html
@@ -772,32 +772,6 @@
         
         <tr >
             <td>51</td>
-            <td ><code>column_break_50</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>52</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>53</td>
             <td ><code>base_discount_amount</code></td>
             <td >
                 Currency</td>
@@ -810,8 +784,46 @@
             </td>
         </tr>
         
-        <tr class="info">
+        <tr >
+            <td>52</td>
+            <td ><code>column_break_50</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
             <td>54</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>55</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -825,7 +837,7 @@
         </tr>
         
         <tr >
-            <td>55</td>
+            <td>56</td>
             <td ><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -839,7 +851,7 @@
         </tr>
         
         <tr >
-            <td>56</td>
+            <td>57</td>
             <td ><code>base_rounded_total</code></td>
             <td >
                 Currency</td>
@@ -853,7 +865,7 @@
         </tr>
         
         <tr >
-            <td>57</td>
+            <td>58</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -866,7 +878,7 @@
         </tr>
         
         <tr >
-            <td>58</td>
+            <td>59</td>
             <td ><code>column_break3</code></td>
             <td class="info">
                 Column Break</td>
@@ -878,7 +890,7 @@
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>60</td>
             <td ><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -892,7 +904,7 @@
         </tr>
         
         <tr >
-            <td>60</td>
+            <td>61</td>
             <td ><code>rounded_total</code></td>
             <td >
                 Currency</td>
@@ -906,7 +918,7 @@
         </tr>
         
         <tr >
-            <td>61</td>
+            <td>62</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -918,7 +930,7 @@
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>63</td>
             <td ><code>advance_paid</code></td>
             <td >
                 Currency</td>
@@ -932,7 +944,7 @@
         </tr>
         
         <tr class="info">
-            <td>63</td>
+            <td>64</td>
             <td ><code>packing_list</code></td>
             <td >
                 Section Break</td>
@@ -946,7 +958,7 @@
         </tr>
         
         <tr >
-            <td>64</td>
+            <td>65</td>
             <td ><code>packed_items</code></td>
             <td >
                 Table</td>
@@ -967,7 +979,7 @@
         </tr>
         
         <tr class="info">
-            <td>65</td>
+            <td>66</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -981,7 +993,7 @@
         </tr>
         
         <tr >
-            <td>66</td>
+            <td>67</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -1002,7 +1014,7 @@
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>68</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -1014,7 +1026,7 @@
         </tr>
         
         <tr class="info">
-            <td>68</td>
+            <td>69</td>
             <td ><code>contact_info</code></td>
             <td >
                 Section Break</td>
@@ -1028,7 +1040,7 @@
         </tr>
         
         <tr >
-            <td>69</td>
+            <td>70</td>
             <td ><code>col_break45</code></td>
             <td class="info">
                 Column Break</td>
@@ -1040,7 +1052,7 @@
         </tr>
         
         <tr >
-            <td>70</td>
+            <td>71</td>
             <td class="danger" title="Mandatory"><code>territory</code></td>
             <td >
                 Link</td>
@@ -1061,7 +1073,7 @@
         </tr>
         
         <tr >
-            <td>71</td>
+            <td>72</td>
             <td class="danger" title="Mandatory"><code>customer_group</code></td>
             <td >
                 Link</td>
@@ -1082,7 +1094,7 @@
         </tr>
         
         <tr >
-            <td>72</td>
+            <td>73</td>
             <td ><code>col_break46</code></td>
             <td class="info">
                 Column Break</td>
@@ -1094,7 +1106,7 @@
         </tr>
         
         <tr >
-            <td>73</td>
+            <td>74</td>
             <td ><code>customer_address</code></td>
             <td >
                 Link</td>
@@ -1115,7 +1127,7 @@
         </tr>
         
         <tr >
-            <td>74</td>
+            <td>75</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -1136,7 +1148,7 @@
         </tr>
         
         <tr class="info">
-            <td>75</td>
+            <td>76</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -1150,7 +1162,7 @@
         </tr>
         
         <tr >
-            <td>76</td>
+            <td>77</td>
             <td ><code>project_name</code></td>
             <td >
                 Link</td>
@@ -1172,7 +1184,7 @@
         </tr>
         
         <tr >
-            <td>77</td>
+            <td>78</td>
             <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
             <td >
                 Link</td>
@@ -1193,7 +1205,7 @@
         </tr>
         
         <tr >
-            <td>78</td>
+            <td>79</td>
             <td ><code>column_break_77</code></td>
             <td class="info">
                 Column Break</td>
@@ -1205,7 +1217,7 @@
         </tr>
         
         <tr >
-            <td>79</td>
+            <td>80</td>
             <td ><code>source</code></td>
             <td >
                 Select</td>
@@ -1228,7 +1240,7 @@
         </tr>
         
         <tr >
-            <td>80</td>
+            <td>81</td>
             <td ><code>campaign</code></td>
             <td >
                 Link</td>
@@ -1249,7 +1261,7 @@
         </tr>
         
         <tr class="info">
-            <td>81</td>
+            <td>82</td>
             <td ><code>printing_details</code></td>
             <td >
                 Section Break</td>
@@ -1261,7 +1273,7 @@
         </tr>
         
         <tr >
-            <td>82</td>
+            <td>83</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1282,7 +1294,7 @@
         </tr>
         
         <tr >
-            <td>83</td>
+            <td>84</td>
             <td ><code>column_break4</code></td>
             <td class="info">
                 Column Break</td>
@@ -1294,7 +1306,7 @@
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>85</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1315,7 +1327,7 @@
         </tr>
         
         <tr class="info">
-            <td>85</td>
+            <td>86</td>
             <td ><code>section_break_78</code></td>
             <td >
                 Section Break</td>
@@ -1327,7 +1339,7 @@
         </tr>
         
         <tr >
-            <td>86</td>
+            <td>87</td>
             <td class="danger" title="Mandatory"><code>status</code></td>
             <td >
                 Select</td>
@@ -1349,7 +1361,7 @@
         </tr>
         
         <tr >
-            <td>87</td>
+            <td>88</td>
             <td ><code>delivery_status</code></td>
             <td >
                 Select</td>
@@ -1367,7 +1379,7 @@
         </tr>
         
         <tr >
-            <td>88</td>
+            <td>89</td>
             <td ><code>per_delivered</code></td>
             <td >
                 Percent</td>
@@ -1380,7 +1392,7 @@
         </tr>
         
         <tr >
-            <td>89</td>
+            <td>90</td>
             <td ><code>column_break_81</code></td>
             <td class="info">
                 Column Break</td>
@@ -1392,7 +1404,7 @@
         </tr>
         
         <tr >
-            <td>90</td>
+            <td>91</td>
             <td ><code>per_billed</code></td>
             <td >
                 Percent</td>
@@ -1405,7 +1417,7 @@
         </tr>
         
         <tr >
-            <td>91</td>
+            <td>92</td>
             <td ><code>billing_status</code></td>
             <td >
                 Select</td>
@@ -1422,7 +1434,7 @@
         </tr>
         
         <tr class="info">
-            <td>92</td>
+            <td>93</td>
             <td ><code>sales_team_section_break</code></td>
             <td >
                 Section Break</td>
@@ -1436,7 +1448,7 @@
         </tr>
         
         <tr >
-            <td>93</td>
+            <td>94</td>
             <td ><code>sales_partner</code></td>
             <td >
                 Link</td>
@@ -1457,7 +1469,7 @@
         </tr>
         
         <tr >
-            <td>94</td>
+            <td>95</td>
             <td ><code>column_break7</code></td>
             <td class="info">
                 Column Break</td>
@@ -1469,7 +1481,7 @@
         </tr>
         
         <tr >
-            <td>95</td>
+            <td>96</td>
             <td ><code>commission_rate</code></td>
             <td >
                 Float</td>
@@ -1481,7 +1493,7 @@
         </tr>
         
         <tr >
-            <td>96</td>
+            <td>97</td>
             <td ><code>total_commission</code></td>
             <td >
                 Currency</td>
@@ -1495,7 +1507,7 @@
         </tr>
         
         <tr class="info">
-            <td>97</td>
+            <td>98</td>
             <td ><code>section_break1</code></td>
             <td >
                 Section Break</td>
@@ -1507,7 +1519,7 @@
         </tr>
         
         <tr >
-            <td>98</td>
+            <td>99</td>
             <td ><code>sales_team</code></td>
             <td >
                 Table</td>
@@ -1528,7 +1540,7 @@
         </tr>
         
         <tr class="info">
-            <td>99</td>
+            <td>100</td>
             <td ><code>recurring_order</code></td>
             <td >
                 Section Break</td>
@@ -1542,7 +1554,7 @@
         </tr>
         
         <tr >
-            <td>100</td>
+            <td>101</td>
             <td ><code>is_recurring</code></td>
             <td >
                 Check</td>
@@ -1555,7 +1567,7 @@
         </tr>
         
         <tr >
-            <td>101</td>
+            <td>102</td>
             <td ><code>recurring_type</code></td>
             <td >
                 Select</td>
@@ -1574,7 +1586,7 @@
         </tr>
         
         <tr >
-            <td>102</td>
+            <td>103</td>
             <td ><code>from_date</code></td>
             <td >
                 Date</td>
@@ -1587,7 +1599,7 @@
         </tr>
         
         <tr >
-            <td>103</td>
+            <td>104</td>
             <td ><code>to_date</code></td>
             <td >
                 Date</td>
@@ -1600,7 +1612,7 @@
         </tr>
         
         <tr >
-            <td>104</td>
+            <td>105</td>
             <td ><code>repeat_on_day_of_month</code></td>
             <td >
                 Int</td>
@@ -1613,7 +1625,7 @@
         </tr>
         
         <tr >
-            <td>105</td>
+            <td>106</td>
             <td ><code>end_date</code></td>
             <td >
                 Date</td>
@@ -1626,7 +1638,7 @@
         </tr>
         
         <tr >
-            <td>106</td>
+            <td>107</td>
             <td ><code>column_break83</code></td>
             <td class="info">
                 Column Break</td>
@@ -1638,7 +1650,7 @@
         </tr>
         
         <tr >
-            <td>107</td>
+            <td>108</td>
             <td ><code>next_date</code></td>
             <td >
                 Date</td>
@@ -1651,7 +1663,7 @@
         </tr>
         
         <tr >
-            <td>108</td>
+            <td>109</td>
             <td ><code>recurring_id</code></td>
             <td >
                 Data</td>
@@ -1663,7 +1675,7 @@
         </tr>
         
         <tr >
-            <td>109</td>
+            <td>110</td>
             <td ><code>notification_email_address</code></td>
             <td >
                 Small Text</td>
@@ -1676,7 +1688,7 @@
         </tr>
         
         <tr >
-            <td>110</td>
+            <td>111</td>
             <td ><code>recurring_print_format</code></td>
             <td >
                 Link</td>
@@ -1834,6 +1846,20 @@
     
     
 	<p class="docs-attr-name">
+        <a name="set_indicator" href="#set_indicator" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_indicator</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set indicator for portal</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="update_delivery_status" href="#update_delivery_status" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>update_delivery_status</b>
@@ -2248,7 +2274,7 @@
         <a name="erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice" href="#erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		erpnext.selling.doctype.sales_order.sales_order.<b>make_sales_invoice</b>
-        <i class="text-muted">(source_name, target_doc=None)</i>
+        <i class="text-muted">(source_name, target_doc=None, ignore_permissions=False)</i>
     </p>
 	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
 </div>
diff --git a/erpnext/docs/current/models/setup/company.html b/erpnext/docs/current/models/setup/company.html
index bafb019..88381d1 100644
--- a/erpnext/docs/current/models/setup/company.html
+++ b/erpnext/docs/current/models/setup/company.html
@@ -111,7 +111,8 @@
                 <pre>Distribution
 Manufacturing
 Retail
-Services</pre>
+Services
+Education</pre>
             </td>
         </tr>
         
@@ -824,20 +825,6 @@
     
     
 	<p class="docs-attr-name">
-        <a name="add_acc" href="#add_acc" class="text-muted small">
-            <i class="icon-link small" style="color: #ccc;"></i></a>
-		<b>add_acc</b>
-        <i class="text-muted">(self, lst)</i>
-    </p>
-	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
-</div>
-	<br>
-
-        
-        
-    
-    
-	<p class="docs-attr-name">
         <a name="after_rename" href="#after_rename" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>after_rename</b>
diff --git a/erpnext/docs/current/models/setup/sales_person.html b/erpnext/docs/current/models/setup/sales_person.html
index 323e625..b7de6b6 100644
--- a/erpnext/docs/current/models/setup/sales_person.html
+++ b/erpnext/docs/current/models/setup/sales_person.html
@@ -229,27 +229,6 @@
             </td>
         </tr>
         
-        <tr >
-            <td>13</td>
-            <td ><code>communications</code></td>
-            <td >
-                Table</td>
-            <td class="text-muted" title="Hidden">
-                Communications
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/core/communication">Communication</a>
-
-
-                
-            </td>
-        </tr>
-        
     </tbody>
 </table>
 
diff --git a/erpnext/docs/current/models/setup/terms_and_conditions.html b/erpnext/docs/current/models/setup/terms_and_conditions.html
index 95acfe1..cc3fdee 100644
--- a/erpnext/docs/current/models/setup/terms_and_conditions.html
+++ b/erpnext/docs/current/models/setup/terms_and_conditions.html
@@ -64,6 +64,18 @@
         
         <tr >
             <td>2</td>
+            <td ><code>disabled</code></td>
+            <td >
+                Check</td>
+            <td >
+                Disabled
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
diff --git a/erpnext/docs/current/models/stock/delivery_note.html b/erpnext/docs/current/models/stock/delivery_note.html
index 52c0fd1..29b6b77 100644
--- a/erpnext/docs/current/models/stock/delivery_note.html
+++ b/erpnext/docs/current/models/stock/delivery_note.html
@@ -834,32 +834,6 @@
         
         <tr >
             <td>54</td>
-            <td ><code>column_break_51</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>55</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>56</td>
             <td ><code>base_discount_amount</code></td>
             <td >
                 Currency</td>
@@ -872,8 +846,46 @@
             </td>
         </tr>
         
-        <tr class="info">
+        <tr >
+            <td>55</td>
+            <td ><code>column_break_51</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
             <td>57</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>58</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -887,7 +899,7 @@
         </tr>
         
         <tr >
-            <td>58</td>
+            <td>59</td>
             <td ><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -901,7 +913,7 @@
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>60</td>
             <td ><code>base_rounded_total</code></td>
             <td >
                 Currency</td>
@@ -915,7 +927,7 @@
         </tr>
         
         <tr >
-            <td>60</td>
+            <td>61</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -928,7 +940,7 @@
         </tr>
         
         <tr >
-            <td>61</td>
+            <td>62</td>
             <td ><code>column_break3</code></td>
             <td class="info">
                 Column Break</td>
@@ -940,7 +952,7 @@
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>63</td>
             <td ><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -954,7 +966,7 @@
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>64</td>
             <td ><code>rounded_total</code></td>
             <td >
                 Currency</td>
@@ -968,7 +980,7 @@
         </tr>
         
         <tr >
-            <td>64</td>
+            <td>65</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -981,7 +993,7 @@
         </tr>
         
         <tr class="info">
-            <td>65</td>
+            <td>66</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -995,7 +1007,7 @@
         </tr>
         
         <tr >
-            <td>66</td>
+            <td>67</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -1016,7 +1028,7 @@
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>68</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -1028,7 +1040,7 @@
         </tr>
         
         <tr class="info">
-            <td>68</td>
+            <td>69</td>
             <td ><code>transporter_info</code></td>
             <td >
                 Section Break</td>
@@ -1042,7 +1054,7 @@
         </tr>
         
         <tr >
-            <td>69</td>
+            <td>70</td>
             <td ><code>transporter_name</code></td>
             <td >
                 Data</td>
@@ -1054,7 +1066,7 @@
         </tr>
         
         <tr >
-            <td>70</td>
+            <td>71</td>
             <td ><code>col_break34</code></td>
             <td class="info">
                 Column Break</td>
@@ -1066,7 +1078,7 @@
         </tr>
         
         <tr >
-            <td>71</td>
+            <td>72</td>
             <td ><code>lr_no</code></td>
             <td >
                 Data</td>
@@ -1078,7 +1090,7 @@
         </tr>
         
         <tr >
-            <td>72</td>
+            <td>73</td>
             <td ><code>lr_date</code></td>
             <td >
                 Date</td>
@@ -1090,7 +1102,7 @@
         </tr>
         
         <tr class="info">
-            <td>73</td>
+            <td>74</td>
             <td ><code>contact_info</code></td>
             <td >
                 Section Break</td>
@@ -1104,7 +1116,7 @@
         </tr>
         
         <tr >
-            <td>74</td>
+            <td>75</td>
             <td class="danger" title="Mandatory"><code>territory</code></td>
             <td >
                 Link</td>
@@ -1125,7 +1137,7 @@
         </tr>
         
         <tr >
-            <td>75</td>
+            <td>76</td>
             <td ><code>customer_group</code></td>
             <td >
                 Link</td>
@@ -1146,7 +1158,7 @@
         </tr>
         
         <tr >
-            <td>76</td>
+            <td>77</td>
             <td ><code>col_break21</code></td>
             <td class="info">
                 Column Break</td>
@@ -1158,7 +1170,7 @@
         </tr>
         
         <tr >
-            <td>77</td>
+            <td>78</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -1179,7 +1191,7 @@
         </tr>
         
         <tr class="info">
-            <td>78</td>
+            <td>79</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -1193,7 +1205,7 @@
         </tr>
         
         <tr >
-            <td>79</td>
+            <td>80</td>
             <td ><code>project_name</code></td>
             <td >
                 Link</td>
@@ -1215,7 +1227,7 @@
         </tr>
         
         <tr >
-            <td>80</td>
+            <td>81</td>
             <td ><code>campaign</code></td>
             <td >
                 Link</td>
@@ -1236,7 +1248,7 @@
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>82</td>
             <td ><code>source</code></td>
             <td >
                 Select</td>
@@ -1259,7 +1271,7 @@
         </tr>
         
         <tr >
-            <td>82</td>
+            <td>83</td>
             <td ><code>column_break5</code></td>
             <td class="info">
                 Column Break</td>
@@ -1271,7 +1283,7 @@
         </tr>
         
         <tr >
-            <td>83</td>
+            <td>84</td>
             <td class="danger" title="Mandatory"><code>posting_time</code></td>
             <td >
                 Time</td>
@@ -1284,7 +1296,7 @@
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>85</td>
             <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
             <td >
                 Link</td>
@@ -1304,8 +1316,20 @@
             </td>
         </tr>
         
+        <tr >
+            <td>86</td>
+            <td ><code>per_billed</code></td>
+            <td >
+                Currency</td>
+            <td >
+                % Amount Billed
+                
+            </td>
+            <td></td>
+        </tr>
+        
         <tr class="info">
-            <td>85</td>
+            <td>87</td>
             <td ><code>printing_details</code></td>
             <td >
                 Section Break</td>
@@ -1317,7 +1341,7 @@
         </tr>
         
         <tr >
-            <td>86</td>
+            <td>88</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1338,7 +1362,7 @@
         </tr>
         
         <tr >
-            <td>87</td>
+            <td>89</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1359,7 +1383,7 @@
         </tr>
         
         <tr >
-            <td>88</td>
+            <td>90</td>
             <td ><code>column_break_88</code></td>
             <td class="info">
                 Column Break</td>
@@ -1371,7 +1395,7 @@
         </tr>
         
         <tr >
-            <td>89</td>
+            <td>91</td>
             <td ><code>print_without_amount</code></td>
             <td >
                 Check</td>
@@ -1383,7 +1407,7 @@
         </tr>
         
         <tr class="info">
-            <td>90</td>
+            <td>92</td>
             <td ><code>section_break_83</code></td>
             <td >
                 Section Break</td>
@@ -1395,7 +1419,7 @@
         </tr>
         
         <tr >
-            <td>91</td>
+            <td>93</td>
             <td class="danger" title="Mandatory"><code>status</code></td>
             <td >
                 Select</td>
@@ -1406,14 +1430,15 @@
             <td>
                 <pre>
 Draft
-Submitted
+To Bill
+Completed
 Cancelled
 Closed</pre>
             </td>
         </tr>
         
         <tr >
-            <td>92</td>
+            <td>94</td>
             <td ><code>per_installed</code></td>
             <td >
                 Percent</td>
@@ -1426,7 +1451,7 @@
         </tr>
         
         <tr >
-            <td>93</td>
+            <td>95</td>
             <td ><code>installation_status</code></td>
             <td >
                 Select</td>
@@ -1438,7 +1463,7 @@
         </tr>
         
         <tr >
-            <td>94</td>
+            <td>96</td>
             <td ><code>column_break_89</code></td>
             <td class="info">
                 Column Break</td>
@@ -1450,7 +1475,7 @@
         </tr>
         
         <tr >
-            <td>95</td>
+            <td>97</td>
             <td ><code>to_warehouse</code></td>
             <td >
                 Link</td>
@@ -1472,7 +1497,7 @@
         </tr>
         
         <tr >
-            <td>96</td>
+            <td>98</td>
             <td ><code>excise_page</code></td>
             <td >
                 Data</td>
@@ -1484,7 +1509,7 @@
         </tr>
         
         <tr >
-            <td>97</td>
+            <td>99</td>
             <td ><code>instructions</code></td>
             <td >
                 Text</td>
@@ -1496,7 +1521,7 @@
         </tr>
         
         <tr class="info">
-            <td>98</td>
+            <td>100</td>
             <td ><code>sales_team_section_break</code></td>
             <td >
                 Section Break</td>
@@ -1510,7 +1535,7 @@
         </tr>
         
         <tr >
-            <td>99</td>
+            <td>101</td>
             <td ><code>sales_partner</code></td>
             <td >
                 Link</td>
@@ -1531,7 +1556,7 @@
         </tr>
         
         <tr >
-            <td>100</td>
+            <td>102</td>
             <td ><code>column_break7</code></td>
             <td class="info">
                 Column Break</td>
@@ -1543,7 +1568,7 @@
         </tr>
         
         <tr >
-            <td>101</td>
+            <td>103</td>
             <td ><code>commission_rate</code></td>
             <td >
                 Float</td>
@@ -1555,7 +1580,7 @@
         </tr>
         
         <tr >
-            <td>102</td>
+            <td>104</td>
             <td ><code>total_commission</code></td>
             <td >
                 Currency</td>
@@ -1569,7 +1594,7 @@
         </tr>
         
         <tr class="info">
-            <td>103</td>
+            <td>105</td>
             <td ><code>section_break1</code></td>
             <td >
                 Section Break</td>
@@ -1581,7 +1606,7 @@
         </tr>
         
         <tr >
-            <td>104</td>
+            <td>106</td>
             <td ><code>sales_team</code></td>
             <td >
                 Table</td>
@@ -1767,6 +1792,20 @@
     
     
 	<p class="docs-attr-name">
+        <a name="update_billing_status" href="#update_billing_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_billing_status</b>
+        <i class="text-muted">(self, update_modified=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="update_current_stock" href="#update_current_stock" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>update_current_stock</b>
@@ -1987,6 +2026,22 @@
 	
         
     
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.delivery_note.delivery_note.update_billed_amount_based_on_so" href="#erpnext.stock.doctype.delivery_note.delivery_note.update_billed_amount_based_on_so" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.delivery_note.delivery_note.<b>update_billed_amount_based_on_so</b>
+        <i class="text-muted">(so_detail, update_modified=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
     <p><span class="label label-info">Public API</span>
         <br><code>/api/method/erpnext.stock.doctype.delivery_note.delivery_note.update_delivery_note_status</code>
     </p>
diff --git a/erpnext/docs/current/models/stock/delivery_note_item.html b/erpnext/docs/current/models/stock/delivery_note_item.html
index c7abefe..1c48c11 100644
--- a/erpnext/docs/current/models/stock/delivery_note_item.html
+++ b/erpnext/docs/current/models/stock/delivery_note_item.html
@@ -746,6 +746,20 @@
         
         <tr >
             <td>49</td>
+            <td ><code>billed_amt</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Billed Amt
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
             <td ><code>page_break</code></td>
             <td >
                 Check</td>
diff --git a/erpnext/docs/current/models/stock/price_list.html b/erpnext/docs/current/models/stock/price_list.html
index 28e2cec..60d5b2e 100644
--- a/erpnext/docs/current/models/stock/price_list.html
+++ b/erpnext/docs/current/models/stock/price_list.html
@@ -391,8 +391,6 @@
 			
         
 			
-        
-			
             <li>
 
 
diff --git a/erpnext/docs/current/models/stock/purchase_receipt.html b/erpnext/docs/current/models/stock/purchase_receipt.html
index 16a1ef7..3a4ea2c 100644
--- a/erpnext/docs/current/models/stock/purchase_receipt.html
+++ b/erpnext/docs/current/models/stock/purchase_receipt.html
@@ -409,7 +409,7 @@
             <td >
                 Button</td>
             <td >
-                Get Current Stock
+                Get current stock
                 
             </td>
             <td>
@@ -706,32 +706,6 @@
         
         <tr >
             <td>47</td>
-            <td ><code>column_break_44</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>48</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>49</td>
             <td ><code>base_discount_amount</code></td>
             <td >
                 Currency</td>
@@ -744,8 +718,46 @@
             </td>
         </tr>
         
-        <tr class="info">
+        <tr >
+            <td>48</td>
+            <td ><code>column_break_44</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
             <td>50</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>51</td>
             <td ><code>section_break_46</code></td>
             <td >
                 Section Break</td>
@@ -757,7 +769,7 @@
         </tr>
         
         <tr >
-            <td>51</td>
+            <td>52</td>
             <td ><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -771,7 +783,7 @@
         </tr>
         
         <tr >
-            <td>52</td>
+            <td>53</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -783,7 +795,7 @@
         </tr>
         
         <tr >
-            <td>53</td>
+            <td>54</td>
             <td ><code>base_rounded_total</code></td>
             <td >
                 Currency</td>
@@ -797,7 +809,7 @@
         </tr>
         
         <tr >
-            <td>54</td>
+            <td>55</td>
             <td ><code>column_break_50</code></td>
             <td class="info">
                 Column Break</td>
@@ -809,7 +821,7 @@
         </tr>
         
         <tr >
-            <td>55</td>
+            <td>56</td>
             <td ><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -823,7 +835,7 @@
         </tr>
         
         <tr >
-            <td>56</td>
+            <td>57</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -835,7 +847,7 @@
         </tr>
         
         <tr class="info">
-            <td>57</td>
+            <td>58</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -849,7 +861,7 @@
         </tr>
         
         <tr >
-            <td>58</td>
+            <td>59</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -870,7 +882,7 @@
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>60</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -882,7 +894,7 @@
         </tr>
         
         <tr class="info">
-            <td>60</td>
+            <td>61</td>
             <td ><code>contact_section</code></td>
             <td >
                 Section Break</td>
@@ -896,7 +908,7 @@
         </tr>
         
         <tr >
-            <td>61</td>
+            <td>62</td>
             <td ><code>supplier_address</code></td>
             <td >
                 Link</td>
@@ -917,7 +929,7 @@
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>63</td>
             <td ><code>column_break_57</code></td>
             <td class="info">
                 Column Break</td>
@@ -929,7 +941,7 @@
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>64</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -950,7 +962,7 @@
         </tr>
         
         <tr class="info">
-            <td>64</td>
+            <td>65</td>
             <td ><code>raw_material_details</code></td>
             <td >
                 Section Break</td>
@@ -964,7 +976,7 @@
         </tr>
         
         <tr >
-            <td>65</td>
+            <td>66</td>
             <td ><code>is_subcontracted</code></td>
             <td >
                 Select</td>
@@ -979,7 +991,7 @@
         </tr>
         
         <tr >
-            <td>66</td>
+            <td>67</td>
             <td ><code>supplier_warehouse</code></td>
             <td >
                 Link</td>
@@ -1000,7 +1012,7 @@
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>68</td>
             <td ><code>supplied_items</code></td>
             <td >
                 Table</td>
@@ -1021,7 +1033,7 @@
         </tr>
         
         <tr >
-            <td>68</td>
+            <td>69</td>
             <td ><code>bill_no</code></td>
             <td >
                 Data</td>
@@ -1033,7 +1045,7 @@
         </tr>
         
         <tr >
-            <td>69</td>
+            <td>70</td>
             <td ><code>bill_date</code></td>
             <td >
                 Date</td>
@@ -1045,7 +1057,7 @@
         </tr>
         
         <tr class="info">
-            <td>70</td>
+            <td>71</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -1059,7 +1071,7 @@
         </tr>
         
         <tr >
-            <td>71</td>
+            <td>72</td>
             <td class="danger" title="Mandatory"><code>status</code></td>
             <td >
                 Select</td>
@@ -1070,14 +1082,15 @@
             <td>
                 <pre>
 Draft
-Submitted
+To Bill
+Completed
 Cancelled
 Closed</pre>
             </td>
         </tr>
         
         <tr >
-            <td>72</td>
+            <td>73</td>
             <td ><code>rejected_warehouse</code></td>
             <td >
                 Link</td>
@@ -1099,7 +1112,7 @@
         </tr>
         
         <tr >
-            <td>73</td>
+            <td>74</td>
             <td ><code>amended_from</code></td>
             <td >
                 Link</td>
@@ -1120,7 +1133,7 @@
         </tr>
         
         <tr >
-            <td>74</td>
+            <td>75</td>
             <td ><code>range</code></td>
             <td >
                 Data</td>
@@ -1132,7 +1145,7 @@
         </tr>
         
         <tr >
-            <td>75</td>
+            <td>76</td>
             <td ><code>column_break4</code></td>
             <td class="info">
                 Column Break</td>
@@ -1144,7 +1157,19 @@
         </tr>
         
         <tr >
-            <td>76</td>
+            <td>77</td>
+            <td ><code>per_billed</code></td>
+            <td >
+                Percent</td>
+            <td >
+                % Amount Billed
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>78</td>
             <td class="danger" title="Mandatory"><code>company</code></td>
             <td >
                 Link</td>
@@ -1165,7 +1190,7 @@
         </tr>
         
         <tr >
-            <td>77</td>
+            <td>79</td>
             <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
             <td >
                 Link</td>
@@ -1186,7 +1211,7 @@
         </tr>
         
         <tr class="info">
-            <td>78</td>
+            <td>80</td>
             <td ><code>printing_settings</code></td>
             <td >
                 Section Break</td>
@@ -1198,7 +1223,7 @@
         </tr>
         
         <tr >
-            <td>79</td>
+            <td>81</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1219,7 +1244,7 @@
         </tr>
         
         <tr >
-            <td>80</td>
+            <td>82</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1240,7 +1265,7 @@
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>83</td>
             <td ><code>other_details</code></td>
             <td >
                 HTML</td>
@@ -1252,7 +1277,7 @@
         </tr>
         
         <tr >
-            <td>82</td>
+            <td>84</td>
             <td ><code>instructions</code></td>
             <td >
                 Small Text</td>
@@ -1264,7 +1289,7 @@
         </tr>
         
         <tr >
-            <td>83</td>
+            <td>85</td>
             <td ><code>remarks</code></td>
             <td >
                 Small Text</td>
@@ -1276,7 +1301,7 @@
         </tr>
         
         <tr class="info">
-            <td>84</td>
+            <td>86</td>
             <td ><code>transporter_info</code></td>
             <td >
                 Section Break</td>
@@ -1290,7 +1315,7 @@
         </tr>
         
         <tr >
-            <td>85</td>
+            <td>87</td>
             <td ><code>transporter_name</code></td>
             <td >
                 Data</td>
@@ -1302,7 +1327,7 @@
         </tr>
         
         <tr >
-            <td>86</td>
+            <td>88</td>
             <td ><code>column_break5</code></td>
             <td class="info">
                 Column Break</td>
@@ -1314,7 +1339,7 @@
         </tr>
         
         <tr >
-            <td>87</td>
+            <td>89</td>
             <td ><code>lr_no</code></td>
             <td >
                 Data</td>
@@ -1326,7 +1351,7 @@
         </tr>
         
         <tr >
-            <td>88</td>
+            <td>90</td>
             <td ><code>lr_date</code></td>
             <td >
                 Date</td>
@@ -1559,6 +1584,20 @@
     
     
 	<p class="docs-attr-name">
+        <a name="update_billing_status" href="#update_billing_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_billing_status</b>
+        <i class="text-muted">(self, update_modified=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="update_ordered_qty" href="#update_ordered_qty" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>update_ordered_qty</b>
@@ -1741,6 +1780,22 @@
 	
         
     
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_billed_amount_based_on_po" href="#erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_billed_amount_based_on_po" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.purchase_receipt.purchase_receipt.<b>update_billed_amount_based_on_po</b>
+        <i class="text-muted">(po_detail, update_modified=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
     <p><span class="label label-info">Public API</span>
         <br><code>/api/method/erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_purchase_receipt_status</code>
     </p>
diff --git a/erpnext/docs/current/models/stock/purchase_receipt_item.html b/erpnext/docs/current/models/stock/purchase_receipt_item.html
index 025f291..2404597 100644
--- a/erpnext/docs/current/models/stock/purchase_receipt_item.html
+++ b/erpnext/docs/current/models/stock/purchase_receipt_item.html
@@ -584,48 +584,6 @@
         
         <tr >
             <td>40</td>
-            <td ><code>project_name</code></td>
-            <td >
-                Link</td>
-            <td >
-                Project Name
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
-
-
-                
-            </td>
-        </tr>
-        
-        <tr >
-            <td>41</td>
-            <td ><code>cost_center</code></td>
-            <td >
-                Link</td>
-            <td >
-                Cost Center
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
-
-
-                
-            </td>
-        </tr>
-        
-        <tr >
-            <td>42</td>
             <td ><code>qa_no</code></td>
             <td >
                 Link</td>
@@ -646,6 +604,39 @@
         </tr>
         
         <tr >
+            <td>41</td>
+            <td ><code>column_break_40</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>prevdoc_docname</code></td>
+            <td >
+                Link</td>
+            <td >
+                Purchase Order
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
             <td>43</td>
             <td ><code>schedule_date</code></td>
             <td >
@@ -669,13 +660,13 @@
             <td></td>
         </tr>
         
-        <tr >
+        <tr class="info">
             <td>45</td>
-            <td ><code>prevdoc_doctype</code></td>
+            <td ><code>section_break_45</code></td>
             <td >
-                Data</td>
-            <td class="text-muted" title="Hidden">
-                Prevdoc Doctype
+                Section Break</td>
+            <td >
+                
                 
             </td>
             <td></td>
@@ -683,72 +674,6 @@
         
         <tr >
             <td>46</td>
-            <td ><code>prevdoc_docname</code></td>
-            <td >
-                Link</td>
-            <td >
-                Purchase Order
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
-
-
-                
-            </td>
-        </tr>
-        
-        <tr >
-            <td>47</td>
-            <td ><code>prevdoc_detail_docname</code></td>
-            <td >
-                Data</td>
-            <td class="text-muted" title="Hidden">
-                Purchase Order Item No
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>48</td>
-            <td ><code>col_break5</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>49</td>
-            <td ><code>bom</code></td>
-            <td >
-                Link</td>
-            <td >
-                BOM
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
-
-
-                
-            </td>
-        </tr>
-        
-        <tr >
-            <td>50</td>
             <td ><code>serial_no</code></td>
             <td >
                 Text</td>
@@ -760,19 +685,7 @@
         </tr>
         
         <tr >
-            <td>51</td>
-            <td ><code>rejected_serial_no</code></td>
-            <td >
-                Text</td>
-            <td >
-                Rejected Serial No
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>52</td>
+            <td>47</td>
             <td ><code>batch_no</code></td>
             <td >
                 Link</td>
@@ -793,7 +706,166 @@
         </tr>
         
         <tr >
+            <td>48</td>
+            <td ><code>column_break_48</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>rejected_serial_no</code></td>
+            <td >
+                Text</td>
+            <td >
+                Rejected Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>50</td>
+            <td ><code>section_break_50</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>51</td>
+            <td ><code>project_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td ><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
             <td>53</td>
+            <td ><code>prevdoc_doctype</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Prevdoc Doctype
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>54</td>
+            <td ><code>prevdoc_detail_docname</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Purchase Order Item No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>col_break5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
+            <td ><code>bom</code></td>
+            <td >
+                Link</td>
+            <td >
+                BOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>57</td>
+            <td ><code>billed_amt</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Billed Amt
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>58</td>
+            <td ><code>landed_cost_voucher_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Landed Cost Voucher Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>59</td>
             <td ><code>brand</code></td>
             <td >
                 Link</td>
@@ -814,7 +886,7 @@
         </tr>
         
         <tr >
-            <td>54</td>
+            <td>60</td>
             <td ><code>item_group</code></td>
             <td >
                 Link</td>
@@ -835,7 +907,7 @@
         </tr>
         
         <tr >
-            <td>55</td>
+            <td>61</td>
             <td ><code>rm_supp_cost</code></td>
             <td >
                 Currency</td>
@@ -849,7 +921,7 @@
         </tr>
         
         <tr >
-            <td>56</td>
+            <td>62</td>
             <td ><code>item_tax_amount</code></td>
             <td >
                 Currency</td>
@@ -863,19 +935,7 @@
         </tr>
         
         <tr >
-            <td>57</td>
-            <td ><code>landed_cost_voucher_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Landed Cost Voucher Amount
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>58</td>
+            <td>63</td>
             <td ><code>valuation_rate</code></td>
             <td >
                 Currency</td>
@@ -889,7 +949,7 @@
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>64</td>
             <td ><code>item_tax_rate</code></td>
             <td >
                 Small Text</td>
@@ -903,7 +963,7 @@
         </tr>
         
         <tr >
-            <td>60</td>
+            <td>65</td>
             <td ><code>page_break</code></td>
             <td >
                 Check</td>
diff --git a/erpnext/docs/current/models/stock/serial_no.html b/erpnext/docs/current/models/stock/serial_no.html
index a6b4662..2718310 100644
--- a/erpnext/docs/current/models/stock/serial_no.html
+++ b/erpnext/docs/current/models/stock/serial_no.html
@@ -353,17 +353,20 @@
             <td>22</td>
             <td ><code>delivery_document_type</code></td>
             <td >
-                Select</td>
+                Link</td>
             <td >
                 Delivery Document Type
                 
             </td>
             <td>
-                <pre>
-Delivery Note
-Sales Invoice
-Stock Entry
-Purchase Receipt</pre>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
             </td>
         </tr>
         
@@ -371,12 +374,14 @@
             <td>23</td>
             <td ><code>delivery_document_no</code></td>
             <td >
-                Data</td>
+                Dynamic Link</td>
             <td >
                 Delivery Document No
                 
             </td>
-            <td></td>
+            <td>
+                <pre>delivery_document_type</pre>
+            </td>
         </tr>
         
         <tr >
diff --git a/erpnext/docs/current/models/stock/stock_entry.html b/erpnext/docs/current/models/stock/stock_entry.html
index 652d816..29bc11e 100644
--- a/erpnext/docs/current/models/stock/stock_entry.html
+++ b/erpnext/docs/current/models/stock/stock_entry.html
@@ -1192,20 +1192,6 @@
     
     
 	<p class="docs-attr-name">
-        <a name="get_warehouse_details" href="#get_warehouse_details" class="text-muted small">
-            <i class="icon-link small" style="color: #ccc;"></i></a>
-		<b>get_warehouse_details</b>
-        <i class="text-muted">(self, args)</i>
-    </p>
-	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
-</div>
-	<br>
-
-        
-        
-    
-    
-	<p class="docs-attr-name">
         <a name="load_items_from_bom" href="#load_items_from_bom" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>load_items_from_bom</b>
@@ -1580,6 +1566,24 @@
 
 	
 
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.stock_entry.stock_entry.get_warehouse_details</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.stock_entry.stock_entry.get_warehouse_details" href="#erpnext.stock.doctype.stock_entry.stock_entry.get_warehouse_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.stock_entry.stock_entry.<b>get_warehouse_details</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
 
     
     
diff --git a/erpnext/docs/current/models/stock/warehouse.html b/erpnext/docs/current/models/stock/warehouse.html
index 2d7108b..c0fa5d3 100644
--- a/erpnext/docs/current/models/stock/warehouse.html
+++ b/erpnext/docs/current/models/stock/warehouse.html
@@ -629,8 +629,6 @@
 			
         
 			
-        
-			
             <li>
 
 
diff --git a/erpnext/docs/user/index.md b/erpnext/docs/user/index.md
index 0394638..7ce09d3 100644
--- a/erpnext/docs/user/index.md
+++ b/erpnext/docs/user/index.md
@@ -1,3 +1,6 @@
 # User Manual and Videos
 
-{index}
\ No newline at end of file
+Learn ERPNext by watching the user manual or training videos.
+
+1. [User Manual]({{docs_base_url}}/user/manual)
+1. [Help Videos]({{docs_base_url}}/user/videos/learn)
diff --git a/erpnext/docs/user/manual/de/human-resources/human-resources-report.md b/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md
similarity index 100%
rename from erpnext/docs/user/manual/de/human-resources/human-resources-report.md
rename to erpnext/docs/user/manual/de/human-resources/human-resources-reports.md
diff --git a/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md b/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md
deleted file mode 100644
index 6eba288..0000000
--- a/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md
+++ /dev/null
@@ -1,72 +0,0 @@
-<h1>Accounting for Projects</h1>
-
-Accounting for the projects is tracked via Cost Center in ERPNext. This will require you creating separate Cost Center for each Project. Separate Cost Center for each Project all allow:<
-
-- Allocating budget against specific Cost Center.
-- Getting Profitability Report for each Project.
-
-Let's check steps on how Project and Cost Center should be linked, and used in the sales and purchase transactions.
-
-### 1. Linking Project and Cost Center
-
-#### 1.1 Create Project
-
-You should first create new Project from:
-
-`Projects > Project > New`
-
-In the Project, you will find field to set default Cost Center for this Project.
-
-#### 1.2 Create Cost Center
-
-Since budgeting and costing for each Project will be managed separately, you should create separate Cost Center for each Project.
-
-To create new Cost Center, go to:
-
-`Accounts > Setup > Cost Center`
-
-[Click here to learn on how to add new Cost Center](https://erpnext.com/user-guide/accounts/cost-centers-and-budgeting).
-
-#### 1.3 Update Cost Center in the Project
-
-After creating Cost Center, come back to Project master, and select Cost Center creating for this Project under Default Cost Center field.
-
-![Project Default Cost Center]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-26 at 3.52.10 pm.png)
-
-With this, you will have Cost Center being fetched automatically in the Sales and Purchase transactions based on selection of Cost Center.
-
-Let's check how this setting will affect your sales and purchase entries.
-
-### 2. Selecting Project and Cost Center in the Sales and Purchase Transactions
-
-#### 2.1 Selecting Project in the Sales Transactions
-
-In the sales transactions (which are Sales Order, Delivery Note and Sales Invoice), Project will be selected in the More Info section. On selection of a Project, respective Cost Center will be updated for all the items in that transaction.
-
-![Cost Center in Sales]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-26 at 3.58.45 pm.png)
-
-#### 2.2 Selecting Project in the Purchase Cycle Transactions
-
-In the purchase transactions, Project will be define for each item. This is because you can create a consolidated purchase entry of materials for various projects. Just like it works in sales cycle, same way in the purchase transactions, on selection of Project, its default cost center will be fetched automatically.
-
-![Cost Center in Purchase]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-26 at 4.20.30 pm.png)
-
-### 3. Accounting Report for a Project
-
-#### 3.1 Projectwise Profitability
-
-Since Project's Cost Center has been updated in both sales and purchase entries made for a specific transaction, system will provide you a projectwise profitability report. Profitability for a Project will be derived based on total value income booked minus total value of expense booked where common Cost Center (of a Project) is tagged.
-
-![Financial Analytics for a Project]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-26 at 4.10.37 pm.png)
-
-#### 3.2 Projectwise Budgeting
-
-If you have also define budgets in the Cost Center of a Project, you will get Budget Variance Report for a Cost Center of a Project.
-
-To check Budget Variance report, go to:
-
-`Accounts > Standard Reports > Budget Variance Report`
-
-[Click here for detailed help on how to do budgeting from Cost Center](https://erpnext.com/user-guide/accounts/budgeting).
-
-<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/accounts/articles/c-form.md b/erpnext/docs/user/manual/en/accounts/articles/c-form.md
index c2f2061..3c6e091 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/c-form.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/c-form.md
@@ -1,4 +1,4 @@
-<h1>C-Form</h1>
+#C-Form
 
 C-Form functionality is only applicable for Indian customers.
 
diff --git a/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
index 02cbd66..ccb89da 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
@@ -1,8 +1,10 @@
-<h1>Changing Parent Account</h1>
+#Changing Parent Account
 
-Chart of Account has hierarchical structure. This means each account has a parent account defined for it. You will have few ledger preset, and few ledger (like for Customer, Supplier, Warehouse) will be auto-created based on their master record. These ledger will be placed under pre-defined groups in the Chart of Account. If needed you can place specific account under another group by changing its Parent Account.
+Chart of Account has hierarchical structure. Each account has a parent it is listed under. 
 
-Following are the steps to edit Parent for specific Account.
+There are some accounts which are auto-created. For example, Account for Warehouse is auto-created when new Wareouse is added in the system. These accounts are added under pre-defined account ledger. Warehouse Account is always added under Stock Assets, under Current Assets.
+
+If you wish to place specific Account into another parent Account, you can achieve the same as below.
 
 ####1. Go to Chart of Account
 
@@ -12,17 +14,22 @@
 
 ####2. Edit Account
 
-![Account]({{docs_base_url}}/assets/img/articles/Selection_080.png)  
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-2.png"> 
 
 ####3. Change Parent Account
 
 Search and select preferred Parent Account and save.
 
-![Account]({{docs_base_url}}/assets/img/articles/Selection_084.png)
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-3.png">
 
 Refresh system from Help menu to experience the change.
 
-![Account]({{docs_base_url}}/assets/img/articles/Selection_085.png)
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-4.png">
 
-<div class="well">Note: Change of Parent Account is not applicable for Root Accounts.</div>
+<div class="well"> Note: Parent cannot be customized for the Root Accounts, like Asset, Liability, Income, Expense, Equity.</div>
+
+#### Quick Help
+
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-account-1.gif">
+
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/customer-for-multiple-company.md b/erpnext/docs/user/manual/en/accounts/articles/customer-for-multiple-company.md
deleted file mode 100644
index 6770fa3..0000000
--- a/erpnext/docs/user/manual/en/accounts/articles/customer-for-multiple-company.md
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>Customer for Multiple Company</h1>
-
-ERPNext allows you managing multiple companies in one ERPNext account. It is possible that you will have Customer and Supplier which would belong to more than one company of yours. While creating sales and purchase transactions, system shows result of Customer and Suppliers for that Company only.
-
-It means if you have added (say) Wind Mills Limited as a customer for the first company, you will not be able to select it as a customer when creating Sales Order (or any other sales transaction) for another company.
-
-There are two approach to address this scenario.
-
-####Create Another Customer Record
-
-You should create another Customer record for Wind Mills Limited, but for the second company.
-
-If you try adding another customer with exact same name (as Wind Mills Limited), system will throw a validation message that, account already exist for Wind Mills Limited.
-
-![Common Customer]({{docs_base_url}}/assets/img/articles/$SGrab_306.png)
-
->To be able to track customerwise receivables, ERPNext created accounting ledger for each customer in the Chart of Account, under Accounts Receivable group.
-
-As indicated in the error message, since Account Name already exist for the first customer, you should change customer name for second customer a bit (say Wind Mills Pvt. Limited) to bring uniqueness in it. Then you will be able to save Customer correctly.
-
-####Change Company in Existing Customer
-
-Since creating another Customer record for the same party will be over-load in the system, you can change company in the exist Customer master of Wind Mills Limited, and re-save it. On saving customer again, it will create another accounting ledger for Wind Mills in the Chart of Account of second company.
-
-![Common Customer Account]({{docs_base_url}}/assets/img/articles/$SGrab_307.png)
-
-<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md b/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md
index 026657f..f7d1c5b 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md
@@ -1,30 +1,41 @@
-<h1>Depreciation for Fixed Asset Items</h1>
+#Depreciation for Fixed Asset Items
 
-Depereciation of fixed asset items.
+Depreciation is when you write off certain value of your assets as an expense. For example, office computer will be used for five years. Hence total value of computer should be booked as expense over the period of five years.
 
-####Separate Group of Depreciation Account
+As per perpetual inventory valuation system (set by default), you should create Stock Reconciliation for depreciating value of fixed asset items. Check below steps to learn more.
 
-![Fixed Asset Account]({{docs_base_url}}/assets/img/articles/$SGrab_384.png)
+#### Step 1: Depreciation Account
 
-####Depreciation Entry for Fixed Asset Items
+Depreciation account is auto-created, under Indirect Expenses account.
 
-Depreciation is when you write off certain value of your assets as an expense. For example if you have a computer that you will use for say 5 years, you can distribute its expense over the period and pass a
-Journal Voucher at the end of each year reducing its value by a certain percentage.
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/depreciation-1.png">
 
-As per perpetual inventory valuation system (set by default), you should create Stock Reconciliation for depreciating value of fixed asset items. In the Stock Reconciliation template, you should only enter Item's Code, Warehouse and its current value.
+#### Step 2: Stock Reconciliation
 
-Let's assume current value of our computer is $250, and its purchase value was $320.
+To create new Stock Reconciliation, go to:
 
-![Fixed Asset Depreciation]({{docs_base_url}}/assets/img/articles/$SGrab_385.png)
+`Stock > Setup > Stock Reconciliation > New`
 
-In this case, depreciation amount of Computer will be $70 ($320-$250). Depreciation Amount will be booked under Difference (expense) Account selected in the stock reconciliation.
+Set Posting Date and Time of Stock Reconciliation will when you wish depreciation entry to be posted in your accounts.
 
-![Fixed Asset Depreciation]({{docs_base_url}}/assets/img/articles/$SGrab_386.png)
+#### Step 3: Item
 
-Following is how general ledger will be posted for fixed this Stock Reconciliation.
+Select Fixed Asset Items in the item table. Update Warehouse of an item. For item valuation, update post-depreciation value. For example, item value was 100. Depreciation amount is 20. As per this post-depreciation valuation of an item will be 80. Hence 80 should be posted as valuation in the Stock Reconciliation.
 
-![Fixed Asset General Ledger]({{docs_base_url}}/assets/img/articles/$SGrab_387.png)
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/depreciation-2.png">
 
-Click [here](https://erpnext.com/user-guide/setting-up/stock-reconciliation-for-non-serialized-item) for steps to be followed when making Stock Reconciliation entry.
+#### Step 4: Depreciation Account
+
+Select Depereciation Account in which depereciation amount will be booked.
+
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/depreciation-3.png">
+
+#### Step 5: Submit
+
+On submission of Stock Reconciliation, depreciation will booked for items asset items.
+
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/depreciation-4.png">
+
+Click [here]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html) for steps to be followed when making Stock Reconciliation entry.
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.html b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.html
deleted file mode 100644
index 30cae4e..0000000
--- a/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<h1>Difference Entry Button </h1>
-
-As per accounting standards Debit amount must be equal to Credit amount. If these amounts are not equal, then entry will not be executed in system. Also system will through validation message. And difference amount will reflect under Difference (Dr-Cr) field.
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_002.png"><br>
-When you press 'Make Difference Entry' button, one new Row will be added under Journal Entry Accounts table with difference amount. You can edit that row to select appropriate account.
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_003.png">
-<br>
-<br>On selecting account under new row, you will be able to submit Journal Entry.
-<br>
-<br>
-<div class="well">If debit and credit amount entered for accounts are already tallying, then you need not click on "Make Difference Entry" button.</div>
-
-
-<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md
new file mode 100644
index 0000000..acac407
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md
@@ -0,0 +1,15 @@
+#Difference Entry
+
+As per accounting standards, debit in a accounting entry must be equal to credit. If not, system does allow submission of accounting transaction, thereby stops ledger posting. In ERPNext, on saving accounting entry, system validates if debit and credit is tallying.
+
+<img alt="Debit Credit Not Equal" class="screenshot" src="{{docs_base_url}}/assets/img/articles/difference-entry-1.png">
+
+To have entry balanced, you should one more row, select another account, and update different amount in it. Or you can add difference amount in one of the Account's row itself.
+
+On clicking 'Make Difference Entry' button, new Row will be added under Journal Entry Accounts table, with difference amount. You can edit that row to select appropriate Account.
+
+<img alt="Debit Credit Not Equal" class="screenshot" src="{{docs_base_url}}/assets/img/articles/difference-entry-2.gif">
+
+On selecting account under new row, debit and credit an entry will be tallying, and you should be able to submit Journal Entri correctly.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-creation.md b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-creation.md
new file mode 100644
index 0000000..6911063
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-creation.md
@@ -0,0 +1,5 @@
+# Fiscal Year Creation
+
+New Fiscal Year should be created each year, at the end of the current fiscal year. Creation of new Fiscal Year before its begining has been automated in ERPNext.
+
+Three days prior to the end of the current Fiscal Year, system checks if new Fiscal Year for the incoming year is already created. If not, then system auto-creates new Fiscal Year.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
index e22a3ef..003ad31 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
@@ -1,32 +1,33 @@
-<h1>Fixing Fiscal Year's Error</h1>
+# Fixing Fiscal Year Error
 
-While creating entries in ERPNext, system validates if dates (like Posting Date, Transaction Date etc.) matches with Fiscal Year selected in the entry. If not, system through an error message saying:
+While creating any entry, system validates if dates (like Posting Date, Transaction Date etc.) belongs to Fiscal Year selected. If not, system through an error message saying:
 
 `Date ##-##-#### not in fiscal year`
 
-You are more likely to receive this error message if your Fiscal Year has changes, but you still have old Fiscal Year updated. To ensure new Fiscal Year is auto updated in the transactions, you should setup your master as instructed below.
+You are more likely to receive this error message if your Fiscal Year has changes, but new Fiscal Year still not set a default. To ensure new Fiscal Year is auto updated in the transactions, you should setup your master as instructed below.
 
-####Create New Fiscal Year
+#### Create New Fiscal Year
 
 Only User with System Manager's Role Assigned has permission to create new Fiscal Year. To create new Fiscal Year, go to:
 
 `Accounts > Setup > Fiscal Year`
 
-Click [here](https://erpnext.com/user-guide/accounts/fiscal-year) to learn more about Fiscal Year master.
+Click [here]({{docs_base_url}}/user/manual/en/accounts/setup/fiscal-year.html) to learn more about Fiscal Year.
 
-####Set Fiscal Year as Default
+#### Set Fiscal Year as Default
 
 After Fiscal Year is saved, you will find option to set that Fiscal year as Default.
 
-![Fiscal Year Default]({{docs_base_url}}/assets/img/articles/$SGrab_393.png)
+<img alt="Debit Credit Not Equal" class="screenshot" src="{{docs_base_url}}/assets/img/articles/fiscal-year-error-1.png">
 
 Default Fiscal Year will be updated in the Global Default setting as well. You can manually update Default Fiscal Year from:
 
 `Setup > Settings > Global Default`
 
-![Fiscal Year Global Default]({{docs_base_url}}/assets/img/articles/$SGrab_394.png)
+<img alt="Debit Credit Not Equal" class="screenshot" src="{{docs_base_url}}/assets/img/articles/fiscal-year-error-2.png">
 
-Then Save Global Default, and refresh browser of your ERPNext account. After this, you will have default Fiscal Year auto-updated in your transactions as well.
+Save Global Default, and Reload your ERPNext account. Then, default Fiscal Year will be auto-updated in your transactions.
 
-Note: In transactions, you can manually select required Fiscal Year from More Info section. You might have to click on "View Details" button to access View Details section, and edit Fiscal Year.
+Note: In transactions, you can manually select required Fiscal Year, from More Info section.
+
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md b/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
new file mode 100644
index 0000000..cc2a865
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
@@ -0,0 +1,21 @@
+#Freeze Accounting Entries
+
+To freeze accounting entries upto a certain date, follow below given steps.
+
+#### Step 1: Go to:
+
+`Accounts > Setup > Accounts Settings`
+
+#### Step 2: Set Date
+
+Set date in the **Accounts Frozen Upto** field.
+
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-1.png">
+
+Now, the system will not allow to make any accounting entries before set date. If at all someone tries creating entries, system will show error message as below.
+
+<img alt="Frozen Date Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-2.png">
+
+You can still allow user with certain role to create/edit entries beyound accounts frozen date. You can set that Role in the Account Settings itself.
+
+<img alt="Frozen Date Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-3.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-entries-upto-a-specific-date.html b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-entries-upto-a-specific-date.html
deleted file mode 100644
index 38ecaf5..0000000
--- a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-entries-upto-a-specific-date.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>How to freeze accounting entries upto a specific date?</h1>
-
-To freeze accounting entries upto a certain date, follow these steps:<br><br>1. Go to <b>Accounts -&gt; Setup -&gt; Accounts Settings</b>.<br>2. Set the date in <b>Accounts Frozen Upto</b> field.<br><img src="{{docs_base_path}}/assets/img/articles/freeze-accounting-entry.png" height="302" width="488"><br><br>Now, the system will not allow to make accounting entries before that date. <br><br>But you can allow a specific <b>Role,</b> to make/edit accounting entries before that date. To do that set the desired <b>Role</b>, in <b>Role Allowed to Set Frozen Accounts &amp; Edit Frozen Entries</b> field.<br>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
index d76a331..f21bf2d 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
@@ -1,4 +1,4 @@
-<h1>How To Freeze Accounting Ledger?</h1>
+#How To Freeze Accounting Ledger?
 
 You can freeze any accounting ledger in ERPNext. So that frozen accounting ledger became unsearchable in accounting transaction. Follow below step to understand the process.
 
diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-nullify-balance-from-temporary-accounts.md b/erpnext/docs/user/manual/en/accounts/articles/how-to-nullify-balance-from-temporary-accounts.md
deleted file mode 100644
index 5ba6d17..0000000
--- a/erpnext/docs/user/manual/en/accounts/articles/how-to-nullify-balance-from-temporary-accounts.md
+++ /dev/null
@@ -1,16 +0,0 @@
-<h1>How to Nullify Balance From Temporary Accounts? </h1>
-
-There are two separate temporary accounts in Chart of Accounts. One is Temporary Account (Assets) and other one is Temporary Account (Liabilities). These accounts are available under Application of Funds and Source of Funds in Chart of Accounts respectively.
-
-These temporary accounts only used to update opening balances. [Click here to learn about update Opening balances](https://erpnext.com/kb/accounts/updating-opening-balance-in-accounts-using-temporary-account)
-
-After completing all opening entries against these temporary accounts balances for both accounts will updated. And Debit balance of Temporary Account (Assets) will became equal to Credit balance of Temporary Account (Liabilities).
-
-Since temporary account were used only for balancing purpose, it shall not have any balance in it.
-To nullify balance in these accounts, you should create a new Journal Voucher, where will you update  balances against these accounts. To create new Journal Entry go to `Accounts &gt; Documents &gt; Journal Entry
-
-![Journal Entry]({{docs_base_url}}/assets/img/articles/$SGrab_432.png)
-
-On submit of this journal entry, balances of these temporary accounts will be set to Zero.
-
-<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.txt b/erpnext/docs/user/manual/en/accounts/articles/index.txt
index 08a69e3..76ace0b 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/articles/index.txt
@@ -1,21 +1,15 @@
-accounting-for-projects
+tracking-project-profitability-using-cost-center
 c-form
 changing-parent-account
-customer-for-multiple-company
 depreciation-for-fixed-asset-items
 difference-entry-button
 fiscal-year-error
-how-to-freeze-accounting-entries-upto-a-specific-date
-how-to-freeze-accounting-ledger
-how-to-nullify-balance-from-temporary-accounts
+freeze-accounting-entries
+how-to-freeze-accouting-ledger
 manage-foreign-exchange-difference
 managing-transactions-in-multiple-currency
-new-fiscal-year-auto-create-feature
-pos-view
+fiscal-year-creation
 post-dated-cheque-entry
-pricing-rule
-recurring-order-and-invoices
 update-stock-option-in-sales-invoice
-updating-opening-balance-in-accounts-using-temporary-account
 what-is-the-differences-of-total-and-valuation-in-tax-and-charges
-withdrawing-salary-from-owners-equity-account
+withdrawing-salary-from-owners-equity-account
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
index 6e24f86..a9a9fef 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
@@ -1,25 +1,23 @@
-<h1>Manage Foreign Exchange Difference</h1>
+# Manage Foreign Exchange Difference
 
-When you book Sales Invoices and Purchase invoices in multiple currencies, you will have to deal with currency difference while booking payment entry. You can easily manage this in ERPNext in following ways.  
+In ERPNext, you can create transactions in the foriegn currency as well. When creating transaction in the foreign currency, system updates current exchanage rate with respect to customer/supplier's currency and base currency on your Company. Since Exchange Rate is always flucuating, on might receive payment from the client on exchange rate different from one mentioned in the Sales/Purchase Invoice. Following is the intruction on how to manage different amount avail in payment entry due to exchange rate change.
 
-####Add Expense Account
+#### Add Expense Account
 
-To mange currency difference, create Account **Foreign Exchange Gain/Loss**.
+To mange currency difference, create Account **Foreign Exchange Gain/Loss**. This account is generally created on the Expense side of P&L statement. However, you can place it under another group as per your accounting requirement.
 
-![Account]({{docs_base_url}}/assets/img/articles/Selection_577.png)
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/exchange-rate-difference-1.png">
 
-####Book Payment Entry
+#### Book Payment Entry
 
-In the payment voucher, update invoice amount against Customer or Supplier account, then update actual payment amount against Bank/ Cash account. Add new row and select Foreign Exchange Gain/Loss to update currency difference amount.
+In the payment voucher, update invoice amount against Customer or Supplier account, then update actual payment amount against Bank/Cash account. Add new row and select Foreign Exchange Gain/Loss to update currency difference amount.
 
-####Scenario
+In the below scenario, Sales Invoice was made EUR, at the exchange rate of 1.090. As per this rate, Sales Invoice amount in USD (base currency) was $1000.
 
-Below is the Sales Invoice for a customer in Europe. The base currency of a Company in USD. Sales Invoice is  made at the exchange rate (USD to Eur) of 1.128.
+One receipt of payment, exchange rate changed. As per the new exchange rate, payment received in the base currency was $1080. This means gain of $80 due to change in exchange rate. Following is how Foreign Exchange Gain will be booked in this scenerio.
 
-![Sales Invoice]({{docs_base_url}}/assets/img/articles/Selection_576.png)
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/exchange-rate-difference-2.gif">
 
-When receiving payment from the customer, exchange rate changed to 1.20. As per the update in the exchange rate, payment was for $120. Following is how payment entry will be booked to adjust the difference amount.
-
-![Journal Entry image]({{docs_base_url}}/assets/img/articles/Selection_578.png) 
+In case you incur loss due to change foriegn exchnage rate, then different amount about be updated in the debit of Foreign Exchange Gain/Loss account. Also you can add another row to update another expenses like bank charges, remittance charges etc.
 
 <!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.html b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.html
deleted file mode 100644
index 3757a69..0000000
--- a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<h1>Managing Transactions In Multiple Currency</h1>
-
-You can make transaction in your base currency as well as in customer or supplier currencies. When you make transaction in your customer or supplier currency, the same currency reflects only in print format of that transaction. And system pass back end
-entry in your base currency.
-<br>
-<br>To understand this scenario will take example of Sales Invoice, where your base currency is INR and your customer currency is USD.
-<br>
-<br>Following are steps to create Sales Invoice in customer currency.
-<br>&nbsp;
-<br><b>Step 1:</b> Go to Selling &gt;&gt; Documents &gt;&gt; Sales Invoice &gt;&gt; (+) New.
-<br>
-<br><b>Step 2:</b> Select Customer and Enter other details.
-<br>
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_012.png">
-<br><b>Step 3:</b> Select customer currency and related Price List.
-<br>
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_016.png">
-<br>
-<br>
-<br>On selecting customer currency 'Exchange Rate' field will open under Currency field, where you will enter exchange rate of customer currency to basic currency. In our case for USD to INR. You can check exchange rate online
-for your customer currency to your currency.
-<br>
-<br>Also you can set default customer currency in customer master. Which will auto fetch in transactions.
-<br>
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_017.png">&nbsp;
-<br>System has Currency Exchange master, where you can set currency exchange masters for your multiple currencies. To Set this go to Accounts &gt; Setup &gt; Currency Exchange. <br><br><b>Step 4:</b> Select Item details.<br>
-<br>On selecting Item details Sales invoice Total section will look like below image.
-<br>
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_018.png" width="750">
-<br>
-<br>
-<br>
-<b>Step 5:</b> Save and Submit <br><br>Enter other details like Taxes and charges, Terms and Condition if there and save and submit the invoice form. After submit click on Printer Icon to check print preview. The same document print or email document will you send to your customer or supplier.<br>For our case it will look as below image.<br><br><img src="{{docs_base_path}}/assets/img/articles/Selection_019.png">&nbsp;&nbsp; <br>
-<br>
-<br>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
new file mode 100644
index 0000000..fe69ab5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
@@ -0,0 +1,38 @@
+#Managing Transactions In Multiple Currency
+
+In ERPNext, transactions can be created in the base currency as well as in parties (customer or supplier) currency. In transaction is created in the parties currency, their currency symbol is updated in the print foramt as well.
+
+Let's consider a Sales Invoice, where your base currency is of a Company is USD and party currency is EUR.
+
+#### Step 1: New Sales Invoice
+
+`Accounts > Documents > Sales Invoice > New`
+
+#### Step 2: Select Party
+
+Select Customer from the Customer master. If default Currency is updated in the Customer master, same will be fetched in the Sales Invoice as well, as Customer Currency.
+
+#### Step 3: Exchange Rate
+
+Currenct Exchange between between base currency and customer currency will auto-fetch.
+
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/multiple-currency-1.gif">
+
+#### Step 4: Update Details
+
+Update other details like Item, Taxes, Terms. In the Taxes and other Charges table, charges of type Actual should be updated in the Customer's currency.
+
+#### Step 4: Save and Submit
+
+Save Sales Invoice and then check Print Format. For all the Currency field (rate, amount, totals) Customer's Currency symbol will be updated as well.
+
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/multiple-currency-2.png">
+
+#### Currency Exchange Masters
+
+If you have come to terms with party to follow standard exchange rate throughout, you can capture it by creating Currency Exchange Rate master. To create new Currency Exchange Rate master, go to:
+
+`Accounts > Setup > Currency Exchange`
+
+ If system find Exchange Rate master for any cuurrecy, it is given preference over currency exchnage rate.
+
diff --git a/erpnext/docs/user/manual/en/accounts/articles/new-fiscal-year-auto-create-feature.html b/erpnext/docs/user/manual/en/accounts/articles/new-fiscal-year-auto-create-feature.html
deleted file mode 100644
index 5b6c10f..0000000
--- a/erpnext/docs/user/manual/en/accounts/articles/new-fiscal-year-auto-create-feature.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>New Fiscal Year Auto-Create feature</h1>
-
-New Fiscal Year needs to be created each year at the end of the previous fiscal year. This Process however has been automated in ERPNext.<div><br></div><div>3 days prior to the end of the existing fiscal year; the system shall check if the user has created a new fiscal year for the incoming year. If not the system generates a new fiscal year. All fiscal year Companies are also linked with the new fiscal year as in the previous year.<br><br></div><div><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-12-03 at 5.03.10 pm.png"><br></div>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/pos-view.html b/erpnext/docs/user/manual/en/accounts/articles/pos-view.html
deleted file mode 100644
index fb3c500..0000000
--- a/erpnext/docs/user/manual/en/accounts/articles/pos-view.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>POS View</h1>
-
-POS view renders form in a different layout, mainly designed for the quick selection of items. This view has primarily been designed for the retail business, who needs to be quick at invoicing.<div><br></div><div><img src="{{docs_base_path}}/assets/img/articles/$SGrab_219.png"><br></div><div><br></div><div>Using POS View, you can make complete Sales Invoice, without switching to standard form view.<br><div><br></div><div><b>Question: Why do I get error message for missing fields when making Purchase Receipt or other sales/purchase transactions from POS View?</b></div></div><div><br></div><div>Though POS View is mainly designed for Sales Invoice, but it is also made available in all the sales and purchase transactions. In other transactions, POS View is only meant for quick selection of items. This view will not provide all the fields which are available in the standard form view. Hence, you shall use POS View in other transactions just for Item selection, and revert to form view for enter values in other mandatory fields.</div>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
index 12957d9..66da24e 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
@@ -1,32 +1,32 @@
-<h1>Post Dated Cheque Entry</h1>
+#Post Dated Cheque Entry
 
-Post Dated Cheque is a cheque dated on future date given to another party. This actually works as an advance payment which will could be cleared post cheque date only.
+Post Dated Cheque is a cheque dated on future date. Party generally give post dated cheque, as advance payment. This cheque would be cleared only after cheque date has arrived.
 
-In ERPNext, you can manage post dated cheque entries via journal voucher. Following are step to book payment entry for post dated cheque.
+In ERPNext, create Journal Entries for post dated cheque.
 
-####New Journal Voucher
+####New Journal Entry
 
 To open new journal voucher go to 
 
-`Accounts > Documents > Journal Voucher > New`
+`Accounts > Documents > Journal Entry > New`
 
-####Set Posting Date and other details
+#### Set Posting Date
 
-Assuming your Cheque Date is 31st December, 2014 (or any future date) and you need value of this cheque to reflect in the bank balance after cheque date only.
+Assuming your Cheque Date is 31st December, 2016 (or any future date). As a result, this posting in your bank ledger will appear on Posting Date updated.
 
-![Journal Voucher]({{docs_base_url}}/assets/img/articles/Selection_005d73bc7.png)
+<img alt="JE Posting Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/post-dated-1.gif">
 
 Note: Journal Voucher Reference Date should equal to or less than Posting Date.
 
-####Step 3: Save and Submit Journal Voucher
+####Step 3: Save and Submit
 
-After entering required details Save and Submit the Journal Voucher.
+After entering required details, Save and Submit the Journal Entry.
 
 ####Adjusting Post Dated  Cheque Entry
 
-If Post Dated Journal Voucher needs to be adjusted against any invoice, it can be accomplished via [Payment Reconciliation Tool](https://erpnext.com/user-guide/accounts/payment-reconciliation).
+If Post Dated Journal Entry needs to be adjusted against any invoice, it can be accomplished via [Payment Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/payment-reconciliation.html).
 
-When cheque is cleared in the future date, i.e. actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool](https://erpnext.com/user-guide/accounts/bank-reconciliation).
+When cheque is cleared, i.e. on actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/bank-reconciliation.html).
 
-You might find value of this Journal Voucher already reflecting against bank's ledger. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of balance as per system, and balance expected in the bank.
+You might find value of this Journal Entry already reflecting against bank's ledger. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of bank balance as per system, and actual balance in a account.
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/pricing-rule.md b/erpnext/docs/user/manual/en/accounts/articles/pricing-rule.md
deleted file mode 100644
index f1caf62..0000000
--- a/erpnext/docs/user/manual/en/accounts/articles/pricing-rule.md
+++ /dev/null
@@ -1,75 +0,0 @@
-<h1>Pricing Rule</h1>
-
-Pricing Rule allows you to define rules based on which item's price or discount to be applied is determined.
-
-### Scenario:
-
-Following are the few cases which can be addressed using Pricing Rule.
-
-1. As per the promotional sale policy, if customer purchases more than 10 units of an item, he enjoys 20% discount. 
-
-2. For Customer "XYZ", selling price for the specific or group of "Products" should be updated as ###.
-
-3. Items categorized under specific Item Group has same selling or buying price.
-
-4. Customers catering to specific Customer Group has same selling price.
-
-5. Supplier's categorized under common Supplier Type should have same buying rate applied.
-
-To have %Discount and Price List Rate for an Item auto-applied, you should set Pricing Rules for it.
-
-Pricing Rule master has two sections:
-
-### 1. Applicability Section:
-
-In this section, conditions are set for the Pricing Rule. When transaction meets condition as specified in the Pricing Rule, Price or Discount as specified in the Item master will be applicable. You can set condition on following values.
-
-####1.1 Applicable On:
-
-![Applicable On]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.26.23 pm.png)
-
-If you want Pricing Rule to be applied on all the items, you should apply rule based on Item Group, and select most Parent Item Group for a value.
-
-####1.2 Applicable For:
-
-Applicability option will updated based on our selection for Selling or Buying or both. You can set applicability on one of the following master.
-
-![Applicable for]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.27.31 pm.png)
-
-####1.3 Quantity:
-
-Specify minimum and maximum qty of an item when this Pricing Rule should be applicable.
-
-![Pricing Rule Qty limit]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.28.05 pm.png)
-
-###2. Application:
-
-Using Price List Rule, you can ultimately define price or %discount to be applied on an item.
-
-![Pricing Rule Apply on]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.33.24 pm.png)
-
-####2.1 Price
-
-Price or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Price mentioned in Pricing Rule will be given priority over item's Price List rate.
-
-![Pricing Rule Price]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.30.27 pm.png)
-
-####2.2 Discount Percentage
-
-Discount Percentage can be applied for a specific Price List. To have it applied for all the Price List, %Discount field should be left blank.
-
-![Rule Discount Percent]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.31.01 pm.png)
-
-#### Validity
-
-Enter From and To date between which this Pricing Rule will be applicable. This will be useful if creating Pricing Rule for sales promotion exercise available for certain days.
-
-![Pricing Rule Validity]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.36.29 pm.png)
-
-####Disable
-
-Check Disable to inactive specific Pricing Rule.
-
-![Pricing Rule Disabled]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.37.38 pm.png)
-
-<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/recurring-order-and-invoices.html b/erpnext/docs/user/manual/en/accounts/articles/recurring-order-and-invoices.html
deleted file mode 100644
index 6893761..0000000
--- a/erpnext/docs/user/manual/en/accounts/articles/recurring-order-and-invoices.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Recurring Orders and Invoices</h1>
-
-If you have a contract with a <b>Customer</b> where you bill the Customer on a monthly, quarterly, half-yearly or annual basis, you should use recurring feature in orders and invoices. <br><br><h4>Scenario:</h4><br>Subscription for your hosted ERPNext account requires yearly renewal. We use Sales Order for generating proforma invoices. To automate proforma invoicing for renewal, we set original Sales Order as recurring. Recurring proforma invoice is created automatically just before customer's account is about to expire, and requires renewal. This recurring Proforma Invoice is also emailed automatically to the customer.<br><br>Feature of setting document as recurring is available in Sales Order, Sales Invoice, Purchase Order and Purchase Invoice.<br><br>Option to set document as recurring will be visible only after submission. Recurring is last section in document. Check <b>Is Recurring</b> to set document as recurring.<br><br><img src="{{docs_base_path}}/assets/img/articles/is-recurring.gif"><br><br><b>From Date and To Date: </b>This defines contract period with the customer.<br><br><b>Repeat on the Day of Month: </b>If recurring type is set as Monthly, then it will be day of the month on which&nbsp; recurring invoice will be generated.<br><br><b>End Date:</b> Date after which auto-creation of recurring invoice will be stopped.<br><br><b>Notification Email Address:</b> Email Addresses (separated by comma) on which recurring invoice will be emailed when auto-generated.<br><br><b>Recurring ID: </b>Recurring ID will be original document id which will be linked to all corresponding recurring document. For example, original Sales Invoice's id will be updated into all recurring Sales Invoices.<br><br><b>Recurring Print Format:</b> Select a print format to define document view which should be emailed to customer.<br><br><h4>Exception Handling:</h4><p>In a situation where recurring invoice is not created successfully, user with System Manager role is notified about it via email. Also the document on which recurring event failed, "Is Recurring" field is unchecked for it. This means system doesn't try creating recurring invoice for that document again.</p><p>Failure in creation of recurring invoice could be due to multiple reasons like wrong email id mentioned in the Email Notification field in Recurring section etc.</p><p>On receipt of notification, if cause of failure is fixed (like correcting email id) within 24 hours, then recurring invoice will be generated automatically. If issue is not fixed within the said time, then document should be created for that month/year manually.<br></p>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md b/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
new file mode 100644
index 0000000..356ad43
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
@@ -0,0 +1,80 @@
+#Tracking Project Profibitability using Cost Center
+
+To track expenses and profibility for a project, you can use Cost Centers. You should create separate Cost Center for each Project. This will allow you to.
+
+- Allocating budget on expense for Projects.
+- Tracking Profitability of Project.
+
+Let's check steps on how Project and Cost Center should be linked, and used in the sales and purchase transactions.
+
+### 1. Linking Project and Cost Center
+
+#### 1.1 Create Project
+
+To create new Project, go to:
+
+`Projects > Project > New`
+
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/project-cost-center-4.png">
+
+#### 1.2 Create Cost Center
+
+Since budgeting and costing for each Project will be managed separately, you should create separate Cost Center for each Project.
+
+To create new Cost Center, go to:
+
+`Accounts > Setup > Cost Center`
+
+[Click here to learn how to manage Cost Centers.]({{docs_base_url}}/user/manual/en/accounts/setup/cost-center.html)
+
+#### 1.3 Update Cost Center in the Project
+
+Update Cost Center in the Project master.
+
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/project-cost-center-1.png">
+
+In the sales and purchase transactions, if Project is selected, then Cost Center will fetched from the Project master.
+
+Let's check how this setting will affect your sales and purchase entries.
+
+### 2. Project and Cost Center in Sales & Purchase Transactions
+
+#### 2.1 Project in the Sales Transactions
+
+In the sales transactions (which are Sales Order, Delivery Note and Sales Invoice), Project will be selected in the More Info section. On selection of a Project, respective Cost Center will be updated for all the items in that transaction. Cost Center will be updated on in the transactions which has Cost Center field.
+
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/project-cost-center-2.png">
+
+#### 2.2 Project in the Purchase Transactions
+
+In the purchase transactions, Project is define for each line item. This is because you can create a consolidated purchase entry for various projects. On selection of Project, its default cost center will auto-fetch.
+
+As per perpetual inventory valuation system, expense for the purchased item will be booked when raw-materials are consumed. On consumption of goods, if you are creating Material Issue (stock) entry, then Expense Cost (says Cost of Goods Sold) and Project's Cost Center should be updated in that entry.
+
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/project-cost-center-3.png">
+
+### 3. Accounting Report for a Project
+
+#### 3.1 Projectwise Profitability
+
+Since Project's Cost Center is updated in both sales and purchase entries, you can check Project Profitability based on report on Cost Center.
+
+**Monthly Project Analysis**
+
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/project-cost-center-5.png">
+
+**Overall Profitability**
+
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/project-cost-center-6.png">
+
+#### 3.2 Projectwise Budgeting
+
+If you have also define budgets in the Cost Center of a Project, you will get Budget Variance Report for a Cost Center of a Project.
+
+To check Budget Variance report, go to:
+
+`Accounts > Standard Reports > Budget Variance Report`
+
+[Click here to learn how to do budgeting from Cost Center]({{docs_base_url}}/user/manual/en/accounts/budgeting.html).
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.html b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.html
deleted file mode 100644
index 106f383..0000000
--- a/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Update Stock Option in Sales Invoice</h1>
-
-The <i>Update Stock</i> check box is available in the <i>Items</i> section within <i>Sales Invoice</i> form.<br><br><img src="{{docs_base_path}}/assets/img/articles/kb_updatestk_field.png" height="221" width="603"><br><br>Usually the Sales Invoice is a voucher specifying the amount to be paid against Quantity delivered/to be delivered as per a particular Sales Order.<br><br>Checking the update Stock option before submitting an Invoice will directly deduct the Stock from the Inventory on submission of the Sales Invoice. In such a case the Sales Invoice also satisfies the function of a Delivery Note.<br>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
new file mode 100644
index 0000000..3f3a470
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
@@ -0,0 +1,9 @@
+#Delivery from Sales Invoice
+
+If you have items delivery and invoicing happening at the same time, you can create delivery from with Sales Invocice itself. Sales Invoice has field called **Update Stock**, just before Item table. If this field is checked, on submission of Sales Invoice, stock of Item will be deducted from selected Warehouse.
+
+<img alt="Update Stock" class="screenshot" src="{{docs_base_url}}/assets/img/articles/update-stock.png">
+
+On checking Update Stock, Sales Invoice Item will show relevant fields like Warehouse, Serial No., Batch No., Item valuation etc.
+
+On submission of Sales Invoice, with general ledger posting, stock ledger posting will happen as well.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md b/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md
deleted file mode 100644
index 4962b82..0000000
--- a/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md
+++ /dev/null
@@ -1,44 +0,0 @@
-<h1>Updating Opening Balance in Accounts using Temporary Account</h1>
-
-For updating opening balances in the Accounts, you will need to use temporary adjustment accounts. In the Chart of Account, two adjustment accounts will be created by default.
-
-1. Temporary Account (Assets)
-2. Temporary Account (Liabilities)
-
-Since ERPNext is a double entry accounting system, it requires balancing on debit side with credit side in an accounting entry. When start working on fresh ERPNext account, you will have to update opening balance in your Balance Sheet accounts. You can update opening balance in account(s), and use Temporary Account for balancing purpose.
-
-Let's consider a scenario of updating opening balance in an Account using temporary account.
-
-#### Identifying Accounts to Update Opening Balance
-
-Say we have following customer's ledger, and have receivable from them. This receivable should be updated as opening balance in their account.
-
-1. Comtek Solutions
-1. Walky Tele Solution
-
-Also we can update opening balance on Bank and Cash account.
-
-1. Bank of Baroda
-1. Cash
-
-All these accounts are located on the Current Asset side, hence will have Debit balance.
-
-#### Identifying Temporary Account
-
-To update debit balance in them, we will have to select Credit account for balancing it. Out of the temporary accounts available, we can use `Temporary Account (Liabilities)`.
-
-##### Opening Balance Entry
-
-For Current Asset account, their current balance will be updated on the Debit side. The total value of Debit will be entered as Credit Balance for the Temporary Account (Liability).
-
-![Debit Opening Balance]({{docs_base_url}}/assets/img/articles/$SGrab_431.png)
-
-Same way, you will update opening balance for the liability account. Since Liability accounts will have credit balance, you will have to select Temporary Account (Asset), which is a Debit account for balancing purpose.
-
-After you have updated opening balance in all the Asset and Liability account, you will find that balance in the temporary account will be equal. If balance in temporary accounts is not equal, it must be because opening balance is not updated in some account, or other account was used for balancing purpose.
-
-Since temporary account were used only for balancing purpose, it shall not have any balance in it. To nullify balance in these accounts, you should create a Journal Voucher which will set balance as zero in these account.
-
-![Temporary Account Nullified]({{docs_base_url}}/assets/img/articles/$SGrab_432.png)
-
-<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.html b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.html
deleted file mode 100644
index 3d1c7db..0000000
--- a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<h1>Purchase Tax or Charges Categories</h1>
-
-Consider Tax or Charge field in Purchase Taxes and Charges master has three values.<br><br><ol>
-    <li>Total</li>
-    <li>Valuation</li>
-    <li>Total and Valuation<br><br><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2015-04-15 at 6.04.02 pm.png"><br></li>
-</ol>
-<p>Let's consider an example to understand an effect of value selected in Consider Tax or Charge field.</p>
-<p>We purchase 10 units of item, at the rate of 800, total purchase amount would be 800. Purchased item has 4% VAT tax and INR 100 transportation charges were incurred.
-
-</p><h4>Total:</h4>
-
-<p>An amount of tax/charge categorized Total will be accounted in the total of purchase transactions, but not in the value of purchased item.</p>
-<p>If VAT 4% is applied on item, it will amount to INR 32. Since VAT is the <a href="https://frappe.io/blog/erpnext-features/managing-consumption-tax" target="_blank">consumption tax</a>, its should be added value of Purchase Order/Invoice, since it will
-    be included in payable towards supplier, but its should not be added to the value of Purchased item.</p>
-<p>Hence for tax or charge you wish to be added to transaction total but not to the valuation of item, it should be categorized as Total.</p>
-<p>When Purchase Invoice is submitted, value of tax/charge is booked in respective account.
-    <br>
-</p>
-<h4>Valuation:</h4>
-<p>An amount of tax/charge categorized as Valuation will be added in the value of purchased item, but will not be added to the value of purchase transaction.</p>
-<p>Transportation charge of INR 100 should be categorized as valuation. With this, the value of purchased item will be increased from 800 to 900. Also, it will be not be added to the total of purchase transaction, because it should not be reflected to supplier,
-    as it will be irrelevant for them.
-    <br>
-</p>
-<p>When Purchase Invoice is submitted, value of tax/charge is booked in respective account. Transportation expense will be booked
-    <br>
-</p>
-<h4>Total and Valuation:</h4>
-<p>An amount of tax/charge categorized as for Total and Valuation will be added in the value of purchase item, as well as will be included in the totals of purchase transactions.</p>
-<p>Let's assume that transporter was arranged by our supplier, but we need to pay transportation charges to them. In that case, for transportation charges, category selected should be Total and Valuation. With this INR 100 transportation charges will be
-    added to actual purchase amount of INR 800. Also, INR 100 will reflect in the total, as it will be payable for us towards supplier.
-    <br>
-</p>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md
new file mode 100644
index 0000000..a23b6e7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md
@@ -0,0 +1,33 @@
+#Purchase Tax or Charges Categories
+
+Consider Tax or Charge field in Purchase Taxes and Charges master has three values.
+
+- Total
+- Valuation
+- Total and Valuation
+
+<img alt="Purchase Tax and Charges Categories" class="screenshot" src="{{docs_base_url}}/assets/img/articles/purchase-other-charges-1.png">
+
+Let's consider an example to understand an effect of each charge type. We purchase ten units of item, at the rate of 800. total purchase amount is 800. Purchased item has 4% VAT applied on it, and INR 100 was incurred in transportation.
+
+####Total:
+
+Tax or Charge categorized as **Total** will be included in the total of purchase transactions. But it will not have impact on the valuation of item purchased.
+
+If VAT 4% is applied on item, it will amount to INR 32 (at item's based rate is 800). Since VAT is the [consumption tax](https://frappe.io/blog/erpnext-features/managing-consumption-tax), its should be added value of Purchase Order/Invoice, since it will be included in payable towards supplier. But its should not be added to the value of Purchased item.
+
+When Purchase Invoice is submitted, general ledger posting will be done for tax/charge categorized as Total.
+
+####Valuation:
+
+Tax or charge categorized as **Valuation** will be added in the value of purchased item, but not in the total of that purchase transaction.
+
+Transportation charge of INR 100 should be categorized as valuation. With this, the value of purchased item will be increased from 800 to 900. Also, this charge will be not be added to the total of purchase transaction, because it your expense, and should not be reflected to the supplier.
+
+Check [here]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.html) to learn general posting done for expense categorized as Valuation.
+
+####Total and Valuation:
+
+Tax or Charge categorized as for **Total and Valuation** will be added in the valuation of item, as well as in the totals of purchase transactions.
+
+Let's assume that transportion is arranged by our supplier, but we need to pay transportation charges to them. In that case, for transportation charges, category selected should be Total and Valuation. With this, INR 100 transportation charge will be added to the actual purchase amount 800. Also, INR 100 will reflect in the total, as it will be payable for us towards supplier.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md b/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
index 860f6eb..b18ec6c 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
@@ -1,4 +1,4 @@
-<h1>WIthdrawing Salary from Owner's Equity Account</h1>
+#WIthdrawing Salary from Owner's Equity Account
 
 ### Question
 
diff --git a/erpnext/docs/user/manual/en/accounts/index.txt b/erpnext/docs/user/manual/en/accounts/index.txt
index 323764e..1a1d5d5 100644
--- a/erpnext/docs/user/manual/en/accounts/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/index.txt
@@ -1,9 +1,11 @@
 journal-entry
 sales-invoice
 purchase-invoice
+payment-request
 chart-of-accounts
 making-payments
 advance-payment-entry
+payment-request
 credit-limit
 opening-entry
 accounting-reports
@@ -13,6 +15,9 @@
 item-wise-tax
 point-of-sale-pos-invoice
 multi-currency-accounting
+recurring-orders-and-invoices
+pricing-rule
 tools
 setup
 articles
+
diff --git a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
index a674f21..6080dcc 100644
--- a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
+++ b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
@@ -10,14 +10,14 @@
 
 <img class="screenshot" alt="Modify Account Currency"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/account.png">
 
-For Customer / Supplier (Party), you can also define it's accounting currency in the Party record. If the Party's accounting currency is different from Company Currency, you have to mention Default Receivable / Payable Account in that currency.
+For Customer / Supplier (Party), you can also define it's billing currency in the Party record. If the Party's accounting currency is different from Company Currency, you should mention Default Receivable / Payable Account in that currency.
 
 <img class="screenshot" alt="Customer Accounting Currency"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/customer.png">
 
 
-Once you defined Accounting Currency in Party / Account record, you are ready to make transactions against them. If Party's accounting currency is different from Company Currency, system will restrict to make transaction for that party with that currency only. If accounting currency is same as Company Currency, you can make transactions for that Party in any currency. But accounting entries (GL Entries) will always be in Party's Accounting Currency. In any case, currency of Receivable Account will always be same as accounting currency of the Party.
+Once you defined Currency in the Account and selected relevant accounts in the Party record , you are ready to make transactions against them. If Party account currency is different from Company Currency, system will restrict to make transaction for that party with that currency only. If account currency is same as Company Currency, you can make transactions for that Party in any currency. But accounting entries (GL Entries) will always be in Party Account Currency.
 
-You can change accounting currency in Party / Account record, until making any transactions against them. After making accounting entries, system will not allow to change the accounting currency for both Party / Account record.
+You can change accounting currency in Party / Account record, until making any transactions against them. After making accounting entries, system will not allow to change the currency for both Party / Account record.
 
 In case of multi-company setup, accounting currency of Party must be same for all the companies.
 
@@ -44,9 +44,7 @@
 <img class="screenshot" alt="Journal Entry Exchange Rate"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/journal-entry-multi-currency.png">
 
  
-In Accounts table, on selection of foreign currency account, system will show Currency section and fetch Account Currency and Exchange Rate automatically. You can change / modify the Exchange Rate later manually.
-
-In a single Journal Entry, you can select accounts with only one alternate currency, apart from accounts in Company Currency. Debit / Credit amount should be entered in Account Currency, system will calculate and show the Debit / Credit amount in Company Currency automatically.
+In Accounts table, on selection of foreign currency account, system will show Currency section and fetch Account Currency and Exchange Rate automatically. You can change / modify the Exchange Rate later manually. Debit / Credit amount should be entered in Account Currency, system will calculate and show the Debit / Credit amount in Company Currency automatically.
 
 <img class="screenshot" alt="Journal Entry in multi currency"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/journal-entry-row.png">
 
@@ -63,7 +61,8 @@
 Suppose, default currency of the company is INR. You have an Paypal account for which Currency is USD. You receive payments in the paypal account and lets say, paypal transfers amount once in a week to your other bank account which is managed in INR. 
 
 Paypal account gets debited on different date with different exchange rate, but on transfer date the exchange rate can be different. Hence, there is generally Exchange Loss / Gain on the transfer entry.
-In the bank transfer entry, system sets exchange rate based on the average incoming exchange rate Paypal account. You need to calculate and enter Exchange Loss / Gain based on the average exchange rate and the exchange rate on the transfer date.
+In the bank transfer entry, system sets exchange rate of the credit account (Paypal) based on the average incoming exchange rate. This is to maintain Paypal balance properly in company currency. In case you modify the average exchange rate, you need to adjust the exchange rate manually in the future entries, so that balance in account currency and company currency are in sync.
+Then you should calculate and enter Exchange Loss / Gain based on the Paypal exchange rate and the exchange rate on the transfer date.
 
 Lets say, Paypal account debited by following amounts over the week, which has not been transferred to your other bank account.
 
diff --git a/erpnext/docs/user/manual/en/accounts/payment-request.md b/erpnext/docs/user/manual/en/accounts/payment-request.md
new file mode 100644
index 0000000..68d4397
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/payment-request.md
@@ -0,0 +1,28 @@
+Payment Request is sent via Email and will contain a link to a Payment Gateway if setup. You can create payment request via Sales Order or Sales Invoice.
+
+- Create Payment Request via Sales Order
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/accounts/pr-from-so.png">
+
+- Create payment Request via Sales Invoice
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/accounts/pr-from-si.png">
+
+---
+
+Select appropriate Payment Gateway Account on Payment Request. Account head specified on payment gateway will 
+considered to create journal entry. 
+
+Note: Invoice/Order Currency and Payment Gateway Account corruncy should be same.
+
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/accounts/pr-details-1.png">
+
+---
+
+##### Notify Customer
+You can notify customer from Payment Request with print format. If customer contact email is mentioned, it will automatically fetch email. If not so you can set email id on Payment Request. 
+
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/accounts/pr-details-2.png">
+
+##### Request Mail
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/accounts/pr-email.png">
+
+
diff --git a/erpnext/docs/user/manual/en/accounts/pricing-rule.md b/erpnext/docs/user/manual/en/accounts/pricing-rule.md
new file mode 100644
index 0000000..7afcbea
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/pricing-rule.md
@@ -0,0 +1,82 @@
+#Pricing Rule
+
+Pricing Rule is a master where you can define rules based on which discount is applied to specific Customer or Supplier.
+### Scenario:
+
+Following are the few cases which can be addressed using Pricing Rule.
+
+1. As per the promotional sale policy, if customer purchases more than 10 units of an item, he enjoys 20% discount. 
+
+2. For Customer "XYZ", selling price for the specific Item should be updated as ###.
+
+3. Items categorized under specific Item Group has same selling or buying price.
+
+4. Customers balonging to specific Customer Group should get ### selling price, ot % of Discount on Items.
+
+5. Supplier's categorized under specific Supplier Type should have ### buying rate applied.
+
+To have %Discount and Price List Rate for an Item auto-applied, you should create Pricing Rules for it.
+
+Pricing Rule master has two sections:
+
+### 1. Applicability Section:
+
+In this section, conditions are set for the application of Pricing Rule. When transaction meets condition as specified in this section, Price or Discount as specified in the Pricing Rule will be applied. You can set condition on following values.
+
+####1.1 Applicable On:
+
+<img alt="Applicable On" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-on.png">
+
+If you want Pricing Rule to be applied on all the items, select based on Item Group. For value, select **All Item Group** (parent Item Group).
+
+####1.2 Applicable For:
+
+Applicability option will updated based on our selection for Selling or Buying or both. You can set applicability on one of the following master.
+
+<img alt="Applicable for" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-for.png">
+
+####1.3 Quantity:
+
+Specify minimum and maximum qty of an item when this Pricing Rule should be applicable.
+
+<img alt="Applicable Qty" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-qty.png">
+
+###2. Application:
+
+Using Price List Rule, you can ultimately define price or %discount to be applied on an item.
+
+<img alt="Applicable" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-application.png">
+
+####2.1 Price
+
+Price or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Price mentioned in Pricing Rule will be given priority over item's Price List rate.
+
+<img alt="Applicable Price" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-price.png">
+
+#### 2.2 Discount Percentage
+
+Discount Percentage can be applied for a specific Price List. To have it applied for all the Price List, %Discount field should be left blank.
+
+<img alt="Discount" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-discount.png">
+
+If %Discount is to be applied on all Price Lists, then leave Price List field blank.
+
+#### Validity
+
+Enter From and To date between which this Pricing Rule will be applicable. This will be useful if creating Pricing Rule for sales promotion exercise available for certain days.
+
+<img alt="Validity" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-validity.png">
+
+#### Priority
+
+If two or more Pricing Rules are found based on same 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.
+
+<img alt="Priority" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-priority.png">
+
+#### Disable
+
+Check to Disable Pricing Rule.
+
+<img alt="Disable" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-disable.png">
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md b/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md
new file mode 100644
index 0000000..4d25639
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md
@@ -0,0 +1,33 @@
+#Recurring Orders and Invoices
+
+If you have a contract with a **Customer** where you bill the Customer on a monthly, quarterly, half-yearly or annual basis, you should use recurring feature in orders and invoices. 
+
+#### Scenario:
+
+Subscription for your hosted ERPNext account requires yearly renewal. We use Sales Order for generating proforma invoices. To automate proforma invoicing for renewal, we set original Sales Order as recurring. Recurring proforma invoice is created automatically just before customer's account is about to expire, and requires renewal. This recurring Proforma Invoice is also emailed automatically to the customer.
+
+Feature of setting document as recurring is available in Sales Order, Sales Invoice, Purchase Order and Purchase Invoice.
+
+Option to set document as recurring will be visible only after submission. Recurring is last section in document. Check **Is Recurring** to set document as recurring.
+
+<img alt="Recurring Invoice" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/recurring.gif">
+
+**From Date and To Date:** This defines contract period with the customer.
+
+**Repeat on the Day of Month:** If recurring type is set as Monthly, then it will be day of the month on which recurring invoice will be generated.
+
+**End Date:** Date after which auto-creation of recurring invoice will be stopped.
+
+**Notification Email Address:** Email Addresses (separated by comma) on which recurring invoice will be emailed when auto-generated.
+
+**Recurring ID:** Recurring ID will be original document id which will be linked to all corresponding recurring document. For example, original Sales Invoice's id will be updated into all recurring Sales Invoices.
+
+**Recurring Print Format:** Select a print format to define document view which should be emailed to customer.
+
+####Exception Handling:
+
+In a situation where recurring invoice is not created successfully, user with System Manager role is notified about it via email. Also the document on which recurring event failed, "Is Recurring" field is unchecked for it. This means system doesn't try creating recurring invoice for that document again.
+	
+Failure in creation of recurring invoice could be due to multiple reasons like wrong email id mentioned in the Email Notification field in Recurring section etc.
+
+On receipt of notification, if cause of failure is fixed (like correcting email id) within 24 hours, then recurring invoice will be generated automatically. If issue is not fixed within the said time, then document should be created for that month/year manually.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/index.txt b/erpnext/docs/user/manual/en/buying/articles/index.txt
index c0ed867..5ae3658 100644
--- a/erpnext/docs/user/manual/en/buying/articles/index.txt
+++ b/erpnext/docs/user/manual/en/buying/articles/index.txt
@@ -1,3 +1,3 @@
 maintaining-suppliers-part-no-in-item
-managing-purchase-uom-and-stock-uom
-select-material-requests-based-on-supplier
\ No newline at end of file
+purchasing-in-different-unit
+pull-items-in-purchase-order-based-on-supplier
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
index 52f4c97..2a92581 100644
--- a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
+++ b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
@@ -1,20 +1,20 @@
-<h1>Maintaining Supplier's Item Code in the Item master</h1>
+#Maintaining Supplier's Item Code in the Item master
 
-Since each company has their own item coding standards, for each item, your item code differ from supplier's Item Code. ERPNext allows you to track Supplier's Item Code in your item master, so that you refer to each others item code while transacting. Also you can fetch Supplier's Item Code in your purchase transactions, so that they can easily recognize item referring to their Item Code.
+For each item, code assigned might differ from the code your supplier has given to that same item. ERPNext allows you to track Supplier's Item Code in the item master. Also you can fetch Supplier's Item Code in your purchase transactions, so that they can easily recognize item referring to their Item Code.
 
 #### 1. Updating Supplier Item Code In Item
 
-Under Purchase section in the Item master, you will find table to track Item Code for each Supplier.
+In the Item master, under Supplier Details section, enter Item Code as given by the Supplier to this item.
 
-![Item Supplier Item Code]({{docs_base_url}}/assets/img/articles/Supplier Item Code.png)
+<img alt="Supplier Item Code" class="screenshot" src="{{docs_base_url}}/assets/img/articles/supplier-item-code.png">
 
 #### 2. Supplier's Item Code in Transactions
 
-Each purchase transaction has field in the Item table where Supplier's Item Code is fetched. This field is hidden in form as well as in the Standard print format. You can make it visible by changing property for this field from [Customize Form](https://erpnext.com/user-guide/customize-erpnext/customize-form).
+Each purchase transaction has field in the Item table where Supplier's Item Code is fetched. This field is hidden in form as well as in the Standard print format. You can make it visible by changing property for this field from [Customize Form.]({{docs_base_url}}/user/manual/en/customize-erpnext/customize-form.html)
 
 Supplier Item Code will only be fetched in the purchase transaction, if both Supplier and Item Code selected in purchase transaction is mapped with value mentioned in the Item master.
 
-![Supplier Item Code in transaction]({{docs_base_url}}/assets/img/articles/Supplier Item Code in Purchase Order.png)
+<img alt="Supplier Item Code in transaction" class="screenshot" src="{{docs_base_url}}/assets/img/articles/supplier-item-code-in-purchase-order.png">
 
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md b/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md
deleted file mode 100644
index d4d97be..0000000
--- a/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md
+++ /dev/null
@@ -1,47 +0,0 @@
-<h1>Managing Purchase UoM and Stock UoM</h1>
-
-When purchasing an item, you can set purchase UoM (Unit of Measurement) which could be different from item's stock UoM.
-
-### Scenario:
-
-Item ABC is stocked in Nos, but purchased in Cartons. Hence in the Purchase Order, you will need to update UoM as Carton.
-
-### 1. Editing Purchase UoM
-
-
-#### Step 1.1: Edit UoM in the Purchase Order
-
-In the Purchase Order, you will find two UoM fied.
-
-- UoM
-- Stock UoM
-
-In both the fields, default UoM of an item will be updated. You should edit UoM field, and select Purchase UoM (Carton in this case).
-
-![Item Purchase UoM]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.10.35 pm.png)
-
-#### Step 1.2: Update UoM Conversion Factor
-
-In one Carton, if you get 20 Nos. of item ABC, then UoM Conversion Factor would be 20. 
-
-![Item Conversion Factor]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.11.58 pm.png)
-
-Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you purchase just one carton, then Qty in the stock UoM will be set as 20.
-
-![Purchase Qty in Default UoM]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.14.46 pm.png)
-
-### 2. Stock Ledger Posting
-
-Irrespective of the Purchase UoM selected, stock ledger posting will be done in the Default UoM of an item only. Hence you should ensure that conversion factor is entered correctly while purchasing item in different UoM.
-
-With this, we can conclude that, updating Purchase UoM is mainly for the reference of the supplier. In the print format, you will see item qty in the Purchase UoM.
-
-![Print Format in Purchase UoM]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.15.27 pm.png)
-
-### 3. Setting Conversion Factor in the Item master
-
-In the Item master, under Purchase section, you can list all the possible purchase UoM of an item, with its UoM Conversion Factor.
-
-![Purchase UoM master]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.13.16 pm.png)
-
-<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md b/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md
new file mode 100644
index 0000000..80f5283
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md
@@ -0,0 +1,35 @@
+#Pull Items in Purchase Order based on Supplier
+
+**Question:**
+
+Our Material Request has many items, each purchased from different suppliers. How to pull items from all open Material Request which are to be purchased from common Supplier?
+
+**Answer:**
+
+To pull items from Material Request for specific Supplier only, follow below given steps.
+
+####Step 1:  Default Supplier
+
+Update Default Supplier in the Item master.
+
+<img alt="Item Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/for-supplier-2.png">
+
+####Step 2:  New Purchase Order
+
+`Buying > Document > Purchase Order > New`
+
+####Step 3:  Select for Supplier
+
+From the options available to pull data in the Purchase Order, click on `For Supplier`.
+
+<img alt="Item Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/for-supplier-1.gif">
+
+####Step 4: Get Items
+
+Select Supplier name and click on `Get`.
+
+<img alt="Item Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/for-supplier-3.png">
+
+####Step 5: Edit Items
+
+All the items associated with a Material Request and having the default Supplier will be fetched in the Items Table. You can further edit items to enter rate, qty etc. Also items which are not to be ordered can be removed from Item table.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md b/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md
new file mode 100644
index 0000000..e95f0e3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md
@@ -0,0 +1,42 @@
+#Purchasing in Different Unit (UoM)
+
+Each item has stock unit of measument (UoM) associated to it. For example UoM of pen is nos. and sand stocked kgs. But item could be purchased in different UoM, like 1 set/box of pen, or one truck of sand. In ERPNex, you can create purchase transaction for an item having different UoM than item's stock UoM.
+
+### Scenario:
+
+Item `Pen` is stocked in Nos, but purchased in Box. Hence we will make Purchase Order for Pen in Box.
+
+#### Step 1: Edit UoM in the Purchase Order
+
+In the Purchase Order, you will find two UoM fied.
+
+- UoM
+- Stock UoM
+
+In both the fields, default UoM of an item will be fetched by default. You should edit UoM field, and select Purchase UoM (Box in this case). Updating Purchase UoM is mainly for the reference of the supplier. In the print format, you will see item qty in the Purchase UoM.
+
+<img alt="Item Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/editing-uom-in-po.gif">
+
+#### Step 2: Update UoM Conversion Factors
+
+In one Box, if you get 20 Nos. of Pen, UoM Conversion Factor would be 20. 
+
+<img alt="Item Conversion Factor" class="screenshot" src="{{docs_base_url}}/assets/img/articles/po-conversion-factor.png">
+
+Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you purchase just one Box, then Qty in the stock UoM will be set as 20.
+
+<img alt="Purchase Qty in Default UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/po-qty-in-stock-uom.png">
+
+### Stock Ledger Posting
+
+Irrespective of the Purchase UoM selected, stock ledger posting will be done in the Default UoM of an item. Hence you should ensure that conversion factor is entered correctly while purchasing item in different UoM.
+
+<img alt="Print Format in Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/po-stock-uom-ledger.png">
+
+### Set Conversion Factor in Item
+
+In the Item master, under Purchase section, you can list all the possible purchase UoM of an item, with its UoM Conversion Factor.
+
+<img alt="Purchase UoM master" class="screenshot" src="{{docs_base_url}}/assets/img/articles/item-purchase-uom-conversion.png">
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md b/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md
deleted file mode 100644
index 6b59695..0000000
--- a/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<h1>Select Material Requests based on Supplier</h1>
-
-<b>Question</b>: How to create a single Purchase Order from multiple Material Requests for all Items that are purchased from common Supplier?<br>
-<br><b>Answer</b>:
-<br>
-<br>Material Requests can be individually fetched from Purchase Orders using the 'From Material Request' button. However this procedure becomes tedious when there are multiple Material Requests for items that are purchased from a single supplier.<br>
-<br>A more efficient way;
-<br>
-<br><u><b>Step 1:</b></u> When creating a Purchase order use the <i>'For Supplier'</i> button in the form.
-<br>
-<br><img src="{{docs_base_url}}/assets/img/articles/kb_po_forsupp.png" height="238" width="747"><br>
-<br><u><b>Step 2:</b></u> In the 'Get From Supplier' pop-up enter the Supplier name and click on <i>'Get'</i>.
-<br>
-<br><img src="{{docs_base_url}}/assets/img/articles/kb_po_popup.png"><br>
-<br><u><b>Step 3:</b></u> All the items associated with a Material Request and having the default Supplier, will be fetched in the Items Table. Any Item that is not required can be deleted.
-<br>
-<br><img src="{{docs_base_url}}/assets/img/articles/kb_po_itemtable.png" height="388" width="645"><br>
-<br><div class="well">Note: For this feature to map the Items correctly, the Default Supplier field in the Item Master must be filled.</div>
-<br>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
index 7460568..9a25ec0 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
@@ -1,26 +1,29 @@
-<h1>Allow Fields to be Changed After Submit</h1>
+#Editing Value in Submitted Document
 
-In many cases a field may need to be changed even after the document has been submitted to allow flexibility. The _Allow On Submit_ option is available for such a purpose. Certain standard fields in Doctypes are set as Allow On Submit by default (such as _Letterhead_ and _Print Heading_ in Invoices). The user can set Custom Fields as Allow On Submit using Customize Form.
+Once document is submitted, fields are frozen, and no editing is allowd. Still there are certain standard fields like Letter Head, Print Heading which can still be edited. For the custom field, if **Allow on Submit** property is checked, it will be editable even after document is submitted.
 
-**Note:** Standard Fields cannot be set as Allow On Submit by a User
+<div class="well"> Standard fields cannot be set as Allow on Submit.</div>
 
-#### Step 1: Go to Customize Form in Setup Module.
+#### Step 1: Go To
 
-```Setup >> Customize >> Customize Form```
+`Setup > Customize > Customize Form`
 
-#### 
-####Step 2: Select the form containing the desired Custom Field in _Enter Form Type_ field.
+####Step 2: Select Form
 
-![]({{docs_base_url}}/assets/img/articles/kb_custom_name.png)
+In Customize Form, select Document Type (Quotation, Sales Order, Purchase Invoice Item etc.)
 
-#### **Step 3:** In the _Fields_ section, scroll down, click on the Custom field and check the _Allow On Submit._
+<img alt="select docytpe" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allow-on-submit-1.png">
 
-![]({{docs_base_url}}/assets/img/articles/kb_allowonsubmit_checkinform.png)
+#### Step 3: Edit Field Property
 
-_This field can now be changed even after the Document is submitted_.
+In the fields section, click on the Custom field and check the **Allow On Submit**.
 
-**Note:** The Custom Fields can also be set as Allow On Submit during the time of creation by checking the Allow On Submit option that is available.
-![]({{docs_base_url}}/assets/img/articles/kb_allowonsubmit_checkinfield.png)
+<img alt="Check Allow on Submit" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allow-on-submit-2.png">
 
+#### Step 3: Update Customize Form
+
+<img alt="Update" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allow-on-submit-3.png">
+
+After updating Customize Form, you should reload your ERPNext account. Then check form, and field to confirm it its editbale in submitted form as well.
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html
deleted file mode 100644
index cf27229..0000000
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Creating Custom Link Fields</h1>
-
-Users can create Custom Link Fields within DocTypes by following these steps;
-
-
-
-<br><h4>Step 1: Go to Customize Form in Setup Module.</h4><code>Setup &gt;&gt; Customize &gt;&gt; Customize Form</code><br><br><h4>Step 2: Select the desired form in <em>Enter Form Type</em> field.</h4><img src="{{docs_base_path}}/assets/img/articles/kb_custom_name.png" height="194" width="697"><br><br><h4><strong>Step 3:</strong> In the <em>Fields</em> section;</h4><p>Insert a new Field row and set the attributes as;</p><ul><li><b>Label: </b>Desired label that user wishes to display in the form</li><li><b>Type: </b>Set as 'Link'</li><li><b>Name: </b>Desired name for the field</li><li><b>Options: </b>Enter the name of the Doctype to which the field is linked<br></li></ul><br><img src="{{docs_base_path}}/assets/img/articles/kb_customlink_newfield.png" height="311" width="697"><br><br><br><h4>Note: Please refer to https://frappe.io/kb/customization/form-architecture for more information about the form structure<br></h4><!-- html -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
new file mode 100644
index 0000000..834617e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
@@ -0,0 +1,29 @@
+#Creating Custom Link Fields
+
+Links field are the ones linked to another document type. For example, customer field is a link field in Sales Order. This field is linked to the Customer master.
+
+You can insert Custom Link Field by following steps below.
+
+
+####Step 1: Go to Customize Form
+
+`Setup > Customize > Customize Form`
+
+####Step 2: Select Form
+
+In Customize Form, select Document Type (Quotation, Sales Order, Purchase Invoice Item etc.). Once field are updated in table, open field before which you wish to insert Custom Field. Then click on "Insert Above" to insert new Custom Field.
+
+<img alt="Select Docytpe" class="screenshot" src="{{docs_base_url}}/assets/img/articles/link-field-1.gif">
+
+####Step 4: Custom Field Values
+
+To set field as Link, enter values as below.
+
+1. Label: Desired label that user wishes to display in the form.
+1. Type: Set as 'Link'
+1. Name: Desired name for the field
+1. Options: Enter the name of the Doctype to which the field is linked
+
+<img alt="Enter Values" class="screenshot" src="{{docs_base_url}}/assets/img/articles/link-field-2.png">
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
index cc7ac01..d8e5319 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
@@ -1,4 +1,4 @@
-<h1>Customizing Sorting Order in the List View</h1>
+#Customizing Sorting Order in the List View
 
 **Question:** I want records in my Item List sorted based on Desc Order of Item Code.
 
@@ -10,20 +10,17 @@
 
 ####Step 2: Select Doctype
 
-Select document for which you Sort Order is to be customized. Considering a scenario, Item should be selected in the Doctype field.
+Select document type for which Sort Order is to be customized.
+
+<img alt="Sort Order field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/sort-order-2.png">
 
 ####Step 3: Update Sort Details
 
 In the Customize Form, you will find these fields.
 
-![Sort Order field]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-02 at 3.26.51 pm.png)
+<img alt="Sort Order field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/sort-order-1.png">
 
-1. Sort Field
-
-Select field based on which sorting will be done. It will be "Item_Code" field in scenario.
-
-2. Sort Order
-
-Sort Order will be two possible options, **Asc** for ascending, and **Desc** for descending.
+1. Sort Field: Select field based on which sorting will be done. It will be "Item_Code" field in scenario.
+2. Sort Order: Sort Order will be two possible options, **Asc** for ascending, and **Desc** for descending.
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
index bb0461c..ae5b061 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
@@ -1,23 +1,23 @@
-<h1>Deleting Custom Reports</h1>
+#Deleting Custom Reports
 
-ERPNext has several [types of reports](https://erpnext.com/kb/report/making-custom-reports-in-erpnext) which can be customize as per the companies/users requirement.
+ERPNext has several [types of reports]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext) which can be customize as per the companies/users requirement.
 
-If there is a report custom report which needs to be deleted, it can be achieved by following steps given below. Please note that its applicable only for the Custom Report, and not for the standard reports.
+If there is a report custom report which needs to be deleted, it can be achieved by following steps. Please note that its applicable only for the Custom Reports, and not for the standard reports.
 
-####Report List
+#### Step 1: Go to Report List
 
 In the Awesome Bar, type and select "Report List" for an option.
 
-![Report Search]({{docs_base_url}}/assets/img/articles/$SGrab_316.png)
+<img alt="Report Search" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-report-1.png">
 
 ####Selecting and Deleting Report
 
 The Report List will have all the standard and custom reports of your account. You can select Custom Report to be deleted from the list itself, and click on Delete icon.
 
-![Report List]({{docs_base_url}}/assets/img/articles/$SGrab_317.png)
+<img alt="Report List" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-report-2.png">
 
 Or you can open that report, and delete it from File menu option.
 
-![Report Delete]({{docs_base_url}}/assets/img/articles/$SGrab_318.png)
+<img alt="Report Delete" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-report-3.png">
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
index 2f9655c..e47692f 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
@@ -1,20 +1,20 @@
-<h1>Disable Rounded Total</h1>
+#Disable Rounded Total
 
-Each transaction in ERPNext has Standard print format. For transactions, Standard print format covers Rounded Total for that transaction by default.
+All the sales transactions like Sales Order, Sales Invoice has Rounded Total in it. It calculated based on the value of Grand Total. Also Rounded Total is also visible in the Standard Print Formats. 
 
-![Print Preview]({{docs_base_url}}/assets/img/articles/Selection_053.png)
+<img alt="Print Preview" class="screenshot" src="{{docs_base_url}}/assets/img/articles/hide-rounded-total-1.png">
 
-If you don't wish rounded total to be shown in the Standard Print Format, please complete following settings.
+Follow steps given below to hide rounded total from Standard Print Formats, for all the sales transactions.
 
-####1. Go to Global Settings
+#### Step 1: Global Settings
 
 `Setup > Settings > Global Settings`
 
-####2. Set Global Defaults
+#### Step 2: Disable Rounded Total
 
 Check Disable Rounded Total, and Save Global Defaults.
 
-![Global Default]({{docs_base_url}}/assets/img/articles/Selection_052.png)
+<img alt="Print Preview" class="screenshot" src="{{docs_base_url}}/assets/img/articles/hide-rounded-total-2.png">
 
 For system to take effect of this setting, you should clear cache and refresh your ERPNext account. Then your print formats shall not render value for the Rounded Total in the print formats.
    
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.html
deleted file mode 100644
index 6b1c38b..0000000
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<h1>Field Types</h1>
-
-<p>Following are the types of fields you can define while creating new ones, or while amend standard ones.</p>
-<ul>
-    <li><b>Attach:</b>
-
-        <br>
-        <br>Attach field allows you browsing file from File Manager and attach in the transaction.
-        <br>
-        <br>
-        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_184.png">
-        <br>
-        <br>
-    </li>
-    <li><b>Button:</b>
-
-        <br>
-        <br>This Field Type will generate a Button, on clicking which you can execute some function.
-        <br>
-        <br>
-    </li>
-    <li><b>Check:</b>
-
-        <br>
-        <br>Check will generate a check box field.
-        <br>
-        <br>
-        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_185.png">
-        <br>
-        <br>
-    </li>
-    <li><b>Column Break:</b>
-
-        <br>
-        <br>Since ERPNext has two column layout, using Column Break fields, you can divide set of fields on either side.
-        <br>
-        <br>
-        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_186.png">
-        <br>
-        <br>
-    </li>
-    <li><b>Currency:</b>
-
-        <br>
-        <br>Currency field holds numeric value, upto two decimal place. Also you can have currency symbol being shown for the currency field.
-        <br>
-        <br>
-        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_187.png">
-        <br>
-        <br>
-    </li>
-</ul>
-<ul>
-    <li><b>Data:</b>
-
-        <br>
-        <br>Data field allows you entering value upto 255 character.
-        <br>
-        <br>
-        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_183.png">
-        <br>
-        <br>
-    </li>
-    <li><b>Date and Time:<br><br></b>This field will give you date and time picker, with value for current date and time (as provided by your computer) set by default.
-        <br>
-        <br><b><img src="{{docs_base_path}}/assets/img/articles/$SGrab_188.png"><br><br></b>
-
-    </li>
-    <li><b>Dynamic Link:<br><br></b>Link field is one which pulls data from another master/table. Dynamic link field is connected with multiple masters at the same time. Its link is determined based on value selected in the previous field.
-        <br>
-        <br>Example: Customer will be Dynamic field in the Quotation form. If use selects Quotation made for Customer, then Customer field will be linked to Customer master, and suggest records accordingly. If user selects that Quotation is for Lead, then same Customer
-        field will be linked to Lead master.
-        <br>
-        <br>
-    </li>
-    <li><b>Float:</b>
-
-        <br>
-        <br>Float field carries numeric value, upto six decimal place. Float Precision set in Setup &gt;&gt; Settings &gt;&gt; System Setting will be applicable on all the link field. For float field, decimal places generated will be as define in Float Precision.
-        <br>
-        <br>
-        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_189.png">
-        <br>If you need more than two decimal place in the Currency field, you can change its field type to Float field from Customize Form.
-        <br>
-        <br>
-    </li>
-    <li><b>Image:</b>
-
-        <br>
-        <br>Image field will render an image file selected in another attach field.
-        <br>
-        <br>
-        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_190b611f3.png">
-        <br>
-        <br>For the Image field, under Option, Attach field name should be provide which this field will refer to for image file, and render that image file.
-        <br>
-        <br>
-    </li>
-    <li><b>Int (Integer):</b>
-
-        <br>
-        <br>Integer field holds numeric value, without decimal place.
-        <br>
-        <br>
-    </li>
-    <li>Link Field:
-        <br>
-        <br>Link field is connected with another master from where it fetches data.
-        <br>
-        <br>
-        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_191.png">
-        <br>
-        <br>
-    </li>
-    <li><b>Password:<br><br></b>Password field will decode value in it. Extra coding will be required for validating password of specific user.<b><br><br></b>
-
-    </li>
-    <li><b>Read Only:<br><br></b>Read Only field will carry data fetched from another form, but they themselves will be non-editable. You should set Read Only as field type if its source for value is predetermined.
-        <br>
-        <br>
-    </li>
-    <li><b>Section Break:</b>
-
-        <br>
-        <br>Section Break can be used to divide form in multiple section.
-        <br>
-        <br>
-        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_192.png">
-        <br>
-        <br>
-    </li>
-    <li><b>Select:<br><br></b>Select will be the drop-down field, with possible results (separate by row) define in the Option.
-        <br>
-        <br>
-        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_193.png">
-        <br><b><br></b>
-
-    </li>
-    <li><b>Small Text:</b>
-
-        <br>
-        <br>Small Text field carries general text content, has little more character limit than Data field.
-        <br>
-        <br>
-        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_194.png">
-        <br>
-        <br>
-    </li>
-    <li><b>Table:</b>
-
-        <br>
-        <br>Table will be (sort of) Link field which will render another docytpe within the current form. For example, Item table in the Sales Order form is Table field, which is linked to Sales Order Item doctype.
-        <br>
-        <br>
-        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_196.png">
-        <br>
-        <br>
-    </li>
-    <li><b>Text Editor:</b>
-
-        <br>
-        <br>Text Editor will be large text field, with tools to format text.
-        <br>
-        <br>
-        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_198.png">
-        <br>
-    </li>
-</ul>
\ No newline at end of file
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
new file mode 100644
index 0000000..813a7a7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.md
@@ -0,0 +1,87 @@
+#Field Types
+
+Following are the types of fields you can define while creating new ones, or while amend standard ones.
+
+- Attach: 
+
+Attach field allows you browsing file from File Manager and attach in the transaction.
+
+- Button: 
+
+It will be a Button, on clicking which you can execute some functions like Save, Submit etc. 
+
+- Check:
+
+It will be a check box field. 
+
+- Column Break
+
+Since ERPNext has multiple column layout, using Column Breaks, you can divide set of fields side-by-side. 
+
+- Currency
+
+Currency field holds numeric value, like item price, amount etc. Currency field can have value upto six decimal places. Also you can have currency symbol being shown for the currency field.
+
+- Data
+
+Data field will be simple text field. It allows entering value upto 255 characters.
+
+- Date and Time
+
+This field will give you date and time picker. Current date and time (as provided by your computer) is set by default. 
+
+- Dynamic Link
+
+Click [here]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.html) to learn how Dynamic Link Field function.
+
+- Float
+
+Float field carries numeric value, upto six decimal place. Precision for the float field is set in
+ 
+`Setup > Settings > System`
+
+Setting will be applicable on all the float field. 
+
+- Image
+
+Image field will render an image file selected in another attach field. 
+
+For the Image field, under Option (in Doctype),field name should be provide where image file is attached. By referring to the value in that field, image will be reference in the Image field.
+
+- Int (Integer)
+
+Integer field holds numeric value, without decimal place.
+
+- Link
+
+Link field is connected to another master from where it fetches data. For example, in the Quotation master, Customer is a Link field.
+
+- Password
+
+Password field will have decode value in it.
+
+- Read Only
+
+Read Only field will carry data fetched from another form, but they themselves will be non-editable. You should set Read Only as field type if its source for value is predetermined.
+
+- Section Break
+
+Section Break is used to divide form into multiple sections. 
+
+- Select
+
+Select will be a drop-down field. You can add muliple results in the Option field, separated by row.
+
+- Small Text
+
+Small Text field carries text content, has more character limit than the Data field.
+
+- Table
+
+Table will be (sort of) Link field which renders another docytpe within the current form. For example, Item table in the Sales Order is a Table field, which is linked to Sales Order Item doctype.
+
+- Text Editor
+
+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
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html
deleted file mode 100644
index 450bfb1..0000000
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<h1>Increase Max Attachments</h1>
-
-You can increase Number of attachments which can be added to particular documents via Customize Form.
-<br>
-<br>Let's assume we need to increase Max Attachment limit for Quotation to five. Following will be the steps to achieve this.
-<br>
-<br>
-<b>Step 1</b>: Go to Setup &gt; Customize &gt; Customize Form.
-    <br>
-    <br><b>Step 2</b>: Enter Form Type.<br>&nbsp;
-    <br>In our case, it will be "Quotation".
-    <br><br><img src="{{docs_base_path}}/assets/img/articles/Selection_0179888b3.png"><br>
-    <br><b>Step 3:</b> Increase Numbers under the Max Attachments field.
-<br>
-    <br><br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_018ea50ef.png">
-    <br>
-    <br>After increasing numbers update the Customization Form.
-<br>
-<br>
-<div class="well">Note: Max limit/size of an attachment is 1MB.</div>
-
-
-<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md
new file mode 100644
index 0000000..2b7459c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md
@@ -0,0 +1,25 @@
+#Increase Max Attachments
+
+In ERPNext, you can limit how many files can be attached to specific Document. Using Custmize Form, you can set **Max(imum) Attachments** which can be added to a particular documents.
+
+Let's assume we need to update Max Attachment for Quotation to five.
+
+#### Step 1: Setup
+
+`Setup > Customize > Customize Form`
+
+#### Step 2: Select Document Type
+ 
+<img alt="Select Doctype" class="screenshot" src="{{docs_base_url}}/assets/img/articles/max-attachment-1.png">
+
+#### Step 3: Set Limit
+
+Set Maximum Attachments as five.
+
+<img alt="Set Max Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/max-attachment-2.png">
+
+After update Max Attachments, Update Customization Form. Reload your ERPNext account and then check specific Quotation to confirm if Max Attachment limit is applied.
+
+<div class="well">Note: Maximum limit/size of an attachment is 1MB.</div>
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
index a810705..6edbd72 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
@@ -12,5 +12,5 @@
 perm-level-error-in-permission-manager
 search-record-by-specific-field
 set-language
-set-precision-for-float-currency-and-percent-fields
+set-precision
 user-restriction
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.html
deleted file mode 100644
index ffdd9d2..0000000
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1>Make Fields Visible In Print Format</h1>
-
-The standard print formats only display certain fields by default. In case the user prefers more information from fields to be displayed, this can be achieved by using the <i>Customize Form</i> feature.<b><br><br>Step 1:</b> Go to Customize Form in Setup Module.<br><br>
-<div class="well">Setup &gt;&gt; Customize &gt;&gt; Customize Form</div>
-<b>Step 2: </b>Select the desired form in <i>Enter Form Type</i> field.<br><br><img src="{{docs_base_path}}/assets/img/articles/kb_custom_name.png"><br><br><b>Step 3:</b> In the <i>Fields</i> section, click on the field that must be visible in the Print Format and remove the check on <i>Print Hide</i> field.<br><br><img src="{{docs_base_path}}/assets/img/articles/kb_custom_printhide.png" height="214" width="674"><br><br>The field will now be visible in all print formats for that Document type.<br>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
new file mode 100644
index 0000000..a14f35c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
@@ -0,0 +1,27 @@
+#Make Fields Visible In Print Format
+
+Each transaction has Standard Print Format. In the Standard format, only certain fields are displayed by default. If  user needs field in the Standard format to be visible, it can be customized by using Customize Form tool.
+
+Let's assume in the Sales order, we need to make Shipping Address field visible in the standard print format.
+
+#### Step 1: Customize Form
+
+Go to:
+
+`Setup > Customize > Customize Form`
+
+#### Step 2: Document Type
+
+As per our scenario, Sales Order will be selected as Document Type.
+field-visible-2.gif
+<img alt="Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/articles/print-visible-1.png">
+
+#### Step 3: Uncheck Print Hide
+
+click to open field to be made visible in the Standard Print Format. Uncheck **Print Hide** field.
+
+<img alt="Uncheck Print Hide " class="screenshot" src="{{docs_base_url}}/assets/img/articles/print-visible-2.gif">
+
+#### Step 5: Update
+
+Customize Customize Form to save changed. Reload your ERPNext account, and then check Print Format for confirmation.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
index 540d1cd..46af27e 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
@@ -1,53 +1,23 @@
-<h1>Reports in ERPNext</h1>
+#Reports in ERPNext
 
 There are three kind of reports in ERPNext.
 
-###1. Query Report
+###1. Report Builder
 
-Query Report is written in SQL which pull values from database and fetch in the report. Though SQL queries can be written from front end, like HTML for customer print format, its restricted from hosted users. Because it will allow users with no access to specific report to query data from query report.
+Report Builder is an in-built report customization tool in ERPNext. This allows you to define specific fields of the form which shall be added in the report. Also you can set required filters, sorting and give preferred name to report.
 
-Check Purchase Order Item to be Received report in Stock module for example of Query report.
+<iframe width="660" height="371" src="https://www.youtube.com/embed/y0o5iYZOioU" frameborder="0" allowfullscreen></iframe>
 
-###2. Script Report
+### 2. Query Report
 
-Script Reports are written in Python and stored on server side. These are complex reports which involves exception of logic and calculation. Since these reports are written on server side, its not available for hosted users.
+Query Report is written in SQL which pull values from account's database and fetch in the report. Though SQL queries can be written from front end, like HTML, its restricted in hosted users. Because it will allow users with no access to specific report to query data directly from the database.
 
-Check Financial Analytics report in Accounts module for example of Script Report.
+Check Purchase Order Item to be Received report in Stock module for example of Query report. Click [here](https://frappe.github.io/frappe/user/guides/reports-and-printing/how-to-make-query-report.html) to learn how to create Query Report.
 
-###3. Report Builder
+### 3. Script Report
 
-Report Builder is an in-built report customization tool in ERPNext. This allows you to define fields of the form which shall appear as column in the report. Also you can set required filters and do sorting as per your preference.
+Script Reports are written in Python and stored on server side. These are complex reports which involves logic and calculation. Since these reports are written on server side, customizing it from hosted account is not possible. 
 
-Each form in ERPNext has Report Builder option in its list view.
-
-![Report Builder Icon]({{docs_base_url}}/assets/img/articles/Selection_046.png)
-
-####Adding Column in Report
-
-Go to Menu and click on Pick Column option to select field which should be added as column in the report. You can also select the field from the child table (eg. Item table in Sales Invoice) of the form.
-
-![Report Pick Column]({{docs_base_url}}/assets/img/articles/Selection_050.png)
-
-####Applying Filters
-
-All the fields of the form will be applicable for setting filter as well.
-
-![Report Pick Column]({{docs_base_url}}/assets/img/articles/$SGrab_238.png)
-
-####Sorting
-
-Select field based on which report will be sorted.
-
-![Report Pick Column]({{docs_base_url}}/assets/img/articles/Selection_052f7b160.png)
-
-####Save Report
-
-Go to Menu and click on Save button to have this report saved with selected column, filters and sorting.
-
-![Report Pick Column]({{docs_base_url}}/assets/img/articles/$SGrab_241.png)
-
-Saved reports appear under Customize section in the module's home page. Customize Report section only appear if you have custom reports being saved for documents of that module.
-
-![Report Pick Column]({{docs_base_url}}/assets/img/articles/$SGrab_242.png)
+Check Financial Analytics report in Accounts module for example of Script Report. Click [here](https://frappe.github.io/frappe/user/guides/reports-and-printing/how-to-make-script-reports.html) to learn how to create Script Report.
 
 <!-- markdown --> 
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
index c14ef39..7030387 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
@@ -1,46 +1,47 @@
-<h1>Managing Dynamic Link Fields</h1>
+#Managing Dynamic Link Fields
 
-Dynamic Link field is one which can search and hold value of any document/doctype. Let's consider an example to learn how Dynamic Link field can benefit us.
+Dynamic Link field is one which can search and hold value of any document/doctype. Let's consider an example to learn how Dynamic Link field works.
 
-While creating Opportunity or Quotation, we have to explicitly define if it is for Lead or Customer. Based on our selection (Lead/Customer), another link field shows up where we can select actual Lead or Customer for whom we are creating this Quotation.
+While creating Opportunity or Quotation, we have to explicitly define if it is for Lead or Customer. Based on our selection (Lead/Customer), another link field shows up where we can select actual Lead or Customer.
 
-If you set later field as Dynamic Link, where we select actual Lead or Customer, this field will be able to search Leads as well as Customers. Hence we need not insert separate link fields for Customer and Lead.
+If you set former field as Dynamic Link, where we select actual Lead or Customer, then the later field will be linked to master selected in the first field, i.e. Leads or Customers. Hence we need not insert separate link fields for Customer and Lead.
 
-Let's check steps to insert Custom Dynamic Field. For an instance, we will insert it under Journal Voucher Form.
+Below are the steps to insert Custom Dynamic Field. For an instance, we will insert Dynamic Link Field in Journal Entry.
 
-####Insert Link Field for Doctype
+#### Step 1: Insert Link Field for Doctype
 
 Firstly we will create a link field which will be linked to the Doctype.
 
-![Custom Link Field]({{docs_base_url}}/assets/img/articles/$SGrab_349.png)
+<img alt="Custom Link Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/dynamic-field-1.gif">
 
-By **Doctype** mentioned in the Option field, we mean parent Doctype. So, just like Quotation is one Doctype, which has multiple Quotation under it. Same way, Doctype is also a Doctype which has Sales Order Doctype, Purchase Order Doctype and other form's doctype created under it as child Doctype.
+By **Doctype** mentioned in the Option field, we mean parent Doctype. So, just like Quotation is one Doctype, which has multiple Quotation under it. Same way, Doctype is also a Doctype which has Sales Order, Purchase Order and other doctypes created as Doctype records.
 
 -- Doctype<br>
------ Sales Order<br>
------ Purchase Invoice<br>
------ Quotation<br>
------ Sales Invoice<br>
------ Employee<br>
------ Production Order<br>
-and so on, till all the forms/document of ERPNext is covered.
+---- Sales Order<br>
+---- Purchase Invoice<br>
+---- Quotation<br>
+---- Sales Invoice<br>
+---- Employee<br>
+---- Production Order<br>
+.. and so on.
 
-So linking this field with parent Doctype master list all the child doctypes/forms.
+So linking this field with parent Doctype will list all the Doctype records.
 
-![journal Voucher Link Field]({{docs_base_url}}/assets/img/articles/$SGrab_352.png)
+<img alt="journal Voucher Link Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/dynamic-field-2.png">
 
-####Insert Dynamic Link Field
+#### Step 2: Insert Dynamic Link Field
 
-It will be "Dynamic Link" for Field Type, and field name of Doctype field mentioned in its Option field.
+This custom field's type will be "Dynamic Link". In the Option field, name of Doctype link field will be mentioned.
 
-![Custom Dynamic Field]({{docs_base_url}}/assets/img/articles/$SGrab_350.png)
+<img alt="Custom Dynamic Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/dynamic-field-3.gif">
 
-This field will allow us to select document id, based on value selected in the Doctype link field. For example, if we select Sales Order in the prior field, this field will list all the Sales Orders id. If we select Purchase Invoice in the prior field, this field will render all the Purchase Order for our selection.
+This field will allow selecting document id, based on value selected in the Doctype link field. For example, if we select Sales Order in the prior field, Dynamic Link field will list all the Sales Orders ids.
 
-![Journal Voucher Dynamic Field ]({{docs_base_url}}/assets/img/articles/$SGrab_353.png)
+<img alt="Custom Dynamic Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/dynamic-field-4.gif">
 
-####Customizing options in the Doctype Link field
+<div class="well">
+**Customizing options in the Doctype Link field**
 
-Bydefault, Docytpe link field will provide all the forms/doctypes for selection. If you wish this field to show certain specific doctypes in the search result, you will need to write Custom Script for it.
+Bydefault, Docytpe link field will provide all the forms/doctypes for selection. If you wish this field to show certain specific doctypes in the search result, you will need to write Custom Script for it.</div>
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md
index 837ca92..191ce8a 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md
@@ -1,17 +1,19 @@
-<h1>Module Visibility</h1>
+#Module Visibility
 
-If you have permission on specific module, but it is still not visible to you, following is how you should go about checking setting to make it visible again.
+If you have permission on specific module, but it is still not visible, following are the possibilities of issues you should look at. Let's consider a scenario that user is permission of Website module, but not able to access it.
 
-As step zero, reassure that you have role assigned which is required for accessing Website and Shopping Cart module. For modules in question, you should have "Website Manager" role assigned. If permissions has been customized in your account, check Role Permission Manager to know which Role has permission on Website and Shopping Cart module.
+As step zero, ensure that you have "Website Manager" role assigned. It is a standard Role which grants permission on Website module. If permissions has been customized in your account, check Role Permission Manager to know which Role has permission on Website, and then check if same Role is assigned to User.
 
-If modules are hidden in-spite of assignment of required permission, then you should check if Website and Shopping Cart module is not disabled from All Application option on your desk/home page.
+If module is hidden in-spite of assignment of required Role, then you should check if Website is not disabled from All Application.
 
-![All Applications]({{docs_base_url}}/assets/img/articles/$SGrab_223.png)
+<img alt="All Applications" class="screenshot" src="{{docs_base_url}}/assets/img/articles/module-visibility-1.gif">
 
-If modules are still not visible, check if it is hidden by System Manager from Show/Hide Modules option in the Setup module.
+If Website is checked in All Application, but still not visible for the User, check if is hidden by System Manager. In the Setup module, feature called Show/Hide Modules allows System Manager to hide specific module from all the Users.
 
-<div class="well">Setup &gt;&gt; Settings &gt;&gt; Show / Hide Modules</div>Ensure required module are checked, and not disabled in this page. If you just enabled/activated it, update Show/Hide Module page, and check your home page after Help &gt;&gt; Clear Cache.
+`Setup > Settings > Show / Hide Modules`
 
-<div class="well">Note: In this help page, Website and Shopping Cart module is considered as an example. You can troubleshoot visibility issues for other modules following same steps.</div>
+Ensure Website module is checked. If you just enabled/activated it, update Show/Hide Module page, and then Reload tab of your ERPNext account. After reload, changes made in the Setup module will be applied and will be visible in the system.
+
+On the same lines, you can check for the visibility issue of other modules as well.
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md
index 2fb27b6..2562740 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md
@@ -1,12 +1,12 @@
-<h1>Perm Level Error in Permission Manager</h1>
+#Perm Level Error in Permission Manager
 
-While customizing rules in the [Permission Manager](https://erpnext.com/user-guide/setting-up/permissions/role-based-permissions), you might receive an error message saying:
+While customizing rules in the [Permission Manager]({{docs_base_url}}/user/erpnext/user/manual/en/setting-up/users-and-permissions/role-based-permissions), you might receive an error message saying:
 
-`For System Manager_ (or other role) _at level 2_ (or other level) _in Customer_ (or document) _in row 8: Permission at level 0 must be set before higher levels are set`.
+`For System Manager _(or other role)_ at level 2 _(or other level)_ in Customer _(or other document)_ in row 8: Permission at level 0 must be set before higher levels are set.`
 
-Error message indicates problem in the existing permission setting for this document.
+Error message indicates problem is in the existing permission setting for this document.
 
-For any role, before assigning permission at Perm Level 1, 2, permission at Perm Level 0 must be assigned. Error message says that System Manager has been assigned permission at Perm Level 1 and 2, but not at level 0. You should first correct the permission for System Manager's role by:
+For any role, before assigning permission at Perm Level 1 or 2 (and so on), permission at Perm Level 0 must be assigned. Error message says that System Manager has been assigned permission at Perm Level 1 and 2, but not at level 0. You should first correct the permission for System Manager's role by:
 
 - Assigning permission to System Manager at level 0.
 
@@ -14,6 +14,6 @@
 
 - By removing permission at level 1 and 2.
 
-After executing one of the above step, you should try adding additional rules in the Role Permission Manager.
+After executing one of the above step, you should be able to successfully add new permissions rules in the Role Permission Manager.
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
index 1505964..92b2f80 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
@@ -1,21 +1,27 @@
-<h1>Search Record by Specific Field</h1>
+#Search Record by Specific Field
 
-While creating any document in ERPNext, you might have to select other record id in it (like selecting Customer in Quotation). For ease in selecting other record, you can search them based on value in various fields of that record. Search By functionality enables you searching and filtering records based on value in the specific fields of that record.
+While creating any document (say Sales Invoice), you have to select other document id in it (say Serial No). For ease in selection, you can also make value of oother field of that visible in the search result. Search By functionality enables to define field whos value will be visible in the search result.
 
-Let's consider an example to learn Search By functionality better. While creating Sales Order, we need to select Customer in it. If we need to filter search result of Customer for specific Customer Group, we should go about following these steps to achieve it.
+Let's assume that while creating Sales Invoice, you wish to see Serial No result, with respective Warehouse.
 
-####Search By in Customize Form
+#### Step 1: Customize Form
 
-In the Customize Form tool, you will find field called Search Field. You should enter field names based on which we can search and filter result for this document.
+`Setup > Customize > Customize Form`
 
-Considering our scenario, we should update name of Customer Group field for Customer in the Customize Form.
+#### Step 2: Select Document
 
-![Search By in Customize Form]()
+`Document Type = Serial No.`
 
-####Searching in Another Record.
+#### Step 3:  Search Field
+
+Update Warehouse field name in the Search By field.
+
+<img alt="Search By in Customize Form" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-by-1.png">
+
+#### Searching in Another Record.
 
 While creating transaction, to get filtered result for Customer, you should firstly click on search magnifier.
 
-![Search for master]()
+<img alt="Search By in Customize Form" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-by-2.png">
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
index 91e9e5f..ede54f2 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
@@ -1,6 +1,6 @@
-<h1>Change the Language</h1>
+#Change the Language
 
-ERPNext is an multi-lingual application, which means user can select a preferred language for one's ERPNext account.
+ERPNext is an multi-lingual application. It allows each user to select preferred lannguage. Following is how User can customize language in one's account.
 
 ### 1. Setting Language in User's Account
 
@@ -8,11 +8,13 @@
 
 #### 1.1 Go to My Setting
 
-![My Setting]({{docs_base_url}}/assets/img/articles/$SGrab_428.png)
+<img alt="My Setting" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-language-1.png">
 
 #### 1.2 Select Language
 
-![Select Language]({{docs_base_url}}/assets/img/articles/$SGrab_429.png)
+<img alt="Select Language" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-language-2.png">
+
+<img alt="Select Language" class="screenshot" src="{{docs_base_url}}/assets/img/articles/set-language-1.gif">
 
 #### 1.3 Save User
 
@@ -28,11 +30,13 @@
 
 #### Set Language
 
-![Global Language]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-05 at 4.35.12 pm.png)
+<img alt="Global Language" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-language-3.png">
 
 #### Save
 
 Save System Settings, and refresh your EPRNext account. On refreshing, you should language in your ERPNext account changed as per your preference.
 
-Note: For now, we have translation available only for few languages. You can contribute to make translation better, and add new languages from [here](https://frappe.io/translator).
+<img alt="Select Language" class="screenshot" src="{{docs_base_url}}/assets/img/articles/set-language-2.gif">
+
+Note: For now, we have translation available only for few languages. You can contribute to make translation better, and add new languages from [here](https://translate.erpnext.com).
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision-for-float-currency-and-percent-fields.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision-for-float-currency-and-percent-fields.md
deleted file mode 100644
index 2cc39e1..0000000
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision-for-float-currency-and-percent-fields.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<h1>Set Precision for Float, Currency and Percent fields</h1>
-
-In ERPNext, default precision for `Float`, `Currency` and `Percent` field is 3. So, you can enter any number up-to 3 decimals in such fields.
-
-You can also change / customize the precision settings globally or for a specific field.
-
-To change the precision globally, go to `Setup > Settings > System Settings`.
-![Global Precision]({{docs_base_url}}/assets/img/articles/precision-global.png)
-
-You can also set field specific precision. To do that go to `Setup > Customize > Customize Form` and select the DocType there. Then go to the specific field row and change precision. Precision field is only visible if field-type is one of the Float, Currency and Percent.
-![Field-wise Precision]({{docs_base_url}}/assets/img/articles/precision-fieldwise.png)
-
-**Note:**
-If you are changing precision of a field to a higher number, all the related fields should also be set to the same precision.
-
-For example, if you want to calculate invoice total upto 5 decimals, you need to change the precision of all related fields, which resulted total. In this case you have to change following fields to get correct total.
-
-    Sales Invoice Item: price_list_rate, base_price_list_rate, rate, base_rate, amount and base_amount
-    
-    Taxes and Charges: tax_amount, total and tax_amount_after_discount
-    
-    Sales Invoice: net_total, other_charges_total, discount_amount and grand_total
-
-And precision should be changed in all related documents as well, to get correct mapping. In this case, same precision should be set for Quotation, Sales order, Delivery Note and Sales Invoice.
-
-<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md
new file mode 100644
index 0000000..4ed070f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md
@@ -0,0 +1,18 @@
+#Set Precision
+
+In ERPNext, default precision for `Float`, `Currency` and `Percent` field is three. It allows you to enter value having value upto three decimal places.
+
+You can also change/customize the precision settings globally or for a specific field.
+
+To change the precision globally, go to:
+
+`Setup > Settings > System Settings`.
+
+<img alt="Global Precision" class="screenshot" src="{{docs_base_url}}/assets/img/articles/precision-1.png">
+
+You can also set field specific precision. To do that go to `Setup > Customize > Customize Form` and select the DocType there. Then go to the specific field row and change precision. Precision field is only visible if field-type is one of the Float, Currency and Percent.
+
+<img alt="Field-wise Precision" class="screenshot" src="{{docs_base_url}}/assets/img/articles/precision-2.png">
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.html
deleted file mode 100644
index 09f9cb1..0000000
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<h1>Owner Restriction</h1>
-
-To restricting user based on Owner (creator of record),&nbsp; form/document should have field linked with User master. If that document is not linked with user, then you should create <a href="https://erpnext.com/user-guide/customize-erpnext/custom-field" target="_blank">custom field</a> and link it with User master.
-<br>
-<br>Following are the steps to restrict User based on Owner.
-<br>
-<br><b>Step 1: </b>Go to:
-<br>
-<br>Setup &gt; Permissions &gt; Role Permissions Manager
-<br>
-<br><b>Step 2:</b> Select Document Type for which you want to set user permission. After permissions are loaded for selected document, scroll to role for which you want to set restriction.
-<br>&nbsp;
-<img src="{{docs_base_path}}/assets/img/articles/Selection_0045d151c.png"><br>
-<br><b>Step 3:</b> For Role to be resricted (Sales User in this case), check "Apply User Restriction". On checking Apply User Permission, two links will be show up called:
-<br>
-<br>- Select Document Type
-<br>- Select User Permissions
-<br>
-<br>Click on "Select Document Type".
-<br>
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_0028834c2.png" height="168" width="691">
-<br>
-<br><b>Step 4:</b> Check mark on User, and un-check for others. If you want user to be restricted based on some other criteria as well, like territory, customer groups, then that should be checked as well.
-<br>
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_003fea339.png">&nbsp;
-<br>
-<div class="well">When restricting User based on User master itself, then there is no need to create User Permission Setting.</div>
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md
new file mode 100644
index 0000000..75007e8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md
@@ -0,0 +1,19 @@
+# Restricting based on Owner
+
+Following are the steps to restrict User to a document based on Owner/creator.
+
+#### Step 1: Role Permission Manager
+
+`Setup > Permissions > Role Permissions Manager`
+
+#### Step 2: Select Document Type
+
+Select Document Type for which you want to set user permission. After permissions are loaded for selected document, scroll to role for which you want to set restriction.
+
+<img alt="Sales Order" class="screenshot" src="{{docs_base_url}}/assets/img/articles/owner-restriction-1.png">
+
+#### Step 3: Apply User Permission
+
+For Role to be resricted (Sales User in this case), check "If Owner".
+
+<img alt="S" class="screenshot" src="{{docs_base_url}}/assets/img/articles/owner-restriction-2.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/index.txt b/erpnext/docs/user/manual/en/human-resources/index.txt
index caa3292..33ee4bb 100644
--- a/erpnext/docs/user/manual/en/human-resources/index.txt
+++ b/erpnext/docs/user/manual/en/human-resources/index.txt
@@ -1,5 +1,5 @@
 employee
-leave-application
+leave
 expense-claim
 attendance
 salary-and-payroll
diff --git a/erpnext/docs/user/manual/en/human-resources/leave.md b/erpnext/docs/user/manual/en/human-resources/leave.md
new file mode 100644
index 0000000..5b32a2b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/leave.md
@@ -0,0 +1,92 @@
+#Overview
+This section enables you to manage leave schedule of your organization. It also explains the way employees can apply for leaves.  
+Employees create leave request and manager (leave approver) approves or rejects the request. You can select from a number of leave types such as sick leave, casual leave, privilege leave and so on. You can also allocate leaves to your employees and generate reports to track leaves record.
+
+---
+
+#Leave Type
+
+> Human Resources > Setup > Leave Type > New Leave Type
+
+Leave Type refers to types of leave allotted to an employee by a company. An employee can select a particular Leave Type while requesting for a leave. You can create any number of Leave Types based on your company’s 
+requirement.
+
+<img class="screenshot" alt="New Leave Type" 
+	src="{{docs_base_url}}/assets/img/human-resources/new-leave-type.png">
+
+**Max Days Leave Allowed:** It refers to maximum number of days this particular Leave Type can be availed at a stretch. If an employee exceeds the maximum number of days under a particular Leave Type, his/her extended leave may be considered as ‘Leave Without Pay’ and this may affect his/her salary calculation.
+
+**Is Carry Forward:** If checked, the balance leave will be carried forwarded to the next allocation period.
+
+**Is Leave Without Pay:** This ensures that the Leave Type will be treated as leaves whithout pay and salary will get deducted for this Leave Type.
+
+**Allow Nagative Balance:** If checked, system will always allow to approve leave application for the Leave Type, even if there is no leave balance.
+
+**Include holidays within leaves as leaves:** Check this option if you wish to count holidays within leaves as a ‘leave’. Such holidays will be deducted from the total number of leaves.
+
+###Default Leave Types
+There are some pre-loaded Leave Types in the system, as below:
+
+- **Leave Without Pay:** You can avail these leaves for different purposes, such as, extended medical issues, educational purpose or unavoidable personal reason. Employee does not get paid for such leaves.
+- **Privilege leave:** These are like earned leaves which can be availed for the purpose of travel, family vacation and so on.
+- **Sick leave:** You can avail these leaves if you are unwell.
+- **Compensatory off:** These are compensatory leave allotted to employees for overtime work.
+- **Casual leave:** You can avail this leave to take care of urgent and unseen matters.
+
+---
+
+#Leave Allocation
+
+Leave Allocation enables you to allot a specific number of leaves to a particular employee. You can allocate a number of leaves to different types of leave. You also have the option to allocate leaves to your employees manually or via the Leave Allocation Tool.
+
+###Manual Allocation
+> Human Resources > Setup > Leave Allocation > New Leave Allocation
+
+To allocate leaves to an Employee, select the period and the number of leaves you want to allocate. You can also add unused leaves from previous allocation period.
+
+<img class="screenshot" alt="Manual Leave Allocation" 
+	src="{{docs_base_url}}/assets/img/human-resources/manual-leave-allocation.png">
+
+###Via Leave Allocation Tool
+> Human Resources > Tools > Leave Allocation Tool
+
+This tool enables you to allocate leaves for a category of employees, instead of individual ones. You can allocate leaves based on Employee Type, Branch, Department and Designation. Leave Allocation Tool is also known as Leave Control Panel.
+
+<img class="screenshot" alt="Leave Allocation Tool"
+	src="{{docs_base_url}}/assets/img/human-resources/leave-allocation-tool.png">
+
+---
+
+#Leave Application
+> Human Resources > Documents > Leave Application > New Leave Application
+
+Leave Application section enables an employee to apply for leaves. Employee can select the type of leave and the Leave Approver who will authorize the Leave Application. User with "Leave Approver" role are considered as Leave approver. Leave Approvers can also be restricted/pre-defined in the Employee record. Based on selected dates and applicable Holiday List, total leave days is calculated automatically.
+
+**Basic Workflow:**
+
+- Employee applies for leave through Leave Application
+- Approver gets notification via email, "Follow via Email" should be checked for this.
+- Approver reviews Leave Application
+- Approver approves/rejects Leave Application
+- Employee gets notification on the status of his/her Leave Application
+
+<img class="screenshot" alt="Leave Allocation Tool"
+	src="{{docs_base_url}}/assets/img/human-resources/new-leave-application.png">
+
+	
+**Notes:**
+
+- Leave Application period must be within a single Leave Allocation period. In case, you are applying for leave across leave allocation period, you have to create two Leave Application records.
+- Application period must be in the latest Allocation period.
+- Employee can't apply for leave on the dates which are added in the "Leave Block List".
+
+---
+
+#Leave Block List
+
+> Human Resources > Setup > Leave Block List > New Leave Block List
+
+Leave Block List is a list of dates in a year, on which employees can not apply for leave. You can define a list of users who can approve Leave Application on blocked days, in case of urgency. You can also define whether the list will applied on entire company or any specific departments.
+
+<img class="screenshot" alt="Leave Allocation Tool"
+	src="{{docs_base_url}}/assets/img/human-resources/leave-block-list.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/index.txt b/erpnext/docs/user/manual/en/human-resources/setup/index.txt
index 550236a..b868186 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/index.txt
+++ b/erpnext/docs/user/manual/en/human-resources/setup/index.txt
@@ -5,6 +5,4 @@
 designation
 earning-type
 deduction-type
-leave-allocation
-leave-type
 holiday-list
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md b/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md
deleted file mode 100644
index 0e8ee94..0000000
--- a/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Helps you allocate Leaves to a particular Employee
-
-<img class="screenshot" alt="Leave Allocation" src="{{docs_base_url}}/assets/img/human-resources/leave-allocation.png">
-
-To assign leaves to multiple employees use the [Leave Allocation Tool]({{docs_base_url}}/user/manual/en/human-resources/tools/leave-allocation-tool.html)
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md b/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md
deleted file mode 100644
index d52cb2e..0000000
--- a/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Specify the Type of Leave that can be allocated against an Employee
-
-<img class="screenshot" alt="Leave Type" src="{{docs_base_url}}/assets/img/human-resources/leave-type.png">
-
-* 'Max Days Leave Allowed' specifies the maximum number of days this type of leave can be taken at a strech.
-* 'Is LWP' specifies if the Leave is without Pay.
-* 'Allow Negative Balance' specifies if system can maintain negative leaves.
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/index.txt b/erpnext/docs/user/manual/en/human-resources/tools/index.txt
index 3da2e71..0d74de7 100644
--- a/erpnext/docs/user/manual/en/human-resources/tools/index.txt
+++ b/erpnext/docs/user/manual/en/human-resources/tools/index.txt
@@ -1,2 +1 @@
-upload-attendance
-leave-allocation-tool
\ No newline at end of file
+upload-attendance
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md b/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md
deleted file mode 100644
index 56e8d3d..0000000
--- a/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Leave Allocation tool helps you allocated a specific number of leaves for your employees.
-
-<img class="screenshot" alt="Leave Application" src="{{docs_base_url}}/assets/img/human-resources/leave-application.png">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md
new file mode 100644
index 0000000..0cf6125
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md
@@ -0,0 +1,9 @@
+#Production Planning & Subassembly
+
+if you need Production Planning Tool to consider raw-materials required for the manufacturing of sub-assembly items selected in the BOM, please check following instructions to achieve the same.
+
+Production Planning Tool has field called "Use Multi-Level BOM", checking which will consider raw-material of sub-assemblies as well in the material planning. If this field is not checked, then it will consider sub-assembly as an item, and won't consider raw-material required for the manufacturing of that sub-assembly.
+
+<img src="{{docs_base_path}}/assets/img/articles/$SGrab_203.png">
+
+You will find same field in the Production Order and Stock Entry as well.This feature is very useful for the companies who create BOM for the sub-assemblies, but Production Order is created only for the finished item. They do not create separate Production Order for the sub-assemblies, but raw-materials as listed in the BOM of sub-assembly items are consumed in the production process, and not sub-assembly item directly.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md
new file mode 100644
index 0000000..d743fb6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md
@@ -0,0 +1,17 @@
+#Valuation Based On' Field in BOM
+
+**Question:** What do the various options in <i>Valuation Based On </i>Field in Bill Of Materials (BOM) Form mean? 
+
+**Answer:** There are 3 available options in the <i>Valuation Based On</i> field;
+
+<img src="{{docs_base_path}}/assets/img/articles/kb_bom_field.png">
+
+Valuation Rate: Item valuation rate is defined based on it's purchase/manufacture value + other charges. 
+
+For Purchase Item, it is defined based on charges entered in the Purchase Receipt. If you don't have any Purchase Receipt
+ made for an item or a Stock Reconciliation, then you won't have 
+Valuation Rate for that item.
+
+Price List Rate: Just like you pull item prices in sales and purchase transaction, it can be pulled in BOM via Price List Rate.   
+
+Last Purchase Rate: It will be the last Purchase Rate value of an item. This value is updated in the item master as well, based on rate in the Purchase Order for this item.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
index 6f2b86b..9252171 100644
--- a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
+++ b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
@@ -37,4 +37,8 @@
 > Note 2: ERPNext will automatically add the raw material rate for your
 valuation purpose when you receive the finished Item in your stock.
 
+### Video Help
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/ThiMCC2DtKo" frameborder="0" allowfullscreen></iframe>
+
 {next}
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/change-password.md b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
index c65cc8b..505d6f3 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
@@ -1,17 +1,17 @@
-<h1>Change Password</h1>
+#Change User Password
 
 Each ERPNext user can customize password for his/her ERPNext account. Also user with System Manager role will be able to reset password for himself as well as for other users. Following are the steps to go about changing your password.
 
 
-####Step 1: Go to My Setting.
+####Step 1: Go to My Setting
 
-![Image]({{docs_base_url}}/assets/img/articles/SGrab_250.png)
+<img alt="Change Password" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-password-1.png">
 
-####Step 2: Set New Password.
+####Step 2: Set New Password
 
-![NEW]({{docs_base_url}}/assets/img/articles/Selection_014dd1559.png)
+<img alt="Change Password" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-password-2.png">
 
-Enter the new password and save the form to save changes. 
+Enter the new password and save the form to save changes.
 
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
index 04e5203..593c4f5 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
@@ -1,4 +1,4 @@
-<h1>Delete All Related Transactions for a Company</h1>
+#Delete All Related Transactions for a Company
 
 Often, users setup all the master data and then create a few dummy records. Then they want to delete the dummy records and the company and start over again, keeping the other master data like Customers, Items, BOMs intact.
 
@@ -12,8 +12,7 @@
 
 This action will wipe out all the data related to that company like Quotation, Invoices, Purchase Orders etc. So be careful
 
-![Delete Company]({{docs_base_url}}/assets/img/articles/delete-company.png)
-
+<img alt="Delete Transactions" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-company.png">
 
 **Note:** If you want to delete the company record itself, the use the normal "Delete" button from Menu options. It will also delete Chart of Accounts, Chart of Cost Centers and Warehouse records for that company.
 
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html
deleted file mode 100644
index 366d8a3..0000000
--- a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<h1>Edit Submitted Document</h1>
-
-&nbsp;To edit submitted document, you need to cancel it first. Followings are steps to edit submitted document.
-<br>
-<br><b>Step 1: Cancel Submitted Document</b><br>
-<br>You will find Cancel button on upper right corner of submitted document.
-<br>
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_001.png">
-<br>
-<br><b>Step 2: Amend the document</b><br>
-<br>On cancellation of submitted document, <b>Amend</b> button will be became visible.
-<br>
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_00256341a.png">
-<br>
-<br><b>Step 3: Save and Submit the document</b><br>
-<br>On clicking Amend button, same document will become editable again. After Making required changes, save and submit the document.
-<br>
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_0036e00ef.png">
-<br>
-<br><div class="well">Note: If your document linked with other documents, then you will need to cancel last document you made on top of this document. Example:<br><br>If you have created Delivery Note and Sales Invoice against Sales Order, which you need to amend, then you should first Cancel Delivery Note and Sales Invoice made for that Sales Order. Then amend Sales Order, re-save and re-submit it.<br>
-</div><br>
-<br>
-
-
-<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md
new file mode 100644
index 0000000..7148611
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md
@@ -0,0 +1,30 @@
+#Edit Submitted Document
+
+To edit submitted document, you need to cancel it first. Followings are steps to edit submitted document.
+
+####Step 1: Cancel Submitted Document
+
+You will find Cancel button on upper right corner of submitted document.
+
+<img alt="Cancel Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/edit-submitted-doc-1.png">
+
+####Step 2: Amend the document
+
+On cancellation of submitted document, Amend button will be became visible.
+
+<img alt="Amend Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/edit-submitted-doc-2.png">
+
+####Step 3: Save and Submit the document
+
+On clicking Amend button, same document will become editable again. After Making required changes, save and submit the document.
+
+<img alt="Resave and Submit Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/edit-submitted-doc-3.png">
+
+<div class="well">Note: If your document linked with other documents, then you will need to cancel last document you made on top of this document. 
+	
+Example:If you have created Delivery Note and Sales Invoice against Sales Order, which you need to amend, then you should first Cancel Delivery Note and Sales Invoice made for that Sales Order. Then amend Sales Order, re-save and re-submit it.
+</div>
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md b/erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md
index 1b7adf4..2d2c179 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md
@@ -1,14 +1,7 @@
-<h1>Integrating ERPNext with other Applications</h1>
+#Integrating ERPNext with other Applications
 
-For now, ERPNext doesn't have out-of-the-box integration available for the third party applications. However, Frappe has REST API using which you can get ERPNext integrated with any other solution.
+For now, ERPNext has out-of-the-box integration available for some applications like Shopify, your SMS gateway and payment gateway. To integrate ERPNext with other application, you can use REST API of Frappe. Check following links to learn more about REST API of Frappe.
 
-Learn more about Frappe API here.
-
-[https://frappe.io/help/rest_api](https://frappe.io/help/rest_api)
-
-For experts services on integration, you can connect with our service providers from community portal.
-
-[https://frappe.io/community/service-providers](https://frappe.io/community/service-providers)
-
+[Frappe Rest API](https://frappe.github.io/frappe/user/guides/integration/rest_api.html)
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html b/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html
deleted file mode 100644
index eee9618..0000000
--- a/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<h1>Manage Header And Footer</h1>
-
-<h1>Manage Header And Footer</h1>
-
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md b/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md
new file mode 100644
index 0000000..24a9a55
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md
@@ -0,0 +1,9 @@
+#Manage Header And Footer
+
+Check following to learn how to setup Letter Head in ERPNext.
+
+[Managing Letter head]({{docs_base_url}}/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.html)
+
+ERPNext doesn't have option to define standard Footer. As a work around, you can use Terms and Condition master for footer. Content of Terms and Condition is already the last to appear in the standard print formats on transactions. Check following link to learn how to manage Terms and Conditions in ERPNext.
+
+[Terms and Condition]({{docs_base_url}}/user/manual/en/setting-up/print/terms-and-conditions.html)
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
index dc9f667..40c12f4 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
@@ -1,24 +1,22 @@
-<h1>Managing Multiple Companies</h1>
+#Managing Multiple Companies
 
-<h1>Managing Multiple Companies</h1>
+ERPNext allows you to create multiple companies in a single ERPNext instance.
 
-ERPNext allows you to create multiple companies in the same/common ERPNext account.
+In one account has multiple companies, you will find option to select Company in each transactions. While most of the records (mostly transactions) will be separated based on Company, there are few masters like Item, Item Group, Customer Group, Territory etc. which are common among all the companies.
 
-With this, you will find option to select Company in your transactions. While most of the transactions will be separated based on Company, there are few masters like Item, Item Group, Customer Group, Territory etc. which can be used across all the companies.
+If you have separate teams working on each company, you can restrict access of the User to the data of specific Company. Click [here]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions/) to know how to set permission rules for giving restricted access to the User.
 
-If you have separate teams working on each company, you can also restrict the access of user to the data of specific company. Click [here](https://manual.erpnext.com/search?txt=user%20permission) to know more about how to set permission to achieve the same.
-
-Following are the steps to create companies in your ERPNext account.
+Following are the steps to add new Company.
 
 ####Go to Setup Module
 
-`Setup &gt; Masters &gt; Company &gt; New`
+`Accounts > Setup > Company > New`
 
 ####Enter Company Details
 
-Company master will be saved with Company Name provided at the time of its creation. 
+Company will be saved with Company Name provided.
 
-![New Company]({{docs_base_url}}/assets/img/articles/SGrab_343.png)
+<img alt="New Company" class="screenshot" src="{{docs_base_url}}/assets/img/articles/new-company-1.png">
 
 Also, you can define other properties for new company like:
 
@@ -30,13 +28,13 @@
 
 Value will be auto-filled in most of these field to define company-wise defaults. You can edit/customize it as per your requirement. 
 
-![New Company]({{docs_base_url}}/assets/img/articles/SGrab_344.png)
+<img alt="New Company" class="screenshot" src="{{docs_base_url}}/assets/img/articles/new-company-2.png">
 
 ####Chart of Account for New Company
 
 A separate Chart of Account master will be set for each company in the ERPNext. This allows you managing Accounts/Ledger master separately for each company. Also it allows you avail financial statement and reports like Balance Sheet and Profit and Loss Statement separately for each company.
 
-![Company]({{docs_base_url}}/assets/img/articles/SGrab_342.png)
+<img alt="New Company" class="screenshot" src="{{docs_base_url}}/assets/img/articles/new-company-3.png">
 
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
index c44d1ea..308a0a7 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
@@ -1,12 +1,10 @@
-<h1>Managing Perm Level in Permission Manager</h1>
-
-<h1>Managing Perm Level in Permission Manager</h1>
+#Managing Perm Level in Permission Manager
 
 In each document, you can group fields by "levels". Each group of field is denoted by a unique number (0, 1, 2, 3 etc.). A separate set of permission rules can be applied to each field group. By default all fields are of level 0.
 
-Perm Level for a field can be defined in the [Customize Form](https://erpnext.com/user-guide/customize-erpnext/customize-form).
+Perm Level for a field can be defined in the [Customize Form](docs_base_url}}/user/manual/en/customize-erpnext/customize-form.html).
 
-![Customize Form]({{docs_base_url}}/assets/img/articles/$SGrab_256.png)
+<img alt="Perm Level Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/perm-level-1.gif">
 
 If you need to assign different permission of particular field to different users, you can achieve it via Perm Level. Let's consider an example for better understanding.
 
@@ -16,11 +14,11 @@
 
 For Stock Manager, they will have permission on fields on Delivery Note as Perm Level 2 whereas a Stock User will not have any permission on Perm Level 2 for Delivery Note.
 
-![Perm Level Manager]({{docs_base_url}}/assets/img/articles/$SGrab_253.png)
+<img alt="Perm Level Rule" class="screenshot" src="{{docs_base_url}}/assets/img/articles/perm-level-2.png">
 
 Considering the same scenario, if you want a Stock User to access a field at Perm Level 2, but not edit it, the Stock User will be assigned permission on Perm Level 2, but only for read, and not for write/edit.
 
-![Perm Level User]({{docs_base_url}}/assets/img/articles/$SGrab_254.png)
+<img alt="Perm Level Rule 2" class="screenshot" src="{{docs_base_url}}/assets/img/articles/perm-level-3.png">
 
 Perm Level (1, 2, 3) not need be in order. Perm Level is primarily for grouping number of fields together, and then assigning permission to Roles for that group. Hence, you can set any perm level for an item, and then do permission setting for it.
 
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
index 0de7869..98e67c6 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
@@ -1,8 +1,6 @@
-<h1>Managing Tree Structure Masters</h1>
+#Managing Tree Structure Masters
 
-<h1>Managing Tree Structure Masters</h1>
-
-Some of the masters in ERPNext are maintained in tree structure. Tree structured masters allow you to set Parent masters, and Child masters under those Parents. Setting up this structure allows you creating intelligent report, and track growth at each level in the hierarchy. 
+Some of the masters in ERPNext are maintained in tree structure. Tree structured masters allow you to set Parent master, and Child masters under those Parents. Setting up this structure allows you creating intelligent report, and track growth at each level in the hierarchy. 
 
 Following is the partial list of masters which are maintained in the tree structure.
 
@@ -24,17 +22,13 @@
 
 `Selling > Setup > Territory`
 
-Also you can type master name in Awesome Bar to go to the related master.
+####Step 2 : Parent Territory
 
-Tree master allows you to set Parent Territories, and Child Territories Groups under those Parents.
+<img alt="Default Territories" class="screenshot" src="{{docs_base_url}}/assets/img/articles/territory-2.png">
 
-####Step 2 : New Parent Territory
+When click on Parent territory, you will see option to add child territory under it. All default Territory groups will be listed under Parent group called "All Territories". You can add further Parent or child Territory Groups under it.
 
-![Territory Group]({{docs_base_url}}/assets/img/articles/Sselection_013.png)
-
-When click on Parent Territory, you will see option to add child territory under it. All default Territory groups will be listed under parent group called "All Territories". You can add further parent or child Territory Groups under it.
-
-####Step 3: Name The Territory Group
+####Step 3: Add new Territory
 
 When click on Add Child, a dialog box will provide two fields.
 
@@ -47,12 +41,13 @@
 If Group Node selected as Yes, then this Territory will be created as Parent, which means you can further create sub-territories under it. If select No, then it will become child Territory which you will be able to select in another masters.
 
 <div class="well">Only child Territory Groups are selectable in another masters and transactions.</div>
-![Child Territory]({{docs_base_url}}/assets/img/articles/Selection_0124080f1.png)
+
+<img alt="Default Territories" class="screenshot" src="{{docs_base_url}}/assets/img/articles/territory-1.gif">
 
 Following is how Child Territories will be listed under a Parent Territory.
 
-![Territory Tree]({{docs_base_url}}/assets/img/articles/Selection_014.png)
+<img alt="Adding new Territories" class="screenshot" src="{{docs_base_url}}/assets/img/articles/territory-3.png">
 
-Following this steps, you can manage other tree masters in ERPNext.
+Following this steps, you can manage other tree masters as well in ERPNext.
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
index 47cf1a4..2e7145d 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
@@ -1,8 +1,6 @@
-<h1>Setting the Current Value for Naming Series</h1>
+#Setting the Current Value for Naming Series
 
-<h1>Setting the Current Value for Naming Series</h1>
-
-Naming Series feature allows you to define prefix for number series of documents. For example, if a Sales Order has prefix "SO", then the series will be generated as SO00001, SO00002... and so on. Click [here](https://erpnext.com/user-guide/setting-up/document-naming-series) to learn how you can customize Number Series for a transaction/master in ERPNext.
+Naming Series feature allows you to define prefix for naming of a documents. For example, if a Sales Order has prefix "SO", then the series will be generated as SO-00001, SO-00002... and so on. Click [here]({{docs_base_url}}/user/manual/en/setting-up/settings/naming-series.html) to learn how you can customize Number Series for a transaction/master in ERPNext.
 
 ### 1. Setting the Current Value
 
@@ -16,19 +14,19 @@
 
 #### Update Series Section
 
-![Update Series Section]({{docs_base_url}}/assets/img/articles/$SGrab_420.png)
+<img alt="Update Series Section" class="screenshot" src="{{docs_base_url}}/assets/img/articles/current-no-1.png">
 
 #### Select Prefix
 
 Considering our scenario, prefix for Sales Order will be "SO".
 
-![Series Prefix]({{docs_base_url}}/assets/img/articles/$SGrab_418.png)
+<img alt="Series Prefix" class="screenshot" src="{{docs_base_url}}/assets/img/articles/current-no-2.png">
 
 #### Current Value
 
 If you have currently 12 Sales Orders created in your account, then current value updated will be 12. You can edit Current Value to 322, and then click on Update Series Number.
 
-![Series Current Value]({{docs_base_url}}/assets/img/articles/$SGrab_419.png)
+<img alt="Series Current Value" class="screenshot" src="{{docs_base_url}}/assets/img/articles/current-no-3.png">
 
 With this setting, you will have numbering for the New Sales Orders starting with #323.
 
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.html b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.html
deleted file mode 100644
index 1ae6cb5..0000000
--- a/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<h1>Overwriting Data from Data Import Tool</h1>
-
-<h1>Overwriting Data from Data Import Tool</h1>
-
-Data Import Tool allows importing documents (like customers, Suppliers, Orders, Invoices etc.) from spreadsheet file into ERPNext. The very same tool can also be used for overwrite values in the existing documents.
-<br>
-<br><div class="well">Over-writing data from Data Import Tool works only for Saved transactions, and not for Submitted ones.</div>
-Let's assume there are no. of items for which we need to overwrite Item Group.
-Following are the steps to go about overwriting Item Groups for existing Items.<br><br><h4>Step 1: Download Template</h4><br>Template Used for overwriting data will be same as one used for importing new items. Hence, you should first download template from.<br><br>Setup &gt;&gt; Data &gt;&gt; Import/Export Data<br><br>Since items to be over-written will be already available in the system, while downloading template, "Download with data" field should be checked. With this, we will have all the existing items being downloaded with the template.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_285.png"><br><br><h4>Step 2: Prepare Data</h4><br>In the download template, We will only keep rows of the items to be worked on and delete the rest. Then we will enter new value in the Item Group column for an item. Since Item Group is a master in itself, we should ensure that Item Group entered in the excel file is already available in the Item Group master as well.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_287.png"><br><br>Since we are overwriting only Item Group, only following columns will be mandatory.<br><br><ol><li>Column A (since it has main values of template)<br></li><li>Name (Column B)<br></li><li>Item Group<br></li></ol>Columns of other field which won't have any impact of overwriting can be
- removed, even if they are mandatory. This is applicable only for 
-overwriting, and not when importing new records.<br><br><h4>Step 3: Import Data</h4><br>Once excel file is ready for importing, come back to Data Import Tool in ERPNext. We should first browser and select the File/template which has data to be overwritten. "Overwrite" field should be checked since we are overwriting Item Group in the existing items.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_288.png"><br><br><h4>Step 4: Upload</h4><br>On clicking Upload and Import, if values as provided in the spreadsheet file is validated, it will be successfully updated in the item master.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_289.png"><br><br>If validation of values fails, then it will indicate row no. of spreadsheet for which validation failed and needs correction. In that case, you should corrected value in that row, and then try importing/uploading file again. If validation fails for even one row, none of the records are imported/updated.<br>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md
new file mode 100644
index 0000000..b3c72b8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md
@@ -0,0 +1,49 @@
+#Overwriting Data from Data Import Tool
+
+Data Import Tool allows importing documents (like customers, Suppliers, Orders, Invoices etc.) from spreadsheet file into ERPNext. The very same tool can also be used for overwrite values in the existing documents.
+
+<div class="well">Overwriting data from Data Import Tool works only for the saved transactions, and not for Submitted ones.</div>
+
+Let's assume there are no. of items for which we need to overwrite Item Group. Following are the steps to go about overwriting Item Groups for existing Items.
+
+####Step 1: Download Template
+
+Template Used for overwriting data will be same as one used for importing new items. Hence, you should first download template from.
+
+`Setup > Data > Import/Export Data'
+
+Since items to be over-written will be already available in the system, while downloading template, click on "Download with data" to get all the existing items in the template.
+
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/articles/overwrite-1.gif">
+	
+####Step 2: Prepare Data
+
+In the template, we can only keep rows of the items to be overwritten and delete the rest. 
+
+Enter new value in the Item Group column for an item. Since Item Group is a master in itself, ensure Item Group entered in the spreadsheet file is already added in the Item Group master.
+
+<img alt="Update Values" class="screenshot" src="{{docs_base_url}}/assets/img/articles/overwrite-2.png">
+
+Since we are overwriting only Item Group, only following columns will be mandatory.
+
+1. Column A (since it has main values of template)
+1. Name (Column B)
+1. Item Group
+
+Columns of other field which won't have any impact can be removed, even if they are mandatory. This is applicable only for overwriting, and not when importing new records.
+
+####Step 3: Browse Template
+
+After updating Item Groups in spreadheet, come back to Data Import Tool in ERPNext. Browser and select the File/template which has data to be overwritten.
+
+<img alt="Browse template" class="screenshot" src="{{docs_base_url}}/assets/img/articles/overwrite-3.gif">
+
+####Step 4: Upload
+
+On clicking Import, Item Group will be over-written.
+
+<img alt="Upload" class="screenshot" src="{{docs_base_url}}/assets/img/articles/overwrite-4.png">
+
+If validation of values fails, then it will indicate row no. of spreadsheet for which validation failed and needs correction. In that case, you should corrected value in that row of spreadsheet, and then import same file again. If validation fails even for one row, none of the records are imported/overwritten.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
index 51fb637..79cefe1 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
@@ -1,31 +1,27 @@
-<h1>Rename User</h1>
-
-<h1>Rename User</h1>
+#Rename User
 
 Renaming functionality allows you to edit id of specific record. User is saved with person's email id. Only User with System Manager's role will be able to rename User IDs.
 
 Following are the steps to rename user id.
 
-#### Step 1: Go to User List
+#### Step 1: Users
 
-Setup &gt; Users &gt; User
+`Setup > Users > User`
 
-Click to open user id you want to rename.
+Open User to be renamed.
 
-#### Step 2: Go to Menu and click on Rename option. 
+#### Step 2: Rename
 
-When will you click on Rename option, pop up will open on same form. 
+From Menu, select Rename.
 
-<img src="{{docs_base_url}}/assets/img/articles/Selection_019811b13.png">
+<img alt="Rename" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-user-1.png">
 
+#### Step 3: Update
 
-#### Step 3: Enter new user ID and Press Rename Button.
+Enter valid email id and click on Rename.
 
+<img alt="Update" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-user-2.png"> 
 
-<img src="{{docs_base_url}}/assets/img/articles/Selection_021ac61a5.png"> 
-
-After successful renaming user can login to their ERPNext account with new ID.
-
-
+After successful renaming, User will be able login using updated user id.
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
index dfd9ea0..517c674 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
@@ -2,13 +2,13 @@
 
 Users can be added by the System Manager. If you are a System Manager, you can add Users via
 
+> Setup > User
+
 There are two main classes of users: Web Users and System Users. System Users are people using ERPNext in the company. Web users are customers or suppliers (or portal users).
   
 Under User a lot of info can be entered. For the sake of usability the information entered for webs users is minimal: First Name and email.
 Important is to realize that the email address is the unique key (ID) identifying the Users.
 
-> Setup > User
-
 ### 1. List of Users
 
 <img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-1.png" alt="User List">
@@ -26,8 +26,7 @@
 
 ### 3. Setting Roles
 
-After saving, you will see a list of roles and a checkbox next to it. Just check the roles you want the
-the user to have and save the document. To click on what permissions translate into roles, click on the role
+After saving, you will see a list of roles and a checkbox next to it. Just check the roles you want the user to have and save the document. To click on what permissions translate into roles, click on the role
 name.
 
 <img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-2.png" alt="User Roles">
diff --git a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
index bfee143..f0963d1 100644
--- a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
+++ b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
@@ -1,15 +1,22 @@
-<h1>Allow over delivery / billing against Sales Order upto certain limit</h1>
+#Allow Over Delivery/Billing
 
-<h1>Allow over delivery / billing against Sales Order upto certain limit</h1>
+While creating Delivery Note, system validates if item's Qty mentined is same as in the Sales Order. It Item Qty has been increased, you will get over-delivery validation. If you want to be able to deliver more items than mentioned in the Sales Order, you should update "Allow over delivery or receipt upto this percent" in the Item master.
 
-To setup over delivery / receipt / billing against a Sales / Purchase Order upto certain limit:
+<img alt="Item wise Allowance percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allowance-percentage-1.png">
 
-1. Go to `Stock > Setup > Stock Settings`.
-2. Set `Allowance Percentage` and save the Stock Settings.
-![Allowance Percentage]({{docs_base_url}}/assets/img/articles/allowance_percentage.png)
-For example: If you have ordered 100 units. and your Allowance is 50% then you are allowed to receive 150 units.
-3. To set item-specific limit, set `Allowance Percentage` in `Item` master.
-![Allowance Percentage in Item]({{docs_base_url}}/assets/img/articles/allowance_percentage_item.png)
+Item's and Rate is also validated when creating Sales Invoice from Sales Order. Also when creating Purchase Receipt and Purchaes Invoice from Purchase Order. Updating "Allow over delivery or receipt upto this percent" will be affective in all sales and purchase transactions.
+
+For example, if you have ordered 100 units of an item, and if item's over receipt percent is 50%, then you are allowed to make Purchase Receipt for upto 150 units.
+
+Update global value for "Allow over delivery or receipt upto this percent" from Stock Settings. Value updated here will be applicable for all the items.
+
+1. Go to `Stock > Setup > Stock Settings`
+
+2. Set `Allowance Percentage`.
+
+3. Save Stock Settings.
+
+<img alt="Item wise Allowance percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allowance-percentage-2.png">
 
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
index e95b113..02d88d8 100644
--- a/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
+++ b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
@@ -1,25 +1,27 @@
-<h1>Auto Creation of Material Request</h1>
+#Auto Creation of Material Request
 
-<h1>Auto Creation of Material Request</h1>
+To prevent stockouts, you can track item's reorder level. When stock level goes below reorder level, purchase manager is notified and instructed to initiate purchase process for the item.
 
-ERPNext allows you to define item-wise and warehouse-wise reorder level in the item master. Reorder level is the item's stock level at which item should be re-ordered.
+In ERPNext, you can update item's Reorder Level and Reorder Qty in the Item master. If same item has different reorder level, you can also update warehouse-wise reorder level and reorder qty.
+
+<img alt="reorder level" class="screenshot" src="{{docs_base_url}}/assets/img/articles/reorder-request-1.png">
 
 With reorder level, you can also define what should be the next action. Either new purchase or transfer from another warehouse. Based on setting in Item master, purpose will be updated in the Material Request as well.
 
-![Item Reorder Level]({{docs_base_url}}/assets/img/articles/$SGrab_391.png)
+<img alt="reorder level next action" class="screenshot" src="{{docs_base_url}}/assets/img/articles/reorder-request-2.png">
 
-You can have Material Request automatically created for items whose stock level reaches re-order level. You can enable this feature from:
+When item's stock reaches reorder level, Material Request is auto-created automatically. You can enable this feature from:
 
 `Stock > Setup > Stock Settings`
 
-![Item Reorder Stock Setting]({{docs_base_url}}/assets/img/articles/$SGrab_392.png)
+<img alt="active auto-material request" class="screenshot" src="{{docs_base_url}}/assets/img/articles/reorder-request-3.png">
 
-A separate Material Request will be created for each item. User with Purchase Manager's role will be informed about these Material Request. He can further process this Material Request, and create Supplier Quotation and Purchase Order against it.
+A separate Material Request will be created for each item. User with Purchase Manager's role will receive email alert about these Material Requests.
 
-If auto creation of Material Request is failed, Purchase Manager will be informed about error message via email. One of the most encountered error message is:
+If auto creation of Material Request is failed, User with Purchase Manager role will be informed about error message. One of the most encountered error message is:
 
-**An error occurred for certain Items while creating Material Requests based on Re-order level.
-Date 01-04-2015 not in any Fiscal Year.**
+**An error occurred for certain Items while creating Material Requests based on Re-order level.**
+**Date 01-04-2016 not in any Fiscal Year.**
 
-One of the reason of error could be Fiscal Year as well. Click [here](https://erpnext.com/kb/accounts/fiscal-year-error) to learn more about it.
+One of the reason of error could be Fiscal Year as well. Click [here]({{docs_base_url}}/user/manual/en/accounts/articles/fiscal-year-error.html) to learn more about it.
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html
deleted file mode 100644
index 6115ed5..0000000
--- a/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>Creating Depreciation For Item</h1>
-
-<h1>Creating Depreciation For Item</h1>
-
-<b>Question:</b> A Fixed Asset Item has been purchased and stored in a warehouse. How can the user create a depreciation for a Fixed Asset Item?<u><b><br><br></b></u><b>Answer:</b><u><b><br><br></b></u>Though there is no direct, automated method to book
-Asset Depreciation. A suitable work around to achieve this is by creating a Stock Reconciliation Entry.
-<br><u><b><br>Step 1:</b></u> In the Attachment file, fill in the appropriate columns;
-<br>
-<ul>
-    <li><i>Item Code</i> whose value is to be depreciated</li>
-    <li><i>Warehouse </i>in which it is stored</li>
-    <li><i>Qty (Quantity) </i>Leave this column blank</li>
-    <li>&nbsp;<i>Valuation Rate </i>Enter the Value after Depreciation</li>
-</ul>
-<p>
-    <br>
-</p>
-<img src="{{docs_base_path}}/assets/img/articles/kb_deprec_csv.png"><br>
-<p><u><b><br></b></u>
-</p>
-<p><u><b>Step 2:</b></u> In the Stock Reconciliation Form, enter the Expense account for depreciation in <i>Difference Account</i>.</p>
-<br><img src="{{docs_base_path}}/assets/img/articles/kb_deprec_form.png" height="302" width="652"><br>
-<p>
-    <br>
-</p>
-<div class="well">Note: For more information on Stock Reconciliation, see the <a href="https://erpnext.com/user-guide/setting-up/stock-reconciliation-for-non-serialized-item" target="_blank">User Guide</a>.</div>
-<div class="well"> Note: An Automated Asset Depreciation feature in on our To-Do List. See this <a href="https://github.com/frappe/erpnext/issues/191" target="_blank">Github Issue</a>.</div>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md
new file mode 100644
index 0000000..491427c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md
@@ -0,0 +1,28 @@
+#Depreciation Entry
+
+**Question:** A Fixed Asset Item has been purchased and stored in a warehouse. How to create a depreciation for a Fixed Asset Item?
+
+**Answer:**You can post asset depreciation entry for the fixed asset item via [Stock Reconciliation]({{docs_base_url}}/user/manual/en/stock/opening-stock.html) Entry.
+
+####Step 1:
+
+In the Attachment file, fill in the appropriate columns;
+
+- **Item Code** whose value is to be depreciated.
+- **Warehouse** in which item is stored.
+- **Qty (Quantity)** Leave this column blank.
+- **Valuation Rate** will be item's value after depreciation.
+
+<img alt="reorder level" class="screenshot" src="{{docs_base_url}}/assets/img/articles/fixed-asset-dep-1.gif">
+
+After updating Valuation Rate for an item, come back to Stock Reconciliation and upload save .csv file.
+
+####Step 2:
+
+Select Expense account for depreciation in **Difference Account**. Value booked in the depreciation account will be the difference of old and next valuation rate of the fixed asset item, which will be actually the depreciation amount.
+
+<img alt="reorder level" class="screenshot" src="{{docs_base_url}}/assets/img/articles/fixed-asset-dep-2.png">
+
+####Stock Reconciliation Help Video
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/0yPgrtfeCTs" frameborder="0" allowfullscreen></iframe>
diff --git a/erpnext/docs/user/manual/en/stock/articles/index.txt b/erpnext/docs/user/manual/en/stock/articles/index.txt
index fc039b1..6d20384 100644
--- a/erpnext/docs/user/manual/en/stock/articles/index.txt
+++ b/erpnext/docs/user/manual/en/stock/articles/index.txt
@@ -1,7 +1,7 @@
 allow-over-delivery-billing-against-sales-order-upto-certain-limit
 auto-creation-of-material-request
-creating-depreciation-for-item
-is-stock-item-field-frozen-in-item-master
+depreciation-entry
+maintain-stock-field-frozen-in-item-master
 manage-rejected-finished-goods-items
 managing-assets
 managing-batch-wise-inventory
@@ -11,5 +11,4 @@
 serial-no-naming
 stock-entry-purpose
 stock-level-report
-track-items-using-barcode
-using-batch-feature-in-stock-entry
\ No newline at end of file
+track-items-using-barcode
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md b/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
similarity index 77%
rename from erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md
rename to erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
index a012827..f93e668 100644
--- a/erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md
+++ b/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
@@ -1,14 +1,12 @@
-<h1>Is Stock Item field Frozen in the Item master</h1>
+#Maintain Stock field Frozen in the Item master
 
-<h1>Is Stock Item field Frozen in the Item master</h1>
+In the item master, you might witness values in the following fields to be frozen.
 
-In the item master, you might witness values in the following fields be frozen.
-
-1. Is Stock Item
+1. Maintain Stock
 1. Has Batch No.
 1. Has Serial No.
 
-![Item Field Frozen]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-16 at 2.52.56 pm.png)
+<img alt="Item Field Frozen" class="screenshot" src="{{docs_base_url}}/assets/img/articles/maintain-stock-1.png">
 
 For an item, once stock ledger entry is created, values in these fields will be froze. This is to prevent user from changing value which can lead to mis-match of actual stock, and stock level in the system of an item.
 
diff --git a/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md b/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
index 9bb0103..2d57d64 100644
--- a/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
+++ b/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
@@ -1,32 +1,31 @@
-<h1>Manage Rejected Finished Goods Items</h1>
+#Manage Rejected Finished Goods Items
 
-<h1>Manage Rejected Finished Goods Items</h1>
+There could be manufactured Items which would not pass quality test, hence rejected.
 
-There could be manufactured Items which would not pass quality test, and would be rejected.
-
-Standard manufacturing process in ERPNext doesn't cover managing rejected items separately. Hence you should create finished goods entry for both accepted as well as rejected items. With this, you will have rejected items also received in the finished goods warehouse.
+Standard manufacturing process in ERPNext doesn't cover managing rejected items. Hence you should create finished goods entry for both accepted as well as rejected items. With this, you will have rejected items also received in the finished goods warehouse.
 
 To move rejected items from the finished goods warehouse, you should create Material Transfer entry. Steps below to create Material Transfer entry.
 
-####New Stock Entry
+####Step 1: New Stock Entry
 
-`Stock > Stock Entry > New`
+`Stock > Documents > Stock Entry > New`
 
-####Entry Purpose
+####Step 2: Purpose
 
 Purpose = Material Transfer
 
-####Warehouse
+####Step 3: Warehouse
 
 Source Warehouse = Finished Goods warehouse
 Target Warehouse = Rejected items warehouse
 
-####Items
+####Step 4: Items
 
 Select item which failed quality test, and enter total rejected items as Qty.
 
-####Submit Stock Entry
+####Step 5: Submit Stock Entry
 
 On Saving and Submitting Stock Entry, stock of rejected items will be moved from Finished Goods Warehouse to Rejected Warehouse.
 
+
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-assets.md b/erpnext/docs/user/manual/en/stock/articles/managing-assets.md
index 5032dcd..0be7860 100644
--- a/erpnext/docs/user/manual/en/stock/articles/managing-assets.md
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-assets.md
@@ -1,24 +1,23 @@
-<h1>Managing Assets</h1>
+#Managing Assets
 
-<h1>Managing Assets</h1>
+Items like machinery, furniture, land and property, patents etc. can be categorized as fixed asset of a company. In ERPNext, you can maintain fixed asset items, mainly stock items in a separate Warehouse.
 
-Items like machinery, furniture, land and property, patents etc. can be categorized as fixed asset of a company. In ERPNext, you can maintain fixed asset items in a separate Warehouse.
-
-Item can be created for each type of an asset. Whereas unique Serial No. will be created for each unit of that asset item. Maintaining serialized inventory of asset item will have in tracking item's warranty and expiry details.
+For the high value asset items, serialized inventory can be maintained. It will allow assigning unique Serial No. to each unit of an asset item.
 
 ####Fixed Asset Master
 
-While creating Item Code for the fixed asset item, you should updated field "Is Fixed Asset" as "Yes".
+While creating Item Code for the fixed asset item, you should check "Is Fixed Asset" field.
 
-![Fixed Asset Item]({{docs_base_url}}/assets/img/articles/$SGrab_383.png)
+<img alt ="Fixed Asset Item" class="screenshot" src="{{docs_base_url}}/assets/img/articles/managing-assets-1.png">
 
 Other item properties like Stock/Non-stock item can be updated on the nature of asset. Like patent and trademarks will be non-stock assets.
 
-If your asset item is serialized, click [here](https://erpnext.com/user-guide/stock/serialized-inventory) to learn how serialized inventory is managed in ERPNext.
+If your asset item is serialized, click [here]({{docs_base_url}}/user/videos/learn/serialized-inventory.html) to learn how serialized inventory is managed in ERPNext.
 
 ####Warehouse for Fixed Asset
 
-Separate Warehouse should be created for the fixed asset items. All the sales, purchase and stock transactions for asset items will be done in that fixed asset warehouse only.
+Separate Warehouse should be created for the fixed asset items. All the sales, purchase and stock transactions for asset items should be done for fixed asset warehouse only.
 
-Also, as per the perpetual inventory valuation system, you will have accounting ledger auto-created for the warehouse. You can move the accounting ledger of warehouse created for fixed asset from Stock Asset group to fixed asset group. This will be helpful while preparing financial statement for a company.
+As per the perpetual inventory valuation system, accounting ledger is auto-created for a warehouse. You can move the accounting ledger of fixed asset asset from Stock Asset (default group) to Fixed Asset's group account.
+
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html
deleted file mode 100644
index 23cd46d..0000000
--- a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1>Managing Batch wise Inventory</h1>
-
-<h1>Managing Batch wise Inventory</h1>
-
-To maintain batches against an Item you need to mention 'has batch no' as yes in the Item Master. You can create a new Batch from&nbsp;<div><br></div><div><p >Stock &gt; Documents &gt; Batch &gt; New</p></div><div><br></div><div>To learn more about batch check out the manual page at&nbsp;https://manual.erpnext.com/contents/stock/batch</div><div><br></div><div>While making a purchase receipt or delivery note, mention the batch number against the item.</div><div><br></div><div><p ><strong>Batch No. in Purchase Receipt</strong></p><p ><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2015-06-23 at 5.33.37 pm.png"><br></p><p ><strong>Batch No. in Delivery Note</strong></p><p ><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2015-06-23 at 5.35.28 pm.png"><br></p><p ><b>Batch-wise Stock Balance Report</b></p><p >To check batch-wise stock balance report, go to:</p><p >Stock &gt; Standard Reports &gt; Batch-wise Balance History</p><p ><br></p></div>
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
new file mode 100644
index 0000000..7ae102b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
@@ -0,0 +1,35 @@
+#Managing Batch wise Inventory
+
+Set of items which has same properties and attributes can be group in a single Batch. For example, pharceuticals items are batch, so that it's manufacturing and expiry date can be tracked together. 
+
+To maintain batches against an Item you need to mention 'Has Batch No' as yes in the Item Master. 
+
+<img alt="Batch Item" class="screenshot" src="{{docs_base_url}}/assets/img/articles/batchwise-stock-1.png">
+
+You can create a new Batch from:
+
+`Stock > Documents > Batch > New`
+
+To learn more about batch, click [here.]({{docs_base_url}}/user/manual/en/stock/batch.html)
+
+For the Batch item, updating Batch No. in the stock transactions (Purchase Receipt & Delivery Note) is mandatory.
+
+#### Purchase Receipt
+
+When creating Purchase Receipt, you should create new Batch, or select one of the existing Batch master. One Batch can be associated with one Batch Item.
+
+<img alt="Batch in Purchase Receipt" class="screenshot" src="{{docs_base_url}}/assets/img/articles/batchwise-stock-2.png">
+
+#### Delivery Note
+
+Define Batch in Delivery Note Item table. If Batch item is added under Product Bundle, you can update it's Batch No. in the Packing List table sa well.
+
+<img alt="Batch in Delivery Note" class="screenshot" src="{{docs_base_url}}/assets/img/articles/batchwise-stock-3.png">
+
+#### Batch-wise Stock Balance Report
+
+To check batch-wise stock balance report, go to:
+
+Stock > Standard Reports > Batch-wise Balance History
+
+<img alt="Batchwise Stock Balance" class="screenshot" src="{{docs_base_url}}/assets/img/articles/batchwise-stock-4.png">
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
index 75acd38..12447e0 100644
--- a/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
@@ -1,12 +1,10 @@
-<h1>Managing Fractions in UoM</h1>
-
-<h1>Managing Fractions in UoM</h1>
+#Managing Fractions in UoM
 
 UoM stands for Unit of Measurement. Few examples of UoM are Numbers (Nos), Kgs, Litre, Meter, Box, Carton etc.
 
-There are few UoMs which cannot have value decimal places. For example, if we have television for an item, with Nos as its UoM, we cannot have 1.5 Nos. of television, or 3.7 Nos. of computer sets. The value of quantity for these items must be whole number.
+There are few UoMs which cannot have value in decimal places. For example, if we have television for an item, with Nos as its UoM, we cannot have 1.5 Nos. of television, or 3.7 Nos. of computer sets. The value of quantity for these items must be whole number.
 
-You can configure if particular UoM can have value in decimal place or no. Bydefault, decimal places will be allowed in all the UoMs. To restrict decimal places or value in fraction for any UoM, you should follow these steps.
+You can configure if particular UoM can have value in decimal place or no. By default, value in decimal places will be allowed for all the UoMs. To restrict decimal places or value in fraction for any UoM, you should follow these steps.
 
 ####UoM List
 
@@ -14,21 +12,21 @@
 
 `Stock > Setup > UoM`
 
-For the list of UoM, select one which you want to restrict value in fraction. Let's assume that UoM is Nos.
+From the list of UoM, select UoM for which value in decimal place is to be restricted. Let's assume that UoM is Nos.
 
 ####Configure
 
-In the UoM form, you will find a field called "Must be whole number". Check this field to restrict user from enter decimal places in quantity field for item with this UoM.
+In the UoM master, you will find a field called "Must be whole number". Check this field to restrict user from enter value in decimal places in quantity field, for item having this UoM.
 
-![UoM Whole No]({{docs_base_url}}/assets/img/articles/$SGrab_390.png)
+<img alt="UoM Must be Whole No" class="screenshot" src="{{docs_base_url}}/assets/img/articles/uom-fraction-1.png">
 
-####While Creating Entry
+####Validation
 
-While creating transaction, if you enter value in fraction for item who's UoM has "Must be whole number" checked, you will get error message stating:
+While creating transaction, if you enter value in fraction for item whos UoM has "Must be whole number" checked, you will get error message stating:
 
 `Quantity cannot be a fraction at row #`
 
-![UoM Fraction Error]({{docs_base_url}}/assets/img/articles/$SGrab_389.png)
+<img alt="UoM Validation Message" class="screenshot" src="{{docs_base_url}}/assets/img/articles/uom-fraction-2.png">
 
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
index 5251a8e..9b8684a 100644
--- a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
+++ b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
@@ -1,14 +1,14 @@
-<h1>Opening Stock Balance Entry for the Serialized and Batch Item</h1>
+#Opening Stock Balance Entry for the Serialized and Batch Item
 
-<h1>Opening Stock Balance Entry for the Serialized and Batch Item</h1>
+Items for which Serial No. and Batch No. is maintained, opening stock balance entry for them is update via Stock Entry. [Click here to learn how serialized inventory is managed in ERPNext]({{docs_base_url}}/user/manual/en/stock/serial-no.html).
 
-Items for which Serial No. and Batch No. is maintained, opening stock balance entry for them will be update via Stock Entry. [Click here to learn how serialized inventory is managed in ERPNext](https://erpnext.com/user-guide/stock/serialized-inventory).
+**Question:** Why Opening Balance entry for the Serialized and Batch Item cannot be updated via Stock Reconciliation?
 
-Why Opening Balance entry for the Serialized and Batch Item cannot be updated via Stock Reconciliation?
+In the ERPNext, stock level of a serialized items is derived based on the count of Serial Nos for that item. Hence, unless Serial Nos. are created for the serialized item, its stock level is not be updated. In the Stock Reconciliation Tool, you can only update opening quantity of an item, but not their Serial No. and Batch No.
 
-In the ERPNext, stock level of a serialized items is derived based on the count of Serial Nos for that item. Hence, unless Serial Nos. are created for the serialized item, its stock level will not be updated. In the Stock Reconciliation Tool, you can only update opening quantity of an item, and not their Serial No. and Batch No.
+### Opening Balance for the Serialized Item
 
-Let's check steps for create opening stock balance entry for the Serialized and Batch item.
+Following are the steps to create opening stock balance entry for the Serialized and Batch item.
 
 #### Step 1: New Stock Entry
 
@@ -28,36 +28,33 @@
 
 #### Step 5: Select Items
 
-Select Items in the Stock Entry table.
+Select Items for which opening balance is to be updated.
 
 #### Step 6: Update Opening Qty
 
-For the serialized item, you should update as many Serial Nos as their Qty. If you have updated Prefix in the Item master, on the submission of Stock Entry Serial Nos. will be auto-created following that prefix.
+For the serialized item, update quantity as many Serial Nos are their.
 
-![Item Serial No. Prefix]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 5.13.50 pm.png)
+For the serialized item, mention Serial Nos. equivalent to it's Qty. Or if Serial Nos. are configured to be created based on Prefix, then no need to mention Serial Nos. manually. Click [here]({{docs_base_url}}/user/manual/en/stock/articles/serial-no-naming.html) to learn more about Serial No. naming.
 
-For a batch item, you should provide Batch ID in which opening balance will be updated. You should keep batch master ready, and updated it for the Batch Item. To create new Batch, go to:
+For a batch item, provide Batch ID in which opening balance will be updated. Keep batch master ready, and updated it for the Batch Item. To create new Batch, go to:
 
 `Stock > Setup > Batch > New`
 
-[Click here to learn how Batchwise inventory is managed in ERPNext](https://erpnext.com/user-guide/stock/batchwise-inventory).
+[Click here to learn how Batchwise inventory is managed in ERPNext.]({{docs_base_url}}/user/manual/en/stock/articles/managing-batch-wise-inventory.html)
 
 #### Step 7: Update Valuation Rate an Item
 
-Valuation Rate is the mandatory field, where you should update `per unit value of item`. If you have unit of items having different valuation rates, they should be updated in a separate row, with different Valuation Rate.
+Update valuation rate, which will be per unit value of item. If different units of the same items having different valuation rate, they should be updated in a separate row, with different Valuation Rates.
 
 #### Step 8: Difference Account
 
-As per perpetual inventory valuation system, accounting entry is created for every stock entry. Accounting system followed in the ERPNext requires Total Debit in an entry matching with Total Credit. On the submission of Stock Entry, system Debits accounting ledger of a Warehouse by total value of items. To balance the same, we use Temporary Liability account in the Difference Account field. [Click here to learn more about use of Temporary Accounts in updating opening balance](https://erpnext.com/kb/accounts/updating-opening-balance-in-accounts-using-temporary-account).
+As per perpetual inventory valuation system, accounting entry is created for every stock transaction. Double entry accounting system requires Total Debit matching with Total Credit in an entry. On the submission of Stock Entry, system debits Warehouse account by total value of items. To balance the same, we use Temporary Opening account as a Difference Account.
 
-![Difference Account]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 5.20.52 pm.png)
+<img alt="Difference Account" class="screenshot" src="{{docs_base_url}}/assets/img/articles/difference-account-1.png">
 
 #### Step 9: Save and Submit Stock Entry
 
-On submission of Stock Entry, stock ledger entry will be posted, and opening balance will be updated for the items on a given posting date.
+On submission of Stock Entry, stock ledger posting will be posted, and opening balance will be updated for the items on a given Posting Date.
 
-If Serial Nos. for your items are set to be created based on prefix, then on submission of Stock Entry, Serial Nos. will be created as well.
-
-![Serial No Creation]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 5.28.57 pm.png)
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/repack-entry.md b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
index 59bf983..1d758c8 100644
--- a/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
+++ b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
@@ -1,16 +1,14 @@
-<h1>Repack Entry</h1>
+#Repack Entry
 
-<h1>Repack Entry</h1>
-
-If you buy items in bulk to be repacked into smaller packs, you can create a **Stock Entry** of type "Repack". For example, item bought in tons can be repacked into Kgs. 
+Repack Entry is created for item bought in bulk, which is being packed into smaller packages. For example, item bought in tons can be repacked into Kgs. 
 
 Notes:
-1. Separate purchase and repacked Items must be made.
+1. Purchase Item and repack will be have different Item Codes.
 2. Repack entry can be made with or without BOM (Bill of Material).
 
-Let's check below scenario to understand this better.
+In a Repack Entry, there can be one or more than one repack items. Let's check below scenario to understand this better.
 
-Assume you buy crude oil in barrel, and get diesel and gasoline as its output. To create production entry, go to:
+Assume we are buying boxes of spray paint of specific colour (Green, Blue etc). And later re-bundling to create packs having multiple colours of spray paint (Blue-Green, Green-Yellow etc.) in them.
 
 #### 1. New Stock Entry
 
@@ -22,14 +20,16 @@
 
 For raw-material/input item, only Source Warehouse will be provided.
 
-For repacked/production item, only Target Warehouse will be entered. You will have to provide valuation for the repacked/production item.
+For repacked/output items, only Target Warehouse will be provided. You will have to provide valuation for the repack items.
 
-![New STE]({{docs_base_url}}/assets/img/articles/Selection_071.png)
+<img alt="Repack Entry" class="screenshot" src="{{docs_base_url}}/assets/img/articles/repack-1.png">
+
+Update Qty for all the items selected.
 
 #### 3. Submit Stock Entry
 
-On submitting Stock Entry, stock of input item will be reduced from Source Warehouse, and stock of repacked/production item will be added in the Target Warehouse.
+On submitting Stock Entry, stock of input item will be reduced from Source Warehouse, and stock of repack/output item will be added in the Target Warehouse.
 
-![New STE]({{docs_base_url}}/assets/img/articles/Selection_072.png)
+<img alt="Repack Stock Entry" class="screenshot" src="{{docs_base_url}}/assets/img/articles/repack-2.png">
 
 <!-- markdown --> 
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
index c4e8774..4f2425f 100644
--- a/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
+++ b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
@@ -1,26 +1,24 @@
-<h1>Serial No. Naming</h1>
+#Serial No. Naming
 
-<h1>Serial No. Naming</h1>
+Serial Nos. is unique value assigned on each unit of an item. Serial no. helps in tracking item's warranty and expiry details. Generally high value items like machines, computers, costly equipments are serialized.
 
-Serial Nos. are unique value assigned on each unit of an item. Serial no. helps in locating and tracking item's warranty and expiry details.
-
-To make item Serialized, in the Item master, on selecting **Has Serial No** field should be updated as "Yes".
+To make item Serialized, in the Item master, check **Has Serial No**.
 
 There are two ways Serial no. can be generated in ERPNext.
 
 ###1. Serializing Purchase Items
 
-If purchased items are received with Serial Nos. applied by OEM (original equipment manufacturer), you should follow this approach. While creating Purchase Receipt, you shall scan or manually enter Serial nos. for an item. On submitting Purchase Receipt, Serial Nos. will be created in the backend as per Serial No. entered for an item.
+If purchased items are received with Serial Nos. applied by OEM (original equipment manufacturer), you can follow same Serial No in ERPNext as well. While creating Purchase Receipt, you shall scan or manually enter Serial nos. for an item. On submitting Purchase Receipt, Serial Nos. will be created in the backend as per Serial Nos. provided for an item. If using OEM' Serial No., then in the Item master, Prefix should not be mentioned for serializalization. As per this scenaio, Prefix field should be left blank.
 
 If received items already has its Serial No. barcoded, you can simply scan that barcode for entering Serial No. in the Purchase Receipt. Click [here](https://frappe.io/blog/management/using-barcodes-to-ease-data-entry) to learn more about it.
 
 On submission of Purchase Receipt or Stock entry for the serialized item, Serial Nos. will be auto-generated.
 
-![Serial Nos]({{docs_base_url}}/assets/img/articles/Selection_061.png)
+<img alt="Serial Nos Entry" class="screenshot" src="{{docs_base_url}}/assets/img/articles/serial-naming-1.png">
 
 Generated Serial numbers will be updated for each item.
 
-![Serial Nos]({{docs_base_url}}/assets/img/articles/Selection_062.png)
+<img alt="Serial Nos Created" class="screenshot" src="{{docs_base_url}}/assets/img/articles/serial-naming-2.png">
 
 ###2. Serializing Manufacturing Item
 
@@ -30,12 +28,12 @@
 
 When Item is set as serialized, it will allow you to mentioned Series for it.
 
-![Item Serial No. Series]({{docs_base_url}}/assets/img/articles/Selection_049.png)
+<img alt="Serial Nos Created" class="screenshot" src="{{docs_base_url}}/assets/img/articles/serial-naming-3.png">
 
 ####2.2 Production Entry for Serialized Item
 
 On submission of production entry for manufacturing item, system will automatically generate Serial Nos. following Series as specified in the Item master.
 
-![Serial No]({{docs_base_url}}/assets/img/articles/Selection_054.png)
+<img alt="Serial Nos Created" class="screenshot" src="{{docs_base_url}}/assets/img/articles/serial-naming-4.png">
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
index 26b6346..426328e 100644
--- a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
@@ -1,53 +1,49 @@
-<h1>Stock Entry Purpose</h1>
+#Stock Entry Purpose
 
-<h1>Stock Entry Purpose</h1>
+Stock Entry is a stock transaction, which can be used for multiple purposes. Let's learn about each Stock Entry Purpose below.
 
-Stock Entry document records Item movement from a Warehouse, to a Warehouse and between Warehouses. And in stock entry form selection of 'Purpose' belongs to type of item movement. Following are the uses of Stock Entry Purposes in stock entry form.
+#### 1.Purpose: Material Issue
 
-#### 1.Purpose = Material Issue
+Material Issue entry create to issue item(s) from a warehouse. On submission of Material Issue, stock of item is deducated from the Source Warehouse. 
 
-This purpose is selected to issue item from a warehouse. In this stock entry, you should define Source Warehouse only. This type of stock entry can be perform for adjustment of serialized inventory.
+Material Issue is generally made for the low value consumable items like office stationary, product consumables etc. Also you can create Material Issue to reconcile serialized and batched item's stock.
 
-![Material Issue]({{docs_base_url}}/assets/img/articles/Selection_440.png)
+<img alt="Material Issue" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-issue.png">
 
-#### 2.Purpose = Material Receipt
+#### 2.Purpose: Material Receipt
 
-This purpose is selected to receive item in a warehouse. In this stock entry, you should define Target Warehouse only. This type of stock entry can be perform for adjustment of serialized inventory.
+Material Receipt entry is created to inward stock of item(s) in a warehouse. This type of stock entry can be created for updating opening balance of serialized and batched item. Also items purchased without Purchase Order can be inwarded from Material Receipt entry.
 
-![Material Receipt]({{docs_base_url}}/assets/img/articles/Selection_442.png)
+For the stock valuation purpose, provided Item Valuation becomes a mandatory field in the Material Receipt entry.
 
-#### 3.Purpose = Material Transfer
+<img alt="Material Receipt" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-receipt.png">
 
-This purpose is selected to transfer item from warehouse to warehouse or to transfer raw material for production. In this stock entry, you should define Source Warehouse and Target Warehouse also.
+#### 3.Purpose: Material Transfer
 
-![Material Transfer]({{docs_base_url}}/assets/img/articles/Selection_443.png)
+Material Transfer entry is created for the inter-warehouse Material Transfer.
+
+<img alt="Material Transfer" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-transfer.png">
  
-#### 4.Purpose = Manufacture
+#### 4.Purpose: Material Transfer for Manufacture 
 
-This purpose is selected to perform finished goods entry. This purpose is auto selected in stock entry form, when you Update Finished Goods entry from Submitted Production Order. ![Check this page to know more about Manufacturing](https://erpnext.com/user-guide/guide-books/engineer-to-order/stock-entry)
+In the manufacturing process, raw-materials are issued from the stores to the production department (generally WIP warehouse). This Material Transfer entry is created from Production Order. Items in this entry are fetched from the BOM of production Item, as selected in Production Order.
 
-![Manufacture]({{docs_base_url}}/assets/img/articles/Selection_444.png) 
+<img alt="Transfer for Manufacture" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-manufacture-transfer.gif">
 
-#### 5.Purpose = Repack
+#### 4.Purpose: Manufacture
 
-This purpose is selected to perform repack of item. ![Check this page to know more about Repack entry](https://erpnext.com/kb/stock/repack-entry)
+Manufacture is created from Production Order. In this entry, both raw-material item as well as production item are fetched from the BOM, selected in the Production Order. For the raw-material items, only Source Warehouse (generally WIP warehouse) is mentioned. For the production item, only target warehouse as mentioned in the Production Order is updated. On submission, stock of raw-material items are deducted from Source Warehouse, which indicates that raw-material items were consumed in the manufacturing process. Production Item is added to the Target Warehouse marking the completion of production cycle.
 
-#### 6.Purpose = Subcontract
+<img alt="Manufacture" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-manufacture.gif">
 
-This purpose is selected to transfer row material to supplier for manufacturing subcontracting item.![Check this page to know more about Subcontracting](https://erpnext.com/user-guide/manufacturing/subcontracting)
+#### 5.Purpose: Repack
 
-![Subcontract]({{docs_base_url}}/assets/img/articles/Selection_445.png)
+Repack Entry is created when items purchases in bulk is repacked under smaller packs. ![Check this page to know more about Repack entry.]({{docs_base_url}}/user/manual/en/stock/articles/repack-entry.html)
 
-#### 6.Purpose = Sales Return
+#### 6.Purpose: Subcontract
 
-This purpose is selected to receive returned item by customer. ![Check this page to know more about Sales Return](https://erpnext.com/user-guide/stock/sales-return)
+Subcontracting transaction involves company transfer raw-material items to the sub-contractors warehouse. This requires adding a warehouse for the sub-contractor as well. Sub-contract entry transfers stock from the companies warehouse to the sub-contractors warehouse.![Check this page to know more about Subcontracting]({{docs_base_url}}/user/manual/en/manufacturing/subcontracting.html).
 
-![Sales Return]({{docs_base_url}}/assets/img/articles/Selection_446.png)
+<img alt="Subcontract" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-subcontract.gif">
 
-#### 6.Purpose = Purchase Return
-
-This purpose is selected to issue purchased item to supplier. ![Check this page to know more about Purchase Return](https://erpnext.com/user-guide/stock/purchase-return)
-
-![Purchase Return]({{docs_base_url}}/assets/img/articles/Selection_447.png)
-        
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
index fa92612..b674470 100644
--- a/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
@@ -1,6 +1,4 @@
-<h1>Stock Level Report</h1>
-
-<h1>Stock Level Report</h1>
+#Stock Level Report
 
 Stock Level report list stock item's quantity available in a particular warehouse.
 
diff --git a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
index 5b0d99a..c880dfb 100644
--- a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
+++ b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
@@ -1,20 +1,21 @@
-<h1>Track items using Barcode</h1>
+#Track Items Using Barcode
 
-A barcode, is a code using multiple lines and spaces of varying widths, designed to represent some alpha-numeric characters. For example, in retail, it generally represents item code / serial number. Most barcode scanners behave like an external keyboard. When it scans a barcode, the data appears in the computer screens at the point of cursor.
+A barcode is a value decoded into vertical spaced lines. Barcode scanners are the input medium, like Keyboard. When it scans a barcode, the data appears in the computer screens at the point of a cursor.
 
-To enable barcode feature in ERPNext go to `Setup –> Customize –> Features Setup` and check "Item Barcode" option.
-![Features Setup]({{docs_base_url}}/assets/img/articles/feature-setup-barcode.png)
+To enable barcode feature in ERPNext go to:
 
-Now, a new field "Barcode" will be appear in Item master, enter barcode while creating a new item. You can update barcode field for existing items using "Data Import Tool".
+`Setup > Customize > Features Setup`
 
-If you are creating your own barcode, then you should print those same barcodes and attach to your products.
-![Item Barcode]({{docs_base_url}}/assets/img/articles/item-barcode.png)
+Check "Item Barcode".
 
+<img alt="Material Transfer" class="screenshot" src="{{docs_base_url}}/assets/img/articles/barcode-feature-setup.png">
 
-Once you have updated barcode field in item master, you can fetch items using barcode in Delivery Note, Sales Invoice and Purchase Receipt document.
+Now a new field "Barcode" will be appear in Item master. Enter barcode while creating a new item.
 
-For example, in Delivery Note Item table, a new field "Barcode" will be appear and if you point your mouse cursor to that field and scan the barcode using Barcode Scanner, the code will appear in that field. At the same time, system will pull item details, based on the barcode.
-![Delivery Note Barcode]({{docs_base_url}}/assets/img/articles/delivery-note-barcode.png)
+<img alt="Material Transfer" class="screenshot" src="{{docs_base_url}}/assets/img/articles/barcode-item-master.png">
 
+Once barcode field is updated in item master, items can be fetched using barcode. This feature will be availble in Delivery Note, Sales Invoice and Purchase Receipt transactions only.
+
+<img alt="Material Transfer" class="screenshot" src="{{docs_base_url}}/assets/img/articles/barcode-item-selection.gif">
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md b/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md
deleted file mode 100644
index eeb5cdf..0000000
--- a/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<h1>Using Batch feature in Stock Entry.</h1>
-
-1. You need to first create an Item Master Record. You can do so by typing 'new Item' in the Awesome bar.
-    <img class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screenshot from 2014-11-18 17:56:19.png">
-2. In the Item Master fill in all item related details. In the 'Inventory' section select 'Has Batch No.' as 'YES'
-    <img  class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screenshot from 2014-11-18 18:00:57.png">
-    NOTE: This option can be changed after submit but only as long as there are no Stock Entries created against that Item. Once an Stock Entry is created against that item this field freezes. To modify it again you need to cancel all outstanding 'Stock Entries'
-3. You can then create a batch. To do so you can type 'new Batch' in the Awesome bar.
-4. Fill in the batch related details and save the Doc.
-    <img  class="screenshot"
-     src="{{docs_base_url}}/assets/img/articles/Screenshot from 2014-11-18 18:09:42.png">
-5. Now in Stock Transaction You can associate a batch against that item under the 'Serial No / Batch' Section.<br>
-    <img  class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screenshot from 2014-11-18 18:13:22.png"><br></div>
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
index 460fa16..289753d 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
@@ -7,4 +7,5 @@
 rename-tool
 renaming-documents
 search-filters
-tree-master-renaming
\ No newline at end of file
+tree-master-renaming
+pos-view
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md b/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md
new file mode 100644
index 0000000..839e820
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md
@@ -0,0 +1,11 @@
+#POS View
+
+POS (point of sale) view renders form in a different layout, optimized for the quick selection of items. This view has primarily been designed for the retail business.
+
+Using POS View, you can only create Sales Invoice, without switching to standard form view. For other transactions, like Sales Order, Delivery Note, Purchase Order, Purchase Receipt etc., POS View is only used for Item selection. For entering other values in the transaction, you should switch to form view.
+
+<img alt="POS View" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pos-view.gif">
+
+For creating POS Invoice, check following help video.
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/4WkelWkbP_c" frameborder="0" allowfullscreen></iframe>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/index.txt b/erpnext/docs/user/manual/en/using-erpnext/index.txt
index 259835e..0dfa0d5 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/index.txt
+++ b/erpnext/docs/user/manual/en/using-erpnext/index.txt
@@ -6,3 +6,4 @@
 assignment
 tags
 articles
+pos-view
diff --git a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
new file mode 100644
index 0000000..92be7f7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
@@ -0,0 +1,22 @@
+#Managing User Sign Up via Website
+
+Users can sign up for ERPNext account via the ERPNext Website.
+
+<img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-12-10 at 4.45.27 pm.jpg">
+
+As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext.
+
+One might want to disable this feature to prevent anonymous users from signing up via the web.
+
+To do so, Go to 
+
+1. ` Website > Setup > Website Settings ` 
+
+2. In website settings doctype navigate to the misc section.
+
+3. Check the disable SignUp check-box and save the doc.
+
+Now only the login button shall appear and there shall be no option to sign-up via the website. You can always revert back by following the same steps.
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/website-security.md b/erpnext/docs/user/manual/en/website/articles/website-security.md
new file mode 100644
index 0000000..2a5ac0a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/website-security.md
@@ -0,0 +1,9 @@
+#Website Security
+
+One can easily generate a website using erpnext. We can list out Products on the website and also create blogs. Products are directly fetched from the Item Master records of your erpnext account. some people would like to limit the access of the website generated by ERPNext to certain people. This is because some of the items may not be available to public.
+
+Well at the moment this feature is not available. You cannot limit the access of the website generated by ERPNext to certain people. If you publish the website it will be publicly visible. However while you cannot control who can view the website, you can always choose which items to display on the website. To show or not show an Item on your website go to 'Item Master' and in the Item form check the 'show in website' checkbox. 
+
+<img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-11-26 at 10.43.51 am.png"> 
+
+You can also fill in the details of the product as to be shown on the website here.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/index.md b/erpnext/docs/user/videos/index.md
index dcefe84..1399258 100644
--- a/erpnext/docs/user/videos/index.md
+++ b/erpnext/docs/user/videos/index.md
@@ -32,4 +32,4 @@
         <br><br>
 		<a href="https://conf.erpnext.com">Join us at the ERPNext Conference on October 9th 2015 in Mumbai</a>
     </div>
-</div>
+</div>
\ 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 bd6766b..a583524 100644
--- a/erpnext/docs/user/videos/learn/index.md
+++ b/erpnext/docs/user/videos/learn/index.md
@@ -223,8 +223,12 @@
         <li><a href="{{docs_base_url}}/user/videos/learn/publish-items-on-website.html">
             Publish Items on Website</a>
             <span class="text-muted pull-right">5:14</span>
+        </li><li><a href="{{docs_base_url}}/user/videos/learn/shopping-cart.html">
+            Shopping Cart</a>
+            <span class="text-muted pull-right">6:32</span>
         </li>
     </ul>
+	<br>
     <h3>Customization</h3>
     <ul class="list-unstyled video-list">
         <li><a href="{{docs_base_url}}/user/videos/learn/field-customization.html">
@@ -235,6 +239,10 @@
             Workflow</a>
             <span class="text-muted pull-right">3:38</span>
         </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/report-builder.html">
+            Report Builder</a>
+            <span class="text-muted pull-right">4:27</span>
+        </li>
     </ul>
 </div>
 <div style="height: 70px;"></div>
diff --git a/erpnext/docs/user/videos/learn/index.txt b/erpnext/docs/user/videos/learn/index.txt
index 365a502..b9f567d 100644
--- a/erpnext/docs/user/videos/learn/index.txt
+++ b/erpnext/docs/user/videos/learn/index.txt
@@ -37,4 +37,6 @@
 advance-payments
 drop-ship
 file-manager
-publish-items-on-website
\ No newline at end of file
+publish-items-on-website
+shopping-cart
+report-builder
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/publish-items-on-website.md b/erpnext/docs/user/videos/learn/publish-items-on-website.md
index eb77e46..0028b3f 100644
--- a/erpnext/docs/user/videos/learn/publish-items-on-website.md
+++ b/erpnext/docs/user/videos/learn/publish-items-on-website.md
@@ -1,4 +1,4 @@
-# Publish Item on Website
+# Publish Items on Website
 
 <iframe width="660" height="371" src="https://www.youtube.com/embed/W31LBBNzbgc" frameborder="0" allowfullscreen></iframe>
 
diff --git a/erpnext/docs/user/videos/learn/report-builder.md b/erpnext/docs/user/videos/learn/report-builder.md
new file mode 100644
index 0000000..72fdc25
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/report-builder.md
@@ -0,0 +1,7 @@
+# Report Builder
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/y0o5iYZOioU" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 4:27**
+
+This tutorial covers creating custom reports in ERPNext using Report Builder.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/shopping-cart.md b/erpnext/docs/user/videos/learn/shopping-cart.md
new file mode 100644
index 0000000..c0dfbe6
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/shopping-cart.md
@@ -0,0 +1,7 @@
+# Shopping Cart
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/xkrYO-KFukM" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 6:32**
+
+ERPNext has Customers Portal. It allos Customer to login, and place new orderes using shopping cart. From Customer Portal, customer can also track progress on their existing orders, view history of transactions and communicate via Issues.
\ No newline at end of file
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index e6fa9a6..03c340f 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -7,7 +7,7 @@
 app_description = """ERP made simple"""
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.13.1"
+app_version = "6.17.0"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"
@@ -23,6 +23,7 @@
 setup_wizard_requires = "assets/erpnext/js/setup_wizard.js"
 setup_wizard_complete = "erpnext.setup.setup_wizard.setup_wizard.setup_complete"
 
+before_install = "erpnext.setup.install.check_setup_wizard_not_completed"
 after_install = "erpnext.setup.install.after_install"
 
 boot_session = "erpnext.startup.boot.boot_session"
diff --git a/erpnext/hr/doctype/appraisal/appraisal.js b/erpnext/hr/doctype/appraisal/appraisal.js
index c9f0583..4cfcd7e 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.js
+++ b/erpnext/hr/doctype/appraisal/appraisal.js
@@ -13,7 +13,7 @@
 }
 
 cur_frm.cscript.onload_post_render = function(doc,cdt,cdn){
-	if(doc.__islocal && doc.employee==frappe.defaults.get_user_default("employee")) {
+	if(doc.__islocal && doc.employee==frappe.defaults.get_user_default("Employee")) {
 		cur_frm.set_value("employee", "");
 		cur_frm.set_value("employee_name", "")
 	}
diff --git a/erpnext/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js
index 39af40e..8a20a09 100644
--- a/erpnext/hr/doctype/employee/employee.js
+++ b/erpnext/hr/doctype/employee/employee.js
@@ -24,8 +24,9 @@
 		erpnext.toggle_naming_series();
 		if(!this.frm.doc.__islocal && this.frm.doc.__onload &&
 			!this.frm.doc.__onload.salary_structure_exists) {
-				cur_frm.add_custom_button(__('Make Salary Structure'), function() {
-					me.make_salary_structure(this); }, frappe.boot.doctype_icons["Salary Structure"]);
+				cur_frm.add_custom_button(__('Salary Structure'), function() {
+					me.make_salary_structure(this); }, __("Make"));
+				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 		}
 	},
 
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index dd54623..0f72fbb 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -25,6 +25,7 @@
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -46,6 +47,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -69,6 +71,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -94,6 +97,7 @@
    "options": "EMP/", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -119,6 +123,7 @@
    "options": "\nMr\nMs", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -143,6 +148,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -166,6 +172,7 @@
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -189,6 +196,7 @@
    "options": "image", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -210,6 +218,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -235,6 +244,7 @@
    "options": "User", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -259,6 +269,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -283,6 +294,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -308,6 +320,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -333,6 +346,7 @@
    "options": "\nMale\nFemale", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -356,6 +370,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -378,6 +393,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -399,6 +415,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -425,6 +442,7 @@
    "options": "\nActive\nLeft", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -450,6 +468,7 @@
    "options": "Employment Type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -476,6 +495,7 @@
    "options": "Holiday List", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -497,6 +517,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -521,6 +542,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -545,6 +567,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -569,6 +592,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -593,6 +617,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -615,6 +640,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -636,6 +662,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -662,6 +689,7 @@
    "options": "Branch", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -687,6 +715,7 @@
    "options": "Department", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -712,6 +741,7 @@
    "options": "Designation", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -738,6 +768,7 @@
    "options": "Email", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -762,6 +793,7 @@
    "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -785,6 +817,7 @@
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -811,6 +844,7 @@
    "options": "\nBank\nCash\nCheque", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -836,6 +870,7 @@
    "oldfieldtype": "Link", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -861,6 +896,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -883,6 +919,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -908,6 +945,7 @@
    "options": "Employee", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -932,6 +970,7 @@
    "options": "Employee Leave Approver", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -954,6 +993,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -975,6 +1015,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -998,6 +1039,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1021,6 +1063,7 @@
    "options": "Email", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1043,6 +1086,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1052,30 +1096,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "emergency_contact_details", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Emergency Contact Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "<h4 class=\"text-muted\">Emergency Contact Details</h4>", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "person_to_be_contacted", 
    "fieldtype": "Data", 
@@ -1088,6 +1109,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1110,6 +1132,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1119,7 +1142,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "emergency_phone_number", 
    "fieldtype": "Data", 
@@ -1132,6 +1155,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1153,6 +1177,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1177,6 +1202,7 @@
    "options": "\nRented\nOwned", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1199,6 +1225,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1222,6 +1249,7 @@
    "options": "\nRented\nOwned", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1244,6 +1272,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1266,6 +1295,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1289,6 +1319,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1311,6 +1342,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1332,6 +1364,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1355,6 +1388,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1377,6 +1411,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1399,6 +1434,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1421,6 +1457,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1442,6 +1479,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1466,6 +1504,7 @@
    "options": "\nSingle\nMarried\nDivorced\nWidowed", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1489,6 +1528,7 @@
    "options": "\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1512,6 +1552,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1535,6 +1576,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1557,6 +1599,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1580,6 +1623,7 @@
    "options": "Employee Education", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1603,6 +1647,7 @@
    "options": "Simple", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1626,6 +1671,7 @@
    "options": "Employee External Work History", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1649,6 +1695,7 @@
    "options": "Simple", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1672,6 +1719,7 @@
    "options": "Employee Internal Work History", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1695,6 +1743,7 @@
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1716,6 +1765,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1741,6 +1791,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1765,6 +1816,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1789,6 +1841,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1814,6 +1867,7 @@
    "options": "\nYes\nNo", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1838,6 +1892,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1862,6 +1917,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1887,6 +1943,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1912,6 +1969,7 @@
    "options": "\nBetter Prospects\nHealth Concerns", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1936,6 +1994,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1960,6 +2019,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1978,7 +2038,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:46.290512", 
+ "modified": "2016-01-04 05:37:04.262434", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee", 
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
index 780cd70..85cd38d 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -97,8 +97,9 @@
 
 		if(doc.docstatus==1 && frappe.model.can_create("Journal Entry") &&
 			cint(doc.total_amount_reimbursed) < cint(doc.total_sanctioned_amount))
-			 cur_frm.add_custom_button(__("Make Bank Entry"),
-			 	cur_frm.cscript.make_bank_entry, frappe.boot.doctype_icons["Journal Entry"]);
+			 cur_frm.add_custom_button(__("Bank Entry"),
+			 	cur_frm.cscript.make_bank_entry, __("Make"));
+			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 	}
 }
 
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.js b/erpnext/hr/doctype/job_applicant/job_applicant.js
index 1ca750a..eac1a9a 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.js
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.js
@@ -10,18 +10,19 @@
 	refresh: function(frm) {
 		if (!frm.doc.__islocal) {
 			if (frm.doc.__onload && frm.doc.__onload.offer_letter) {
-				frm.add_custom_button(__("View Offer Letter"), function() {
+				frm.add_custom_button(__("Offer Letter"), function() {
 					frappe.set_route("Form", "Offer Letter", frm.doc.__onload.offer_letter);
-				});
+				}, __("View"));
 			} else {
-				frm.add_custom_button(__("Make Offer Letter"), function() {
+				frm.add_custom_button(__("Offer Letter"), function() {
 					frappe.route_options = {
 						"job_applicant": frm.doc.name,
 						"applicant_name": frm.doc.applicant_name,
 						"designation": frm.doc.job_opening,
 					};
 					new_doc("Offer Letter");
-				});
+				}, __("Make"));
+				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 			}
 		}
 		
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.json b/erpnext/hr/doctype/job_applicant/job_applicant.json
index e1351ef..b9660e2 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.json
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.json
@@ -25,6 +25,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -48,6 +49,7 @@
    "options": "Email", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -71,6 +73,7 @@
    "options": "Open\nReplied\nRejected\nHold", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -92,6 +95,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -116,6 +120,7 @@
    "options": "Job Opening", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -137,6 +142,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -159,29 +165,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "communications", 
-   "fieldtype": "Table", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Communications", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Communication", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -200,7 +184,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:48.722773", 
+ "modified": "2016-01-06 02:36:13.556143", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Job Applicant", 
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py
index b6b76c9..13516b6 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.py
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.py
@@ -80,9 +80,9 @@
 
 
 	def create_log(self, ss_list):
-		log = "<p>No employee for the above selected criteria OR salary slip already created</p>"
+		log = "<p>" + _("No employee for the above selected criteria OR salary slip already created") + "</p>"
 		if ss_list:
-			log = "<b>Salary Slip Created For</b>\
+			log = "<b>" + _("Salary Slip Created") + "</b>\
 			<br><br>%s" % '<br>'.join(self.format_as_links(ss_list))
 		return log
 
@@ -205,4 +205,4 @@
 			'month_start_date': msd,
 			'month_end_date': med,
 			'month_days': month_days
-		})
\ No newline at end of file
+		})
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index 2680b52..5bb00f1 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -22,6 +22,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -48,6 +49,7 @@
    "options": "Employee", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -72,6 +74,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -97,6 +100,7 @@
    "options": "Department", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -122,6 +126,7 @@
    "options": "Designation", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -147,6 +152,7 @@
    "options": "Branch", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -170,6 +176,7 @@
    "options": "Letter Head", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -193,6 +200,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -215,6 +223,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -241,6 +250,7 @@
    "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -267,6 +277,7 @@
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -291,6 +302,7 @@
    "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -315,6 +327,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -339,6 +352,7 @@
    "oldfieldtype": "Float", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -363,6 +377,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -387,6 +402,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -411,6 +427,7 @@
    "oldfieldtype": "Check", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -436,6 +453,7 @@
    "options": "Salary Slip", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -459,6 +477,7 @@
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -482,6 +501,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -494,28 +514,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "html_21", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "<label>Earnings</label>", 
-   "permlevel": 0, 
-   "print_hide": 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, 
    "fieldname": "earnings", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -530,6 +528,7 @@
    "options": "Salary Slip Earning", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -553,6 +552,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -565,28 +565,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "html_24", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "<label>Deductions</label>", 
-   "permlevel": 0, 
-   "print_hide": 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, 
    "fieldname": "deductions", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -601,6 +579,7 @@
    "options": "Salary Slip Deduction", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -624,6 +603,7 @@
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -645,6 +625,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -666,6 +647,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -691,6 +673,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -716,6 +699,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -741,6 +725,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -766,6 +751,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -792,6 +778,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -815,6 +802,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -840,6 +828,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -858,7 +847,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:55.474041", 
+ "modified": "2016-01-04 05:31:35.363767", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Slip", 
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.js b/erpnext/hr/doctype/salary_structure/salary_structure.js
index 995c744..65aac1b 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.js
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.js
@@ -12,8 +12,9 @@
 
 cur_frm.cscript.refresh = function(doc, dt, dn){
 	if((!doc.__islocal) && (doc.is_active == 'Yes')){
-		cur_frm.add_custom_button(__('Make Salary Slip'),
-			cur_frm.cscript['Make Salary Slip'], frappe.boot.doctype_icons["Salary Slip"]);
+		cur_frm.add_custom_button(__('Salary Slip'),
+			cur_frm.cscript['Make Salary Slip'], __("Make"));
+		cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 	}
 }
 
diff --git a/erpnext/hr/report/employee_birthday/employee_birthday.js b/erpnext/hr/report/employee_birthday/employee_birthday.js
index 15a4369..60b69b4 100644
--- a/erpnext/hr/report/employee_birthday/employee_birthday.js
+++ b/erpnext/hr/report/employee_birthday/employee_birthday.js
@@ -16,7 +16,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }
\ No newline at end of file
diff --git a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.js b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.js
index 5df4554..8c258e1 100644
--- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.js
+++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.js
@@ -23,7 +23,7 @@
 			"fieldtype": "Link",
 			"options": "Company",
 			"reqd": 1,
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }
\ No newline at end of file
diff --git a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
index 9fed438..8f0db50 100644
--- a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
+++ b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
@@ -29,7 +29,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }
\ No newline at end of file
diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js
index e209f33..6d9111f 100644
--- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js
+++ b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js
@@ -29,7 +29,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_settings/hub_settings.js b/erpnext/hub_node/doctype/hub_settings/hub_settings.js
index 190b9bb..95b6d62 100644
--- a/erpnext/hub_node/doctype/hub_settings/hub_settings.js
+++ b/erpnext/hub_node/doctype/hub_settings/hub_settings.js
@@ -1,9 +1,9 @@
 frappe.ui.form.on("Hub Settings", "onload", function(frm) {
 	if(!frm.doc.seller_country) {
-		frm.set_value("seller_country", frappe.defaults.get_default("country"));
+		frm.set_value("seller_country", frappe.defaults.get_default("Country"));
 	}
 	if(!frm.doc.seller_name) {
-		frm.set_value("seller_name", frappe.defaults.get_default("company"));
+		frm.set_value("seller_name", frappe.defaults.get_default("Company"));
 	}
 });
 
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 4b7f7f2..6cfbc99 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -4,17 +4,15 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.utils import cint, cstr, flt
-
 from frappe import _
 from frappe.model.document import Document
 
 from operator import itemgetter
 
 class BOM(Document):
-
 	def autoname(self):
 		last_name = frappe.db.sql("""select max(name) from `tabBOM`
-			where name like "BOM/%s/%%" """ % frappe.db.escape(self.item))
+			where name like "BOM/{0}/%%" and item=%s""".format(frappe.db.escape(self.item)), self.item)
 		if last_name:
 			idx = cint(cstr(last_name[0][0]).split('/')[-1].split('-')[0]) + 1
 		else:
@@ -198,6 +196,9 @@
 			self.uom = ret[1]
 			self.item_name= ret[2]
 
+		if not self.quantity:
+			frappe.throw(_("Quantity should be greater than 0"))
+
 	def validate_materials(self):
 		""" Validate raw material entries """
 		if not self.get('items'):
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index 7349447..ad8b776 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -61,38 +61,35 @@
 	set_custom_buttons: function(frm) {
 		var doc = frm.doc;
 		if (doc.docstatus === 1) {
-
-			if (flt(doc.material_transferred_for_manufacturing) < flt(doc.qty)) {
-				frm.add_custom_button(__('Transfer Materials for Manufacture'),
-					cur_frm.cscript['Transfer Raw Materials'], frappe.boot.doctype_icons["Stock Entry"]);
-			}
-
-			if (flt(doc.produced_qty) < flt(doc.material_transferred_for_manufacturing)) {
-				frm.add_custom_button(__('Update Finished Goods'),
-					cur_frm.cscript['Update Finished Goods'], frappe.boot.doctype_icons["Stock Entry"]);
-			}
-
-			frm.add_custom_button(__("Show Stock Entries"), function() {
+			frm.add_custom_button(__("Stock Entries"), function() {
 				frappe.route_options = {
 					production_order: frm.doc.name
 				}
 				frappe.set_route("List", "Stock Entry");
-			});
+			}, __("View"));
 
 			if (doc.status != 'Stopped' && doc.status != 'Completed') {
-				frm.add_custom_button(__('Stop'), cur_frm.cscript['Stop Production Order'],
-					"icon-exclamation", "btn-default");
+				frm.add_custom_button(__('Stop'), cur_frm.cscript['Stop Production Order'], __("Status"));
 			} else if (doc.status == 'Stopped') {
-				frm.add_custom_button(__('Re-open'), cur_frm.cscript['Unstop Production Order'],
-				"icon-check", "btn-default");
+				frm.add_custom_button(__('Re-open'), cur_frm.cscript['Unstop Production Order'], __("Status"));
 			}
 
 			// opertions
 			if ((doc.operations || []).length) {
-				frm.add_custom_button(__('Show Time Logs'), function() {
+				frm.add_custom_button(__('Time Logs'), function() {
 					frappe.route_options = {"production_order": frm.doc.name};
 					frappe.set_route("List", "Time Log");
-				});
+				}, __("View"));
+			}
+
+			if (flt(doc.material_transferred_for_manufacturing) < flt(doc.qty)) {
+				frm.add_custom_button(__('Transfer Materials for Manufacture'),
+					cur_frm.cscript['Transfer Raw Materials'], __("Stock Entry"));
+			}
+
+			if (flt(doc.produced_qty) < flt(doc.material_transferred_for_manufacturing)) {
+				frm.add_custom_button(__('Update Finished Goods'),
+					cur_frm.cscript['Update Finished Goods'], __("Stock Entry"));
 			}
 		}
 
@@ -256,11 +253,10 @@
 
 cur_frm.fields_dict['production_item'].get_query = function(doc) {
 	return {
-		filters:[
-			['Item', 'is_pro_applicable', '=', 1],
-			['Item', 'has_variants', '=', 0],
-			['Item', 'end_of_life', '>=', frappe.datetime.nowdate()]
-		]
+		query: "erpnext.controllers.queries.item_query",
+		filters:{
+			'is_pro_applicable': 1,
+		}
 	}
 }
 
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
index 212acaa..15c4245 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
@@ -4,7 +4,7 @@
 frappe.require("assets/erpnext/js/utils.js");
 
 cur_frm.cscript.onload = function(doc, cdt, cdn) {
-	cur_frm.set_value("company", frappe.defaults.get_user_default("company"))
+	cur_frm.set_value("company", frappe.defaults.get_user_default("Company"))
 	cur_frm.set_value("use_multi_level_bom", 1)
 }
 
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py
index dae01df..b939803 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/workstation.py
@@ -45,7 +45,7 @@
 
 @frappe.whitelist()
 def get_default_holiday_list():
-	return frappe.db.get_value("Company", frappe.defaults.get_user_default("company"), "default_holiday_list")
+	return frappe.db.get_value("Company", frappe.defaults.get_user_default("Company"), "default_holiday_list")
 
 def check_if_within_operating_hours(workstation, operation, from_datetime, to_datetime):
 	if from_datetime and to_datetime:
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 612a447..71aed12 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -20,6 +20,7 @@
 execute:frappe.reload_doc('accounts', 'doctype', 'pos_setting') # 2014-01-29
 execute:frappe.reload_doc('selling', 'doctype', 'customer') # 2014-01-29
 execute:frappe.reload_doc('buying', 'doctype', 'supplier') # 2014-01-29
+execute:frappe.reload_doctype('Item')
 erpnext.patches.v4_0.map_charge_to_taxes_and_charges
 execute:frappe.reload_doc('support', 'doctype', 'newsletter') # 2014-01-31
 execute:frappe.reload_doc('hr', 'doctype', 'employee') # 2014-02-03
@@ -240,3 +241,5 @@
 erpnext.patches.v6_10.fix_delivery_status_of_drop_ship_item #2015-12-08
 erpnext.patches.v5_8.tax_rule #2015-12-08
 erpnext.patches.v6_12.set_overdue_tasks
+erpnext.patches.v6_16.update_billing_status_in_dn_and_pr
+erpnext.patches.v6_16.create_manufacturer_records
\ No newline at end of file
diff --git a/erpnext/patches/v4_2/repost_reserved_qty.py b/erpnext/patches/v4_2/repost_reserved_qty.py
index 74f4b79..4570570 100644
--- a/erpnext/patches/v4_2/repost_reserved_qty.py
+++ b/erpnext/patches/v4_2/repost_reserved_qty.py
@@ -6,16 +6,18 @@
 from erpnext.stock.stock_balance import update_bin_qty, get_reserved_qty
 
 def execute():
+	frappe.reload_doctype("Sales Order Item")
+
 	repost_for = frappe.db.sql("""
-		select 
-			distinct item_code, warehouse 
-		from 
+		select
+			distinct item_code, warehouse
+		from
 			(
 				(
-					select distinct item_code, warehouse 
+					select distinct item_code, warehouse
 								from `tabSales Order Item` where docstatus=1
 				) UNION (
-					select distinct item_code, warehouse 
+					select distinct item_code, warehouse
 					from `tabPacked Item` where docstatus=1 and parenttype='Sales Order'
 				)
 			) so_item
@@ -27,9 +29,9 @@
 			update_bin_qty(item_code, warehouse, {
 				"reserved_qty": get_reserved_qty(item_code, warehouse)
 			})
-			
-	frappe.db.sql("""delete from tabBin 
+
+	frappe.db.sql("""delete from tabBin
 		where exists(
 			select name from tabItem where name=tabBin.item_code and ifnull(is_stock_item, 0) = 0
 		)
-	""")
\ No newline at end of file
+	""")
diff --git a/erpnext/patches/v6_10/fix_billed_amount_in_drop_ship_po.py b/erpnext/patches/v6_10/fix_billed_amount_in_drop_ship_po.py
index 4aecaa7..d7f72b5 100644
--- a/erpnext/patches/v6_10/fix_billed_amount_in_drop_ship_po.py
+++ b/erpnext/patches/v6_10/fix_billed_amount_in_drop_ship_po.py
@@ -13,6 +13,6 @@
 			where purchase_order=%s and docstatus=1""", po[0])
 		if invoices:
 			for inv in invoices:
-				frappe.get_doc("Purchase Invoice", inv[0]).update_qty(change_modified=False)
+				frappe.get_doc("Purchase Invoice", inv[0]).update_qty(update_modified=False)
 		else:
 			frappe.db.sql("""update `tabPurchase Order` set per_billed=0 where name=%s""", po[0])
\ No newline at end of file
diff --git a/erpnext/patches/v6_10/fix_ordered_received_billed.py b/erpnext/patches/v6_10/fix_ordered_received_billed.py
index ed4112e..c81a20e 100644
--- a/erpnext/patches/v6_10/fix_ordered_received_billed.py
+++ b/erpnext/patches/v6_10/fix_ordered_received_billed.py
@@ -14,4 +14,4 @@
 			{"patch_date": not_null_patch_date}):
 
 			doc = frappe.get_doc(doctype, name)
-			doc.update_qty(change_modified=False)
+			doc.update_qty(update_modified=False)
diff --git a/erpnext/patches/v6_16/__init__.py b/erpnext/patches/v6_16/__init__.py
new file mode 100644
index 0000000..baffc48
--- /dev/null
+++ b/erpnext/patches/v6_16/__init__.py
@@ -0,0 +1 @@
+from __future__ import unicode_literals
diff --git a/erpnext/patches/v6_16/create_manufacturer_records.py b/erpnext/patches/v6_16/create_manufacturer_records.py
new file mode 100644
index 0000000..5ae65f0
--- /dev/null
+++ b/erpnext/patches/v6_16/create_manufacturer_records.py
@@ -0,0 +1,19 @@
+# Copyright (c) 2016, 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
+
+def execute():
+	frappe.reload_doc("stock", "doctype", "manufacturer")
+	frappe.reload_doctype("Item")
+	
+	for d in frappe.db.sql("""select distinct manufacturer from tabItem 
+		where ifnull(manufacturer, '') != '' and disabled=0"""):
+			manufacturer_name = cstr(d[0]).strip()
+			if manufacturer_name and not frappe.db.exists("Manufacturer", manufacturer_name):
+				man = frappe.new_doc("Manufacturer")
+				man.short_name = manufacturer_name
+				man.full_name = manufacturer_name
+				man.save()
diff --git a/erpnext/patches/v6_16/update_billing_status_in_dn_and_pr.py b/erpnext/patches/v6_16/update_billing_status_in_dn_and_pr.py
new file mode 100644
index 0000000..b660d39
--- /dev/null
+++ b/erpnext/patches/v6_16/update_billing_status_in_dn_and_pr.py
@@ -0,0 +1,42 @@
+# Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	for dt in ("Delivery Note", "Purchase Receipt"):
+		frappe.reload_doctype(dt)
+		frappe.reload_doctype(dt + " Item")
+
+	# Update billed_amt in DN and PR which are not against any order
+	for d in frappe.db.sql("""select name from `tabDelivery Note Item` item
+		where (so_detail is null or so_detail = '') and docstatus=1""", as_dict=1):
+
+		billed_amt = frappe.db.sql("""select sum(amount) from `tabSales Invoice Item`
+			where dn_detail=%s and docstatus=1""", d.name)
+		billed_amt = billed_amt and billed_amt[0][0] or 0
+		frappe.db.set_value("Delivery Note Item", d.name, "billed_amt", billed_amt, update_modified=False)
+
+		frappe.db.commit()
+
+	# Update billed_amt in DN and PR which are not against any order
+	for d in frappe.db.sql("""select name from `tabPurchase Receipt Item` item
+		where (prevdoc_detail_docname is null or prevdoc_detail_docname = '') and docstatus=1""", as_dict=1):
+
+		billed_amt = frappe.db.sql("""select sum(amount) from `tabPurchase Invoice Item`
+			where pr_detail=%s and docstatus=1""", d.name)
+		billed_amt = billed_amt and billed_amt[0][0] or 0
+		frappe.db.set_value("Purchase Receipt Item", d.name, "billed_amt", billed_amt, update_modified=False)
+
+		frappe.db.commit()
+
+	for dt in ("Delivery Note", "Purchase Receipt"):
+		# Update billed amt which are against order or invoice
+		# Update billing status for all
+		for d in frappe.db.sql("select name from `tab{0}` where docstatus=1".format(dt), as_dict=1):
+			doc = frappe.get_doc(dt, d.name)
+			doc.update_billing_status(update_modified=False)
+			doc.set_status(update=True, update_modified=False)
+
+			frappe.db.commit()
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index 8c14347..b33386b 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -30,24 +30,24 @@
 			cur_frm.add_custom_button(__("Gantt Chart"), function() {
 				frappe.route_options = {"project": doc.name, "start": doc.expected_start_date, "end": doc.expected_end_date};
 				frappe.set_route("Gantt", "Task");
-			}, "icon-tasks", true);
+			}, __("View"), true);
 			cur_frm.add_custom_button(__("Tasks"), function() {
 				frappe.route_options = {"project": doc.name}
 				frappe.set_route("List", "Task");
-			}, "icon-list", true);
+			}, __("View"), true);
 		}
 		if(frappe.model.can_read("Time Log")) {
 			cur_frm.add_custom_button(__("Time Logs"), function() {
 				frappe.route_options = {"project": doc.name}
 				frappe.set_route("List", "Time Log");
-			}, "icon-list", true);
+			}, __("View"), true);
 		}
 
 		if(frappe.model.can_read("Expense Claim")) {
 			cur_frm.add_custom_button(__("Expense Claims"), function() {
 				frappe.route_options = {"project": doc.name}
 				frappe.set_route("List", "Expense Claim");
-			}, "icon-list", true);
+			}, __("View"), true);
 		}
 	}
 }
diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js
index 871d14d..a0bbe26 100644
--- a/erpnext/projects/doctype/task/task.js
+++ b/erpnext/projects/doctype/task/task.js
@@ -20,26 +20,26 @@
 				frm.add_custom_button(__("Time Logs"), function() {
 					frappe.route_options = {"project": doc.project, "task": doc.name}
 					frappe.set_route("List", "Time Log");
-				}, "icon-list", true);
+				}, __("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");
-				}, "icon-list", true);
+				}, __("View"), true);
 			}
 
 			if(frm.perm[0].write) {
 				if(frm.doc.status!=="Closed" && frm.doc.status!=="Cancelled") {
-					frm.add_custom_button("Close", function() {
+					frm.add_custom_button(__("Close"), function() {
 						frm.set_value("status", "Closed");
 						frm.save();
-					});
+					}, __("Status"));
 				} else {
-					frm.add_custom_button("Reopen", function() {
+					frm.add_custom_button(__("Reopen"), function() {
 						frm.set_value("status", "Open");
 						frm.save();
-					});
+					}, __("Status"));
 				}
 			}
 		}
diff --git a/erpnext/projects/doctype/time_log/test_time_log.py b/erpnext/projects/doctype/time_log/test_time_log.py
index 1894e37..8d5694f 100644
--- a/erpnext/projects/doctype/time_log/test_time_log.py
+++ b/erpnext/projects/doctype/time_log/test_time_log.py
@@ -105,7 +105,7 @@
 		task_name = frappe.db.get_value("Task",{"project": "_Test Project 1"})
 
 		time_log = make_time_log_test_record(employee="_T-Employee-0002", hours=2,
-			task=task_name)
+			task=task_name, simulate=1)
 		self.assertEqual(time_log.costing_rate, 50)
 		self.assertEqual(time_log.costing_amount, 100)
 		self.assertEqual(time_log.billing_rate, 100)
@@ -115,7 +115,7 @@
 		self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_billing_amount"), 200)
 
 		time_log2 = make_time_log_test_record(employee="_T-Employee-0002",
-			hours=2, task= task_name, from_time = now_datetime() + datetime.timedelta(hours= 3))
+			hours=2, task= task_name, from_time = now_datetime() + datetime.timedelta(hours= 3), simulate=1)
 		self.assertEqual(frappe.db.get_value("Task", task_name, "total_billing_amount"), 400)
 		self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_billing_amount"), 400)
 
diff --git a/erpnext/projects/doctype/time_log/time_log.js b/erpnext/projects/doctype/time_log/time_log.js
index 7b2faf9..7648a53 100644
--- a/erpnext/projects/doctype/time_log/time_log.js
+++ b/erpnext/projects/doctype/time_log/time_log.js
@@ -46,19 +46,19 @@
 frappe.ui.form.on("Time Log", "to_time", function(frm) {
 	if(frm._setting_hours) return;
 	frm.set_value("hours", moment(cur_frm.doc.to_time).diff(moment(cur_frm.doc.from_time),
-		"minutes") / 60);
+		"seconds") / 3600);
 
 });
 
 var calculate_cost = function(frm) {
 	frm.set_value("costing_amount", frm.doc.costing_rate * frm.doc.hours);
 	if (frm.doc.billable==1){
-		frm.set_value("billing_amount", frm.doc.billing_rate * frm.doc.hours);
+		frm.set_value("billing_amount", (frm.doc.billing_rate * frm.doc.hours) + frm.doc.additional_cost);
 	}
 }
 
 var get_activity_cost = function(frm) {
-	if (frm.doc.employee && frm.doc.activity_type){
+	if (frm.doc.activity_type){
 		return frappe.call({
 			method: "erpnext.projects.doctype.time_log.time_log.get_activity_cost",
 			args: {
@@ -80,6 +80,10 @@
 	calculate_cost(frm);
 });
 
+frappe.ui.form.on("Time Log", "additional_cost", function(frm) {
+	calculate_cost(frm);
+});
+
 frappe.ui.form.on("Time Log", "activity_type", function(frm) {
 	get_activity_cost(frm);
 });
@@ -94,6 +98,7 @@
 	}
 	else {
 		frm.set_value("billing_amount", 0);
+		frm.set_value("additional_cost", 0);
 	}
 });
 
diff --git a/erpnext/projects/doctype/time_log/time_log.json b/erpnext/projects/doctype/time_log/time_log.json
index 4490f97..88eae1e 100644
--- a/erpnext/projects/doctype/time_log/time_log.json
+++ b/erpnext/projects/doctype/time_log/time_log.json
@@ -1,934 +1,950 @@
 {
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "creation": "2013-04-03 16:38:41", 
- "custom": 0, 
- "description": "Log of Activities performed by users against Tasks that can be used for tracking time, billing.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
+ "allow_copy": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "naming_series:",
+ "creation": "2013-04-03 16:38:41",
+ "custom": 0,
+ "description": "Log of Activities performed by users against Tasks that can be used for tracking time, billing.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Series", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "TL-", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "depends_on": "eval:!doc.for_manufacturing",
+   "fieldname": "activity_type",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Activity Type",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Activity Type",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Series",
+   "length": 0,
+   "no_copy": 0,
+   "options": "TL-",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Draft\nSubmitted\nBatched for Billing\nBilled\nCancelled", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "",
+   "fieldname": "project",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Project",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Project",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "section_break_4", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "",
+   "fieldname": "task",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Task",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Task",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "from_time", 
-   "fieldtype": "Datetime", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "From Time", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Status",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Draft\nSubmitted\nBatched for Billing\nBilled\nCancelled",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "0", 
-   "fieldname": "hours", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Hours", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break_2",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "to_time", 
-   "fieldtype": "Datetime", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "To Time", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "from_time",
+   "fieldtype": "Datetime",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "From Time",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_8", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "default": "0",
+   "fieldname": "hours",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Hours",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:!doc.for_manufacturing", 
-   "fieldname": "activity_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Activity Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Activity Type", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "to_time",
+   "fieldtype": "Datetime",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "To Time",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "project", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Project", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Project", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "billable",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Billable",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "task", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Task", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Task", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "section_break_7",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "section_break_12", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "note",
+   "fieldtype": "Text Editor",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Note",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "user", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "User", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "User", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "section_break_12",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "employee", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Employee", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Employee", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "user",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 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,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "employee",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 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,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "for_manufacturing", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "For Manufacturing", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "billable", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Billable", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "for_manufacturing",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "For Manufacturing",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.for_manufacturing", 
-   "fieldname": "section_break_11", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "eval:doc.for_manufacturing",
+   "fieldname": "section_break_11",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "production_order", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Production Order", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Production Order", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "",
+   "fieldname": "production_order",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Production Order",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Production Order",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "operation", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Operation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Operation", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "",
+   "fieldname": "operation",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Operation",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Operation",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "operation_id", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Operation ID", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "",
+   "fieldname": "operation_id",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Operation ID",
+   "length": 0,
+   "no_copy": 0,
+   "options": "",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_14", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break_14",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "workstation", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Workstation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Workstation", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "",
+   "fieldname": "workstation",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Workstation",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Workstation",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "description": "Operation completed for how many finished goods?", 
-   "fieldname": "completed_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Completed Qty", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "",
+   "description": "Operation completed for how many finished goods?",
+   "fieldname": "completed_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Completed Qty",
+   "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
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "",
+   "fieldname": "section_break_24",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "note", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Note", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "default": "0",
+   "description": "",
+   "fieldname": "costing_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Costing Rate based on Activity Type (per hour)",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "section_break_24", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "default": "0",
+   "fieldname": "costing_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Costing Amount",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "0", 
-   "description": "", 
-   "fieldname": "costing_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Costing Rate based on Activity Type (per hour)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break_25",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "0", 
-   "fieldname": "costing_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Costing Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "default": "0",
+   "description": "",
+   "fieldname": "billing_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Billing Rate based on Activity Type (per hour)",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_25", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "eval:doc.billable",
+   "fieldname": "additional_cost",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Additional Cost",
+   "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
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "0", 
-   "description": "", 
-   "fieldname": "billing_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Billing Rate based on Activity Type (per hour)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "default": "0",
+   "description": "Will be updated only if Time Log is 'Billable'",
+   "fieldname": "billing_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Billing Amount",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "0", 
-   "description": "Will be updated only if Time Log is 'Billable'", 
-   "fieldname": "billing_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Billing Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "section_break_29",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "section_break_29", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "description": "Will be updated when batched.",
+   "fieldname": "time_log_batch",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Time Log Batch",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Time Log Batch",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "Will be updated when batched.", 
-   "fieldname": "time_log_batch", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Time Log Batch", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Time Log Batch", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "description": "Will be updated when billed.",
+   "fieldname": "sales_invoice",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Sales Invoice",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Sales Invoice",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "Will be updated when billed.", 
-   "fieldname": "sales_invoice", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sales Invoice", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Sales Invoice", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Amended From",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Time Log",
+   "permlevel": 1,
+   "print_hide": 1,
+   "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, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Time Log", 
-   "permlevel": 1, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Title", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Title",
+   "length": 0,
+   "no_copy": 1,
+   "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, 
- "icon": "icon-time", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2015-11-16 06:29:59.410559", 
- "modified_by": "Administrator", 
- "module": "Projects", 
- "name": "Time Log", 
- "owner": "Administrator", 
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "icon-time",
+ "idx": 1,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2016-01-14 04:40:47.439032",
+ "modified_by": "Administrator",
+ "module": "Projects",
+ "name": "Time Log",
+ "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": "Projects User", 
-   "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": "Projects User",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 0, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Projects Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "apply_user_permissions": 0,
+   "cancel": 1,
+   "create": 0,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Projects Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 1,
    "write": 1
   }
- ], 
- "read_only": 0, 
- "read_only_onload": 0, 
+ ],
+ "read_only": 0,
+ "read_only_onload": 0,
  "title_field": "title"
-}
\ No newline at end of file
+}
diff --git a/erpnext/projects/doctype/time_log/time_log.py b/erpnext/projects/doctype/time_log/time_log.py
index cd20036..6763209 100644
--- a/erpnext/projects/doctype/time_log/time_log.py
+++ b/erpnext/projects/doctype/time_log/time_log.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import cstr, flt, get_datetime, get_time, getdate
+from frappe.utils import flt, get_datetime, get_time, getdate
 from dateutil.relativedelta import relativedelta
 from erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings import get_mins_between_operations
 
@@ -93,14 +93,12 @@
 				(%(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 ifnull(task, "")=%(task)s
 			and docstatus < 2""".format(fieldname),
 			{
 				"val": self.get(fieldname),
 				"from_time": self.from_time,
 				"to_time": self.to_time,
-				"name": self.name or "No Name",
-				"task": cstr(self.task)
+				"name": self.name or "No Name"
 			}, as_dict=True)
 
 		return existing[0] if existing else None
@@ -236,6 +234,9 @@
 				self.billing_amount = self.billing_rate * self.hours
 			else:
 				self.billing_amount = 0
+		
+		if self.additional_cost and self.billable:
+			self.billing_amount += self.additional_cost
 
 	def update_task_and_project(self):
 		"""Update costing rate in Task or Project if either is set"""
diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.js b/erpnext/projects/doctype/time_log_batch/time_log_batch.js
index 6b5f080..b1c431c 100644
--- a/erpnext/projects/doctype/time_log_batch/time_log_batch.js
+++ b/erpnext/projects/doctype/time_log_batch/time_log_batch.js
@@ -37,14 +37,31 @@
 	}
 });
 
-frappe.ui.form.on("Time Log Batch Detail", "time_log", function(frm, cdt, cdn) {
+frappe.ui.form.on("Time Log Batch Detail", "time_log", function(frm) {
+	calculate_time_and_amount(frm);
+});
+
+frappe.ui.form.on("Time Log Batch Detail", "time_logs_remove", function(frm) {
+	calculate_time_and_amount(frm);
+});
+
+frappe.ui.form.on("Time Log Batch", "onload", function(frm) {
+	if (frm.doc.__islocal && frm.doc.time_logs) {
+		calculate_time_and_amount(frm);
+	}
+});
+
+var calculate_time_and_amount = function(frm) {
 	var tl = frm.doc.time_logs || [];
 	total_hr = 0;
 	total_amt = 0;
 	for(var i=0; i<tl.length; i++) {
-		total_hr += tl[i].hours;
-		total_amt += tl[i].billing_amount;
+		if (tl[i].time_log) {
+			total_hr += tl[i].hours;
+			total_amt += tl[i].billing_amount;
+		}
 	}
 	cur_frm.set_value("total_hours", total_hr);
 	cur_frm.set_value("total_billing_amount", total_amt);
-});
\ No newline at end of file
+	
+}
\ No newline at end of file
diff --git a/erpnext/public/css/erpnext.css b/erpnext/public/css/erpnext.css
index 3c286b1..621efb5 100644
--- a/erpnext/public/css/erpnext.css
+++ b/erpnext/public/css/erpnext.css
@@ -101,3 +101,9 @@
   margin-right: 0px;
   margin-top: -3px;
 }
+.pos .discount-amount-area .discount-field-col {
+  padding-left: 0px;
+}
+.pos .discount-amount-area .input-group {
+  margin-top: 2px;
+}
diff --git a/erpnext/public/js/controllers/stock_controller.js b/erpnext/public/js/controllers/stock_controller.js
index 9df7d0f..a360d91 100644
--- a/erpnext/public/js/controllers/stock_controller.js
+++ b/erpnext/public/js/controllers/stock_controller.js
@@ -29,7 +29,7 @@
 					company: me.frm.doc.company
 				};
 				frappe.set_route("query-report", "Stock Ledger");
-			}, "icon-bar-chart");
+			}, __("View"));
 		}
 
 	},
@@ -46,7 +46,7 @@
 					group_by_voucher: false
 				};
 				frappe.set_route("query-report", "General Ledger");
-			}, "icon-table");
+			}, __("View"));
 		}
 	}
 });
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index a8cdf83..a2ee1b7 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -392,10 +392,15 @@
 
 		// rounded totals
 		if(frappe.meta.get_docfield(this.frm.doc.doctype, "rounded_total", this.frm.doc.name)) {
-			this.frm.doc.rounded_total = Math.round(this.frm.doc.grand_total);
+			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)) {
-			this.frm.doc.base_rounded_total = Math.round(this.frm.doc.base_grand_total);
+			var company_currency = this.get_company_currency();
+			
+			this.frm.doc.base_rounded_total = 
+				round_based_on_smallest_currency_fraction(this.frm.doc.base_grand_total, 
+					company_currency, precision("base_rounded_total"));
 		}
 	},
 
@@ -504,8 +509,11 @@
 			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((this.frm.doc.base_grand_total - this.frm.doc.total_advance 
-				- this.frm.doc.base_write_off_amount), precision("base_grand_total"));
+			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") {
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 49f47e0..e5e0938 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -133,14 +133,14 @@
 		var me = this;
 		if (in_list(["Purchase Invoice", "Sales Invoice"], this.frm.doctype)) {
 			if(this.frm.doc.outstanding_amount !== this.frm.doc.base_grand_total) {
-				this.frm.add_custom_button(__("Show Payments"), function() {
+				this.frm.add_custom_button(__("Payments"), function() {
 					frappe.route_options = {
 						"Journal Entry Account.reference_type": me.frm.doc.doctype,
 						"Journal Entry Account.reference_name": me.frm.doc.name
 					};
 
 					frappe.set_route("List", "Journal Entry");
-				});
+				}, __("View"));
 			}
 		}
 	},
@@ -489,7 +489,7 @@
 				if(docfield) {
 					var label = __(docfield.label || "").replace(/\([^\)]*\)/g, "");
 					field_label_map[grid_doctype + "-" + fname] =
-						label.trim() + " (" + currency + ")";
+						label.trim() + " (" + __(currency) + ")";
 				}
 			});
 		}
@@ -559,7 +559,7 @@
 	apply_pricing_rule: function(item, calculate_taxes_and_totals) {
 		var me = this;
 		var args = this._get_args(item);
-		if (!(args.item_list && args.item_list.length)) {
+		if (!(args.items && args.items.length)) {
 			if(calculate_taxes_and_totals) me.calculate_taxes_and_totals();
 			return;
 		}
@@ -579,7 +579,7 @@
 	_get_args: function(item) {
 		var me = this;
 		return {
-			"item_list": this._get_item_list(item),
+			"items": this._get_item_list(item),
 			"customer": me.frm.doc.customer,
 			"customer_group": me.frm.doc.customer_group,
 			"territory": me.frm.doc.territory,
@@ -595,8 +595,8 @@
 			"campaign": me.frm.doc.campaign,
 			"sales_partner": me.frm.doc.sales_partner,
 			"ignore_pricing_rule": me.frm.doc.ignore_pricing_rule,
-			"parenttype": me.frm.doc.doctype,
-			"parent": me.frm.doc.name
+			"doctype": me.frm.doc.doctype,
+			"name": me.frm.doc.name
 		};
 	},
 
@@ -654,7 +654,7 @@
 	apply_price_list: function(item) {
 		var me = this;
 		var args = this._get_args(item);
-		if (!((args.item_list && args.item_list.length) || args.price_list)) {
+		if (!((args.items && args.items.length) || args.price_list)) {
 			return;
 		}
 
@@ -668,7 +668,7 @@
 					me.frm.set_value("plc_conversion_rate", r.message.parent.plc_conversion_rate);
 					me.in_apply_price_list = false;
 
-					if(args.item_list.length) {
+					if(args.items.length) {
 						me._set_values_for_item_list(r.message.children);
 					}
 				}
@@ -865,12 +865,48 @@
 })
 
 frappe.ui.form.on(cur_frm.doctype, "apply_discount_on", function(frm) {
-	cur_frm.cscript.calculate_taxes_and_totals();
+	if(frm.doc.additional_discount_percentage) {
+		frm.trigger("additional_discount_percentage");
+	} else {
+		cur_frm.cscript.calculate_taxes_and_totals();
+	}
 })
 
+frappe.ui.form.on(cur_frm.doctype, "additional_discount_percentage", function(frm) {
+	if (frm.via_discount_amount) {
+		return;
+	}
+
+	if(!frm.doc.apply_discount_on) {
+		frappe.msgprint(__("Please set 'Apply Additional Discount On'"));
+		return
+	}
+
+	frm.via_discount_percentage = true;
+
+	if(frm.doc.additional_discount_percentage && frm.doc.discount_amount) {
+		// Reset discount amount and net / grand total
+		frm.set_value("discount_amount", 0);
+	}
+
+	var total = flt(frm.doc[frappe.model.scrub(frm.doc.apply_discount_on)]);
+	var discount_amount = flt(total*flt(frm.doc.additional_discount_percentage) / 100,
+		precision("discount_amount"));
+
+	frm.set_value("discount_amount", discount_amount);
+	delete frm.via_discount_percentage;
+});
+
 frappe.ui.form.on(cur_frm.doctype, "discount_amount", function(frm) {
-	cur_frm.cscript.set_dynamic_labels();
-	cur_frm.cscript.calculate_taxes_and_totals();
-})
+	frm.cscript.set_dynamic_labels();
+
+	if (!frm.via_discount_percentage) {
+		frm.via_discount_amount = true;
+		frm.set_value("additional_discount_percentage", 0);
+		delete frm.via_discount_amount;
+	}
+
+	frm.cscript.calculate_taxes_and_totals();
+});
 
 
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index 9a1a05a..206be3c 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -7,7 +7,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company"),
+			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
 		{
@@ -22,7 +22,12 @@
 			"fieldname": "periodicity",
 			"label": __("Periodicity"),
 			"fieldtype": "Select",
-			"options": "Yearly\nHalf-yearly\nQuarterly\nMonthly",
+			"options": [
+				{ "value": "Monthly", "label": __("Monthly") },
+				{ "value": "Quarterly", "label": __("Quarterly") },
+				{ "value": "Half-Yearly", "label": __("Half-Yearly") },
+				{ "value": "Yearly", "label": __("Yearly") }
+			],
 			"default": "Yearly",
 			"reqd": 1
 		}
diff --git a/erpnext/public/js/pos/pos.html b/erpnext/public/js/pos/pos.html
index 1c337f4..d12b9b2 100644
--- a/erpnext/public/js/pos/pos.html
+++ b/erpnext/public/js/pos/pos.html
@@ -25,17 +25,25 @@
 						</div>
                     </div>
                     <div class="row pos-bill-row discount-amount-area">
-                        <div class="col-xs-6"><h6 class="text-muted">{%= __("Discount Amount") %}</h6></div>
-                        <div class="col-xs-6"><input type="text" class="form-control discount-amount text-right"></div>
+                        <div class="col-xs-6"><h6 class="text-muted">{%= __("Discount") %}</h6></div>
+						<div class="col-xs-3 discount-field-col">
+							<div class="input-group input-group-sm">
+								<span class="input-group-addon">%</span>
+								<input type="text" class="form-control discount-percentage text-right">
+							</div>
+						</div>
+                        <div class="col-xs-3 discount-field-col">
+							<div class="input-group input-group-sm">
+								<span class="input-group-addon">{%= get_currency_symbol(currency) %}</span>
+								<input type="text" class="form-control discount-amount text-right"
+							  		placeholder="{%= 0.00 %}">
+							</div>
+						</div>
                     </div>
                     <div class="row pos-bill-row grand-total-area">
                         <div class="col-xs-6"><h6>{%= __("Grand Total") %}</h6></div>
                         <div class="col-xs-6"><h6 class="grand-total text-right"></h6></div>
                     </div>
-                    <!-- <div class="row pos-bill-row paid-amount-area">
-                        <div class="col-xs-6"><h6 class="text-muted">{%= __("Amount Paid") %}</h6></div>
-                        <div class="col-xs-6"><input type="text" class="form-control paid-amount text-right"></div>
-                    </div> -->
     			</div>
     		</div>
     	</div>
diff --git a/erpnext/public/js/pos/pos.js b/erpnext/public/js/pos/pos.js
index 02eeab0..db60025 100644
--- a/erpnext/public/js/pos/pos.js
+++ b/erpnext/public/js/pos/pos.js
@@ -7,7 +7,7 @@
 	init: function(wrapper, frm) {
 		this.wrapper = wrapper;
 		this.frm = frm;
-		this.wrapper.html(frappe.render_template("pos", {}));
+		this.wrapper.html(frappe.render_template("pos", {currency: this.frm.currency}));
 
 		this.check_transaction_type();
 		this.make();
@@ -17,6 +17,11 @@
 			me.refresh();
 		});
 
+		this.wrapper.find('input.discount-percentage').on("change", function() {
+			frappe.model.set_value(me.frm.doctype, me.frm.docname,
+				"additional_discount_percentage", flt(this.value));
+		});
+
 		this.wrapper.find('input.discount-amount').on("change", function() {
 			frappe.model.set_value(me.frm.doctype, me.frm.docname, "discount_amount", flt(this.value));
 		});
@@ -52,10 +57,13 @@
 				"fieldtype": "Link",
 				"options": this.party,
 				"label": this.party,
-				"fieldname": "pos_party",
+				"fieldname": this.party.toLowerCase(),
 				"placeholder": this.party
 			},
 			parent: this.wrapper.find(".party-area"),
+			frm: this.frm,
+			doctype: this.frm.doctype,
+			docname: this.frm.docname,
 			only_input: true,
 		});
 		this.party_field.make_input();
@@ -230,6 +238,7 @@
 	},
 	refresh_fields: function() {
 		this.party_field.set_input(this.frm.doc[this.party.toLowerCase()]);
+		this.wrapper.find('input.discount-percentage').val(this.frm.doc.additional_discount_percentage);
 		this.wrapper.find('input.discount-amount').val(this.frm.doc.discount_amount);
 
 		this.show_items_in_item_cart();
@@ -406,15 +415,15 @@
 				// prefer cash payment!
 				var default_mode = me.frm.doc.mode_of_payment ? me.frm.doc.mode_of_payment :
 					me.modes_of_payment.indexOf(__("Cash"))!==-1 ? __("Cash") : undefined;
-
+					
 				// show payment wizard
 				var dialog = new frappe.ui.Dialog({
 					width: 400,
 					title: 'Payment',
 					fields: [
 						{fieldtype:'Currency',
-							fieldname:'total_amount', label: __('Total Amount'), read_only:1,
-							"default": me.frm.doc.grand_total, read_only: 1},
+							fieldname:'total_amount', label: __('Total Amount'),
+							"default": me.frm.doc.grand_total},
 						{fieldtype:'Select', fieldname:'mode_of_payment',
 							label: __('Mode of Payment'),
 							options: me.modes_of_payment.join('\n'), reqd: 1,
@@ -422,7 +431,19 @@
 						{fieldtype:'Currency', fieldname:'paid_amount', label:__('Amount Paid'),
 							reqd:1, "default": me.frm.doc.grand_total, hidden: 1, change: function() {
 								var values = dialog.get_values();
-								dialog.set_value("change", Math.round(values.paid_amount - values.total_amount));
+								
+								var actual_change = flt(values.paid_amount - values.total_amount, 
+									precision("paid_amount"));
+								
+								if (actual_change > 0) {
+									var rounded_change = 
+										round_based_on_smallest_currency_fraction(actual_change, 
+											me.frm.doc.currency, precision("paid_amount"));
+								} else {
+									var rounded_change = 0;
+								}
+								
+								dialog.set_value("change", rounded_change);
 								dialog.get_input("change").trigger("change");
 
 							}},
@@ -475,7 +496,7 @@
 
 			var paid_amount = flt((flt(values.paid_amount) - flt(values.change)), precision("paid_amount"));
 			me.frm.set_value("paid_amount", paid_amount);
-			
+
 			// specifying writeoff amount here itself, so as to avoid recursion issue
 			me.frm.set_value("write_off_amount", me.frm.doc.grand_total - paid_amount);
 			me.frm.set_value("outstanding_amount", 0);
diff --git a/erpnext/public/js/purchase_trends_filters.js b/erpnext/public/js/purchase_trends_filters.js
index f0654f8..b2d882c 100644
--- a/erpnext/public/js/purchase_trends_filters.js
+++ b/erpnext/public/js/purchase_trends_filters.js
@@ -51,7 +51,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 	];
 }
diff --git a/erpnext/public/js/sales_trends_filters.js b/erpnext/public/js/sales_trends_filters.js
index 0365617..f28e8f7 100644
--- a/erpnext/public/js/sales_trends_filters.js
+++ b/erpnext/public/js/sales_trends_filters.js
@@ -52,7 +52,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 	];
 }
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index ec70bbb..9c6cd03 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -9,94 +9,6 @@
 
 function load_erpnext_slides() {
 	$.extend(erpnext.wiz, {
-		region: {
-			title: __("Region"),
-			icon: "icon-flag",
-			help: __("Select your Country, Time Zone and Currency"),
-			fields: [
-				{ fieldname: "country", label: __("Country"), reqd:1,
-					fieldtype: "Select" },
-				{ fieldname: "timezone", label: __("Time Zone"), reqd:1,
-					fieldtype: "Select" },
-				{ fieldname: "currency", label: __("Currency"), reqd:1,
-					fieldtype: "Select" },
-			],
-
-			onload: function(slide) {
-				frappe.call({
-					method:"frappe.geo.country_info.get_country_timezone_info",
-					callback: function(data) {
-						erpnext.wiz.region.data = data.message;
-						erpnext.wiz.region.setup_fields(slide);
-						erpnext.wiz.region.bind_events(slide);
-					}
-				});
-			},
-			css_class: "single-column",
-			setup_fields: function(slide) {
-				var data = erpnext.wiz.region.data;
-
-				slide.get_input("country").empty()
-					.add_options([""].concat(keys(data.country_info).sort()));
-
-				slide.get_input("currency").empty()
-					.add_options(frappe.utils.unique([""].concat($.map(data.country_info,
-						function(opts, country) { return opts.currency; }))).sort());
-
-				slide.get_input("timezone").empty()
-					.add_options([""].concat(data.all_timezones));
-
-				if (data.default_country) {
-					slide.set_input("country", data.default_country);
-				}
-			},
-
-			bind_events: function(slide) {
-				slide.get_input("country").on("change", function() {
-					var country = slide.get_input("country").val();
-					var $timezone = slide.get_input("timezone");
-					var data = erpnext.wiz.region.data;
-
-					$timezone.empty();
-
-					// add country specific timezones first
-					if(country) {
-						var timezone_list = data.country_info[country].timezones || [];
-						$timezone.add_options(timezone_list.sort());
-						slide.get_field("currency").set_input(data.country_info[country].currency);
-						slide.get_field("currency").$input.trigger("change");
-					}
-
-					// add all timezones at the end, so that user has the option to change it to any timezone
-					$timezone.add_options([""].concat(data.all_timezones));
-
-					slide.get_field("timezone").set_input($timezone.val());
-
-					// temporarily set date format
-					frappe.boot.sysdefaults.date_format = (data.country_info[country].date_format
-						|| "dd-mm-yyyy");
-				});
-
-				slide.get_input("currency").on("change", function() {
-					var currency = slide.get_input("currency").val();
-					if (!currency) return;
-					frappe.model.with_doc("Currency", currency, function() {
-						frappe.provide("locals.:Currency." + currency);
-						var currency_doc = frappe.model.get_doc("Currency", currency);
-						var number_format = currency_doc.number_format;
-						if (number_format==="#.###") {
-							number_format = "#.###,##";
-						} else if (number_format==="#,###") {
-							number_format = "#,###.##"
-						}
-
-						frappe.boot.sysdefaults.number_format = number_format;
-						locals[":Currency"][currency] = $.extend({}, currency_doc);
-					});
-				});
-			}
-		},
-
 		user: {
 			title: __("The First User: You"),
 			icon: "icon-user",
diff --git a/erpnext/public/js/shopping_cart.js b/erpnext/public/js/shopping_cart.js
index d437d74..b667177 100644
--- a/erpnext/public/js/shopping_cart.js
+++ b/erpnext/public/js/shopping_cart.js
@@ -4,13 +4,12 @@
 // shopping cart
 frappe.provide("shopping_cart");
 
-$(function() {
+frappe.ready(function() {
 	// update user
 	if(full_name) {
 		$('.navbar li[data-label="User"] a')
 			.html('<i class="icon-fixed-width icon-user"></i> ' + full_name);
 	}
-
 	// update login
 	shopping_cart.set_cart_count();
 });
@@ -33,10 +32,9 @@
 				},
 				btn: opts.btn,
 				callback: function(r) {
+					shopping_cart.set_cart_count();
 					if(opts.callback)
 						opts.callback(r);
-
-					shopping_cart.set_cart_count();
 				}
 			});
 		}
@@ -44,13 +42,29 @@
 
 	set_cart_count: function() {
 		var cart_count = getCookie("cart_count");
-		var $cart = $('.dropdown [data-label="Cart"]');
-		var $badge = $cart.find(".badge");
+		
+		if($(".cart-icon").length == 0) {
+			$('<div class="cart-icon" style="float:right;padding-top:10px;">\
+				<a href="/cart" class="text-muted small">\
+					<div class="btn btn-primary cart"> Cart\
+						<span id="cart-count" class="label" style="padding-left:5px;margin-left:5px;\
+								margin-right:-5px;background-color: #2905E2;">\
+						</span>\
+					</div>\
+				</a></div>').appendTo($('.hidden-xs'))
+		}
+		
+		var $cart = $('.cart-icon');
+		var $badge = $cart.find("#cart-count");
+
+		if(parseInt(cart_count) === 0 || cart_count === undefined) {
+			$cart.css("display", "none");
+		}
+		else {
+			$cart.css("display", "inline");
+		}
+
 		if(cart_count) {
-			if($badge.length === 0) {
-				var $badge = $('<span class="badge pull-right"></span>')
-					.prependTo($cart.find("a").addClass("badge-hover"));
-			}
 			$badge.html(cart_count);
 		} else {
 			$badge.remove();
diff --git a/erpnext/public/js/stock_analytics.js b/erpnext/public/js/stock_analytics.js
index e07e3d4..a8229ba 100644
--- a/erpnext/public/js/stock_analytics.js
+++ b/erpnext/public/js/stock_analytics.js
@@ -51,7 +51,7 @@
 	},
 	filters: [
 		{fieldtype:"Select", label: __("Value or Qty"), fieldname: "value_or_qty",
-			options:["Value", "Quantity"],
+			options:[{label:__("Value"), value:"Value"}, {label:__("Quantity"), value:"Quantity"}],
 			filter: function(val, item, opts, me) {
 				return me.apply_zero_filter(val, item, opts, me);
 			}},
@@ -64,7 +64,13 @@
 		{fieldtype:"Date", label: __("From Date"), fieldname: "from_date"},
 		{fieldtype:"Date", label: __("To Date"), fieldname: "to_date"},
 		{fieldtype:"Select", label: __("Range"), fieldname: "range",
-			options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}
+			options:[
+				{label:__("Daily"), value:"Daily"},
+				{label:__("Weekly"), value:"Weekly"},
+				{label:__("Monthly"), value:"Monthly"},
+				{label:__("Quarterly"), value:"Quarterly"},
+				{label:__("Yearly"), value:"Yearly"},
+			]}
 	],
 	setup_filters: function() {
 		var me = this;
diff --git a/erpnext/public/js/templates/address_list.html b/erpnext/public/js/templates/address_list.html
index 54f8ce2..6ee7d78 100644
--- a/erpnext/public/js/templates/address_list.html
+++ b/erpnext/public/js/templates/address_list.html
@@ -1,4 +1,4 @@
-<p><button class="btn btn-xs btn-default btn-address">New Address</button></p>
+<p><button class="btn btn-xs btn-default btn-address">{{ __("New Address") }}</button></p>
 <div class="clearfix"></div>
 {% for(var i=0, l=addr_list.length; i<l; i++) { %}
     <p class="h6">
@@ -8,7 +8,7 @@
         {% if(addr_list[i].is_shipping_address) { %}
             <span class="text-muted">({%= __("Shipping") %})</span>{% } %}
 
-        <a href="#Form/Address/{%= addr_list[i].name %}"
+        <a href="#Form/Address/{%= encodeURIComponent(addr_list[i].name) %}"
             class="btn btn-default btn-xs pull-right">
             {%= __("Edit") %}</a>
         </p>
diff --git a/erpnext/public/js/templates/contact_list.html b/erpnext/public/js/templates/contact_list.html
index a2aedc5..e269159 100644
--- a/erpnext/public/js/templates/contact_list.html
+++ b/erpnext/public/js/templates/contact_list.html
@@ -1,5 +1,5 @@
 <p><button class="btn btn-xs btn-default btn-contact">
-    New Contact</button></p>
+    {{ __("New Contact") }}</button></p>
     <div class="clearfix"></div>
 
 {% for(var i=0, l=contact_list.length; i<l; i++) { %}
@@ -9,7 +9,7 @@
             <span class="text-muted">({%= __("Primary") %})</span>
         {% } %}
 
-        <a href="#Form/Contact/{%= contact_list[i].name %}"
+        <a href="#Form/Contact/{%= encodeURIComponent(contact_list[i].name) %}"
             class="btn btn-xs btn-default pull-right">
             {%= __("Edit") %}</a>
     </p>
diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less
index 3f839ee..813a567 100644
--- a/erpnext/public/less/erpnext.less
+++ b/erpnext/public/less/erpnext.less
@@ -125,3 +125,13 @@
 	margin-right: 0px;
 	margin-top: -3px;
 }
+
+.pos .discount-amount-area {
+	.discount-field-col {
+		padding-left: 0px;
+	}
+	
+	.input-group {
+		margin-top: 2px;
+	}
+}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 4cd5cc7..f816fe3 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -1,28 +1,50 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.ui.form.on("Customer", "refresh", function(frm) {
-	cur_frm.cscript.setup_dashboard(frm.doc);
+frappe.ui.form.on("Customer", {
+	refresh: function(frm) {
+		frm.cscript.setup_dashboard(frm.doc);
 
-	if(frappe.defaults.get_default("cust_master_name")!="Naming Series") {
-		frm.toggle_display("naming_series", false);
-	} else {
-		erpnext.toggle_naming_series();
+		if(frappe.defaults.get_default("cust_master_name")!="Naming Series") {
+			frm.toggle_display("naming_series", false);
+		} else {
+			erpnext.toggle_naming_series();
+		}
+
+		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
+
+		if(!frm.doc.__islocal) {
+			erpnext.utils.render_address_and_contact(frm);
+		} else {
+			erpnext.utils.clear_address_and_contact(frm);
+		}
+
+		var grid = cur_frm.get_field("sales_team").grid;
+		grid.set_column_disp("allocated_amount", false);
+		grid.set_column_disp("incentives", false);
+
+		frm.events.add_custom_buttons(frm);
+	},
+	add_custom_buttons: function(frm) {
+		["Opportunity", "Quotation", "Sales Order", "Delivery Note", "Sales Invoice"].forEach(function(doctype, i) {
+			if(frappe.model.can_read(doctype)) {
+				frm.add_custom_button(__(doctype), function() {
+					frappe.route_options = {"customer": frm.doc.name};
+					frappe.set_route("List", doctype);
+				}, __("View"));
+			}
+			if(frappe.model.can_create(doctype)) {
+				frm.add_custom_button(__(doctype), function() {
+					frappe.route_options = {"customer": frm.doc.name};
+					new_doc(doctype);
+				}, __("Make"));
+			}
+		});
+	},
+	validate: function(frm) {
+		if(frm.doc.lead_name) frappe.model.clear_doc("Lead", frm.doc.lead_name);
 	}
-
-	frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
-
-	if(!frm.doc.__islocal) {
-		erpnext.utils.render_address_and_contact(frm);
-	} else {
-		erpnext.utils.clear_address_and_contact(frm);
-	}
-
-	var grid = cur_frm.get_field("sales_team").grid;
-	grid.set_column_disp("allocated_amount", false);
-	grid.set_column_disp("incentives", false);
-
-})
+});
 
 cur_frm.cscript.onload = function(doc, dt, dn) {
 	cur_frm.cscript.load_defaults(doc, dt, dn);
@@ -39,10 +61,6 @@
 cur_frm.add_fetch('lead_name', 'company_name', 'customer_name');
 cur_frm.add_fetch('default_sales_partner','commission_rate','default_commission_rate');
 
-cur_frm.cscript.validate = function(doc, dt, dn) {
-	if(doc.lead_name) frappe.model.clear_doc("Lead", doc.lead_name);
-}
-
 cur_frm.cscript.setup_dashboard = function(doc) {
 	cur_frm.dashboard.reset(doc);
 	if(doc.__islocal)
@@ -66,7 +84,7 @@
 		callback: function(r) {
 			if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) {
 				cur_frm.dashboard.set_headline(
-					__("Total Billing This Year: ") + "<b>"
+					__("Total billing this year") + ": <b>"
 					+ format_currency(r.message.billing_this_year, cur_frm.doc.party_account_currency)
 					+ '</b> / <span class="text-muted">' + __("Unpaid") + ": <b>"
 					+ format_currency(r.message.total_unpaid, cur_frm.doc.party_account_currency)
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index f27fdbf..3ebfa7d 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -782,30 +782,6 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "communications", 
-   "fieldtype": "Table", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Communications", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Communication", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
@@ -818,7 +794,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-12-08 12:50:05.106006", 
+ "modified": "2016-01-06 02:36:04.820353", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Customer", 
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 72ec1dc..8a7da63 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -229,9 +229,15 @@
 
 
 def get_credit_limit(customer, company):
-	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") or \
-			frappe.db.get_value("Company", company, "credit_limit")
+	credit_limit = None
 
-	return credit_limit
+	if customer:
+		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")
+
+	if not credit_limit:
+		credit_limit = frappe.db.get_value("Company", company, "credit_limit")
+
+	return flt(credit_limit)
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index d717e20..83cec04 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -18,17 +18,19 @@
 		this._super(doc, dt, dn);
 
 		if(doc.docstatus == 1 && doc.status!=='Lost') {
-			cur_frm.add_custom_button(__('Make Sales Order'),
-				cur_frm.cscript['Make Sales Order'], frappe.boot.doctype_icons["Sales Order"]);
-			if(doc.status!=="Ordered") {
-				cur_frm.add_custom_button(__('Set as Lost'),
-					cur_frm.cscript['Declare Order Lost'], "icon-exclamation", "btn-default");
-			}
+			cur_frm.add_custom_button(__('Sales Order'),
+				cur_frm.cscript['Make Sales Order'], __("Make"));
 
+			if(doc.status!=="Ordered") {
+				cur_frm.add_custom_button(__('Lost'),
+					cur_frm.cscript['Declare Order Lost'], __("Status"));
+			}
+			
+			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 		}
 
 		if (this.frm.doc.docstatus===0) {
-			cur_frm.add_custom_button(__('From Opportunity'),
+			cur_frm.add_custom_button(__('Opportunity'),
 				function() {
 					frappe.model.map_current_doc({
 						method: "erpnext.crm.doctype.opportunity.opportunity.make_quotation",
@@ -41,7 +43,7 @@
 							company: cur_frm.doc.company
 						}
 					})
-				}, "icon-download", "btn-default");
+				}, __("Get items from"), "btn-default");
 		}
 
 		this.toggle_reqd_lead_customer();
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index a4ca4ff..535e7fc 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -25,6 +25,7 @@
    "options": "icon-user", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -46,6 +47,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -71,6 +73,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -96,6 +99,7 @@
    "options": "QTN-", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -122,6 +126,7 @@
    "options": "\nLead\nCustomer", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -148,6 +153,7 @@
    "options": "Customer", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -174,6 +180,7 @@
    "options": "Lead", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -196,6 +203,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -220,6 +228,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -242,6 +251,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -264,6 +274,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -286,6 +297,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -308,6 +320,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -334,6 +347,7 @@
    "options": "Quotation", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -361,6 +375,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -387,6 +402,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -414,6 +430,7 @@
    "options": "\nSales\nMaintenance\nShopping Cart", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -437,6 +454,7 @@
    "options": "icon-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -462,6 +480,7 @@
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -489,6 +508,7 @@
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -511,6 +531,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -537,6 +558,7 @@
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -561,6 +583,7 @@
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -585,6 +608,7 @@
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -607,6 +631,7 @@
    "no_copy": 1, 
    "permlevel": 1, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -631,6 +656,7 @@
    "options": "icon-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -656,6 +682,7 @@
    "options": "Quotation Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -678,6 +705,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -702,6 +730,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -727,6 +756,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -749,6 +779,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -773,6 +804,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -796,6 +828,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -820,6 +853,7 @@
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -845,6 +879,7 @@
    "options": "Sales Taxes and Charges Template", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -866,6 +901,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -890,6 +926,7 @@
    "options": "Shipping Rule", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -911,6 +948,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -936,6 +974,7 @@
    "options": "Sales Taxes and Charges", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -959,6 +998,7 @@
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -980,6 +1020,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1005,6 +1046,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1026,6 +1068,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1049,6 +1092,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1073,6 +1117,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1098,51 +1143,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
-   "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, 
-   "fieldname": "column_break_46", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 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, 
-   "fieldname": "discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 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, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1167,6 +1168,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1178,6 +1180,77 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "column_break_46", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "totals", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1191,6 +1264,7 @@
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1216,6 +1290,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1242,6 +1317,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1268,6 +1344,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1291,6 +1368,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1317,6 +1395,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1343,6 +1422,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1368,6 +1448,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1394,6 +1475,7 @@
    "options": "icon-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1419,6 +1501,7 @@
    "options": "Terms and Conditions", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -1443,6 +1526,7 @@
    "oldfieldtype": "Text Editor", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1466,6 +1550,7 @@
    "options": "icon-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1490,6 +1575,7 @@
    "options": "Territory", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1517,6 +1603,7 @@
    "options": "Customer Group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1540,6 +1627,7 @@
    "options": "Address", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1562,6 +1650,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1584,6 +1673,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1608,6 +1698,7 @@
    "options": "Address", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1634,6 +1725,7 @@
    "options": "Contact", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1657,6 +1749,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1682,6 +1775,7 @@
    "options": "Letter Head", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1707,6 +1801,7 @@
    "options": "Print Heading", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -1731,6 +1826,7 @@
    "options": "icon-file-text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1756,6 +1852,7 @@
    "options": "Campaign", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1781,6 +1878,7 @@
    "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1806,6 +1904,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1828,6 +1927,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1855,6 +1955,7 @@
    "options": "Draft\nSubmitted\nOrdered\nLost\nCancelled\nOpen\nReplied", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1880,6 +1981,7 @@
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1904,6 +2006,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1922,7 +2025,8 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2015-11-16 06:29:54.958329", 
+ "menu_index": 0, 
+ "modified": "2015-12-17 16:19:06.964646", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation", 
@@ -2119,5 +2223,6 @@
  "search_fields": "status,transaction_date,customer,lead,order_type", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "title"
+ "title_field": "title", 
+ "version": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 56c8da0..9dae2b9 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -41,58 +41,60 @@
 					}
 				}
 
-				// material request
-				if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1
-					&& flt(doc.per_delivered, 2) < 100) {
-						cur_frm.add_custom_button(__('Material Request'), this.make_material_request);
-				}
-
-				// make purchase order
-				if(flt(doc.per_delivered, 2) < 100 && allow_purchase) {
-					cur_frm.add_custom_button(__('Purchase Order'), cur_frm.cscript.make_purchase_order);
-				}
-
-				if(flt(doc.per_billed)==0) {
-					cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry);
-				}
-
 				if (this.frm.has_perm("submit")) {
 					// stop
 					if(flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed) < 100) {
-							cur_frm.add_custom_button(__('Stop'), this.stop_sales_order)
+							cur_frm.add_custom_button(__('Stop'), this.stop_sales_order, __("Status"))
 						}
 
 
-					cur_frm.add_custom_button(__('Close'), this.close_sales_order)
-				}
-
-				// maintenance
-				if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1) {
-					cur_frm.add_custom_button(__('Maint. Visit'), this.make_maintenance_visit);
-					cur_frm.add_custom_button(__('Maint. Schedule'), this.make_maintenance_schedule);
+					cur_frm.add_custom_button(__('Close'), this.close_sales_order, __("Status"))
 				}
 
 				// delivery note
 				if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && allow_delivery) {
-					cur_frm.add_custom_button(__('Delivery'), this.make_delivery_note).addClass("btn-primary");
+					cur_frm.add_custom_button(__('Delivery'), this.make_delivery_note, __("Make"));
+					cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 				}
 
 				// sales invoice
 				if(flt(doc.per_billed, 2) < 100) {
-					cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice).addClass("btn-primary");
+					cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice, __("Make"));
+				}
+
+				// material request
+				if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1
+					&& flt(doc.per_delivered, 2) < 100) {
+						cur_frm.add_custom_button(__('Material Request'), this.make_material_request, __("Make"));
+				}
+
+				// make purchase order
+				if(flt(doc.per_delivered, 2) < 100 && allow_purchase) {
+					cur_frm.add_custom_button(__('Purchase Order'), cur_frm.cscript.make_purchase_order, __("Make"));
+				}
+
+				if(flt(doc.per_billed)==0) {
+					cur_frm.add_custom_button(__('Payment Request'), this.make_payment_request, __("Make"));
+					cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry, __("Make"));
+				}
+
+				// maintenance
+				if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1) {
+					cur_frm.add_custom_button(__('Maintenance Visit'), this.make_maintenance_visit, __("Make"));
+					cur_frm.add_custom_button(__('Maintenance Schedule'), this.make_maintenance_schedule, __("Make"));
 				}
 
 
 			} else {
 				if (this.frm.has_perm("submit")) {
 					// un-stop
-					cur_frm.add_custom_button(__('Re-open'), cur_frm.cscript['Unstop Sales Order']);
+					cur_frm.add_custom_button(__('Re-open'), cur_frm.cscript['Unstop Sales Order'], __("Status"));
 				}
 			}
 		}
 
 		if (this.frm.doc.docstatus===0) {
-			cur_frm.add_custom_button(__('From Quotation'),
+			cur_frm.add_custom_button(__('Quotation'),
 				function() {
 					frappe.model.map_current_doc({
 						method: "erpnext.selling.doctype.quotation.quotation.make_sales_order",
@@ -105,7 +107,7 @@
 							company: cur_frm.doc.company
 						}
 					})
-				});
+				}, __("Get items from"));
 		}
 
 		this.order_type(doc);
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 40337bf..ee97334 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -25,6 +25,7 @@
    "options": "icon-user", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -47,6 +48,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -72,6 +74,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -97,6 +100,7 @@
    "options": "SO-", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -122,6 +126,7 @@
    "options": "Customer", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -144,6 +149,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -166,6 +172,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -188,6 +195,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -210,6 +218,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -232,6 +241,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -259,6 +269,7 @@
    "options": "\nSales\nMaintenance\nShopping Cart", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -281,6 +292,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -307,6 +319,7 @@
    "options": "Sales Order", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -334,6 +347,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -360,6 +374,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -386,6 +401,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -413,6 +429,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -440,6 +457,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -464,6 +482,7 @@
    "options": "Address", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -486,6 +505,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -509,6 +529,7 @@
    "options": "icon-tag", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -534,6 +555,7 @@
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -561,6 +583,7 @@
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -583,6 +606,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -609,6 +633,7 @@
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -633,6 +658,7 @@
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -657,6 +683,7 @@
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -679,6 +706,7 @@
    "no_copy": 1, 
    "permlevel": 1, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -703,6 +731,7 @@
    "options": "icon-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -728,6 +757,7 @@
    "options": "Sales Order Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -749,6 +779,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -770,6 +801,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -794,6 +826,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -819,6 +852,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -841,6 +875,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -865,6 +900,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -888,6 +924,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -912,6 +949,7 @@
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -937,6 +975,7 @@
    "options": "Sales Taxes and Charges Template", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -958,6 +997,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -982,6 +1022,7 @@
    "options": "Shipping Rule", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1003,6 +1044,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1028,6 +1070,7 @@
    "options": "Sales Taxes and Charges", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1051,6 +1094,7 @@
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1072,6 +1116,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1097,6 +1142,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1120,6 +1166,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1143,6 +1190,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1167,6 +1215,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1192,50 +1241,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
-   "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, 
-   "fieldname": "column_break_50", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 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, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1260,6 +1266,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1271,6 +1278,78 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "column_break_50", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "totals", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1284,6 +1363,7 @@
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1309,6 +1389,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1335,6 +1416,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1361,6 +1443,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1384,6 +1467,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1410,6 +1494,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1436,6 +1521,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1461,6 +1547,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1485,6 +1572,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1511,6 +1599,7 @@
    "options": "icon-suitcase", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1536,6 +1625,7 @@
    "options": "Packed Item", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1561,6 +1651,7 @@
    "options": "icon-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1586,6 +1677,7 @@
    "options": "Terms and Conditions", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1610,6 +1702,7 @@
    "oldfieldtype": "Text Editor", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1634,6 +1727,7 @@
    "options": "icon-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1655,6 +1749,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1680,6 +1775,7 @@
    "options": "Territory", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1704,6 +1800,7 @@
    "options": "Customer Group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1725,6 +1822,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1749,6 +1847,7 @@
    "options": "Address", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1772,6 +1871,7 @@
    "options": "Contact", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1797,6 +1897,7 @@
    "options": "icon-file-text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1823,6 +1924,7 @@
    "options": "Project", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1848,6 +1950,7 @@
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1871,6 +1974,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1896,6 +2000,7 @@
    "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1922,6 +2027,7 @@
    "options": "Campaign", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1945,6 +2051,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1970,6 +2077,7 @@
    "options": "Letter Head", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1992,6 +2100,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2018,6 +2127,7 @@
    "options": "Print Heading", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -2041,6 +2151,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2068,6 +2179,7 @@
    "options": "\nDraft\nTo Deliver and Bill\nTo Bill\nTo Deliver\nCompleted\nStopped\nCancelled\nClosed", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -2092,6 +2204,7 @@
    "options": "Not Delivered\nFully Delivered\nPartly Delivered\nClosed\nNot Applicable", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2118,6 +2231,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2140,6 +2254,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2166,6 +2281,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2190,6 +2306,7 @@
    "options": "Not Billed\nFully Billed\nPartly Billed\nClosed", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2215,6 +2332,7 @@
    "options": "icon-group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2240,6 +2358,7 @@
    "options": "Sales Partner", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2262,6 +2381,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2287,6 +2407,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2313,6 +2434,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2336,6 +2458,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2361,6 +2484,7 @@
    "options": "Sales Team", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2385,6 +2509,7 @@
    "options": "icon-time", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2409,6 +2534,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2434,6 +2560,7 @@
    "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2458,6 +2585,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2482,6 +2610,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2506,6 +2635,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2530,6 +2660,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2552,6 +2683,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2576,6 +2708,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2599,6 +2732,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2623,6 +2757,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2648,6 +2783,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2666,7 +2802,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:56.599677", 
+ "modified": "2015-12-29 12:32:45.649349", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order", 
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 6ec82a2..8bc96e6 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -111,14 +111,14 @@
 
 	def validate_warehouse(self):
 		super(SalesOrder, self).validate_warehouse()
-		
+
 		for d in self.get("items"):
 			if (frappe.db.get_value("Item", d.item_code, "is_stock_item")==1 or
 				(self.has_product_bundle(d.item_code) and self.product_bundle_has_stock_item(d.item_code))) \
 				and not d.warehouse and not cint(d.delivered_by_supplier):
 				frappe.throw(_("Delivery warehouse required for stock item {0}").format(d.item_code),
 					WarehouseRequired)
-			
+
 	def validate_with_previous_doc(self):
 		super(SalesOrder, self).validate_with_previous_doc({
 			"Quotation": {
@@ -285,14 +285,29 @@
 
 			delivered_qty += item.delivered_qty
 			tot_qty += item.qty
-			
-		frappe.db.set_value("Sales Order", self.name, "per_delivered", flt(delivered_qty/tot_qty) * 100, 
-		update_modified=False)
 
+		frappe.db.set_value("Sales Order", self.name, "per_delivered", flt(delivered_qty/tot_qty) * 100,
+		update_modified=False)
+	
+	def set_indicator(self):
+		"""Set indicator for portal"""
+		if self.per_billed < 100 and self.per_delivered < 100:
+			self.indicator_color = "orange"
+			self.indicator_title = _("Not Paid and Not Delivered")
+		
+		elif self.per_billed == 100 and self.per_delivered < 100:
+			self.indicator_color = "orange"
+			self.indicator_title = _("Paid and Not Delivered")
+
+		else:
+			self.indicator_color = "green"
+			self.indicator_title = _("Paid")
+			
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
 	list_context = get_list_context(context)
 	list_context["title"] = _("My Orders")
+	list_context["parents"] = [{"title": _("My Account"), "name": "me"}]
 	return list_context
 
 @frappe.whitelist()
@@ -401,7 +416,7 @@
 	return target_doc
 
 @frappe.whitelist()
-def make_sales_invoice(source_name, target_doc=None):
+def make_sales_invoice(source_name, target_doc=None, ignore_permissions=False):
 	def postprocess(source, target):
 		set_missing_values(source, target)
 		#Get the advance paid Journal Entries in Sales Invoice Advance
@@ -410,6 +425,7 @@
 	def set_missing_values(source, target):
 		target.is_pos = 0
 		target.ignore_pricing_rule = 1
+		target.flags.ignore_permissions = True
 		target.run_method("set_missing_values")
 		target.run_method("calculate_taxes_and_totals")
 
@@ -442,7 +458,7 @@
 			"doctype": "Sales Team",
 			"add_if_empty": True
 		}
-	}, target_doc, postprocess)
+	}, target_doc, postprocess, ignore_permissions=ignore_permissions)
 
 	return doclist
 
@@ -518,7 +534,9 @@
 	data = frappe.db.sql("""select name, customer_name, delivery_status, billing_status, delivery_date
 		from `tabSales Order`
 		where (ifnull(delivery_date, '0000-00-00')!= '0000-00-00') \
-				and (delivery_date between %(start)s and %(end)s) {conditions}
+				and (delivery_date between %(start)s and %(end)s)
+				and docstatus < 2
+				{conditions}
 		""".format(conditions=conditions), {
 			"start": start,
 			"end": end
@@ -533,7 +551,7 @@
 		default_price_list = frappe.get_value("Supplier", for_supplier, "default_price_list")
 		if default_price_list:
 			target.buying_price_list = default_price_list
-		
+
 		if any( item.delivered_by_supplier==1 for item in source.items):
 			if source.shipping_address_name:
 				target.customer_address = source.shipping_address_name
@@ -541,12 +559,12 @@
 			else:
 				target.customer_address = source.customer_address
 				target.customer_address_display = source.address_display
-			
+
 			target.customer_contact_person = source.contact_person
 			target.customer_contact_display = source.contact_display
 			target.customer_contact_mobile = source.contact_mobile
 			target.customer_contact_email = source.contact_email
-			
+
 		else:
 			target.customer = ""
 			target.customer_name = ""
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 3501f52..c6ea618 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -334,15 +334,15 @@
 		existing_ordered_qty = bin[0].ordered_qty if bin else 0.0
 		existing_reserved_qty = bin[0].reserved_qty if bin else 0.0
 
-		bin = frappe.get_all("Bin", filters={"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"},
-			fields=["reserved_qty"])
+		bin = frappe.get_all("Bin", filters={"item_code": dn_item.item_code, 
+			"warehouse": "_Test Warehouse - _TC"}, fields=["reserved_qty"])
 
 		existing_reserved_qty_for_dn_item = bin[0].reserved_qty if bin else 0.0
 
 		#create so, po and partial dn
 		so = make_sales_order(item_list=so_items, do_not_submit=True)
 		so.submit()
-
+		
 		po = make_purchase_order_for_drop_shipment(so.name, '_Test Supplier')
 		po.submit()
 
diff --git a/erpnext/selling/page/sales_browser/sales_browser.js b/erpnext/selling/page/sales_browser/sales_browser.js
index 55fa57a..a99fe72 100644
--- a/erpnext/selling/page/sales_browser/sales_browser.js
+++ b/erpnext/selling/page/sales_browser/sales_browser.js
@@ -155,7 +155,7 @@
 						if(node.expanded) {
 							node.toggle_node();
 						}
-						node.reload_parent();
+						node.reload();
 					}
 				}
 			});
diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.js b/erpnext/selling/page/sales_funnel/sales_funnel.js
index b3a9796..a516342 100644
--- a/erpnext/selling/page/sales_funnel/sales_funnel.js
+++ b/erpnext/selling/page/sales_funnel/sales_funnel.js
@@ -180,6 +180,6 @@
 		context.fillStyle = "black";
 		context.textBaseline = "middle";
 		context.font = "1.1em sans-serif";
-		context.fillText(title, width + 20, y_mid);
+		context.fillText(__(title), width + 20, y_mid);
 	}
 });
diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.py b/erpnext/selling/page/sales_funnel/sales_funnel.py
index 78db873..eb3b996 100644
--- a/erpnext/selling/page/sales_funnel/sales_funnel.py
+++ b/erpnext/selling/page/sales_funnel/sales_funnel.py
@@ -4,6 +4,8 @@
 from __future__ import unicode_literals
 import frappe
 
+from frappe import _
+
 @frappe.whitelist()
 def get_funnel_data(from_date, to_date):
 	active_leads = frappe.db.sql("""select count(*) from `tabLead`
@@ -26,8 +28,8 @@
 		where docstatus = 1 and (date(`creation`) between %s and %s)""", (from_date, to_date))[0][0]
 
 	return [
-		{ "title": "Active Leads / Customers", "value": active_leads, "color": "#B03B46" },
-		{ "title": "Opportunities", "value": opportunities, "color": "#F09C00" },
-		{ "title": "Quotations", "value": quotations, "color": "#006685" },
-		{ "title": "Sales Orders", "value": sales_orders, "color": "#00AD65" }
+		{ "title": _("Active Leads / Customers"), "value": active_leads, "color": "#B03B46" },
+		{ "title": _("Opportunities"), "value": opportunities, "color": "#F09C00" },
+		{ "title": _("Quotations"), "value": quotations, "color": "#006685" },
+		{ "title": _("Sales Orders"), "value": sales_orders, "color": "#00AD65" }
 	]
diff --git a/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
index c7b8c83..a854fa9 100644
--- a/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
+++ b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
@@ -8,7 +8,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company"),
+			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
 		{
diff --git a/erpnext/selling/report/customer_credit_balance/customer_credit_balance.js b/erpnext/selling/report/customer_credit_balance/customer_credit_balance.js
index fc13a67..3a99eb0 100644
--- a/erpnext/selling/report/customer_credit_balance/customer_credit_balance.js
+++ b/erpnext/selling/report/customer_credit_balance/customer_credit_balance.js
@@ -9,7 +9,7 @@
 			"fieldtype": "Link",
 			"options": "Company",
 			"reqd": 1,
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"customer",
diff --git a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js
index 7bfabb2..f1cb3b7 100644
--- a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js
+++ b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js
@@ -14,7 +14,12 @@
 			fieldname: "period",
 			label: __("Period"),
 			fieldtype: "Select",
-			options: "Monthly\nQuarterly\nHalf-Yearly\nYearly",
+			options: [
+				{ "value": "Monthly", "label": __("Monthly") },
+				{ "value": "Quarterly", "label": __("Quarterly") },
+				{ "value": "Half-Yearly", "label": __("Half-Yearly") },
+				{ "value": "Yearly", "label": __("Yearly") }
+			],
 			default: "Monthly"
 		},
 		{
@@ -25,4 +30,4 @@
 			default: "Quantity"
 		},
 	]
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
index 6dfdd1f..9258730 100644
--- a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
+++ b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
@@ -33,7 +33,7 @@
 			label: __("Company"),
 			fieldtype: "Link",
 			options: "Company",
-			default: frappe.defaults.get_user_default("company")
+			default: frappe.defaults.get_user_default("Company")
 		},
 		{
 			fieldname:"item_group",
diff --git a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js b/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js
index 1e39146..7631fcb 100644
--- a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js
+++ b/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js
@@ -14,7 +14,12 @@
 			fieldname: "period",
 			label: __("Period"),
 			fieldtype: "Select",
-			options: "Monthly\nQuarterly\nHalf-Yearly\nYearly",
+			options: [
+				{ "value": "Monthly", "label": __("Monthly") },
+				{ "value": "Quarterly", "label": __("Quarterly") },
+				{ "value": "Half-Yearly", "label": __("Half-Yearly") },
+				{ "value": "Yearly", "label": __("Yearly") }
+			],
 			default: "Monthly"
 		},
 		{
@@ -25,4 +30,4 @@
 			default: "Quantity"
 		},
 	]
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 6a8744a..7f17bd3 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -288,6 +288,24 @@
 			}
 		}
 		refresh_field('product_bundle_help');
+	},
+	
+	make_payment_request: function() {
+		frappe.call({
+			method:"erpnext.accounts.doctype.payment_request.payment_request.make_payment_request",
+			args: {
+				"dt": cur_frm.doc.doctype,
+				"dn": cur_frm.doc.name,
+				"recipient_id": cur_frm.doc.contact_email
+			},
+			callback: function(r) {
+				if(!r.exc){
+					var doc = frappe.model.sync(r.message);
+					console.log(r.message)
+					frappe.set_route("Form", r.message.doctype, r.message.name);
+				}
+			}
+		})
 	}
 });
 
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 4c9f53d..d8db5bf 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -26,6 +26,7 @@
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -50,6 +51,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -75,6 +77,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -98,6 +101,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -119,6 +123,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -139,9 +144,10 @@
    "label": "Domain", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Distribution\nManufacturing\nRetail\nServices", 
+   "options": "Distribution\nManufacturing\nRetail\nServices\nEducation", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -164,6 +170,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -188,6 +195,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -212,6 +220,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -235,6 +244,7 @@
    "options": "Country", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -257,6 +267,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -280,6 +291,7 @@
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -303,6 +315,7 @@
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -327,6 +340,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -350,6 +364,7 @@
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -376,6 +391,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -400,6 +416,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -426,6 +443,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -450,6 +468,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -472,6 +491,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -499,6 +519,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -523,6 +544,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -547,6 +569,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -571,6 +594,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -593,6 +617,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -617,6 +642,7 @@
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -641,6 +667,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -666,6 +693,7 @@
    "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -692,6 +720,7 @@
    "options": "default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -714,6 +743,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -740,6 +770,7 @@
    "options": "\nWarn\nIgnore\nStop", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -766,6 +797,7 @@
    "options": "\nWarn\nIgnore\nStop", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -789,6 +821,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -812,6 +845,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -835,6 +869,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -857,6 +892,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -880,6 +916,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -903,6 +940,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -927,6 +965,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -949,6 +988,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -975,6 +1015,7 @@
    "options": "Phone", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1000,6 +1041,7 @@
    "options": "Phone", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1025,6 +1067,7 @@
    "options": "Email", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1049,6 +1092,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1073,6 +1117,7 @@
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1099,6 +1144,7 @@
    "oldfieldtype": "Code", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1122,6 +1168,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1140,7 +1187,8 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:43.539356", 
+ "menu_index": 0, 
+ "modified": "2015-12-24 15:09:29.866621", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Company", 
@@ -1288,5 +1336,6 @@
   }
  ], 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "version": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index d337805..29dee1e 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -101,19 +101,6 @@
 		frappe.db.set(self, "default_payable_account", frappe.db.get_value("Account",
 			{"company": self.name, "account_type": "Payable"}))
 
-	def add_acc(self, lst):
-		account = frappe.get_doc({
-			"doctype": "Account",
-			"freeze_account": "No",
-			"company": self.name
-		})
-
-		for d in self.fld_dict.keys():
-			account.set(d, (d == 'parent_account' and lst[self.fld_dict[d]]) and lst[self.fld_dict[d]] +' - '+ self.abbr or lst[self.fld_dict[d]])
-		if not account.parent_account:
-			account.flags.ignore_mandatory = True
-		account.insert()
-
 	def set_default_accounts(self):
 		self._set_default_account("default_cash_account", "Cash")
 		self._set_default_account("default_bank_account", "Bank")
@@ -216,13 +203,15 @@
 			frappe.db.sql("""delete from `tabItem Reorder` where warehouse in (%s)"""
 				% ', '.join(['%s']*len(warehouses)), tuple(warehouses))
 
-		for f in ["income_account", "expense_account"]:
-			frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
-				% (f, f, ', '.join(['%s']*len(accounts))), tuple(accounts))
+		if accounts:
+			for f in ["income_account", "expense_account"]:
+				frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
+					% (f, f, ', '.join(['%s']*len(accounts))), tuple(accounts))
 
-		for f in ["selling_cost_center", "buying_cost_center"]:
-			frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
-				% (f, f, ', '.join(['%s']*len(cost_centers))), tuple(cost_centers))
+		if cost_centers:
+			for f in ["selling_cost_center", "buying_cost_center"]:
+				frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
+					% (f, f, ', '.join(['%s']*len(cost_centers))), tuple(cost_centers))
 
 		# reset default company
 		frappe.db.sql("""update `tabSingles` set value=""
diff --git a/erpnext/setup/doctype/email_digest/email_digest.js b/erpnext/setup/doctype/email_digest/email_digest.js
index 9e3b4e6..b830d87 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.js
+++ b/erpnext/setup/doctype/email_digest/email_digest.js
@@ -55,34 +55,24 @@
 				title: __('Add/Remove Recipients'),
 				width: 400
 			});
-			var dialog_div = $a(d.body, 'div', 'dialog-div', '', '');
-			var tab = make_table(dialog_div, r.user_list.length+2, 2, '', ['15%', '85%']);
-			tab.className = 'user-list';
-			var add_or_update = 'Add';
+
 			$.each(r.user_list, function(i, v) {
-				var check = $a_input($td(tab, i+1, 0), 'checkbox');
-				check.value = v.name;
-				if(v.checked==1) {
-					check.checked = 1;
-					add_or_update = 'Update';
-				}
 				var fullname = frappe.user.full_name(v.name);
-				if(fullname !== v.name) v.name = fullname + " &lt;" + v.name + "&gt;";
+				if(fullname !== v.name) fullname = fullname + " &lt;" + v.name + "&gt;";
+
 				if(v.enabled==0) {
-					v.name = repl("<span style='color: red'> %(name)s (" + __("disabled user") + ")</span>", {name: v.name});
+					fullname = repl("<span style='color: red'> %(name)s (" + __("disabled user") + ")</span>", {name: v.name});
 				}
-				var user = $a($td(tab, i+1, 1), 'span', '', '', v.name);
-				//user.onclick = function() { check.checked = !check.checked; }
+
+				$('<div class="checkbox"><label>\
+					<input type="checkbox" data-id="' + v.name + '"'+
+						(v.checked ? 'checked' : '') +
+				'> '+ fullname +'</label></div>').appendTo(d.body);
 			});
 
 			// Display add recipients button
-			if(r.user_list.length>15) {
-				$btn($td(tab, 0, 1), __('{0} Recipients',[__(add_or_update)]), function() {
-					cur_frm.cscript.add_to_rec_list(doc, tab, r.user_list.length);
-				});
-			}
-			$btn($td(tab, r.user_list.length+1, 1),__('{0} Recipients',[__(add_or_update)]), function() {
-				cur_frm.cscript.add_to_rec_list(doc, tab, r.user_list.length);
+			d.set_primary_action("Update", function() {
+				cur_frm.cscript.add_to_rec_list(doc, d.body, r.user_list.length);
 			});
 
 			cur_frm.rec_dialog = d;
@@ -91,15 +81,13 @@
 	});
 }
 
-cur_frm.cscript.add_to_rec_list = function(doc, tab, length) {
+cur_frm.cscript.add_to_rec_list = function(doc, dialog, length) {
 	// add checked users to list of recipients
 	var rec_list = [];
-	for(var i = 1; i <= length; i++) {
-		var input = $($td(tab, i, 0)).find('input');
-		if(input.is(':checked')) {
-			rec_list.push(input.attr('value'));
-		}
-	}
+	$(dialog).find('input:checked').each(function(i, input) {
+		rec_list.push($(input).attr('data-id'));
+	});
+
 	doc.recipient_list = rec_list.join('\n');
 	cur_frm.rec_dialog.hide();
 	cur_frm.save();
diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json
index adb4c67..e99d14f 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.json
+++ b/erpnext/setup/doctype/sales_person/sales_person.json
@@ -26,6 +26,7 @@
    "options": "icon-user", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -50,6 +51,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -76,6 +78,7 @@
    "options": "Sales Person", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -101,6 +104,7 @@
    "options": "\nYes\nNo", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -122,6 +126,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -145,6 +150,7 @@
    "options": "Employee", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -169,6 +175,7 @@
    "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -193,6 +200,7 @@
    "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -217,6 +225,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -242,6 +251,7 @@
    "options": "icon-bullseye", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -267,6 +277,7 @@
    "options": "Target Detail", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -293,29 +304,7 @@
    "options": "Monthly Distribution", 
    "permlevel": 0, 
    "print_hide": 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, 
-   "fieldname": "communications", 
-   "fieldtype": "Table", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Communications", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Communication", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -334,7 +323,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:57.194163", 
+ "modified": "2016-01-06 02:36:22.551330", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Person", 
diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
index 5fb635e..2b84a11 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
@@ -27,6 +27,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -38,6 +39,30 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Disabled", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "terms", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -51,6 +76,7 @@
    "oldfieldtype": "Text Editor", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -69,7 +95,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:59.292943", 
+ "modified": "2016-01-11 23:54:33.491719", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Terms and Conditions", 
diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index dcb6eb3..b4e19da 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py
@@ -17,6 +17,14 @@
 	add_web_forms()
 	frappe.db.commit()
 
+def check_setup_wizard_not_completed():
+	if frappe.db.get_default('desktop:home_page') == 'desktop':
+		print
+		print "ERPNext can only be installed on a fresh site where the setup wizard is not completed"
+		print "You can reinstall this site (after saving your data) using: bench --site [sitename] reinstall"
+		print
+		return False
+
 def feature_setup():
 	"""save global defaults and features setup"""
 	doc = frappe.get_doc("Features Setup", "Features Setup")
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 4d4cc6d..b92dcf9 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -106,9 +106,30 @@
 	}).insert()
 
 	# Bank Account
+	create_bank_account(args)
 
 	args["curr_fiscal_year"] = curr_fiscal_year
 
+def create_bank_account(args):
+	if args.get("bank_account"):
+		company_name = args.get('company_name').strip()
+		bank_account_group =  frappe.db.get_value("Account",
+			{"account_type": "Bank", "is_group": 1, "root_type": "Asset",
+				"company": company_name})
+		if bank_account_group:
+			bank_account = frappe.get_doc({
+				"doctype": "Account",
+				'account_name': args.get("bank_account"),
+				'parent_account': bank_account_group,
+				'is_group':0,
+				'company': company_name,
+				"account_type": "Bank",
+			})
+			try:
+				return bank_account.insert()
+			except RootNotEditable:
+				frappe.throw(_("Bank account cannot be named as {0}").format(args.get("bank_account")))
+
 def create_price_lists(args):
 	for pl_type, pl_name in (("Selling", _("Standard Selling")), ("Buying", _("Standard Buying"))):
 		frappe.get_doc({
diff --git a/erpnext/shopping_cart/utils.py b/erpnext/shopping_cart/utils.py
index 7794a8f..b8d5054 100644
--- a/erpnext/shopping_cart/utils.py
+++ b/erpnext/shopping_cart/utils.py
@@ -28,17 +28,7 @@
 	cart_enabled = is_cart_enabled()
 	context["shopping_cart_enabled"] = cart_enabled
 
-	if cart_enabled:
-		post_login = [
-			{"label": _("Cart"), "url": "cart", "class": "cart-count"},
-			{"class": "divider"}
-		]
-		context["post_login"] = post_login + context.get("post_login", [])
-
 def update_my_account_context(context):
-	if is_cart_enabled():
-		context["my_account_list"].append({"label": _("Cart"), "url": "cart"})
-
 	context["my_account_list"].extend([
 		{"label": _("Orders"), "url": "orders"},
 		{"label": _("Invoices"), "url": "invoices"},
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index 4bef0d8..0b6f47e 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -11,19 +11,23 @@
 
 		if (!doc.is_return && doc.status!="Closed") {
 			if(flt(doc.per_installed, 2) < 100 && doc.docstatus==1)
-				cur_frm.add_custom_button(__('Installation Note'), this.make_installation_note);
+				cur_frm.add_custom_button(__('Installation Note'), this.make_installation_note, __("Make"));
 
 			if (doc.docstatus==1) {
-				cur_frm.add_custom_button(__('Sales Return'), this.make_sales_return);
+				cur_frm.add_custom_button(__('Sales Return'), this.make_sales_return, __("Make"));
 			}
 
 			if(doc.docstatus==0 && !doc.__islocal) {
 				cur_frm.add_custom_button(__('Packing Slip'),
-					cur_frm.cscript['Make Packing Slip'], frappe.boot.doctype_icons["Packing Slip"]);
+					cur_frm.cscript['Make Packing Slip'], __("Make"));
+			}
+
+			if (!doc.__islocal && doc.docstatus==1) {
+				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 			}
 
 			if (this.frm.doc.docstatus===0) {
-				cur_frm.add_custom_button(__('From Sales Order'),
+				cur_frm.add_custom_button(__('Sales Order'),
 					function() {
 						frappe.model.map_current_doc({
 							method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note",
@@ -37,7 +41,7 @@
 								company: cur_frm.doc.company
 							}
 						})
-					});
+					}, __("Get items from"));
 			}
 		}
 
@@ -46,14 +50,12 @@
 			if (cint(frappe.defaults.get_default("auto_accounting_for_stock"))) {
 				this.show_general_ledger();
 			}
-			if (this.frm.has_perm("submit") && (doc.status !== "Closed") 
-				&& this.frm.doc.__onload && this.frm.doc.__onload.has_return_entry) {
-					cur_frm.add_custom_button(__("Close"), this.close_delivery_note)
+			if (this.frm.has_perm("submit") && doc.status !== "Closed") {
+				cur_frm.add_custom_button(__("Close"), this.close_delivery_note, __("Status"))
 			}
 		}
 
-		if(doc.__onload && !doc.__onload.billing_complete && doc.docstatus==1 
-				&& !doc.is_return && doc.status!="Closed") {
+		if(doc.docstatus==1 && !doc.is_return && doc.status!="Closed" && flt(doc.per_billed) < 100) {
 			// show Make Invoice button only if Delivery Note is not created from Sales Invoice
 			var from_sales_invoice = false;
 			from_sales_invoice = cur_frm.doc.items.some(function(item) {
@@ -61,11 +63,11 @@
 			});
 
 			if(!from_sales_invoice)
-				cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice).addClass("btn-primary");
+				cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice, __("Make"));
 		}
 
 		if(doc.docstatus==1 && doc.status === "Closed" && this.frm.has_perm("submit")) {
-			cur_frm.add_custom_button(__('Re-open'), this.reopen_delivery_note)
+			cur_frm.add_custom_button(__('Reopen'), this.reopen_delivery_note, __("Status"))
 		}
 		erpnext.stock.delivery_note.set_print_hide(doc, dt, dn);
 
@@ -285,6 +287,3 @@
 		}
 	}
 }
-
-
-
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index b776ee2..f001f85 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -25,6 +25,7 @@
    "options": "icon-user", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -47,6 +48,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -73,6 +75,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -98,6 +101,7 @@
    "options": "DN-\nDN-RET-", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -123,6 +127,7 @@
    "options": "Customer", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -146,6 +151,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -170,6 +176,7 @@
    "options": "Address", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -192,6 +199,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -215,6 +223,7 @@
    "options": "Address", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -237,6 +246,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -259,6 +269,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -281,6 +292,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -303,6 +315,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -325,6 +338,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -350,6 +364,7 @@
    "options": "Delivery Note", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -378,6 +393,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -405,6 +421,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -431,6 +448,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -458,6 +476,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -483,6 +502,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -508,6 +528,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -531,6 +552,7 @@
    "options": "icon-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -556,6 +578,7 @@
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -582,6 +605,7 @@
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -603,6 +627,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -628,6 +653,7 @@
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -651,6 +677,7 @@
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -675,6 +702,7 @@
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -697,6 +725,7 @@
    "no_copy": 1, 
    "permlevel": 1, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -721,6 +750,7 @@
    "options": "icon-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -746,6 +776,7 @@
    "options": "Delivery Note Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -771,6 +802,7 @@
    "options": "icon-suitcase", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -796,6 +828,7 @@
    "options": "Packed Item", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -818,6 +851,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -839,6 +873,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -863,6 +898,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -888,6 +924,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -911,6 +948,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -935,6 +973,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -958,6 +997,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -982,6 +1022,7 @@
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1008,6 +1049,7 @@
    "options": "Sales Taxes and Charges Template", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1029,6 +1071,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1053,6 +1096,7 @@
    "options": "Shipping Rule", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1074,6 +1118,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1099,6 +1144,7 @@
    "options": "Sales Taxes and Charges", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1122,6 +1168,7 @@
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1143,6 +1190,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1168,6 +1216,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1192,6 +1241,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1215,6 +1265,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1239,6 +1290,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1264,50 +1316,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
-   "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, 
-   "fieldname": "column_break_51", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 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, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1332,6 +1341,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1343,6 +1353,76 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "column_break_51", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "totals", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1356,6 +1436,7 @@
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1381,6 +1462,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1408,6 +1490,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1435,6 +1518,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1459,6 +1543,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1484,6 +1569,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1511,6 +1597,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1538,6 +1625,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1565,6 +1653,7 @@
    "options": "icon-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1590,6 +1679,7 @@
    "options": "Terms and Conditions", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1614,6 +1704,7 @@
    "oldfieldtype": "Text Editor", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1638,6 +1729,7 @@
    "options": "icon-truck", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1662,6 +1754,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -1685,6 +1778,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -1712,6 +1806,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -1740,6 +1835,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -1766,6 +1862,7 @@
    "options": "icon-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1790,6 +1887,7 @@
    "options": "Territory", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1814,6 +1912,7 @@
    "options": "Customer Group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1835,6 +1934,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -1860,6 +1960,7 @@
    "options": "Contact", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1884,6 +1985,7 @@
    "options": "icon-file-text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1910,6 +2012,7 @@
    "options": "Project", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1936,6 +2039,7 @@
    "options": "Campaign", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1961,6 +2065,7 @@
    "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1983,6 +2088,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -2010,6 +2116,7 @@
    "oldfieldtype": "Time", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -2037,6 +2144,7 @@
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -2049,6 +2157,30 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "per_billed", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "% Amount Billed", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 1, 
    "fieldname": "printing_details", 
    "fieldtype": "Section Break", 
@@ -2062,6 +2194,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2087,6 +2220,7 @@
    "options": "Letter Head", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2112,6 +2246,7 @@
    "options": "Print Heading", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -2134,6 +2269,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2158,6 +2294,7 @@
    "oldfieldtype": "Check", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2180,6 +2317,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2203,9 +2341,10 @@
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
-   "options": "\nDraft\nSubmitted\nCancelled\nClosed", 
+   "options": "\nDraft\nTo Bill\nCompleted\nCancelled\nClosed", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -2234,6 +2373,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2256,6 +2396,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2277,6 +2418,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2303,6 +2445,7 @@
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2327,6 +2470,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2351,6 +2495,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2376,6 +2521,7 @@
    "options": "icon-group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2401,6 +2547,7 @@
    "options": "Sales Partner", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -2424,6 +2571,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -2450,6 +2598,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -2477,6 +2626,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2500,6 +2650,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2525,6 +2676,7 @@
    "options": "Sales Team", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2543,7 +2695,8 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:44.673451", 
+ "menu_index": 0, 
+ "modified": "2015-12-25 16:20:39.014291", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 
@@ -2675,5 +2828,6 @@
  "search_fields": "status,customer,customer_name, territory,base_grand_total", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "title"
+ "title_field": "title", 
+ "version": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index c5fd34f..7cb855f 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -48,7 +48,8 @@
 			'target_ref_field': 'qty',
 			'source_field': 'qty',
 			'percent_join_field': 'against_sales_invoice',
-			'overflow_type': 'delivery'
+			'overflow_type': 'delivery',
+			'no_tolerance': 1
 		},
 		{
 			'source_dt': 'Delivery Note Item',
@@ -56,24 +57,10 @@
 			'join_field': 'so_detail',
 			'target_field': 'returned_qty',
 			'target_parent_dt': 'Sales Order',
-			# 'target_parent_field': 'per_delivered',
-			# 'target_ref_field': 'qty',
 			'source_field': '-1 * qty',
-			# 'percent_join_field': 'against_sales_order',
-			# 'overflow_type': 'delivery',
 			'extra_cond': """ and exists (select name from `tabDelivery Note` where name=`tabDelivery Note Item`.parent and is_return=1)"""
 		}]
 
-	def onload(self):
-		billed_qty = frappe.db.sql("""select sum(qty) from `tabSales Invoice Item`
-			where docstatus=1 and delivery_note=%s""", self.name)
-		if billed_qty:
-			total_qty = sum((item.qty for item in self.get("items")))
-			self.set_onload("billing_complete", (billed_qty[0][0] == total_qty))
-			
-		self.set_onload("has_return_entry", len(frappe.db.exists({"doctype": "Delivery Note", 
-			"is_return": 1, "return_against": self.name, "docstatus": 1})))
-
 	def before_print(self):
 		def toggle_print_hide(meta, fieldname):
 			df = meta.get_field(fieldname)
@@ -171,7 +158,7 @@
 
 	def validate_warehouse(self):
 		super(DeliveryNote, self).validate_warehouse()
-		
+
 		for d in self.get_item_list():
 			if frappe.db.get_value("Item", d['item_code'], "is_stock_item") == 1:
 				if not d['warehouse']:
@@ -199,6 +186,7 @@
 
 		# update delivered qty in sales order
 		self.update_prevdoc_status()
+		self.update_billing_status()
 
 		if not self.is_return:
 			self.check_credit_limit()
@@ -206,18 +194,15 @@
 		self.update_stock_ledger()
 		self.make_gl_entries()
 
-		frappe.db.set(self, 'status', 'Submitted')
-
-
 	def on_cancel(self):
 		self.check_stop_or_close_sales_order("against_sales_order")
 		self.check_next_docstatus()
 
 		self.update_prevdoc_status()
+		self.update_billing_status()
 
 		self.update_stock_ledger()
 
-		frappe.db.set(self, 'status', 'Cancelled')
 		self.cancel_packing_slips()
 
 		self.make_gl_entries_on_cancel()
@@ -280,6 +265,63 @@
 		self.notify_update()
 		clear_doctype_notifications(self)
 
+	def update_billing_status(self, update_modified=True):
+		updated_delivery_notes = [self.name]
+		for d in self.get("items"):
+			if d.si_detail and not d.so_detail:
+				d.db_set('billed_amt', d.amount, update_modified=update_modified)
+			elif d.so_detail:
+				updated_delivery_notes += update_billed_amount_based_on_so(d.so_detail, update_modified)
+
+		for dn in set(updated_delivery_notes):
+			dn_doc = self if (dn == self.name) else frappe.get_doc("Delivery Note", dn)
+			dn_doc.update_billing_percentage(update_modified=update_modified)
+
+		self.load_from_db()
+
+def update_billed_amount_based_on_so(so_detail, update_modified=True):
+	# Billed against Sales Order directly
+	billed_against_so = frappe.db.sql("""select sum(amount) from `tabSales Invoice Item`
+		where so_detail=%s and (dn_detail is null or dn_detail = '') and docstatus=1""", so_detail)
+	billed_against_so = billed_against_so and billed_against_so[0][0] or 0
+
+	# Get all Delivery Note Item rows against the Sales Order Item row
+	dn_details = frappe.db.sql("""select dn_item.name, dn_item.amount, dn_item.si_detail, dn_item.parent
+		from `tabDelivery Note Item` dn_item, `tabDelivery Note` dn
+		where dn.name=dn_item.parent and dn_item.so_detail=%s
+			and dn.docstatus=1 and dn.is_return = 0
+		order by dn.posting_date asc, dn.posting_time asc, dn.name asc""", so_detail, as_dict=1)
+
+	updated_dn = []
+	for dnd in dn_details:
+		billed_amt_agianst_dn = 0
+
+		# If delivered against Sales Invoice
+		if dnd.si_detail:
+			billed_amt_agianst_dn = flt(dnd.amount)
+			billed_against_so -= billed_amt_agianst_dn
+		else:
+			# Get billed amount directly against Delivery Note
+			billed_amt_agianst_dn = frappe.db.sql("""select sum(amount) from `tabSales Invoice Item`
+				where dn_detail=%s and docstatus=1""", dnd.name)
+			billed_amt_agianst_dn = billed_amt_agianst_dn and billed_amt_agianst_dn[0][0] or 0
+
+		# Distribute billed amount directly against SO between DNs based on FIFO
+		if billed_against_so and billed_amt_agianst_dn < dnd.amount:
+			pending_to_bill = flt(dnd.amount) - billed_amt_agianst_dn
+			if pending_to_bill <= billed_against_so:
+				billed_amt_agianst_dn += pending_to_bill
+				billed_against_so -= pending_to_bill
+			else:
+				billed_amt_agianst_dn += billed_against_so
+				billed_against_so = 0
+
+		frappe.db.set_value("Delivery Note Item", dnd.name, "billed_amt", billed_amt_agianst_dn, update_modified=update_modified)
+
+		updated_dn.append(dnd.parent)
+
+	return updated_dn
+
 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/stock/doctype/delivery_note/delivery_note_list.js b/erpnext/stock/doctype/delivery_note/delivery_note_list.js
index fbbf08f..f1ad929 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note_list.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_list.js
@@ -1,11 +1,15 @@
 frappe.listview_settings['Delivery Note'] = {
-	add_fields: ["customer", "customer_name", "base_grand_total", "per_installed",
+	add_fields: ["customer", "customer_name", "base_grand_total", "per_installed", "per_billed", 
 		"transporter_name", "grand_total", "is_return", "status"],
 	get_indicator: function(doc) {
 		if(cint(doc.is_return)==1) {
 			return [__("Return"), "darkgrey", "is_return,=,Yes"];
 		} else if(doc.status==="Closed") {
 			return [__("Closed"), "green", "status,=,Closed"];
-		} 
+		}  else if (flt(doc.per_billed, 2) < 100) {
+			return [__("To Bill"), "orange", "per_billed,<,100"];
+		} else if (flt(doc.per_billed, 2) == 100) {
+			return [__("Completed"), "green", "per_billed,=,100"];
+		}
 	}
 };
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index c3d8447..699d8b6 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -18,6 +18,7 @@
 from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos, SerialNoWarehouseError
 from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation \
 	import create_stock_reconciliation, set_valuation_method
+from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order, create_dn_against_so
 
 class TestDeliveryNote(unittest.TestCase):
 	def test_over_billing_against_dn(self):
@@ -405,6 +406,112 @@
 		
 		update_delivery_note_status(dn.name, "Closed")
 		self.assertEquals(frappe.db.get_value("Delivery Note", dn.name, "Status"), "Closed")
+		
+	def test_dn_billing_status_case1(self):
+		# SO -> DN -> SI
+		so = make_sales_order()
+		dn = create_dn_against_so(so.name, delivered_qty=2)
+		
+		self.assertEqual(dn.status, "To Bill")
+		self.assertEqual(dn.per_billed, 0)
+		
+		si = make_sales_invoice(dn.name)
+		si.submit()
+		
+		dn.load_from_db()
+		self.assertEqual(dn.get("items")[0].billed_amt, 200)
+		self.assertEqual(dn.per_billed, 100)
+		self.assertEqual(dn.status, "Completed")
+		
+	def test_dn_billing_status_case2(self):
+		# SO -> SI and SO -> DN1, DN2
+		from erpnext.selling.doctype.sales_order.sales_order import make_delivery_note, make_sales_invoice
+		
+		so = make_sales_order()
+		
+		si = make_sales_invoice(so.name)
+		si.get("items")[0].qty = 5
+		si.insert()
+		si.submit()
+		
+		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
+		
+		dn1 = make_delivery_note(so.name)
+		dn1.posting_time = "10:00"
+		dn1.get("items")[0].qty = 2
+		dn1.submit()
+		
+		self.assertEqual(dn1.get("items")[0].billed_amt, 200)
+		self.assertEqual(dn1.per_billed, 100)
+		self.assertEqual(dn1.status, "Completed")
+		
+		dn2 = make_delivery_note(so.name)
+		dn2.posting_time = "08:00"
+		dn2.get("items")[0].qty = 4
+		dn2.submit()
+		
+		dn1.load_from_db()
+		self.assertEqual(dn1.get("items")[0].billed_amt, 100)
+		self.assertEqual(dn1.per_billed, 50)
+		self.assertEqual(dn1.status, "To Bill")
+		
+		self.assertEqual(dn2.get("items")[0].billed_amt, 400)
+		self.assertEqual(dn2.per_billed, 100)
+		self.assertEqual(dn2.status, "Completed")
+		
+	def test_dn_billing_status_case3(self):
+		# SO -> DN1 -> SI and SO -> SI and SO -> DN2
+		from erpnext.selling.doctype.sales_order.sales_order \
+			import make_delivery_note, make_sales_invoice as make_sales_invoice_from_so
+		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
+		
+		so = make_sales_order()
+		
+		dn1 = make_delivery_note(so.name)
+		dn1.posting_time = "10:00"
+		dn1.get("items")[0].qty = 2
+		dn1.submit()
+
+		si1 = make_sales_invoice(dn1.name)
+		si1.submit()
+		
+		dn1.load_from_db()
+		self.assertEqual(dn1.per_billed, 100)
+		
+		si2 = make_sales_invoice_from_so(so.name)
+		si2.get("items")[0].qty = 4
+		si2.submit()
+		
+		dn2 = make_delivery_note(so.name)
+		dn2.posting_time = "08:00"
+		dn2.get("items")[0].qty = 5
+		dn2.submit()
+		
+		dn1.load_from_db()
+		self.assertEqual(dn1.get("items")[0].billed_amt, 200)
+		self.assertEqual(dn1.per_billed, 100)
+		self.assertEqual(dn1.status, "Completed")
+		
+		self.assertEqual(dn2.get("items")[0].billed_amt, 400)
+		self.assertEqual(dn2.per_billed, 80)
+		self.assertEqual(dn2.status, "To Bill")
+		
+	def test_dn_billing_status_case4(self):
+		# SO -> SI -> DN
+		from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
+		from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_delivery_note
+		
+		so = make_sales_order()
+		
+		si = make_sales_invoice(so.name)
+		si.submit()
+		
+		dn = make_delivery_note(si.name)
+		dn.submit()
+		
+		self.assertEqual(dn.get("items")[0].billed_amt, 1000)
+		self.assertEqual(dn.per_billed, 100)
+		self.assertEqual(dn.status, "Completed")
 
 def create_delivery_note(**args):
 	dn = frappe.new_doc("Delivery Note")
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 2dbdd96..dcafc1e 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -23,6 +23,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -48,6 +49,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -74,6 +76,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -97,6 +100,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -119,6 +123,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -142,6 +147,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -166,6 +172,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -190,6 +197,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -213,6 +221,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -237,6 +246,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -259,6 +269,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -283,6 +294,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -310,6 +322,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -337,6 +350,7 @@
    "oldfieldtype": "Float", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -360,6 +374,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -385,6 +400,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -412,6 +428,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -435,6 +452,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -460,6 +478,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -487,6 +506,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -510,6 +530,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -535,6 +556,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -562,6 +584,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -587,6 +610,7 @@
    "options": "Pricing Rule", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -609,6 +633,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -633,6 +658,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -657,6 +683,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -679,6 +706,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -703,6 +731,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -727,6 +756,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -749,6 +779,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -774,6 +805,7 @@
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -802,6 +834,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -826,6 +859,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -851,6 +885,7 @@
    "options": "Batch", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -875,6 +910,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -901,6 +937,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -929,6 +966,7 @@
    "options": "Item Group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -954,6 +992,7 @@
    "options": "Brand", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -980,6 +1019,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1001,6 +1041,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1024,6 +1065,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1049,6 +1091,7 @@
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1066,13 +1109,14 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Against Sales Order", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Sales Order", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1096,6 +1140,7 @@
    "options": "Sales Invoice", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1120,11 +1165,12 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
    "set_only_once": 0, 
    "unique": 0, 
    "width": "150px"
@@ -1145,6 +1191,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1169,6 +1216,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1179,6 +1227,31 @@
    "width": "150px"
   }, 
   {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "billed_amt", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Billed Amt", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1195,6 +1268,7 @@
    "oldfieldtype": "Check", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1212,7 +1286,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:45.014492", 
+ "modified": "2016-01-07 05:59:56.448357", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note Item", 
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index 55295f4..9ce603c 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -22,19 +22,19 @@
 					"item_code": frm.doc.name
 				}
 				frappe.set_route("query-report", "Stock Balance");
-			});
+			}, __("View"));
 			frm.add_custom_button(__("Ledger"), function() {
 				frappe.route_options = {
 					"item_code": frm.doc.name
 				}
 				frappe.set_route("query-report", "Stock Ledger");
-			});
+			}, __("View"));
 			frm.add_custom_button(__("Projected"), function() {
 				frappe.route_options = {
 					"item_code": frm.doc.name
 				}
 				frappe.set_route("query-report", "Stock Projected Qty");
-			});
+			}, __("View"));
 		}
 
 		// make sensitive fields(has_serial_no, is_stock_item, valuation_method)
@@ -48,11 +48,12 @@
 			frm.set_intro(__("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"), true);
 			frm.add_custom_button(__("Show Variants"), function() {
 				frappe.set_route("List", "Item", {"variant_of": frm.doc.name});
-			}, "icon-list", "btn-default");
+			}, __("View"));
 
-			frm.add_custom_button(__("Make Variant"), function() {
+			frm.add_custom_button(__("Variant"), function() {
 				erpnext.item.make_variant()
-			}, "icon-list", "btn-default");
+			}, __("Make"));
+			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 		}
 		if (frm.doc.variant_of) {
 			frm.set_intro(__("This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set", [frm.doc.variant_of]), true);
@@ -191,8 +192,8 @@
 
 	edit_prices_button: function(frm) {
 		frm.add_custom_button(__("Add / Edit Prices"), function() {
-			frappe.set_route("Report", "Item Price", {"item_code": frm.doc.name});
-		}, "icon-money", "btn-default");
+			frappe.set_route("List", "Item Price", {"item_code": frm.doc.name});
+		}, __("View"));
 	},
 
 	weight_to_validate: function(frm){
@@ -236,7 +237,7 @@
 			frappe.call({
 				method:"erpnext.controllers.item_variant.get_variant",
 				args: {
-					"item": cur_frm.doc.name,
+					"template": cur_frm.doc.name,
 					"args": d.get_values()
 				},
 				callback: function(r) {
@@ -320,6 +321,10 @@
 		frm.toggle_display("attributes", frm.doc.has_variants || frm.doc.variant_of);
 		frm.fields_dict.attributes.grid.toggle_reqd("attribute_value", frm.doc.variant_of ? 1 : 0);
 		frm.fields_dict.attributes.grid.set_column_disp("attribute_value", frm.doc.variant_of ? 1 : 0);
+
+		frm.toggle_enable("attributes", !frm.doc.variant_of);
+		frm.fields_dict.attributes.grid.toggle_enable("attribute", !frm.doc.variant_of);
+		frm.fields_dict.attributes.grid.toggle_enable("attribute_value", !frm.doc.variant_of);
 	}
 });
 
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 746929a..b7d866d 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -300,7 +300,7 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Image View", 
    "length": 0, 
    "no_copy": 0, 
@@ -1316,7 +1316,7 @@
    "collapsible": 0, 
    "depends_on": "eval:doc.is_purchase_item", 
    "fieldname": "manufacturer", 
-   "fieldtype": "Data", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
@@ -1324,6 +1324,7 @@
    "label": "Manufacturer", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Manufacturer", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -2337,7 +2338,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2015-12-07 14:14:33.563149", 
+ "modified": "2016-01-17 11:14:10.169713", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item", 
@@ -2357,7 +2358,8 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "Item Manager", 
+   "restrict": 0, 
+   "role": "Material Master Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
@@ -2377,7 +2379,8 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "Stock Manager", 
+   "restrict": 0, 
+   "role": "Material Manager", 
    "set_user_permissions": 0, 
    "share": 0, 
    "submit": 0, 
@@ -2385,7 +2388,7 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
+   "apply_user_permissions": 1, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -2397,7 +2400,8 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "Stock User", 
+   "restrict": 0, 
+   "role": "Material User", 
    "set_user_permissions": 0, 
    "share": 0, 
    "submit": 0, 
@@ -2405,7 +2409,7 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
+   "apply_user_permissions": 1, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -2417,6 +2421,7 @@
    "print": 0, 
    "read": 1, 
    "report": 0, 
+   "restrict": 0, 
    "role": "Sales User", 
    "set_user_permissions": 0, 
    "share": 0, 
@@ -2425,7 +2430,7 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
+   "apply_user_permissions": 1, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -2437,6 +2442,7 @@
    "print": 0, 
    "read": 1, 
    "report": 0, 
+   "restrict": 0, 
    "role": "Purchase User", 
    "set_user_permissions": 0, 
    "share": 0, 
@@ -2445,7 +2451,7 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
+   "apply_user_permissions": 1, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -2457,6 +2463,7 @@
    "print": 0, 
    "read": 1, 
    "report": 0, 
+   "restrict": 0, 
    "role": "Maintenance User", 
    "set_user_permissions": 0, 
    "share": 0, 
@@ -2465,7 +2472,7 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
+   "apply_user_permissions": 1, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -2477,6 +2484,7 @@
    "print": 0, 
    "read": 1, 
    "report": 0, 
+   "restrict": 0, 
    "role": "Accounts User", 
    "set_user_permissions": 0, 
    "share": 0, 
@@ -2485,7 +2493,7 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
+   "apply_user_permissions": 1, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -2497,6 +2505,7 @@
    "print": 0, 
    "read": 1, 
    "report": 0, 
+   "restrict": 0, 
    "role": "Manufacturing User", 
    "set_user_permissions": 0, 
    "share": 0, 
@@ -2507,5 +2516,6 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "item_name,description,item_group,customer_code", 
+ "sort_order": "DESC", 
  "title_field": "item_name"
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 0fc0faa..80cba88 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -30,9 +30,18 @@
 		self.get("__onload").sle_exists = self.check_if_sle_exists()
 
 	def autoname(self):
-		if frappe.db.get_default("item_naming_by")=="Naming Series" and not self.variant_of:
-			from frappe.model.naming import make_autoname
-			self.item_code = make_autoname(self.naming_series+'.#####')
+		if frappe.db.get_default("item_naming_by")=="Naming Series":
+			if self.variant_of:
+				if not self.item_code:
+					item_code_suffix = ""
+					for attribute in self.attributes:
+						attribute_abbr = frappe.db.get_value("Item Attribute Value",
+							{"parent": attribute.attribute, "attribute_value": attribute.attribute_value}, "abbr")
+						item_code_suffix += "-" + str(attribute_abbr or attribute.attribute_value)
+					self.item_code = str(self.variant_of) + item_code_suffix
+			else:
+				from frappe.model.naming import make_autoname
+				self.item_code = make_autoname(self.naming_series+'.#####')
 		elif not self.item_code:
 			msgprint(_("Item Code is mandatory because Item is not automatically numbered"), raise_exception=1)
 
@@ -541,7 +550,8 @@
 		if self.variant_of:
 			template_uom = frappe.db.get_value("Item", self.variant_of, "stock_uom")
 			if template_uom != self.stock_uom:
-				frappe.throw(_("Default Unit of Measure for Variant must be same as Template"))
+				frappe.throw(_("Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'")
+					.format(self.stock_uom, template_uom))
 
 	def validate_attributes(self):
 		if self.has_variants or self.variant_of:
@@ -562,11 +572,10 @@
 					frappe.throw(_("Please specify Attribute Value for attribute {0}").format(d.attribute))
 				args[d.attribute] = d.attribute_value
 
-			if self.variant_of:
-				# test this during insert because naming is based on item_code and we cannot use condition like self.name != variant
-				variant = get_variant(self.variant_of, args)
-				if variant and self.get("__islocal"):
-					frappe.throw(_("Item variant {0} exists with same attributes").format(variant), ItemVariantExistsError)
+			variant = get_variant(self.variant_of, args, self.name)
+			if variant:
+				frappe.throw(_("Item variant {0} exists with same attributes")
+					.format(variant), ItemVariantExistsError)
 
 def validate_end_of_life(item_code, end_of_life=None, disabled=None, verbose=1):
 	if (not end_of_life) or (disabled is None):
diff --git a/erpnext/stock/doctype/item/item_list.js b/erpnext/stock/doctype/item/item_list.js
index 1074bd0..fffc7fe 100644
--- a/erpnext/stock/doctype/item/item_list.js
+++ b/erpnext/stock/doctype/item/item_list.js
@@ -1,6 +1,7 @@
 frappe.listview_settings['Item'] = {
 	add_fields: ["item_name", "stock_uom", "item_group", "image", "variant_of",
 		"has_variants", "end_of_life", "disabled", "is_sales_item"],
+	filters: [["disabled", "=", "0"]],
 
 	get_indicator: function(doc) {
 		if (doc.disabled) {
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index bd6fe28..e5392d4 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -93,20 +93,21 @@
 			"price_list_currency": "_Test Currency",
 			"plc_conversion_rate": 1,
 			"order_type": "Sales",
-			"transaction_type": "selling"
+			"customer": "_Test Customer"
 		})
 
 		for key, value in to_check.iteritems():
 			self.assertEquals(value, details.get(key))
 
 	def test_make_item_variant(self):
-		frappe.delete_doc_if_exists("Item", "_Test Variant Item-L")
+		frappe.delete_doc_if_exists("Item", "_Test Variant Item-L", force=1)
 
 		variant = create_variant("_Test Variant Item", {"Test Size": "Large"})
 		variant.save()
 
 		# doing it again should raise error
 		variant = create_variant("_Test Variant Item", {"Test Size": "Large"})
+		variant.item_code = "_Test Variant Item-L-duplicate"
 		self.assertRaises(ItemVariantExistsError, variant.save)
 
 	def test_make_item_variant_with_numeric_values(self):
diff --git a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
index 9aaab18..846537a 100644
--- a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
+++ b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
@@ -1,6 +1,6 @@
 {
  "allow_copy": 0, 
- "allow_import": 1, 
+ "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "", 
  "creation": "2014-09-26 03:52:31.161255", 
@@ -25,6 +25,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -49,6 +50,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -60,13 +62,14 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-edit", 
+ "idx": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:48.249491", 
+ "modified": "2016-01-06 01:47:08.939754", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Attribute Value", 
diff --git a/erpnext/stock/doctype/item_variant/item_variant.json b/erpnext/stock/doctype/item_variant/item_variant.json
index e51635a..b7cc9ea 100644
--- a/erpnext/stock/doctype/item_variant/item_variant.json
+++ b/erpnext/stock/doctype/item_variant/item_variant.json
@@ -1,6 +1,6 @@
 {
  "allow_copy": 0, 
- "allow_import": 1, 
+ "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "", 
  "creation": "2014-09-26 03:54:04.370259", 
@@ -26,6 +26,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -50,6 +51,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -61,13 +63,14 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "", 
+ "idx": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:48.592686", 
+ "modified": "2016-01-06 01:47:09.067886", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Variant", 
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 740a514..9a86a6c 100644
--- a/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
+++ b/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
@@ -1,6 +1,6 @@
 {
  "allow_copy": 0, 
- "allow_import": 1, 
+ "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "", 
  "creation": "2015-05-19 05:12:30.344797", 
@@ -26,6 +26,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -48,6 +49,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -73,6 +75,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -97,6 +100,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -120,6 +124,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -144,6 +149,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -168,6 +174,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -190,6 +197,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -214,6 +222,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -225,13 +234,14 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "", 
+ "idx": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:48.641487", 
+ "modified": "2016-01-06 01:47:09.098783", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Variant Attribute", 
diff --git a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
index 89f3ad5..7f190d2 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
@@ -15,20 +15,32 @@
 		pr = frappe.copy_doc(pr_test_records[0])
 		pr.submit()
 
-		bin_details = frappe.db.get_value("Bin", {"warehouse": "_Test Warehouse - _TC",
-			"item_code": "_Test Item"},	["actual_qty", "stock_value"], as_dict=1)
+		last_sle = frappe.db.get_value("Stock Ledger Entry", {
+				"voucher_type": pr.doctype,
+				"voucher_no": pr.name,
+				"item_code": "_Test Item",
+				"warehouse": "_Test Warehouse - _TC"
+			},
+			fieldname=["qty_after_transaction", "stock_value"],
+			as_dict=1)
 
 		self.submit_landed_cost_voucher(pr)
 
 		pr_lc_value = frappe.db.get_value("Purchase Receipt Item", {"parent": pr.name}, "landed_cost_voucher_amount")
 		self.assertEquals(pr_lc_value, 25.0)
 
-		bin_details_after_lcv = frappe.db.get_value("Bin", {"warehouse": "_Test Warehouse - _TC",
-			"item_code": "_Test Item"},	["actual_qty", "stock_value"], as_dict=1)
+		last_sle_after_landed_cost = frappe.db.get_value("Stock Ledger Entry", {
+				"voucher_type": pr.doctype,
+				"voucher_no": pr.name,
+				"item_code": "_Test Item",
+				"warehouse": "_Test Warehouse - _TC"
+			},
+			fieldname=["qty_after_transaction", "stock_value"],
+			as_dict=1)
 
-		self.assertEqual(bin_details.actual_qty, bin_details_after_lcv.actual_qty)
+		self.assertEqual(last_sle.qty_after_transaction, last_sle_after_landed_cost.qty_after_transaction)
 
-		self.assertEqual(bin_details_after_lcv.stock_value - bin_details.stock_value, 25.0)
+		self.assertEqual(last_sle_after_landed_cost.stock_value - last_sle.stock_value, 25.0)
 
 		gl_entries = get_gl_entries("Purchase Receipt", pr.name)
 
diff --git a/erpnext/stock/doctype/manufacturer/__init__.py b/erpnext/stock/doctype/manufacturer/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/stock/doctype/manufacturer/__init__.py
diff --git a/erpnext/stock/doctype/manufacturer/manufacturer.json b/erpnext/stock/doctype/manufacturer/manufacturer.json
new file mode 100644
index 0000000..623e352
--- /dev/null
+++ b/erpnext/stock/doctype/manufacturer/manufacturer.json
@@ -0,0 +1,224 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:short_name", 
+ "creation": "2016-01-17 11:04:52.761731", 
+ "custom": 0, 
+ "description": "Manufacturers used in Items", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "Limited to 12 characters", 
+   "fieldname": "short_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Short Name", 
+   "length": 10, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "full_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Full Name", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "website", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Website", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "data_6", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Country", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Country", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "logo", 
+   "fieldtype": "Attach Image", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Logo", 
+   "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "notes", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Notes", 
+   "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, 
+ "icon": "icon-certificate", 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-01-17 11:39:36.686949", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Manufacturer", 
+ "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": "Stock 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": "Stock User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "short_name, full_name", 
+ "sort_field": "", 
+ "sort_order": "DESC", 
+ "title_field": "short_name"
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/manufacturer/manufacturer.py b/erpnext/stock/doctype/manufacturer/manufacturer.py
new file mode 100644
index 0000000..7b85b05
--- /dev/null
+++ b/erpnext/stock/doctype/manufacturer/manufacturer.py
@@ -0,0 +1,10 @@
+# -*- 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 Manufacturer(Document):
+	pass
diff --git a/erpnext/stock/doctype/manufacturer/test_manufacturer.py b/erpnext/stock/doctype/manufacturer/test_manufacturer.py
new file mode 100644
index 0000000..996f6b2
--- /dev/null
+++ b/erpnext/stock/doctype/manufacturer/test_manufacturer.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Manufacturer')
+
+class TestManufacturer(unittest.TestCase):
+	pass
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 0efc8bc..0bb4815 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -34,33 +34,36 @@
 		}
 
 		if(doc.docstatus == 1 && doc.status != 'Stopped') {
-			if(doc.material_request_type === "Purchase")
-				cur_frm.add_custom_button(__("Make Supplier Quotation"),
-					this.make_supplier_quotation,
-						frappe.boot.doctype_icons["Supplier Quotation"]);
-
-			if(doc.material_request_type === "Material Transfer" && doc.status === "Submitted")
-				cur_frm.add_custom_button(__("Transfer Material"), this.make_stock_entry,
-					frappe.boot.doctype_icons["Stock Entry"]);
-
-			if(doc.material_request_type === "Material Issue" && doc.status === "Submitted")
-				cur_frm.add_custom_button(__("Issue Material"), this.make_stock_entry,
-					frappe.boot.doctype_icons["Stock Entry"]);
 
 			if(flt(doc.per_ordered, 2) < 100) {
+				// make
+				if(doc.material_request_type === "Material Transfer" && doc.status === "Submitted")
+					cur_frm.add_custom_button(__("Transfer Material"),
+					this.make_stock_entry, __("Make"));
+
+				if(doc.material_request_type === "Material Issue" && doc.status === "Submitted")
+					cur_frm.add_custom_button(__("Issue Material"),
+					this.make_stock_entry, __("Make"));
+
 				if(doc.material_request_type === "Purchase")
-					cur_frm.add_custom_button(__('Make Purchase Order'),
-						this.make_purchase_order, frappe.boot.doctype_icons["Purchase Order"]);
+					cur_frm.add_custom_button(__('Purchase Order'),
+						this.make_purchase_order, __("Make"));
 
+				if(doc.material_request_type === "Purchase")
+					cur_frm.add_custom_button(__("Supplier Quotation"),
+					this.make_supplier_quotation, __("Make"));
+
+				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
+
+				// stop
 				cur_frm.add_custom_button(__('Stop'),
-					cur_frm.cscript['Stop Material Request'], "icon-exclamation", "btn-default");
+					cur_frm.cscript['Stop Material Request'], __("Status"));
+
 			}
-
-
 		}
 
 		if (this.frm.doc.docstatus===0) {
-			cur_frm.add_custom_button(__('From Sales Order'),
+			cur_frm.add_custom_button(__('Sales Order'),
 				function() {
 					frappe.model.map_current_doc({
 						method: "erpnext.selling.doctype.sales_order.sales_order.make_material_request",
@@ -72,12 +75,12 @@
 							company: cur_frm.doc.company
 						}
 					})
-				}, "icon-download", "btn-default");
+				}, __("Get items from"));
 		}
 
 		if(doc.docstatus == 1 && doc.status == 'Stopped')
 			cur_frm.add_custom_button(__('Re-open'),
-				cur_frm.cscript['Unstop Material Request'], "icon-check");
+				cur_frm.cscript['Unstop Material Request'], __("Status"));
 
 	},
 
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index fd82784..74a8fa1 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -11,7 +11,6 @@
 from frappe import _
 from frappe.model.mapper import get_mapped_doc
 from erpnext.stock.stock_balance import update_bin_qty, get_indented_qty
-
 from erpnext.controllers.buying_controller import BuyingController
 
 
@@ -24,7 +23,7 @@
 		return _("{0}: {1}").format(self.status, self.material_request_type)
 
 	def check_if_already_pulled(self):
-		pass#if self.[d.sales_order_no for d in self.get('items')]
+		pass
 
 	def validate_qty_against_so(self):
 		so_items = {} # Format --> {'SO/00001': {'Item/001': 120, 'Item/002': 24}}
@@ -123,6 +122,10 @@
 					from `tabStock Entry Detail` where material_request = %s
 					and material_request_item = %s and docstatus = 1""",
 					(self.name, d.name))[0][0])
+
+				if d.ordered_qty and d.ordered_qty > d.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))
+
 				frappe.db.set_value(d.doctype, d.name, "ordered_qty", d.ordered_qty)
 
 			# note: if qty is 0, its row is still counted in len(self.get("items"))
@@ -178,6 +181,9 @@
 
 @frappe.whitelist()
 def make_purchase_order(source_name, target_doc=None):
+	def postprocess(source, target_doc):
+		set_missing_values(source, target_doc)
+
 	doclist = get_mapped_doc("Material Request", source_name, 	{
 		"Material Request": {
 			"doctype": "Purchase Order",
@@ -198,7 +204,7 @@
 			"postprocess": update_item,
 			"condition": lambda doc: doc.ordered_qty < doc.qty
 		}
-	}, target_doc, set_missing_values)
+	}, target_doc, postprocess)
 
 	return doclist
 
@@ -214,11 +220,11 @@
 
 	def postprocess(source, target_doc):
 		target_doc.supplier = source_name
-		set_missing_values(source, target_doc)
+
 		target_doc.set("items", [d for d in target_doc.get("items")
 			if d.get("item_code") in supplier_items and d.get("qty") > 0])
-
-		return target_doc
+		
+		set_missing_values(source, target_doc)
 
 	for mr in material_requests:
 		target_doc = get_mapped_doc("Material Request", mr, 	{
@@ -260,6 +266,9 @@
 
 @frappe.whitelist()
 def make_supplier_quotation(source_name, target_doc=None):
+	def postprocess(source, target_doc):
+		set_missing_values(source, target_doc)
+
 	doclist = get_mapped_doc("Material Request", source_name, {
 		"Material Request": {
 			"doctype": "Supplier Quotation",
@@ -276,7 +285,7 @@
 				"parenttype": "prevdoc_doctype"
 			}
 		}
-	}, target_doc, set_missing_values)
+	}, target_doc, postprocess)
 
 	return doclist
 
diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py
index 5cd7de1..37d985e 100644
--- a/erpnext/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py
@@ -106,6 +106,7 @@
 		mr.submit()
 
 		# check if per complete is None
+		mr.load_from_db()
 		self.assertEquals(mr.per_ordered, 0)
 		self.assertEquals(mr.get("items")[0].ordered_qty, 0)
 		self.assertEquals(mr.get("items")[1].ordered_qty, 0)
@@ -173,6 +174,7 @@
 		mr.submit()
 
 		# check if per complete is None
+		mr.load_from_db()
 		self.assertEquals(mr.per_ordered, 0)
 		self.assertEquals(mr.get("items")[0].ordered_qty, 0)
 		self.assertEquals(mr.get("items")[1].ordered_qty, 0)
@@ -262,6 +264,7 @@
 		mr.submit()
 
 		# check if per complete is None
+		mr.load_from_db()
 		self.assertEquals(mr.per_ordered, 0)
 		self.assertEquals(mr.get("items")[0].ordered_qty, 0)
 		self.assertEquals(mr.get("items")[1].ordered_qty, 0)
@@ -276,8 +279,8 @@
 			"fiscal_year": "_Test Fiscal Year 2013",
 		})
 		se_doc.get("items")[0].update({
-			"qty": 60.0,
-			"transfer_qty": 60.0,
+			"qty": 54.0,
+			"transfer_qty": 54.0,
 			"s_warehouse": "_Test Warehouse 1 - _TC",
 			"basic_rate": 1.0
 		})
@@ -307,7 +310,7 @@
 		mr.load_from_db()
 
 		self.assertEquals(mr.per_ordered, 100)
-		self.assertEquals(mr.get("items")[0].ordered_qty, 60.0)
+		self.assertEquals(mr.get("items")[0].ordered_qty, 54.0)
 		self.assertEquals(mr.get("items")[1].ordered_qty, 3.0)
 
 		current_requested_qty_item1 = self._get_requested_qty("_Test Item Home Desktop 100", "_Test Warehouse - _TC")
@@ -383,7 +386,7 @@
 	def _get_requested_qty(self, item_code, warehouse):
 		return flt(frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, "indented_qty"))
 
-	def test_make_stock_entry_for_Material_Issue(self):
+	def test_make_stock_entry_for_material_issue(self):
 		from erpnext.stock.doctype.material_request.material_request import make_stock_entry
 
 		mr = frappe.copy_doc(test_records[0]).insert()
@@ -422,13 +425,13 @@
 
 		se_doc = make_stock_entry(mr.name)
 		se_doc.fiscal_year = "_Test Fiscal Year 2014"
-		se_doc.get("items")[0].qty = 60.0
+		se_doc.get("items")[0].qty = 54.0
 		se_doc.insert()
 		se_doc.submit()
 
 		# check if per complete is as expected
 		mr.load_from_db()
-		self.assertEquals(mr.get("items")[0].ordered_qty, 60.0)
+		self.assertEquals(mr.get("items")[0].ordered_qty, 54.0)
 		self.assertEquals(mr.get("items")[1].ordered_qty, 3.0)
 
 		#testing bin requested qty after issuing stock against material request
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 93f1b08..7cf7ae9 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -38,7 +38,7 @@
 
 		if(!this.frm.doc.is_return && this.frm.doc.status!="Closed") {
 			if(this.frm.doc.docstatus==0) {
-				cur_frm.add_custom_button(__('From Purchase Order'),
+				cur_frm.add_custom_button(__('Purchase Order'),
 					function() {
 						frappe.model.map_current_doc({
 							method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_receipt",
@@ -51,25 +51,26 @@
 								company: cur_frm.doc.company
 							}
 						})
-				});
+				}, __("Get items from"));
 			}
 
 			if(this.frm.doc.docstatus == 1 && this.frm.doc.status!="Closed") {
-				cur_frm.add_custom_button(__('Return'), this.make_purchase_return);
-				if(this.frm.doc.__onload && !this.frm.doc.__onload.billing_complete) {
-					cur_frm.add_custom_button(__('Invoice'),
-						 this.make_purchase_invoice).addClass("btn-primary");
+				if (this.frm.has_perm("submit")) {
+					cur_frm.add_custom_button(__("Close"), this.close_purchase_receipt, __("Status"))
 				}
-				if (this.frm.has_perm("submit") && 
-					this.frm.doc.__onload && this.frm.doc.__onload.has_return_entry) {
-						cur_frm.add_custom_button(__("Close"), this.close_purchase_receipt)
+				
+				cur_frm.add_custom_button(__('Return'), this.make_purchase_return, __("Make"));
+				
+				if(flt(this.frm.doc.per_billed) < 100) {
+					cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice, __("Make"));
 				}
+				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 			}
 		}
 
 
 		if(this.frm.doc.docstatus==1 && this.frm.doc.status === "Closed" && this.frm.has_perm("submit")) {
-			cur_frm.add_custom_button(__('Re-open'), this.reopen_purchase_receipt)
+			cur_frm.add_custom_button(__('Reopen'), this.reopen_purchase_receipt, __("Status"))
 		}
 
 		this.frm.toggle_reqd("supplier_warehouse", this.frm.doc.is_subcontracted==="Yes");
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 1764ed9..47069ea 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -644,7 +644,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Get Current Stock", 
+   "label": "Get current stock", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
@@ -1171,6 +1171,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "base_discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "column_break_44", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1194,6 +1219,30 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "discount_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1219,31 +1268,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "base_discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 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, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "section_break_46", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1788,7 +1812,7 @@
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
-   "options": "\nDraft\nSubmitted\nCancelled\nClosed", 
+   "options": "\nDraft\nTo Bill\nCompleted\nCancelled\nClosed", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
@@ -1910,6 +1934,30 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "per_billed", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "% Amount Billed", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "description": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
@@ -2254,7 +2302,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2015-12-01 00:48:26.728603", 
+ "modified": "2016-01-15 04:14:16.311445", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt", 
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index b20617e..1d87238 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -46,16 +46,6 @@
 			'extra_cond': """ and exists (select name from `tabPurchase Receipt` where name=`tabPurchase Receipt Item`.parent and is_return=1)"""
 		}]
 
-	def onload(self):
-		billed_qty = frappe.db.sql("""select sum(qty) from `tabPurchase Invoice Item`
-			where purchase_receipt=%s and docstatus=1""", self.name)
-		if billed_qty:
-			total_qty = sum((item.qty for item in self.get("items")))
-			self.set_onload("billing_complete", (billed_qty[0][0] == total_qty))
-			
-		self.set_onload("has_return_entry", len(frappe.db.exists({"doctype": "Purchase Receipt", 
-			"is_return": 1, "return_against": self.name, "docstatus": 1})))
-
 	def validate(self):
 		super(PurchaseReceipt, self).validate()
 
@@ -99,7 +89,7 @@
 			if flt(d.rejected_qty) and not d.rejected_warehouse:
 				d.rejected_warehouse = self.rejected_warehouse
 				if not d.rejected_warehouse:
-					frappe.throw(_("Rejected Warehouse is mandatory against regected item"))
+					frappe.throw(_("Row #{0}: Rejected Warehouse is mandatory against rejected Item {1}").format(d.idx, d.item_code))
 
 	# validate accepted and rejected qty
 	def validate_accepted_rejected_qty(self):
@@ -243,6 +233,8 @@
 		self.update_prevdoc_status()
 		self.update_ordered_qty()
 
+		self.update_billing_status()
+
 		if not self.is_return:
 			purchase_controller.update_last_purchase_rate(self, 1)
 
@@ -281,6 +273,8 @@
 		# Must be called after updating received qty in PO
 		self.update_ordered_qty()
 
+		self.update_billing_status()
+
 		if not self.is_return:
 			pc_obj.update_last_purchase_rate(self, 0)
 
@@ -436,6 +430,54 @@
 		self.notify_update()
 		clear_doctype_notifications(self)
 
+	def update_billing_status(self, update_modified=True):
+		updated_pr = [self.name]
+		for d in self.get("items"):
+			if d.prevdoc_detail_docname:
+				updated_pr += update_billed_amount_based_on_po(d.prevdoc_detail_docname, update_modified)
+
+		for pr in set(updated_pr):
+			pr_doc = self if (pr == self.name) else frappe.get_doc("Purchase Receipt", pr)
+			pr_doc.update_billing_percentage(update_modified=update_modified)
+
+		self.load_from_db()
+
+def update_billed_amount_based_on_po(po_detail, update_modified=True):
+	# Billed against Sales Order directly
+	billed_against_po = frappe.db.sql("""select sum(amount) from `tabPurchase Invoice Item`
+		where po_detail=%s and (pr_detail is null or pr_detail = '') and docstatus=1""", po_detail)
+	billed_against_po = billed_against_po and billed_against_po[0][0] or 0
+
+	# Get all Delivery Note Item rows against the Sales Order Item row
+	pr_details = frappe.db.sql("""select pr_item.name, pr_item.amount, pr_item.parent
+		from `tabPurchase Receipt Item` pr_item, `tabPurchase Receipt` pr
+		where pr.name=pr_item.parent and pr_item.prevdoc_detail_docname=%s
+			and pr.docstatus=1 and pr.is_return = 0
+		order by pr.posting_date asc, pr.posting_time asc, pr.name asc""", po_detail, as_dict=1)
+
+	updated_pr = []
+	for pr_item in pr_details:
+		# Get billed amount directly against Purchase Receipt
+		billed_amt_agianst_pr = frappe.db.sql("""select sum(amount) from `tabPurchase Invoice Item`
+			where pr_detail=%s and docstatus=1""", pr_item.name)
+		billed_amt_agianst_pr = billed_amt_agianst_pr and billed_amt_agianst_pr[0][0] or 0
+
+		# Distribute billed amount directly against PO between PRs based on FIFO
+		if billed_against_po and billed_amt_agianst_pr < pr_item.amount:
+			pending_to_bill = flt(pr_item.amount) - billed_amt_agianst_pr
+			if pending_to_bill <= billed_against_po:
+				billed_amt_agianst_pr += pending_to_bill
+				billed_against_po -= pending_to_bill
+			else:
+				billed_amt_agianst_pr += billed_against_po
+				billed_against_po = 0
+
+		frappe.db.set_value("Purchase Receipt Item", pr_item.name, "billed_amt", billed_amt_agianst_pr, update_modified=update_modified)
+
+		updated_pr.append(pr_item.parent)
+
+	return updated_pr
+
 @frappe.whitelist()
 def make_purchase_invoice(source_name, target_doc=None):
 	from frappe.model.mapper import get_mapped_doc
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js
index 6314899..5c57fb5 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js
@@ -1,11 +1,15 @@
 frappe.listview_settings['Purchase Receipt'] = {
 	add_fields: ["supplier", "supplier_name", "base_grand_total", "is_subcontracted",
-		"transporter_name", "is_return", "status"],
+		"transporter_name", "is_return", "status", "per_billed"],
 	get_indicator: function(doc) {
 		if(cint(doc.is_return)==1) {
 			return [__("Return"), "darkgrey", "is_return,=,Yes"];
 		} else if(doc.status==="Closed") {
 			return [__("Closed"), "green", "status,=,Closed"];
-		} 
+		}  else if (flt(doc.per_billed, 2) < 100) {
+			return [__("To Bill"), "orange", "per_billed,<,100"];
+		} else if (flt(doc.per_billed, 2) == 100) {
+			return [__("Completed"), "green", "per_billed,=,100"];
+		}
 	}
 };
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 8aa9761..dc81405 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -7,11 +7,10 @@
 import frappe
 import frappe.defaults
 from frappe.utils import cint, flt, cstr
+from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
 
 class TestPurchaseReceipt(unittest.TestCase):
 	def test_make_purchase_invoice(self):
-		from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
-
 		pr = make_purchase_receipt(do_not_save=True)
 		self.assertRaises(frappe.ValidationError, make_purchase_invoice, pr.name)
 		pr.submit()
@@ -185,6 +184,45 @@
 		update_purchase_receipt_status(pr.name, "Closed")
 		self.assertEquals(frappe.db.get_value("Purchase Receipt", pr.name, "status"), "Closed")
 		
+	def test_pr_billing_status(self):
+		# PO -> PR1 -> PI and PO -> PI and PO -> PR2
+		from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
+		from erpnext.buying.doctype.purchase_order.purchase_order \
+			import make_purchase_receipt, make_purchase_invoice as make_purchase_invoice_from_po
+		
+		po = create_purchase_order()
+		
+		pr1 = make_purchase_receipt(po.name)
+		pr1.posting_time = "10:00"
+		pr1.get("items")[0].received_qty = 2
+		pr1.get("items")[0].qty = 2
+		pr1.submit()
+		
+		pi1 = make_purchase_invoice(pr1.name)
+		pi1.submit()
+		
+		pr1.load_from_db()
+		self.assertEqual(pr1.per_billed, 100)
+		
+		pi2 = make_purchase_invoice_from_po(po.name)
+		pi2.get("items")[0].qty = 4
+		pi2.submit()
+		
+		pr2 = make_purchase_receipt(po.name)
+		pr2.posting_time = "08:00"
+		pr2.get("items")[0].received_qty = 5
+		pr2.get("items")[0].qty = 5
+		pr2.submit()
+		
+		pr1.load_from_db()
+		self.assertEqual(pr1.get("items")[0].billed_amt, 1000)
+		self.assertEqual(pr1.per_billed, 100)
+		self.assertEqual(pr1.status, "Completed")
+		
+		self.assertEqual(pr2.get("items")[0].billed_amt, 2000)
+		self.assertEqual(pr2.per_billed, 80)
+		self.assertEqual(pr2.status, "To Bill")
+		
 def get_gl_entries(voucher_type, voucher_no):
 	return frappe.db.sql("""select account, debit, credit
 		from `tabGL Entry` where voucher_type=%s and voucher_no=%s
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 0789071..ceff05a 100755
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -7,6 +7,7 @@
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Document", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -24,6 +25,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -46,6 +48,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -71,6 +74,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -95,6 +99,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -119,6 +124,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -142,6 +148,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -166,6 +173,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -189,6 +197,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -212,6 +221,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -236,6 +246,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -258,6 +269,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -282,6 +294,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -308,6 +321,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -334,6 +348,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -357,6 +372,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -382,6 +398,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -409,6 +426,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -435,6 +453,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -459,6 +478,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -482,6 +502,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -505,6 +526,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -526,6 +548,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -549,6 +572,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -570,6 +594,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -595,6 +620,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -622,6 +648,7 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -643,6 +670,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -668,6 +696,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -695,6 +724,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -720,6 +750,7 @@
    "options": "Pricing Rule", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -742,6 +773,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -766,6 +798,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -790,6 +823,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -812,6 +846,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -836,6 +871,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -860,6 +896,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -882,6 +919,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -907,6 +945,7 @@
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -934,6 +973,7 @@
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -947,54 +987,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "project_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Project Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Project", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
-   "default": ":Company", 
-   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
-   "fieldname": "cost_center", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Cost Center", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
    "fieldname": "qa_no", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1009,6 +1001,7 @@
    "options": "Quality Inspection", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1020,70 +1013,19 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "schedule_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Required By", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "schedule_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "stock_qty", 
-   "fieldtype": "Float", 
+   "fieldname": "column_break_40", 
+   "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Qty as per Stock UOM", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "stock_qty", 
-   "oldfieldtype": "Currency", 
    "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "100px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "100px"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "prevdoc_doctype", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Prevdoc Doctype", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_doctype", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1108,6 +1050,7 @@
    "options": "Purchase Order", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1121,43 +1064,21 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "prevdoc_detail_docname", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Purchase Order Item No", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_detail_docname", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "150px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "150px"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "col_break5", 
-   "fieldtype": "Column Break", 
+   "fieldname": "schedule_date", 
+   "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "label": "Required By", 
    "length": 0, 
    "no_copy": 0, 
+   "oldfieldname": "schedule_date", 
+   "oldfieldtype": "Date", 
    "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1168,19 +1089,45 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "bom", 
-   "fieldtype": "Link", 
+   "fieldname": "stock_qty", 
+   "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "BOM", 
+   "label": "Qty as per Stock UOM", 
    "length": 0, 
-   "no_copy": 1, 
-   "options": "BOM", 
+   "no_copy": 0, 
+   "oldfieldname": "stock_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "100px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "100px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "section_break_45", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 1, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1205,28 +1152,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 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, 
-   "fieldname": "rejected_serial_no", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Rejected Serial No", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1252,6 +1178,7 @@
    "options": "Batch", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1263,6 +1190,272 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "column_break_48", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "rejected_serial_no", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Rejected Serial No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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, 
+   "fieldname": "section_break_50", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "project_name", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Project Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Project", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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, 
+   "default": ":Company", 
+   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "prevdoc_doctype", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Prevdoc Doctype", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "prevdoc_doctype", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "prevdoc_detail_docname", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Purchase Order Item No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "prevdoc_detail_docname", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "150px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "150px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "col_break5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "bom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "BOM", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "BOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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, 
+   "fieldname": "billed_amt", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Billed Amt", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "landed_cost_voucher_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Landed Cost Voucher Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "brand", 
    "fieldtype": "Link", 
    "hidden": 1, 
@@ -1277,6 +1470,7 @@
    "options": "Brand", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1303,6 +1497,7 @@
    "options": "Item Group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1328,6 +1523,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1355,6 +1551,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1368,28 +1565,6 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "landed_cost_voucher_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Landed Cost Voucher Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "valuation_rate", 
    "fieldtype": "Currency", 
    "hidden": 1, 
@@ -1404,6 +1579,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "80px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1431,6 +1607,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -1455,6 +1632,7 @@
    "oldfieldtype": "Check", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1472,7 +1650,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:54.377742", 
+ "modified": "2016-01-15 04:20:38.803896", 
  "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 3965417..3437463 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -133,7 +133,7 @@
 	qty: function(doc, cdt, cdn) {
 		var d = locals[cdt][cdn];
 		d.transfer_qty = flt(d.qty) * flt(d.conversion_factor);
-		refresh_field('items');
+		this.calculate_basic_amount(d);
 	},
 
 	production_order: function() {
@@ -176,12 +176,13 @@
 
 	add_excise_button: function() {
 		if(frappe.boot.sysdefaults.country === "India")
-			this.frm.add_custom_button(__("Make Excise Invoice"), function() {
+			this.frm.add_custom_button(__("Excise Invoice"), function() {
 				var excise = frappe.model.make_new_doc_and_get_name('Journal Entry');
 				excise = locals['Journal Entry'][excise];
 				excise.voucher_type = 'Excise Entry';
 				loaddoc('Journal Entry', excise.name);
-			}, frappe.boot.doctype_icons["Journal Entry"], "btn-default");
+			}, __("Make"));
+			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 	},
 
 	items_add: function(doc, cdt, cdn) {
@@ -227,7 +228,89 @@
 
 	items_on_form_rendered: function(doc, grid_row) {
 		erpnext.setup_serial_no();
-	}
+	},
+
+	basic_rate: function(doc, cdt, cdn) {
+		var item = frappe.model.get_doc(cdt, cdn);
+		this.calculate_basic_amount(item);
+	},
+
+	s_warehouse: function(doc, cdt, cdn) {
+		this.get_warehouse_details(doc, cdt, cdn)
+	},
+
+	t_warehouse: function(doc, cdt, cdn) {
+		this.get_warehouse_details(doc, cdt, cdn)
+	},
+
+	get_warehouse_details: function(doc, cdt, cdn) {
+		var me = this;
+		var d = locals[cdt][cdn];
+		if(!d.bom_no) {
+			frappe.call({
+				method: "erpnext.stock.doctype.stock_entry.stock_entry.get_warehouse_details",
+				args: {
+					"args": {
+						'item_code': d.item_code,
+						'warehouse': cstr(d.s_warehouse) || cstr(d.t_warehouse),
+						'transfer_qty': d.transfer_qty,
+						'serial_no': d.serial_no,
+						'qty': d.s_warehouse ? -1* d.qty : d.qty,
+						'posting_date': this.frm.doc.posting_date,
+						'posting_time': this.frm.doc.posting_time
+					}
+				},
+				callback: function(r) {
+					if (!r.exc) {
+						$.extend(d, r.message);
+						me.calculate_basic_amount(d);
+					}
+				}
+			});
+		}
+	},
+
+	calculate_basic_amount: function(item) {
+		item.basic_amount = flt(flt(item.transfer_qty) * flt(item.basic_rate),
+			precision("basic_amount", item));
+
+		this.calculate_amount();
+	},
+
+	calculate_amount: function() {
+		this.calculate_total_additional_costs();
+
+		var total_basic_amount = frappe.utils.sum(
+			(this.frm.doc.items || []).map(function(i) { return i.t_warehouse ? flt(i.basic_amount) : 0; })
+		);
+
+		for (var i in this.frm.doc.items) {
+			var item = this.frm.doc.items[i];
+
+			if (item.t_warehouse && total_basic_amount) {
+				item.additional_cost = (flt(item.basic_amount) / total_basic_amount) * this.frm.doc.total_additional_costs;
+			} else {
+				item.additional_cost = 0;
+			}
+
+			item.amount = flt(item.basic_amount + flt(item.additional_cost),
+				precision("amount", item));
+
+			item.valuation_rate = flt(flt(item.basic_rate)
+				+ (flt(item.additional_cost) / flt(item.transfer_qty)),
+				precision("valuation_rate", item));
+		}
+
+		refresh_field('items');
+	},
+
+	calculate_total_additional_costs: function() {
+		var total_additional_costs = frappe.utils.sum(
+			(this.frm.doc.additional_costs || []).map(function(c) { return flt(c.amount); })
+		);
+
+		this.frm.set_value("total_additional_costs", flt(total_additional_costs, precision("total_additional_costs")));
+	},
 });
 
 cur_frm.script_manager.make(erpnext.stock.StockEntry);
@@ -346,23 +429,6 @@
 	}
 }
 
-cur_frm.cscript.s_warehouse = function(doc, cdt, cdn) {
-	var d = locals[cdt][cdn];
-	if(!d.bom_no) {
-		args = {
-			'item_code'		: d.item_code,
-			'warehouse'		: cstr(d.s_warehouse) || cstr(d.t_warehouse),
-			'transfer_qty'	: d.transfer_qty,
-			'serial_no'		: d.serial_no,
-			'qty'			: d.s_warehouse ? -1* d.qty : d.qty
-		}
-		return get_server_fields('get_warehouse_details', JSON.stringify(args),
-			'items', doc, cdt, cdn, 1);
-	}
-}
-
-cur_frm.cscript.t_warehouse = cur_frm.cscript.s_warehouse;
-
 cur_frm.cscript.uom = function(doc, cdt, cdn) {
 	var d = locals[cdt][cdn];
 	if(d.uom && d.item_code){
@@ -406,3 +472,9 @@
 cur_frm.cscript.posting_date = function(doc, cdt, cdn){
 	erpnext.get_fiscal_year(doc.company, doc.posting_date);
 }
+
+frappe.ui.form.on('Landed Cost Taxes and Charges', {
+	amount: function(frm) {
+		frm.cscript.calculate_amount();
+	}
+})
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 9702972..28939ca 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -11,6 +11,7 @@
 from erpnext.stock.get_item_details import get_available_qty, get_default_cost_center, get_conversion_factor
 from erpnext.manufacturing.doctype.bom.bom import validate_bom_no
 from erpnext.accounts.utils import validate_fiscal_year
+import json
 
 class IncorrectValuationRateError(frappe.ValidationError): pass
 class DuplicateEntryForProductionOrderError(frappe.ValidationError): pass
@@ -232,6 +233,7 @@
 					self.posting_date, self.posting_time, d.actual_qty, d.transfer_qty), NegativeStockError)
 
 	def get_stock_and_rate(self):
+		self.set_transfer_qty()
 		self.set_actual_qty()
 		self.calculate_rate_and_amount()
 
@@ -293,7 +295,9 @@
 	def update_valuation_rate(self):
 		for d in self.get("items"):
 			d.amount = flt(d.basic_amount + flt(d.additional_cost), d.precision("amount"))
-			d.valuation_rate = flt(flt(d.basic_rate) + flt(d.additional_cost) / flt(d.transfer_qty),
+			d.valuation_rate = flt(
+				flt(d.basic_rate)
+				+ (flt(d.additional_cost) / flt(d.transfer_qty)),
 				d.precision("valuation_rate"))
 
 	def set_total_incoming_outgoing_value(self):
@@ -473,7 +477,10 @@
 		if not ret["expense_account"]:
 			ret["expense_account"] = frappe.db.get_value("Company", self.company, "stock_adjustment_account")
 
-		stock_and_rate = args.get('warehouse') and self.get_warehouse_details(args) or {}
+		args['posting_date'] = self.posting_date
+		args['posting_time'] = self.posting_time
+
+		stock_and_rate = args.get('warehouse') and get_warehouse_details(args) or {}
 		ret.update(stock_and_rate)
 
 		return ret
@@ -495,21 +502,6 @@
 			}
 		return ret
 
-	def get_warehouse_details(self, args):
-		ret = {}
-		if args.get('warehouse') and args.get('item_code'):
-			args.update({
-				"posting_date": self.posting_date,
-				"posting_time": self.posting_time,
-			})
-			args = frappe._dict(args)
-
-			ret = {
-				"actual_qty" : get_previous_sle(args).get("qty_after_transaction") or 0,
-				"basic_rate" : get_incoming_rate(args)
-			}
-		return ret
-
 	def get_items(self):
 		self.set('items', [])
 		self.validate_production_order()
@@ -806,3 +798,23 @@
 		operating_cost_per_unit = flt(bom.operating_cost) / flt(bom.quantity)
 
 	return operating_cost_per_unit
+
+@frappe.whitelist()
+def get_warehouse_details(args):
+	if isinstance(args, basestring):
+		args = json.loads(args)
+
+	args = frappe._dict(args)
+
+	ret = {}
+	if args.warehouse and args.item_code:
+		args.update({
+			"posting_date": args.posting_date,
+			"posting_time": args.posting_time,
+		})
+		ret = {
+			"actual_qty" : get_previous_sle(args).get("qty_after_transaction") or 0,
+			"basic_rate" : get_incoming_rate(args)
+		}
+
+	return ret
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index 535e397..08c1df1 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -10,16 +10,18 @@
 		// end of life
 		frm.set_query("item_code", "items", function(doc, cdt, cdn) {
 			return {
-				filters:[
-					['Item', 'end_of_life', '>=', frappe.datetime.nowdate()]
-				]
+				query: "erpnext.controllers.queries.item_query",
+				filters:{
+					"is_stock_item": 1,
+					"has_serial_no": 0
+				}
 			}
 		});
 	},
 
 	refresh: function(frm) {
 		if(frm.doc.docstatus < 1) {
-			frm.add_custom_button(__("Get Items"), function() {
+			frm.add_custom_button(__("Items"), function() {
 				frm.events.get_items(frm);
 			});
 		}
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index b0aff01..0d9be9b 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -125,7 +125,7 @@
 			for msg in self.validation_messages:
 				msgprint(msg)
 
-			raise frappe.ValidationError
+			raise frappe.ValidationError(self.validation_messages)
 
 	def validate_item(self, item_code, row_num):
 		from erpnext.stock.doctype.item.item import validate_end_of_life, \
@@ -250,15 +250,15 @@
 @frappe.whitelist()
 def get_items(warehouse, posting_date, posting_time):
 	items = frappe.get_list("Bin", fields=["item_code"], filters={"warehouse": warehouse}, as_list=1)
-	
-	items += frappe.get_list("Item", fields=["name"], filters= {"is_stock_item": 1, "has_serial_no": 0, 
+
+	items += frappe.get_list("Item", fields=["name"], filters= {"is_stock_item": 1, "has_serial_no": 0,
 		"has_batch_no": 0, "has_variants": 0, "default_warehouse": warehouse}, as_list=1)
-		
+
 	res = []
 	for item in set(items):
-		stock_bal = get_stock_balance(item[0], warehouse, posting_date, posting_time, 
+		stock_bal = get_stock_balance(item[0], warehouse, posting_date, posting_time,
 			with_valuation_rate=True)
-		
+
 		res.append({
 			"item_code": item[0],
 			"warehouse": warehouse,
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 71bc64a..cc80d1e 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -6,7 +6,7 @@
 from frappe import _, throw
 from frappe.utils import flt, cint, add_days, cstr
 import json
-from erpnext.accounts.doctype.pricing_rule.pricing_rule import get_pricing_rule_for_item
+from erpnext.accounts.doctype.pricing_rule.pricing_rule import get_pricing_rule_for_item, set_transaction_type
 from erpnext.setup.utils import get_exchange_rate
 from frappe.model.meta import get_field_precision
 
@@ -21,14 +21,13 @@
 			"selling_price_list": None,
 			"price_list_currency": None,
 			"plc_conversion_rate": 1.0,
-			"parenttype": "",
-			"parent": "",
+			"doctype": "",
+			"name": "",
 			"supplier": None,
 			"transaction_date": None,
 			"conversion_rate": 1.0,
 			"buying_price_list": None,
 			"is_subcontracted": "Yes" / "No",
-			"transaction_type": "selling",
 			"ignore_pricing_rule": 0/1
 			"project_name": ""
 		}
@@ -49,7 +48,7 @@
 
 	get_price_list_rate(args, item_doc, out)
 
-	if args.transaction_type == "selling" and cint(args.is_pos):
+	if args.customer and cint(args.is_pos):
 		out.update(get_pos_profile_item_details(args.company, args))
 
 	# update args with out, if key or value not exists
@@ -59,7 +58,7 @@
 
 	out.update(get_pricing_rule_for_item(args))
 
-	if args.get("parenttype") in ("Sales Invoice", "Delivery Note"):
+	if args.get("doctype") in ("Sales Invoice", "Delivery Note"):
 		if item_doc.has_serial_no == 1 and not args.serial_no:
 			out.serial_no = get_serial_nos_by_fifo(args, item_doc)
 
@@ -78,13 +77,6 @@
 
 	args = frappe._dict(args)
 
-	if not args.get("transaction_type"):
-		if args.get("parenttype")=="Material Request" or \
-				frappe.get_meta(args.get("parenttype")).get_field("supplier"):
-			args.transaction_type = "buying"
-		else:
-			args.transaction_type = "selling"
-
 	if not args.get("price_list"):
 		args.price_list = args.get("selling_price_list") or args.get("buying_price_list")
 
@@ -92,6 +84,8 @@
 		args.item_code = get_item_code(barcode=args.barcode)
 	elif not args.item_code and args.serial_no:
 		args.item_code = get_item_code(serial_no=args.serial_no)
+	
+	set_transaction_type(args)
 
 	return args
 
@@ -115,7 +109,7 @@
 	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":
+	if args.transaction_type=="selling":
 		# validate if sales item or service item
 		if args.get("order_type") == "Maintenance":
 			if item.is_service_item != 1:
@@ -127,7 +121,7 @@
 		if 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.parenttype != "Material Request":
+	elif args.transaction_type=="buying" and args.doctype != "Material Request":
 		# validate if purchase item or subcontracted item
 		if item.is_purchase_item != 1:
 			throw(_("Item {0} must be a Purchase Item").format(item.name))
@@ -143,7 +137,7 @@
 		item.update_template_tables()
 
 	from frappe.defaults import get_user_default_as_list
-	user_default_warehouse_list = get_user_default_as_list('warehouse')
+	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 ""
 
@@ -160,7 +154,7 @@
 		"item_tax_rate": json.dumps(dict(([d.tax_type, d.tax_rate] for d in
 			item.get("taxes")))),
 		"uom": item.stock_uom,
-		"min_order_qty": flt(item.min_order_qty) if args.parenttype == "Material Request" else "",
+		"min_order_qty": flt(item.min_order_qty) if args.doctype == "Material Request" else "",
 		"conversion_factor": 1.0,
 		"qty": args.qty or 1.0,
 		"stock_qty": 1.0,
@@ -201,7 +195,7 @@
 
 def get_default_cost_center(args, item):
 	return (frappe.db.get_value("Project", args.get("project_name"), "cost_center")
-		or (item.selling_cost_center if args.get("transaction_type") == "selling" else item.buying_cost_center)
+		or (item.selling_cost_center if args.get("customer") else item.buying_cost_center)
 		or frappe.db.get_value("Item Group", item.item_group, "default_cost_center")
 		or args.get("cost_center"))
 
@@ -212,10 +206,13 @@
 		validate_price_list(args)
 		validate_conversion_rate(args, meta)
 
-		price_list_rate = get_price_list_rate_for(args, item_doc.name)
-		if not price_list_rate and item_doc.variant_of:
-			price_list_rate = get_price_list_rate_for(args, item_doc.variant_of)
+		price_list_rate = get_price_list_rate_for(args.price_list, item_doc.name)
 
+		# variant
+		if not price_list_rate and item_doc.variant_of:
+			price_list_rate = get_price_list_rate_for(args.price_list, item_doc.variant_of)
+
+		# insert in database
 		if not price_list_rate:
 			if args.price_list and args.rate:
 				insert_item_price(args)
@@ -224,10 +221,10 @@
 		out.price_list_rate = flt(price_list_rate) * flt(args.plc_conversion_rate) \
 			/ flt(args.conversion_rate)
 
-		if not out.price_list_rate and args.transaction_type == "buying":
+		if not out.price_list_rate and args.transaction_type=="buying":
 			from erpnext.stock.doctype.item.item import get_last_purchase_details
 			out.update(get_last_purchase_details(item_doc.name,
-				args.parent, args.conversion_rate))
+				args.name, args.conversion_rate))
 
 def insert_item_price(args):
 	"""Insert Item Price if Price List and Price List Rate are specified and currency is the same"""
@@ -246,12 +243,12 @@
 				"price_list_rate": price_list_rate
 			})
 			item_price.insert()
-			frappe.msgprint("Item Price added for {0} in Price List {1}".format(args.item_code,
+			frappe.msgprint(_("Item Price added for {0} in Price List {1}").format(args.item_code,
 				args.price_list))
 
-def get_price_list_rate_for(args, item_code):
+def get_price_list_rate_for(price_list, item_code):
 	return frappe.db.get_value("Item Price",
-			{"price_list": args.price_list, "item_code": item_code}, "price_list_rate")
+			{"price_list": price_list, "item_code": item_code}, "price_list_rate")
 
 def validate_price_list(args):
 	if args.get("price_list"):
@@ -288,10 +285,11 @@
 			frappe._dict({"fields": args})))
 
 def get_party_item_code(args, item_doc, out):
-	if args.transaction_type == "selling":
+	if args.transaction_type=="selling" and args.customer:
 		customer_item_code = item_doc.get("customer_items", {"customer_name": args.customer})
 		out.customer_item_code = customer_item_code[0].ref_code if customer_item_code else None
-	else:
+		
+	if args.transaction_type=="buying" and args.supplier:
 		item_supplier = item_doc.get("supplier_items", {"supplier": args.supplier})
 		out.supplier_part_no = item_supplier[0].supplier_part_no if item_supplier else None
 
@@ -360,7 +358,7 @@
 @frappe.whitelist()
 def get_available_qty(item_code, warehouse):
 	return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse},
-		["projected_qty", "actual_qty"], as_dict=True) or {}
+		["projected_qty", "actual_qty"], as_dict=True) or {"projected_qty": 0, "actual_qty": 0}
 
 @frappe.whitelist()
 def get_batch_qty(batch_no,warehouse,item_code):
@@ -369,21 +367,27 @@
 		return {'actual_batch_qty': actual_batch_qty}
 
 @frappe.whitelist()
-def apply_price_list(args):
-	"""
+def apply_price_list(args, as_doc=False):
+	"""Apply pricelist on a document-like dict object and return as
+	{'parent': dict, 'children': list}
+
+	:param args: See below
+	:param as_doc: Updates value in the passed dict
+
 		args = {
-			"item_list": [{"doctype": "", "name": "", "item_code": "", "brand": "", "item_group": ""}, ...],
+			"doctype": "",
+			"name": "",
+			"items": [{"doctype": "", "name": "", "item_code": "", "brand": "", "item_group": ""}, ...],
 			"conversion_rate": 1.0,
 			"selling_price_list": None,
 			"price_list_currency": None,
 			"plc_conversion_rate": 1.0,
-			"parenttype": "",
-			"parent": "",
+			"doctype": "",
+			"name": "",
 			"supplier": None,
 			"transaction_date": None,
 			"conversion_rate": 1.0,
 			"buying_price_list": None,
-			"transaction_type": "selling",
 			"ignore_pricing_rule": 0/1
 		}
 	"""
@@ -392,10 +396,8 @@
 	parent = get_price_list_currency_and_exchange_rate(args)
 	children = []
 
-	if "item_list" in args:
-		item_list = args.get("item_list")
-		del args["item_list"]
-
+	if "items" in args:
+		item_list = args.get("items")
 		args.update(parent)
 
 		for item in item_list:
@@ -404,16 +406,31 @@
 			item_details = apply_price_list_on_item(args_copy)
 			children.append(item_details)
 
-	return {
-		"parent": parent,
-		"children": children
-	}
+	if as_doc:
+		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')):
+				for fieldname in children[i]:
+					# if the field exists in the original doc
+					# update the value
+					if fieldname in item and fieldname not in ("name", "doctype"):
+						item[fieldname] = children[i][fieldname]
+
+		return args
+	else:
+		return {
+			"parent": parent,
+			"children": children
+		}
 
 def apply_price_list_on_item(args):
 	item_details = frappe._dict()
 	item_doc = frappe.get_doc("Item", args.item_code)
 	get_price_list_rate(args, item_doc, item_details)
+
 	item_details.update(get_pricing_rule_for_item(args))
+
 	return item_details
 
 def get_price_list_currency(price_list):
@@ -437,10 +454,10 @@
 		and price_list_currency != args.price_list_currency):
 			plc_conversion_rate = get_exchange_rate(price_list_currency, args.currency) or plc_conversion_rate
 
-	return {
+	return frappe._dict({
 		"price_list_currency": price_list_currency,
 		"plc_conversion_rate": plc_conversion_rate
-	}
+	})
 
 @frappe.whitelist()
 def get_default_bom(item_code=None):
diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.js b/erpnext/stock/report/stock_ageing/stock_ageing.js
index 8492d01..60e64b7 100644
--- a/erpnext/stock/report/stock_ageing/stock_ageing.js
+++ b/erpnext/stock/report/stock_ageing/stock_ageing.js
@@ -8,7 +8,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company"),
+			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
 		{
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.js b/erpnext/stock/report/stock_ledger/stock_ledger.js
index 28a14c8..fb60157 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.js
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.js
@@ -8,7 +8,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company"),
+			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
 		{
diff --git a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
index 7d3a2ee..aef6c99 100644
--- a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
+++ b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
@@ -50,10 +50,12 @@
 			if d.warehouse == bin.warehouse:
 				re_order_level = d.warehouse_reorder_level
 				re_order_qty = d.warehouse_reorder_qty
+				
+		shortage_qty = re_order_level - flt(bin.projected_qty) if re_order_level else 0
 
-		data.append([item.name, item.item_name, item.description, item.item_group, item.brand, bin.warehouse,
-			item.stock_uom, bin.actual_qty, bin.planned_qty, bin.indented_qty, bin.ordered_qty, bin.reserved_qty,
-			bin.projected_qty, re_order_level, re_order_qty, re_order_level - flt(bin.projected_qty)])
+		data.append([item.name, item.item_name, item.description, item.item_group, item.brand, bin.warehouse, 
+			item.stock_uom, bin.actual_qty, bin.planned_qty, bin.indented_qty, bin.ordered_qty, 
+			bin.reserved_qty, bin.projected_qty, re_order_level, re_order_qty, shortage_qty])
 
 	return data
 
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 4edf7a9..c47ecab 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -140,6 +140,8 @@
 			"actual_qty": self.qty_after_transaction,
 			"stock_value": self.stock_value
 		})
+		bin_doc.flags.via_stock_ledger_entry = True
+		
 		bin_doc.save(ignore_permissions=True)
 
 	def process_sle(self, sle):
diff --git a/erpnext/support/doctype/issue/issue.js b/erpnext/support/doctype/issue/issue.js
index 28617cb..15029a0 100644
--- a/erpnext/support/doctype/issue/issue.js
+++ b/erpnext/support/doctype/issue/issue.js
@@ -5,15 +5,15 @@
 
 	"refresh": function(frm) {
 		if(frm.doc.status==="Open") {
-			frm.add_custom_button("Close", function() {
+			frm.add_custom_button(__("Close"), function() {
 				frm.set_value("status", "Closed");
 				frm.save();
-			});
+			}, __("Status"));
 		} else {
-			frm.add_custom_button("Reopen", function() {
+			frm.add_custom_button(__("Reopen"), function() {
 				frm.set_value("status", "Open");
 				frm.save();
-			});
+			}, __("Status"));
 		}
 	}
 });
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index 229eccf..b11eea9 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -1,7 +1,7 @@
 {
  "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
  "autoname": "naming_series:", 
  "creation": "2013-02-01 10:36:25", 
  "custom": 0, 
@@ -24,6 +24,7 @@
    "options": "icon-flag", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -47,6 +48,7 @@
    "options": "ISS-", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -69,6 +71,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -90,6 +93,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -116,6 +120,7 @@
    "options": "Open\nReplied\nHold\nClosed", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -142,6 +147,7 @@
    "options": "Email", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -163,6 +169,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -185,6 +192,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -210,6 +218,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -232,6 +241,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -257,6 +267,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -279,6 +290,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -302,6 +314,7 @@
    "options": "icon-pushpin", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -325,6 +338,7 @@
    "options": "Lead", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -348,6 +362,7 @@
    "options": "Contact", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -370,6 +385,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -395,6 +411,7 @@
    "options": "Customer", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -419,6 +436,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -441,6 +459,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -466,6 +485,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -489,6 +509,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -514,6 +535,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -538,6 +560,7 @@
    "oldfieldtype": "Time", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -561,6 +584,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -583,6 +607,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -606,6 +631,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -624,7 +650,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:47.774531", 
+ "modified": "2016-01-14 07:45:55.840256", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Issue", 
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index 76e5a10..b6ee0b6 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -41,7 +41,7 @@
 
 			if not self.company:
 				self.company = frappe.db.get_value("Lead", self.lead, "company") or \
-					frappe.db.get_default("company")
+					frappe.db.get_default("Company")
 
 	def update_status(self):
 		status = frappe.db.get_value("Issue", self.name, "status")
diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js
index 023ef6c..91b1f67 100644
--- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js
+++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js
@@ -16,7 +16,7 @@
 		var me = this;
 
 		if (this.frm.doc.docstatus === 0) {
-			this.frm.add_custom_button(__('From Sales Order'),
+			this.frm.add_custom_button(__('Sales Order'),
 				function() {
 					frappe.model.map_current_doc({
 						method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_schedule",
@@ -28,7 +28,7 @@
 							company: me.frm.doc.company
 						}
 					});
-				}, "icon-download", "btn-default");
+				}, __("Get items from"));
 		} else if (this.frm.doc.docstatus === 1) {
 			this.frm.add_custom_button(__("Make Maintenance Visit"), function() {
 				frappe.model.open_mapped_doc({
@@ -36,7 +36,7 @@
 					source_name: me.frm.doc.name,
 					frm: me.frm
 				})
-			}, frappe.boot.doctype_icons["Maintenance Visit"]);
+			}, __("Make"));
 		}
 	},
 
diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.js b/erpnext/support/doctype/maintenance_visit/maintenance_visit.js
index 7a803fb..52141a8 100644
--- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.js
+++ b/erpnext/support/doctype/maintenance_visit/maintenance_visit.js
@@ -15,7 +15,7 @@
 erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({
 	refresh: function() {
 		if (this.frm.doc.docstatus===0) {
-			cur_frm.add_custom_button(__('From Maintenance Schedule'),
+			cur_frm.add_custom_button(__('Maintenance Schedule'),
 				function() {
 					frappe.model.map_current_doc({
 						method: "erpnext.support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
@@ -26,8 +26,8 @@
 							company: cur_frm.doc.company
 						}
 					})
-				}, "icon-download", "btn-default");
-			cur_frm.add_custom_button(__('From Warranty Claim'),
+				}, __("Get items from"));
+			cur_frm.add_custom_button(__('Warranty Claim'),
 				function() {
 					frappe.model.map_current_doc({
 						method: "erpnext.support.doctype.warranty_claim.warranty_claim.make_maintenance_visit",
@@ -38,8 +38,8 @@
 							company: cur_frm.doc.company
 						}
 					})
-				}, "icon-download", "btn-default");
-			cur_frm.add_custom_button(__('From Sales Order'),
+				}, __("Get items from"));
+			cur_frm.add_custom_button(__('Sales Order'),
 				function() {
 					frappe.model.map_current_doc({
 						method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_visit",
@@ -51,7 +51,7 @@
 							company: cur_frm.doc.company
 						}
 					})
-				}, "icon-download", "btn-default");
+				}, __("Get items from"));
 		}
 	},
 });
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.js b/erpnext/support/doctype/warranty_claim/warranty_claim.js
index e33f9b2..991745a 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.js
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.js
@@ -15,8 +15,9 @@
 	refresh: function() {
 		if(!cur_frm.doc.__islocal &&
 			(cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) {
-			cur_frm.add_custom_button(__('Make Maintenance Visit'),
-				this.make_maintenance_visit, frappe.boot.doctype_icons["Maintenance Visit"], "btn-default")
+			cur_frm.add_custom_button(__('Maintenance Visit'),
+				this.make_maintenance_visit, __("Make"))
+			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 		}
 	},
 
diff --git a/erpnext/tasks.py b/erpnext/tasks.py
index 3c7acea..cef0ac9 100644
--- a/erpnext/tasks.py
+++ b/erpnext/tasks.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.celery_app import celery_task, task_logger
+from frappe.utils.scheduler import log
 
 @celery_task()
 def send_newsletter(site, newsletter, event):
@@ -15,12 +16,16 @@
 
 	except:
 		frappe.db.rollback()
-		task_logger.warn(frappe.get_traceback())
+
+		task_logger.error(site)
+		task_logger.error(frappe.get_traceback())
 
 		# wasn't able to send emails :(
 		doc.db_set("email_sent", 0)
 		frappe.db.commit()
 
+		log("send_newsletter")
+
 		raise
 
 	else:
diff --git a/erpnext/templates/form_grid/item_grid.html b/erpnext/templates/form_grid/item_grid.html
index 78f0da4..1c50e15 100644
--- a/erpnext/templates/form_grid/item_grid.html
+++ b/erpnext/templates/form_grid/item_grid.html
@@ -1,6 +1,5 @@
 {% var visible_columns = row.get_visible_columns(["item_code", "qty", "rate", "amount",
-	"stock_uom", "uom", "discount_percentage", "schedule_date", "warehouse",
-	"against_sales_order", "sales_order"]); %}
+	"stock_uom", "uom", "discount_percentage", "warehouse"]); %}
 
 {% if(!doc) { %}
 	<div class="row">
diff --git a/erpnext/templates/generators/item.html b/erpnext/templates/generators/item.html
index 500a118..34d345f 100644
--- a/erpnext/templates/generators/item.html
+++ b/erpnext/templates/generators/item.html
@@ -1,3 +1,5 @@
+{% extends "templates/web.html" %}
+
 {% block title %} {{ title }} {% endblock %}
 
 {% block header %}<h2>{{ title }}</h2>{% endblock %}
@@ -6,7 +8,11 @@
 {% include 'templates/includes/product_search_box.html' %}
 {% endblock %}
 
-{% block content %}
+{% block breadcrumbs %}
+    {% include "templates/includes/breadcrumbs.html" %}
+{% endblock %}
+
+{% block page_content %}
 {% from "erpnext/templates/includes/macros.html" import product_image %}
 <div class="item-content">
 	<div class="product-page-content" itemscope itemtype="http://schema.org/Product">
@@ -65,18 +71,7 @@
                             style="display: none;
     						padding-left: 0px; padding-right: 0px;
                             padding-top: 10px;">
-    						<div>
-                                <input class="form-control"
-                                    type="text" style="max-width: 140px;">
-                            </div>
-    						<div style="margin-top: 10px;">
-    							<button class="btn btn-default btn-sm">
-                                {{ _("Update") }}</button>
-    						</div>
-                            <div style="margin-top: 5px;">
-                                <a href="/cart" class="text-muted small">
-                                    {{ _("View Cart") }}</a>
-                            </div>
+    						<a href="/cart">{{ _("Goto Cart") }}</a>
     					</div>
                     </div>
 				</div>
diff --git a/erpnext/templates/generators/item_group.html b/erpnext/templates/generators/item_group.html
index 2652f6f..eb1278c 100644
--- a/erpnext/templates/generators/item_group.html
+++ b/erpnext/templates/generators/item_group.html
@@ -1,8 +1,14 @@
+{% extends "templates/web.html" %}
+
 {% block header_actions %}
 {% include 'templates/includes/product_search_box.html' %}
 {% endblock %}
 
-{% block content %}
+{% block breadcrumbs %}
+    {% include "templates/includes/breadcrumbs.html" %}
+{% endblock %}
+
+{% block page_content %}
 <div class="item-group-content">
 	<div>
 		{% if slideshow %}<!-- slideshow -->
@@ -27,17 +33,6 @@
 		{% endif %}
 	</div>
 </div>
-<script>
-$(function() {
-	if(window.logged_in && getCookie("system_user")==="yes") {
-		frappe.has_permission("Item Group", "{{ name }}", "write", function(r) {
-			frappe.require("/assets/frappe/js/frappe/website/editable.js");
-			frappe.make_editable($('[itemprop="description"]'), "Item Group", "{{ name }}", "description");
-		});
-	}
-});
-</script>
-
 {% endblock %}
 
 {% block style %}
diff --git a/erpnext/templates/generators/sales_partner.html b/erpnext/templates/generators/sales_partner.html
index 2a07448..6da6ad0 100644
--- a/erpnext/templates/generators/sales_partner.html
+++ b/erpnext/templates/generators/sales_partner.html
@@ -1,8 +1,10 @@
+{% extends "templates/web.html" %}
+
 {% block title %} {{ title }} {% endblock %}
 
 {% block header %}<h2>{{ title }}</h2>{% endblock %}
 
-{% block content %}
+{% block page_content %}
 <div class="partner-content" itemscope itemtype="http://schema.org/Organization">
 	<div class="row">
 		<div class="col-md-4">
diff --git a/erpnext/templates/includes/address_row.html b/erpnext/templates/includes/address_row.html
index f6ec819..15dcb95 100644
--- a/erpnext/templates/includes/address_row.html
+++ b/erpnext/templates/includes/address_row.html
@@ -1,5 +1,5 @@
 <div class="web-list-item">
-    <a href="/addresses?name={{ doc.name | urlencode }}" no-pjax class="no-decoration">
+    <a href="/addresses?name={{ doc.name | urlencode }}" class="no-decoration">
         <h4 class="strong">{{ doc.address_title }}</h4>
         <p class="text-muted small">
             {{ frappe.get_doc(doc).get_display() }}
diff --git a/erpnext/templates/includes/cart.js b/erpnext/templates/includes/cart.js
index e413f0b..0c29569 100644
--- a/erpnext/templates/includes/cart.js
+++ b/erpnext/templates/includes/cart.js
@@ -65,11 +65,11 @@
 					if(!r.exc) {
 						$(".cart-items").html(r.message.items);
 						$(".cart-tax-items").html(r.message.taxes);
+						$(".cart-icon").hide();
 					}
 				},
 			});
 		});
-
 	},
 
 	render_tax_row: function($cart_taxes, doc, shipping_rules) {
@@ -144,5 +144,6 @@
 });
 
 $(document).ready(function() {
+	$(".cart-icon").hide();
 	shopping_cart.bind_events();
 });
diff --git a/erpnext/templates/includes/footer/footer_extension.html b/erpnext/templates/includes/footer/footer_extension.html
index 400043e..e24b862 100644
--- a/erpnext/templates/includes/footer/footer_extension.html
+++ b/erpnext/templates/includes/footer/footer_extension.html
@@ -15,6 +15,7 @@
     </div>
 </div>
 <script>
+frappe.ready(function() {
 	$("#footer-subscribe-button").click(function() {
 
 		if($("#footer-subscribe-email").val()) {
@@ -38,5 +39,6 @@
 		else
 			frappe.msgprint(frappe._("Please enter email address"))
 	});
+});
 </script>
 {% endif %}
diff --git a/erpnext/templates/includes/issue_row.html b/erpnext/templates/includes/issue_row.html
index 2935a24..c090f93 100644
--- a/erpnext/templates/includes/issue_row.html
+++ b/erpnext/templates/includes/issue_row.html
@@ -1,5 +1,5 @@
 <div class="web-list-item">
-    <a class="no-decoration" href="/issues?name={{ doc.name }}" no-pjax>
+    <a class="no-decoration" href="/issues?name={{ doc.name }}">
     <div class="row">
         <div class="col-xs-8">
             <span class="indicator {{ "red" if doc.status=="Open" else "darkgrey"   }}">
diff --git a/erpnext/templates/includes/product_page.js b/erpnext/templates/includes/product_page.js
index cec4f2a..f4d9027 100644
--- a/erpnext/templates/includes/product_page.js
+++ b/erpnext/templates/includes/product_page.js
@@ -49,21 +49,6 @@
 		});
 	});
 
-	$("#item-update-cart button").on("click", function() {
-		shopping_cart.update_cart({
-			item_code: get_item_code(),
-			qty: $("#item-update-cart input").val(),
-			btn: this,
-			callback: function(r) {
-				if(r.exc) {
-					$("#item-update-cart input").val(qty);
-				} else {
-					qty = $("#item-update-cart input").val();
-				}
-			},
-		});
-	});
-
 	$("[itemscope] .item-view-attribute .form-control").on("change", function() {
 		try {
 			var item_code = encodeURIComponent(get_item_code());
@@ -86,7 +71,7 @@
 			return;
 		}
 
-		frappe.load_via_ajax(window.location.pathname + "?variant=" + item_code);
+		window.location.href = window.location.pathname + "?variant=" + item_code;
 	});
 });
 
diff --git a/erpnext/templates/includes/transaction_row.html b/erpnext/templates/includes/transaction_row.html
index 9b9fd52..7c03579 100644
--- a/erpnext/templates/includes/transaction_row.html
+++ b/erpnext/templates/includes/transaction_row.html
@@ -1,5 +1,5 @@
 <div class="web-list-item">
-<a href="/{{ pathname }}/{{ doc.name }}" no-pjax>
+<a href="/{{ pathname }}/{{ doc.name }}">
 <div class="row">
 	<div class="col-sm-8 col-xs-7">
 		<div class="row">
diff --git a/erpnext/templates/pages/cart.html b/erpnext/templates/pages/cart.html
index a97e658..6891bce 100644
--- a/erpnext/templates/pages/cart.html
+++ b/erpnext/templates/pages/cart.html
@@ -1,9 +1,18 @@
+{% extends "templates/web.html" %}
+
 {% block title %} {{ "Shopping Cart" }} {% endblock %}
 
 {% block header %}<h2>{{ _("My Cart") }}</h2>{% endblock %}
 
-{% block script %}{% include "templates/includes/cart.js" %}{% endblock %}
-{% block style %}{% include "templates/includes/cart.css" %}{% endblock %}
+{% block script %}
+<script>{% include "templates/includes/cart.js" %}</script>
+{% endblock %}
+
+{% block style %}
+<style>
+    {% include "templates/includes/cart.css" %}
+</style>
+{% endblock %}
 
 
 {% block header_actions %}
@@ -14,7 +23,7 @@
 {% endif %}
 {% endblock %}
 
-{% block content %}
+{% block page_content %}
 
 {% from "templates/includes/macros.html" import item_name_and_description %}
 
diff --git a/erpnext/templates/pages/edit-profile.html b/erpnext/templates/pages/edit-profile.html
index 82ad6fa..f10e0a3 100644
--- a/erpnext/templates/pages/edit-profile.html
+++ b/erpnext/templates/pages/edit-profile.html
@@ -1,8 +1,10 @@
+{% extends "templates/web.html" %}
+
 {% block title %} {{ "My Profile" }} {% endblock %}
 
 {% block header %}<h2>My Profile</h2>{% endblock %}
 
-{% block content %}
+{% block page_content %}
 <div class="user-content" style="max-width: 500px;">
 	<div class="alert alert-warning" id="message" style="display: none;"></div>
 	<form>
@@ -26,7 +28,7 @@
 	</form>
 </div>
 <script>
-$(document).ready(function() {
+frappe.ready(function() {
 	$("#fullname").val(getCookie("full_name") || "");
 	$("#update_user").click(function() {
 		frappe.call({
diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
index 45f6af0..fae55f3 100644
--- a/erpnext/templates/pages/order.html
+++ b/erpnext/templates/pages/order.html
@@ -1,11 +1,21 @@
+{% extends "templates/web.html" %}
+
 {% block header %}
 <h1>{{ doc.name }}</h1>
 <!-- <h6 class="text-muted">{{ doc._title or doc.doctype }}</h6> -->
 {% endblock %}
 
-{% block style %}{% include "templates/includes/order/order.css" %}{% endblock %}
+{% block breadcrumbs %}
+	{% include "templates/includes/breadcrumbs.html" %}
+{% endblock %}
 
-{% block content %}
+{% block style %}
+<style>
+    {% include "templates/includes/order/order.css" %}
+</style>
+{% endblock %}
+
+{% block page_content %}
 
 {% from "erpnext/templates/includes/order/order_macros.html" import item_name_and_description %}
 
@@ -14,7 +24,7 @@
         <span class="indicator {{ doc.indicator_color or "darkgrey" }}">
             {{ doc.indicator_title or doc.status or "Submitted" }}
         </span>
-    </div>
+	</div>
     <div class="col-xs-6 text-muted text-right h6">
         {{ doc.get_formatted("transaction_date") }}
     </div>
@@ -52,10 +62,9 @@
                 {% endif %}
             </div>
             <div class="col-sm-2 col-xs-3 text-right">
-                {{ d.get_formatted("amount") }}
-				{# output of get_formatted("rate") is unicode, to replace unicode use _("text {0}").decode("utf8").format(val) #}
+                {{ d.get_formatted("amount")	 }}
                 <p class="text-muted small">{{
-                    _("Rate: {0}").decode("utf8").format(d.get_formatted("rate")) }}</p>
+                    _("Rate: {0}").format(d.get_formatted("rate")) }}</p>
             </div>
         </div>
         {% endfor %}
@@ -70,4 +79,19 @@
     </div>
 </div>
 
+<div class="cart-taxes row small">
+    <div class="col-sm-8"><!-- empty --></div>
+    <div class="col-sm-4">
+        {% if (doc.doctype=="Sales Order" and doc.per_billed <= 0)
+			or (doc.doctype=="Sales Invoice" and doc.outstanding_amount > 0) %}
+		<div class="page-header-actions-block" data-html-block="header-actions">
+			<p>
+			    <a href="/api/method/erpnext.accounts.doctype.payment_request.payment_request.make_payment_request?dn={{ doc.name }}&dt={{ doc.doctype }}&submit_doc=1&mute_email=1&cart=1"
+			        class="btn btn-primary btn-sm">Pay {{ doc.get_formatted("grand_total") }} </a>
+			</p>
+			</div>
+		{% endif %}
+	</div>
+</div>
+
 {% endblock %}
diff --git a/erpnext/templates/pages/order.py b/erpnext/templates/pages/order.py
index 6c36e3c..4824d44 100644
--- a/erpnext/templates/pages/order.py
+++ b/erpnext/templates/pages/order.py
@@ -13,6 +13,8 @@
 		context.doc.set_indicator()
 
 	context.parents = frappe.form_dict.parents
-
+	context.payment_ref = frappe.db.get_value("Payment Request", 
+		{"reference_name": frappe.form_dict.name}, "name")
+		
 	if not context.doc.has_website_permission("read"):
 		frappe.throw(_("Not Permitted"), frappe.PermissionError)
diff --git a/erpnext/templates/pages/partners.html b/erpnext/templates/pages/partners.html
index 9c87f44..132c06b 100644
--- a/erpnext/templates/pages/partners.html
+++ b/erpnext/templates/pages/partners.html
@@ -1,8 +1,10 @@
+{% extends "templates/web.html" %}
+
 {% block title %} {{ title }} {% endblock %}
 
 {% block header %}<h2>{{ title }}</h2>{% endblock %}
 
-{% block content %}
+{% block page_content %}
 <div class="partners-content">
 	{% for partner_info in partners %}
 	<div class="row">
diff --git a/erpnext/templates/pages/product_search.html b/erpnext/templates/pages/product_search.html
index 07e6c6e..2d80cf4 100644
--- a/erpnext/templates/pages/product_search.html
+++ b/erpnext/templates/pages/product_search.html
@@ -1,3 +1,5 @@
+{% extends "templates/web.html" %}
+
 {% block title %} {{ "Product Search" }} {% endblock %}
 
 {% block header %}<h2>Product Search</h2>{% endblock %}
@@ -6,11 +8,11 @@
 {% include 'templates/includes/product_search_box.html' %}
 {% endblock %}
 
-{% block content %}
+{% block page_content %}
 <script>{% include "templates/includes/product_list.js" %}</script>
 
 <script>
-$(document).ready(function() {
+frappe.ready(function() {
 	var txt = get_url_arg("q");
 	$(".search-results").html("Search results for: " + txt);
 	window.search = txt;
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 6fd08f6..2b2e0f3 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -8,12 +8,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,المنتجات الاستهلاكية
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,الرجاء اختيار الحزب النوع الأول
 DocType: Item,Customer Items,عناصر العملاء
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,حساب {0}: حساب الرئيسي {1} لا يمكن أن يكون دفتر الأستاذ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,الحساب {0}: حسابه الرئيسي {1} لا يمكنه أن يكون دفتر حسابات (دفتر أستاذ)
 DocType: Item,Publish Item to hub.erpnext.com,نشر البند إلى hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,إشعارات البريد الإلكتروني
 DocType: Item,Default Unit of Measure,وحدة القياس الافتراضية
 DocType: SMS Center,All Sales Partner Contact,جميع مبيعات الاتصال الشريك
-DocType: Employee,Leave Approvers,ترك الموافقون
+DocType: Employee,Leave Approvers,الموافقون علي الاجازة
 DocType: Sales Partner,Dealer,تاجر
 DocType: Employee,Rented,مؤجر
 DocType: POS Profile,Applicable for User,ينطبق على العضو
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,العملاء الاتصال
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,من المواد طلب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,من المواد طلب
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} شجرة
 DocType: Job Applicant,Job Applicant,طالب العمل
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,لا مزيد من النتائج.
@@ -49,10 +49,10 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +107,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 +206,New Leave Application,إجازة جديدة التطبيق
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,البنك مشروع
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. للحفاظ على العملاء رمز البند الحكيمة والبحث فيها لجعلها تقوم على التعليمات البرمجية الخاصة بهم استخدام هذا الخيار
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. لضمان منطقية ترميز البنود ولتمكين البحث فيها بناءً على ذلك الترميز استخدم هذا الخيار
 DocType: Mode of Payment Account,Mode of Payment Account,طريقة حساب الدفع
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,مشاهدة المتغيرات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,كمية
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,كمية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),القروض ( المطلوبات )
 DocType: Employee Education,Year of Passing,اجتياز سنة
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,في الأوراق المالية
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,الرعاية الصحية
 DocType: Purchase Invoice,Monthly,شهريا
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),التأخير في الدفع (أيام)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,فاتورة
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,فاتورة
 DocType: Maintenance Schedule Item,Periodicity,دورية
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,عنوان البريد الإلكتروني
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,السنة المالية {0} مطلوب
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
-DocType: Company,Abbr,ابر
+DocType: Company,Abbr,اسم مختصر
 DocType: Appraisal Goal,Score (0-5),نقاط (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},صف {0} {1} {2} لا يتطابق مع {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},صف {0} {1} {2} لا يتطابق مع {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,الصف # {0}
 DocType: Delivery Note,Vehicle No,السيارة لا
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,الرجاء اختيار قائمة الأسعار
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,الرجاء اختيار قائمة الأسعار
 DocType: Production Order Operation,Work In Progress,التقدم في العمل
 DocType: Employee,Holiday List,عطلة قائمة
 DocType: Time Log,Time Log,وقت دخول
@@ -93,19 +93,19 @@
 DocType: Packed Item,Parent Detail docname,الأم تفاصيل docname
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Kg,كجم
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,فتح عن وظيفة.
-DocType: Item Attribute,Increment,زيادة
+DocType: Item Attribute,Increment,الزيادة
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,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: Employee,Married,متزوج
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},لا يجوز لل{0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث الأسهم ضد تسليم مذكرة {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث الأسهم ضد تسليم مذكرة {0}
 DocType: Payment Reconciliation,Reconcile,توفيق
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,بقالة
 DocType: Quality Inspection Reading,Reading 1,قراءة 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,جعل الدخول البنك
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صناديق المعاشات التقاعدية
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,مستودع إلزامي إذا كان نوع الحساب هو مستودع
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,مستودع إلزامي إذا كان نوع الحساب هو مستودع
 DocType: SMS Center,All Sales Person,كل عملية بيع شخص
 DocType: Lead,Person Name,اسم الشخص
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",تحقق ما اذا كان النظام المتكررة، قم بإلغاء لوقف المتكررة أو وضع مناسب تاريخ الانتهاء
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,مهتم
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,فاتورة المواد
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,افتتاح
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},من {0} إلى {1}
+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,فتح دخول
 DocType: Stock Entry,Additional Costs,تكاليف إضافية
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,حساب مع الصفقة الحالية لا يمكن تحويلها إلى المجموعة.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,لا يمكن تحويل حساب جرت عليه أي عملية إلى مجموعة.
 DocType: Lead,Product Enquiry,المنتج استفسار
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,يرجى إدخال الشركة الأولى
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,الهدف في
+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 +9,Activity Log:,:سجل النشاط
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,البند {0} غير موجود في النظام أو قد انتهت صلاحيتها
@@ -165,7 +165,7 @@
 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 +444,Item {0} is not active or end of life has been reached,البند {0} غير نشط أو تم التوصل إلى نهاية الحياة
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,البند {0} غير نشط أو تم التوصل إلى نهاية الحياة
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,سيتم تحديث بعد تقديم فاتورة المبيعات.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,إعدادات وحدة الموارد البشرية
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,حملت تفاصيل العمليات بها.
 DocType: Serial No,Maintenance Status,حالة الصيانة
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,البنود والتسعير
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},من التسجيل ينبغي أن يكون ضمن السنة المالية. على افتراض من التسجيل = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},من التسجيل ينبغي أن يكون ضمن السنة المالية. على افتراض من التسجيل = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,حدد موظف الذين تقوم بإنشاء تقييم.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},مركز تكلف {0} لا تنتمي إلى شركة {1}
 DocType: Customer,Individual,فرد
@@ -197,7 +197,7 @@
 DocType: Purchase Taxes and Charges,Valuation,تقييم
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,تعيين كافتراضي
 ,Purchase Order Trends,شراء اتجاهات ترتيب
-apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,تخصيص الأوراق لهذا العام.
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,تخصيص الاجازات لهذا العام.
 DocType: Earning Type,Earning Type,كسب نوع
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,تعطيل تخطيط القدرات وتتبع الوقت
 DocType: Bank Reconciliation,Bank Account,الحساب المصرفي
@@ -205,7 +205,7 @@
 DocType: Selling Settings,Default Territory,الافتراضي الإقليم
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,تلفزيون
 DocType: Production Order Operation,Updated via 'Time Log',"تحديث عبر 'وقت دخول """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},حساب {0} لا ينتمي إلى شركة {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},الحساب {0} لا ينتمي إلى شركة {1}
 DocType: Naming Series,Series List for this Transaction,قائمة متسلسلة لهذه العملية
 DocType: Sales Invoice,Is Opening Entry,تم افتتاح الدخول
 DocType: Customer Group,Mention if non-standard receivable account applicable,أذكر إذا غير القياسية حساب القبض ينطبق
@@ -215,13 +215,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,صافي النقد من التمويل
 DocType: Lead,Address & Contact,معلومات الاتصال والعنوان
-DocType: Leave Allocation,Add unused leaves from previous allocations,إضافة الأوراق غير المستخدمة من المخصصات السابقة
+DocType: Leave Allocation,Add unused leaves from previous allocations,إضافة الاجازات غير المستخدمة من المخصصات السابقة
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},المتكرر التالي {0} سيتم إنشاؤها على {1}
 DocType: Newsletter List,Total Subscribers,إجمالي عدد المشتركين
 ,Contact Name,اسم جهة الاتصال
 DocType: Production Plan Item,SO Pending Qty,وفي انتظار SO الكمية
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,يخلق زلة مرتبات المعايير المذكورة أعلاه.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,لا يوجد وصف معين
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,طلب للشراء.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,و اترك الموافق المحددة فقط يمكن أن يقدم هذا التطبيق اترك
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,تخفيف التسجيل يجب أن يكون أكبر من تاريخ الالتحاق بالعمل
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,البند مواصفات الموقع
 DocType: Payment Tool,Reference No,المرجع لا
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,ترك الممنوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,سنوي
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,الأسهم المصالحة البند
 DocType: Stock Entry,Sales Invoice No,فاتورة مبيعات لا
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,المورد نوع
 DocType: Item,Publish in Hub,نشر في المحور
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,البند {0} تم إلغاء
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,البند {0} تم إلغاء
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,طلب المواد
 DocType: Bank Reconciliation,Update Clearance Date,تحديث تاريخ التخليص
 DocType: Item,Purchase Details,تفاصيل شراء
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},البند {0} غير موجودة في &quot;المواد الخام الموردة&quot; الجدول في أمر الشراء {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},البند {0} غير موجودة في &quot;المواد الخام الموردة&quot; الجدول في أمر الشراء {1}
 DocType: Employee,Relation,علاقة
 DocType: Shipping Rule,Worldwide Shipping,الشحن في جميع أنحاء العالم
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,أكد أوامر من العملاء.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,اقتراحات
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,تعيين مجموعة من الحكمة الإغلاق الميزانيات على هذا الإقليم. يمكنك أيضا تضمين الموسمية عن طريق تعيين التوزيع.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},الرجاء إدخال مجموعة حساب الأصل لمستودع {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},دفع ضد {0} {1} لا يمكن أن يكون أكبر من قيمة المعلقة {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,توليد جدول
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,آخر
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,5 أحرف كحد أقصى
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,سيتم تعيين أول اترك الموافق في القائمة بوصفها الإجازة الموافق الافتراضي
+apps/erpnext/erpnext/config/desktop.py +73,Learn,تعلم
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,النشاط التكلفة لكل موظف
 DocType: Accounts Settings,Settings for Accounts,إعدادات الحسابات
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,إدارة المبيعات الشخص شجرة .
@@ -283,15 +286,15 @@
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,خطأ مرجع دائري
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,وبعبارة (تصدير) أن تكون واضحة مرة واحدة قمت بحفظ ملاحظة التسليم.
 DocType: Lead,Industry,صناعة
-DocType: Employee,Job Profile,الملف ظيفة
+DocType: Employee,Job Profile,ملف الوظيفة
 DocType: Newsletter,Newsletter,النشرة الإخبارية
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,إبلاغ عن طريق البريد الإلكتروني على خلق مادة التلقائي طلب
 DocType: Journal Entry,Multi Currency,متعدد العملات
 DocType: Payment Reconciliation Invoice,Invoice Type,نوع الفاتورة
 DocType: Sales Invoice Item,Delivery Note,ملاحظة التسليم
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,إنشاء الضرائب
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,إنشاء الضرائب
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,لقد تم تعديل دفع الدخول بعد سحبها. يرجى تسحبه مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,ملخص لهذا الأسبوع والأنشطة المعلقة
 DocType: Workstation,Rent Cost,الإيجار التكلفة
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,الرجاء اختيار الشهر والسنة
@@ -305,14 +308,14 @@
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",تعيين موظف (مثل الرئيس التنفيذي ، مدير الخ ) .
 apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"الرجاء إدخال ' كرر في يوم من الشهر "" قيمة الحقل"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,المعدل الذي يتم تحويل العملة إلى عملة الأساس العملاء العميل
-DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",المتاحة في BOM ، تسليم مذكرة ، شراء الفاتورة ، ترتيب الإنتاج، طلب شراء ، شراء استلام ، فاتورة المبيعات ، ترتيب المبيعات ، اسهم الدخول و الجدول الزمني
+DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",المتاحة في BOM ، تسليم مذكرة ، شراء الفاتورة ، ترتيب الإنتاج، طلب شراء ، شراء استلام ، فاتورة المبيعات ، ترتيب المبيعات ، حركة مخزنية و الجدول الزمني
 DocType: Item Tax,Tax Rate,ضريبة
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,اختر البند
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +631,Select Item,اختر البند
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","البند: {0} المدارة دفعة الحكيمة، لا يمكن التوفيق بينها باستخدام \
  المالية المصالحة، بدلا من استخدام الدخول المالية"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},الصف # {0}: لا دفعة ويجب أن يكون نفس {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,تحويل لغير المجموعه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,يجب تقديم شراء إيصال
@@ -330,14 +333,14 @@
 DocType: Maintenance Visit,Maintenance Type,صيانة نوع
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},المسلسل لا {0} لا تنتمي إلى التسليم ملاحظة {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,معلمة البند التفتيش الجودة
-DocType: Leave Application,Leave Approver Name,ترك اسم الموافق
+DocType: Leave Application,Leave Approver Name,أسم الموافق علي الاجازة
 ,Schedule Date,جدول التسجيل
 DocType: Packed Item,Packed Item,ملاحظة التوصيل التغليف
 apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,الإعدادات الافتراضية ل شراء صفقة.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},وجود النشاط التكلفة للموظف {0} ضد نوع النشاط - {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,يرجى عدم إنشاء حسابات العملاء والموردين. يتم إنشاؤها مباشرة من سادة العملاء / الموردين.
 DocType: Currency Exchange,Currency Exchange,تحويل العملات
-DocType: Purchase Invoice Item,Item Name,البند الاسم
+DocType: Purchase Invoice Item,Item Name,أسم البند
 DocType: Authorization Rule,Approving User  (above authorized value),الموافقة العضو (أعلى قيمة أذن)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ميزان الائتمان
 DocType: Employee,Widowed,ارمل
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,طبي
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,السبب لفقدان
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,وحيد
 DocType: Issue,Attachment,التعلق
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,الميزانية لا يمكن تعيين لمركز التكلفة المجموعة
@@ -380,15 +384,15 @@
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,تخصيص النص الاستهلالي الذي يذهب كجزء من أن البريد الإلكتروني. كل معاملة له نص منفصل استهلالي.
 DocType: Sales Taxes and Charges Template,Sales Master Manager,مدير المبيعات ماستر
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,الإعدادات العمومية لجميع عمليات التصنيع.
-DocType: Accounts Settings,Accounts Frozen Upto,حسابات مجمدة حتي
+DocType: Accounts Settings,Accounts Frozen Upto,حسابات مجمدة حتى
 DocType: SMS Log,Sent On,ارسلت في
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,عطلة الرئيسي.
 DocType: Material Request Item,Required Date,تاريخ المطلوبة
 DocType: Delivery Note,Billing Address,عنوان الفواتير
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,الرجاء إدخال رمز المدينة .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,الرجاء إدخال رمز المدينة .
 DocType: BOM,Costing,تكلف
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",إذا كانت محددة، سيتم النظر في مقدار ضريبة والمدرجة بالفعل في قيم طباعة / المبلغ طباعة
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,إجمالي الكمية
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
 DocType: Shipping Rule,Net Weight,الوزن الصافي
 DocType: Employee,Emergency Phone,الهاتف في حالات الطوارئ
 ,Serial No Warranty Expiry,المسلسل لا عودة انتهاء الاشتراك
@@ -432,7 +436,7 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,إدارة التعاقد من الباطن
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,الأثاث و تركيبات
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,المعدل الذي يتم تحويل سعر العملة العملة الأساسية القائمة لشركة
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},حساب {0} لا تنتمي إلى الشركة: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},الحساب {0} لا ينتمي للشركة: {1}
 DocType: Selling Settings,Default Customer Group,المجموعة الافتراضية العملاء
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",إذا تعطيل، &#39;مدور المشاركات &quot;سيتم الميدان لا تكون مرئية في أي صفقة
 DocType: BOM,Operating Cost,تكاليف التشغيل
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,الاضافة لا يمكن أن يكون 0
 DocType: Production Planning Tool,Material Requirement,متطلبات المواد
 DocType: Company,Delete Company Transactions,حذف المعاملات الشركة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,البند {0} لم يتم شراء السلعة
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,البند {0} لم يتم شراء السلعة
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} هو عنوان بريد إلكتروني غير صالح في ""إعلام \
  عنوان البريد الإلكتروني"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,مجموع الفواتير هذه السنة:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,إضافة / تعديل الضرائب والرسوم
 DocType: Purchase Invoice,Supplier Invoice No,رقم فاتورة المورد
 DocType: Territory,For reference,للرجوع إليها
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",لا يمكن حذف الرقم التسلسلي {0}، كما يتم استخدامه في المعاملات الأسهم
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),إغلاق (الكروم)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),إغلاق (الكروم)
 DocType: Serial No,Warranty Period (Days),فترة الضمان (أيام)
 DocType: Installation Note Item,Installation Note Item,ملاحظة تثبيت الإغلاق
 ,Pending Qty,في انتظار الكمية
@@ -463,10 +466,8 @@
 DocType: Buying Settings,Purchase Receipt Required,مطلوب إيصال الشراء
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
-To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** توزيع شهري ** يساعدك على توزيع ميزانيتك على مدى عدة شهور إذا كان لديك موسمية في عملك.
-
- لتوزيع الميزانية باستخدام هذا التوزيع، تعيين هذا التوزيع الشهري ** ** في ** ** مركز التكلفة"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,لا توجد في جدول الفاتورة السجلات
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",**التوزيع الشهري** يساعدك على توزيع ميزانيتك على مدى عدة أشهر إذا كان لديك موسمية في عملك. لتوزيع الميزانية باستخدام هذا التوزيع، اعتمد هذا **التوزيع الشهري** في **مركز التكلفة**
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,لا توجد في جدول الفاتورة السجلات
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,يرجى تحديد الشركة وحزب النوع الأول
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,المالية / المحاسبة العام.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",آسف ، المسلسل نص لا يمكن دمج
@@ -474,9 +475,9 @@
 DocType: Project Task,Project Task,عمل مشروع
 ,Lead Id,معرف مبادرة البيع
 DocType: C-Form Invoice Detail,Grand Total,المجموع الإجمالي
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,لا ينبغي أن تكون السنة المالية تاريخ بدء السنة المالية أكبر من تاريخ الانتهاء
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,لا ينبغي أن تكون السنة المالية تاريخ بدء السنة المالية أكبر من تاريخ الانتهاء
 DocType: Warranty Claim,Resolution,قرار
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},تسليم: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},تسليم: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,حساب المستحق
 DocType: Sales Order,Billing and Delivery Status,الفوترة والدفع الحالة
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,تكرار العملاء
@@ -491,16 +492,16 @@
 DocType: Quotation,Quotation To,تسعيرة إلى
 DocType: Lead,Middle Income,المتوسطة الدخل
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),افتتاح (الكروم )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,المبلغ المخصص لا يمكن أن تكون سلبية
 DocType: Purchase Order Item,Billed Amt,المنقار AMT
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,مستودع المنطقي الذي ضد مصنوعة إدخالات الأسهم.
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,مستودع منطقي لقاء ما تم إدخاله من مخزون.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},مطلوب المرجعية لا والمراجع التسجيل لل {0}
 DocType: Sales Invoice,Customer's Vendor,العميل البائع
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,إنتاج النظام هو إجباري
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,الكتابة الاقتراح
 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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},خطأ الأسهم السلبية ( { } 6 ) القطعة ل {0} في {1} في معرض النماذج ثلاثية على {2} {3} {4} في {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},خطأ الأسهم السلبية ( { } 6 ) القطعة ل {0} في {1} في معرض النماذج ثلاثية على {2} {3} {4} في {5}
 DocType: Fiscal Year Company,Fiscal Year Company,الشركة السنة المالية
 DocType: Packing Slip Item,DN Detail,DN التفاصيل
 DocType: Time Log,Billed,توصف
@@ -519,16 +520,17 @@
 DocType: Activity Type,Default Costing Rate,افتراضي تكلف سعر
 DocType: Maintenance Schedule,Maintenance Schedule,صيانة جدول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",ثم يتم تصفيتها من قوانين التسعير على أساس العملاء، مجموعة العملاء، الأرض، مورد، مورد نوع، حملة، شريك المبيعات الخ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,صافي التغير في المخزون
 DocType: Employee,Passport Number,رقم جواز السفر
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,مدير
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,من إيصال الشراء
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,من إيصال الشراء
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات.
 DocType: SMS Settings,Receiver Parameter,استقبال معلمة
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,""" بناء على "" و "" مجمع بــ ' لا يمكن أن يتطابقا"
 DocType: Sales Person,Sales Person Targets,أهداف المبيعات شخص
 DocType: Production Order Operation,In minutes,في دقائق
 DocType: Issue,Resolution Date,تاريخ القرار
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
 DocType: Selling Settings,Customer Naming By,العملاء تسمية بواسطة
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,تحويل إلى المجموعة
 DocType: Activity Cost,Activity Type,نوع النشاط
@@ -539,7 +541,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} غير موجود في جدول تفاصيل الفاتورة
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,صيانة زيارة {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
 DocType: Material Request,Material Transfer,لنقل المواد
@@ -561,13 +563,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,تسويق
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,لتتبع البند في المبيعات وثائق الشراء على أساس غ من المسلسل. ويمكن أيضا استخدام هذه المعلومات لتعقب الضمان للمنتج.
 DocType: Purchase Receipt Item Supplied,Current Stock,الأسهم الحالية
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,مستودع رفض إلزامي ضد البند regected
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,مجموع الفواتير هذا العام
 DocType: Account,Expenses Included In Valuation,وشملت النفقات في التقييم
 DocType: Employee,Provide email id registered in company,توفير معرف البريد الإلكتروني المسجلة في الشركة
 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 +533,Item has variants.,البند لديه المتغيرات.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,نوع الشجرة
@@ -585,18 +587,18 @@
 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 +92,{0} is not a stock Item,{0} ليس من نوع المخزون
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ليس من نوع المخزون
 DocType: Mode of Payment Account,Default Account,الافتراضي حساب
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,الرجاء اختيار يوم عطلة أسبوعية
 DocType: Production Order Operation,Planned End Time,تنظيم وقت الانتهاء
 ,Sales Person Target Variance Item Group-Wise,الشخص المبيعات المستهدفة الفرق البند المجموعة الحكيم
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,حساب مع الصفقة الحالية لا يمكن تحويلها إلى دفتر الأستاذ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,لا يمكن تحويل حساب جرت عليه أي عملية إلى دفتر حسابات (دفتر أستاذ)
 DocType: Delivery Note,Customer's Purchase Order No,الزبون أمر الشراء لا
 DocType: Employee,Cell Number,الخلية رقم
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,طلبات السيارات المواد المتولدة
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,مفقود
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"لا يمكنك إدخال قسيمة الحالي في ""ضد إدخال دفتر اليومية"" عمود"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"لا يمكنك إدخال قسيمة الحالي في ""ضد إدخال دفتر اليومية"" عمود"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,طاقة
 DocType: Opportunity,Opportunity From,فرصة من
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,بيان الراتب الشهري.
@@ -604,10 +606,10 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,حساب جديد
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0} من {0} من نوع {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,الصف {0}: تحويل عامل إلزامي
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,القيود المحاسبية ويمكن إجراء ضد العقد ورقة. لا يسمح مقالات ضد المجموعات.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,لا يمكن إيقاف أو إلغاء BOM كما أنه مرتبط مع BOMs أخرى
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,القيود المحاسبية يمكن توضع مقابل عناصر فرعية. لا يسمح بربطها  مقابل المجموعات.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,لا يمكن إيقاف أو إلغاء BOM كما أنه مرتبط مع BOMs أخرى
 DocType: Opportunity,Maintenance,صيانة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},عدد الشراء استلام المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},عدد الشراء استلام المطلوبة القطعة ل {0}
 DocType: Item Attribute Value,Item Attribute Value,البند قيمة السمة
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,حملات المبيعات
 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.
@@ -665,7 +667,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,قائمة الأسعار غير محددة
 DocType: Employee,Family Background,الخلفية العائلية
 DocType: Process Payroll,Send Email,إرسال البريد الإلكتروني
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,لا يوجد تصريح
 DocType: Company,Default Bank Account,الافتراضي الحساب المصرفي
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",لتصفية استنادا الحزب، حدد حزب النوع الأول
@@ -673,7 +675,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,غ
 DocType: Item,Items with higher weightage will be shown higher,وسيتم عرض البنود مع أعلى الترجيح العالي
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,تفاصيل تسوية البنك
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,بلدي الفواتير
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,بلدي الفواتير
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,لا توجد موظف
 DocType: Purchase Order,Stopped,توقف
 DocType: Item,If subcontracted to a vendor,إذا الباطن للبائع
@@ -683,6 +685,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,أرسل الآن
 ,Support Analytics,دعم تحليلات
 DocType: Item,Website Warehouse,مستودع الموقع
+DocType: Payment Reconciliation,Minimum Invoice Amount,الحد الأدنى للمبلغ الفاتورة
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",في يوم من الشهر الذي سيتم إنشاء فاتورة السيارات سبيل المثال 05، 28 الخ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,يجب أن تكون النتيجة أقل من أو يساوي 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,سجلات النموذج - س
@@ -692,7 +695,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",لتمكين &quot;نقطة بيع&quot; ميزات
 DocType: Bin,Moving Average Rate,الانتقال متوسط معدل
 DocType: Production Planning Tool,Select Items,حدد العناصر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
 DocType: Maintenance Visit,Completion Status,استكمال الحالة
 DocType: Sales Invoice Item,Target Warehouse,الهدف مستودع
 DocType: Item,Allow over delivery or receipt upto this percent,سماح على تسليم أو استلام تصل هذه النسبة
@@ -704,7 +707,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,يؤلف تلقائيا رسالة على تقديم المعاملات.
 DocType: Production Order,Item To Manufacture,البند لتصنيع
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} الوضع هو {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,أمر الشراء إلى الدفع
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,أمر الشراء إلى الدفع
 DocType: Sales Order Item,Projected Qty,الكمية المتوقع
 DocType: Sales Invoice,Payment Due Date,تاريخ استحقاق السداد
 DocType: Newsletter,Newsletter Manager,مدير النشرة الإخبارية
@@ -728,7 +731,7 @@
 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 +304,Point-of-Sale,نقطة البيع
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","رصيد حساب بالفعل في الائتمان، لا يسمح لك تعيين ""الرصيد يجب أن يكون 'كما' الخصم '"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","رصيد حساب بالفعل في الائتمان، لا يسمح لك تعيين ""الرصيد يجب أن يكون 'كما' الخصم '"
 DocType: Account,Balance must be,يجب أن يكون التوازن
 DocType: Hub Settings,Publish Pricing,نشر التسعير
 DocType: Notification Control,Expense Claim Rejected Message,المطالبة حساب رفض رسالة
@@ -751,7 +754,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,أسعار صرف العملات الرئيسية .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} يجب أن تكون نشطة
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} يجب أن تكون نشطة
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,الرجاء اختيار نوع الوثيقة الأولى
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,إلغاء المواد الزيارات {0} قبل إلغاء هذه الصيانة زيارة
 DocType: Salary Slip,Leave Encashment Amount,ترك المبلغ التحصيل
@@ -769,17 +772,17 @@
 DocType: Supplier,Default Payable Accounts,الحسابات الدائنة الافتراضي
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,موظف {0} غير نشط أو غير موجود
 DocType: Features Setup,Item Barcode,البند الباركود
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,البند المتغيرات {0} تحديث
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,البند المتغيرات {0} تحديث
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,مقدم فاتورة الشراء
 DocType: Address,Shop,تسوق
 DocType: Hub Settings,Sync Now,مزامنة الآن
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},صف {0}: لا يمكن ربط دخول الائتمان مع {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},صف {0}: لا يمكن ربط دخول الائتمان مع {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,سيتم الافتراضي بنك / الصرف حساب الفاتورة تلقائيا تحديث في POS عند تحديد هذا الوضع.
 DocType: Employee,Permanent Address Is,العنوان الدائم هو
 DocType: Production Order Operation,Operation completed for how many finished goods?,اكتمال عملية لكيفية العديد من السلع تامة الصنع؟
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,العلامة التجارية
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,اتاحة لأكثر من {0} للصنف {1}
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,اتاحة لأكثر من {0} للصنف {1}
 DocType: Employee,Exit Interview Details,تفاصيل مقابلة الخروج
 DocType: Item,Is Purchase Item,هو شراء مادة
 DocType: Journal Entry Account,Purchase Invoice,فاتورة شراء
@@ -791,7 +794,7 @@
 DocType: Salary Slip,Total in words,وبعبارة مجموع
 DocType: Material Request Item,Lead Time Date,تاريخ و وقت مبادرة البيع
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,إلزامي. ربما لم يتم انشاء سجل تحويل العملة ل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},الصف # {0}: يرجى تحديد رقم التسلسلي للتاريخ {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},الصف # {0}: يرجى تحديد رقم التسلسلي للتاريخ {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.",وللسلع &quot;حزمة المنتج، مستودع، المسلسل لا دفعة ويتم النظر في أي من الجدول&quot; قائمة التعبئة &quot;. إذا مستودع ودفعة لا هي نفسها لجميع عناصر التعبئة لمادة أي &#39;حزمة المنتج، يمكن إدخال تلك القيم في الجدول الرئيسي عنصر، سيتم نسخ القيم إلى &quot;قائمة التعبئة&quot; الجدول.
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,الشحنات للعملاء.
 DocType: Purchase Invoice Item,Purchase Order Item,شراء السلعة ترتيب
@@ -800,14 +803,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,فرق
 ,Company Name,اسم الشركة
 DocType: SMS Center,Total Message(s),مجموع الرسائل ( ق )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,اختر البند لنقل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,حدد رئيس حساب في البنك حيث أودع الاختيار.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,تسمح للمستخدم لتحرير الأسعار قائمة قيم في المعاملات
 DocType: Pricing Rule,Max Qty,ماكس الكمية
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,مادة كيميائية
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
 DocType: Process Payroll,Select Payroll Year and Month,حدد الرواتب السنة والشهر
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",انتقل إلى المجموعة المناسبة (عادة طلب تمويل&gt; الأصول الحالية&gt; الحسابات المصرفية وإنشاء حساب جديد (بالنقر على إضافة الطفل) من نوع &quot;البنك&quot;
 DocType: Workstation,Electricity Cost,تكلفة الكهرباء
@@ -821,10 +825,10 @@
 DocType: SMS Center,All Lead (Open),جميع الرصاص (فتح)
 DocType: Purchase Invoice,Get Advances Paid,الحصول على السلف المدفوعة
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,إرفاق صورتك
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,جعل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,جعل
 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 +3,My Cart,سلتي
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,سلتي
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,فتح الكمية
@@ -832,8 +836,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,خيارات الأسهم
 DocType: Journal Entry Account,Expense Claim,حساب المطالبة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},الكمية ل{0}
-DocType: Leave Application,Leave Application,ترك التطبيق
-apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ترك أداة تخصيص
+DocType: Leave Application,Leave Application,طلب اجازة
+apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,اداة توزيع الاجازات
 DocType: Leave Block List,Leave Block List Dates,ترك التواريخ قائمة الحظر
 DocType: Company,If Monthly Budget Exceeded (for expense account),إذا تجاوز الميزانية الشهرية (لحساب المصاريف)
 DocType: Workstation,Net Hour Rate,صافي معدل ساعة
@@ -843,10 +847,10 @@
 DocType: POS Profile,Cash/Bank Account,النقد / البنك حساب
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
 DocType: Delivery Note,Delivery To,التسليم إلى
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,الجدول السمة إلزامي
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,الجدول السمة إلزامي
 DocType: Production Planning Tool,Get Sales Orders,الحصول على أوامر المبيعات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} لا يمكن أن تكون سلبية
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,خصم
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,خصم
 DocType: Features Setup,Purchase Discounts,شراء خصومات
 DocType: Workstation,Wages,أجور
 DocType: Time Log,Will be updated only if Time Log is 'Billable',وسيتم تحديث إلا إذا وقت الدخول هو &quot;فوترة&quot;
@@ -862,7 +866,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"كنت الموافق المصروفات لهذا السجل . يرجى تحديث ""الحالة"" و فروا"
 DocType: Serial No,Creation Document No,إنشاء وثيقة لا
 DocType: Issue,Issue,قضية
-apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,حساب لا يتطابق مع الشركة
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,الحساب لا يتطابق مع الشركة
 apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.",سمات البدائل للصنف. على سبيل المثال الحجم واللون الخ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,مستودع WIP
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},المسلسل لا {0} هو بموجب عقد صيانة لغاية {1}
@@ -871,7 +875,7 @@
 DocType: Tax Rule,Shipping State,الدولة الشحن
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"يجب إضافة البند باستخدام ""الحصول على السلع من شراء إيصالات 'زر"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,مصاريف المبيعات
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,شراء القياسية
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,شراء القياسية
 DocType: GL Entry,Against,ضد
 DocType: Item,Default Selling Cost Center,الافتراضي البيع مركز التكلفة
 DocType: Sales Partner,Implementation Partner,تنفيذ الشريك
@@ -913,6 +917,7 @@
 DocType: Sales Partner,Distributor,موزع
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,التسوق شحن العربة القاعدة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',الرجاء تعيين &#39;تطبيق خصم إضافي على&#39;
 ,Ordered Items To Be Billed,أمرت البنود التي يتعين صفت
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,من المدى يجب أن يكون أقل من أن تتراوح
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,حدد وقت السجلات وتقديمها إلى إنشاء فاتورة مبيعات جديدة.
@@ -922,13 +927,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,وتوصف هذه الدفعة دخول الوقت.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,خلق الفرص
 DocType: Salary Slip,Leave Without Pay,إجازة بدون راتب
-DocType: Supplier,Communications,الاتصالات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,خطأ القدرة على التخطيط
 ,Trial Balance for Party,ميزان المراجعة للحزب
 DocType: Lead,Consultant,مستشار
 DocType: Salary Slip,Earnings,أرباح
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,الانتهاء من البند {0} يجب إدخال لنوع صناعة دخول
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,فتح ميزان المحاسبة
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,الانتهاء من البند {0} يجب إدخال لنوع صناعة دخول
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,فتح ميزان المحاسبة
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاتورة مبيعات المقدمة
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,شيء أن تطلب
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',""" تاريخ البدء الفعلي "" لا يمكن أن يكون احدث من "" تاريخ الانتهاء الفعلي """
@@ -970,7 +974,7 @@
 DocType: Global Defaults,Current Fiscal Year,السنة المالية الحالية
 DocType: Global Defaults,Disable Rounded Total,تعطيل إجمالي مدور
 DocType: Lead,Call,دعوة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' المدخلات ' لا يمكن أن تكون فارغة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,' المدخلات ' لا يمكن أن تكون فارغة
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},صف مكررة {0} مع نفسه {1}
 ,Trial Balance,ميزان المراجعة
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,إعداد الموظفين
@@ -982,9 +986,9 @@
 DocType: Contact,User ID,المستخدم ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,عرض ليدجر
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,أقرب
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
 DocType: Production Order,Manufacture against Sales Order,تصنيع ضد ترتيب المبيعات
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,بقية العالم
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,إجمالي الأجور
@@ -1000,7 +1004,7 @@
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,الحفاظ على نفس معدل طوال دورة الشراء
 DocType: Opportunity Item,Opportunity Item,فرصة السلعة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,افتتاح مؤقت
-,Employee Leave Balance,الموظف اترك الرصيد
+,Employee Leave Balance,رصيد اجازات الموظف
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},التوازن ل حساب {0} يجب أن يكون دائما {1}
 DocType: Address,Address Type,نوع العنوان
 DocType: Purchase Receipt,Rejected Warehouse,رفض مستودع
@@ -1014,26 +1018,26 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},غير مخول لتحرير الحساب المجمد {0}
 DocType: Journal Entry,Get Outstanding Invoices,الحصول على الفواتير المستحقة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,ترتيب المبيعات {0} غير صالح
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",آسف، و الشركات لا يمكن دمج
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged",آسف، و الشركات لا يمكن دمج
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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 }
 ,Invoiced Amount (Exculsive Tax),المبلغ فواتير ( Exculsive الضرائب )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,البند 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,رئيس الاعتبار {0} خلق
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,تم إنشاء رئيس للحساب {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,أخضر
 DocType: Item,Auto re-order,السيارات إعادة ترتيب
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,الإجمالي المحقق
 DocType: Employee,Place of Issue,مكان الإصدار
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,عقد
 DocType: Email Digest,Add Quote,إضافة اقتباس
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM اللازمة لUOM: {0} في المدينة: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM اللازمة لUOM: {0} في المدينة: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,المصاريف غير المباشرة
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,الصف {0}: الكمية إلزامي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,زراعة
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,المنتجات أو الخدمات الخاصة بك
 DocType: Mode of Payment,Mode of Payment,طريقة الدفع
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,هذه هي مجموعة البند الجذرية والتي لا يمكن تحريرها.
 DocType: Journal Entry Account,Purchase Order,أمر الشراء
 DocType: Warehouse,Warehouse Contact Info,معلومات اتصال المستودع
@@ -1042,8 +1046,8 @@
 DocType: Email Digest,Annual Income,الدخل السنوي
 DocType: Serial No,Serial No Details,تفاصيل المسلسل
 DocType: Purchase Invoice Item,Item Tax Rate,البند ضريبة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حسابات الائتمان يمكن ربط ضد دخول السحب أخرى
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حسابات الائتمان يمكن ربط ضد دخول السحب أخرى
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,البند {0} يجب أن يكون عنصر التعاقد الفرعي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,معدات العاصمة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",يتم تحديد الأسعار على أساس القاعدة الأولى 'تطبيق في' الميدان، التي يمكن أن تكون مادة، مادة أو مجموعة العلامة التجارية.
@@ -1053,7 +1057,7 @@
 DocType: Appraisal Goal,Goal,هدف
 DocType: Sales Invoice Item,Edit Description,تحرير الوصف
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,التسليم المتوقع التاريخ هو أقل من الموعد المقرر ابدأ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,ل مزود
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,ل مزود
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,تحديد نوع الحساب يساعد في تحديد هذا الحساب في المعاملات.
 DocType: Purchase Invoice,Grand Total (Company Currency),المجموع الكلي (العملات شركة)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,مجموع المنتهية ولايته
@@ -1066,7 +1070,7 @@
 DocType: Journal Entry,Journal Entry,إدخال دفتر اليومية
 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 +427,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى الصنف {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,هذا هو عدد المعاملات التي تم إنشاؤها باستخدام مشاركة هذه البادئة
@@ -1093,12 +1097,12 @@
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,مجموع قيمة الطلب
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,غذاء
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,المدى شيخوخة 3
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,يمكنك جعل السجل الوقت فقط ضد نظام إنتاج المقدمة
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,يمكنك جعل السجل الوقت فقط ضد أمر إنتاج مسجل
 DocType: Maintenance Schedule Item,No of Visits,لا الزيارات
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",النشرات الإخبارية إلى جهات الاتصال، ويؤدي.
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,لا يمكن ترك عمليات فارغا.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,لا يمكن ترك عمليات فارغا.
 ,Delivered Items To Be Billed,وحدات تسليمها الى أن توصف
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,لا يمكن تغيير الرقم التسلسلي لل مستودع
 DocType: Authorization Rule,Average Discount,متوسط الخصم
@@ -1107,13 +1111,13 @@
 DocType: Features Setup,Features Setup,ميزات الإعداد
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,مشاهدة خطاب العرض
 DocType: Item,Is Service Item,هو البند خدمة
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,فترة التطبيق لا يمكن أن يكون تخصيص فترة إجازة الخارجي
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,فترة الطلب لا يمكن أن يكون خارج فترةالاجزات المخصصة
 DocType: Activity Cost,Projects,مشاريع
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,الرجاء اختيار السنة المالية
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},من {0} | {1} {2}
 DocType: BOM Operation,Operation Description,وصف العملية
 DocType: Item,Will also apply to variants,سوف تنطبق أيضا على متغيرات
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,لا يمكن تغيير السنة المالية وتاريخ بدء السنة المالية تاريخ الانتهاء مرة واحدة يتم حفظ السنة المالية.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,لا يمكن تغيير السنة المالية وتاريخ بدء السنة المالية تاريخ الانتهاء مرة واحدة يتم حفظ السنة المالية.
 DocType: Quotation,Shopping Cart,سلة التسوق
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,متوسط ديلي الصادرة
 DocType: Pricing Rule,Campaign,حملة
@@ -1124,7 +1128,8 @@
 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 +211,Stock Entries already created for Production Order ,مقالات الأسهم التي تم إنشاؤها بالفعل لترتيب الإنتاج
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,مقالات الأسهم التي تم إنشاؤها بالفعل لترتيب الإنتاج
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,صافي التغير في الأصول الثابتة
 DocType: Leave Control Panel,Leave blank if considered for all designations,ترك فارغا إذا نظرت لجميع التسميات
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,لا يمكن تضمين تهمة من نوع ' الفعلي ' في الصف {0} في سعر السلعة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},الحد الأقصى: {0}
@@ -1136,7 +1141,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,دليل الحسابات
 DocType: Material Request,Terms and Conditions Content,الشروط والأحكام المحتوى
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
 DocType: Maintenance Visit,Unscheduled,غير المجدولة
 DocType: Employee,Owned,تملكها
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,يعتمد على إجازة بدون مرتب
@@ -1158,9 +1163,9 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},القيد المحاسبي ل{0}: {1} لا يمكن إلا أن يكون في العملة: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},القيد المحاسبي ل{0}: {1} يمكن إجراؤه بالعملة: {2} فقط
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,No active Salary Structure found for employee {0} and the month,لا هيكل الراتب نشط تم العثور عليها ل موظف {0} والشهر
-DocType: Job Opening,"Job profile, qualifications required etc.",الملامح المهمة ، المؤهلات المطلوبة الخ
+DocType: Job Opening,"Job profile, qualifications required etc.",ملف الوظيفة ، المؤهلات المطلوبة الخ
 DocType: Journal Entry Account,Account Balance,رصيد حسابك
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,القاعدة الضريبية للمعاملات.
 DocType: Rename Tool,Type of document to rename.,نوع الوثيقة إلى إعادة تسمية.
@@ -1174,18 +1179,18 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,الجمعيات الفرعية
 DocType: Shipping Rule Condition,To Value,إلى القيمة
 DocType: Supplier,Stock Manager,الأسهم مدير
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},مستودع مصدر إلزامي ل صف {0}
+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 +581,Packing Slip,زلة التعبئة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,مكتب للإيجار
 apps/erpnext/erpnext/config/setup.py +110,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 +60,Import Failed!,فشل الاستيراد !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,أي عنوان أضاف بعد.
 DocType: Workstation Working Hour,Workstation Working Hour,محطة العمل ساعة العمل
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,محلل
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي مبلغ JV {2} الصف {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي مبلغ JV {2} الصف {0}
 DocType: Item,Inventory,جرد
 DocType: Features Setup,"To enable ""Point of Sale"" view",لتمكين &quot;نقطة البيع&quot; وجهة نظر
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,لا يمكن أن يتم السداد للسلة فارغة
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,لا يمكن أن يتم السداد للسلة فارغة
 DocType: Item,Sales Details,تفاصيل المبيعات
 DocType: Opportunity,With Items,مع الأصناف
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,في الكمية
@@ -1200,10 +1205,11 @@
 DocType: Cost Center,Parent Cost Center,الأم تكلفة مركز
 DocType: Sales Invoice,Source,مصدر
 DocType: Leave Type,Is Leave Without Pay,وإجازة بدون راتب
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,لا توجد في جدول الدفع السجلات
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,لا توجد في جدول الدفع السجلات
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,تاريخ بدء السنة المالية
 DocType: Employee External Work History,Total Experience,مجموع الخبرة
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,تدفق النقد من الاستثمار
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,الشحن و التخليص الرسوم
 DocType: Material Request Item,Sales Order No,ترتيب المبيعات لا
 DocType: Item Group,Item Group Name,البند اسم المجموعة
@@ -1211,12 +1217,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,المواد نقل لصناعة
 DocType: Pricing Rule,For Price List,لائحة الأسعار
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,البحث التنفيذي
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",معدل شراء البند: {0} لم يتم العثور، وهو مطلوب لحجز دخول المحاسبة (النفقات). يرجى ذكر سعر البند ضد لائحة أسعار الشراء.
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",معدل شراء البند: {0} لم يتم العثور، وهو مطلوب لحجز دخول المحاسبة (النفقات). يرجى ذكر سعر البند ضد لائحة أسعار الشراء.
 DocType: Maintenance Schedule,Schedules,جداول
 DocType: Purchase Invoice Item,Net Amount,صافي القيمة
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM تفاصيل لا
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),إضافي مقدار الخصم (العملة الشركة)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},الخطأ: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},الخطأ: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,يرجى إنشاء حساب جديد من الرسم البياني للحسابات .
 DocType: Maintenance Visit,Maintenance Visit,صيانة زيارة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,العملاء> مجموعة العملاء> إقليم
@@ -1240,9 +1246,9 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,قائمة المتلقي هو فارغ. يرجى إنشاء قائمة استقبال
 DocType: Production Plan Sales Order,Production Plan Sales Order,أمر الإنتاج خطة المبيعات
 DocType: Sales Partner,Sales Partner Target,مبيعات الشريك الهدف
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},القيد المحاسبي ل{0} لا يمكن إلا أن تكون في العملة: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},لا يمكن إجراء القيد المحاسبي ل{0} إلا بالعملة: {1}
 DocType: Pricing Rule,Pricing Rule,التسعير القاعدة
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,طلب المادي لأمر الشراء
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,طلب المادي لأمر الشراء
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},لا يوجد عاد هذا البند {1} في {2} {3} الصف # {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,الحسابات المصرفية
 ,Bank Reconciliation Statement,بيان تسوية البنك
@@ -1250,11 +1256,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,فتح البورصة الميزان
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} يجب أن تظهر مرة واحدة فقط
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},لا يسمح للإنتقال أكثر {0} من {1} ضد طلب شراء {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},الأوراق المخصصة بنجاح ل {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,لا توجد عناصر لحزمة
 DocType: Shipping Rule Condition,From Value,من القيمة
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,تصنيع الكمية إلزامي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,تصنيع الكمية إلزامي
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,المبالغ لا ينعكس في البنك
 DocType: Quality Inspection Reading,Reading 4,قراءة 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,مطالبات لحساب الشركة.
@@ -1266,33 +1272,34 @@
 ,Material Requests for which Supplier Quotations are not created,طلبات المواد التي الاقتباسات مورد لا يتم إنشاء
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,اليوم (ق) الذي يتم تطبيق للحصول على إجازة وأيام العطل. لا تحتاج إلى تقديم طلب للحصول الإجازة.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,لتعقب العناصر باستخدام الباركود. سوف تكون قادرة على الدخول في بنود مذكرة التسليم والفاتورة المبيعات عن طريق مسح الباركود من العنصر.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,إجعلها تسليم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,إجعلها تسليم
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,جعل الاقتباس
 DocType: Dependent Task,Dependent Task,العمل تعتمد
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},معامل تحويل وحدة القياس الافتراضية يجب أن تكون 1 في الصف {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,توقف عيد ميلاد تذكير
 DocType: SMS Center,Receiver List,استقبال قائمة
 DocType: Payment Tool Detail,Payment Amount,دفع مبلغ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,الكمية المستهلكة
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} مشاهدة
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} مشاهدة
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,صافي التغير في النقد
 DocType: Salary Structure Deduction,Salary Structure Deduction,هيكل المرتبات / الخصومات
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {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 +185,Quantity must not be more than {0},لا يجب أن تكون الكمية أكثر من {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),سن (أيام)
 DocType: Quotation Item,Quotation Item,عنصر تسعيرة
 DocType: Account,Account Name,اسم الحساب
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,من تاريخ لا يمكن أن يكون أكبر من إلى تاريخ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,من تاريخ لا يمكن أن يكون أكبر من إلى تاريخ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,المسلسل لا {0} كمية {1} لا يمكن أن يكون جزء
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,المورد الرئيسي نوع .
 DocType: Purchase Order Item,Supplier Part Number,المورد رقم الجزء
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,معدل التحويل لا يمكن أن يكون 0 أو 1
-apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} تم إلغاء أو توقف
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,معدل التحويل لا يمكن أن يكون 0 أو 1
+apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,شراء استلام {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,شراء استلام {0} لم تقدم
 DocType: Company,Default Payable Account,افتراضي الدائنة حساب
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",إعدادات الإنترنت عربة التسوق مثل قواعد الشحن، وقائمة الأسعار الخ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0} فوترت٪
@@ -1304,15 +1311,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,قضايا بلدي
 DocType: BOM Item,BOM Item,BOM صنف
 DocType: Appraisal,For Employee,لموظف
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,الصف {0}: تقدم ضد مورد يجب بخصم
 DocType: Company,Default Values,قيم افتراضية
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,صف {0} كمية الدفع لا يمكن أن يكون سلبيا
 DocType: Expense Claim,Total Amount Reimbursed,مجموع المبلغ المسدد
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
 DocType: Customer,Default Price List,قائمة الأسعار الافتراضي
 DocType: Payment Reconciliation,Payments,المدفوعات
 DocType: Budget Detail,Budget Allocated,الميزانية المخصصة
 DocType: Journal Entry,Entry Type,نوع الدخول
 ,Customer Credit Balance,رصيد العملاء
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,صافي التغير في الحسابات الدائنة
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,يرجى التحقق من اسم المستخدم البريد الالكتروني
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',العميل المطلوبة ل ' Customerwise الخصم '
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,تحديث البنك دفع التواريخ مع المجلات.
@@ -1333,7 +1342,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,تمكين سلة التسوق
 DocType: Employee,Permanent Address,العنوان الدائم
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,البند {0} يجب أن تكون خدمة عنصر .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",السلفة ضد {0} {1} لا يمكن أن يكون أكبر \ من المجموع الكلي {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,الرجاء اختيار رمز العنصر
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),تخفيض خصم لإجازة بدون أجر (LWP)
@@ -1348,20 +1357,21 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,مصاريف التسويق
 ,Item Shortage Report,البند تقرير نقص
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,طلب المواد المستخدمة لجعل هذا المقال الاوراق المالية
+DocType: Stock Entry Detail,Material Request used to make this Stock Entry,طلب المواد المستخدمة لانشاء الحركة المخزنية
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,واحد وحدة من عنصر.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',وقت دخول الدفعة {0} يجب ' نشره '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',وقت دخول الدفعة {0} يجب ' نشره '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,جعل الدخول المحاسبة للحصول على كل حركة الأسهم
 DocType: Leave Allocation,Total Leaves Allocated,أوراق الإجمالية المخصصة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},مستودع المطلوبة في صف لا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},مستودع المطلوبة في صف لا {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,الرجاء إدخال ساري المفعول بداية السنة المالية وتواريخ نهاية
 DocType: Employee,Date Of Retirement,تاريخ التقاعد
 DocType: Upload Attendance,Get Template,الحصول على قالب
 DocType: Address,Postal,بريدي
 DocType: Item,Weightage,الوزن
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,يوجد مجموعة العملاء مع نفس الاسم الرجاء تغيير اسم العميل أو إعادة تسمية المجموعة العملاء
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,الرجاء اختيار {0} أولا.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},النص {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,يوجد مجموعة العملاء بنفس الاسم الرجاء تغيير اسم العميل أو إعادة تسمية مجموعة العملاء
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,الرجاء اختيار {0} أولا.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},النص {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,اتصال جديد
 DocType: Territory,Parent Territory,الأم الأرض
 DocType: Quality Inspection Reading,Reading 2,القراءة 2
 DocType: Stock Entry,Material Receipt,أستلام مواد
@@ -1369,7 +1379,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {0}
 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 +210,Quantity required for Item {0} in row {1},الكمية المطلوبة القطعة ل {0} في {1} الصف
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},الكمية المطلوبة القطعة ل {0} في {1} الصف
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},مستودع {0} لا يمكن حذف كما توجد كمية القطعة ل {1}
 DocType: Quotation,Order Type,نوع الطلب
 DocType: Purchase Invoice,Notification Email Address,عنوان البريد الإلكتروني الإخطار
@@ -1386,15 +1396,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,عدد كبير جدا من الأعمدة. تصدير التقرير وطباعته باستخدام تطبيق جدول البيانات.
 DocType: Sales 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 +152,Main,رئيسي
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,رئيسي
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,مختلف
 DocType: Naming Series,Set prefix for numbering series on your transactions,تحديد بادئة للترقيم المتسلسل على المعاملات الخاصة بك
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,لا يمكن إلغاء النظام على توقف . نزع السدادة لإلغاء .
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,جعل أمر الشراء
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,جعل أمر الشراء
 DocType: SMS Center,Send To,أرسل إلى
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
 DocType: Payment Reconciliation Payment,Allocated amount,المبلغ المخصص
@@ -1407,19 +1417,20 @@
 DocType: Purchase Order Item,Warehouse and Reference,مستودع والمراجع
 DocType: Supplier,Statutory info and other general information about your Supplier,معلومات قانونية ومعلومات عامة أخرى عن بريدا
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,عناوين
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,ضد مجلة الدخول {0} ليس لديه أي لا مثيل لها {1} دخول
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,ضد مجلة الدخول {0} ليس لديه أي لا مثيل لها {1} دخول
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},تكرار المسلسل لا دخل القطعة ل {0}
-DocType: Shipping Rule Condition,A condition for a Shipping Rule,وهناك شرط للحصول على الشحن القاعدة
+DocType: Shipping Rule Condition,A condition for a Shipping Rule,شرط للحصول على قانون الشحن
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,لا يسمح البند لأمر الإنتاج.
 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/config/manufacturing.py +24,Time Logs for manufacturing.,سجلات الوقت للتصنيع.
 DocType: Item,Apply Warehouse-wise Reorder Level,تطبيق مستودع الحكمة إعادة ترتيب مستوى
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} يجب أن تقدم
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} يجب أن تعتمد
 DocType: Authorization Control,Authorization Control,إذن التحكم
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},الصف # {0}: رفض مستودع إلزامي ضد رفض البند {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,وقت دخول للمهام.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,دفع
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,دفع
 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},طلب المواد من الحد الأقصى {0} يمكن إجراء القطعة ل {1} ضد ترتيب المبيعات {2}
 DocType: Employee,Salutation,تحية
@@ -1436,7 +1447,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,مساعد
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,البند {0} ليس البند المتسلسلة
 DocType: SMS Center,Create Receiver List,إنشاء قائمة استقبال
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,انتهى
 DocType: Packing Slip,To Package No.,لحزم رقم
 DocType: Warranty Claim,Issue Date,تاريخ القضية
 DocType: Activity Cost,Activity Cost,النشاط التكلفة
@@ -1446,7 +1456,7 @@
 DocType: Payment Tool,Make Payment Entry,جعل الدفع الاشتراك
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},كمية القطعة ل {0} يجب أن يكون أقل من {1}
 ,Sales Invoice Trends,اتجاهات فاتورة المبيعات
-DocType: Leave Application,Apply / Approve Leaves,تطبيق / الموافقة على أوراق
+DocType: Leave Application,Apply / Approve Leaves,تقديم / الموافقة على أجازة
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ل
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"يمكن الرجوع صف فقط إذا كان نوع التهمة هي "" في السابق المبلغ صف 'أو' السابق صف إجمالي '"
 DocType: Sales Order Item,Delivery Warehouse,مستودع تسليم
@@ -1474,7 +1484,7 @@
 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 +65,Territory / Customer,أراضي / العملاء
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,على سبيل المثال 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي الفاتورة المبلغ المستحق {2} الصف {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي الفاتورة المبلغ المستحق {2} الصف {0}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,وبعبارة تكون مرئية بمجرد حفظ فاتورة المبيعات.
 DocType: Item,Is Sales Item,هو المبيعات الإغلاق
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,البند المجموعة شجرة
@@ -1486,7 +1496,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} تم إنشاء
 DocType: Delivery Note Item,Against Sales Order,ضد ترتيب المبيعات
 ,Serial No Status,المسلسل لا الحالة
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,الجدول العنصر لا يمكن أن تكون فارغة
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,الجدول العنصر لا يمكن أن تكون فارغة
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","صف {0} لضبط {1} دورية، يجب أن يكون الفرق بين من وإلى تاريخ \
  أكبر من أو يساوي {2}"
@@ -1496,7 +1506,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,الرسوم والضرائب
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,من فضلك ادخل تاريخ المرجعي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,الموردة الكمية
@@ -1511,7 +1521,7 @@
 DocType: Installation Note,Installation Time,تثبيت الزمن
 DocType: Sales Invoice,Accounting Details,تفاصيل المحاسبة
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,حذف جميع المعاملات لهذه الشركة
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,الصف # {0} عملية {1} لم يكتمل ل{2} الكمية من السلع تامة الصنع في أمر الإنتاج # {3}. يرجى تحديث حالة عملية عن طريق سجلات الوقت
+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,الصف # {0} عملية {1} لم يكتمل ل{2} الكمية من السلع تامة الصنع في أمر الإنتاج # {3}. يرجى تحديث حالة عملية عن طريق سجلات الوقت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,الاستثمارات
 DocType: Issue,Resolution Details,قرار تفاصيل
 DocType: Quality Inspection Reading,Acceptance Criteria,معايير القبول
@@ -1526,8 +1536,8 @@
 DocType: Appraisal,For Employee Name,لاسم الموظف
 DocType: Holiday List,Clear Table,الجدول واضح
 DocType: Features Setup,Brands,العلامات التجارية
-DocType: C-Form Invoice Detail,Invoice No,الفاتورة لا
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,من أمر الشراء
+DocType: C-Form Invoice Detail,Invoice No,رقم الفاتورة
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,من أمر الشراء
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,تكلف سعر
 ,Customer Addresses And Contacts,العناوين العملاء واتصالات
@@ -1544,7 +1554,7 @@
 ,Maintenance Schedules,جداول الصيانة
 ,Quotation Trends,اتجاهات الاقتباس
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},المجموعة البند لم يرد ذكرها في البند الرئيسي لمادة {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
 DocType: Shipping Rule Condition,Shipping Amount,الشحن المبلغ
 ,Pending Amount,في انتظار المبلغ
 DocType: Purchase Invoice Item,Conversion Factor,معامل التحويل
@@ -1561,12 +1571,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,شجرة حسابات finanial .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,ترك فارغا إذا نظرت لجميع أنواع موظف
 DocType: Landed Cost Voucher,Distribute Charges Based On,توزيع الرسوم بناء على
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"حساب {0} يجب أن تكون من النوع ' الأصول الثابتة "" لأن الصنف {1} من ضمن الأصول"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,يجب أن يكون نوع الحساب {0} 'أصول ثابتة' حيث أن الصنف {1} من ضمن الأصول
 DocType: HR Settings,HR Settings,إعدادات HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,حساب المطالبة بانتظار الموافقة. فقط الموافق المصروفات يمكن تحديث الحالة.
 DocType: Purchase Invoice,Additional Discount Amount,إضافي مقدار الخصم
 DocType: Leave Block List Allow,Leave Block List Allow,ترك قائمة الحظر السماح
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,ابر لا يمكن أن تكون فارغة أو الفضاء
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,"الاسم المختصر لا يمكن أن يكون فارغاً أو ""مسافة"""
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,الرياضة
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,الإجمالي الفعلي
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,وحدة
@@ -1575,9 +1585,10 @@
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,مستودع حيث كنت الحفاظ على المخزون من المواد رفضت
 apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,السنة المالية تنتهي في الخاص
 DocType: POS Profile,Price List,قائمة الأسعار
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} الآن سنة مالية افتراضية،  يرجى تحديث المتصفح ليصبح التغيير نافذ المفعول .
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} هي السنة المالية الافتراضية الآن،  يرجى تحديث المتصفح ليصبح التغيير نافذ المفعول.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,مطالبات حساب
 DocType: Issue,Support,دعم
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,عرض السلة
 ,BOM Search,BOM البحث
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),إغلاق (فتح + المجاميع)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,يرجى تحديد العملة في الشركة
@@ -1585,26 +1596,27 @@
 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/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",إظهار / إخفاء ميزات مثل المسلسل نص ، POS الخ
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,وبناء على طلبات المواد أثيرت تلقائيا على أساس إعادة ترتيب مستوى العنصر
-apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},حساب {0} غير صالح. يجب أن تكون عملة الحساب {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},مطلوب عامل UOM التحويل في الصف {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},تاريخ التخليص لا يمكن أن يكون قبل تاريخ الاختيار في الصف {0}
 DocType: Salary Slip,Deduction,اقتطاع
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},وأضاف البند سعر {0} في قائمة الأسعار {1}
 DocType: Address Template,Address Template,قالب عنوان
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,الرجاء إدخال رقم الموظف من هذا الشخص المبيعات
 DocType: Territory,Classification of Customers by region,تصنيف العملاء حسب المنطقة
 DocType: Project,% Tasks Completed,مهام٪ تم انهاء
 DocType: Project,Gross Margin,هامش الربح الإجمالي
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,من فضلك ادخل إنتاج السلعة الأولى
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,المستخدم معطل
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,المستخدم معطل
 DocType: Opportunity,Quotation,تسعيرة
 DocType: Salary Slip,Total Deduction,مجموع الخصم
 DocType: Quotation,Maintenance User,الصيانة العضو
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,تكلفة تحديث
 DocType: Employee,Date of Birth,تاريخ الميلاد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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: 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 +142,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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,خصم
@@ -1614,12 +1626,12 @@
 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,SO الكمية
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",توجد إدخالات الاسهم ضد مستودع {0}، وبالتالي لا يمكنك إعادة تعيين أو تعديل مستودع
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",توجد إدخالات الاسهم ضد مستودع {0}، وبالتالي لا يمكنك إعادة تعيين أو تعديل مستودع
 DocType: Appraisal,Calculate Total Score,حساب النتيجة الإجمالية
 DocType: Supplier Quotation,Manufacturing Manager,مدير التصنيع
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},المسلسل لا {0} هو تحت الضمان لغاية {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,ملاحظة تقسيم التوصيل في حزم.
-apps/erpnext/erpnext/hooks.py +68,Shipments,شحنات
+apps/erpnext/erpnext/hooks.py +69,Shipments,شحنات
 DocType: Purchase Order Item,To be delivered to customer,ليتم تسليمها إلى العملاء
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,يجب تقديم الوقت سجل الحالة.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,المسلسل لا {0} لا تنتمي إلى أي مستودع
@@ -1639,16 +1651,16 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,حدد الشركة ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,اتركه فارغا إذا نظرت لجميع الإدارات
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",أنواع العمل (دائمة أو عقد الخ متدربة ) .
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
 DocType: Currency Exchange,From Currency,من العملات
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},ترتيب المبيعات المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},ترتيب المبيعات المطلوبة القطعة ل {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,المبالغ لم تنعكس في نظام
 DocType: Purchase Invoice Item,Rate (Company Currency),معدل (عملة الشركة)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,آخرون
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,لا يمكن العثور على مطابقة البند. الرجاء تحديد قيمة أخرى ل{0}.
 DocType: POS Profile,Taxes and Charges,الضرائب والرسوم
-DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",منتج أو الخدمة التي يتم شراؤها أو بيعها أو حملها في المخزون.
+DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",منتج أو خدمة تم شراؤها أو بيعها أو حفظها في المخزون.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"لا يمكن تحديد نوع التهمة باسم ' في الصف السابق المبلغ ' أو ' في السابق صف إجمالي "" ل لصف الأول"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,مصرفي
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,الرجاء انقر على ' إنشاء الجدول ' للحصول على الجدول الزمني
@@ -1658,7 +1670,7 @@
 DocType: Quality Inspection,In Process,في عملية
 DocType: Authorization Rule,Itemwise Discount,Itemwise الخصم
 DocType: Purchase Order Item,Reference Document Type,مرجع نوع الوثيقة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} مقابل ترتيب المبيعات {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} مقابل ترتيب المبيعات {1}
 DocType: Account,Fixed Asset,الأصول الثابتة
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,جرد المتسلسلة
 DocType: Activity Type,Default Billing Rate,افتراضي الفواتير أسعار
@@ -1668,7 +1680,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ترتيب مبيعات لدفع
 DocType: Expense Claim Detail,Expense Claim Detail,حساب المطالبة التفاصيل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,الوقت سجلات خلق:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,يرجى تحديد الحساب الصحيح
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,يرجى تحديد الحساب الصحيح
 DocType: Item,Weight UOM,وحدة قياس الوزن
 DocType: Employee,Blood Group,فصيلة الدم
 DocType: Purchase Invoice Item,Page Break,فاصل الصفحة
@@ -1699,19 +1711,20 @@
 DocType: Time Log,To Time,إلى وقت
 DocType: Authorization Rule,Approving Role (above authorized value),الموافقة دور (أعلى قيمة أذن)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",لإضافة العقد التابعة ، واستكشاف شجرة وانقر على العقدة التي بموجبها تريد إضافة المزيد من العقد .
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,يجب أن يكون الائتمان لحساب حسابات المدفوعات
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM العودية : {0} لا يمكن أن يكون الأم أو الطفل من {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,يجب أن يكون الائتمان لحساب حسابات المدفوعات
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,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 +116,"For {0}, only debit accounts can be linked against another credit entry",ل{0}، فقط حسابات الخصم يمكن ربط ضد دخول ائتمان أخرى
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry",ل{0}، فقط حسابات الخصم يمكن ربط ضد دخول ائتمان أخرى
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,قائمة الأسعار {0} تم تعطيل
 DocType: Manufacturing Settings,Allow Overtime,تسمح العمل الإضافي
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} الأرقام التسلسلية اللازمة لالبند {1}. لقد قدمت {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{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: Opportunity,Lost Reason,فقد السبب
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,انشاء مدخلات الدفع ضد أوامر أو فواتير.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,عنوان جديد
 DocType: Quality Inspection,Sample Size,حجم العينة
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,مراكز تكلفة إضافية يمكن أن تكون ضمن مجموعات ولكن يمكن أن تكون إدخالات ضد المجموعات غير-
 DocType: Project,External,خارجي
@@ -1731,7 +1744,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,كود البند> مجموعة المدينة> العلامة التجارية
 DocType: Appraisal Goal,Appraisal Goal,تقييم الهدف
 DocType: Time Log,Costing Amount,تكلف مبلغ
-DocType: Process Payroll,Submit Salary Slip,يقدم زلة الراتب
+DocType: Process Payroll,Submit Salary Slip,تسجيل ايصال راتب
 DocType: Salary Structure,Monthly Earning & Deduction,الدخل الشهري وخصم
 apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,خصم Maxiumm القطعة ل {0} {1} ٪
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,استيراد بكميات كبيرة
@@ -1767,13 +1780,14 @@
 DocType: Rename Tool,Rename Tool,إعادة تسمية أداة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,تحديث التكلفة
 DocType: Item Reorder,Item Reorder,البند إعادة ترتيب
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,نقل المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,نقل المواد
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",تحديد العمليات ، وتكلفة التشغيل وإعطاء عملية فريدة من نوعها لا لل عمليات الخاصة بك.
 DocType: Purchase Invoice,Price List Currency,قائمة الأسعار العملات
 DocType: Naming Series,User must always select,يجب دائما مستخدم تحديد
 DocType: Stock Settings,Allow Negative Stock,تسمح الأسهم السلبية
 DocType: Installation Note,Installation Note,ملاحظة التثبيت
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,إضافة الضرائب
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,تدفق النقد من التمويل
 ,Financial Analytics,تحليلات مالية
 DocType: Quality Inspection,Verified By,التحقق من
 DocType: Address,Subsidiary,شركة فرعية
@@ -1783,19 +1797,19 @@
 DocType: Process Payroll,Create Salary Slip,إنشاء زلة الراتب
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,التوازن المتوقع حسب البنك
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),مصدر الأموال ( المطلوبات )
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},كمية في الصف {0} ( {1} ) ويجب أن تكون نفس الكمية المصنعة {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},كمية في الصف {0} ( {1} ) ويجب أن تكون نفس الكمية المصنعة {2}
 DocType: Appraisal,Employee,موظف
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,استيراد البريد الإلكتروني من
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,دعوة كمستخدم
 DocType: Features Setup,After Sale Installations,بعد التثبيت بيع
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} فوترت بشكل كامل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} فوترت بشكل كامل
 DocType: Workstation Working Hour,End Time,نهاية الوقت
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,شروط العقد القياسية ل مبيعات أو شراء .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,المجموعة بواسطة قسيمة
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,المطلوبة على
 DocType: Sales Invoice,Mass Mailing,الشامل البريدية
 DocType: Rename Tool,File to Rename,ملف إعادة تسمية
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},رقم الطلب من purchse المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},رقم الطلب من purchse المطلوبة القطعة ل {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,مشاهدة المدفوعات
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},محدد BOM {0} غير موجود القطعة ل{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,{0} يجب أن يتم إلغاء جدول الصيانة قبل إلغاء هذا الأمر المبيعات
@@ -1805,6 +1819,7 @@
 DocType: Selling Settings,Sales Order Required,ترتيب المبيعات المطلوبة
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,انشاء عميل
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,صيانة جدول التفاصيل
 DocType: Quality Inspection Reading,Reading 9,قراءة 9
@@ -1816,6 +1831,7 @@
 DocType: Warranty Claim,Raised By,التي أثارها
 DocType: Payment Tool,Payment Account,حساب الدفع
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,صافي التغير في حسابات المقبوضات
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,التعويضية
 DocType: Quality Inspection Reading,Accepted,مقبول
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,من فضلك تأكد من حقا تريد حذف جميع المعاملات لهذه الشركة. ستبقى البيانات الرئيسية الخاصة بك كما هو. لا يمكن التراجع عن هذا الإجراء.
@@ -1823,17 +1839,17 @@
 DocType: Payment Tool,Total Payment Amount,المبلغ الكلي للدفع
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث الأسهم، فاتورة تحتوي انخفاض الشحن البند.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث الأسهم، فاتورة تحتوي انخفاض الشحن البند.
 DocType: Newsletter,Test,اختبار
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",كما أن هناك معاملات الأوراق المالية الموجودة لهذا البند، \ لا يمكنك تغيير قيم &quot;ليس لديه المسلسل &#39;،&#39; لديه دفعة لا &#39;،&#39; هل البند الأسهم&quot; و &quot;أسلوب التقييم&quot;
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,خيارات مجلة الدخول
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,خيارات مجلة الدخول
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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 +157,Please enter Planned Qty for Item {0} at row {1},يرجى إدخال الكمية المخططة القطعة ل {0} في {1} الصف
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} لم يتم تأكيده
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} لم يتم تأكيده
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,طلبات البنود.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سيتم إنشاء منفصلة أمر الإنتاج لمادة جيدة لكل النهائي.
 DocType: Purchase Invoice,Terms and Conditions1,حيث وConditions1
@@ -1846,7 +1862,7 @@
 DocType: Authorization Rule,Authorized Value,القيمة أذن
 DocType: Contact,Enter department to which this Contact belongs,أدخل الدائرة التي ينتمي هذا الاتصال
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,إجمالي غائب
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,البند أو مستودع لل صف {0} لا يطابق المواد طلب
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,البند أو مستودع لل صف {0} لا يطابق المواد طلب
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,وحدة القياس
 DocType: Fiscal Year,Year End Date,تاريخ نهاية العام
 DocType: Task Depends On,Task Depends On,المهمة يعتمد على
@@ -1870,9 +1886,9 @@
 DocType: Campaign,Campaign-.####,حملة # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,خطوات القادمة
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,يجب أن يكون تاريخ الانتهاء العقد أكبر من تاريخ الالتحاق بالعمل
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,موزع طرف ثالث / تاجر / عمولة الوكيل / التابعة / التجزئة الذي يبيع منتجات شركة من أجل عمولة.
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,موزع طرف ثالث / وكيل / دلّال / شريك / بائع التجزئة الذي يبيع منتجات الشركات مقابل عمولة.
 DocType: Customer Group,Has Child Node,وعقدة الطفل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} مقابل طلب شراء {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} مقابل طلب شراء {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",أدخل المعلمات URL ثابت هنا (مثلا المرسل = ERPNext، اسم المستخدم = ERPNext، كلمة المرور = 1234 الخ)
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} لا في أي سنة مالية نشطة. لمزيد من التفاصيل الاختيار {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,هذا مثال موقع ولدت لصناعة السيارات من ERPNext
@@ -1920,7 +1936,7 @@
  10. إضافة أو اقتطاع: إذا كنت ترغب في إضافة أو خصم الضرائب."
 DocType: Purchase Receipt Item,Recd Quantity,Recd الكمية
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج أكثر تفاصيل {0} من المبيعات كمية الطلب {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,لم يقدم الاسهم الدخول {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,الحركة المخزنية {0} غير مسجلة
 DocType: Payment Reconciliation,Bank / Cash Account,البنك حساب / النقدية
 DocType: Tax Rule,Billing City,مدينة الفوترة
 DocType: Global Defaults,Hide Currency Symbol,إخفاء رمز العملة
@@ -1939,7 +1955,7 @@
 DocType: Item,Allow Production Order,تسمح أمر الإنتاج
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,الصف {0} : يجب أن يكون تاريخ بدء قبل تاريخ الانتهاء
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),إجمالي (الكمية)
-DocType: Installation Note Item,Installed Qty,تثبيت الكمية
+DocType: Installation Note Item,Installed Qty,الكميات الثابتة
 DocType: Lead,Fax,فاكس
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,إجمالي الدخل
@@ -1952,6 +1968,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,مصاريف فائدة
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 وفوق
 DocType: Buying Settings,Default Buying Price List,الافتراضي شراء قائمة الأسعار
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.",تعيين القيم الافتراضية مثل شركة ، العملات، السنة المالية الحالية ، الخ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,الدفع نوع
@@ -1964,7 +1981,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +26,Ledger,دفتر الحسابات
 DocType: Target Detail,Target  Amount,الهدف المبلغ
 DocType: Shopping Cart Settings,Shopping Cart Settings,إعدادات سلة التسوق
-DocType: Journal Entry,Accounting Entries,مقالات المحاسبة
+DocType: Journal Entry,Accounting Entries,القيود المحاسبة
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},تكرار الدخول . يرجى مراجعة تصريح القاعدة {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},الملف POS العالمي {0} تم إنشاؤها مسبقا لشركة {1}
 DocType: Purchase Order,Ref SQ,المرجع SQ
@@ -1987,7 +2004,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",انظر &quot;نسبة المواد على أساس&quot; التكلفة في القسم
 DocType: Appraisal Goal,Key Responsibility Area,مفتاح مسؤولية المنطقة
 DocType: Item Reorder,Material Request Type,طلب نوع المواد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,الصف {0}: UOM معامل التحويل إلزامي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,الصف {0}: UOM معامل التحويل إلزامي
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,المرجع
 DocType: Cost Center,Cost Center,مركز التكلفة
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,سند #
@@ -2010,7 +2027,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},يرجى تحديد قيمة ل {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,جميع العناوين.
 DocType: Company,Stock Settings,إعدادات الأسهم
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",دمج غير ممكن إلا إذا الخصائص التالية هي نفسها في كل السجلات. هي المجموعة، نوع الجذر، شركة
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",دمج غير ممكن إلا إذا الخصائص التالية هي نفسها في كل السجلات. هي المجموعة، نوع الجذر، شركة
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,إدارة مجموعة العملاء شجرة .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,اسم مركز تكلفة جديد
 DocType: Leave Control Panel,Leave Control Panel,ترك لوحة التحكم
@@ -2030,8 +2047,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,دفع أداة التفاصيل
 ,Sales Browser,متصفح المبيعات
 DocType: Journal Entry,Total Credit,إجمالي الائتمان
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد دخول الأسهم {2}: تحذير
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,محلي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد حركة مخزنية {2}: تحذير
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,المدينين
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,كبير
@@ -2050,13 +2067,13 @@
 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. رقم
 DocType: Production Order Operation,Make Time Log,جعل وقت دخول
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,الرجاء ضبط كمية إعادة الطلب
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,الرجاء ضبط كمية إعادة الطلب
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},يرجى إنشاء العملاء من الرصاص {0}
 DocType: Price List,Applicable for Countries,ينطبق على البلدان
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,أجهزة الكمبيوتر
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,هذه هي مجموعة العملاء الجذرية والتي لا يمكن تحريرها.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,إرضاء الإعداد مخططك من الحسابات قبل البدء مقالات المحاسبة
-DocType: Purchase Invoice,Ignore Pricing Rule,تجاهل التسعير القاعدة
+DocType: Purchase Invoice,Ignore Pricing Rule,تجاهل قاعدة التسعير
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,من التسجيل في هيكل الراتب لا يمكن أن يكون أقل من الموظف تاريخ الالتحاق بالعمل.
 DocType: Employee Education,Graduate,تخريج
 DocType: Leave Block List,Block Days,كتلة أيام
@@ -2110,10 +2127,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,يجب إدخال أتلست عنصر واحد مع كمية السلبية في الوثيقة عودة
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,لا ملاحظات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,لا ملاحظات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,تأخير
 DocType: Account,Stock Received But Not Billed,الأسهم المتلقى ولكن لا توصف
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,يجب أن يكون حساب الجذر مجموعة
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,يجب أن يكون حساب الجذر مجموعة
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,إجمالي المبلغ المتأخر الدفع + + المبلغ التحصيل - خصم إجمالي
 DocType: Monthly Distribution,Distribution Name,توزيع الاسم
 DocType: Features Setup,Sales and Purchase,المبيعات والمشتريات
@@ -2127,6 +2144,7 @@
 DocType: Journal Entry Account,Party Balance,ميزان الحزب
 DocType: Sales Invoice Item,Time Log Batch,الوقت الدفعة دخول
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,الرجاء حدد تطبيق خصم على
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,زلة الراتب المنشأة
 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,نقل المواد لتصنيع
@@ -2134,9 +2152,9 @@
 DocType: Purchase Invoice,Half-yearly,نصف سنوية
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,لم يتم العثور السنة المالية {0}.
 DocType: Bank Reconciliation,Get Relevant Entries,الحصول على مقالات ذات صلة
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,الدخول المحاسبة للسهم
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,الدخول المحاسبة للسهم
 DocType: Sales Invoice,Sales Team1,مبيعات Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,البند {0} غير موجود
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,البند {0} غير موجود
 DocType: Sales Invoice,Customer Address,العنوان العملاء
 DocType: Purchase Invoice,Apply Additional Discount On,تطبيق خصم إضافي على
 DocType: Account,Root Type,نوع الجذر
@@ -2145,15 +2163,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,تظهر هذه الشرائح في أعلى الصفحة
 DocType: BOM,Item UOM,البند UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),مبلغ الضريبة بعد خصم مبلغ (شركة العملات)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},مستودع الهدف هو إلزامية ل صف {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},مستودع الهدف هو إلزامية ل صف {0}
 DocType: Quality Inspection,Quality Inspection,فحص الجودة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,اضافية الصغيرة
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : المواد المطلوبة الكمية هي أقل من الحد الأدنى للطلب الكمية
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,حساب {0} مجمد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : المواد المطلوبة الكمية هي أقل من الحد الأدنى للطلب الكمية
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,الحساب {0} مجمّد
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,كيان قانوني / الفرعية مع مخطط مستقل للحسابات تابعة للمنظمة.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",الغذاء و المشروبات و التبغ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL أو BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},ان تجعل دفع فواتير فقط ضد {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},ان تجعل دفع فواتير فقط ضد {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,معدل العمولة لا يمكن أن يكون أكبر من 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,الحد الأدنى مستوى المخزون
 DocType: Stock Entry,Subcontract,قام بمقاولة فرعية
@@ -2191,7 +2209,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,فحص الجودة واردة.
 DocType: Purchase Order Item,Returned Qty,عاد الكمية
 DocType: Employee,Exit,خروج
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,نوع الجذر إلزامي
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,نوع الجذر إلزامي
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,المسلسل لا {0} خلق
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",لراحة العملاء، ويمكن استخدام هذه الرموز في أشكال الطباعة مثل الفواتير والسندات التسليم
 DocType: Employee,You can enter any date manually,يمكنك إدخال أي تاريخ يدويا
@@ -2199,8 +2217,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,فترة الاختبار
 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 +110,Row {0}: Advance against Customer must be credit,الصف {0}: يجب أن يكون مقدما ضد العملاء الائتمان
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,شراء السلعة استلام الموردة
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,دفع
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,دفع
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,إلى التاريخ والوقت
 DocType: SMS Settings,SMS Gateway URL,SMS بوابة URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,سجلات للحفاظ على حالة تسليم الرسائل القصيرة
@@ -2217,9 +2236,9 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,إعادة ترتيب مستوى
 DocType: Attendance,Attendance Date,تاريخ الحضور
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,تفكك الراتب على أساس الكسب وخصم.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,حساب مع العقد التابعة لا يمكن تحويلها إلى دفتر الأستاذ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,لا يمكن تحويل حساب ذو توابع إلى دفتر حسابات (دفتر أستاذ)
 DocType: Address,Preferred Shipping Address,النقل البحري المفضل العنوان
-DocType: Purchase Receipt Item,Accepted Warehouse,قبلت مستودع
+DocType: Purchase Receipt Item,Accepted Warehouse,مستودع مقبول
 DocType: Bank Reconciliation Detail,Posting Date,تاريخ النشر
 DocType: Item,Valuation Method,تقييم الطريقة
 apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},تعذر العثور على سعر الصرف ل{0} إلى {1}
@@ -2235,11 +2254,11 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,المسلسل لا {0} غير موجود
 DocType: Pricing Rule,Discount Percentage,نسبة الخصم
 DocType: Payment Reconciliation Invoice,Invoice Number,رقم الفاتورة
-apps/erpnext/erpnext/hooks.py +54,Orders,أوامر
+apps/erpnext/erpnext/hooks.py +55,Orders,أوامر
 DocType: Leave Control Panel,Employee Type,نوع الموظف
-DocType: Employee Leave Approver,Leave Approver,ترك الموافق
+DocType: Employee Leave Approver,Leave Approver,الموافق علي الاجازة
 DocType: Manufacturing Settings,Material Transferred for Manufacture,المواد المنقولة لغرض صناعة
-DocType: Expense Claim,"A user with ""Expense Approver"" role","يمكن للمستخدم مع ""النفقات الموافق"" دور"
+DocType: Expense Claim,"A user with ""Expense Approver"" role","مستخدم يقوم بدور ""معتمد التكاليف"""
 ,Issued Items Against Production Order,الأصناف التي صدرت بحق أمر الإنتاج
 DocType: Pricing Rule,Purchase Manager,مدير المشتريات
 DocType: Payment Tool,Payment Tool,دفع أداة
@@ -2247,12 +2266,12 @@
 DocType: Sales Order,% of materials billed against this Sales Order,٪ من المواد فوترت مقابل أمر المبيعات
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,بدء فترة الإغلاق
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,مركز التكلفة مع المعاملات القائمة لا يمكن تحويلها إلى مجموعة
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,خفض
+DocType: Account,Depreciation,خفض
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),المورد (ق)
 DocType: Customer,Credit Limit,الحد الائتماني
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,حدد النوع من المعاملات
 DocType: GL Entry,Voucher No,رقم السند
-DocType: Leave Allocation,Leave Allocation,ترك توزيع
+DocType: Leave Allocation,Leave Allocation,توزيع الاجازات
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,طلبات المواد {0} خلق
 apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,قالب من الشروط أو العقد.
 DocType: Customer,Address and Contact,عنوان والاتصال
@@ -2272,11 +2291,12 @@
 DocType: Material Request,Requested For,طلب لل
 DocType: Quotation Item,Against Doctype,DOCTYPE ضد
 DocType: Delivery Note,Track this Delivery Note against any Project,تتبع هذه ملاحظة التوصيل ضد أي مشروع
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,لا يمكن حذف حساب الجذر
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,صافي النقد من الاستثمار
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,لا يمكن حذف حساب الجذر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,مشاهدة سهم مقالات
 ,Is Primary Address,هو العنوان الرئيسي
 DocType: Production Order,Work-in-Progress Warehouse,مستودع العمل قيد التنفيذ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},إشارة # {0} بتاريخ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},إشارة # {0} بتاريخ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,إدارة العناوين
 DocType: Pricing Rule,Item Code,البند الرمز
 DocType: Production Planning Tool,Create Production Orders,إنشاء أوامر الإنتاج
@@ -2284,7 +2304,7 @@
 DocType: Journal Entry,User Remark,ملاحظة المستخدم
 DocType: Lead,Market Segment,سوق القطاع
 DocType: Employee Internal Work History,Employee Internal Work History,التاريخ الموظف العمل الداخلية
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),إغلاق (الدكتور)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),إغلاق (الدكتور)
 DocType: Contact,Passive,سلبي
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,المسلسل لا {0} ليس في الأوراق المالية
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,قالب الضريبية لبيع صفقة.
@@ -2300,7 +2320,7 @@
 ,Billed Amount,مبلغ الفاتورة
 DocType: Bank Reconciliation,Bank Reconciliation,تسوية البنك
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,الحصول على التحديثات
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,طلب المواد {0} تم إلغاء أو توقف
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,طلب المواد {0} تم إلغاء أو توقف
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,إضافة بعض السجلات عينة
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ترك الإدارة
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,مجموعة بواسطة حساب
@@ -2309,14 +2329,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",رئيس الاعتبار في إطار المسؤولية، التي سيتم حجزها الربح / الخسارة
 DocType: Payment Tool,Against Vouchers,ضد قسائم
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,مساعدة سريعة
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},مصدر و مستودع الهدف لا يمكن أن يكون نفس الصف ل {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},مصدر و مستودع الهدف لا يمكن أن يكون نفس الصف ل {0}
 DocType: Features Setup,Sales Extras,مبيعات إضافات
-apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ميزانية الحساب {1} مقابل مركز التكلفة {2} سيتجاوز التي كتبها {3}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},ميزانية {0} للحساب {1} مقابل مركز التكلفة {2} ستتجاوز بـ{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',"""من تاريخ "" يجب أن يكون بعد "" إلى تاريخ """
 ,Stock Projected Qty,الأسهم المتوقعة الكمية
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},العملاء {0} لا تنتمي لمشروع {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},العملاء {0} لا تنتمي لمشروع {1}
 DocType: Sales Order,Customer's Purchase Order,طلب شراء الزبون
 DocType: Warranty Claim,From Company,من شركة
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,القيمة أو الكمية
@@ -2326,9 +2346,9 @@
 DocType: Leave Block List,Leave Block List Allowed,ترك قائمة الحظر مسموح
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,ستستخدم هذا لتسجيل الدخول
 DocType: Sales Partner,Retailer,متاجر التجزئة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,يجب أن يكون الائتمان لحساب حساب الميزانية العمومية
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,يجب أن يكون الائتمان لحساب حساب الميزانية العمومية
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,جميع أنواع مزود
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأن السلعة بسهولة و غير مرقمة تلقائيا
+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 +93,Quotation {0} not of type {1},اقتباس {0} ليست من نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,صيانة جدول السلعة
 DocType: Sales Order,%  Delivered,تم إيصاله٪
@@ -2341,7 +2361,8 @@
 DocType: Appraisal,Appraisal,تقييم
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,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 +164,Leave approver must be one of {0},يجب أن تكون واحدة من ترك الموافق {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},"الموافق عل الاجازة يجب ان يكون واحد من 
+{0}"
 DocType: Hub Settings,Seller Email,البائع البريد الإلكتروني
 DocType: Project,Total Purchase Cost (via Purchase Invoice),مجموع تكلفة الشراء (عن طريق شراء الفاتورة)
 DocType: Workstation Working Hour,Start Time,بداية
@@ -2358,7 +2379,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,من اقتباس
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},دخول أخرى الفترة الإنتهاء {0} أحرز بعد {1}
 DocType: Production Order,Material Transferred for Manufacturing,المواد المنقولة لغرض التصنيع
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,حساب {0} لا يوجد
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,لا وجود للحساب {0}
 DocType: Purchase Receipt Item,Purchase Order Item No,شراء السلعة طلب No
 DocType: Project,Project Type,نوع المشروع
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,إما الكمية المستهدفة أو المبلغ المستهدف إلزامي.
@@ -2371,8 +2392,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,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),الوزن الكلي للحزمة. الوزن الصافي عادة + تغليف المواد الوزن. (للطباعة)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,يسمح للمستخدمين مع هذا الدور لضبط الحسابات المجمدة و إنشاء / تعديل القيود المحاسبية على حسابات مجمدة
-DocType: Serial No,Is Cancelled,وألغي
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,بلدي الشحنات
+DocType: Serial No,Is Cancelled,ألغي
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,بلدي الشحنات
 DocType: Journal Entry,Bill Date,تاريخ الفاتورة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",حتى لو كانت هناك قوانين التسعير متعددة مع الأولوية القصوى، يتم تطبيق الأولويات الداخلية ثم التالية:
 DocType: Supplier,Supplier Details,تفاصيل المورد
@@ -2392,11 +2413,11 @@
 DocType: Lead,From Customer,من العملاء
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,المكالمات
 DocType: Project,Total Costing Amount (via Time Logs),المبلغ الكلي التكاليف (عبر الزمن سجلات)
-DocType: Purchase Order Item Supplied,Stock UOM,الأسهم UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
+DocType: Purchase Order Item Supplied,Stock UOM,الوحدة
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,المتوقع
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},المسلسل لا {0} لا ينتمي إلى مستودع {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ملاحظة : سوف النظام لا تحقق الإفراط التسليم و الإفراط في حجز القطعة ل {0} حيث الكمية أو المبلغ 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,تاريخ الفتح
 DocType: Journal Entry,Remark,كلام
@@ -2409,9 +2430,9 @@
 DocType: Time Log,Batched for Billing,دفعات عن الفواتير
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,رفعت فواتير من قبل الموردين.
 DocType: POS Profile,Write Off Account,شطب حساب
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,خصم المبلغ
 DocType: Purchase Invoice,Return Against Purchase Invoice,العودة ضد شراء فاتورة
 DocType: Item,Warranty Period (in days),فترة الضمان (بالأيام)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,صافي التدفقات النقدية من العمليات
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,على سبيل المثال ضريبة
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,البند 4
 DocType: Journal Entry Account,Journal Entry Account,حساب إدخال دفتر اليومية
@@ -2423,7 +2444,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",انتقل إلى المجموعة المناسبة (عادة مصدر الأموال&gt; المطلوبات المتداولة&gt; الضرائب والرسوم وإنشاء حساب جديد (بالنقر على إضافة الطفل) من نوع &quot;الضريبة&quot; والقيام نذكر معدل الضريبة.
 ,Payment Period Based On Invoice Date,طريقة الدفع بناء على تاريخ الفاتورة
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},في عداد المفقودين أسعار صرف العملات ل{0}
-DocType: Journal Entry,Stock Entry,الأسهم الدخول
+DocType: Journal Entry,Stock Entry,حركة مخزنية
 DocType: Account,Payable,المستحقة
 DocType: Salary Slip,Arrear Amount,متأخرات المبلغ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,زبائن الجدد
@@ -2452,7 +2473,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,تاريخ التقاعد يجب أن يكون أكبر من تاريخ الالتحاق بالعمل
 DocType: Sales Invoice,Against Income Account,ضد حساب الدخل
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0} سلمت٪
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,نقل معلومات
@@ -2479,15 +2500,15 @@
 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/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,هذا هو الشخص المبيعات الجذرية والتي لا يمكن تحريرها.
-,Stock Ledger,الأسهم ليدجر
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},معدل: {0}
+,Stock Ledger,سجل المخزن
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},معدل: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,زلة الراتب خصم
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,حدد عقدة المجموعة أولا.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},يجب أن يكون هدف واحد من {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},يجب أن يكون هدف واحد من {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,تعبئة النموذج وحفظه
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,تحميل تقريرا يتضمن جميع المواد الخام مع وضعهم أحدث المخزون
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,منتديات
-DocType: Leave Application,Leave Balance Before Application,ترك الرصيد قبل تطبيق
+DocType: Leave Application,Leave Balance Before Application,رصيد الاجازات قلب الطلب
 DocType: SMS Center,Send SMS,إرسال SMS
 DocType: Company,Default Letter Head,افتراضي رسالة رئيس
 DocType: Time Log,Billable,فوترة
@@ -2521,7 +2542,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,شركة (وليس العميل أو المورد) الرئيسي.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"يرجى إدخال "" التاريخ المتوقع تسليم '"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,تسليم ملاحظات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,المبلغ المدفوع + شطب المبلغ لا يمكن أن يكون أكبر من المجموع الكلي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},ملاحظة : ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",ملاحظة: إذا لم يتم الدفع ضد أي إشارة، وجعل الدخول مجلة يدويا.
@@ -2538,13 +2559,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' معطل
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,على النحو المفتوحة
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,إرسال رسائل البريد الإلكتروني التلقائي لاتصالات على المعاملات تقديم.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","صف {0}: الكمية لا أفالابل في مستودع {1} على {2} {3}.
  المتاحة الكمية: {4}، نقل الكمية: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,البند 3
 DocType: Purchase Order,Customer Contact Email,العملاء الاتصال البريد الإلكتروني
 DocType: Sales Team,Contribution (%),مساهمة (٪)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء الدفع منذ دخول ' النقد أو البنك الحساب "" لم يتم تحديد"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء الدفع منذ دخول ' النقد أو البنك الحساب "" لم يتم تحديد"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,المسؤوليات
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,ال
 DocType: Sales Person,Sales Person Name,مبيعات الشخص اسم
@@ -2555,24 +2576,24 @@
 DocType: Stock Reconciliation Item,Before reconciliation,قبل المصالحة
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,البند ضريبة صف {0} يجب أن يكون في الاعتبار نوع ضريبة الدخل أو المصاريف أو إتهام أو
 DocType: Sales Order,Partly Billed,وصفت جزئيا
 DocType: Item,Default BOM,الافتراضي BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,الرجاء إعادة الكتابة اسم الشركة لتأكيد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,إجمالي المعلقة آمت
 DocType: Time Log Batch,Total Hours,مجموع ساعات
 DocType: Journal Entry,Printing Settings,إعدادات الطباعة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,السيارات
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,من التسليم ملاحظة
 DocType: Time Log,From Time,من وقت
 DocType: Notification Control,Custom Message,رسالة مخصصة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,الخدمات المصرفية الاستثمارية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,نقدا أو الحساب المصرفي إلزامي لجعل الدخول الدفع
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,نقدا أو الحساب المصرفي إلزامي لجعل الدخول الدفع
 DocType: Purchase Invoice,Price List Exchange Rate,معدل سعر صرف قائمة
 DocType: Purchase Invoice Item,Rate,معدل
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,المتدرب
-DocType: Newsletter,A Lead with this email id should exist,وينبغي أن يكون هذا المعرف الرصاص مع البريد الإلكتروني موجود
+DocType: Newsletter,A Lead with this email id should exist,يجب أن يكون هنالك قائد يستخدم هذا البريد الإلكتروني
 DocType: Stock Entry,From BOM,من BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,الأساسية
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,يتم تجميد المعاملات الاسهم قبل {0}
@@ -2587,9 +2608,10 @@
  الصراع عن طريق تعيين الأولوية. قواعد السعر: {0}"
 DocType: Account,Bank,مصرف
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شركة الطيران
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,قضية المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,قضية المواد
 DocType: Material Request Item,For Warehouse,لمستودع
 DocType: Employee,Offer Date,عرض التسجيل
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,الاقتباسات
 DocType: Hub Settings,Access Token,رمز وصول
 DocType: Sales Invoice Item,Serial No,المسلسل لا
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,الرجاء إدخال تفاصيل أول من Maintaince
@@ -2603,10 +2625,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,هناك أكثر من العطلات أيام عمل من هذا الشهر.
 DocType: Product Bundle Item,Product Bundle Item,المنتج حزمة البند
 DocType: Sales Partner,Sales Partner Name,مبيعات الشريك الاسم
+DocType: Payment Reconciliation,Maximum Invoice Amount,الحد الأقصى للمبلغ الفاتورة
 DocType: Purchase Invoice Item,Image View,عرض الصورة
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,التقييم وتوتال
@@ -2614,6 +2638,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"هذا البند هو البديل من {0} (قالب). سيتم نسخ سمات على من القالب ما لم يتم تعيين ""لا نسخ '"
 DocType: Account,Purchase User,شراء العضو
 DocType: Notification Control,Customize the Notification,تخصيص إعلام
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,التدفق النقدي من العمليات
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,لا يمكن حذف القالب الافتراضي العنوان
 DocType: Sales Invoice,Shipping Rule,الشحن القاعدة
 DocType: Journal Entry,Print Heading,طباعة عنوان
@@ -2624,7 +2649,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,المواد الخام
 DocType: Leave Application,Follow via Email,متابعة عبر البريد الإلكتروني
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,المبلغ الضريبي بعد الخصم المبلغ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,موجود حساب الطفل لهذا الحساب . لا يمكنك حذف هذا الحساب.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,يرجى تحديد تاريخ النشر لأول مرة
@@ -2642,6 +2667,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},مسلسل نص مطلوب لل مسلسل البند {0}
 DocType: Journal Entry,Bank Entry,دخول الضفة
 DocType: Authorization Rule,Applicable To (Designation),تنطبق على (تعيين)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,إضافة إلى العربة
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,المجموعة حسب
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,تمكين / تعطيل العملات .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,المصروفات البريدية
@@ -2649,30 +2675,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,الترفيه وترفيهية
 DocType: Purchase Order,The date on which recurring order will be stop,التاريخ الذي سيتم تتوقف أجل متكرر
 DocType: Quality Inspection,Item Serial No,البند رقم المسلسل
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} يجب تخفيض كتبها {1} أو يجب زيادة الفائض التسامح
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,يجب إنقاص {0}  بـ{1} أو زيادة سماحية الفائض
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,إجمالي الحاضر
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,ساعة
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","متسلسلة البند {0} لا يمكن تحديث \
  باستخدام الأسهم المصالحة"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,نقل المواد إلى المورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,نقل المواد إلى المورد
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,إنشاء اقتباس
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,غير مصرح لك الموافقة على أوراق تواريخ بلوك
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,لقد تم من قبل فوترت جميع الأصناف
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,لقد تم من قبل فوترت جميع الأصناف
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},يمكن أن يكون وافق عليها {0}
 DocType: Shipping Rule,Shipping Rule Conditions,الشحن شروط القاعدة
 DocType: BOM Replace Tool,The new BOM after replacement,وBOM الجديدة بعد استبدال
 DocType: Features Setup,Point of Sale,نقطة بيع
 DocType: Account,Tax,ضريبة
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},صف {0}: {1} ليست صالحة {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,من حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,من حزمة المنتج
 DocType: Production Planning Tool,Production Planning Tool,إنتاج أداة تخطيط المنزل
 DocType: Quality Inspection,Report Date,تقرير تاريخ
 DocType: C-Form,Invoices,الفواتير
 DocType: Job Opening,Job Title,المسمى الوظيفي
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} المستلمين
 DocType: Features Setup,Item Groups in Details,المجموعات في البند تفاصيل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,يجب أن تكون الكمية لصنع أكبر من 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),بداية في نقاط البيع (POS)
@@ -2680,8 +2705,9 @@
 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: Pricing Rule,Customer Group,مجموعة العملاء
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},حساب المصاريف إلزامي لمادة {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},حساب المصاريف إلزامي لمادة {0}
 DocType: Item,Website Description,وصف الموقع
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,صافي التغير في حقوق المساهمين
 DocType: Serial No,AMC Expiry Date,AMC تاريخ انتهاء الاشتراك
 ,Sales Register,سجل مبيعات
 DocType: Quotation,Quotation Lost Reason,خسارة التسعيرة بسبب
@@ -2689,15 +2715,15 @@
 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 +108,Summary for this month and pending activities,ملخص لهذا الشهر والأنشطة المعلقة
 DocType: Customer Group,Customer Group Name,العملاء اسم المجموعة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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,سمات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,الحصول على العناصر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,الرجاء إدخال شطب الحساب
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,الحصول على العناصر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,الرجاء إدخال شطب الحساب
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,أمر آخر تاريخ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,جعل المكوس الفاتورة
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},حساب {0} لا ينتمي إلى شركة {1}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},الحساب {0} لا ينتمي إلى الشركة {1}
 DocType: C-Form,C-Form,نموذج C-
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID العملية لم تحدد
 DocType: Production Order,Planned Start Date,المخطط لها تاريخ بدء
@@ -2710,7 +2736,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,بيانات المشروع من الحكمة ليست متاحة لل اقتباس
 DocType: Project,Expected End Date,تاريخ الإنتهاء المتوقع
 DocType: Appraisal Template,Appraisal Template Title,تقييم قالب عنوان
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,تجاري
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,تجاري
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,الأم البند {0} لا يجب أن يكون البند الأسهم
 DocType: Cost Center,Distribution Id,توزيع رقم
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,خدمات رهيبة
@@ -2723,7 +2749,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},يجب أن تكون قيمة للسمة {0} ضمن مجموعة من {1} إلى {2} في الزيادات من {3}
 DocType: Tax Rule,Sales,مبيعات
 DocType: Stock Entry Detail,Basic Amount,المبلغ الأساسي
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
 DocType: Leave Allocation,Unused leaves,الأوراق غير المستخدمة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,كر
 DocType: Customer,Default Receivable Accounts,افتراضي حسابات المقبوضات
@@ -2735,16 +2761,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,إيصالات شراء
-DocType: Payment Reconciliation,Maximum Amount,أقصى مبلغ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,كيف يتم تطبيق التسعير القاعدة؟
 DocType: Quality Inspection,Delivery Note No,ملاحظة لا تسليم
 DocType: Company,Retail,بيع بالتجزئة
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,العملاء {0} غير موجود
 DocType: Attendance,Absent,غائب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,حزمة المنتج
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},الصف {0}: إشارة غير صالحة {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},الصف {0}: إشارة غير صالحة {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,شراء قالب الضرائب والرسوم
 DocType: Upload Attendance,Download Template,تحميل قالب
 DocType: GL Entry,Remarks,تصريحات
@@ -2756,7 +2782,7 @@
 DocType: Offer Letter,Awaiting Response,في انتظار الرد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,فوق
 DocType: Salary Slip,Earning & Deduction,وكسب الخصم
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,حساب {0} لا يمكن أن يكون مجموعة
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,الحساب {0} لا يمكن أن يكون مجموعة
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,Optional. This setting will be used to filter in various transactions.,اختياري . سيتم استخدام هذا الإعداد لتصفية في المعاملات المختلفة.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,لا يسمح السلبية قيم التقييم
 DocType: Holiday List,Weekly Off,العطلة الأسبوعية
@@ -2771,17 +2797,19 @@
 ,Monthly Attendance Sheet,ورقة الحضور الشهرية
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,العثور على أي سجل
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مركز التكلفة إلزامي  للصنف {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,الحصول على عناصر من حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,الحصول على عناصر من حزمة المنتج
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,حساب {0} غير نشط
-DocType: GL Entry,Is Advance,هو المقدمة
+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 +122,Please enter 'Is Subcontracted' as Yes or No,"يرجى إدخال "" التعاقد من الباطن "" كما نعم أو لا"
 DocType: Sales Team,Contact No.,الاتصال رقم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,نوع حساب الأرباح و الخسائر {0} غير مسموح به في الأرصدة الافتتاحية
 DocType: Features Setup,Sales Discounts,مبيعات خصومات
 DocType: Hub Settings,Seller Country,البائع البلد
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,نشر عناصر على الموقع
 DocType: Authorization Rule,Authorization Rule,إذن القاعدة
 DocType: Sales Invoice,Terms and Conditions Details,شروط وتفاصيل الشروط
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,مواصفات
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,الضرائب على المبيعات والرسوم قالب
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ملابس واكسسوارات
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,عدد بالدفع
@@ -2803,7 +2831,7 @@
 DocType: Time Log,Billing Amount,قيمة الفواتير
 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 +18,Applications for leave.,طلبات الحصول على إجازة.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,حساب مع الصفقة الحالية لا يمكن حذف
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,لا يمكن حذف جرت عليه أي عملية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,المصاريف القانونية
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",في يوم من الشهر الذي سيتم إنشاء ترتيب السيارات سبيل المثال 05، 28 الخ
 DocType: Sales Invoice,Posting Time,نشر التوقيت
@@ -2817,13 +2845,13 @@
 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 +132,Travel Expenses,مصاريف السفر
 DocType: Maintenance Visit,Breakdown,انهيار
-apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,الحساب: {0} مع العملة: {1} لا يمكن اختيارها
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,الحساب: {0} مع العملة: {1} لا يمكن اختياره
 DocType: Bank Reconciliation Detail,Cheque Date,تاريخ الشيك
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},حساب {0}: حساب الرئيسي {1} لا تنتمي إلى الشركة: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},الحساب {0}: حسابه الرئيسي {1} لا ينتمي إلى الشركة: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,تم حذف جميع المعاملات المتعلقة بهذه الشركة!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,كما في تاريخ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,امتحان
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,مستودع الافتراضي هو إلزامي بالنسبة لمخزون السلعة .
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,مستودع الافتراضي هو إلزامي بالنسبة لمخزون السلعة .
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},دفع المرتبات لشهر {0} و السنة {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,إدراج السيارات أسعار قائمة الأسعار إذا مفقود
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,إجمالي المبلغ المدفوع
@@ -2835,6 +2863,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),المبلغ الكلي الفواتير (عبر الزمن سجلات)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,نبيع هذه القطعة
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,المورد رقم
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,وينبغي أن تكون كمية أكبر من 0
 DocType: Journal Entry,Cash Entry,الدخول النقدية
 DocType: Sales Partner,Contact Desc,الاتصال التفاصيل
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.",نوع من الأوراق مثل غيرها، عارضة المرضى
@@ -2843,14 +2872,14 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,إضافة صفوف لوضع الميزانيات السنوية على الحسابات.
 DocType: Buying Settings,Default Supplier Type,الافتراضي مزود نوع
 DocType: Production Order,Total Operating Cost,إجمالي تكاليف التشغيل
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,ملاحظة : البند {0} دخلت عدة مرات
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,ملاحظة : البند {0} دخلت عدة مرات
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,جميع جهات الاتصال.
 DocType: Newsletter,Test Email Id,اختبار البريد الإلكتروني معرف
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,اختصار الشركة
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,إذا كنت تتبع فحص الجودة . تمكن البند QA المطلوبة وضمان الجودة لا في إيصال الشراء
 DocType: GL Entry,Party Type,نوع الحزب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,المواد الخام لا يمكن أن يكون نفس البند الرئيسي
-DocType: Item Attribute Value,Abbreviation,الاختصار
+DocType: Item Attribute Value,Abbreviation,اسم مختصر
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,لا أوثرويزيد منذ {0} يتجاوز حدود
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,قالب الراتب الرئيسي.
 DocType: Leave Type,Max Days Leave Allowed,اترك أيام كحد أقصى مسموح
@@ -2858,7 +2887,7 @@
 DocType: Payment Tool,Set Matching Amounts,ضبط المبالغ مطابقة
 DocType: Purchase Invoice,Taxes and Charges Added,أضيفت الضرائب والرسوم
 ,Sales Funnel,مبيعات القمع
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,اختصار إلزامي
+apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,الاسم المختصر إلزامي
 apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,عربة
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,شكرا لك على اهتمامك في الاشتراك في تحديثات لدينا
 ,Qty to Transfer,الكمية للنقل
@@ -2866,9 +2895,9 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,دور الأليفة لتحرير الأسهم المجمدة
 ,Territory Target Variance Item Group-Wise,الأراضي المستهدفة الفرق البند المجموعة الحكيم
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,جميع المجموعات العملاء
-apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما لا يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,قالب الضرائب إلزامي.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,حساب {0}: حساب الرئيسي {1} غير موجود
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,الحساب {0}: حسابه الرئيسي {1} غير موجود
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),قائمة الأسعار معدل (عملة الشركة)
 DocType: Account,Temporary,مؤقت
 DocType: Address,Preferred Billing Address,يفضل عنوان الفواتير
@@ -2886,14 +2915,14 @@
 ,Item-wise Price List Rate,البند الحكيمة قائمة الأسعار قيم
 DocType: Purchase Order Item,Supplier Quotation,اقتباس المورد
 DocType: Quotation,In Words will be visible once you save the Quotation.,وبعبارة تكون مرئية بمجرد حفظ اقتباس.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} لم يتوقف
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} لم يتوقف
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
 DocType: Lead,Add to calendar on this date,إضافة إلى التقويم في هذا التاريخ
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,قواعد لإضافة تكاليف الشحن.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,الأحداث القادمة
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,مطلوب العملاء
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,دخول سريع
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} غير إلزامية من أجل العودة
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} إلزامية من أجل العودة
 DocType: Purchase Order,To Receive,تلقي
 apps/erpnext/erpnext/public/js/setup_wizard.js +284,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,الدخل / المصاريف
@@ -2908,24 +2937,24 @@
 DocType: Customer,From Lead,من العميل المحتمل
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,أوامر الإفراج عن الإنتاج.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,اختر السنة المالية ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
 DocType: Hub Settings,Name Token,اسم رمز
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,البيع القياسية
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,واحدة على الاقل مستودع إلزامي
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,استبدل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,الرجاء إدخال حدة القياس الافتراضية
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,الرجاء إدخال حدة القياس الافتراضية
 DocType: Purchase Invoice Item,Project Name,اسم المشروع
 DocType: Supplier,Mention if non-standard receivable account,أذكر إذا غير القياسية حساب المستحق
 DocType: Journal Entry Account,If Income or Expense,إذا دخل أو مصروف
 DocType: Features Setup,Item Batch Nos,ارقام البند دفعة
 DocType: Stock Ledger Entry,Stock Value Difference,قيمة الأسهم الفرق
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,الموارد البشرية
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,الموارد البشرية
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,دفع المصالحة الدفع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,الأصول الضريبية
 DocType: BOM Item,BOM No,لا BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,إدخال دفتر اليومية {0} ليس لديه حساب {1} أو بالفعل يقابل ضد قسيمة أخرى
 DocType: Item,Moving Average,المتوسط المتحرك
 DocType: BOM Replace Tool,The BOM which will be replaced,وBOM التي سيتم استبدالها
 DocType: Account,Debit,مدين
@@ -2939,7 +2968,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"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.",إذا تم العثور على أساس دولتين أو أكثر من قواعد التسعير على الشروط المذكورة أعلاه، يتم تطبيق الأولوية. الأولوية هو رقم بين 0-20 في حين القيمة الافتراضية هي صفر (فارغة). عدد العالي يعني ان الامر سيستغرق الأسبقية إذا كانت هناك قواعد التسعير متعددة مع نفس الظروف.
 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.,تسمح للمستخدمين التالية للموافقة على طلبات الحصول على إجازة أيام بلوك.
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,تسمح للمستخدمين التالية للموافقة على طلبات الحصول على إجازة أيام فترة.
 apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,أنواع المطالبة حساب.
 DocType: Item,Taxes,الضرائب
 DocType: Project,Default Cost Center,افتراضي مركز التكلفة
@@ -2962,15 +2991,15 @@
 DocType: Stock Entry Detail,Additional Cost,تكلفة إضافية
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,تاريخ نهاية السنة المالية
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",لا يمكن تصفية استنادا قسيمة لا، إذا تم تجميعها حسب قسيمة
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,جعل مورد اقتباس
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,جعل مورد اقتباس
 DocType: Quality Inspection,Incoming,الوارد
 DocType: BOM,Materials Required (Exploded),المواد المطلوبة (انفجرت)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),خفض عائد لإجازة بدون أجر (LWP)
 apps/erpnext/erpnext/public/js/setup_wizard.js +274,"Add users to your organization, other than yourself",إضافة مستخدمين إلى مؤسستك، وغيرها من نفسك
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},الصف # {0}: المسلسل لا {1} لا يتطابق مع {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,عارضة اترك
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,أجازة عارضة
 DocType: Batch,Batch ID,دفعة ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},ملاحظة : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},ملاحظة : {0}
 ,Delivery Note Trends,ملاحظة اتجاهات التسليم
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ملخص هذا الأسبوع
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} يجب أن يكون الصنف مشترى أو متعاقد من الباطن في الصف {1}
@@ -2980,14 +3009,15 @@
 DocType: Opportunity,Opportunity Date,تاريخ الفرصة
 DocType: Purchase Receipt,Return Against Purchase Receipt,العودة ضد شراء إيصال
 DocType: Purchase Order,To Bill,لبيل
-DocType: Material Request,% Ordered,٪ أمرت
+DocType: Material Request,% Ordered,٪ تم طلبها
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,العمل مقاولة
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,متوسط. سعر شراء
 DocType: Task,Actual Time (in Hours),الوقت الفعلي (بالساعات)
 DocType: Employee,History In Company,وفي تاريخ الشركة
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,النشرات الإخبارية
 DocType: Address,Shipping,الشحن
-DocType: Stock Ledger Entry,Stock Ledger Entry,الأسهم ليدجر الدخول
+DocType: Stock Ledger Entry,Stock Ledger Entry,حركة سجل المخزن
 DocType: Department,Leave Block List,ترك قائمة الحظر
 DocType: Customer,Tax ID,البطاقة الضريبية
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,البند {0} ليس الإعداد ل مسلسل رقم العمود يجب أن يكون فارغا
@@ -3004,7 +3034,6 @@
 DocType: Purchase Order,End date of current order's period,تاريخ انتهاء الفترة لكي الحالي
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,تقديم عرض رسالة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,عودة
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,يجب أن تكون وحدة القياس الافتراضية للخيار نفس قالب
 DocType: Production Order Operation,Production Order Operation,أمر الإنتاج عملية
 DocType: Pricing Rule,Disable,تعطيل
 DocType: Project Task,Pending Review,في انتظار المراجعة
@@ -3012,7 +3041,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,معرف العملاء
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,إلى الوقت يجب أن تكون أكبر من من الوقت
 DocType: Journal Entry Account,Exchange Rate,سعر الصرف
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,ترتيب المبيعات {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,ترتيب المبيعات {0} لم تقدم
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},مستودع {0}: حساب الرئيسي {1} لا بولونغ للشركة {2}
 DocType: BOM,Last Purchase Rate,أخر سعر توريد
 DocType: Account,Asset,الأصول
@@ -3032,14 +3061,14 @@
 ,Available Stock for Packing Items,المخزون المتاج للأصناف المعبأة
 DocType: Item Variant,Item Variant,البديل البند
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,وضع هذا القالب كما العنوان الافتراضي حيث لا يوجد الافتراضية الأخرى
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","رصيد حساب بالفعل في الخصم، لا يسمح لك تعيين ""الرصيد يجب أن يكون 'ك' الائتمان '"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,إدارة الجودة
 DocType: Production Planning Tool,Filter based on customer,تصفية على أساس العملاء
 DocType: Payment Tool Detail,Against Voucher No,ضد قسيمة لا
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},الرجاء إدخال كمية القطعة ل {0}
 DocType: Employee External Work History,Employee External Work History,التاريخ الموظف العمل الخارجي
 DocType: Tax Rule,Purchase,شراء
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,التوازن الكمية
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,الكمية المتاحة
 DocType: Item Group,Parent Item Group,الأم الإغلاق المجموعة
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ل {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,مراكز التكلفة
@@ -3049,6 +3078,7 @@
 DocType: Opportunity,Next Contact,التالي اتصل بنا
 DocType: Employee,Employment Type,مجال العمل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,الموجودات الثابتة
+,Cash Flow,التدفق النقدي
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,فترة التطبيق لا يمكن أن يكون عبر اثنين من السجلات alocation
 DocType: Item Group,Default Expense Account,الافتراضي نفقات الحساب
 DocType: Employee,Notice (days),إشعار (أيام )
@@ -3061,7 +3091,7 @@
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,الجديد {0} اسم
 apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},تجدون طيه {0} # {1}
 DocType: Job Applicant,Applicant Name,اسم مقدم الطلب
-DocType: Authorization Rule,Customer / Item Name,العميل / البند الاسم
+DocType: Authorization Rule,Customer / Item Name,العميل / أسم البند
 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**. 
 
 The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
@@ -3080,13 +3110,12 @@
 DocType: Production Order,Warehouses,المستودعات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,طباعة و قرطاسية
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,عقدة المجموعة
-DocType: Payment Reconciliation,Minimum Amount,الحد الأدنى المبلغ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,تحديث السلع منتهية
 DocType: Workstation,per hour,كل ساعة
-DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,سيتم إنشاء حساب المستودع ( الجرد الدائم ) في إطار هذا الحساب.
+DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,سيتم إنشاء حساب المستودع (الجرد الدائم) تحت هذا الحساب.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,مستودع لا يمكن حذف كما يوجد مدخل الأسهم دفتر الأستاذ لهذا المستودع.
 DocType: Company,Distribution,التوزيع
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,المبلغ المدفوع
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,المبلغ المدفوع
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,مدير المشروع
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,إيفاد
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ماكس الخصم المسموح به لمادة: {0} {1}٪
@@ -3110,10 +3139,10 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics الدعم
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},شركة مفقود في المستودعات {0}
 DocType: POS Profile,Terms and Conditions,الشروط والأحكام
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},إلى التسجيل يجب أن يكون ضمن السنة المالية. على افتراض إلى تاريخ = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},إلى التسجيل يجب أن يكون ضمن السنة المالية. على افتراض إلى تاريخ = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",هنا يمكنك الحفاظ على الطول والوزن، والحساسية، الخ المخاوف الطبية
 DocType: Leave Block List,Applies to Company,ينطبق على شركة
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,لا يمكن إلغاء الاشتراك بسبب الأسهم المقدم {0} موجود
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,لا يمكن إلغاء الاشتراك بسبب الحركة المخزنية {0} موجود
 DocType: Purchase Invoice,In Words,في كلمات
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,اليوم هو {0} 'عيد ميلاد!
 DocType: Production Planning Tool,Material Request For Warehouse,طلب للحصول على المواد مستودع
@@ -3124,11 +3153,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,من فضلك ادخل شراء إيصالات
 DocType: Sales Invoice,Get Advances Received,الحصول على السلف المتلقاة
 DocType: Email Digest,Add/Remove Recipients,إضافة / إزالة المستلمين
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},الصفقة لا يسمح ضد توقفت أمر الإنتاج {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),إعداد ملقم واردة ل دعم البريد الإلكتروني معرف . (على سبيل المثال support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,نقص الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
 DocType: Salary Slip,Salary Slip,إيصال الراتب
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.",توليد التعبئة زلات لحزم ليتم تسليمها. تستخدم لإعلام عدد حزمة، حزمة المحتويات وزنه.
@@ -3217,7 +3246,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,سجلات الموظفين
 DocType: HR Settings,Payroll Settings,إعدادات الرواتب
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,غير مطابقة الفواتير والمدفوعات المرتبطة.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,طلب مكان
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,طلب مكان
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,الجذر لا يمكن أن يكون مركز تكلفة الأصل
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,اختر الماركة ...
 DocType: Sales Invoice,C-Form Applicable,C-نموذج قابل للتطبيق
@@ -3230,9 +3259,9 @@
 DocType: Payment Tool,Get Outstanding Vouchers,الحصول على قسائم المعلقة
 DocType: Warranty Claim,Resolved By,حلها عن طريق
 DocType: Appraisal,Start Date,تاريخ البدء
-apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,تخصيص يترك لفترة .
+apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,تخصيص أجازات لفترة .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,انقر هنا للتحقق من
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,حساب {0}: لا يمكنك تعيين نفسه كحساب الأم
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,الحساب {0}: لا يمكنك جعله حساباً رئيسياً لنفسه
 DocType: Purchase Invoice Item,Price List Rate,قائمة الأسعار قيم
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",تظهر &quot;في سوق الأسهم&quot; أو &quot;ليس في الأوراق المالية&quot; على أساس الأسهم المتاحة في هذا المخزن.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),مشروع القانون المواد (BOM)
@@ -3241,19 +3270,19 @@
 DocType: Project,Expected Start Date,يتوقع البدء تاريخ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,إزالة البند إذا الرسوم لا تنطبق على هذا البند
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,على سبيل المثال. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,تسلم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,تسلم
 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: Employee Leave Approver,Employee Leave Approver,الموظف إجازة الموافق
+DocType: Employee Leave Approver,Employee Leave Approver,الموافق علي اجازة الموظف
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} تمت إضافة بنجاح إلى قائمة النشرة الإخبارية لدينا.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",لا يمكن ان تعلن بانها فقدت ، لأن أحرز اقتباس .
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,مدير ماستر شراء
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,إنتاج النظام {0} يجب أن تقدم
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,إنتاج النظام {0} يجب أن تقدم
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},يرجى تحديد تاريخ بدء و نهاية التاريخ القطعة ل {0}
-apps/erpnext/erpnext/config/stock.py +136,Main Reports,الرئيسية تقارير
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,التقارير الرئيسية
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,حتى الآن لا يمكن أن يكون قبل تاريخ من
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
 apps/erpnext/erpnext/stock/doctype/item/item.js +193,Add / Edit Prices,إضافة / تحرير الأسعار
@@ -3269,7 +3298,7 @@
 DocType: Industry Type,Industry Type,صناعة نوع
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,حدث خطأ!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,يحتوي التطبيق اترك التواريخ الكتلة التالية: تحذير
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,{0} سبق أن قدمت فاتورة المبيعات
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,{0} سبق أن قدمت فاتورة المبيعات
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,تاريخ الانتهاء
 DocType: Purchase Invoice Item,Amount (Company Currency),المبلغ (عملة الشركة)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,وحدة المؤسسة ( قسم) الرئيسي.
@@ -3288,12 +3317,12 @@
 ,Serial No Service Contract Expiry,مسلسل العقد لا انتهاء الاشتراك خدمة
 DocType: Item,Unit of Measure Conversion,وحدة القياس التحويل
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,لا يمكن تغيير موظف
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,لا يمكنك الائتمان والخصم نفس الحساب في نفس الوقت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,لا يمكنك الائتمان والخصم نفس الحساب في نفس الوقت
 DocType: Naming Series,Help HTML,مساعدة HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},يجب أن يكون مجموع الترجيح تعيين 100 ٪ . فمن {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},اتاحة لأكثر من {0} للصنف {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},اتاحة لأكثر من {0} للصنف {1}
 DocType: Address,Name of person or organization that this address belongs to.,اسم الشخص أو المنظمة التي ينتمي إلى هذا العنوان.
-apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,لديك موردون
+apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,الموردون
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,لا يمكن تعيين كما فقدت كما يرصد ترتيب المبيعات .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"آخر هيكل الراتب {0} نشط للموظف {1}. يرجى التأكد مكانتها ""غير فعال"" للمتابعة."
 DocType: Purchase Invoice,Contact,اتصل
@@ -3304,48 +3333,48 @@
 DocType: Employee,Date of Issue,تاريخ الإصدار
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0} من {0} ب {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},الصف # {0}: تعيين مورد للالبند {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,الموقع صورة {0} تعلق على البند {1} لا يمكن العثور
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,يرجى التحقق من خيار العملات المتعددة للسماح حسابات مع عملة أخرى
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,يرجى التحقق من خيار العملات المتعددة للسماح حسابات مع عملة أخرى
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,البند: {0} غير موجود في النظام
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,لا يحق لك تعيين القيمة المجمدة
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,لا يحق لك تعيين القيمة المجمدة
 DocType: Payment Reconciliation,Get Unreconciled Entries,الحصول على مقالات لم تتم تسويتها
+DocType: Payment Reconciliation,From Invoice Date,من تاريخ الفاتورة
 DocType: Cost Center,Budgets,الميزانيات
-DocType: Employee,Emergency Contact Details,تفاصيل الاتصال في حالات الطوارئ
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,مجال عمل الشركة؟
 DocType: Delivery Note,To Warehouse,لمستودع
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},تم إدخال حساب {0} أكثر من مرة للعام المالي {1}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},تم إدخال الحساب {0} أكثر من مرة للعام المالي {1}
 ,Average Commission Rate,متوسط العمولة
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,"""لهُ رقم تسلسل""  لا يمكن ان يكون ""نعم"" لبند غير قابل للتخزين"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,"""لهُ رقم تسلسل""  لا يمكن ان يكون ""نعم"" لبند غير قابل للتخزين"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,لا يمكن أن ىكون تاريخ الحضور تاريخ مستقبلي
 DocType: Pricing Rule,Pricing Rule Help,تعليمات التسعير القاعدة
 DocType: Purchase Taxes and Charges,Account Head,رئيس حساب
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,تحديث تكاليف إضافية لحساب تكلفة هبطت من البنود
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,كهربائي
 DocType: Stock Entry,Total Value Difference (Out - In),إجمالي قيمة الفرق (خارج - في)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,الصف {0}: سعر صرف إلزامي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,الصف {0}: سعر صرف إلزامي
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},هوية المستخدم لم يتم تعيين موظف ل {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,من المطالبة الضمان
 DocType: Stock Entry,Default Source Warehouse,المصدر الافتراضي مستودع
 DocType: Item,Customer Code,قانون العملاء
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},تذكير عيد ميلاد ل{0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,منذ أيام طلب آخر
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,يجب أن يكون الخصم لحساب حساب الميزانية العمومية
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,الموجودات الأسهم
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},هل تريد حقا لتقديم كل زلة الرواتب ل شهر {0} و السنة {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},هل تريد حقا تسجيل كل ايصالات الرواتب ل شهر {0} و السنة {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,المشتركون استيراد
 DocType: Target Detail,Target Qty,الهدف الكمية
 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 +35,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} يجب أن يكون من نوع المسؤولية / حقوق المساهمين
 DocType: Authorization Rule,Based On,وبناء على
 DocType: Sales Order Item,Ordered Qty,أمرت الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,البند هو تعطيل {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,البند هو تعطيل {0}
 DocType: Stock Settings,Stock Frozen Upto,الأسهم المجمدة لغاية
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},فترة من وفترة لمواعيد إلزامية لالمتكررة {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,مشروع النشاط / المهمة.
@@ -3353,7 +3382,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),شطب المبلغ (شركة العملات)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
 DocType: Landed Cost Voucher,Landed Cost Voucher,هبطت التكلفة قسيمة
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},الرجاء تعيين {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تكرار في يوم من شهر
@@ -3383,12 +3412,12 @@
 DocType: Upload Attendance,Upload Attendance,تحميل الحضور
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,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/accounts/doctype/journal_entry/journal_entry.js +446,Amount,كمية
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,كمية
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,استبدال BOM
 ,Sales Analytics,مبيعات تحليلات
 DocType: Manufacturing Settings,Manufacturing Settings,إعدادات التصنيع
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,إعداد البريد الإلكتروني
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,الرجاء إدخال العملة الافتراضية في شركة ماستر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,الرجاء إدخال العملة الافتراضية في شركة ماستر
 DocType: Stock Entry Detail,Stock Entry Detail,الأسهم إدخال التفاصيل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,تذكير اليومية
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},تضارب القاعدة الضريبية مع {0}
@@ -3414,13 +3443,13 @@
 DocType: Sales Order Item,Produced Quantity,أنتجت الكمية
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,مهندس
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,جمعيات البحث الفرعية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},كود البند المطلوبة في صف لا { 0 }
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},كود البند المطلوبة في صف لا { 0 }
 DocType: Sales Partner,Partner Type,نوع الشريك
 DocType: Purchase Taxes and Charges,Actual,فعلي
 DocType: Authorization Rule,Customerwise Discount,Customerwise الخصم
 DocType: Purchase Invoice,Against Expense Account,ضد حساب المصاريف
 DocType: Production Order,Production Order,الإنتاج ترتيب
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,تركيب ملاحظة {0} وقد تم بالفعل قدمت
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,تركيب ملاحظة {0} وقد تم بالفعل قدمت
 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,عرض الآن
@@ -3432,15 +3461,15 @@
 DocType: Employee,Applicable Holiday List,ينطبق عطلة قائمة
 DocType: Employee,Cheque,شيك
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,تم تحديث الرقم المتسلسل
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,تقرير نوع إلزامي
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,تقرير نوع إلزامي
 DocType: Item,Serial Number Series,المسلسل عدد سلسلة
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},مستودع إلزامي للسهم المدينة {0} في {1} الصف
 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/public/js/setup_wizard.js +101,The First User: You,المستخدم أولا : أنت
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},يتم تعيين السنة المالية وتاريخ بدء السنة المالية تاريخ الانتهاء بالفعل في السنة المالية {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,التوفيق بنجاح
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},يتم تعيين السنة المالية وتاريخ بدء السنة المالية تاريخ الانتهاء بالفعل في السنة المالية {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,التوفيق بنجاح
 DocType: Production Order,Planned End Date,المخطط لها تاريخ الانتهاء
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,حيث يتم تخزين العناصر.
 DocType: Tax Rule,Validity,صحة
@@ -3448,7 +3477,7 @@
 DocType: Attendance,Attendance,الحضور
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,تاريخ نشرها ونشر الوقت إلزامي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,تاريخ نشرها ونشر الوقت إلزامي
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,قالب الضرائب لشراء صفقة.
 ,Item Prices,البند الأسعار
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,وبعبارة تكون مرئية بمجرد حفظ أمر الشراء.
@@ -3457,15 +3486,15 @@
 DocType: Task,Review Date,مراجعة تاريخ
 DocType: Purchase Invoice,Advance Payments,دفعات مقدمة
 DocType: Purchase Taxes and Charges,On Net Total,على إجمالي صافي
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,مستودع الهدف في الصف {0} يجب أن يكون نفس ترتيب الإنتاج
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,مستودع الهدف في الصف {0} يجب أن يكون نفس ترتيب الإنتاج
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,لا إذن لاستخدام أداة الدفع
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""عناويين الإيميل للتنبيه""  غير محددة للمدخلات المتكررة %s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,لا يمكن تغيير العملة بعد إجراء إدخالات باستخدام بعض العملات الأخرى
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,لا يمكن تغيير العملة بعد إجراء إدخالات باستخدام بعض العملات الأخرى
 DocType: Company,Round Off Account,جولة قبالة حساب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,المصاريف الإدارية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,الاستشارات
 DocType: Customer Group,Parent Customer Group,الأم العملاء مجموعة
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,تغيير
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,تغيير
 DocType: Purchase Invoice,Contact Email,عنوان البريد الإلكتروني
 DocType: Appraisal Goal,Score Earned,نقاط المكتسبة
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","على سبيل المثال ""شركتي ذ.م.م. """
@@ -3475,13 +3504,13 @@
 DocType: Packing Slip,Gross Weight UOM,الوزن الإجمالي UOM
 DocType: Email Digest,Receivables / Payables,الذمم المدينة / الدائنة
 DocType: Delivery Note Item,Against Sales Invoice,ضد فاتورة المبيعات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,حساب الائتمان
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,حساب الائتمان
 DocType: Landed Cost Item,Landed Cost Item,هبطت تكلفة السلعة
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,إظهار القيم الصفر
 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 +562,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
 DocType: Item,Default Warehouse,النماذج الافتراضية
 DocType: Task,Actual End Date (via Time Logs),الفعلي تاريخ الانتهاء (عبر الزمن سجلات)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},الميزانية لا يمكن تعيين ضد المجموعة حساب {0}
@@ -3517,29 +3546,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,تخطيط سجلات الوقت خارج ساعات العمل محطة العمل.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} قد تم بالفعل تأكيده
 ,Items To Be Requested,البنود يمكن طلبه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,الحصول على آخر سعر شراء
 DocType: Time Log,Billing Rate based on Activity Type (per hour),أسعار الفواتير على أساس نوع النشاط (في الساعة)
 DocType: Company,Company Info,معلومات عن الشركة
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent",شركة البريد الإلكتروني معرف لم يتم العثور على ، وبالتالي لم ترسل البريد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),تطبيق الأموال (الأصول )
 DocType: Production Planning Tool,Filter based on item,تصفية استنادا إلى البند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,حساب الخصم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,حساب الخصم
 DocType: Fiscal Year,Year Start Date,تاريخ بدء العام
 DocType: Attendance,Employee Name,اسم الموظف
 DocType: Sales Invoice,Rounded Total (Company Currency),المشاركات تقريب (العملة الشركة)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,لا يمكن سرية لمجموعة حيث يتم تحديد نوع الحساب.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,لا يمكن سرية لمجموعة حيث يتم تحديد نوع الحساب.
 DocType: Purchase Common,Purchase Common,شراء المشتركة
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,من الفرص
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,فوائد الموظف
 DocType: Sales Invoice,Is POS,هو POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},الكمية معبأة يجب أن يساوي كمية القطعة ل {0} في {1} الصف
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},الكمية معبأة يجب أن يساوي كمية القطعة ل {0} في {1} الصف
 DocType: Production Order,Manufactured Qty,الكمية المصنعة
 DocType: Purchase Receipt Item,Accepted Quantity,كمية مقبولة
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} {1} غير موجود
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,رفعت فواتير للعملاء.
 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 +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},الصف لا {0}: مبلغ لا يمكن أن يكون أكبر من ريثما المبلغ من النفقات المطالبة {1}. في انتظار المبلغ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},الصف لا {0}: مبلغ لا يمكن أن يكون أكبر من ريثما المبلغ من النفقات المطالبة {1}. في انتظار المبلغ {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}  مشتركين تم اضافتهم
 DocType: Maintenance Schedule,Schedule,جدول
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",تحديد الميزانية لهذا مركز التكلفة. لمجموعة العمل الميزانية، انظر &quot;قائمة الشركات&quot;
@@ -3547,7 +3577,7 @@
 DocType: Quality Inspection Reading,Reading 3,قراءة 3
 ,Hub,محور
 DocType: GL Entry,Voucher Type,نوع السند
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
 DocType: Expense Claim,Approved,وافق
 DocType: Pricing Rule,Price,السعر
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',يجب أن يتم تعيين الموظف مرتاح على {0} ك ' اليسار '
@@ -3561,7 +3591,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,المحاسبة إدخالات دفتر اليومية.
 DocType: Delivery Note Item,Available Qty at From Warehouse,الكمية المتوفرة في المستودعات من
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},الصف {0}: حزب / حساب لا يتطابق مع {1} / {2} في {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,لإنشاء حساب الضرائب
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,الرجاء إدخال حساب المصاريف
 DocType: Account,Stock,المخزون
@@ -3572,7 +3602,7 @@
 DocType: Employee,Contract End Date,تاريخ نهاية العقد
 DocType: Sales Order,Track this Sales Order against any Project,تتبع هذا الأمر ضد أي مشروع المبيعات
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,سحب أوامر البيع (في انتظار لتسليم) بناء على المعايير المذكورة أعلاه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,من مزود اقتباس
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,من مزود اقتباس
 DocType: Deduction Type,Deduction Type,خصم نوع
 DocType: Attendance,Half Day,نصف يوم
 DocType: Pricing Rule,Min Qty,دقيقة الكمية
@@ -3580,7 +3610,7 @@
 DocType: GL Entry,Transaction Date,تاريخ المعاملة
 DocType: Production Plan Item,Planned Qty,المخطط الكمية
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,مجموع الضرائب
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,لالكمية (الكمية المصنعة) إلزامي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,لالكمية (الكمية المصنعة) إلزامي
 DocType: Stock Entry,Default Target Warehouse,الهدف الافتراضي مستودع
 DocType: Purchase Invoice,Net Total (Company Currency),المجموع الصافي (عملة الشركة)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,الصف {0}: نوع الحزب والحزب لا ينطبق إلا على المقبوضات / حسابات المدفوعات
@@ -3592,7 +3622,7 @@
 DocType: Hub Settings,Hub Settings,إعدادات المحور
 DocType: Project,Gross Margin %,هامش إجمالي٪
 DocType: BOM,With Operations,مع عمليات
-apps/erpnext/erpnext/accounts/party.py +232,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 +232,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}.
 ,Monthly Salary Register,سجل الراتب الشهري
 DocType: Warranty Claim,If different than customer address,إذا كان مختلفا عن عنوان العميل
 DocType: BOM Operation,BOM Operation,BOM عملية
@@ -3634,9 +3664,9 @@
 DocType: Customer,Commission Rate,اللجنة قيم
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,جعل البديل
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,منع مغادرة الطلبات المقدمة من الإدارة.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,السلة فارغة
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,السلة فارغة
 DocType: Production Order,Actual Operating Cost,الفعلية تكاليف التشغيل
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,لا يمكن تحرير الجذر.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,لا يمكن تحرير الجذر.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,يمكن المبلغ المخصص لا يزيد المبلغ unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,السماح الإنتاج على عطلات
 DocType: Sales Order,Customer's Purchase Order Date,طلب شراء الزبون التسجيل
@@ -3647,11 +3677,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,مصمم
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,الشروط والأحكام قالب
 DocType: Serial No,Delivery Details,الدفع تفاصيل
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,إنشاء المواد طلب تلقائيا إذا وقعت كمية أقل من هذا المستوى
 ,Item-wise Purchase Register,البند من الحكمة الشراء تسجيل
 DocType: Batch,Expiry Date,تاريخ انتهاء الصلاحية
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item",لضبط مستوى إعادة الطلب، يجب أن يكون البند لشراء السلعة أو التصنيع البند
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item",لضبط مستوى إعادة الطلب، يجب أن يكون البند لشراء السلعة أو التصنيع البند
 ,Supplier Addresses and Contacts,العناوين المورد و اتصالات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,الرجاء اختيار الفئة الأولى
 apps/erpnext/erpnext/config/projects.py +18,Project master.,المشروع الرئيسي.
@@ -3659,7 +3689,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(نصف يوم)
 DocType: Supplier,Credit Days,الائتمان أيام
 DocType: Leave Type,Is Carry Forward,والمضي قدما
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,الحصول على عناصر من BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,فاتورة المواد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},الصف {0}: مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {1}
@@ -3667,7 +3697,7 @@
 DocType: Employee,Reason for Leaving,سبب ترك العمل
 DocType: Expense Claim Detail,Sanctioned Amount,يعاقب المبلغ
 DocType: GL Entry,Is Opening,وفتح
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},لا يمكن ربط الخصم المباشر الإدخال مع {1} الصف {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,حساب {0} غير موجود
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},لا يمكن ربط الخصم المباشر الإدخال مع {1} الصف {0}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,حساب {0} غير موجود
 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 bee08fd..b7b7973 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Потребителски продукти
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Моля изберете страна Type първи
 DocType: Item,Customer Items,Предмети на клиенти
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Account {0}: Родителска сметка {1} не може да бъде Главна счетоводна книга
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Account {0}: Родителска сметка {1} не може да бъде Главна счетоводна книга
 DocType: Item,Publish Item to hub.erpnext.com,Публикуване т да hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Известия по имейл
 DocType: Item,Default Unit of Measure,Default Мерна единица
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,Клиента Контакти
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,От Материал Искане
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,От Материал Искане
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дървовидно
 DocType: Job Applicant,Job Applicant,Кандидат За Работа
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Не повече резултати.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. To maintain the customer wise item code and to make them searchable based on their code use this option
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на разплащателна сметка
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Покажи Варианти
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Количество
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Количество
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Заеми (пасиви)
 DocType: Employee Education,Year of Passing,Година на Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В Наличност
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Грижа за здравето
 DocType: Purchase Invoice,Monthly,Месечно
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Забавяне на плащане (дни)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Имейл Адрес
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Фискална година {0} е необходим
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Отбрана
 DocType: Company,Abbr,Съкращение
 DocType: Appraisal Goal,Score (0-5),Резултати на (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} не съвпада с {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} не съвпада с {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Превозно средство не
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Моля изберете Ценоразпис
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Моля изберете Ценоразпис
 DocType: Production Order Operation,Work In Progress,Незавършено производство
 DocType: Employee,Holiday List,Holiday Списък
 DocType: Time Log,Time Log,Време Log
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Същата фирма се вписват повече от веднъж
 DocType: Employee,Married,Омъжена
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не се разрешава {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
 DocType: Payment Reconciliation,Reconcile,Съгласувайте
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Хранителни стоки
 DocType: Quality Inspection Reading,Reading 1,Четене 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Направи Bank Влизане
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионни фондове
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Warehouse е задължително, ако типа на профила е Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,"Warehouse е задължително, ако типа на профила е Warehouse"
 DocType: SMS Center,All Sales Person,Всички продажби Person
 DocType: Lead,Person Name,Лице Име
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Проверете дали повтарящи цел, махнете отметката, за да спре повтарящи се или пуснати правилното Крайна дата"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Заинтересован
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Бил на Материал
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Отвор
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},"От {0}, за да {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},"От {0}, за да {1}"
 DocType: Item,Copy From Item Group,Copy от позиция Group
 DocType: Journal Entry,Opening Entry,Откриване Влизане
 DocType: Stock Entry,Additional Costs,Допълнителни разходи
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Сметка със съществуващa трансакция не може да бъде превърната в група.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Сметка със съществуващa трансакция не може да бъде превърната в група.
 DocType: Lead,Product Enquiry,Каталог Запитване
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Моля, въведете първата компания"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Моля изберете Company първа
 DocType: Employee Education,Under Graduate,Под Graduate
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Обща Цена
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Activity Log:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Точка {0} не съществува в системата или е с изтекъл срок
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Точка {0} трябва да бъде покупка Точка
 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 +444,Item {0} is not active or end of life has been reached,Точка {0} не е активен или е било постигнато в края на жизнения
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,Точка {0} не е активен или е било постигнато в края на жизнения
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Ще бъде актуализиран след фактурата за продажба е подадено.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Настройки за Module HR
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Подробности за извършените операции.
 DocType: Serial No,Maintenance Status,Поддръжка Status
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Артикули и ценообразуване
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},"От дата трябва да бъде в рамките на фискалната година. Ако приемем, че от датата = {0}"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},"От дата трябва да бъде в рамките на фискалната година. Ако приемем, че от датата = {0}"
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Изберете служителя за когото вие създавате при оценките.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Разходен център {0} не принадлежи към Company {1}
 DocType: Customer,Individual,Индивидуален
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Net Cash от Финансиране
 DocType: Lead,Address & Contact,Адрес и контакти
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добави неизползвани отпуски от предишни разпределения
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Следваща повтарящо {0} ще бъде създаден на {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Име За Контакт
 DocType: Production Plan Item,SO Pending Qty,"Така, докато се Количество"
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Създава заплата приплъзване за посочените по-горе критерии.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Няма описание дадено
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Заявка за покупка.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Само избраният Оставете одобряващ да подадете този отпуск Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Облекчаване дата трябва да е по-голяма от Дата на Присъединяване
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Позиция Website Specification
 DocType: Payment Tool,Reference No,Референтен номер по
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Оставете Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Склад за помирение Точка
 DocType: Stock Entry,Sales Invoice No,Продажби Фактура Не
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Доставчик Type
 DocType: Item,Publish in Hub,Публикувай в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Точка {0} е отменен
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Точка {0} е отменен
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Материал Искане
 DocType: Bank Reconciliation,Update Clearance Date,Актуализация Клирънсът Дата
 DocType: Item,Purchase Details,Изкупните Детайли
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не е открит в &quot;суровини Доставя&quot; маса в Поръчката {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не е открит в &quot;суровини Доставя&quot; маса в Поръчката {1}
 DocType: Employee,Relation,Връзка
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Доставка
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Потвърдените поръчки от клиенти.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Предложения
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Задаване на елемент Група-мъдър бюджети на тази територия. Можете също така да включват сезон, като настроите разпределение."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Моля, въведете група майка сметка за склад {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Заплащане срещу {0} {1} не може да бъде по-голяма от дължимата сума, {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Заплащане срещу {0} {1} не може да бъде по-голяма от дължимата сума, {2}"
 DocType: Supplier,Address HTML,Адрес HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Генериране Schedule
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Последен
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 символа
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Първият Оставете одобряващ в списъка ще бъде избран по подразбиране Оставете одобряващ
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Уча
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Разходите за дейността на служителите
 DocType: Accounts Settings,Settings for Accounts,Настройки за сметки
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Управление на продажбите Person Tree.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Multi валути
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип Invoice
 DocType: Sales Invoice Item,Delivery Note,Фактура
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Създаване Данъци
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Създаване Данъци
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Заплащане вписване е променен, след като го извади. Моля, изтеглете го отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} въведен два пъти в Данък
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} въведен два пъти в Данък
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Резюме за тази седмица и предстоящи дейности
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Моля, изберете месец и година"
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Предлага се в BOM, известието за доставка, фактурата за покупка, производство поръчка за покупка, покупка разписка, фактурата за продажба, продажба Поръчка, Фондова вписване, график"
 DocType: Item Tax,Tax Rate,Данъчна Ставка
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},"{0} вече разпределена за Employee {1} за период {2} {3}, за да"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Изберете Точка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Изберете Точка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Позиция: {0} успя партиди, не може да се примири с помощта \ фондова помирение, вместо това използвайте фондова Влизане"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Не трябва да е същото като {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Конвертиране в не-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Покупка разписка трябва да бъде представено
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медицински
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина за загубата
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation е затворен на следните дати, както на Holiday Списък: {0}"
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Възможности
 DocType: Employee,Single,Единичен
 DocType: Issue,Attachment,Привързаност
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Бюджетът не може да се настрои за Cost Center Group
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,Holiday майстор.
 DocType: Material Request Item,Required Date,Задължително Дата
 DocType: Delivery Note,Billing Address,Адрес На Плащане
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Моля, въведете Код."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Моля, въведете Код."
 DocType: BOM,Costing,Остойностяване
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако е избрано, размерът на данъка ще се считат за която вече е включена в Print Курсове / Print размер"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Общо Количество
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Моля, въведете Warehouse, за които ще бъдат повдигнати Материал Искане"
 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 +458,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
 DocType: Shipping Rule,Net Weight,Нето Тегло
 DocType: Employee,Emergency Phone,Телефон за спешни
 ,Serial No Warranty Expiry,Пореден № Warranty Изтичане
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Увеличаване не може да бъде 0
 DocType: Production Planning Tool,Material Requirement,Материал Изискване
 DocType: Company,Delete Company Transactions,Изтриване на фирма Сделки
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Точка {0} не е Закупете Точка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Точка {0} не е Закупете Точка
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} е невалиден имейл адрес в ""Уведомление \ Имейл адрес"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Общо Billing Тази година:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавяне / Редактиране на данъци и такси
 DocType: Purchase Invoice,Supplier Invoice No,Доставчик Invoice Не
 DocType: Territory,For reference,За справка
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не може да се изтрие Пореден № {0}, тъй като се използва в сделки с акции"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Закриване (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Закриване (Cr)
 DocType: Serial No,Warranty Period (Days),Гаранционен период (дни)
 DocType: Installation Note Item,Installation Note Item,Монтаж Забележка Точка
 ,Pending Qty,Отложена Количество
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Месечен Разпределение ** ви помага да разпространявате бюджета си през месеца, ако имате сезонност в бизнеса си. За разпределяне на бюджета, използвайки тази дистрибуция, задайте тази ** Месечен Разпределение ** в ** разходен център на **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Не са намерени в таблицата с Invoice записи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Не са намерени в таблицата с Invoice записи
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Моля изберете Company и Party Type първи
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Финансови / Счетоводство година.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Съжаляваме, серийни номера не могат да бъдат слети"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,Проект Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Общо
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Началната дата не трябва да бъде по-голяма от фискална година Крайна дата
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Началната дата не трябва да бъде по-голяма от фискална година Крайна дата
 DocType: Warranty Claim,Resolution,Резолюция
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Доставени: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Доставени: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Платими Акаунт
 DocType: Sales Order,Billing and Delivery Status,Billing и Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Повторете клиенти
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,Офертата до
 DocType: Lead,Middle Income,Среден доход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Откриване (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Отпусната сума не може да бъде отрицателна
 DocType: Purchase Order Item,Billed Amt,Таксуваната Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логически Склад, за които са направени стоковите разписки."
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Производство на поръчката е задължително
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Предложение за писане
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negative фондова Error ({6}) за позиция {0} в Warehouse {1} на {2} {3} в {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negative фондова Error ({6}) за позиция {0} в Warehouse {1} на {2} {3} в {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година Company
 DocType: Packing Slip Item,DN Detail,DN Подробности
 DocType: Time Log,Billed,Обявен
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,Default Остойностяване Курсове
 DocType: Maintenance Schedule,Maintenance Schedule,График за поддръжка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тогава към цените правилник се филтрират базирани на гостите, група клиенти, територия, доставчик, доставчик Type, Кампания, продажба Partner т.н."
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Нетна промяна в Инвентаризация
 DocType: Employee,Passport Number,Номер на паспорт
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Мениджър
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,От Покупка Разписка
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Същата позиция е влязъл няколко пъти.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,От Покупка Разписка
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Същата позиция е влязъл няколко пъти.
 DocType: SMS Settings,Receiver Parameter,Приемник на параметъра
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Въз основа на"" и ""Групиране По"" не може да бъде един и същ"
 DocType: Sales Person,Sales Person Targets,Търговец Цели
 DocType: Production Order Operation,In minutes,В минути
 DocType: Issue,Resolution Date,Резолюция Дата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
 DocType: Selling Settings,Customer Naming By,Задаване на име на клиента от
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Конвертиране в Група
 DocType: Activity Cost,Activity Type,Вид Дейност
@@ -534,7 +538,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} не е намерен в Таблица Фактури
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} не е намерен в Таблица Фактури
 DocType: Company,Round Off Cost Center,Завършете Cost Center
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Поддръжка посещение {0} трябва да се отмени преди анулирането този Продажби Поръчка
 DocType: Material Request,Material Transfer,Материал Transfer
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,За да проследите позиция в продажбите и закупуване на документи въз основа на техните серийни номера. Това е също може да се използва за проследяване на информацията за гаранцията на продукта.
 DocType: Purchase Receipt Item Supplied,Current Stock,Current Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Отхвърлени Warehouse е задължително срещу regected т
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Общо за фактуриране през тази година
 DocType: Account,Expenses Included In Valuation,"Разходи, включени в остойностяване"
 DocType: Employee,Provide email id registered in company,Осигуряване на имейл ID регистриран в компания
 DocType: Hub Settings,Seller City,Продавач City
 DocType: Email Digest,Next email will be sent on:,Следваща ще бъде изпратен имейл на:
 DocType: Offer Letter Term,Offer Letter Term,Оферта Писмо Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Точка има варианти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0} не е в наличност
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} не е в наличност
 DocType: Mode of Payment Account,Default Account,Default Account
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Водещият трябва да се настрои, ако Opportunity е направена от олово"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Моля изберете седмичен почивен ден
 DocType: Production Order Operation,Planned End Time,Планирания край на времето
 ,Sales Person Target Variance Item Group-Wise,Продажбите Person Target Вариацията т Group-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Сметка със съществуващa трансакция не може да бъде превърната в Главна Счетоводна Книга
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Сметка със съществуващa трансакция не може да бъде превърната в Главна Счетоводна Книга
 DocType: Delivery Note,Customer's Purchase Order No,Клиента поръчка Не
 DocType: Employee,Cell Number,Броя на клетките
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Материал Исканията Генерирани
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Загубен
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Вие не можете да въведете текущата ваучер &quot;Срещу вестник Entry&quot; колона
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Вие не можете да въведете текущата ваучер &quot;Срещу вестник Entry&quot; колона
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергия
 DocType: Opportunity,Opportunity From,Opportunity От
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Месечно извлечение заплата.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: От {0} от вид {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Превръщане Factor е задължително
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да деактивирате или да отмени BOM тъй като тя е свързана с други спецификации на материали
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да деактивирате или да отмени BOM тъй като тя е свързана с други спецификации на материали
 DocType: Opportunity,Maintenance,Поддръжка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},"Покупка Квитанция брой, необходим за т {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},"Покупка Квитанция брой, необходим за т {0}"
 DocType: Item Attribute Value,Item Attribute Value,Позиция атрибута Value
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Продажби кампании.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ценова листа не избран
 DocType: Employee,Family Background,Семейна среда
 DocType: Process Payroll,Send Email,Изпрати е-мейл
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Внимание: Invalid Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Внимание: Invalid Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Няма разрешение
 DocType: Company,Default Bank Account,Default Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","За да филтрирате базирани на партия, изберете страна Напишете първия"
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Предмети с висше weightage ще бъдат показани по-високи
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,"Банково извлечение, Подробности"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Моят Фактури
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Моят Фактури
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Няма намерен служител
 DocType: Purchase Order,Stopped,Спряно
 DocType: Item,If subcontracted to a vendor,Ако възложи на продавача
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Изпрати сега
 ,Support Analytics,Поддръжка Analytics
 DocType: Item,Website Warehouse,Website Warehouse
+DocType: Payment Reconciliation,Minimum Invoice Amount,Минимална сума на фактурата
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Денят от месеца, на която автоматично фактура ще бъде генериран например 05, 28 и т.н."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Резултати трябва да бъде по-малка или равна на 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-форма записи
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",За да се даде възможност на &quot;точка на продажба&quot; функции
 DocType: Bin,Moving Average Rate,Moving Average Курсове
 DocType: Production Planning Tool,Select Items,Изберете артикули
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} срещу Сметка {1} от {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} срещу Сметка {1} от {2}
 DocType: Maintenance Visit,Completion Status,Завършване Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Оставя се в продължение на доставка или получаване до запълването този процент
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматично композира съобщение при представяне на сделките.
 DocType: Production Order,Item To Manufacture,Точка за производство
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статут е {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Поръчка за покупка на плащане
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Поръчка за покупка на плащане
 DocType: Sales Order Item,Projected Qty,Прогнозно Количество
 DocType: Sales Invoice,Payment Due Date,Дължимото плащане Дата
 DocType: Newsletter,Newsletter Manager,Newsletter мениджъра
@@ -704,7 +709,7 @@
 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 +304,Point-of-Sale,Точка на продажба
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
 DocType: Account,Balance must be,Баланс трябва да бъде
 DocType: Hub Settings,Publish Pricing,Публикуване на ценообразуване
 DocType: Notification Control,Expense Claim Rejected Message,Expense искането се отхвърля Message
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Валута на валутния курс майстор.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} трябва да бъде активен
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} трябва да бъде активен
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Моля, изберете вида на документа първо"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменете Материал Посещения {0} преди анулира тази поддръжка посещение
 DocType: Salary Slip,Leave Encashment Amount,Оставете Инкасо Сума
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,По подразбиране Платими сметки
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Служител {0} не е активен или не съществува
 DocType: Features Setup,Item Barcode,Позиция Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Позиция Варианти {0} актуализиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Позиция Варианти {0} актуализиран
 DocType: Quality Inspection Reading,Reading 6,Четене 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактурата за покупка Advance
 DocType: Address,Shop,Магазин
 DocType: Hub Settings,Sync Now,Sync сега
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit влизане не може да бъде свързана с {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit влизане не може да бъде свързана с {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Default Bank / Cash сметка ще се актуализира автоматично в POS Invoice, когато е избран този режим."
 DocType: Employee,Permanent Address Is,Постоянен адрес е
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операция попълва за колко готова продукция?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Марката
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Помощи за свръх {0} прекоси за позиция {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Помощи за свръх {0} прекоси за позиция {1}.
 DocType: Employee,Exit Interview Details,Exit Интервю Детайли
 DocType: Item,Is Purchase Item,Дали Покупка Точка
 DocType: Journal Entry Account,Purchase Invoice,Покупка Invoice
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,Общо в думи
 DocType: Material Request Item,Lead Time Date,Lead Time Дата
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,е задължително. Може би рекорд на валута не е създаден за
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Моля, посочете Пореден № за позиция {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Моля, посочете Пореден № за позиция {1}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","За &#39;Продукт Пакетни &quot;, склад, сериен номер и партидният няма да се счита от&quot; Опаковка Списък &quot;масата. Ако Warehouse и партиден № са едни и същи за всички опаковъчни артикули за т всеки &quot;Продукт Bundle&quot;, тези стойности могат да бъдат вписани в основния таблицата позиция, стойностите ще се копират в &quot;Опаковка Списък&quot; маса."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Превозите на клиентите.
 DocType: Purchase Invoice Item,Purchase Order Item,Поръчка за покупка Точка
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Вариране
 ,Company Name,Име На Фирмата
 DocType: SMS Center,Total Message(s),Общо Message (и)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Изберете точката за прехвърляне
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,"Изберете акаунт шеф на банката, в която е депозирана проверка."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Позволи на потребителя да редактира Ценоразпис Курсове по сделки
 DocType: Pricing Rule,Max Qty,Max Количество
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Плащането срещу Продажби / Поръчката трябва винаги да бъде маркиран, като предварително"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Химически
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Всички предмети са били прехвърлени вече за тази производствена поръчка.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Всички предмети са били прехвърлени вече за тази производствена поръчка.
 DocType: Process Payroll,Select Payroll Year and Month,Изберете Payroll година и месец
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Отидете на подходящата група (обикновено Прилагане на фондове&gt; Текущи активи&gt; Банкови сметки и да създадете нов акаунт (като кликнете върху Добавяне на детето) от тип &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Ток Cost
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Вземи платени аванси
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Прикрепете вашата снимка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Правя
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Правя
 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 +3,My Cart,Моята количка
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Моята количка
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Откриване Количество
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
 DocType: Delivery Note,Delivery To,Доставка до
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Умение маса е задължително
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,Умение маса е задължително
 DocType: Production Planning Tool,Get Sales Orders,Вземи Продажби Поръчки
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може да бъде отрицателна
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Отстъпка
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Отстъпка
 DocType: Features Setup,Purchase Discounts,Изкупните Отстъпки
 DocType: Workstation,Wages,Заплати
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Ще бъде актуализиран, само ако времето Log е &quot;Подлежащи на таксуване&quot;"
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,Доставка членка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Т трябва да се добавят с помощта на &quot;получават от покупка Приходи&quot; бутона
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Продажби Разходи
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard Изкупуването
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standard Изкупуването
 DocType: GL Entry,Against,Срещу
 DocType: Item,Default Selling Cost Center,Default Selling Cost Center
 DocType: Sales Partner,Implementation Partner,Партньор за изпълнение
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,Разпределител
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Количка Доставка Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производство Поръчка {0} трябва да се отмени преди анулира тази поръчка за продажба
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',"Моля, задайте &quot;Прилагане Допълнителна отстъпка от &#39;"
 ,Ordered Items To Be Billed,"Поръчаните артикули, които се таксуват"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,От Range трябва да бъде по-малко от гамата
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Изберете Час Logs и подадем да създадете нов фактурата за продажба.
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log партида се таксува.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Създайте Opportunity
 DocType: Salary Slip,Leave Without Pay,Оставете без заплащане
-DocType: Supplier,Communications,Communications
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Капацитет Error планиране
 ,Trial Balance for Party,Trial Везни за парти
 DocType: Lead,Consultant,Консултант
 DocType: Salary Slip,Earnings,Печалба
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Завършил т {0} трябва да бъде въведен за влизане тип Производство
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Откриване Счетоводство Balance
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Завършил т {0} трябва да бъде въведен за влизане тип Производство
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Откриване Счетоводство Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Фактурата за продажба Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Няма за какво да поиска
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Актуалната Начална дата"" не може да бъде по-голяма от ""Актуалната Крайна дата"""
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,Текущата фискална година
 DocType: Global Defaults,Disable Rounded Total,Забранете Rounded Общо
 DocType: Lead,Call,Повикване
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&quot;Записи&quot; не могат да бъдат празни
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&quot;Записи&quot; не могат да бъдат празни
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate ред {0} със същия {1}
 ,Trial Balance,Оборотна ведомост
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Създаване Служители
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,User ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Виж Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Най-ранната
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
 DocType: Production Order,Manufacture against Sales Order,Производство срещу Продажби Поръчка
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Останалата част от света
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,Брутно възнаграждение
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Не е разрешено да редактирате замразена сметка {0}
 DocType: Journal Entry,Get Outstanding Invoices,Вземи неплатените фактури
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продажбите Поръчка {0} не е валидна
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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 Не {0}
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,Място на издаване
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Договор
 DocType: Email Digest,Add Quote,Добави цитат
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Мерна единица фактор coversion изисква за мерна единица: {0} в продукт: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Мерна единица фактор coversion изисква за мерна единица: {0} в продукт: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Непреките разходи
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Кол е задължително
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земеделие
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,Вашите продукти или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плащане
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Това е главната позиция група и не може да се редактира.
 DocType: Journal Entry Account,Purchase Order,Поръчка
 DocType: Warehouse,Warehouse Contact Info,Склад Информация за контакт
@@ -1018,8 +1024,8 @@
 DocType: Email Digest,Annual Income,Годишен доход
 DocType: Serial No,Serial No Details,Пореден № Детайли
 DocType: Purchase Invoice Item,Item Tax Rate,Позиция данъчна ставка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Бележка за доставка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Бележка за доставка {0} не е подадена
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Точка {0} трябва да бъде подизпълнители Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капиталови УРЕДИ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ценообразуване правило е първият избран на базата на &quot;Нанесете върху&quot; област, която може да бъде т, т Group или търговска марка."
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,Гол
 DocType: Sales Invoice Item,Edit Description,Edit Описание
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Очаквана дата на доставка е по-малка от планираното Начална дата.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,За доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,За доставчик
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Задаване типа на профила ви помага при избора на този профил в сделките.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company валути)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Общо Outgoing
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,Вестник Влизане
 DocType: Workstation,Workstation Name,Workstation Име
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email бюлетин:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към т {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към т {1}
 DocType: Sales Partner,Target Distribution,Target Разпределение
 DocType: Salary Slip,Bank Account No.,Bank Account No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Това е поредният номер на последната създадена сделката с този префикс
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Бюлетини за контакти, води."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Операциите не може да бъде оставено празно.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Операциите не може да бъде оставено празно.
 ,Delivered Items To Be Billed,"Доставени изделия, които се таксуват"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse не може да се променя за Serial No.
 DocType: Authorization Rule,Average Discount,Средна отстъпка
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},От {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operation Описание
 DocType: Item,Will also apply to variants,Ще се прилага и за варианти
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Не може да се промени фискална година Начални дата и фискална година Крайна дата веднъж фискалната година се запазва.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Не може да се промени фискална година Начални дата и фискална година Крайна дата веднъж фискалната година се запазва.
 DocType: Quotation,Shopping Cart,Карта За Пазаруване
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Ср Daily Outgoing
 DocType: Pricing Rule,Campaign,Кампания
@@ -1100,7 +1106,8 @@
 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 +211,Stock Entries already created for Production Order ,Вписване в запасите вече създадени за производствена поръчка
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Вписване в запасите вече създадени за производствена поръчка
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Нетна промяна в дълготрайни материални активи
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставете празно, ако считат за всички наименования"
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,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 +182,Max: {0},Max: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Сметкоплан
 DocType: Material Request,Terms and Conditions Content,Условия Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,не може да бъде по-голяма от 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
 DocType: Maintenance Visit,Unscheduled,Нерепаративен
 DocType: Employee,Owned,Собственост
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи от тръгне без Pay
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Възложени Изпълнения
 DocType: Shipping Rule Condition,To Value,За да Value
 DocType: Supplier,Stock Manager,Склад за мениджъра
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Източник склад е задължително за поредна {0}
+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 +581,Packing Slip,Приемо-предавателен протокол
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Офис под наем
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Настройки Setup SMS Gateway
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Не адрес добавя още.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation работен час
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Аналитик
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на JV количество {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на JV количество {2}
 DocType: Item,Inventory,Инвентаризация
 DocType: Features Setup,"To enable ""Point of Sale"" view",За да се даде възможност на &quot;точка на продажба&quot; изглед
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плащането не може да се направи за празна количката
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Плащането не може да се направи за празна количката
 DocType: Item,Sales Details,Продажби Детайли
 DocType: Opportunity,With Items,С артикули
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,В Количество
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,Родител Cost Center
 DocType: Sales Invoice,Source,Източник
 DocType: Leave Type,Is Leave Without Pay,Дали си тръгне без Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Не са намерени в таблицата за плащане записи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Не са намерени в таблицата за плащане записи
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Финансова година Начална дата
 DocType: Employee External Work History,Total Experience,Общо Experience
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Приемо-предавателен протокол (и) анулиране
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Приемо-предавателен протокол (и) анулиране
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Парични потоци от инвестиционна
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товарни и спедиция Такси
 DocType: Material Request Item,Sales Order No,Продажбите Заповед №
 DocType: Item Group,Item Group Name,Име на артикул Group
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Прехвърляне Материали за Производство
 DocType: Pricing Rule,For Price List,За Ценовата листа
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Ставка за покупка за покупка: {0} не е намерен, която се изисква, за да резервират счетоводство (разходи). Моля, посочете т цена срещу купуването ценоразпис."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Ставка за покупка за покупка: {0} не е намерен, която се изисква, за да резервират счетоводство (разходи). Моля, посочете т цена срещу купуването ценоразпис."
 DocType: Maintenance Schedule,Schedules,Списъци
 DocType: Purchase Invoice Item,Net Amount,Нетна сума
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Подробности Не
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Допълнителна отстъпка сума (във Валута на Фирмата)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Грешка: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Грешка: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Моля да създадете нов акаунт от сметкоплан.
 DocType: Maintenance Visit,Maintenance Visit,Поддръжка посещение
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Customer&gt; Customer Group&gt; Territory
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,Продажбите Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Счетоводство Entry за {0} може да се направи само в валута: {1}
 DocType: Pricing Rule,Pricing Rule,Ценообразуване Правило
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материал Заявка за пазаруване Поръчка
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Материал Заявка за пазаруване Поръчка
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Върнати т {1} не съществува в {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банкови сметки
 ,Bank Reconciliation Statement,Bank помирение резюме
@@ -1225,11 +1233,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Откриване фондова Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} трябва да се появи само веднъж
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Не е позволено да прехвърляйте повече {0} от {1} срещу Поръчката {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},Листата Разпределен успешно в продължение на {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,"Няма елементи, да се опаковат"
 DocType: Shipping Rule Condition,From Value,От Value
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Производство Количество е задължително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Производство Количество е задължително
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Суми не постъпят по банковата
 DocType: Quality Inspection Reading,Reading 4,Четене 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Искове за сметка на фирмата.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,Материал Исканията за които не са създадени Доставчик Цитати
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"В деня (и), на която кандидатствате за отпуск са празници. Не е нужно да кандидатствате за отпуск."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,За да проследите предмети с помощта на баркод. Вие ще бъдете в състояние да влезе елементи в Бележка за доставка и фактурата за продажба чрез сканиране на баркод на артикул.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Маркирай като Доставени
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Маркирай като Доставени
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направи оферта
 DocType: Dependent Task,Dependent Task,Зависим Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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 напомняне за рождени дни
 DocType: SMS Center,Receiver List,Списък Receiver
 DocType: Payment Tool Detail,Payment Amount,Сума За Плащане
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Консумирана Сума
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Изглед
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Изглед
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Нетна промяна в Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Структура Заплата Приспадане
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
 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 +185,Quantity must not be more than {0},Количество не трябва да бъде повече от {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Възраст (дни)
 DocType: Quotation Item,Quotation Item,Цитат Позиция
 DocType: Account,Account Name,Име на Сметка
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,"От дата не може да бъде по-голяма, отколкото към днешна дата"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,"От дата не може да бъде по-голяма, отколкото към днешна дата"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Пореден № {0} количество {1} не може да бъде една малка част
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Доставчик Type майстор.
 DocType: Purchase Order Item,Supplier Part Number,Доставчик Номер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Обменен курс не може да бъде 0 или 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Обменен курс не може да бъде 0 или 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{1} {0} е отменен или спрян
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Камион Dispatch Дата
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Покупка Квитанция {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Покупка Квитанция {0} не е подадена
 DocType: Company,Default Payable Account,Default Платим Акаунт
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки за онлайн пазарска количка като правилата за корабоплаване, Ценоразпис т.н."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Начислен
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Моите въпроси
 DocType: BOM Item,BOM Item,BOM Точка
 DocType: Appraisal,For Employee,За Employee
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Row {0}: Advance срещу доставчик трябва да се задължи
 DocType: Company,Default Values,Стойности по подразбиране
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Сума за плащане не може да бъде отрицателна
 DocType: Expense Claim,Total Amount Reimbursed,Общия размер на възстановените
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Срещу фактура от доставчик {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Срещу фактура от доставчик {0} от {1}
 DocType: Customer,Default Price List,Default Ценоразпис
 DocType: Payment Reconciliation,Payments,Плащания
 DocType: Budget Detail,Budget Allocated,"Бюджетът, отпуснат"
 DocType: Journal Entry,Entry Type,Влизане Type
 ,Customer Credit Balance,Customer кредитно салдо
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Нетна промяна в Задължения
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Моля, проверете електронната си поща ID"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Клиент, необходим за &quot;Customerwise Discount&quot;"
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Актуализиране дати банкови платежни с списания.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Активиране на количката
 DocType: Employee,Permanent Address,Постоянен Адрес
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,"Точка {0} трябва да е услуга, т."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Изплатения аванс срещу {0} {1} не може да бъде по-голям \ от Grand Total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Моля изберете код артикул
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Намаляване на приспадане тръгне без Pay (LWP)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Единична единица на дадена позиция.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Време Log Партида {0} трябва да бъде &quot;Изпратен&quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Време Log Партида {0} трябва да бъде &quot;Изпратен&quot;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Направи счетоводен запис за всеки склад Movement
 DocType: Leave Allocation,Total Leaves Allocated,Общо Leaves Отпуснати
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Warehouse изисква най Row Не {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Warehouse изисква най Row Не {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Моля, въведете валиден Финансова година Начални и крайни дати"
 DocType: Employee,Date Of Retirement,Дата на пенсиониране
 DocType: Upload Attendance,Get Template,Вземи Template
 DocType: Address,Postal,Пощенски
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"A Група Клиенти съществува със същото име моля, променете името на Клиента или преименувайте Група Клиенти"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Моля изберете {0} на първо място.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},текст {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Моля изберете {0} на първо място.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},текст {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Нова Контакт
 DocType: Territory,Parent Territory,Родител Territory
 DocType: Quality Inspection Reading,Reading 2,Четене 2
 DocType: Stock Entry,Material Receipt,Материал Разписка
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Тип и страна се изисква за получаване / плащане сметка {0}
 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 +210,Quantity required for Item {0} in row {1},"Количество, необходимо за т {0} на ред {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},"Количество, необходимо за т {0} на ред {1}"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} не може да се заличи, тъй като съществува количество за т {1}"
 DocType: Quotation,Order Type,Поръчка Type
 DocType: Purchase Invoice,Notification Email Address,Уведомление имейл адрес
@@ -1361,15 +1373,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Твърде много колони. Износ на доклада и да го отпечатате с помощта на приложение за електронни таблици.
 DocType: Sales 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 +152,Main,Основен
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Основен
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Определете префикс за номериране серия от вашите сделки
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Спряно за да не могат да бъдат отменени. Отпуши, за да отмените."
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) трябва да бъде активен за тази позиция или си шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) трябва да бъде активен за тази позиция или си шаблон
 DocType: Employee,Leave Encashed?,Оставете осребряват?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity От поле е задължително
 DocType: Item,Variants,Варианти
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Направи поръчка
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Направи поръчка
 DocType: SMS Center,Send To,Изпрати на
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Отпусната сума
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Склад и справочник
 DocType: Supplier,Statutory info and other general information about your Supplier,Законова информация и друга обща информация за вашия доставчик
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адреси
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дублиране Пореден № влезе за позиция {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условие за Правило за Доставка
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Артикул не е позволено да има производствена поръчка.
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Credit Сума в Account валути
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Час Logs за производство.
 DocType: Item,Apply Warehouse-wise Reorder Level,Нанесете Warehouse-мъдър Пренареждане Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} трябва да бъде представено
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} трябва да бъде представено
 DocType: Authorization Control,Authorization Control,Разрешение Control
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: отхвърля Warehouse е задължително срещу отхвърли т {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Time Вход за задачи.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Плащане
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Плащане
 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},Материал Искане на максимална {0} може да се направи за позиция {1} срещу Продажби Поръчка {2}
 DocType: Employee,Salutation,Поздрав
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Сътрудник
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Точка {0} не е сериализирани Точка
 DocType: SMS Center,Create Receiver List,Създайте Списък Receiver
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Изтекъл
 DocType: Packing Slip,To Package No.,С пакета No.
 DocType: Warranty Claim,Issue Date,Дата На Издаване
 DocType: Activity Cost,Activity Cost,Разходи за дейността
@@ -1449,7 +1461,7 @@
 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 +65,Territory / Customer,Територия / Customer
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,например 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на фактурира непогасения {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на фактурира непогасения {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,По думите ще бъде видим след като спаси фактурата за продажба.
 DocType: Item,Is Sales Item,Е-продажба Точка
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Позиция Group Tree
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} е създадена
 DocType: Delivery Note Item,Against Sales Order,Срещу поръчка за продажба
 ,Serial No Status,Пореден № Status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Точка на маса не може да бъде празно
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Точка на маса не може да бъде празно
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Ред {0}: Към комплектът {1} периодичност, разлика между от и към днешна дата \ трябва да бъде по-голямо от или равно на {2}"
 DocType: Pricing Rule,Selling,Продажба
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Мита и такси
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Моля, въведете Референтна дата"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,"Таблица за елемент, който ще бъде показан в Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Приложен Количество
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,Монтаж на времето
 DocType: Sales Invoice,Accounting Details,Счетоводство Детайли
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Изтриване на всички сделки за тази фирма
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Операция {1} не е завършен за {2} Количество на готовата продукция в производствена поръчка # {3}. Моля Статусът на работа чрез Час Logs
+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,Row # {0}: Операция {1} не е завършен за {2} Количество на готовата продукция в производствена поръчка # {3}. Моля Статусът на работа чрез Час Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолюция Детайли
 DocType: Quality Inspection Reading,Acceptance Criteria,Критерии За Приемане
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,Clear Таблица
 DocType: Features Setup,Brands,Brands
 DocType: C-Form Invoice Detail,Invoice No,Фактура Не
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,От поръчка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,От поръчка
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,Остойностяване Курсове
 ,Customer Addresses And Contacts,Адреси на клиенти и контакти
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,Графици за поддръжка
 ,Quotation Trends,Цитати Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Позиция Group не са посочени в т майстор за т {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е вземане под внимание
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е вземане под внимание
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
 ,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Превръщане Factor
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дърво на finanial сметки.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Оставете празно, ако считат за всички видове наети лица"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Разпредели такси на базата на
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Account {0} трябва да е от тип ""Дълготраен Актив"" като елемент {1} е Актив,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Account {0} трябва да е от тип ""Дълготраен Актив"" като елемент {1} е Актив,"
 DocType: HR Settings,HR Settings,Настройки на човешките ресурси
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense претенция изчаква одобрение. Само за сметка одобряващ да актуализирате състоянието.
 DocType: Purchase Invoice,Additional Discount Amount,Допълнителна отстъпка сума
 DocType: Leave Block List Allow,Leave Block List Allow,Оставете Block List Позволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортен
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Общо Край
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Единица
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} сега е по подразбиране фискална година. Моля, опреснете браузъра си за да влезе в сила промяната."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Разходните Вземания
 DocType: Issue,Support,Подкрепа
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Вижте Количката
 ,BOM Search,BOM Търсене
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Закриване (откриване + Общо)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Моля, посочете валута през Company"
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Фактор мерна единица реализациите се изисква в ред {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Дата Клирънсът не може да бъде преди датата проверка в ред {0}
 DocType: Salary Slip,Deduction,Дедукция
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Елемент Цена добавя за {0} в Ценовата листа {1}
 DocType: Address Template,Address Template,Адрес Template
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,"Моля, въведете Id Служител на този търговец"
 DocType: Territory,Classification of Customers by region,Класификация на клиентите по регион
 DocType: Project,% Tasks Completed,% Завършени Задачи
 DocType: Project,Gross Margin,Gross Margin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Моля, въведете Производство Точка първа"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,ръководство за инвалиди
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ръководство за инвалиди
 DocType: Opportunity,Quotation,Цитат
 DocType: Salary Slip,Total Deduction,Общо Приспадане
 DocType: Quotation,Maintenance User,Поддържане на потребителя
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 Адрес
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
 DocType: Production Order Operation,Actual Operation Time,Действително време за операцията
 DocType: Authorization Rule,Applicable To (User),Приложими по отношение на (User)
 DocType: Purchase Taxes and Charges,Deduct,Приспада
@@ -1588,12 +1602,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следете Продажби кампании. Следете Leads, цитати, продажба Поръчка т.н. от кампании, за да се прецени възвръщаемост на инвестициите."
 DocType: Expense Claim,Approver,Одобряващ
 ,SO Qty,SO Количество
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Стоковите постъпления съществуват срещу складови {0}, затова не можете да ре-зададете или модифицирате Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Стоковите постъпления съществуват срещу складови {0}, затова не можете да ре-зададете или модифицирате Warehouse"
 DocType: Appraisal,Calculate Total Score,Изчислете Общ резултат
 DocType: Supplier Quotation,Manufacturing Manager,Производство на мениджъра
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Пореден № {0} е в гаранция до запълването {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split Бележка за доставка в пакети.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Превозите
+apps/erpnext/erpnext/hooks.py +69,Shipments,Превозите
 DocType: Purchase Order Item,To be delivered to customer,За да бъде доставен на клиент
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Log Status трябва да бъдат изпратени.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Пореден № {0} не принадлежи на нито една Warehouse
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Изберете Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставете празно, ако считат за всички ведомства"
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Видове наемане на работа (постоянни, договорни, стажант и т.н.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} е задължително за {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} е задължително за {1}
 DocType: Currency Exchange,From Currency,От Валута
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Моля изберете отпусната сума, Тип фактура и фактура Номер в поне един ред"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Продажбите на поръчката изисква за т {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Моля изберете отпусната сума, Тип фактура и фактура Номер в поне един ред"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Продажбите на поръчката изисква за т {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,"Сумите, които не е отразено в системата"
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company валути)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Други
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,В Процес
 DocType: Authorization Rule,Itemwise Discount,Itemwise Отстъпка
 DocType: Purchase Order Item,Reference Document Type,Референтен Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} срещу Поръчка за Продажба {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} срещу Поръчка за Продажба {1}
 DocType: Account,Fixed Asset,Дълготраен актив
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Сериализирани Инвентаризация
 DocType: Activity Type,Default Billing Rate,Default Billing Курсове
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продажбите Поръчка за плащане
 DocType: Expense Claim Detail,Expense Claim Detail,Expense претенция Подробности
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Време Logs създаден:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Моля изберете правилния акаунт
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Моля изберете правилния акаунт
 DocType: Item,Weight UOM,Тегло мерна единица
 DocType: Employee,Blood Group,Blood Group
 DocType: Purchase Invoice Item,Page Break,Page Break
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,На време
 DocType: Authorization Rule,Approving Role (above authorized value),Приемане Role (над разрешено стойност)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","За да добавите деца възли, опознаването на дърво и кликнете върху възела, при които искате да добавите повече възли."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредитът за сметка трябва да бъде Платим акаунт
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не може да бъде родител или дете на {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Кредитът за сметка трябва да бъде Платим акаунт
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,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 +116,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитни сметки могат да бъдат свързани с друга кредитна влизане"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитни сметки могат да бъдат свързани с друга кредитна влизане"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ценоразпис {0} е деактивиран
 DocType: Manufacturing Settings,Allow Overtime,Оставя Извънредният
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} серийни номера, необходими за т {1}. Вие сте предоставили {2}."
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,Customer Елемент кодове
 DocType: Opportunity,Lost Reason,Загубил Причина
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Създаване на плащане влизания срещу заповеди или фактури.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,New Адрес
 DocType: Quality Inspection,Sample Size,Размер на извадката
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Всички елементи вече са фактурирани
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,"Допълнителни разходни центрове могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
 DocType: Project,External,Външен
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,Преименуване на Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Актуализация Cost
 DocType: Item Reorder,Item Reorder,Позиция Пренареждане
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Материал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transfer Материал
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Посочете операции, оперативни разходи и да даде уникална операция не на вашите операции."
 DocType: Purchase Invoice,Price List Currency,Ценоразпис на валути
 DocType: Naming Series,User must always select,Потребителят трябва винаги да изберете
 DocType: Stock Settings,Allow Negative Stock,Оставя Negative Фондова
 DocType: Installation Note,Installation Note,Монтаж Note
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Добави Данъци
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Парични потоци от финансова
 ,Financial Analytics,Финансови Analytics
 DocType: Quality Inspection,Verified By,Проверени от
 DocType: Address,Subsidiary,Филиал
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,Създайте Заплата Slip
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,"Очаквания баланс, като в една банка"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Източник на средства (пасиви)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Количество в ред {0} ({1}) трябва да е същото като произведено количество {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Количество в ред {0} ({1}) трябва да е същото като произведено количество {2}
 DocType: Appraisal,Employee,Employee
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Внос имейл от
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Покани като Потребител
 DocType: Features Setup,After Sale Installations,Следпродажбени инсталации
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} е напълно таксуван
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} е напълно таксуван
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартни договорни условия за покупко-продажба или покупка.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Група от Ваучер
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Необходим на
 DocType: Sales Invoice,Mass Mailing,Масовото изпращане
 DocType: Rename Tool,File to Rename,Файл за Преименуване
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},"Purchse номер на поръчката, необходима за т {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},"Purchse номер на поръчката, необходима за т {0}"
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Покажи Плащания
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Предвидени BOM {0} не съществува за позиция {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График за поддръжка {0} трябва да се отмени преди анулира тази поръчка за продажба
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,Продажбите Поръчка Задължително
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Създаване на клиенти
 DocType: Purchase Invoice,Credit To,Кредитът за
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Активни води / Клиенти
 DocType: Employee Education,Post Graduate,Post Graduate
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,График за поддръжка Подробности
 DocType: Quality Inspection Reading,Reading 9,Четене 9
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,Повдигнат от
 DocType: Payment Tool,Payment Account,Разплащателна сметка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Моля, посочете Company, за да продължите"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Нетна промяна в Вземания
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсаторни Off
 DocType: Quality Inspection Reading,Accepted,Приет
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,"Моля, уверете се, че наистина искате да изтриете всички сделки за тази компания. Вашите основни данни ще останат, тъй като е. Това действие не може да бъде отменено."
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,Общо сумата за плащане
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Тъй като има съществуващи сделки борсови за тази позиция, \ не можете да промените стойностите на &#39;има сериен номер &quot;,&quot; Има Batch Не &quot;,&quot; Трябва ли Фондова т &quot;и&quot; Метод на оценка &quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Quick вестник Влизане
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick вестник Влизане
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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 +157,Please enter Planned Qty for Item {0} at row {1},"Моля, въведете Планиран Количество за позиция {0} на ред {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} не е подадена
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} не е подадена
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Искания за предмети.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отделно производство цел ще бъде създаден за всеки завършен добра позиция.
 DocType: Purchase Invoice,Terms and Conditions1,Условия и Conditions1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,Оторизиран Value
 DocType: Contact,Enter department to which this Contact belongs,"Въведете отдела, в който се свържете с нас принадлежи"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Общо Отсъства
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Точка или склад за ред {0} не съвпада Материал Искане
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Точка или склад за ред {0} не съвпада Материал Искане
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Мерна единица
 DocType: Fiscal Year,Year End Date,Година Крайна дата
 DocType: Task Depends On,Task Depends On,Task зависи от
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Договор Крайна дата трябва да бъде по-голяма от Дата на Присъединяване
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Трето лице дистрибутор / дилър / комисионер / филиал / търговец, който продава на фирми продукти срещу комисионна."
 DocType: Customer Group,Has Child Node,Има Node Child
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} срещу Поръчка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} срещу Поръчка {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Въведете статични параметри на URL тук (Напр. Подател = ERPNext, потребителско име = ERPNext, парола = 1234 и т.н.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} не е в никоя активна фискална година. За повече информация провери {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Това е пример за сайт автоматично генерирано от ERPNext
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,Recd Количество
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Не може да се произвежда повече Точка {0} от продажби Поръчка количество {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Акаунт
 DocType: Tax Rule,Billing City,Billing City
 DocType: Global Defaults,Hide Currency Symbol,Скриване на валути Symbol
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Комунални Разходи
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Над 90 -
 DocType: Buying Settings,Default Buying Price List,Default Изкупуването Ценоразпис
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Вече е създаден Никой служител за над избрани критерии или заплата фиша
 DocType: Notification Control,Sales Order Message,Продажбите Поръчка Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Задайте стойности по подразбиране, като Company, валути, текущата фискална година, и т.н."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Вид на плащане
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Вижте &quot;Курсове на материали на основата на&quot; в Остойностяване Раздел
 DocType: Appraisal Goal,Key Responsibility Area,Key Отговорност Area
 DocType: Item Reorder,Material Request Type,Материал Заявка Type
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: мерна единица реализациите Factor е задължително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: мерна единица реализациите Factor е задължително
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Cost Center
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Всички адреси.
 DocType: Company,Stock Settings,Сток Settings
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Сливането е възможно само ако следните свойства са същите и в двете записи. Дали Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Сливането е възможно само ако следните свойства са същите и в двете записи. Дали Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управление Customer Group Tree.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,New Cost Center Име
 DocType: Leave Control Panel,Leave Control Panel,Оставете Control Panel
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Заплащане Tool Подробности
 ,Sales Browser,Продажбите Browser
 DocType: Journal Entry,Total Credit,Общ кредит
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Съществува Друг {0} # {1} срещу входната запас {2}: Предупреждение
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Местен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Съществува Друг {0} # {1} срещу входната запас {2}: Предупреждение
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,Длъжници
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Голям
@@ -2003,7 +2022,7 @@
 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 No.
 DocType: Production Order Operation,Make Time Log,Направи Time Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,"Моля, задайте повторна поръчка количество"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,"Моля, задайте повторна поръчка количество"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Моля, създайте Customer от Lead {0}"
 DocType: Price List,Applicable for Countries,Приложимо за Държави
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Компютри
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Поне един елемент следва да бъде вписано с отрицателна величина в замяна документ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Без забележки
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Без забележки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Просрочен
 DocType: Account,Stock Received But Not Billed,Фондова Получени Но Не Обявен
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root профил трябва да бъде група
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root профил трябва да бъде група
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Брутно възнаграждение + просрочия сума + Инкасо сума - Total Приспадане
 DocType: Monthly Distribution,Distribution Name,Разпределение Име
 DocType: Features Setup,Sales and Purchase,Продажба и покупка
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,Party Balance
 DocType: Sales Invoice Item,Time Log Batch,Време Log Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Моля изберете Apply отстъпка от
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Заплата Slip Създаден
 DocType: Company,Default Receivable Account,Default вземания Акаунт
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Създайте Bank вписване на обща заплата за над избрани критерии
 DocType: Stock Entry,Material Transfer for Manufacture,Материал Transfer за Производство
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,Полугодишен
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Фискална година {0} не е намерен.
 DocType: Bank Reconciliation,Get Relevant Entries,Вземете съответните вписвания
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Счетоводен запис за Складова аличност
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Счетоводен запис за Складова аличност
 DocType: Sales Invoice,Sales Team1,Продажбите Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Точка {0} не съществува
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Точка {0} не съществува
 DocType: Sales Invoice,Customer Address,Customer Адрес
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесете Допълнителна отстъпка от
 DocType: Account,Root Type,Root Type
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Покажете слайдшоу в горната част на страницата
 DocType: BOM,Item UOM,Позиция мерна единица
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Данъчен сума след Сума Discount (Company валути)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target склад е задължително за поредна {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Target склад е задължително за поредна {0}
 DocType: Quality Inspection,Quality Inspection,Проверка на качеството
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Сметка {0} е замразена
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Legal Entity / Дъщерно дружество с отделен сметкоплан, членуващи в организацията."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храни, напитки и тютюневи"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL или BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Мога само да направи плащане срещу нетаксувано {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Мога само да направи плащане срещу нетаксувано {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Ставка на Комисията не може да бъде по-голяма от 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимална Инвентаризация Level
 DocType: Stock Entry,Subcontract,Подизпълнение
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Постъпили проверка на качеството.
 DocType: Purchase Order Item,Returned Qty,Върнати Количество
 DocType: Employee,Exit,Изход
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type е задължително
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root Type е задължително
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Пореден № {0} е създадена
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За удобство на клиентите, тези кодове могат да бъдат използвани в печатни формати като фактури и доставка Notes"
 DocType: Employee,You can enter any date manually,Можете да въведете всяка дата ръчно
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Изпитателен Срок
 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 +110,Row {0}: Advance against Customer must be credit,Row {0}: Advance срещу Клиентът трябва да бъде кредити
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Покупка Квитанция приложените аксесоари
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Плащане
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Плащане
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Към за дата
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Дневници за поддържане състоянието на доставка SMS
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Пренареждане Level
 DocType: Attendance,Attendance Date,Присъствие Дата
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Заплата раздялата въз основа на доходите и приспадане.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Сметка с подсметки не може да бъде превърнати в Главна счетоводна книга
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Сметка с подсметки не може да бъде превърнати в Главна счетоводна книга
 DocType: Address,Preferred Shipping Address,Предпочитана Адрес за доставка
 DocType: Purchase Receipt Item,Accepted Warehouse,Приет Склад
 DocType: Bank Reconciliation Detail,Posting Date,Публикуване Дата
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Пореден № {0} не съществува
 DocType: Pricing Rule,Discount Percentage,Отстъпка Процент
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер на фактура
-apps/erpnext/erpnext/hooks.py +54,Orders,Заповеди
+apps/erpnext/erpnext/hooks.py +55,Orders,Заповеди
 DocType: Leave Control Panel,Employee Type,Тип Employee
 DocType: Employee Leave Approver,Leave Approver,Оставете одобряващ
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Материал Прехвърлен за Производство
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% от материали начислени по тази Поръчка за Продажба
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Период Закриване Влизане
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center със съществуващите операции не могат да бъдат превърнати в група
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизация
+DocType: Account,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Доставчик (ци)
 DocType: Customer,Credit Limit,Кредитен лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изберете тип сделка
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,Поискана за
 DocType: Quotation Item,Against Doctype,Срещу Вид Документ
 DocType: Delivery Note,Track this Delivery Note against any Project,Абонирай се за тази доставка Note срещу всеки проект
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root сметка не може да бъде изтрита
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Net Cash от Инвестиране
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root сметка не може да бъде изтрита
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Показване на вписване в запасите
 ,Is Primary Address,Дали Основен адрес
 DocType: Production Order,Work-in-Progress Warehouse,Работа в прогрес Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Референтен # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Референтен # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управление на адреси
 DocType: Pricing Rule,Item Code,Код
 DocType: Production Planning Tool,Create Production Orders,Създаване на производствени поръчки
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,Потребителят Забележка
 DocType: Lead,Market Segment,Пазарен сегмент
 DocType: Employee Internal Work History,Employee Internal Work History,Служител Вътрешен Work История
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Закриване (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Закриване (Dr)
 DocType: Contact,Passive,Пасивен
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Пореден № {0} не е в наличност
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Данъчна шаблон за продажба сделки.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,Обявен Сума
 DocType: Bank Reconciliation,Bank Reconciliation,Bank помирение
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Получаване на актуализации
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Материал Заявка {0} е отменен или спрян
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Материал Заявка {0} е отменен или спрян
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Добавяне на няколко примерни записи
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Оставете Management
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Групата от Профил
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Ръководителят сметката по Отговорност, в който печалбата / загубата ще бъде резервирана"
 DocType: Payment Tool,Against Vouchers,Срещу Ваучери
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Помощ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Източник и целева склада не могат да бъдат едни и същи за ред {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Източник и целева склада не могат да бъдат едни и същи за ред {0}
 DocType: Features Setup,Sales Extras,Продажби Екстри
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет за Смтка {1} срещу Разходен Център {2} ще превишава с {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',&quot;От дата&quot; трябва да е след &quot;Към днешна дата&quot;
 ,Stock Projected Qty,Фондова Прогнозно Количество
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Customer {0} не принадлежи на проекта {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Customer {0} не принадлежи на проекта {1}
 DocType: Sales Order,Customer's Purchase Order,Поръчката на Клиента
 DocType: Warranty Claim,From Company,От Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Стойност или Количество
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Оставете Block List любимци
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Вие ще го използвате за вход
 DocType: Sales Partner,Retailer,Търговец на дребно
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit За сметка трябва да бъде партида Баланс
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Credit За сметка трябва да бъде партида Баланс
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Всички Видове Доставчик
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код е задължително, тъй като опция не се номерира автоматично"
+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 +93,Quotation {0} not of type {1},Цитат {0} не от типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График за техническо обслужване Точка
 DocType: Sales Order,%  Delivered,% Доставени
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Брутното тегло на опаковката. Обикновено нетно тегло + опаковъчен материал тегло. (За печат)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Потребителите с тази роля е разрешено да задават замразени сметки и да се създаде / модифицира счетоводни записи срещу замразените сметки
 DocType: Serial No,Is Cancelled,Дали Отменен
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Моите пратки
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Моите пратки
 DocType: Journal Entry,Bill Date,Бил Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Дори и да има няколко ценови правила с най-висок приоритет, се прилагат след това следните вътрешни приоритети:"
 DocType: Supplier,Supplier Details,Доставчик Детайли
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Призовава
 DocType: Project,Total Costing Amount (via Time Logs),Общо Остойностяване сума (чрез Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Склад за мерна единица
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Поръчка за покупка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Поръчка за покупка {0} не е подадена
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Проектиран
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Пореден № {0} не принадлежи на Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Забележка: Системата няма да се покажат над-доставка и свръх-резервации за позиция {0} като количество или стойност е 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,Откриване Дата
 DocType: Journal Entry,Remark,Забележка
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,Дозирани за фактуриране
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Законопроекти, повдигнати от доставчици."
 DocType: POS Profile,Write Off Account,Отпишат Акаунт
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Отстъпка Сума
 DocType: Purchase Invoice,Return Against Purchase Invoice,Върнете Срещу фактурата за покупка
 DocType: Item,Warranty Period (in days),Гаранционен срок (в дни)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Net Cash от Operations
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,например ДДС
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Позиция 4
 DocType: Journal Entry Account,Journal Entry Account,Вестник Влизане Акаунт
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Дата на пенсиониране трябва да е по-голяма от Дата на Присъединяване
 DocType: Sales Invoice,Against Income Account,Срещу Приходна Сметка
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Доставени
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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 Info
@@ -2421,10 +2443,10 @@
 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 +14,This is a root sales person and cannot be edited.,"Това е човек, корен на продажбите и не може да се редактира."
 ,Stock Ledger,Фондова Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Оценка: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Оценка: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Заплата Slip Приспадане
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Изберете група възел на първо място.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Цел трябва да бъде един от {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Цел трябва да бъде един от {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Попълнете формата и да го запишете
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Свали доклад, съдържащ всички суровини с най-новите си статус инвентара"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (не клиент или доставчик) майстор.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Моля, въведете &quot;Очаквана дата на доставка&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Notes {0} трябва да се отмени преди анулирането този Продажби Поръчка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,Платената сума + отпишат сума не може да бъде по-голяма от Grand Total
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,Платената сума + отпишат сума не може да бъде по-голяма от 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 +126,Note: There is not enough leave balance for Leave Type {0},Забележка: Няма достатъчно отпуск баланс за отпуск Тип {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Забележка: Ако плащането не е извършено срещу всяко позоваване, направи вестник Влизане ръчно."
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Задай като Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Изпрати автоматични имейли в Контакти при подаването на сделки.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Кол не Свободно в склада {1} на {2} {3}. В наличност Количество: {4}, трансфер Qty: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Позиция 3
 DocType: Purchase Order,Customer Contact Email,Customer Контакт Email
 DocType: Sales Team,Contribution (%),Принос (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Забележка: Плащане Влизане няма да се създали от &quot;пари или с банкова сметка&quot; Не е посочено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Забележка: Плащане Влизане няма да се създали от &quot;пари или с банкова сметка&quot; Не е посочено
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Отговорности
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажби лице Име
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Преди помирение
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},За да {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Данъци и такси Добавен (Company валути)
-apps/erpnext/erpnext/stock/doctype/item/item.py +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Позиция Tax Row {0} Трябва да имате предвид тип данък или приход или разход или Дължими
 DocType: Sales Order,Partly Billed,Частично Обявен
 DocType: Item,Default BOM,Default BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Моля име повторно вид фирма, за да потвърдите"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Общият размер на неизплатените Amt
 DocType: Time Log Batch,Total Hours,Общо Часа
 DocType: Journal Entry,Printing Settings,Настройки за печат
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Общ дебит трябва да бъде равна на Общ кредит. Разликата е {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Общ дебит трябва да бъде равна на Общ кредит. Разликата е {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилен
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,От Бележка за доставка
 DocType: Time Log,From Time,От време
 DocType: Notification Control,Custom Message,Персонализирано съобщение
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестиционно банкиране
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Брой или банкова сметка е задължителна за вземане на влизане плащане
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Брой или банкова сметка е задължителна за вземане на влизане плащане
 DocType: Purchase Invoice,Price List Exchange Rate,Ценоразпис Валутен курс
 DocType: Purchase Invoice Item,Rate,Скорост
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Интерниран
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","Multiple Цена правило съществува с едни и същи критерии, моля решаване \ конфликт чрез възлагане приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиолиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Материал Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Материал Issue
 DocType: Material Request Item,For Warehouse,За Warehouse
 DocType: Employee,Offer Date,Оферта Дата
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Котировките
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,Сериен Номер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Моля, въведете Maintaince Детайли първа"
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Има повече почивки в работни дни този месец.
 DocType: Product Bundle Item,Product Bundle Item,Каталог Bundle Точка
 DocType: Sales Partner,Sales Partner Name,Продажбите Partner Име
+DocType: Payment Reconciliation,Maximum Invoice Amount,Максимална сума на фактурата
 DocType: Purchase Invoice Item,Image View,Вижте изображението
 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 +553,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,От Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Total
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Тази позиция е вариант на {0} (по образец). Атрибути ще бъдат копирани от шаблона, освен ако &quot;Не Copy&quot; е зададен"
 DocType: Account,Purchase User,Покупка на потребителя
 DocType: Notification Control,Customize the Notification,Персонализиране на Notification
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Парични потоци от операции
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Default Адрес Template не може да бъде изтрита
 DocType: Sales Invoice,Shipping Rule,Доставка Правило
 DocType: Journal Entry,Print Heading,Print Heading
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Суров Материал
 DocType: Leave Application,Follow via Email,Следвайте по имейл
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Данъчен сума след Сума Отстъпка
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Предвид Child съществува за този профил. Не можете да изтриете този профил.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Не подразбиране BOM съществува за т {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Моля изберете Публикуване Дата първа
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},"Серийни номера, изисквано за серийни номера, т {0}"
 DocType: Journal Entry,Bank Entry,Bank Влизане
 DocType: Authorization Rule,Applicable To (Designation),Приложими по отношение на (наименование)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Добави в кошницата
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Група С
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Включване / Изключване на валути.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Пощенски разходи
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Датата, на която повтарящ цел ще бъде да спре"
 DocType: Quality Inspection,Item Serial No,Позиция Пореден №
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} трябва да се намали с {1} или е необходимо да се увеличи толерантност на препълване
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} трябва да се намали с {1} или е необходимо да се увеличи толерантност на препълване
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Общо Present
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Сериализирани т {0} не може да бъде актуализиран \ използвайки фондова помирение
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Трансфер Материал на доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Трансфер Материал на доставчик
 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,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Създаване на цитата
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Вие нямате право да одобри листата на Блок Дати
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Всички тези елементи вече са били фактурирани
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Всички тези елементи вече са били фактурирани
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Може да бъде одобрен от {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Доставка Правило Условия
 DocType: BOM Replace Tool,The new BOM after replacement,Новият BOM след подмяна
 DocType: Features Setup,Point of Sale,Точка на продажба
 DocType: Account,Tax,Данък
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} не е валиден {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,От Каталог Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,От Каталог Bundle
 DocType: Production Planning Tool,Production Planning Tool,Tool Производствено планиране
 DocType: Quality Inspection,Report Date,Доклад Дата
 DocType: C-Form,Invoices,Фактури
 DocType: Job Opening,Job Title,Длъжност
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Получатели
 DocType: Features Setup,Item Groups in Details,Елемент групи Детайли
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Количество за Производство трябва да е по-голямо от 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-на-Sale (POS)
@@ -2618,8 +2644,9 @@
 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: Pricing Rule,Customer Group,Customer Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Разходна сметка е задължително за покупка {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Разходна сметка е задължително за покупка {0}
 DocType: Item,Website Description,Website Описание
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Нетна промяна в собствения капитал
 DocType: Serial No,AMC Expiry Date,AMC срок на годност
 ,Sales Register,Продажбите Регистрация
 DocType: Quotation,Quotation Lost Reason,Цитат Загубени Причина
@@ -2627,12 +2654,12 @@
 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 +108,Summary for this month and pending activities,Резюме за този месец и предстоящи дейности
 DocType: Customer Group,Customer Group Name,Customer Group Име
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,Атрибутите
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Вземи артикули
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Моля, въведете отпишат Акаунт"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Вземи артикули
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Моля, въведете отпишат Акаунт"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Последна Поръчка Дата
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Направи акцизите Invoice
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Сметка {0} не принадлежи на фирма {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Project-мъдър данни не е достъпно за оферта
 DocType: Project,Expected End Date,Очаквано Крайна дата
 DocType: Appraisal Template,Appraisal Template Title,Оценка Template Title
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Търговски
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Търговски
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родител т {0} не трябва да бъде фондова Точка
 DocType: Cost Center,Distribution Id,Id Разпределение
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Яки Услуги
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},"Цена Умение {0} трябва да бъде в границите от {1} {2}, за да в инкрементите {3}"
 DocType: Tax Rule,Sales,Търговски
 DocType: Stock Entry Detail,Basic Amount,Основен размер
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse изисква за склад т {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Warehouse изисква за склад т {0}
 DocType: Leave Allocation,Unused leaves,Неизползваните отпуски
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,По подразбиране вземания Accounts
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Увеличаване на Умение {0} не може да бъде 0
 DocType: Journal Entry,Pay To / Recd From,Заплати на / Recd От
 DocType: Naming Series,Setup Series,Setup Series
+DocType: Payment Reconciliation,To Invoice Date,Към датата на фактурата
 DocType: Supplier,Contact HTML,Свържи се с HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Изкупните Приходи
-DocType: Payment Reconciliation,Maximum Amount,Максимален размер
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Как ценообразуване правило се прилага?
 DocType: Quality Inspection,Delivery Note No,Бележка за доставка Не
 DocType: Company,Retail,На дребно
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Customer {0} не съществува
 DocType: Attendance,Absent,Липсващ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Каталог Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Invalid позоваване {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Каталог Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Row {0}: Invalid позоваване {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Покупка данъци и такси Template
 DocType: Upload Attendance,Download Template,Изтеглете шаблони
 DocType: GL Entry,Remarks,Забележки
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,Месечен зрители Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Не са намерени записи
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Разходен Център е задължително за {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Получават от продукта Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Получават от продукта Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Сметка {0} е неактивна
 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,Присъствие От Дата и зрители към днешна дата е задължително
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Сметка вид ""Печалби и загуби"" {0} не е позволена при Начален Баланс"
 DocType: Features Setup,Sales Discounts,Продажби Отстъпки
 DocType: Hub Settings,Seller Country,Продавач Country
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Публикуване Теми на Website
 DocType: Authorization Rule,Authorization Rule,Разрешение Правило
 DocType: Sales Invoice,Terms and Conditions Details,Условия за ползване Детайли
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Спецификации
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажби данъци и такси в шаблона
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Облекло &amp; Аксесоари
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Брой на Поръчка
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,Billing Сума
 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 +18,Applications for leave.,Заявленията за отпуск.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Сметка със съществуващa трансакция не може да бъде изтрита
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Сметка със съществуващa трансакция не може да бъде изтрита
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Правни разноски
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Денят от месеца, на която автоматично, за да се генерира например 05, 28 и т.н."
 DocType: Sales Invoice,Posting Time,Публикуване на времето
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,Авария
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Сметка: {0} с валута: не може да бъде избран {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Сметка {0}: Родителска сметка {1} не принадлежи на фирмата: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Сметка {0}: Родителска сметка {1} не принадлежи на фирмата: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Успешно заличава всички транзакции, свързани с тази компания!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Както по Дата
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Изпитание
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,"Default Warehouse е задължително за склад, т."
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,"Default Warehouse е задължително за склад, т."
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Изплащането на заплатите за месец {0} и година {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto вложка Ценоразпис ставка, ако липсва"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Общо платената сума
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Общо Billing сума (чрез Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Ние продаваме този артикул
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id доставчик
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Количество трябва да бъде по-голяма от 0
 DocType: Journal Entry,Cash Entry,Cash Влизане
 DocType: Sales Partner,Contact Desc,Свържи Описание
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Вид на листа като случайни, болни и т.н."
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Добавете редове, за да зададете годишни бюджети по сметки."
 DocType: Buying Settings,Default Supplier Type,Default доставчик Type
 DocType: Production Order,Total Operating Cost,Общо оперативни разходи
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Забележка: Точка {0} влезе няколко пъти
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Забележка: Точка {0} влезе няколко пъти
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Всички контакти.
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Фирма Съкращение
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Всички групи клиенти
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Данъчна Template е задължително.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Account {0}: Родителска сметка {1} не съществува
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,Account {0}: Родителска сметка {1} не съществува
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценоразпис Rate (Company валути)
 DocType: Account,Temporary,Временен
 DocType: Address,Preferred Billing Address,Предпочитана Billing Адрес
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,Точка-мъдър Ценоразпис Курсове
 DocType: Purchase Order Item,Supplier Quotation,Доставчик оферта
 DocType: Quotation,In Words will be visible once you save the Quotation.,По думите ще бъде видим след като спаси цитата.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} е спрян
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barcode {0} вече се използва в т {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} е спрян
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barcode {0} вече се използва в т {1}
 DocType: Lead,Add to calendar on this date,Добави в календара на тази дата
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила за добавяне на транспортни разходи.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстоящи събития
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,От Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Поръчки пуснати за производство.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Изберете фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
 DocType: Hub Settings,Name Token,Име Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard Selling
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Поне един склад е задължително
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Selling,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 Replace Tool,Replace,Заменете
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} срещу Фактура за продажба {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Моля, въведете подразбиране Мерна единица"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} срещу Фактура за продажба {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,"Моля, въведете подразбиране Мерна единица"
 DocType: Purchase Invoice Item,Project Name,Име на проекта
 DocType: Supplier,Mention if non-standard receivable account,"Споменете, ако нестандартно вземане предвид"
 DocType: Journal Entry Account,If Income or Expense,Ако приход или разход
 DocType: Features Setup,Item Batch Nos,Позиция Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Склад за Value Разлика
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Човешки Ресурси
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,Човешки Ресурси
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Заплащане помирение плащане
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Данъчни активи
 DocType: BOM Item,BOM No,BOM Не
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,Вестник Влизане {0} не разполага сметка {1} или вече съвпадащи срещу друг ваучер
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,The BOM който ще бъде заменен
 DocType: Account,Debit,Дебит
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,Допълнителна Cost
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Финансова година Крайна дата
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрира по Ваучер Не, ако групирани по Ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Направи Доставчик оферта
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Направи Доставчик оферта
 DocType: Quality Inspection,Incoming,Входящ
 DocType: BOM,Materials Required (Exploded),Необходими материали (разглобен)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),"Намаляване Приходи за да напуснат, без Pay (LWP)"
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Пореден № {1} не съвпада с {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual отпуск
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Забележка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Забележка: {0}
 ,Delivery Note Trends,Бележка за доставка Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Тази Седмица Резюме
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} трябва да бъде Закупен или Подизпълнителен в ред {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ср. Изкупуването Курсове
 DocType: Task,Actual Time (in Hours),Действителното време (в часове)
 DocType: Employee,History In Company,История През Company
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Количеството общо Issue / Transfer {0} в Подемно-Искане {1} не може да бъде по-голяма от исканата количество {2} за позиция {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Бюлетини
 DocType: Address,Shipping,Кораби
 DocType: Stock Ledger Entry,Stock Ledger Entry,Фондова Ledger Влизане
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,Крайна дата на периода на текущата поръчката
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Направи оферта Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Връщане
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Default мерната единица за Variant трябва да е същото като Template
 DocType: Production Order Operation,Production Order Operation,Производство Поръчка Operation
 DocType: Pricing Rule,Disable,Правя неспособен
 DocType: Project Task,Pending Review,До Review
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id Customer
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"На време трябва да бъде по-голяма, отколкото от време"
 DocType: Journal Entry Account,Exchange Rate,Обменен курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Продажбите Поръчка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Продажбите Поръчка {0} не е подадена
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: майка сметка {1} не Bolong на дружеството {2}
 DocType: BOM,Last Purchase Rate,Последна Покупка Курсове
 DocType: Account,Asset,Придобивка
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,"Свободно фондова за артикули, Опаковки"
 DocType: Item Variant,Item Variant,Позиция Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Настройването на тази Адрес Шаблон по подразбиране, тъй като няма друг случай на неизпълнение"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","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 +76,Quality Management,Управление на качеството
 DocType: Production Planning Tool,Filter based on customer,Филтър на базата на клиент
 DocType: Payment Tool Detail,Against Voucher No,Срещу ваучър №
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,Следваща Контакт
 DocType: Employee,Employment Type,Тип заетост
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Дълготрайни активи
+,Cash Flow,Паричен поток
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Срок за кандидатстване не може да бъде в два alocation записи
 DocType: Item Group,Default Expense Account,Default Expense Account
 DocType: Employee,Notice (days),Известие (дни)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,Складове
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print и стационарни
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Група Node
-DocType: Payment Reconciliation,Minimum Amount,"Минималната сума,"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Актуализиране на готова продукция
 DocType: Workstation,per hour,на час
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Account for the warehouse (Perpetual Inventory) will be created under this Account.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse не може да се заличи, тъй като съществува влизане фондова книга за този склад."
 DocType: Company,Distribution,Разпределение
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,"Сума, платена"
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,"Сума, платена"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Ръководител На Проект
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Изпращане
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max отстъпка разрешено за покупка: {0} е {1}%
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Поддръжка Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Фирма липсва в складовете {0}
 DocType: POS Profile,Terms and Conditions,Правила и условия
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Към днешна дата трябва да бъде в рамките на фискалната година. Ако приемем, че към днешна дата = {0}"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},"Към днешна дата трябва да бъде в рамките на фискалната година. Ако приемем, че към днешна дата = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Тук можете да се поддържа височина, тегло, алергии, медицински опасения и т.н."
 DocType: Leave Block List,Applies to Company,Отнася се за Фирма
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Не може да се затвори, защото {0} съществува внесено фондова Влизане"
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Моля, въведете покупка Приходи"
 DocType: Sales Invoice,Get Advances Received,Вземи Получени аванси
 DocType: Email Digest,Add/Remove Recipients,Добавяне / Премахване на Получатели
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},Сделката не допуска срещу спря производството Поръчка {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup входящия сървър за подкрепа имейл ID. (Например support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Недостиг Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
 DocType: Salary Slip,Salary Slip,Заплата Slip
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Към днешна дата&quot; се изисква
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генериране на товарителници за пакети трябва да бъдат доставени. Използва се за уведомяване на пакетите номер, съдържание на пакети и теглото му."
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Записи на служителите.
 DocType: HR Settings,Payroll Settings,Настройки ТРЗ
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Съвпадение без свързана фактури и плащания.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Направи поръчка
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Направи поръчка
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root не може да има център на разходите майка
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Изберете Марка ...
 DocType: Sales Invoice,C-Form Applicable,C-форма приложима
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,Начална Дата
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Разпределяне на листа за период.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Кликнете тук, за да се провери"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Сметка {0}: Може да се назначи себе си за родителска сметка
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Сметка {0}: Може да се назначи себе си за родителска сметка
 DocType: Purchase Invoice Item,Price List Rate,Ценоразпис Курсове
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Покажи &quot;В наличност&quot; или &quot;Не е в наличност&quot; на базата на склад налични в този склад.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Бил на материалите (BOM)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,Очаквана начална дата
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Махни позиция, ако цените не се отнася за тази позиция"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Напр. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Получавам
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Получавам
 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: Employee Leave Approver,Employee Leave Approver,Служител Оставете одобряващ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} е успешно добавен в нашия Бюлетин.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не може да се декларира като изгубена, защото цитата е направено."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Майстор на мениджъра
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Производство Поръчка {0} трябва да бъде представено
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Производство Поръчка {0} трябва да бъде представено
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Моля изберете Начална дата и крайна дата за т {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Основните доклади
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Към днешна дата не може да бъде преди от дата
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Нещо се обърка!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Внимание: Оставете заявка съдържа следните дати блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Фактурата за продажба {0} вече е била подадена
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Фактурата за продажба {0} вече е била подадена
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Дата На Завършване
 DocType: Purchase Invoice Item,Amount (Company Currency),Сума (Company валути)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Организация единица (отдел) майстор.
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,Пореден № Договор за услуги Изтичане
 DocType: Item,Unit of Measure Conversion,Мерна единица на реализациите
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Работникът или служителят не може да се променя
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Вие не можете да кредитни и дебитни същия акаунт в същото време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Вие не можете да кредитни и дебитни същия акаунт в същото време
 DocType: Naming Series,Help HTML,Помощ HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Общо weightage определен да бъде 100%. Това е {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Помощи за свръх {0} прекоси за позиция {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Помощи за свръх {0} прекоси за позиция {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Име на лицето или организацията, че този адрес принадлежи."
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Вашите доставчици
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не може да се определи като губи като поръчка за продажба е направена.
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,Дата на издаване
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: От {0} за {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Определете доставчик за т {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {0}, прикрепена към т {1} не може да бъде намерена"
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {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.,Списък този продукт в няколко групи в сайта.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Моля, проверете опцията Multi валути да се позволи на сметки в друга валута"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,"Моля, проверете опцията Multi валути да се позволи на сметки в друга валута"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Позиция: {0} не съществува в системата
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Вие не можете да настроите Frozen стойност
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Вие не можете да настроите Frozen стойност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Вземи Неизравнени влизания
+DocType: Payment Reconciliation,From Invoice Date,От Invoice Дата
 DocType: Cost Center,Budgets,Бюджети
-DocType: Employee,Emergency Contact Details,Аварийни контактни Детайли
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Какво прави?
 DocType: Delivery Note,To Warehouse,За да Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},"Сметка {0} е вписана повече от веднъж за фискалната година, {1}"
 ,Average Commission Rate,Средна Комисията Курсове
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,"'Има сериен номер' не може да бъде 'Да' за стока, която не на склад"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,"'Има сериен номер' не може да бъде 'Да' за стока, която не на склад"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Присъствие не може да бъде маркиран за бъдещи дати
 DocType: Pricing Rule,Pricing Rule Help,Ценообразуване Правило Помощ
 DocType: Purchase Taxes and Charges,Account Head,Главна Сметка
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,"Актуализиране на допълнителни разходи, за да се изчисли приземи разходи за предмети"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Електрически
 DocType: Stock Entry,Total Value Difference (Out - In),Общо Разлика Value (Out - В)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Валутен курс е задължително
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Row {0}: Валутен курс е задължително
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID не е конфигуриран за Employee {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,От гаранционен иск
 DocType: Stock Entry,Default Source Warehouse,Default Източник Warehouse
 DocType: Item,Customer Code,Код Customer
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder за {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Дни след Last Поръчка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Debit За сметка трябва да бъде партида Баланс
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,Debit To account must be a Balance Sheet account,Debit За сметка трябва да бъде партида Баланс
 DocType: Buying Settings,Naming Series,Именуване Series
 DocType: Leave Block List,Leave Block List Name,Оставете Block List Име
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Сток Активи
@@ -3271,7 +3301,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Закриване на профила {0} трябва да е от тип Отговорност / Equity
 DocType: Authorization Rule,Based On,Базиран На
 DocType: Sales Order Item,Ordered Qty,Поръчано Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Точка {0} е деактивиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Точка {0} е деактивиран
 DocType: Stock Settings,Stock Frozen Upto,Фондова Frozen Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},"Период От и периода, за датите задължителни за повтарящи {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Дейността на проект / задача.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Напиши Off Сума (Company валути)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Поземлен Cost Ваучер
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Моля, задайте {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторете в Деня на Месец
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,Качи Присъствие
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM и производство Количество са задължителни
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Застаряването на населението Range 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Размер
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Размер
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM заменя
 ,Sales Analytics,Продажби Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Настройки производство
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Създаване на Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,"Моля, въведете подразбиране валута през Company магистър"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Дневни Напомняния
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Данъчна правило противоречи {0}
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,Произведено количество
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Инженер
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Търсене под Изпълнения
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Код изисква най Row Не {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Код изисква най Row Не {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Действителен
 DocType: Authorization Rule,Customerwise Discount,Customerwise Отстъпка
 DocType: Purchase Invoice,Against Expense Account,Срещу Разходна Сметка
 DocType: Production Order,Production Order,Производство Поръчка
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Монтаж Забележка {0} вече е била подадена
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Монтаж Забележка {0} вече е била подадена
 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,Вижте сега
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,Приложимо Holiday Списък
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Обновено
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Тип на отчета е задължително
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Тип на отчета е задължително
 DocType: Item,Serial Number Series,Сериен номер Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse е задължително за склад т {0} на ред {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; търговия
 DocType: Issue,First Responded On,Първо Отговорили On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Обява на артикул в няколко групи
 apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Първият потребител: Вие
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Начални дата и фискална година Крайна дата вече са определени в Фискална година {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успешно Съгласувани
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Начални дата и фискална година Крайна дата вече са определени в Фискална година {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Успешно Съгласувани
 DocType: Production Order,Planned End Date,Планиран Крайна дата
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Когато елементите са съхранени.
 DocType: Tax Rule,Validity,Валидност
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,Посещаемост
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Публикуване дата и публикуване време е задължително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Публикуване дата и публикуване време е задължително
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Данъчна шаблон за закупуване сделки.
 ,Item Prices,Елемент Цени
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,По думите ще бъде видим след като спаси Поръчката.
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,Преглед Дата
 DocType: Purchase Invoice,Advance Payments,Авансови плащания
 DocType: Purchase Taxes and Charges,On Net Total,На Net Общо
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target склад в ред {0} трябва да е същото като производствена поръчка
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Target склад в ред {0} трябва да е същото като производствена поръчка
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Няма разрешение за ползване Плащане Tool
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""имейл адреси за известяване"" не е зададен за повтарящи % S"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,"Валутна не може да се промени, след като записи с помощта на някои друга валута"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,"Валутна не може да се промени, след като записи с помощта на някои друга валута"
 DocType: Company,Round Off Account,Завършете Акаунт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административни разходи
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консултативен
 DocType: Customer Group,Parent Customer Group,Родител Customer Group
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промяна
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Промяна
 DocType: Purchase Invoice,Contact Email,Контакт Email
 DocType: Appraisal Goal,Score Earned,Резултат спечелените
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",например &quot;My Company LLC&quot;
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,Бруто тегло мерна единица
 DocType: Email Digest,Receivables / Payables,Вземания / Задължения
 DocType: Delivery Note Item,Against Sales Invoice,Срещу фактура за продажба
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Кредитна сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Поземлен Cost Точка
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Покажи нулеви стойности
 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 +562,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
 DocType: Item,Default Warehouse,Default Warehouse
 DocType: Task,Actual End Date (via Time Logs),Действителна Крайна дата (чрез Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Бюджетът не може да бъде назначен срещу Group Account {0}
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планирайте времето трупи извън Workstation работно време.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} вече е била подадена
 ,Items To Be Requested,Предмети трябва да бъдат поискани
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Вземи Last Покупка Курсове
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing процент въз основа на Type активност (на час)
 DocType: Company,Company Info,Информация за фирмата
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Фирма Email ID не е намерен, следователно не съобщение, изпратено"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Прилагане на средства (активи)
 DocType: Production Planning Tool,Filter based on item,Филтър на базата на т
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Debit Акаунт
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debit Акаунт
 DocType: Fiscal Year,Year Start Date,Година Начална дата
 DocType: Attendance,Employee Name,Служител Име
 DocType: Sales Invoice,Rounded Total (Company Currency),Rounded Общо (Company валути)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Не може да се покров Group, защото е избран типа на профила."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Не може да се покров Group, защото е избран типа на профила."
 DocType: Purchase Common,Purchase Common,Покупка Чести
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,От Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Доходи на наети лица
 DocType: Sales Invoice,Is POS,Дали POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Опакован количество трябва да е равно количество за т {0} на ред {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Опакован количество трябва да е равно количество за т {0} на ред {1}
 DocType: Production Order,Manufactured Qty,Произведен Количество
 DocType: Purchase Receipt Item,Accepted Quantity,Прието Количество
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не съществува
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,"Законопроекти, повдигнати на клиентите."
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Project
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,Добавени {0} абонати
 DocType: Maintenance Schedule,Schedule,Разписание
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Определете бюджета за тази Cost Center. За да зададете бюджет действия, вижте &quot;Company List&quot;"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,Четене 3
 ,Hub,Главина
 DocType: GL Entry,Voucher Type,Ваучер Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценова листа не е намерен или инвалиди
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Ценова листа не е намерен или инвалиди
 DocType: Expense Claim,Approved,Одобрен
 DocType: Pricing Rule,Price,Цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като &quot;Ляв&quot;
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Счетоводни вписвания в дневник.
 DocType: Delivery Note Item,Available Qty at From Warehouse,В наличност Количество в От Warehouse
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Моля изберете Record Employee първия.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Сметка не съвпада с {1} / {2} в {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Сметка не съвпада с {1} / {2} в {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,За създаване на данъчна сметка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Моля, въведете Expense Account"
 DocType: Account,Stock,Наличност
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,Договор Крайна дата
 DocType: Sales Order,Track this Sales Order against any Project,Абонирай се за тази поръчка за продажба срещу всеки проект
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Поръчки за продажба Pull (висящите да достави), основано на горните критерии"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,От Доставчик оферта
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,От Доставчик оферта
 DocType: Deduction Type,Deduction Type,Приспадане Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Количество
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,Transaction Дата
 DocType: Production Plan Item,Planned Qty,Планиран Количество
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Общо Tax
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,За Количество (Произведен Количество) е задължително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,За Количество (Произведен Количество) е задължително
 DocType: Stock Entry,Default Target Warehouse,Default Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Общо (Company валути)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Тип и страна е приложима само срещу получаване / плащане акаунт
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,Комисията Курсове
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Направи Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Заявленията за отпуск блок на отдел.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Количката е празна
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Количката е празна
 DocType: Production Order,Actual Operating Cost,Действителни оперативни разходи
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root не може да се редактира.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root не може да се редактира.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Разпределен сума може да не по-голяма от unadusted сума
 DocType: Manufacturing Settings,Allow Production on Holidays,Допусне производство на празници
 DocType: Sales Order,Customer's Purchase Order Date,Клиента поръчка Дата
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Условия Template
 DocType: Serial No,Delivery Details,Детайли за доставка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Cost Center се изисква в ред {0} в Данъци маса за вид {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Cost Center се изисква в ред {0} в Данъци маса за вид {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматично създаване Материал искане, ако количеството падне под това ниво"
 ,Item-wise Purchase Register,Точка-мъдър Покупка Регистрация
 DocType: Batch,Expiry Date,Срок На Годност
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","За да зададете ниво на повторна поръчка, т трябва да бъде покупка или производство Точка Точка"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","За да зададете ниво на повторна поръчка, т трябва да бъде покупка или производство Точка Точка"
 ,Supplier Addresses and Contacts,Доставчик Адреси и контакти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Моля, изберете Категория първо"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Майстор Project.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Половин ден)
 DocType: Supplier,Credit Days,Кредитните Days
 DocType: Leave Type,Is Carry Forward,Дали Пренасяне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Получават от BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Получават от BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Време за Days
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Бил на материали
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Тип и страна се изисква за получаване / плащане сметка {1}
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,Причина за напускане
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционирани Сума
 DocType: GL Entry,Is Opening,Се отваря
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: дебитна не може да бъде свързана с {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Сметка {0} не съществува
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Row {0}: дебитна не може да бъде свързана с {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Сметка {0} не съществува
 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 c42181e..00a1a05 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,ভোগ্যপণ্য
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,প্রথম পক্ষের ধরন নির্বাচন করুন
 DocType: Item,Customer Items,গ্রাহক চলছে
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট তথ্য {1} একটি খতিয়ান হতে পারবেন না
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট তথ্য {1} একটি খতিয়ান হতে পারবেন না
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com আইটেমটি প্রকাশ করুন
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,ইমেল বিজ্ঞপ্তি
 DocType: Item,Default Unit of Measure,মেজার ডিফল্ট ইউনিট
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,গ্রাহকের পরিচিতি
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,উপাদান অনুরোধ থেকে
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,উপাদান অনুরোধ থেকে
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} বৃক্ষ
 DocType: Job Applicant,Job Applicant,কাজ আবেদনকারী
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,কোন ফলাফল.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. গ্রাহক জ্ঞানী আইটেমটি কোড বজায় রাখা এবং তাদের কোড ব্যবহার করা এই অপশনটি স্থান উপর ভিত্তি করে এদের অনুসন্ধানযোগ্য করে
 DocType: Mode of Payment Account,Mode of Payment Account,পেমেন্ট একাউন্ট এর মোড
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,দেখান রুপভেদ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,পরিমাণ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ঋণ (দায়)
 DocType: Employee Education,Year of Passing,পাসের সন
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,স্টক ইন
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,স্বাস্থ্যের যত্ন
 DocType: Purchase Invoice,Monthly,মাসিক
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),পেমেন্ট মধ্যে বিলম্ব (দিন)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,চালান
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,চালান
 DocType: Maintenance Schedule Item,Periodicity,পর্যাবৃত্তি
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ইমেল ঠিকানা
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,অর্থবছরের {0} প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,প্রতিরক্ষা
 DocType: Company,Abbr,সংক্ষিপ্তকরণ
 DocType: Appraisal Goal,Score (0-5),স্কোর (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},সারি {0}: {1} {2} সঙ্গে মেলে না {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},সারি {0}: {1} {2} সঙ্গে মেলে না {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,সারি # {0}:
 DocType: Delivery Note,Vehicle No,যানবাহন কোন
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,মূল্য তালিকা নির্বাচন করুন
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,মূল্য তালিকা নির্বাচন করুন
 DocType: Production Order Operation,Work In Progress,কাজ চলছে
 DocType: Employee,Holiday List,ছুটির তালিকা
 DocType: Time Log,Time Log,টাইম ইন
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,একই কোম্পানীর একবারের বেশি প্রবেশ করানো হয়
 DocType: Employee,Married,বিবাহিত
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},অনুমোদিত নয় {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
 DocType: Payment Reconciliation,Reconcile,মিলনসাধন করা
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,মুদিখানা
 DocType: Quality Inspection Reading,Reading 1,1 পঠন
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ব্যাংক এন্ট্রি করতে
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,অবসর বৃত্তি পেনশন ভাতা তহবিল
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,অ্যাকাউন্টের ধরণ ওয়্যারহাউস যদি ওয়্যারহাউস বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,অ্যাকাউন্টের ধরণ ওয়্যারহাউস যদি ওয়্যারহাউস বাধ্যতামূলক
 DocType: SMS Center,All Sales Person,সব বিক্রয় ব্যক্তি
 DocType: Lead,Person Name,ব্যক্তির নাম
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","চেক অর্ডার আবৃত্ত তাহলে, আবৃত্ত বা থামাতে সঠিক শেষ তারিখ করা টিক চিহ্ন তুলে দেয়া"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,আগ্রহী
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,উপাদান বিল
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,উদ্বোধন
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},থেকে {0} থেকে {1}
+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,প্রারম্ভিক ভুক্তি
 DocType: Stock Entry,Additional Costs,অতিরিক্ত খরচ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,বিদ্যমান লেনদেন সঙ্গে অ্যাকাউন্ট গ্রুপ রূপান্তরিত করা যাবে না.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,বিদ্যমান লেনদেন সঙ্গে অ্যাকাউন্ট গ্রুপ রূপান্তরিত করা যাবে না.
 DocType: Lead,Product Enquiry,পণ্য অনুসন্ধান
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,প্রথম কোম্পানি লিখুন দয়া করে
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,টার্গেটের
+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 +9,Activity Log:,কার্য বিবরণ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,{0} আইটেম সিস্টেমে কোন অস্তিত্ব নেই অথবা মেয়াদ শেষ হয়ে গেছে
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,আইটেম {0} একটি ক্রয় আইটেমটি হতে হবে
 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 +444,Item {0} is not active or end of life has been reached,{0} আইটেম সক্রিয় নয় বা জীবনের শেষ হয়েছে পৌঁছেছেন
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,{0} আইটেম সক্রিয় নয় বা জীবনের শেষ হয়েছে পৌঁছেছেন
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,বিক্রয় চালান জমা হয় পরে আপডেট করা হবে.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,এইচআর মডিউল ব্যবহার সংক্রান্ত সেটিংস Comment
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,অপারেশনের বিবরণ সম্পন্ন.
 DocType: Serial No,Maintenance Status,রক্ষণাবেক্ষণ অবস্থা
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,চলছে এবং প্রাইসিং
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},জন্ম থেকে অর্থবছরের মধ্যে হওয়া উচিত. জন্ম থেকে Assuming = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},জন্ম থেকে অর্থবছরের মধ্যে হওয়া উচিত. জন্ম থেকে Assuming = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"আপনি মূল্যায়ন তৈরি করা হয়, যাদের জন্য কর্মী নির্বাচন."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},কেন্দ্র {0} কোম্পানি অন্তর্গত নয় উড়ানের তালিকাটি {1}
 DocType: Customer,Individual,ব্যক্তি
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,অর্থায়ন থেকে নিট ক্যাশ
 DocType: Lead,Address & Contact,ঠিকানা ও যোগাযোগ
 DocType: Leave Allocation,Add unused leaves from previous allocations,আগের বরাদ্দ থেকে অব্যবহৃত পাতার করো
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},পরবর্তী আবর্তক {0} উপর তৈরি করা হবে {1}
@@ -221,6 +222,7 @@
 ,Contact Name,যোগাযোগের নাম
 DocType: Production Plan Item,SO Pending Qty,মুলতুবি Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,উপরে উল্লিখিত মানদণ্ড জন্য বেতন স্লিপ তৈরি করা হয়.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,দেওয়া কোন বিবরণ
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,কেনার জন্য অনুরোধ জানান.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,শুধু নির্বাচিত ছুটি রাজসাক্ষী এই ছুটি আবেদন জমা দিতে পারেন
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,তারিখ মুক্তিদান যোগদান তারিখ থেকে বড় হওয়া উচিত
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,আইটেম ওয়েবসাইট স্পেসিফিকেশন
 DocType: Payment Tool,Reference No,রেফারেন্স কোন
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,ত্যাগ অবরুদ্ধ
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,বার্ষিক
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,শেয়ার রিকনসিলিয়েশন আইটেম
 DocType: Stock Entry,Sales Invoice No,বিক্রয় চালান কোন
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,সরবরাহকারী ধরন
 DocType: Item,Publish in Hub,হাব প্রকাশ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,উপাদানের জন্য অনুরোধ
 DocType: Bank Reconciliation,Update Clearance Date,আপডেট পরিস্কারের তারিখ
 DocType: Item,Purchase Details,ক্রয় বিবরণ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ক্রয় করার &#39;কাঁচামাল সরবরাহ করা&#39; টেবিলের মধ্যে পাওয়া আইটেম {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ক্রয় করার &#39;কাঁচামাল সরবরাহ করা&#39; টেবিলের মধ্যে পাওয়া আইটেম {0} {1}
 DocType: Employee,Relation,সম্পর্ক
 DocType: Shipping Rule,Worldwide Shipping,বিশ্বব্যাপী শিপিং
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,গ্রাহকরা থেকে নিশ্চিত আদেশ.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,পরামর্শ
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,এই অঞ্চলের উপর সেট আইটেমটি গ্রুপ-জ্ঞানী বাজেটের. এছাড়াও আপনি বন্টন সেট করে ঋতু অন্তর্ভুক্ত করতে পারে.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},গুদাম উর্ধ্বস্থ অ্যাকাউন্ট গ্রুপ লিখুন দয়া করে {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},বিপরীতে পরিশোধ {0} {1} বকেয়া পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},বিপরীতে পরিশোধ {0} {1} বকেয়া পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {2}
 DocType: Supplier,Address HTML,ঠিকানা এইচটিএমএল
 DocType: Lead,Mobile No.,মোবাইল নাম্বার.
 DocType: Maintenance Schedule,Generate Schedule,সূচি নির্মাণ
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,সর্বশেষ
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,সর্বোচ্চ 5 টি অক্ষর
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,যদি তালিকার প্রথম ছুটি রাজসাক্ষী ডিফল্ট ছুটি রাজসাক্ষী হিসাবে নির্ধারণ করা হবে
+apps/erpnext/erpnext/config/desktop.py +73,Learn,শেখা
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,কর্মচারী প্রতি কার্যকলাপ খরচ
 DocType: Accounts Settings,Settings for Accounts,অ্যাকাউন্ট এর জন্য সেটিং
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,সেলস পারসন গাছ পরিচালনা.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,বিভিন্ন দেশের মুদ্রা
 DocType: Payment Reconciliation Invoice,Invoice Type,চালান প্রকার
 DocType: Sales Invoice Item,Delivery Note,চালান পত্র
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,করের আপ সেট
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,করের আপ সেট
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,আপনি এটি টানা পরে পেমেন্ট ভুক্তি নথীটি পরিবর্তিত হয়েছে. আবার এটি টান করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্স দুইবার প্রবেশ
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্স দুইবার প্রবেশ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,এই সপ্তাহে এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
 DocType: Workstation,Rent Cost,ভাড়া খরচ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,মাস এবং বছর নির্বাচন করুন
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, আদেয়ক, ক্রয় চালান, উত্পাদনের আদেশ, ক্রয় আদেশ, কেনার রসিদ, বিক্রয় চালান, বিক্রয় আদেশ, শেয়ার এন্ট্রি, শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড পাওয়া যায়"
 DocType: Item Tax,Tax Rate,করের হার
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,পছন্দ করো
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,পছন্দ করো
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","আইটেম: {0} ব্যাচ প্রজ্ঞাময়, পরিবর্তে ব্যবহার স্টক এণ্ট্রি \ শেয়ার রিকনসিলিয়েশন ব্যবহার মিলন করা যাবে না পরিচালিত"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},সারি # {0}: ব্যাচ কোন হিসাবে একই হতে হবে {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,অ দলের রূপান্তর
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,কেনার রসিদ দাখিল করতে হবে
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,মেডিকেল
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,হারানোর জন্য কারণ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,একক
 DocType: Issue,Attachment,ক্রোক
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,বাজেট গ্রুপ খরচ কেন্দ্র স্থাপন করা যাবে না
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,হলিডে মাস্টার.
 DocType: Material Request Item,Required Date,প্রয়োজনীয় তারিখ
 DocType: Delivery Note,Billing Address,বিলিং ঠিকানা
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
 DocType: BOM,Costing,খোয়াতে
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","চেক যদি ইতিমধ্যে প্রিন্ট হার / প্রিন্ট পরিমাণ অন্তর্ভুক্ত হিসাবে, ট্যাক্স পরিমাণ বিবেচনা করা হবে"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,মোট Qty
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
 DocType: Shipping Rule,Net Weight,প্রকৃত ওজন
 DocType: Employee,Emergency Phone,জরুরী ফোন
 ,Serial No Warranty Expiry,সিরিয়াল কোন পাটা মেয়াদ উত্তীর্ন
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,বর্ধিত 0 হতে পারবেন না
 DocType: Production Planning Tool,Material Requirement,উপাদান প্রয়োজন
 DocType: Company,Delete Company Transactions,কোম্পানি লেনদেন মুছে
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,আইটেম {0} ক্রয় করা হয় না আইটেম
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,আইটেম {0} ক্রয় করা হয় না আইটেম
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} &#39;বিজ্ঞপ্তি \ ইমেল ঠিকানা&#39; একটি অবৈধ ইমেল ঠিকানা
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,মোট বিলিং এই বছর:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ সম্পাদনা কর ও চার্জ যোগ
 DocType: Purchase Invoice,Supplier Invoice No,সরবরাহকারী চালান কোন
 DocType: Territory,For reference,অবগতির জন্য
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","মুছে ফেলা যায় না সিরিয়াল কোন {0}, এটা শেয়ার লেনদেনের ক্ষেত্রে ব্যবহার করা হয় যেমন"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),বন্ধ (যোগাযোগ Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),বন্ধ (যোগাযোগ Cr)
 DocType: Serial No,Warranty Period (Days),পাটা কাল (দিন)
 DocType: Installation Note Item,Installation Note Item,ইনস্টলেশন নোট আইটেম
 ,Pending Qty,মুলতুবি Qty
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** মাসিক বন্টন ** আপনার ব্যবসা যদি আপনি ঋতু আছে, যদি আপনি মাস জুড়ে আপনার বাজেটের বিতরণ করতে সাহায্য করে. ** এই ডিস্ট্রিবিউশন ব্যবহার একটি বাজেট বিতরণ ** কস্ট সেন্টারে ** এই ** মাসিক বন্টন সেট করুন"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,চালান টেবিল অন্তর্ভুক্ত কোন রেকর্ড
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,চালান টেবিল অন্তর্ভুক্ত কোন রেকর্ড
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,প্রথম কোম্পানি ও অনুষ্ঠান প্রকার নির্বাচন করুন
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,আর্থিক / অ্যাকাউন্টিং বছর.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","দুঃখিত, সিরিয়াল আমরা মার্জ করা যাবে না"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,প্রকল্প টাস্ক
 ,Lead Id,লিড আইডি
 DocType: C-Form Invoice Detail,Grand Total,সর্বমোট
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,অর্থবছরের শুরুর তারিখ অর্থবছরের শেষ তারিখ তার চেয়ে অনেক বেশী করা উচিত হবে না
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,অর্থবছরের শুরুর তারিখ অর্থবছরের শেষ তারিখ তার চেয়ে অনেক বেশী করা উচিত হবে না
 DocType: Warranty Claim,Resolution,সমাধান
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},বিতরণ: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},বিতরণ: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,প্রদেয় অ্যাকাউন্ট
 DocType: Sales Order,Billing and Delivery Status,বিলিং এবং বিলি অবস্থা
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,পুনরাবৃত্ত গ্রাহকদের
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,উদ্ধৃতি
 DocType: Lead,Middle Income,মধ্য আয়
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),খোলা (যোগাযোগ Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,বরাদ্দ পরিমাণ নেতিবাচক হতে পারে না
 DocType: Purchase Order Item,Billed Amt,দেখানো হয়েছিল মাসিক
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,শেয়ার এন্ট্রি তৈরি করা হয় যার বিরুদ্ধে একটি লজিক্যাল ওয়্যারহাউস.
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,উৎপাদন অর্ডার বাধ্যতামূলক
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,প্রস্তাবনা লিখন
 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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},নেতিবাচক শেয়ার ত্রুটি ({6}) আইটেম জন্য {0} গুদাম {1} উপর {2} {3} মধ্যে {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},নেতিবাচক শেয়ার ত্রুটি ({6}) আইটেম জন্য {0} গুদাম {1} উপর {2} {3} মধ্যে {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,অর্থবছরের কোম্পানি
 DocType: Packing Slip Item,DN Detail,ডিএন বিস্তারিত
 DocType: Time Log,Billed,বিল
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,ডিফল্ট খোয়াতে হার
 DocType: Maintenance Schedule,Maintenance Schedule,রক্ষণাবেক্ষণ সময়সূচী
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","তারপর দামে ইত্যাদি গ্রাহক, ক্রেতা গ্রুপ, টেরিটরি, সরবরাহকারী, কারখানা, সরবরাহকারী ধরন, প্রচারাভিযান, বিক্রয় অংশীদার উপর ভিত্তি করে ফিল্টার আউট হয়"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,পরিসংখ্যা মধ্যে নিট পরিবর্তন
 DocType: Employee,Passport Number,পাসপোর্ট নম্বার
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,ম্যানেজার
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,কেনার রসিদ থেকে
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,কেনার রসিদ থেকে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
 DocType: SMS Settings,Receiver Parameter,রিসিভার পরামিতি
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,এবং &#39;গ্রুপ দ্বারা&#39; &#39;উপর ভিত্তি করে&#39; একই হতে পারে না
 DocType: Sales Person,Sales Person Targets,সেলস পারসন লক্ষ্যমাত্রা
 DocType: Production Order Operation,In minutes,মিনিটের মধ্যে
 DocType: Issue,Resolution Date,রেজোলিউশন তারিখ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
 DocType: Selling Settings,Customer Naming By,গ্রাহক নেমিং
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,গ্রুপ রূপান্তর
 DocType: Activity Cost,Activity Type,কার্যকলাপ টাইপ
@@ -534,7 +538,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} চালান বিবরণ টেবিল মধ্যে পাওয়া যায়নি
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ যান {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 DocType: Material Request,Material Transfer,উপাদান স্থানান্তর
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,মার্কেটিং
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,তাদের সিরিয়াল টি উপর ভিত্তি করে বিক্রয় ও ক্রয় নথিতে আইটেম ট্র্যাক করতে. এই প্রোডাক্ট ওয়ারেন্টি বিবরণ ট্র্যাক ব্যবহার করতে পারেন.
 DocType: Purchase Receipt Item Supplied,Current Stock,বর্তমান তহবিল
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,পরিত্যক্ত গুদাম regected আইটেমটি বিরুদ্ধে বাধ্যতামূলক
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,এই বছর মোট বিলিং
 DocType: Account,Expenses Included In Valuation,খরচ মূল্যনির্ধারণ অন্তর্ভুক্ত
 DocType: Employee,Provide email id registered in company,কোম্পানি নিবন্ধিত ইমেইল আইডি প্রদান
 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 +533,Item has variants.,আইটেম ভিন্নতা আছে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,বৃক্ষ ধরন
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0} একটি স্টক আইটেম নয়
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} একটি স্টক আইটেম নয়
 DocType: Mode of Payment Account,Default Account,ডিফল্ট একাউন্ট
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,সুযোগ লিড থেকে তৈরি করা হয় তাহলে লিড নির্ধারণ করা আবশ্যক
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,সাপ্তাহিক ছুটির দিন নির্বাচন করুন
 DocType: Production Order Operation,Planned End Time,পরিকল্পনা শেষ সময়
 ,Sales Person Target Variance Item Group-Wise,সেলস পারসন উদ্দিষ্ট ভেদাংক আইটেমটি গ্রুপ-প্রজ্ঞাময়
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট লেজার রূপান্তরিত করা যাবে না
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট লেজার রূপান্তরিত করা যাবে না
 DocType: Delivery Note,Customer's Purchase Order No,গ্রাহকের ক্রয় আদেশ কোন
 DocType: Employee,Cell Number,মোবাইল নম্বর
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,অটো উপাদান অনুরোধ উত্পন্ন
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,নষ্ট
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,আপনি কলাম &#39;জার্নাল এন্ট্রি বিরুদ্ধে&#39; বর্তমান ভাউচার লিখতে পারবেন না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,আপনি কলাম &#39;জার্নাল এন্ট্রি বিরুদ্ধে&#39; বর্তমান ভাউচার লিখতে পারবেন না
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,শক্তি
 DocType: Opportunity,Opportunity From,থেকে সুযোগ
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,মাসিক বেতন বিবৃতি.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: টাইপ {1} এর {0} থেকে
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,সারি {0}: রূপান্তর ফ্যাক্টর বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,হিসাব থেকে পাতার নোড বিরুদ্ধে তৈরি করা যেতে পারে. দলের বিরুদ্ধে সাজপোশাকটি অনুমতি দেওয়া হয় না.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,নিষ্ক্রিয় অথবা অন্য BOMs সাথে সংযুক্ত করা হয় হিসাবে BOM বাতিল করতে পারেন না
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,নিষ্ক্রিয় অথবা অন্য BOMs সাথে সংযুক্ত করা হয় হিসাবে BOM বাতিল করতে পারেন না
 DocType: Opportunity,Maintenance,রক্ষণাবেক্ষণ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},আইটেম জন্য প্রয়োজন কেনার রসিদ নম্বর {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},আইটেম জন্য প্রয়োজন কেনার রসিদ নম্বর {0}
 DocType: Item Attribute Value,Item Attribute Value,আইটেম মান গুন
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,সেলস প্রচারণা.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,মূল্যতালিকা নির্বাচিত না
 DocType: Employee,Family Background,পারিবারিক ইতিহাস
 DocType: Process Payroll,Send Email,বার্তা পাঠাও
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,অনুমতি নেই
 DocType: Company,Default Bank Account,ডিফল্ট ব্যাঙ্ক অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","পার্টি উপর ভিত্তি করে ফিল্টার করুন, নির্বাচন পার্টি প্রথম টাইপ"
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,আমরা
 DocType: Item,Items with higher weightage will be shown higher,উচ্চ গুরুত্ব দিয়ে চলছে উচ্চ দেখানো হবে
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ব্যাংক পুনর্মিলন বিস্তারিত
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,আমার চালান
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,আমার চালান
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,কোন কর্মচারী পাওয়া
 DocType: Purchase Order,Stopped,বন্ধ
 DocType: Item,If subcontracted to a vendor,একটি বিক্রেতা আউটসোর্স করে
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,এখন পাঠান
 ,Support Analytics,সাপোর্ট অ্যানালিটিক্স
 DocType: Item,Website Warehouse,ওয়েবসাইট ওয়্যারহাউস
+DocType: Payment Reconciliation,Minimum Invoice Amount,নূন্যতম চালান পরিমাণ
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","অটো চালান 05, 28 ইত্যাদি যেমন তৈরি করা হবে যা মাসের দিন"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,স্কোর 5 থেকে কম বা সমান হবে
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,সি-ফরম রেকর্ড
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;বিক্রয় বিন্দু&quot; বৈশিষ্ট্য সক্রিয় করুন
 DocType: Bin,Moving Average Rate,গড় হার মুভিং
 DocType: Production Planning Tool,Select Items,আইটেম নির্বাচন করুন
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} বিল বিরুদ্ধে {1} তারিখের {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} বিল বিরুদ্ধে {1} তারিখের {2}
 DocType: Maintenance Visit,Completion Status,শেষ অবস্থা
 DocType: Sales Invoice Item,Target Warehouse,উদ্দিষ্ট ওয়্যারহাউস
 DocType: Item,Allow over delivery or receipt upto this percent,এই শতাংশ পর্যন্ত বিতরণ বা প্রাপ্তি ধরে মঞ্জুরি
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,স্বয়ংক্রিয়ভাবে লেনদেন জমা বার্তা রচনা.
 DocType: Production Order,Item To Manufacture,আইটেম উত্পাদনপ্রণালী
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} অবস্থা {2} হয়
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,পেমেন্ট করার আদেশ ক্রয়
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,পেমেন্ট করার আদেশ ক্রয়
 DocType: Sales Order Item,Projected Qty,অভিক্ষিপ্ত Qty
 DocType: Sales Invoice,Payment Due Date,পরিশোধযোগ্য তারিখ
 DocType: Newsletter,Newsletter Manager,নিউজলেটার ম্যানেজার
@@ -704,7 +709,7 @@
 DocType: Sales Invoice Item,Stock Details,স্টক Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,প্রকল্প মূল্য
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,বিক্রয় বিন্দু
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","ইতিমধ্যে ক্রেডিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ডেবিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","ইতিমধ্যে ক্রেডিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ডেবিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
 DocType: Account,Balance must be,ব্যালেন্স থাকতে হবে
 DocType: Hub Settings,Publish Pricing,প্রাইসিং প্রকাশ
 DocType: Notification Control,Expense Claim Rejected Message,ব্যয় দাবি প্রত্যাখ্যান পাঠান
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,মুদ্রা বিনিময় হার মাস্টার.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,প্রথম ডকুমেন্ট টাইপ নির্বাচন করুন
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,এই রক্ষণাবেক্ষণ পরিদর্শন বাতিল আগে বাতিল উপাদান ভিজিট {0}
 DocType: Salary Slip,Leave Encashment Amount,নগদীকরণ পরিমাণ ত্যাগ
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,ডিফল্ট পরিশোধযোগ্য অংশ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} কর্মচারী সক্রিয় নয় বা কোন অস্তিত্ব নেই
 DocType: Features Setup,Item Barcode,আইটেম বারকোড
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
 DocType: Quality Inspection Reading,Reading 6,6 পঠন
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,চালান অগ্রিম ক্রয়
 DocType: Address,Shop,দোকান
 DocType: Hub Settings,Sync Now,সিঙ্ক এখন
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},সারি {0}: ক্রেডিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},সারি {0}: ক্রেডিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,এই মোড নির্বাচন করা হলে ডিফল্ট ব্যাঙ্ক / ক্যাশ অ্যাকাউন্ট স্বয়ংক্রিয়ভাবে পিওএস চালান মধ্যে আপডেট করা হবে.
 DocType: Employee,Permanent Address Is,স্থায়ী ঠিকানা
 DocType: Production Order Operation,Operation completed for how many finished goods?,অপারেশন কতগুলি সমাপ্ত পণ্য জন্য সম্পন্ন?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ব্র্যান্ড
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}.
 DocType: Employee,Exit Interview Details,প্রস্থান ইন্টারভিউ এর বর্ণনা
 DocType: Item,Is Purchase Item,ক্রয় আইটেম
 DocType: Journal Entry Account,Purchase Invoice,ক্রয় চালান
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,কথায় মোট
 DocType: Material Request Item,Lead Time Date,সময় লিড তারিখ
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,আবশ্যক. হয়তো মুদ্রা বিনিময় রেকর্ড এজন্য তৈরি করা হয়নি
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},সারি # {0}: আইটেম জন্য কোন সিরিয়াল উল্লেখ করুন {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},সারি # {0}: আইটেম জন্য কোন সিরিয়াল উল্লেখ করুন {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","&#39;পণ্য সমষ্টি&#39; আইটেম, গুদাম, সিরিয়াল না এবং ব্যাচ জন্য কোন &#39;প্যাকিং তালিকা টেবিল থেকে বিবেচনা করা হবে. ওয়ারহাউস ও ব্যাচ কোন কোন &#39;পণ্য সমষ্টি&#39; আইটেমের জন্য সব প্যাকিং আইটেম জন্য একই থাকে, যারা মান প্রধান আইটেম টেবিলে সন্নিবেশ করানো যাবে, মান মেজ বোঁচকা তালিকা &#39;থেকে কপি করা হবে."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,গ্রাহকদের চালানে.
 DocType: Purchase Invoice Item,Purchase Order Item,আদেশ আইটেম ক্রয়
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,অনৈক্য
 ,Company Name,কোমপানির নাম
 DocType: SMS Center,Total Message(s),মোট বার্তা (গুলি)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,চেক জমা ছিল ব্যাংকের নির্বাচন অ্যাকাউন্ট মাথা.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ব্যবহারকারী লেনদেনের মূল্য তালিকা হার সম্পাদন করার অনুমতি প্রদান
 DocType: Pricing Rule,Max Qty,সর্বোচ্চ Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,রাসায়নিক
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,সকল আইটেম ইতিমধ্যে এই উৎপাদন অর্ডার জন্য স্থানান্তর করা হয়েছে.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,সকল আইটেম ইতিমধ্যে এই উৎপাদন অর্ডার জন্য স্থানান্তর করা হয়েছে.
 DocType: Process Payroll,Select Payroll Year and Month,বেতনের বছর এবং মাস নির্বাচন করুন
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",উপযুক্ত গ্রুপ (সাধারণত তহবিলের আবেদন&gt; চলতি সম্পদ&gt; ব্যাংক অ্যাকাউন্ট থেকে যান এবং টাইপ) শিশু যোগ উপর ক্লিক করে (একটি নতুন অ্যাকাউন্ট তৈরি করুন &quot;ব্যাংক&quot;
 DocType: Workstation,Electricity Cost,বিদ্যুৎ খরচ
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),সব নেতৃত্ব (ওপেন)
 DocType: Purchase Invoice,Get Advances Paid,উন্নতির প্রদত্ত করুন
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,তোমার ছবি সংযুক্ত
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,করা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,করা
 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 +3,My Cart,আমার ট্রলি
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,আমার ট্রলি
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Qty খোলা
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,নগদ / ব্যাংক অ্যাকাউন্ট
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
 DocType: Delivery Note,Delivery To,বিতরণ
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
 DocType: Production Planning Tool,Get Sales Orders,বিক্রয় আদেশ পান
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} নেতিবাচক হতে পারে না
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,ডিসকাউন্ট
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,ডিসকাউন্ট
 DocType: Features Setup,Purchase Discounts,ক্রয় ডিসকাউন্ট
 DocType: Workstation,Wages,মজুরি
 DocType: Time Log,Will be updated only if Time Log is 'Billable',টাইম ইন &#39;বিলযোগ্য&#39; হয় তাহলে শুধুমাত্র আপডেট করা হবে
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,শিপিং রাজ্য
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,আইটেম বাটন &#39;ক্রয় রসিদ থেকে জানানোর পান&#39; ব্যবহার করে যোগ করা হবে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,সেলস খরচ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,স্ট্যান্ডার্ড রাজধানীতে
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,স্ট্যান্ডার্ড রাজধানীতে
 DocType: GL Entry,Against,বিরুদ্ধে
 DocType: Item,Default Selling Cost Center,ডিফল্ট বিক্রি খরচ কেন্দ্র
 DocType: Sales Partner,Implementation Partner,বাস্তবায়ন অংশীদার
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,পরিবেশক
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,শপিং কার্ট শিপিং রুল
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,উৎপাদন অর্ডার {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',সেট &#39;অতিরিক্ত ডিসকাউন্ট প্রযোজ্য&#39; দয়া করে
 ,Ordered Items To Be Billed,আদেশ আইটেম বিল তৈরি করা
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,বিন্যাস কম হতে হয়েছে থেকে চেয়ে পরিসীমা
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,সময় লগসমূহ নির্বাচন করুন এবং একটি নতুন বিক্রয় চালান তৈরি জমা দিন.
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,এই টাইম ইন ব্যাচ বিল হয়েছে.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,সুযোগ সৃষ্টি
 DocType: Salary Slip,Leave Without Pay,পারিশ্রমিক বিহীন ছুটি
-DocType: Supplier,Communications,যোগাযোগ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,ক্ষমতা পরিকল্পনা ত্রুটি
 ,Trial Balance for Party,পার্টি জন্য ট্রায়াল ব্যালেন্স
 DocType: Lead,Consultant,পরামর্শকারী
 DocType: Salary Slip,Earnings,উপার্জন
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,সমাপ্ত আইটেম {0} প্রস্তুত টাইপ এন্ট্রির জন্য প্রবেশ করতে হবে
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,খোলা অ্যাকাউন্টিং ব্যালান্স
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,সমাপ্ত আইটেম {0} প্রস্তুত টাইপ এন্ট্রির জন্য প্রবেশ করতে হবে
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,খোলা অ্যাকাউন্টিং ব্যালান্স
 DocType: Sales Invoice Advance,Sales Invoice Advance,বিক্রয় চালান অগ্রিম
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,কিছুই অনুরোধ করতে
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','প্রকৃত আরম্ভের তারিখ' কখনই 'প্রকৃত শেষ তারিখ' থেকে বেশি হতে পারে না
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,চলতি অর্থবছরের
 DocType: Global Defaults,Disable Rounded Total,গোলাকৃতি মোট অক্ষম
 DocType: Lead,Call,কল
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;এন্ট্রি&#39; খালি রাখা যাবে না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&#39;এন্ট্রি&#39; খালি রাখা যাবে না
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},সদৃশ সারিতে {0} একই {1}
 ,Trial Balance,ট্রায়াল ব্যালেন্স
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,এমপ্লয়িজ স্থাপনের
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,ব্যবহারকারী আইডি
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,দেখুন লেজার
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,পুরনো
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
 DocType: Production Order,Manufacture against Sales Order,সেলস আদেশের বিরুদ্ধে প্রস্তুত
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,বিশ্বের বাকি
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,গ্রস পে
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},হিমায়িত অ্যাকাউন্ট সম্পাদনা করার জন্য অনুমোদিত নয় {0}
 DocType: Journal Entry,Get Outstanding Invoices,অসামান্য চালানে পান
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,বিক্রয় আদেশ {0} বৈধ নয়
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,ঘটনার কেন্দ্রবিন্দু
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,চুক্তি
 DocType: Email Digest,Add Quote,উক্তি করো
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM জন্য প্রয়োজন UOM coversion ফ্যাক্টর: {0} আইটেম: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM জন্য প্রয়োজন UOM coversion ফ্যাক্টর: {0} আইটেম: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,পরোক্ষ খরচ
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,সারি {0}: Qty বাধ্যতামূলক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,কৃষি
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,আপনার পণ্য বা সেবা
 DocType: Mode of Payment,Mode of Payment,পেমেন্ট মোড
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,এটি একটি root আইটেমটি গ্রুপ এবং সম্পাদনা করা যাবে না.
 DocType: Journal Entry Account,Purchase Order,ক্রয় আদেশ
 DocType: Warehouse,Warehouse Contact Info,ওয়ারহাউস যোগাযোগের তথ্য
@@ -1018,8 +1024,8 @@
 DocType: Email Digest,Annual Income,বার্ষিক আয়
 DocType: Serial No,Serial No Details,সিরিয়াল কোন বিবরণ
 DocType: Purchase Invoice Item,Item Tax Rate,আইটেমটি ট্যাক্স হার
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,আইটেম {0} একটি সাব-সংকুচিত আইটেম হতে হবে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ক্যাপিটাল উপকরণ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","প্রাইসিং রুল প্রথম উপর ভিত্তি করে নির্বাচন করা হয় আইটেম, আইটেম গ্রুপ বা ব্র্যান্ড হতে পারে, যা ক্ষেত্র &#39;প্রয়োগ&#39;."
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,লক্ষ্য
 DocType: Sales Invoice Item,Edit Description,সম্পাদনা বিবরণ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,প্রত্যাশিত প্রসবের তারিখ পরিকল্পনা শুরুর তারিখ তুলনায় কম হয়.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,সরবরাহকারী
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,সরবরাহকারী
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,অ্যাকাউন্ট টাইপ সেটিং লেনদেন এই অ্যাকাউন্টটি নির্বাচন করতে সাহায্য করে.
 DocType: Purchase Invoice,Grand Total (Company Currency),সর্বমোট (কোম্পানি একক)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,মোট আউটগোয়িং
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,জার্নাল এন্ট্রি
 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 +427,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,এই উপসর্গবিশিষ্ট সর্বশেষ নির্মিত লেনদেনের সংখ্যা
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","যোগাযোগ নিউজলেটার, বাড়ে."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,অপারেশনস ফাঁকা রাখা যাবে না.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,অপারেশনস ফাঁকা রাখা যাবে না.
 ,Delivered Items To Be Billed,বিতরণ আইটেম বিল তৈরি করা
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ওয়ারহাউস সিরিয়াল নং জন্য পরিবর্তন করা যাবে না
 DocType: Authorization Rule,Average Discount,গড় মূল্য ছাড়ের
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},থেকে {0} | {1} {2}
 DocType: BOM Operation,Operation Description,অপারেশন বিবরণ
 DocType: Item,Will also apply to variants,এছাড়াও ভিন্নতা প্রয়োগ করা হবে
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ফিস্ক্যাল বছর একবার সংরক্ষিত হয় ফিস্ক্যাল বছর আরম্ভের তারিখ ও ফিস্ক্যাল বছর শেষ তারিখ পরিবর্তন করা যাবে না.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ফিস্ক্যাল বছর একবার সংরক্ষিত হয় ফিস্ক্যাল বছর আরম্ভের তারিখ ও ফিস্ক্যাল বছর শেষ তারিখ পরিবর্তন করা যাবে না.
 DocType: Quotation,Shopping Cart,বাজারের ব্যাগ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,গড় দৈনিক আউটগোয়িং
 DocType: Pricing Rule,Campaign,প্রচারাভিযান
@@ -1100,7 +1106,8 @@
 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 +211,Stock Entries already created for Production Order ,ইতিমধ্যে উৎপাদন অর্ডার নির্মিত শেয়ার সাজপোশাকটি
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ইতিমধ্যে উৎপাদন অর্ডার নির্মিত শেয়ার সাজপোশাকটি
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,পরিসম্পদ মধ্যে নিট পরিবর্তন
 DocType: Leave Control Panel,Leave blank if considered for all designations,সব প্রশিক্ষণে জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,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 +182,Max: {0},সর্বোচ্চ: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,হিসাবরক্ষনের তালিকা
 DocType: Material Request,Terms and Conditions Content,শর্তাবলী কনটেন্ট
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
 DocType: Employee,Owned,মালিক
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,বিনা বেতনে ছুটি উপর নির্ভর করে
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,উপ সমাহারগুলি
 DocType: Shipping Rule Condition,To Value,মান
 DocType: Supplier,Stock Manager,স্টক ম্যানেজার
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},উত্স গুদাম সারিতে জন্য বাধ্যতামূলক {0}
+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 +581,Packing Slip,প্যাকিং স্লিপ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,অফিস ভাড়া
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,সেটআপ এসএমএস গেটওয়ে সেটিংস
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,কোনো ঠিকানা এখনো যোগ.
 DocType: Workstation Working Hour,Workstation Working Hour,ওয়ার্কস্টেশন কাজ ঘন্টা
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,বিশ্লেষক
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা জেভি পরিমাণ সমান নয় {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা জেভি পরিমাণ সমান নয় {2}
 DocType: Item,Inventory,জায়
 DocType: Features Setup,"To enable ""Point of Sale"" view",দেখুন &quot;বিক্রয় বিন্দু&quot; সচল করুন
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,পেমেন্ট খালি ট্রলি জন্য তৈরি করা যাবে না
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,পেমেন্ট খালি ট্রলি জন্য তৈরি করা যাবে না
 DocType: Item,Sales Details,বিক্রয় বিবরণ
 DocType: Opportunity,With Items,জানানোর সঙ্গে
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty ইন
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,মূল খরচ কেন্দ্র
 DocType: Sales Invoice,Source,উত্স
 DocType: Leave Type,Is Leave Without Pay,বিনা বেতনে ছুটি হয়
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,পেমেন্ট টেবিল অন্তর্ভুক্ত কোন রেকর্ড
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,পেমেন্ট টেবিল অন্তর্ভুক্ত কোন রেকর্ড
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,আর্থিক বছরের শুরু তারিখ
 DocType: Employee External Work History,Total Experience,মোট অভিজ্ঞতা
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,বিনিয়োগ থেকে ক্যাশ ফ্লো
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,মাল ও ফরোয়ার্ডিং চার্জ
 DocType: Material Request Item,Sales Order No,বিক্রয় আদেশ কোন
 DocType: Item Group,Item Group Name,আইটেমটি গ্রুপ নাম
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,প্রস্তুত জন্য স্থানান্তর সামগ্রী
 DocType: Pricing Rule,For Price List,মূল্য তালিকা জন্য
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,নির্বাহী অনুসন্ধান
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","আইটেম জন্য ক্রয় হার: {0} পাওয়া যায়নি, অ্যাকাউন্টিং এন্ট্রি (ব্যয়) বই প্রয়োজন বোধ করা হয় যা. একটি ক্রয় মূল্য তালিকা বিরুদ্ধে আইটেমের মূল্য উল্লেখ করুন."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","আইটেম জন্য ক্রয় হার: {0} পাওয়া যায়নি, অ্যাকাউন্টিং এন্ট্রি (ব্যয়) বই প্রয়োজন বোধ করা হয় যা. একটি ক্রয় মূল্য তালিকা বিরুদ্ধে আইটেমের মূল্য উল্লেখ করুন."
 DocType: Maintenance Schedule,Schedules,সূচী
 DocType: Purchase Invoice Item,Net Amount,থোক
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM বিস্তারিত কোন
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),অতিরিক্ত মূল্য ছাড়ের পরিমাণ (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},ত্রুটি: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},ত্রুটি: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,অ্যাকাউন্ট চার্ট থেকে নতুন একাউন্ট তৈরি করুন.
 DocType: Maintenance Visit,Maintenance Visit,রক্ষণাবেক্ষণ পরিদর্শন
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,গ্রাহক&gt; গ্রাহক গ্রুপ&gt; টেরিটরি
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,বিক্রয় অংশীদার উদ্দিষ্ট
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} জন্য অ্যাকাউন্টিং কেবল প্রবেশ মুদ্রা তৈরি করা যাবে: {1}
 DocType: Pricing Rule,Pricing Rule,প্রাইসিং রুল
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,আদেশ ক্রয় উপাদানের জন্য অনুরোধ
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,আদেশ ক্রয় উপাদানের জন্য অনুরোধ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},সারি # {0}: Returned আইটেম {1} না মধ্যে উপস্থিত থাকে না {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,ব্যাংক হিসাব
 ,Bank Reconciliation Statement,ব্যাংক পুনর্মিলন বিবৃতি
@@ -1225,11 +1233,11 @@
 ,POS,পিওএস
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,খোলা স্টক ব্যালেন্স
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} শুধুমাত্র একবার প্রদর্শিত হতে হবে
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},আরো tranfer করা অনুমোদিত নয় {0} চেয়ে {1} ক্রয় আদেশের বিরুদ্ধে {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},সাফল্যের বরাদ্দ পাতার {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,কোনও আইটেম প্যাক
 DocType: Shipping Rule Condition,From Value,মূল্য থেকে
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,উৎপাদন পরিমাণ বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,উৎপাদন পরিমাণ বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,ব্যাংক প্রতিফলিত না পরিমাণে
 DocType: Quality Inspection Reading,Reading 4,4 পঠন
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,কোম্পানি ব্যয় জন্য দাবি করে.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,"সরবরাহকারী এবার তৈরি করা যাবে না, যার জন্য উপাদান অনুরোধ"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) ছুটির হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,বারকোড ব্যবহার আইটেম ট্র্যাক. আপনি আইটেম এর বারকোড স্ক্যানিং দ্বারা হুণ্ডি এবং বিক্রয় চালান মধ্যে আইটেম প্রবেশ করতে সক্ষম হবে.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,মার্ক হিসাবে বিতরণ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,মার্ক হিসাবে বিতরণ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,উদ্ধৃতি করা
 DocType: Dependent Task,Dependent Task,নির্ভরশীল কার্য
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,বন্ধ করুন জন্মদিনের রিমাইন্ডার
 DocType: SMS Center,Receiver List,রিসিভার তালিকা
 DocType: Payment Tool Detail,Payment Amount,পরিশোধিত অর্থ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ক্ষয়প্রাপ্ত পরিমাণ
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} দেখুন
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} দেখুন
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,ক্যাশ মধ্যে নিট পরিবর্তন
 DocType: Salary Structure Deduction,Salary Structure Deduction,বেতন কাঠামো সিদ্ধান্তগ্রহণ
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {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 +185,Quantity must not be more than {0},পরিমাণ বেশী হবে না {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),বয়স (দিন)
 DocType: Quotation Item,Quotation Item,উদ্ধৃতি আইটেম
 DocType: Account,Account Name,অ্যাকাউন্ট নাম
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,জন্ম তারিখ এর চেয়ে বড় হতে পারে না
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,জন্ম তারিখ এর চেয়ে বড় হতে পারে না
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,সিরিয়াল কোন {0} পরিমাণ {1} একটি ভগ্নাংশ হতে পারবেন না
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,সরবরাহকারী প্রকার মাস্টার.
 DocType: Purchase Order Item,Supplier Part Number,সরবরাহকারী পার্ট সংখ্যা
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,রূপান্তরের হার 0 বা 1 হতে পারে না
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,রূপান্তরের হার 0 বা 1 হতে পারে না
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,কেনার রসিদ {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,কেনার রসিদ {0} দাখিল করা হয় না
 DocType: Company,Default Payable Account,ডিফল্ট প্রদেয় অ্যাকাউন্ট
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","যেমন গ্রেপ্তার নিয়ম, মূল্যতালিকা ইত্যাদি হিসাবে অনলাইন শপিং কার্ট এর সেটিংস"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% দেখানো হয়েছিল
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,আমার সমস্যা
 DocType: BOM Item,BOM Item,BOM আইটেম
 DocType: Appraisal,For Employee,কর্মী
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,সারি {0}: সরবরাহকারীর বিরুদ্ধে অগ্রিম ডেবিট করা হবে
 DocType: Company,Default Values,ডিফল্ট মান
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,সারি {0}: পেমেন্ট পরিমাণ নেতিবাচক হতে পারে না
 DocType: Expense Claim,Total Amount Reimbursed,মোট পরিমাণ শিশুবের
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},সরবরাহকারী বিরুদ্ধে চালান {0} তারিখের {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},সরবরাহকারী বিরুদ্ধে চালান {0} তারিখের {1}
 DocType: Customer,Default Price List,ডিফল্ট মূল্য তালিকা
 DocType: Payment Reconciliation,Payments,পেমেন্টস্
 DocType: Budget Detail,Budget Allocated,বাজেট বরাদ্দ
 DocType: Journal Entry,Entry Type,এন্ট্রি টাইপ
 ,Customer Credit Balance,গ্রাহকের ক্রেডিট ব্যালেন্স
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,হিসাবের পরিশোধযোগ্য অংশ মধ্যে নিট পরিবর্তন
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,আপনার ইমেইল আইডি যাচাই করুন
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',&#39;Customerwise ছাড়&#39; জন্য প্রয়োজনীয় গ্রাহক
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,পত্রিকার সঙ্গে ব্যাংক পেমেন্ট তারিখ আপডেট করুন.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,শপিং কার্ট সক্রিয়
 DocType: Employee,Permanent Address,স্থায়ী ঠিকানা
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,আইটেম {0} একটি পরিষেবা আইটেম হতে হবে.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",সর্বমোট চেয়ে \ {0} {1} বেশী হতে পারবেন না বিরুদ্ধে পরিশোধিত আগাম {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,আইটেমটি কোড নির্বাচন করুন
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),বিনা বেতনে ছুটি জন্য সিদ্ধান্তগ্রহণ হ্রাস (LWP)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,একটি আইটেম এর একক.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',টাইম ইন ব্যাচ {0} &#39;লগইন&#39; হতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',টাইম ইন ব্যাচ {0} &#39;লগইন&#39; হতে হবে
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,প্রতি স্টক আন্দোলনের জন্য অ্যাকাউন্টিং এন্ট্রি করতে
 DocType: Leave Allocation,Total Leaves Allocated,মোট পাতার বরাদ্দ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},সারি কোন সময়ে প্রয়োজনীয় গুদাম {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},সারি কোন সময়ে প্রয়োজনীয় গুদাম {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,বৈধ আর্থিক বছরের শুরু এবং শেষ তারিখগুলি লিখুন দয়া করে
 DocType: Employee,Date Of Retirement,অবসর তারিখ
 DocType: Upload Attendance,Get Template,টেমপ্লেট করুন
 DocType: Address,Postal,ঠিকানা
 DocType: Item,Weightage,গুরুত্ব
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,একটি গ্রাহক গ্রুপ একই নামের সঙ্গে বিদ্যমান গ্রাহকের নাম পরিবর্তন বা ক্রেতা গ্রুপ নামান্তর করুন
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,{0} প্রথম নির্বাচন করুন.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},টেক্সট {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,{0} প্রথম নির্বাচন করুন.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},টেক্সট {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,নতুন কন্টাক্ট
 DocType: Territory,Parent Territory,মূল টেরিটরি
 DocType: Quality Inspection Reading,Reading 2,2 পড়া
 DocType: Stock Entry,Material Receipt,উপাদান রশিদ
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {0}
 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 +210,Quantity required for Item {0} in row {1},সারিতে আইটেম {0} জন্য প্রয়োজনীয় পরিমাণ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},সারিতে আইটেম {0} জন্য প্রয়োজনীয় পরিমাণ {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},পরিমাণ আইটেমটি জন্য বিদ্যমান হিসাবে ওয়্যারহাউস {0} মোছা যাবে না {1}
 DocType: Quotation,Order Type,যাতে টাইপ
 DocType: Purchase Invoice,Notification Email Address,বিজ্ঞপ্তি ইমেল ঠিকানা
@@ -1361,15 +1373,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,অনেক কলাম. প্রতিবেদন এবং রফতানি একটি স্প্রেডশীট অ্যাপ্লিকেশন ব্যবহার করে তা প্রিন্ট করা হবে.
 DocType: Sales 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 +152,Main,প্রধান
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,প্রধান
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,বৈকল্পিক
 DocType: Naming Series,Set prefix for numbering series on your transactions,আপনার লেনদেনের উপর সিরিজ সংখ্যায়ন জন্য সেট উপসর্গ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,থামানো অর্ডার বাতিল করা যাবে না. বাতিল করতে দুর.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,ক্রয় আদেশ করা
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,ক্রয় আদেশ করা
 DocType: SMS Center,Send To,পাঠানো
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
 DocType: Payment Reconciliation Payment,Allocated amount,বরাদ্দ পরিমাণ
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,ওয়ারহাউস ও রেফারেন্স
 DocType: Supplier,Statutory info and other general information about your Supplier,আপনার সরবরাহকারীর সম্পর্কে বিধিবদ্ধ তথ্য এবং অন্যান্য সাধারণ তথ্য
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,ঠিকানা
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,জার্নাল বিরুদ্ধে এণ্ট্রি {0} কোনো অপ্রতিম {1} এন্ট্রি নেই
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,জার্নাল বিরুদ্ধে এণ্ট্রি {0} কোনো অপ্রতিম {1} এন্ট্রি নেই
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},সিরিয়াল কোন আইটেম জন্য প্রবেশ সদৃশ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,একটি শিপিং শাসনের জন্য একটি শর্ত
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,আইটেম উৎপাদন অর্ডার আছে অনুমোদিত নয়.
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,অ্যাকাউন্টের মুদ্রা মধ্যে ক্রেডিট পরিমাণ
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,উত্পাদন জন্য সময় লগসমূহ.
 DocType: Item,Apply Warehouse-wise Reorder Level,ওয়ারহাউস অনুসার রেকর্ডার শ্রেনী প্রয়োগ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
 DocType: Authorization Control,Authorization Control,অনুমোদন কন্ট্রোল
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},সারি # {0}: ওয়্যারহাউস প্রত্যাখ্যাত প্রত্যাখ্যান আইটেম বিরুদ্ধে বাধ্যতামূলক {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,কাজগুলো জন্য টাইম ইন.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,প্রদান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,প্রদান
 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},সর্বাধিক {0} এর উপাদানের জন্য অনুরোধ {1} সেলস আদেশের বিরুদ্ধে আইটেম জন্য তৈরি করা যেতে পারে {2}
 DocType: Employee,Salutation,অভিবাদন
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,সহযোগী
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,{0} আইটেম ধারাবাহিকভাবে আইটেম নয়
 DocType: SMS Center,Create Receiver List,রিসিভার তালিকা তৈরি করুন
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,মেয়াদউত্তীর্ণ
 DocType: Packing Slip,To Package No.,নং প্যাকেজে
 DocType: Warranty Claim,Issue Date,প্রদানের তারিখ
 DocType: Activity Cost,Activity Cost,কার্যকলাপ খরচ
@@ -1449,7 +1461,7 @@
 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 +65,Territory / Customer,টেরিটরি / গ্রাহক
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,যেমন 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,সেলস আইটেম
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,আইটেমটি গ্রুপ বৃক্ষ
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} তৈরি হয়েছে
 DocType: Delivery Note Item,Against Sales Order,সেলস আদেশের বিরুদ্ধে
 ,Serial No Status,সিরিয়াল কোন স্ট্যাটাস
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,আইটেম টেবিল ফাঁকা থাকতে পারে না
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,আইটেম টেবিল ফাঁকা থাকতে পারে না
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","সারি {0}: সেট করুন {1} পর্যায়কাল, থেকে এবং তারিখ \ করার মধ্যে পার্থক্য এর চেয়ে বড় বা সমান হবে {2}"
 DocType: Pricing Rule,Selling,বিক্রি
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,কর্তব্য এবং কর
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,সরবরাহকৃত Qty
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,ইনস্টলেশনের সময়
 DocType: Sales Invoice,Accounting Details,অ্যাকাউন্টিং এর বর্ণনা
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,এই কোম্পানির জন্য সব লেনদেন মুছে
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,সারি # {0}: অপারেশন {1} উত্পাদনের মধ্যে সমাপ্ত পণ্য {2} Qty জন্য সম্পন্ন করা হয় না আদেশ # {3}. সময় লগসমূহ মাধ্যমে অপারেশন অবস্থা আপডেট করুন
+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,সারি # {0}: অপারেশন {1} উত্পাদনের মধ্যে সমাপ্ত পণ্য {2} Qty জন্য সম্পন্ন করা হয় না আদেশ # {3}. সময় লগসমূহ মাধ্যমে অপারেশন অবস্থা আপডেট করুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,বিনিয়োগ
 DocType: Issue,Resolution Details,রেজোলিউশনের বিবরণ
 DocType: Quality Inspection Reading,Acceptance Criteria,গ্রহণযোগ্য বৈশিষ্ট্য
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,সাফ ছক
 DocType: Features Setup,Brands,ব্র্যান্ড
 DocType: C-Form Invoice Detail,Invoice No,চালান নং
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,ক্রয় অর্ডার থেকে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,ক্রয় অর্ডার থেকে
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,খোয়াতে হার
 ,Customer Addresses And Contacts,গ্রাহক ঠিকানা এবং পরিচিতি
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,রক্ষণাবেক্ষণ সময়সূচী
 ,Quotation Trends,উদ্ধৃতি প্রবণতা
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},আইটেমটি গ্রুপ আইটেমের জন্য আইটেম মাস্টার উল্লেখ না {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
 DocType: Shipping Rule Condition,Shipping Amount,শিপিং পরিমাণ
 ,Pending Amount,অপেক্ষারত পরিমাণ
 DocType: Purchase Invoice Item,Conversion Factor,রূপান্তর ফ্যাক্টর
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial অ্যাকাউন্টের বৃক্ষ.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,সব কর্মচারী ধরনের জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 DocType: Landed Cost Voucher,Distribute Charges Based On,বিতরণ অভিযোগে নির্ভরশীল
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,আইটেম {1} একটি অ্যাসেট আইটেম হিসাবে অ্যাকাউন্ট {0} &#39;স্থায়ী সম্পদ&#39; ধরনের হতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,আইটেম {1} একটি অ্যাসেট আইটেম হিসাবে অ্যাকাউন্ট {0} &#39;স্থায়ী সম্পদ&#39; ধরনের হতে হবে
 DocType: HR Settings,HR Settings,এইচআর সেটিংস
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ব্যয় দাবি অনুমোদনের জন্য স্থগিত করা হয়. শুধু ব্যয় রাজসাক্ষী স্ট্যাটাস আপডেট করতে পারবেন.
 DocType: Purchase Invoice,Additional Discount Amount,অতিরিক্ত মূল্য ছাড়ের পরিমাণ
 DocType: Leave Block List Allow,Leave Block List Allow,ব্লক মঞ্জুর তালিকা ত্যাগ
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,স্পোর্টস
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,প্রকৃত মোট
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,একক
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ডিফল্ট অর্থবছরের এখন হয়. পরিবর্তন কার্যকর করার জন্য আপনার ব্রাউজার রিফ্রেশ করুন.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ব্যয় দাবি
 DocType: Issue,Support,সমর্থন
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,দেখুন কার্ট
 ,BOM Search,খোঁজো
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),বন্ধ (+ + সমগ্র খোলা)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,কোম্পানি মুদ্রা উল্লেখ করুন
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM রূপান্তর ফ্যাক্টর সারিতে প্রয়োজন বোধ করা হয় {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},পরিস্কারের তারিখ সারিতে চেক তারিখের আগে হতে পারে না {0}
 DocType: Salary Slip,Deduction,সিদ্ধান্তগ্রহণ
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},আইটেমের মূল্য জন্য যোগ {0} মূল্যতালিকা {1}
 DocType: Address Template,Address Template,ঠিকানা টেমপ্লেট
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,এই বিক্রয় ব্যক্তির কর্মী ID লিখুন দয়া করে
 DocType: Territory,Classification of Customers by region,অঞ্চল গ্রাহকের সাইট
 DocType: Project,% Tasks Completed,% কাজগুলো সম্পন্ন  হয়েছে
 DocType: Project,Gross Margin,গ্রস মার্জিন
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,প্রথম উত্পাদন আইটেম লিখুন দয়া করে
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,প্রতিবন্ধী ব্যবহারকারী
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,প্রতিবন্ধী ব্যবহারকারী
 DocType: Opportunity,Quotation,উদ্ধৃতি
 DocType: Salary Slip,Total Deduction,মোট সিদ্ধান্তগ্রহণ
 DocType: Quotation,Maintenance User,রক্ষণাবেক্ষণ ব্যবহারকারী
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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,বিয়োগ করা
@@ -1588,12 +1602,12 @@
 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,তাই Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","শেয়ার এন্ট্রি গুদাম বিরুদ্ধে বিদ্যমান {0}, অত: পর আপনি পুনরায় ধার্য বা গুদাম পরিবর্তন করতে পারেন না"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","শেয়ার এন্ট্রি গুদাম বিরুদ্ধে বিদ্যমান {0}, অত: পর আপনি পুনরায় ধার্য বা গুদাম পরিবর্তন করতে পারেন না"
 DocType: Appraisal,Calculate Total Score,মোট স্কোর গণনা করা
 DocType: Supplier Quotation,Manufacturing Manager,উৎপাদন ম্যানেজার
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},সিরিয়াল কোন {0} পর্যন্ত ওয়ারেন্টি বা তার কম বয়সী {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,প্যাকেজ বিভক্ত হুণ্ডি.
-apps/erpnext/erpnext/hooks.py +68,Shipments,চালানে
+apps/erpnext/erpnext/hooks.py +69,Shipments,চালানে
 DocType: Purchase Order Item,To be delivered to customer,গ্রাহকের মধ্যে বিতরণ করা হবে
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,টাইম ইন স্থিতি জমা িদেত হেব.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,সিরিয়াল কোন {0} কোনো গুদাম অন্তর্গত নয়
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,কোম্পানি নির্বাচন ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,সব বিভাগের জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","কর্মসংস্থান প্রকারভেদ (স্থায়ী, চুক্তি, অন্তরীণ ইত্যাদি)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
 DocType: Currency Exchange,From Currency,মুদ্রা থেকে
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","অন্তত একটি সারিতে বরাদ্দ পরিমাণ, চালান প্রকার এবং চালান নম্বর নির্বাচন করুন"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},আইটেম জন্য প্রয়োজন বিক্রয় আদেশ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","অন্তত একটি সারিতে বরাদ্দ পরিমাণ, চালান প্রকার এবং চালান নম্বর নির্বাচন করুন"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},আইটেম জন্য প্রয়োজন বিক্রয় আদেশ {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,সিস্টেম প্রতিফলিত না পরিমাণে
 DocType: Purchase Invoice Item,Rate (Company Currency),হার (কোম্পানি একক)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,অন্যরা
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,প্রক্রিয়াধীন
 DocType: Authorization Rule,Itemwise Discount,Itemwise ছাড়
 DocType: Purchase Order Item,Reference Document Type,রেফারেন্স ডকুমেন্ট টাইপ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} সেলস আদেশের বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} সেলস আদেশের বিরুদ্ধে {1}
 DocType: Account,Fixed Asset,নির্দিষ্ট সম্পত্তি
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,ধারাবাহিকভাবে পরিসংখ্যা
 DocType: Activity Type,Default Billing Rate,ডিফল্ট বিলিং রেট
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,অর্থ প্রদান বিক্রয় আদেশ
 DocType: Expense Claim Detail,Expense Claim Detail,ব্যয় দাবি বিস্তারিত
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,সময় লগসমূহ নির্মিত:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,সঠিক অ্যাকাউন্ট নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,সঠিক অ্যাকাউন্ট নির্বাচন করুন
 DocType: Item,Weight UOM,ওজন UOM
 DocType: Employee,Blood Group,রক্তের গ্রুপ
 DocType: Purchase Invoice Item,Page Break,পৃষ্ঠা বিরতি
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,সময়
 DocType: Authorization Rule,Approving Role (above authorized value),(কঠিন মূল্য উপরে) ভূমিকা অনুমোদন
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","সন্তানের যোগ নোড, বৃক্ষ এবং এক্সপ্লোর আপনি আরো নোড যোগ করতে চান যার অধীনে নোডে ক্লিক করুন."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,একাউন্টে ক্রেডিট একটি প্রদেয় অ্যাকাউন্ট থাকতে হবে
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} এর পিতা বা মাতা বা সন্তান হতে পারবেন না {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,একাউন্টে ক্রেডিট একটি প্রদেয় অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} এর পিতা বা মাতা বা সন্তান হতে পারবেন না {2}
 DocType: Production Order Operation,Completed Qty,সমাপ্ত Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, শুধুমাত্র ডেবিট অ্যাকাউন্ট অন্য ক্রেডিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","{0}, শুধুমাত্র ডেবিট অ্যাকাউন্ট অন্য ক্রেডিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,মূল্যতালিকা {0} নিষ্ক্রিয় করা হয়
 DocType: Manufacturing Settings,Allow Overtime,ওভারটাইম মঞ্জুরি
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} আইটেম জন্য প্রয়োজন সিরিয়াল নাম্বার {1}. আপনার দেওয়া {2}.
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,গ্রাহক আইটেম সঙ্কেত
 DocType: Opportunity,Lost Reason,লস্ট কারণ
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,আদেশ বা চালানে বিরুদ্ধে পেমেন্ট থেকে.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,নতুন ঠিকানা
 DocType: Quality Inspection,Sample Size,সাধারন মাপ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,সকল আইটেম ইতিমধ্যে invoiced হয়েছে
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,অতিরিক্ত খরচ সেন্টার গ্রুপ অধীন করা যেতে পারে কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে
 DocType: Project,External,বহিরাগত
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,টুল পুনঃনামকরণ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,আপডেট খরচ
 DocType: Item Reorder,Item Reorder,আইটেম অনুসারে পুনঃক্রম করুন
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,ট্রান্সফার উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,ট্রান্সফার উপাদান
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","অপারেশন, অপারেটিং খরচ উল্লেখ করুন এবং আপনার কাজকর্মকে কোন একটি অনন্য অপারেশন দিতে."
 DocType: Purchase Invoice,Price List Currency,মূল্যতালিকা মুদ্রা
 DocType: Naming Series,User must always select,ব্যবহারকারী সবসময় নির্বাচন করতে হবে
 DocType: Stock Settings,Allow Negative Stock,নেতিবাচক শেয়ার মঞ্জুরি
 DocType: Installation Note,Installation Note,ইনস্টলেশন উল্লেখ্য
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,করের যোগ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,অর্থায়ন থেকে ক্যাশ ফ্লো
 ,Financial Analytics,আর্থিক বিশ্লেষণ
 DocType: Quality Inspection,Verified By,কর্তৃক যাচাইকৃত
 DocType: Address,Subsidiary,সহায়ক
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,বেতন স্লিপ তৈরি
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,ব্যাংক হিসাবে প্রত্যাশিত ভারসাম্য
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),তহবিলের উৎস (দায়)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},সারিতে পরিমাণ {0} ({1}) শিল্পজাত পরিমাণ হিসাবে একই হতে হবে {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},সারিতে পরিমাণ {0} ({1}) শিল্পজাত পরিমাণ হিসাবে একই হতে হবে {2}
 DocType: Appraisal,Employee,কর্মচারী
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,থেকে আমদানি ইমেইল
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,ব্যবহারকারী হিসেবে আমন্ত্রণ
 DocType: Features Setup,After Sale Installations,বিক্রয় ইনস্টলেশনের পরে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} সম্পূর্ণরূপে বিল হয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} সম্পূর্ণরূপে বিল হয়
 DocType: Workstation Working Hour,End Time,শেষ সময়
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,সেলস বা কেনার জন্য আদর্শ চুক্তি পদ.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,ভাউচার দ্বারা গ্রুপ
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,প্রয়োজনীয় উপর
 DocType: Sales Invoice,Mass Mailing,ভর মেইলিং
 DocType: Rename Tool,File to Rename,পুনঃনামকরণ করা ফাইল
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},আইটেম জন্য প্রয়োজন Purchse ক্রম সংখ্যা {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},আইটেম জন্য প্রয়োজন Purchse ক্রম সংখ্যা {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,দেখান পেমেন্টস্
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},আইটেম জন্য বিদ্যমান নয় নির্দিষ্ট BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ সূচি {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,সেলস আদেশ প্রয়োজন
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,গ্রাহক তৈরি
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,রক্ষণাবেক্ষণ তফসিল বিস্তারিত
 DocType: Quality Inspection Reading,Reading 9,9 পঠন
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,দ্বারা উত্থাপিত
 DocType: Payment Tool,Payment Account,টাকা পরিষদের অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,গ্রহনযোগ্য অ্যাকাউন্ট মধ্যে নিট পরিবর্তন
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,পূরক অফ
 DocType: Quality Inspection Reading,Accepted,গৃহীত
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,"আপনি কি সত্যিই এই কোম্পানির জন্য সব লেনদেন মুছে ফেলতে চান, নিশ্চিত করুন. হিসাবে এটা আপনার মাস্টার ডেটা থাকবে. এই ক্রিয়াটি পূর্বাবস্থায় ফেরানো যাবে না."
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,পেমেন্ট মোট পরিমাণ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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 +204,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
 DocType: Newsletter,Test,পরীক্ষা
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","বিদ্যমান শেয়ার লেনদেন আপনাকে মান পরিবর্তন করতে পারবেন না \ এই আইটেমটি জন্য আছে &#39;সিরিয়াল কোন হয়েছে&#39;, &#39;ব্যাচ করিয়াছেন&#39;, &#39;স্টক আইটেম&#39; এবং &#39;মূল্যনির্ধারণ পদ্ধতি&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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 +157,Please enter Planned Qty for Item {0} at row {1},সারিতে আইটেম {0} জন্য পরিকল্পনা Qty লিখুন দয়া করে {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} দাখিল করা হয় না
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,আইটেম জন্য অনুরোধ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,পৃথক উত্পাদন যাতে প্রতিটি সমাপ্ত ভাল আইটেমের জন্য তৈরি করা হবে.
 DocType: Purchase Invoice,Terms and Conditions1,শর্তাবলী এবং Conditions1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,কঠিন মূল্য
 DocType: Contact,Enter department to which this Contact belongs,এই যোগাযোগ জন্যে যা করার ডিপার্টমেন্ট লিখুন
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,মোট অনুপস্থিত
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,সারি {0} মেলে না উপাদানের জন্য অনুরোধ জন্য আইটেম বা গুদাম
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,সারি {0} মেলে না উপাদানের জন্য অনুরোধ জন্য আইটেম বা গুদাম
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,পরিমাপের একক
 DocType: Fiscal Year,Year End Date,বছর শেষ তারিখ
 DocType: Task Depends On,Task Depends On,কাজের উপর নির্ভর করে
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,চুক্তি শেষ তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,একটি কমিশন জন্য কোম্পানি পণ্য বিক্রি একটি তৃতীয় পক্ষের যারা পরিবেশক / ব্যাপারী / কমিশন এজেন্ট / অধিভুক্ত / রিসেলার.
 DocType: Customer Group,Has Child Node,সন্তানের নোড আছে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} ক্রয় আদেশের বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} ক্রয় আদেশের বিরুদ্ধে {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","এখানে স্ট্যাটিক URL পরামিতি লিখুন (যেমন. প্রেরকের = ERPNext, ব্যবহারকারীর নাম = ERPNext, পাসওয়ার্ড = 1234 ইত্যাদি)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} না কোনো সক্রিয় অর্থবছরে. আরো বিস্তারিত জানার জন্য পরীক্ষা {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,এই একটি উদাহরণ ওয়েবসাইট ERPNext থেকে স্বয়ংক্রিয় উত্পন্ন হয়
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,Recd পরিমাণ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},সেলস আদেশ পরিমাণ বেশী আইটেম {0} সৃষ্টি করতে পারে না {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
 DocType: Payment Reconciliation,Bank / Cash Account,ব্যাংক / নগদ অ্যাকাউন্ট
 DocType: Tax Rule,Billing City,বিলিং সিটি
 DocType: Global Defaults,Hide Currency Symbol,মুদ্রা প্রতীক লুকান
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ইউটিলিটি খরচ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-উপরে
 DocType: Buying Settings,Default Buying Price List,ডিফল্ট ক্রয় মূল্য তালিকা
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.","ইত্যাদি কোম্পানি, মুদ্রা, চলতি অর্থবছরে, মত ডিফল্ট মান"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,শোধের ধরণ
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",দেখুন খোয়াতে বিভাগে &quot;সামগ্রী ভিত্তি করে হার&quot;
 DocType: Appraisal Goal,Key Responsibility Area,কী দায়িত্ব ফোন
 DocType: Item Reorder,Material Request Type,উপাদান অনুরোধ টাইপ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,সারি {0}: UOM রূপান্তর ফ্যাক্টর বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,সারি {0}: UOM রূপান্তর ফ্যাক্টর বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,সুত্র
 DocType: Cost Center,Cost Center,খরচ কেন্দ্র
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ভাউচার #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,সব ঠিকানাগুলি.
 DocType: Company,Stock Settings,স্টক সেটিংস
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","নিম্নলিখিত বৈশিষ্ট্য উভয় রেকর্ডে একই হলে মার্জ শুধুমাত্র সম্ভব. গ্রুপ, root- র ধরন, কোম্পানী"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","নিম্নলিখিত বৈশিষ্ট্য উভয় রেকর্ডে একই হলে মার্জ শুধুমাত্র সম্ভব. গ্রুপ, root- র ধরন, কোম্পানী"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,গ্রাহক গ্রুপ গাছ পরিচালনা.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,নতুন খরচ কেন্দ্রের নাম
 DocType: Leave Control Panel,Leave Control Panel,কন্ট্রোল প্যানেল ছেড়ে চলে
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,পেমেন্ট টুল বিস্তারিত
 ,Sales Browser,সেলস ব্রাউজার
 DocType: Journal Entry,Total Credit,মোট ক্রেডিট
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} শেয়ার এন্ট্রি বিরুদ্ধে বিদ্যমান {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,স্থানীয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} শেয়ার এন্ট্রি বিরুদ্ধে বিদ্যমান {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,ঋণ গ্রহিতা
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,বড়
@@ -2003,7 +2022,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,আপনি সেট এবং নির্দেশকের লক্ষ্যমাত্রা নজর রাখতে পারেন যাতে সব বিক্রয় লেনদেন একাধিক ** বিক্রয় ব্যক্তি ** বিরুদ্ধে ট্যাগ করা যায়.
 ,S.O. No.,তাই নং
 DocType: Production Order Operation,Make Time Log,টাইম ইন করুন
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,পুনর্বিন্যাস পরিমাণ সেট করুন
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,পুনর্বিন্যাস পরিমাণ সেট করুন
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},লিড থেকে গ্রাহক তৈরি করুন {0}
 DocType: Price List,Applicable for Countries,দেশ সমূহ জন্য প্রযোজ্য
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,কম্পিউটার
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,অন্তত একটি আইটেম ফিরে নথিতে নেতিবাচক পরিমাণ সঙ্গে প্রবেশ করা উচিত
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,কোন মন্তব্য
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,কোন মন্তব্য
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,পরিশোধসময়াতীত
 DocType: Account,Stock Received But Not Billed,শেয়ার পেয়েছি কিন্তু বিল না
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root অ্যাকাউন্টের একটি গ্রুপ হতে হবে
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root অ্যাকাউন্টের একটি গ্রুপ হতে হবে
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,গ্রস পে &#39;বকেয়া পরিমাণ + নগদীকরণ পরিমাণ - মোট সিদ্ধান্তগ্রহণ
 DocType: Monthly Distribution,Distribution Name,বন্টন নাম
 DocType: Features Setup,Sales and Purchase,ক্রয় এবং বিক্রয়
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,পার্টি ব্যালেন্স
 DocType: Sales Invoice Item,Time Log Batch,টাইম ইন ব্যাচ
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,ডিসকাউন্ট উপর প্রয়োগ নির্বাচন করুন
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,বেতন স্লিপ তৈরী
 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,প্রস্তুত জন্য উপাদান স্থানান্তর
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,অর্ধ বার্ষিক
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,অর্থবছরের {0} পাওয়া যায়নি.
 DocType: Bank Reconciliation,Get Relevant Entries,প্রাসঙ্গিক এন্ট্রি পেতে
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,স্টক জন্য অ্যাকাউন্টিং এণ্ট্রি
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,স্টক জন্য অ্যাকাউন্টিং এণ্ট্রি
 DocType: Sales Invoice,Sales Team1,সেলস team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
 DocType: Sales Invoice,Customer Address,গ্রাহকের ঠিকানা
 DocType: Purchase Invoice,Apply Additional Discount On,অতিরিক্ত ডিসকাউন্ট উপর প্রয়োগ
 DocType: Account,Root Type,Root- র ধরন
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,পৃষ্ঠার উপরের এই স্লাইডশো প্রদর্শন
 DocType: BOM,Item UOM,আইটেম UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ছাড়ের পরিমাণ পরে ট্যাক্স পরিমাণ (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},উদ্দিষ্ট গুদাম সারিতে জন্য বাধ্যতামূলক {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},উদ্দিষ্ট গুদাম সারিতে জন্য বাধ্যতামূলক {0}
 DocType: Quality Inspection,Quality Inspection,উচ্চমানের তদন্ত
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,অতিরিক্ত ছোট
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,সংস্থার একাত্মতার অ্যাকাউন্টের একটি পৃথক চার্ট সঙ্গে আইনি সত্তা / সাবসিডিয়ারি.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","খাদ্য, পানীয় ও তামাকের"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,পিএল বা বঙ্গাব্দের
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},শুধুমাত্র বিরুদ্ধে পেমেন্ট করতে পারবেন যেতে উদ্ভাবনী উপায় {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},শুধুমাত্র বিরুদ্ধে পেমেন্ট করতে পারবেন যেতে উদ্ভাবনী উপায় {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,কমিশন হার তার চেয়ে অনেক বেশী 100 হতে পারে না
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,নূন্যতম পরিসংখ্যা শ্রেনী
 DocType: Stock Entry,Subcontract,ঠিকা
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,ইনকামিং মান পরিদর্শন.
 DocType: Purchase Order Item,Returned Qty,ফিরে Qty
 DocType: Employee,Exit,প্রস্থান
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root- র ধরন বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root- র ধরন বাধ্যতামূলক
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,{0} নির্মিত সিরিয়াল কোন
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","গ্রাহকদের সুবিধার জন্য, এই কোড চালান এবং বিলি নোট মত মুদ্রণ বিন্যাস ব্যবহার করা যেতে পারে"
 DocType: Employee,You can enter any date manually,আপনি নিজে কোনো তারিখ লিখতে পারেন
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,অবেক্ষাধীন সময়ের
 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 +110,Row {0}: Advance against Customer must be credit,সারি {0}: গ্রাহক বিরুদ্ধে অগ্রিম ক্রেডিট হতে হবে
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,কেনার রসিদ আইটেম সরবরাহ
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,বেতন
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,বেতন
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime করুন
 DocType: SMS Settings,SMS Gateway URL,এসএমএস গেটওয়ে ইউআরএল
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS বিতরণ অবস্থা বজায় রাখার জন্য লগ
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,পুনর্বিন্যাস স্তর
 DocType: Attendance,Attendance Date,এ্যাটেনডেন্স তারিখ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,আদায় এবং সিদ্ধান্তগ্রহণ উপর ভিত্তি করে বেতন ছুটি.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,সন্তানের নোড সঙ্গে অ্যাকাউন্ট লেজার রূপান্তরিত করা যাবে না
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,সন্তানের নোড সঙ্গে অ্যাকাউন্ট লেজার রূপান্তরিত করা যাবে না
 DocType: Address,Preferred Shipping Address,পছন্দের শিপিং ঠিকানা
 DocType: Purchase Receipt Item,Accepted Warehouse,গৃহীত ওয়্যারহাউস
 DocType: Bank Reconciliation Detail,Posting Date,পোস্টিং তারিখ
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,সিরিয়াল কোন {0} অস্তিত্ব নেই
 DocType: Pricing Rule,Discount Percentage,ডিসকাউন্ট শতাংশ
 DocType: Payment Reconciliation Invoice,Invoice Number,চালান নম্বর
-apps/erpnext/erpnext/hooks.py +54,Orders,আদেশ
+apps/erpnext/erpnext/hooks.py +55,Orders,আদেশ
 DocType: Leave Control Panel,Employee Type,কর্মচারী ধরন
 DocType: Employee Leave Approver,Leave Approver,রাজসাক্ষী ত্যাগ
 DocType: Manufacturing Settings,Material Transferred for Manufacture,উপাদান প্রস্তুত জন্য বদলিকৃত
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,উপকরণ% এই বিক্রয় আদেশের বিরুদ্ধে বিল
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,সময়কাল সমাপন ভুক্তি
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,বিদ্যমান লেনদেন সঙ্গে খরচ কেন্দ্র গ্রুপ রূপান্তরিত করা যাবে না
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,অবচয়
+DocType: Account,Depreciation,অবচয়
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),সরবরাহকারী (গুলি)
 DocType: Customer,Credit Limit,ক্রেডিট সীমা
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,লেনদেনের ধরন নির্বাচন করুন
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,জন্য অনুরোধ করা
 DocType: Quotation Item,Against Doctype,Doctype বিরুদ্ধে
 DocType: Delivery Note,Track this Delivery Note against any Project,কোন প্রকল্পের বিরুদ্ধে এই হুণ্ডি সন্ধান
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root অ্যাকাউন্টের মোছা যাবে না
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,বিনিয়োগ থেকে নিট ক্যাশ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root অ্যাকাউন্টের মোছা যাবে না
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,দেখান স্টক সাজপোশাকটি
 ,Is Primary Address,প্রাথমিক ঠিকানা
 DocType: Production Order,Work-in-Progress Warehouse,কাজ-অগ্রগতি ওয়্যারহাউস
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},রেফারেন্স # {0} তারিখের {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},রেফারেন্স # {0} তারিখের {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,ঠিকানা ও পরিচালনা
 DocType: Pricing Rule,Item Code,পণ্য সংকেত
 DocType: Production Planning Tool,Create Production Orders,উত্পাদনের আদেশ করুন
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,ব্যবহারকারী মন্তব্য
 DocType: Lead,Market Segment,মার্কেটের অংশ
 DocType: Employee Internal Work History,Employee Internal Work History,কর্মচারী অভ্যন্তরীণ কাজের ইতিহাস
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),বন্ধ (ড)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),বন্ধ (ড)
 DocType: Contact,Passive,নিষ্ক্রিয়
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,না মজুত সিরিয়াল কোন {0}
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,লেনদেন বিক্রি জন্য ট্যাক্স টেমপ্লেট.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,বিলের পরিমাণ
 DocType: Bank Reconciliation,Bank Reconciliation,ব্যাংক পুনর্মিলন
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,আপডেট পান
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,উপাদানের জন্য অনুরোধ {0} বাতিল বা বন্ধ করা হয়
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,উপাদানের জন্য অনুরোধ {0} বাতিল বা বন্ধ করা হয়
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,কয়েকটি নমুনা রেকর্ড যোগ
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ম্যানেজমেন্ট ত্যাগ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,অ্যাকাউন্ট দ্বারা গ্রুপ
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","লাভ / ক্ষতি হবে বুক দায় অধীনে অ্যাকাউন্ট মাথা,"
 DocType: Payment Tool,Against Vouchers,ভাউচার বিরুদ্ধে
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,দ্রুত সাহায্য
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},সোর্স ও টার্গেট গুদাম সারির এক হতে পারে না {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},সোর্স ও টার্গেট গুদাম সারির এক হতে পারে না {0}
 DocType: Features Setup,Sales Extras,সেলস অতিরিক্ত
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{2} খরচ কেন্দ্র বিরুদ্ধে একাউন্ট {1} জন্য {0} বাজেট অতিক্রম করবে {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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','তারিখ থেকে' অবশ্যই 'তারিখ পর্যন্ত' এর পরে হতে হবে
 ,Stock Projected Qty,স্টক Qty অনুমিত
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
 DocType: Sales Order,Customer's Purchase Order,গ্রাহকের ক্রয় আদেশ
 DocType: Warranty Claim,From Company,কোম্পানীর কাছ থেকে
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,মূল্য বা স্টক
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,ব্লক তালিকা প্রেজেন্টেশন ত্যাগ
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,আপনাকে অবশ্যই লগইন করতে এটি ব্যবহার করা হবে
 DocType: Sales Partner,Retailer,খুচরা বিক্রেতা
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,একাউন্টে ক্রেডিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,একাউন্টে ক্রেডিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,সমস্ত সরবরাহকারী প্রকারভেদ
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"আইটেম স্বয়ংক্রিয়ভাবে গণনা করা হয়, কারণ আইটেমটি কোড বাধ্যতামূলক"
+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 +93,Quotation {0} not of type {1},উদ্ধৃতি {0} না টাইপ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,রক্ষণাবেক্ষণ সময়সূচী আইটেমটি
 DocType: Sales Order,%  Delivered,% বিতরণ করা হয়েছে
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),প্যাকেজের গ্রস ওজন. সাধারণত নেট ওজন + প্যাকেজিং উপাদান ওজন. (প্রিন্ট জন্য)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,এই ব্যবহারকারীরা হিমায়িত অ্যাকাউন্ট বিরুদ্ধে হিসাব থেকে হিমায়িত অ্যাকাউন্ট সেট এবং তৈরি / পরিবর্তন করার অনুমতি দেওয়া হয়
 DocType: Serial No,Is Cancelled,বাতিল করা হয়
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,আমার চালানে
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,আমার চালানে
 DocType: Journal Entry,Bill Date,বিল তারিখ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","সর্বোচ্চ অগ্রাধিকার দিয়ে একাধিক প্রাইসিং নিয়ম আছে, এমনকি যদি তারপর নিচের অভ্যন্তরীণ অগ্রাধিকার প্রয়োগ করা হয়:"
 DocType: Supplier,Supplier Details,সরবরাহকারী
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,কল
 DocType: Project,Total Costing Amount (via Time Logs),মোট খোয়াতে পরিমাণ (সময় লগসমূহ মাধ্যমে)
 DocType: Purchase Order Item Supplied,Stock UOM,শেয়ার UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,অর্ডার {0} দাখিল করা হয় না ক্রয়
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,অর্ডার {0} দাখিল করা হয় না ক্রয়
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,অভিক্ষিপ্ত
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},সিরিয়াল কোন {0} ওয়্যারহাউস অন্তর্গত নয় {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,উল্লেখ্য: {0} পরিমাণ বা পরিমাণ 0 হিসাবে বিতরণ-বহুবার-বুকিং আইটেম জন্য সিস্টেম পরীক্ষা করা হবে না
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,খোলার তারিখ
 DocType: Journal Entry,Remark,মন্তব্য
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,বিলিং জন্য শ্রেণীবদ্ধ
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,প্রস্তাব উত্থাপিত বিল.
 DocType: POS Profile,Write Off Account,অ্যাকাউন্ট বন্ধ লিখতে
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,হ্রাসকৃত মুল্য
 DocType: Purchase Invoice,Return Against Purchase Invoice,বিরুদ্ধে ক্রয় চালান আসতে
 DocType: Item,Warranty Period (in days),(দিন) ওয়্যারেন্টি সময়কাল
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,অপারেশন থেকে নিট ক্যাশ
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,যেমন ভ্যাট
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,আইটেম 4
 DocType: Journal Entry Account,Journal Entry Account,জার্নাল এন্ট্রি অ্যাকাউন্ট
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,অবসর তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 DocType: Sales Invoice,Against Income Account,আয় অ্যাকাউন্টের বিরুদ্ধে
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% বিতরণ করা হয়েছে
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,মাসিক বন্টন শতকরা
 DocType: Territory,Territory Targets,টেরিটরি লক্ষ্যমাত্রা
 DocType: Delivery Note,Transporter Info,স্থানান্তরকারী তথ্য
@@ -2421,10 +2443,10 @@
 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 +14,This is a root sales person and cannot be edited.,এটি একটি root বিক্রয় ব্যক্তি এবং সম্পাদনা করা যাবে না.
 ,Stock Ledger,স্টক লেজার
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},রেট: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},রেট: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,বেতন স্লিপ সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,প্রথমে একটি গ্রুপ নোড নির্বাচন.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},"উদ্দেশ্য, এক হতে হবে {0}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},"উদ্দেশ্য, এক হতে হবে {0}"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,ফর্ম পূরণ করুন এবং এটি সংরক্ষণ
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,তাদের সর্বশেষ জায় অবস্থা সব কাঁচামাল সম্বলিত একটি প্রতিবেদন ডাউনলোড
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,কমিউনিটি ফোরাম
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,কোম্পানি (না গ্রাহক বা সরবরাহকারীর) মাস্টার.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',&#39;প্রত্যাশিত প্রসবের তারিখ&#39; দয়া করে প্রবেশ করুন
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,প্রসবের নোট {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,প্রদত্ত পরিমাণ পরিমাণ সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না বন্ধ লিখুন + +
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},উল্লেখ্য: ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","উল্লেখ্য: পেমেন্ট কোনো রেফারেন্স বিরুদ্ধে প্রণীত না হয়, তাহলে নিজে জার্নাল এন্ট্রি করতে."
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' নিষ্ক্রিয়
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ওপেন হিসাবে সেট করুন
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,জমা লেনদেনের পরিচিতিতে স্বয়ংক্রিয় ইমেল পাঠান.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","সারি {0}: স্টক গুদাম আসা না {1} উপর {2} {3}. প্রাপ্তিসাধ্য Qty: {4}, qty স্থানান্তর: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,আইটেম 3
 DocType: Purchase Order,Customer Contact Email,গ্রাহক যোগাযোগ ইমেইল
 DocType: Sales Team,Contribution (%),অবদান (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,উল্লেখ্য: পেমেন্ট ভুক্তি থেকে তৈরি করা হবে না &#39;ক্যাশ বা ব্যাংক একাউন্ট&#39; উল্লেখ করা হয়নি
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,উল্লেখ্য: পেমেন্ট ভুক্তি থেকে তৈরি করা হবে না &#39;ক্যাশ বা ব্যাংক একাউন্ট&#39; উল্লেখ করা হয়নি
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,দায়িত্ব
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,টেমপ্লেট
 DocType: Sales Person,Sales Person Name,সেলস পারসন নাম
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,পুনর্মিলন আগে
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,আইটেমটি ট্যাক্স সারি {0} টাইপ ট্যাক্স বা আয় বা ব্যয় বা প্রদেয় এর একাউন্ট থাকতে হবে
 DocType: Sales Order,Partly Billed,আংশিক দেখানো হয়েছিল
 DocType: Item,Default BOM,ডিফল্ট BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,পুনরায় টাইপ কোম্পানি নাম নিশ্চিত অনুগ্রহ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,মোট বিশিষ্ট মাসিক
 DocType: Time Log Batch,Total Hours,মোট ঘণ্টা
 DocType: Journal Entry,Printing Settings,মুদ্রণ সেটিংস
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},মোট ডেবিট মোট ক্রেডিট সমান হতে হবে. পার্থক্য হল {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},মোট ডেবিট মোট ক্রেডিট সমান হতে হবে. পার্থক্য হল {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,স্বয়ংচালিত
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ডেলিভারি নোট থেকে
 DocType: Time Log,From Time,সময় থেকে
 DocType: Notification Control,Custom Message,নিজস্ব বার্তা
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,বিনিয়োগ ব্যাংকিং
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,ক্যাশ বা ব্যাংক একাউন্ট পেমেন্ট এন্ট্রি করার জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,ক্যাশ বা ব্যাংক একাউন্ট পেমেন্ট এন্ট্রি করার জন্য বাধ্যতামূলক
 DocType: Purchase Invoice,Price List Exchange Rate,মূল্য তালিকা বিনিময় হার
 DocType: Purchase Invoice Item,Rate,হার
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,অন্তরীণ করা
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","একাধিক মূল্য রুল একই মানদণ্ডের সঙ্গে বিদ্যমান, অগ্রাধিকার বরাদ্দ দ্বারা \ দ্বন্দ্ব সমাধান করুন. দাম বিধি: {0}"
 DocType: Account,Bank,ব্যাংক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,বিমানসংস্থা
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,ইস্যু উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,ইস্যু উপাদান
 DocType: Material Request Item,For Warehouse,গুদাম জন্য
 DocType: Employee,Offer Date,অপরাধ তারিখ
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,উদ্ধৃতি
 DocType: Hub Settings,Access Token,অ্যাক্সেস টোকেন
 DocType: Sales Invoice Item,Serial No,ক্রমিক নং
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,প্রথম Maintaince বিবরণ লিখুন দয়া করে
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,কার্যদিবসের তুলনায় আরো ছুটির এই মাস আছে.
 DocType: Product Bundle Item,Product Bundle Item,পণ্য সমষ্টি আইটেম
 DocType: Sales Partner,Sales Partner Name,বিক্রয় অংশীদার নাম
+DocType: Payment Reconciliation,Maximum Invoice Amount,সর্বাধিক চালান পরিমাণ
 DocType: Purchase Invoice Item,Image View,চিত্র দেখুন
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,মূল্যনির্ধারণ এবং মোট
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"এই আইটেম {0} (টেমপ্লেট) একটি বৈকল্পিক. &#39;কোন কপি করো&#39; সেট করা হয়, যদি না আরোপ টেমপ্লেট থেকে কপি করা হবে"
 DocType: Account,Purchase User,ক্রয় ব্যবহারকারী
 DocType: Notification Control,Customize the Notification,বিজ্ঞপ্তি কাস্টমাইজ করুন
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,অপারেশন থেকে নগদ প্রবাহ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,ডিফল্ট ঠিকানা টেমপ্লেট মোছা যাবে না
 DocType: Sales Invoice,Shipping Rule,শিপিং রুল
 DocType: Journal Entry,Print Heading,প্রিন্ট শীর্ষক
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,কাঁচামাল
 DocType: Leave Application,Follow via Email,ইমেইলের মাধ্যমে অনুসরণ করুন
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ছাড়ের পরিমাণ পরে ট্যাক্স পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,শিশু অ্যাকাউন্ট এই অ্যাকাউন্টের জন্য বিদ্যমান. আপনি এই অ্যাকাউন্ট মুছে ফেলতে পারবেন না.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,প্রথম পোস্টিং তারিখ নির্বাচন করুন
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},ধারাবাহিকভাবে আইটেম জন্য সিরিয়াল আমরা প্রয়োজনীয় {0}
 DocType: Journal Entry,Bank Entry,ব্যাংক এণ্ট্রি
 DocType: Authorization Rule,Applicable To (Designation),প্রযোজ্য (পদবী)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,কার্ট যোগ করুন
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,গ্রুপ দ্বারা
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ নিষ্ক্রিয় মুদ্রা সক্রিয় করুন.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ঠিকানা খরচ
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,বিনোদন ও অবকাশ
 DocType: Purchase Order,The date on which recurring order will be stop,আবর্তক অর্ডার বন্ধ করা হবে কোন তারিখে
 DocType: Quality Inspection,Item Serial No,আইটেম সিরিয়াল কোন
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} অথবা আপনি বৃদ্ধি করা উচিত ওভারফ্লো সহনশীলতা হ্রাস করা হবে
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} অথবা আপনি বৃদ্ধি করা উচিত ওভারফ্লো সহনশীলতা হ্রাস করা হবে
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,মোট বর্তমান
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,ঘন্টা
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",ধারাবাহিকভাবে আইটেম {0} শেয়ার রিকনসিলিয়েশন ব্যবহার \ আপডেট করা যাবে না
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,সরবরাহকারী উপাদান স্থানান্তর
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,সরবরাহকারী উপাদান স্থানান্তর
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,উদ্ধৃতি তৈরি
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,আপনি ব্লক তারিখগুলি উপর পাতার অনুমোদন যথাযথ অনুমতি নেই
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,এই সব জিনিস ইতিমধ্যে invoiced হয়েছে
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,এই সব জিনিস ইতিমধ্যে invoiced হয়েছে
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},দ্বারা অনুমোদিত হতে পারে {0}
 DocType: Shipping Rule,Shipping Rule Conditions,শিপিং রুল শর্তাবলী
 DocType: BOM Replace Tool,The new BOM after replacement,প্রতিস্থাপন পরে নতুন BOM
 DocType: Features Setup,Point of Sale,বিক্রয় বিন্দু
 DocType: Account,Tax,কর
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},সারি {0}: {1} একটি বৈধ নয় {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,পণ্য বান্ডিল থেকে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,পণ্য বান্ডিল থেকে
 DocType: Production Planning Tool,Production Planning Tool,উৎপাদন পরিকল্পনা টুল
 DocType: Quality Inspection,Report Date,প্রতিবেদন তারিখ
 DocType: C-Form,Invoices,চালান
 DocType: Job Opening,Job Title,কাজের শিরোনাম
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} প্রাপক
 DocType: Features Setup,Item Groups in Details,বিবরণ আইটেম গ্রুপ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,প্রস্তুত পরিমাণ 0 থেকে বড় হওয়া উচিত.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),স্টার্ট পয়েন্ট অফ বিক্রয় (পিওএস)
@@ -2618,8 +2644,9 @@
 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: Pricing Rule,Customer Group,গ্রাহক গ্রুপ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},ব্যয় অ্যাকাউন্ট আইটেমের জন্য বাধ্যতামূলক {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},ব্যয় অ্যাকাউন্ট আইটেমের জন্য বাধ্যতামূলক {0}
 DocType: Item,Website Description,ওয়েবসাইট বর্ণনা
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ইক্যুইটি মধ্যে নিট পরিবর্তন
 DocType: Serial No,AMC Expiry Date,এএমসি মেয়াদ শেষ হওয়ার তারিখ
 ,Sales Register,সেলস নিবন্ধন
 DocType: Quotation,Quotation Lost Reason,উদ্ধৃতি লস্ট কারণ
@@ -2627,12 +2654,12 @@
 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 +108,Summary for this month and pending activities,এই মাস এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
 DocType: Customer Group,Customer Group Name,গ্রাহক গ্রুপ নাম
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,আরোপ করা
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,জানানোর পান
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,জানানোর পান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,শেষ আদেশ তারিখ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,আবগারি চালান করুন
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},অ্যাকাউন্ট {0} আছে কোম্পানীর জন্যে না {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,প্রকল্প-ভিত্তিক তথ্য উদ্ধৃতি জন্য উপলব্ধ নয়
 DocType: Project,Expected End Date,সমাপ্তি প্রত্যাশিত তারিখ
 DocType: Appraisal Template,Appraisal Template Title,মূল্যায়ন টেমপ্লেট শিরোনাম
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,ব্যবসায়িক
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,ব্যবসায়িক
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,মূল আইটেমটি {0} একটি স্টক আইটেম হবে না
 DocType: Cost Center,Distribution Id,বন্টন আইডি
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,জট্টিল সেবা
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} অ্যাট্রিবিউট জন্য মূল্য পরিসীমা মধ্যে হতে হবে {1} করার {2} এর মধ্যে বাড়তি {3}
 DocType: Tax Rule,Sales,সেলস
 DocType: Stock Entry Detail,Basic Amount,বেসিক পরিমাণ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
 DocType: Leave Allocation,Unused leaves,অব্যবহৃত পাতার
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
 DocType: Customer,Default Receivable Accounts,গ্রহনযোগ্য অ্যাকাউন্ট ডিফল্ট
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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,যোগাযোগ এইচটিএমএল
 DocType: Landed Cost Voucher,Purchase Receipts,ক্রয় রসিদের
-DocType: Payment Reconciliation,Maximum Amount,সর্বোচ্চ পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,কিভাবে প্রাইসিং নিয়ম প্রয়োগ করা হয়?
 DocType: Quality Inspection,Delivery Note No,হুণ্ডি কোন
 DocType: Company,Retail,খুচরা
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,গ্রাহক {0} অস্তিত্ব নেই
 DocType: Attendance,Absent,অনুপস্থিত
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,পণ্য সমষ্টি
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},সারি {0}: অবৈধ উল্লেখ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,পণ্য সমষ্টি
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},সারি {0}: অবৈধ উল্লেখ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,কর ও শুল্ক টেমপ্লেট ক্রয়
 DocType: Upload Attendance,Download Template,ডাউনলোড টেমপ্লেট
 DocType: GL Entry,Remarks,মন্তব্য
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,মাসিক উপস্থিতি পত্রক
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,পাওয়া কোন রেকর্ড
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: খরচ কেন্দ্র আইটেম জন্য বাধ্যতামূলক {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,অ্যাকাউন্ট {0} নিষ্ক্রীয়
 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,জন্ম তারিখ এবং উপস্থিত এ্যাটেনডেন্স বাধ্যতামূলক
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,এন্ট্রি খোলা অনুমোদিত নয় &#39;লাভ ও ক্ষতি&#39; টাইপ অ্যাকাউন্ট {0}
 DocType: Features Setup,Sales Discounts,সেলস রহমান
 DocType: Hub Settings,Seller Country,বিক্রেতা দেশ
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,ওয়েবসাইটে আইটেম প্রকাশ
 DocType: Authorization Rule,Authorization Rule,অনুমোদন রুল
 DocType: Sales Invoice,Terms and Conditions Details,শর্তাবলী বিস্তারিত
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,বিশেষ উল্লেখ
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,বিক্রয় করের এবং চার্জ টেমপ্লেট
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,পোশাক ও আনুষাঙ্গিক
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,অর্ডার সংখ্যা
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,বিলিং পরিমাণ
 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 +18,Applications for leave.,ছুটি জন্য অ্যাপ্লিকেশন.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট মুছে ফেলা যাবে না
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট মুছে ফেলা যাবে না
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,আইনি খরচ
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","অটো ক্রম 05, 28 ইত্যাদি যেমন তৈরি করা হবে যা মাসের দিন"
 DocType: Sales Invoice,Posting Time,পোস্টিং সময়
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,ভাঙ্গন
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,অ্যাকাউন্ট: {0} একক সঙ্গে: {1} নির্বাচন করা যাবে না
 DocType: Bank Reconciliation Detail,Cheque Date,চেক তারিখ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} কোম্পানি অন্তর্গত নয়: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} কোম্পানি অন্তর্গত নয়: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,সফলভাবে এই কোম্পানীর সাথে সম্পর্কিত সব লেনদেন মোছা!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,আজকের তারিখে
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,পরীক্ষাকাল
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,ডিফল্ট গুদাম স্টক আইটেম জন্য বাধ্যতামূলক.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,ডিফল্ট গুদাম স্টক আইটেম জন্য বাধ্যতামূলক.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},মাসের জন্য বেতন পরিশোধ {0} এবং বছরের {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,অটো সন্নিবেশ মূল্য তালিকা হার অনুপস্থিত যদি
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,মোট প্রদত্ত পরিমাণ
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),মোট বিলিং পরিমাণ (সময় লগসমূহ মাধ্যমে)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,আমরা এই আইটেম বিক্রয়
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,সরবরাহকারী আইডি
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,পরিমাণ 0 তুলনায় বড় হওয়া উচিত
 DocType: Journal Entry,Cash Entry,ক্যাশ এণ্ট্রি
 DocType: Sales Partner,Contact Desc,যোগাযোগ নিম্নক্রমে
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","নৈমিত্তিক মত পাতা ধরণ, অসুস্থ ইত্যাদি"
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,হিসাব বার্ষিক বাজেটের সেট সারি করো.
 DocType: Buying Settings,Default Supplier Type,ডিফল্ট সরবরাহকারী ধরন
 DocType: Production Order,Total Operating Cost,মোট অপারেটিং খরচ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,উল্লেখ্য: আইটেম {0} একাধিক বার প্রবেশ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,উল্লেখ্য: আইটেম {0} একাধিক বার প্রবেশ
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,সকল যোগাযোগ.
 DocType: Newsletter,Test Email Id,টেস্ট ইমেইল আইডি
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,কোম্পানি সমাহার
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,সকল গ্রাহকের গ্রুপ
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,ট্যাক্স টেমপ্লেট বাধ্যতামূলক.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} অস্তিত্ব নেই
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} অস্তিত্ব নেই
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),মূল্যতালিকা হার (কোম্পানি একক)
 DocType: Account,Temporary,অস্থায়ী
 DocType: Address,Preferred Billing Address,পছন্দের বিলিং ঠিকানা
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,আইটেম-জ্ঞানী মূল্য তালিকা হার
 DocType: Purchase Order Item,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
 DocType: Quotation,In Words will be visible once you save the Quotation.,আপনি উধৃতি সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} থামানো হয়
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} থামানো হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
 DocType: Lead,Add to calendar on this date,এই তারিখে ক্যালেন্ডারে যোগ
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,শিপিং খরচ যোগ করার জন্য বিধি.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,আসন্ন ঘটনাবলী
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,লিড
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,আদেশ উৎপাদনের জন্য মুক্তি.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ফিস্ক্যাল বছর নির্বাচন ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
 DocType: Hub Settings,Name Token,নাম টোকেন
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,স্ট্যান্ডার্ড বিক্রি
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,অন্তত একটি গুদাম বাধ্যতামূলক
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,প্রতিস্থাপন করা
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিরুদ্ধে {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,মেজার ডিফল্ট ইউনিট লিখুন দয়া করে
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিরুদ্ধে {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,মেজার ডিফল্ট ইউনিট লিখুন দয়া করে
 DocType: Purchase Invoice Item,Project Name,প্রকল্পের নাম
 DocType: Supplier,Mention if non-standard receivable account,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য তাহলে
 DocType: Journal Entry Account,If Income or Expense,আয় বা ব্যয় যদি
 DocType: Features Setup,Item Batch Nos,আইটেম ব্যাচ আমরা
 DocType: Stock Ledger Entry,Stock Value Difference,শেয়ার মূল্য পার্থক্য
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,মানব সম্পদ
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,মানব সম্পদ
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,পেমেন্ট পুনর্মিলন পরিশোধের
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,ট্যাক্স সম্পদ
 DocType: BOM Item,BOM No,BOM কোন
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,জার্নাল এন্ট্রি {0} {1} বা ইতিমধ্যে অন্যান্য ভাউচার বিরুদ্ধে মিলেছে অ্যাকাউন্ট নেই
 DocType: Item,Moving Average,চলন্ত গড়
 DocType: BOM Replace Tool,The BOM which will be replaced,"প্রতিস্থাপন করা হবে, যা BOM"
 DocType: Account,Debit,ডেবিট
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,অতিরিক্ত খরচ
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,আর্থিক বছরের শেষ তারিখ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","ভাউচার কোন উপর ভিত্তি করে ফিল্টার করতে পারবে না, ভাউচার দ্বারা গ্রুপকৃত যদি"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
 DocType: Quality Inspection,Incoming,ইনকামিং
 DocType: BOM,Materials Required (Exploded),উপকরণ (অপ্রমাণিত) প্রয়োজন
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),বিনা বেতনে ছুটি জন্য আদায় হ্রাস (LWP)
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},সারি # {0}: সিরিয়াল কোন {1} সঙ্গে মেলে না {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,নৈমিত্তিক ছুটি
 DocType: Batch,Batch ID,ব্যাচ আইডি
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},উল্লেখ্য: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},উল্লেখ্য: {0}
 ,Delivery Note Trends,হুণ্ডি প্রবণতা
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,এই সপ্তাহের সংক্ষিপ্ত
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} সারিতে একটি ক্রয় বা উপ-সংকুচিত আইটেম হতে হবে {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,গড়. রাজধানীতে হার
 DocType: Task,Actual Time (in Hours),(ঘন্টায়) প্রকৃত সময়
 DocType: Employee,History In Company,কোম্পানি ইন ইতিহাস
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,নিউজ লেটার
 DocType: Address,Shipping,পরিবহন
 DocType: Stock Ledger Entry,Stock Ledger Entry,স্টক লেজার এণ্ট্রি
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,বর্তমান অর্ডারের সময়ের শেষ তারিখ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,অফার লেটার করুন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,প্রত্যাবর্তন
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট টেমপ্লেট হিসাবে একই হতে হবে
 DocType: Production Order Operation,Production Order Operation,উৎপাদন অর্ডার অপারেশন
 DocType: Pricing Rule,Disable,অক্ষম
 DocType: Project Task,Pending Review,মুলতুবি পর্যালোচনা
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,কাস্টমার আইডি
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,সময় সময় থেকে তার চেয়ে অনেক বেশী করা আবশ্যক
 DocType: Journal Entry Account,Exchange Rate,বিনিময় হার
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},ওয়ারহাউস {0}: মূল অ্যাকাউন্ট {1} কোম্পানী bolong না {2}
 DocType: BOM,Last Purchase Rate,শেষ কেনার হার
 DocType: Account,Asset,সম্পদ
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,প্যাকিং আইটেম জন্য উপলব্ধ স্টক
 DocType: Item Variant,Item Variant,আইটেম ভেরিয়েন্ট
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,অন্য কোন ডিফল্ট আছে হিসাবে ডিফল্ট হিসেবে এই ঠিকানায় টেমপ্লেট সেটিং
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ইতিমধ্যে ডেবিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ক্রেডিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,গুনমান ব্যবস্থাপনা
 DocType: Production Planning Tool,Filter based on customer,ফিল্টার গ্রাহক উপর ভিত্তি করে
 DocType: Payment Tool Detail,Against Voucher No,ভাউচার কোন বিরুদ্ধে
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,পরবর্তী যোগাযোগ
 DocType: Employee,Employment Type,কর্মসংস্থান প্রকার
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,নির্দিষ্ট পরিমান সম্পত্তি
+,Cash Flow,নগদ প্রবাহ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,আবেদনের সময় দুই alocation রেকর্ড জুড়ে হতে পারে না
 DocType: Item Group,Default Expense Account,ডিফল্ট ব্যায়ের অ্যাকাউন্ট
 DocType: Employee,Notice (days),নোটিশ (দিন)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,ওয়ারহাউস
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,প্রিন্ট ও নিশ্চল
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,গ্রুপ নোড
-DocType: Payment Reconciliation,Minimum Amount,ন্যূনতম পরিমাণ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,আপডেট সমাপ্ত পণ্য
 DocType: Workstation,per hour,প্রতি ঘণ্টা
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,গুদাম (চিরস্থায়ী পরিসংখ্যা) জন্য অ্যাকাউন্ট এই অ্যাকাউন্টের অধীনে তৈরি করা হবে.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,শেয়ার খতিয়ান এন্ট্রি এই গুদাম জন্য বিদ্যমান হিসাবে ওয়্যারহাউস মোছা যাবে না.
 DocType: Company,Distribution,বিতরণ
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,পরিমাণ অর্থ প্রদান করা
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,পরিমাণ অর্থ প্রদান করা
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,প্রকল্প ব্যবস্থাপক
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,প্রাণবধ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,আইটেম জন্য অনুমোদিত সর্বোচ্চ ছাড়: {0} {1}% হল
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,সাপোর্ট Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},কোম্পানি গুদাম অনুপস্থিত {0}
 DocType: POS Profile,Terms and Conditions,শর্তাবলী
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},তারিখ রাজস্ব বছরের মধ্যে হতে হবে. = জন্ম Assuming {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},তারিখ রাজস্ব বছরের মধ্যে হতে হবে. = জন্ম Assuming {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","এখানে আপনি ইত্যাদি উচ্চতা, ওজন, এলার্জি, ঔষধ উদ্বেগ স্থাপন করতে পারে"
 DocType: Leave Block List,Applies to Company,প্রতিষ্ঠানের ক্ষেত্রে প্রযোজ্য
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,জমা স্টক এণ্ট্রি {0} থাকার কারণে বাতিল করতে পারেন না
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,ক্রয় রসিদ লিখুন দয়া করে
 DocType: Sales Invoice,Get Advances Received,উন্নতির গৃহীত করুন
 DocType: Email Digest,Add/Remove Recipients,প্রাপক Add / Remove
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},লেনদেন বন্ধ উত্পাদনের বিরুদ্ধে অনুমতি না করার {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),সমর্থন ইমেল আইডি জন্য সেটআপ ইনকামিং সার্ভার. (যেমন support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ঘাটতি Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 DocType: Salary Slip,Salary Slip,বেতন পিছলানো
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.","প্যাকেজ বিতরণ করা জন্য স্লিপ বোঁচকা নির্মাণ করা হয়. বাক্স সংখ্যা, প্যাকেজের বিষয়বস্তু এবং তার ওজন অবহিত করা."
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,কর্মচারী রেকর্ড.
 DocType: HR Settings,Payroll Settings,বেতনের সেটিংস
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,অ লিঙ্ক চালান এবং পেমেন্টস্ মেলে.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,প্লেস আদেশ
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,প্লেস আদেশ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root- র একটি ঊর্ধ্বতন খরচ কেন্দ্র থাকতে পারে না
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,নির্বাচন ব্র্যান্ড ...
 DocType: Sales Invoice,C-Form Applicable,সি-ফরম প্রযোজ্য
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,শুরুর তারিখ
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,একটি নির্দিষ্ট সময়ের জন্য পাতার বরাদ্দ.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,যাচাই করার জন্য এখানে ক্লিক করুন
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,অ্যাকাউন্ট {0}: আপনি অভিভাবক অ্যাকাউন্ট হিসাবে নিজেকে ধার্য করতে পারবেন না
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,অ্যাকাউন্ট {0}: আপনি অভিভাবক অ্যাকাউন্ট হিসাবে নিজেকে ধার্য করতে পারবেন না
 DocType: Purchase Invoice Item,Price List Rate,মূল্যতালিকা হার
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",&quot;শেয়ার&quot; অথবা এই গুদাম পাওয়া স্টক উপর ভিত্তি করে &quot;না স্টক&quot; প্রদর্শন করা হবে.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),উপকরণ বিল (BOM)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,প্রত্যাশিত স্টার্ট তারিখ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,চার্জ যে আইটেমটি জন্য প্রযোজ্য নয় যদি আইটেমটি মুছে ফেলুন
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,যেমন. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,গ্রহণ করা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,গ্রহণ করা
 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: Employee Leave Approver,Employee Leave Approver,কর্মী ছুটি রাজসাক্ষী
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} সফলভাবে আমাদের নিউজলেটার তালিকায় যুক্ত হয়েছে.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","উদ্ধৃতি দেয়া হয়েছে, কারণ যত হারিয়ে ডিক্লেয়ার করতে পারেন না."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ক্রয় মাস্টার ম্যানেজার
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,অর্ডার {0} দাখিল করতে হবে উৎপাদন
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,অর্ডার {0} দাখিল করতে হবে উৎপাদন
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},আইটেম জন্য আরম্ভের তারিখ ও শেষ তারিখ নির্বাচন করুন {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,প্রধান প্রতিবেদন
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,তারিখ থেকে তারিখের আগে হতে পারে না
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,শিল্প শ্রেণী
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,কিছু ভুল হয়েছে!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,সতর্কতা: ছুটি আবেদন নিম্নলিখিত ব্লক তারিখ রয়েছে
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,চালান {0} ইতিমধ্যেই জমা দেওয়া হয়েছে বিক্রয়
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,চালান {0} ইতিমধ্যেই জমা দেওয়া হয়েছে বিক্রয়
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,সমাপ্তির তারিখ
 DocType: Purchase Invoice Item,Amount (Company Currency),পরিমাণ (কোম্পানি একক)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,সংগঠনের ইউনিটের (ডিপার্টমেন্ট) মাস্টার.
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,সিরিয়াল কোন সার্ভিস চুক্তি মেয়াদ উত্তীর্ন
 DocType: Item,Unit of Measure Conversion,পরিমাপ রূপান্তর ইউনিট
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,কর্মচারী পরিবর্তন করা যাবে না
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,আপনি ক্রেডিট এবং একই সময়ে একই অ্যাকাউন্ট ডেবিট পারবেন না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,আপনি ক্রেডিট এবং একই সময়ে একই অ্যাকাউন্ট ডেবিট পারবেন না
 DocType: Naming Series,Help HTML,হেল্প এইচটিএমএল
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},100% হওয়া উচিত নির্ধারিত মোট গুরুত্ব. এটা হল {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}
 DocType: Address,Name of person or organization that this address belongs to.,এই অঙ্ক জন্যে যে ব্যক্তি বা প্রতিষ্ঠানের নাম.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,আপনার সরবরাহকারীদের
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,বিক্রয় আদেশ তৈরি করা হয় যেমন বিচ্ছিন্ন সেট করা যায় না.
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,প্রদান এর তারিখ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: {0} থেকে {1} এর জন্য
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},সারি # {0}: আইটেমের জন্য সেট সরবরাহকারী {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,আইটেম {1} সংযুক্ত ওয়েবসাইট চিত্র {0} পাওয়া যাবে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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.,ওয়েবসাইটে একাধিক গ্রুপ এই আইটেম তালিকা.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,অন্যান্য মুদ্রা হিসাব অনুমতি মাল্টি মুদ্রা বিকল্প চেক করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,অন্যান্য মুদ্রা হিসাব অনুমতি মাল্টি মুদ্রা বিকল্প চেক করুন
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,আইটেম: {0} সিস্টেমের মধ্যে উপস্থিত না
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,আপনি হিমায়িত মূল্য নির্ধারণ করার জন্য অনুমতিপ্রাপ্ত নন
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,আপনি হিমায়িত মূল্য নির্ধারণ করার জন্য অনুমতিপ্রাপ্ত নন
 DocType: Payment Reconciliation,Get Unreconciled Entries,অসমর্পিত এন্ট্রি পেতে
+DocType: Payment Reconciliation,From Invoice Date,চালান তারিখ থেকে
 DocType: Cost Center,Budgets,বাজেট
-DocType: Employee,Emergency Contact Details,জরুরী যোগাযোগের তথ্য
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,এটার কাজ কি?
 DocType: Delivery Note,To Warehouse,গুদাম থেকে
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},অ্যাকাউন্ট {0} অর্থবছরের জন্য একবারের বেশি প্রবেশ করা হয়েছে {1}
 ,Average Commission Rate,গড় কমিশন হার
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,'সিরিয়াল নং আছে' কখনই নন-ষ্টক আইটেমের ক্ষেত্রে 'হ্যাঁ' হতে পারবে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,'সিরিয়াল নং আছে' কখনই নন-ষ্টক আইটেমের ক্ষেত্রে 'হ্যাঁ' হতে পারবে না
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,এ্যাটেনডেন্স ভবিষ্যতে তারিখগুলি জন্য চিহ্নিত করা যাবে না
 DocType: Pricing Rule,Pricing Rule Help,প্রাইসিং শাসন সাহায্য
 DocType: Purchase Taxes and Charges,Account Head,অ্যাকাউন্ট হেড
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,আইটেম অবতরণ খরচ নিরূপণ করার জন্য অতিরিক্ত খরচ আপডেট
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,বৈদ্যুতিক
 DocType: Stock Entry,Total Value Difference (Out - In),মোট মূল্য পার্থক্য (আউট - ইন)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,সারি {0}: বিনিময় হার বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,সারি {0}: বিনিময় হার বাধ্যতামূলক
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ইউজার আইডি কর্মচারী জন্য নির্ধারণ করে না {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,পাটা দাবি
 DocType: Stock Entry,Default Source Warehouse,ডিফল্ট সোর্স ওয়্যারহাউস
 DocType: Item,Customer Code,গ্রাহক কোড
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},জন্য জন্মদিনের স্মারক {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,শেষ আদেশ থেকে দিনের
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,স্টক সম্পদ
@@ -3271,7 +3301,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,অ্যাকাউন্ট {0} সমাপ্তি ধরনের দায় / ইক্যুইটি হওয়া আবশ্যক
 DocType: Authorization Rule,Based On,উপর ভিত্তি করে
 DocType: Sales Order Item,Ordered Qty,আদেশ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
 DocType: Stock Settings,Stock Frozen Upto,শেয়ার হিমায়িত পর্যন্ত
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},থেকে এবং আবর্তক সময়সীমার জন্য বাধ্যতামূলক তারিখ সময়ের {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,প্রকল্পের কার্যকলাপ / টাস্ক.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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 হতে হবে
 DocType: Purchase Invoice,Write Off Amount (Company Currency),পরিমাণ বন্ধ লিখুন (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
 DocType: Landed Cost Voucher,Landed Cost Voucher,ল্যান্ড কস্ট ভাউচার
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},সেট করুন {0}
 DocType: Purchase Invoice,Repeat on Day of Month,মাস দিন পুনরাবৃত্তি
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,আপলোড এ্যাটেনডেন্স
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,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/accounts/doctype/journal_entry/journal_entry.js +446,Amount,পরিমাণ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,পরিমাণ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM প্রতিস্থাপিত
 ,Sales Analytics,বিক্রয় বিশ্লেষণ
 DocType: Manufacturing Settings,Manufacturing Settings,উৎপাদন সেটিংস
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ইমেইল সেট আপ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,কোম্পানি মাস্টার ডিফল্ট মুদ্রা লিখুন দয়া করে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,কোম্পানি মাস্টার ডিফল্ট মুদ্রা লিখুন দয়া করে
 DocType: Stock Entry Detail,Stock Entry Detail,শেয়ার এন্ট্রি বিস্তারিত
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,দৈনিক অনুস্মারক
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},সাথে ট্যাক্স রুল দ্বন্দ্ব {0}
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,উত্পাদিত পরিমাণ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,ইঞ্জিনিয়ার
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,অনুসন্ধান সাব সমাহারগুলি
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},আইটেম কোড সারি কোন সময়ে প্রয়োজনীয় {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},আইটেম কোড সারি কোন সময়ে প্রয়োজনীয় {0}
 DocType: Sales Partner,Partner Type,সাথি ধরন
 DocType: Purchase Taxes and Charges,Actual,আসল
 DocType: Authorization Rule,Customerwise Discount,Customerwise ছাড়
 DocType: Purchase Invoice,Against Expense Account,ব্যয় অ্যাকাউন্টের বিরুদ্ধে
 DocType: Production Order,Production Order,উৎপাদন অর্ডার
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,ইনস্টলেশন উল্লেখ্য {0} ইতিমধ্যেই জমা দেওয়া হয়েছে
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,ইনস্টলেশন উল্লেখ্য {0} ইতিমধ্যেই জমা দেওয়া হয়েছে
 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,এখন দেখুন
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,প্রযোজ্য ছুটির তালিকা
 DocType: Employee,Cheque,চেক
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,সিরিজ আপডেট
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,প্রতিবেদন প্রকার বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,প্রতিবেদন প্রকার বাধ্যতামূলক
 DocType: Item,Serial Number Series,ক্রমিক সংখ্যা সিরিজ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},ওয়্যারহাউস সারিতে স্টক আইটেম {0} জন্য বাধ্যতামূলক {1}
 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/public/js/setup_wizard.js +101,The First User: You,প্রথম ব্যবহারকারী: আপনি
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},অর্থবছরের আরম্ভের তারিখ ও ফিস্ক্যাল বছর শেষ তারিখ ইতিমধ্যে অর্থবছরে নির্ধারণ করা হয় {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,সফলভাবে মীমাংসা
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},অর্থবছরের আরম্ভের তারিখ ও ফিস্ক্যাল বছর শেষ তারিখ ইতিমধ্যে অর্থবছরে নির্ধারণ করা হয় {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,সফলভাবে মীমাংসা
 DocType: Production Order,Planned End Date,পরিকল্পনা শেষ তারিখ
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,আইটেম কোথায় সংরক্ষণ করা হয়.
 DocType: Tax Rule,Validity,বৈধতা
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,উপস্থিতি
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,তারিখ পোস্টিং এবং সময় পোস্ট বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,তারিখ পোস্টিং এবং সময় পোস্ট বাধ্যতামূলক
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,লেনদেন কেনার জন্য ট্যাক্স টেমপ্লেট.
 ,Item Prices,আইটেমটি মূল্য
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,আপনি ক্রয় আদেশ সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,পর্যালোচনা তারিখ
 DocType: Purchase Invoice,Advance Payments,অগ্রিম প্রদান
 DocType: Purchase Taxes and Charges,On Net Total,একুন উপর
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,{0} সারিতে উদ্দিষ্ট গুদাম উৎপাদন অর্ডার হিসাবে একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,{0} সারিতে উদ্দিষ্ট গুদাম উৎপাদন অর্ডার হিসাবে একই হতে হবে
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,কোন অনুমতি পেমেন্ট টুল ব্যবহার
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% এর আবৃত্ত জন্য নির্দিষ্ট না &#39;সূচনা ইমেল ঠিকানা&#39;
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,মুদ্রা একক কিছু অন্যান্য মুদ্রা ব্যবহার এন্ট্রি করার পর পরিবর্তন করা যাবে না
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,মুদ্রা একক কিছু অন্যান্য মুদ্রা ব্যবহার এন্ট্রি করার পর পরিবর্তন করা যাবে না
 DocType: Company,Round Off Account,অ্যাকাউন্ট বন্ধ বৃত্তাকার
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,প্রশাসনিক খরচ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,পরামর্শকারী
 DocType: Customer Group,Parent Customer Group,মূল ক্রেতা গ্রুপ
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,পরিবর্তন
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,পরিবর্তন
 DocType: Purchase Invoice,Contact Email,যোগাযোগের ই - মেইল
 DocType: Appraisal Goal,Score Earned,স্কোর অর্জিত
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",যেমন &quot;আমার কোম্পানি এলএলসি&quot;
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,গ্রস ওজন UOM
 DocType: Email Digest,Receivables / Payables,সম্ভাব্য / Payables
 DocType: Delivery Note Item,Against Sales Invoice,বিক্রয় চালান বিরুদ্ধে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,ক্রেডিট অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,ক্রেডিট অ্যাকাউন্ট
 DocType: Landed Cost Item,Landed Cost Item,ল্যান্ড খরচ আইটেমটি
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,শূন্য মান দেখাও
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,আইটেমের পরিমাণ কাঁচামাল দেওয়া পরিমাণে থেকে repacking / উত্পাদন পরে প্রাপ্ত
 DocType: Payment Reconciliation,Receivable / Payable Account,গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট
 DocType: Delivery Note Item,Against Sales Order Item,বিক্রয় আদেশ আইটেমটি বিরুদ্ধে
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
 DocType: Item,Default Warehouse,ডিফল্ট ওয়্যারহাউস
 DocType: Task,Actual End Date (via Time Logs),প্রকৃত শেষ তারিখ (সময় লগসমূহ মাধ্যমে)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},বাজেট গ্রুপ অ্যাকাউন্ট বিরুদ্ধে নিয়োগ করা যাবে না {0}
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ওয়ার্কস্টেশন ওয়ার্কিং সময়ের বাইরে সময় লগ পরিকল্পনা করুন.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ইতিমধ্যেই জমা দেওয়া হয়েছে
 ,Items To Be Requested,চলছে অনুরোধ করা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,শেষ কেনার হার পেতে
 DocType: Time Log,Billing Rate based on Activity Type (per hour),কার্যকলাপ টাইপ উপর ভিত্তি করে বিলিং হার (প্রতি ঘন্টায়)
 DocType: Company,Company Info,প্রতিষ্ঠানের তথ্য
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","কোম্পানি ইমেইল আইডি পাওয়া যায়নি, তাই পাঠানো না mail"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ফান্ডস (সম্পদ) এর আবেদন
 DocType: Production Planning Tool,Filter based on item,ফিল্টার আইটেম উপর ভিত্তি করে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,ডেবিট অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,ডেবিট অ্যাকাউন্ট
 DocType: Fiscal Year,Year Start Date,বছরের শুরু তারিখ
 DocType: Attendance,Employee Name,কর্মকর্তার নাম
 DocType: Sales Invoice,Rounded Total (Company Currency),গোলাকৃতি মোট (কোম্পানি একক)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"অ্যাকাউন্ট ধরন নির্বাচন করা হয়, কারণ গ্রুপের গোপন করা যাবে না."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"অ্যাকাউন্ট ধরন নির্বাচন করা হয়, কারণ গ্রুপের গোপন করা যাবে না."
 DocType: Purchase Common,Purchase Common,ক্রয় প্রচলিত
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,সুযোগ থেকে
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,কর্মচারীর সুবিধা
 DocType: Sales Invoice,Is POS,পিওএস
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},বস্তাবন্দী পরিমাণ সারিতে আইটেম {0} জন্য পরিমাণ সমান নয় {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},বস্তাবন্দী পরিমাণ সারিতে আইটেম {0} জন্য পরিমাণ সমান নয় {1}
 DocType: Production Order,Manufactured Qty,শিল্পজাত Qty
 DocType: Purchase Receipt Item,Accepted Quantity,গৃহীত পরিমাণ
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} বিদ্যমান নয়
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,গ্রাহকরা উত্থাপিত বিল.
 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 +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},সারি কোন {0}: পরিমাণ ব্যয় দাবি {1} বিরুদ্ধে পরিমাণ অপেক্ষারত তার চেয়ে অনেক বেশী হতে পারে না. অপেক্ষারত পরিমাণ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},সারি কোন {0}: পরিমাণ ব্যয় দাবি {1} বিরুদ্ধে পরিমাণ অপেক্ষারত তার চেয়ে অনেক বেশী হতে পারে না. অপেক্ষারত পরিমাণ {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} গ্রাহকদের যোগ করা হয়েছে
 DocType: Maintenance Schedule,Schedule,সময়সূচি
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","এই খরচ কেন্দ্র বাজেট নির্ধারণ করুন. বাজেটের কর্ম নির্ধারণ করার জন্য, দেখুন &quot;কোম্পানি তালিকা&quot;"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,3 পড়া
 ,Hub,হাব
 DocType: GL Entry,Voucher Type,ভাউচার ধরন
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
 DocType: Expense Claim,Approved,অনুমোদিত
 DocType: Pricing Rule,Price,মূল্য
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী &#39;বাম&#39; হিসাবে
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,অ্যাকাউন্টিং জার্নাল এন্ট্রি.
 DocType: Delivery Note Item,Available Qty at From Warehouse,গুদাম থেকে এ উপলব্ধ Qty
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},সারি {0}: পার্টি / অ্যাকাউন্টের সাথে মেলে না {1} / {2} এ {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,একটি ট্যাক্স অ্যাকাউন্ট তৈরি করতে
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
 DocType: Account,Stock,স্টক
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,চুক্তি শেষ তারিখ
 DocType: Sales Order,Track this Sales Order against any Project,কোন প্রকল্পের বিরুদ্ধে এই বিক্রয় আদেশ ট্র্যাক
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,টানুন বিক্রয় আদেশ উপরে মাপকাঠির ভিত্তিতে (বিলি মুলতুবি)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,সরবরাহকারী উদ্ধৃতি থেকে
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,সরবরাহকারী উদ্ধৃতি থেকে
 DocType: Deduction Type,Deduction Type,সিদ্ধান্তগ্রহণ ধরন
 DocType: Attendance,Half Day,অর্ধদিবস
 DocType: Pricing Rule,Min Qty,ন্যূনতম Qty
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,লেনদেন তারিখ
 DocType: Production Plan Item,Planned Qty,পরিকল্পিত Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,মোট ট্যাক্স
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,পরিমাণ (Qty শিল্পজাত) বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,পরিমাণ (Qty শিল্পজাত) বাধ্যতামূলক
 DocType: Stock Entry,Default Target Warehouse,ডিফল্ট উদ্দিষ্ট ওয়্যারহাউস
 DocType: Purchase Invoice,Net Total (Company Currency),একুন (কোম্পানি একক)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট বিরুদ্ধে শুধুমাত্র প্রযোজ্য
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,কমিশন হার
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,ভেরিয়েন্ট করুন
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,ডিপার্টমেন্ট দ্বারা ব্লক ছেড়ে অ্যাপ্লিকেশন.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,কার্ট খালি হয়
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,কার্ট খালি হয়
 DocType: Production Order,Actual Operating Cost,আসল অপারেটিং খরচ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,রুট সম্পাদনা করা যাবে না.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,রুট সম্পাদনা করা যাবে না.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,বরাদ্দ পরিমাণ unadusted পরিমাণ তার চেয়ে অনেক বেশী করতে পারেন
 DocType: Manufacturing Settings,Allow Production on Holidays,ছুটির উৎপাদন মঞ্জুরি
 DocType: Sales Order,Customer's Purchase Order Date,গ্রাহকের ক্রয় আদেশ তারিখ
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ডিজাইনার
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,শর্তাবলী টেমপ্লেট
 DocType: Serial No,Delivery Details,প্রসবের বিবরণ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,পরিমাণ এই সীমার নিচে পড়ে তাহলে স্বয়ংক্রিয়ভাবে উপাদান অনুরোধ করুন
 ,Item-wise Purchase Register,আইটেম-বিজ্ঞ ক্রয় নিবন্ধন
 DocType: Batch,Expiry Date,মেয়াদ শেষ হওয়ার তারিখ
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","পুনর্বিন্যাস স্তর সেট করতে, আইটেমটি একটি ক্রয় আইটেম বা উৎপাদন আইটেম হতে হবে"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","পুনর্বিন্যাস স্তর সেট করতে, আইটেমটি একটি ক্রয় আইটেম বা উৎপাদন আইটেম হতে হবে"
 ,Supplier Addresses and Contacts,সরবরাহকারী ঠিকানা এবং পরিচিতি
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,প্রথম শ্রেণী নির্বাচন করুন
 apps/erpnext/erpnext/config/projects.py +18,Project master.,প্রকল্প মাস্টার.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(অর্ধদিবস)
 DocType: Supplier,Credit Days,ক্রেডিট দিন
 DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয়
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM থেকে জানানোর পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,উপকরণ বিল
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {1}
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,ত্যাগ করার জন্য কারণ
 DocType: Expense Claim Detail,Sanctioned Amount,অনুমোদিত পরিমাণ
 DocType: GL Entry,Is Opening,খোলার
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},সারি {0}: ডেবিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,অ্যাকাউন্ট {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},সারি {0}: ডেবিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,অ্যাকাউন্ট {0} অস্তিত্ব নেই
 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 3538d47..3bcbf7b 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Molimo prvo odaberite Party Tip
 DocType: Item,Customer Items,Customer Predmeti
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadređeni konto {1} Ne može biti knjiga
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadređeni konto {1} Ne može biti knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavite stavku da hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mail obavijesti
 DocType: Item,Default Unit of Measure,Zadana mjerna jedinica
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potreban za Cjenovnik {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Hoće li biti izračunata u transakciji.
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Od materijala zahtjev
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Od materijala zahtjev
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Posao podnositelj
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nema više rezultata.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Za održavanje kupaca mudar Šifra i kako bi ih pretraživati na temelju svog koda koristiti ovu opciju
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Show Varijante
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Količina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Zajmovi (pasiva)
 DocType: Employee Education,Year of Passing,Tekuća godina
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,U Stock
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Zdravstvena zaštita
 DocType: Purchase Invoice,Monthly,Mjesečno
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Kašnjenje u plaćanju (Dani)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail adresa
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Skraćeni naziv
 DocType: Appraisal Goal,Score (0-5),Ocjena (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} ne odgovara {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} ne odgovara {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Ne vozila
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Molimo odaberite Cjenik
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Molimo odaberite Cjenik
 DocType: Production Order Operation,Work In Progress,Radovi u toku
 DocType: Employee,Holiday List,Lista odmora
 DocType: Time Log,Time Log,Vrijeme Log
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista firma je ušao više od jednom
 DocType: Employee,Married,Oženjen
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nije dozvoljeno za {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 DocType: Payment Reconciliation,Reconcile,pomiriti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,mirovinskim fondovima
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Skladište je obavezno ako je tip naloga Skladište
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Skladište je obavezno ako je tip naloga Skladište
 DocType: SMS Center,All Sales Person,Svi prodavači
 DocType: Lead,Person Name,Osoba Ime
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Provjerite da li se ponavlja kako, uklonite oznaku da se zaustavi ponavljaju ili da pravilno Završni datum"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Zainteresiran
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Sastavnica
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvaranje
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Primjerak iz točke Group
 DocType: Journal Entry,Opening Entry,Otvaranje unos
 DocType: Stock Entry,Additional Costs,Dodatni troškovi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konto sa postojećim transakcijama se ne može pretvoriti u grupu konta .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Konto sa postojećim transakcijama se ne može pretvoriti u grupu konta .
 DocType: Lead,Product Enquiry,Na upit
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Unesite tvrtka prva
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Molimo najprije odaberite Company
 DocType: Employee Education,Under Graduate,Pod diplomski
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target Na
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target Na
 DocType: BOM,Total Cost,Ukupan trošak
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dnevnik aktivnosti:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Artikal {0} ne postoji u sustavu ili je istekao
@@ -165,7 +165,7 @@
 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","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 +444,Item {0} is not active or end of life has been reached,Stavka {0} nije aktivan ili kraj života je postignut
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,Stavka {0} nije aktivan ili kraj života je postignut
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Hoće li se obnavljaju nakon prodaje fakture je Prijavljen.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Podešavanja modula ljudskih resursa
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detalji o poslovanju obavlja.
 DocType: Serial No,Maintenance Status,Održavanje statusa
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Stavke i cijene
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma trebao biti u fiskalnoj godini. Uz pretpostavku Od datuma = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma trebao biti u fiskalnoj godini. Uz pretpostavku Od datuma = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Odaberite zaposlenika za koga se stvara procjene.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Troška {0} ne pripada Tvrtka {1}
 DocType: Customer,Individual,Pojedinac
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Neto gotovine iz aktivnosti finansiranja
 DocType: Lead,Address & Contact,Adresa i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorišteni lišće iz prethodnog izdvajanja
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Sljedeća Ponavljajući {0} će biti kreiran na {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Kontakt ime
 DocType: Production Plan Item,SO Pending Qty,SO čekanju Kol
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Nema opisa dano
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zahtjev za kupnju.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice artikla
 DocType: Payment Tool,Reference No,Poziv na broj
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Ostavite blokirani
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pomirenje Item
 DocType: Stock Entry,Sales Invoice No,Faktura prodaje br
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Item,Publish in Hub,Objavite u Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Artikal {0} je otkazan
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Artikal {0} je otkazan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Odnos
 DocType: Shipping Rule,Worldwide Shipping,Dostavom diljem svijeta
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potvrđene narudžbe od kupaca.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Prijedlozi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Postavite Stavka Grupa-mudre proračune na ovom području. Također možete uključiti sezonalnost postavljanjem Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Unesite roditelja grupe računa za skladište {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veći od preostalog iznosa {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veći od preostalog iznosa {2}
 DocType: Supplier,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel broj
 DocType: Maintenance Schedule,Generate Schedule,Generiranje Raspored
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Najnovije
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 znakova
 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
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Učiti
 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
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Upravljanje prodavač stablo .
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
 DocType: Sales Invoice Item,Delivery Note,Otpremnica
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Postavljanje Porezi
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Postavljanje Porezi
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +105,Summary for this week and pending activities,Pregled za ovaj tjedan i aktivnostima na čekanju
 DocType: Workstation,Rent Cost,Rent cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Molimo odaberite mjesec i godinu
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Dostupno u sastavnicama, otpremnicama, računu kupnje, nalogu za proizvodnju, narudžbi kupnje, primci, prodajnom računu, narudžbi kupca, ulaznog naloga i kontrolnoj kartici"
 DocType: Item Tax,Tax Rate,Porezna stopa
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Odaberite Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Odaberite Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Detaljnije: {0} uspio batch-mudar, ne može se pomiriti koristeći \
  Stock pomirenje, umjesto koristi Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Pretvoriti u non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kupovina Prijem mora biti dostavljena
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,liječnički
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog za gubljenje
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zatvoren sljedećih datuma po Holiday List: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mogućnosti
 DocType: Employee,Single,Singl
 DocType: Issue,Attachment,Vezanost
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budžet se ne može postaviti za grupu troškova Center
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,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 +563,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. ,Zaposlenika rekord je stvorio pomoću odabranog polja.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Majstor za odmor .
 DocType: Material Request Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Unesite kod artikal .
 DocType: BOM,Costing,Koštanje
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ako je označeno, iznos poreza će se smatrati već uključena u Print Rate / Ispis Iznos"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Ukupno Qty
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Serijski Nema jamstva isteka
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Stavka {0} nije Kupnja predmeta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Stavka {0} nije Kupnja predmeta
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} je nevažeća e-mail adresu u ""Obavijest \
  E-mail adresa '"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Ukupno Billing Ove godine:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi poreze i troškove
 DocType: Purchase Invoice,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Zatvaranje (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Zatvaranje (Cr)
 DocType: Serial No,Warranty Period (Days),Jamstveni period (dani)
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 ,Pending Qty,U očekivanju Količina
@@ -466,7 +469,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** ** Mjesečni Distribucija će Vam pomoći distribuirati svoj proračun kroz mjesece ako imate sezonski u vašem poslu.
 
  Distribuirati budžet koristeći ovu distribucije, postavite ovu ** Mjesečna distribucija ** u ** Troškovi Centru **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nisu pronađeni u tablici fakturu
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nisu pronađeni u tablici fakturu
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Molimo najprije odaberite Društva i Party Tip
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Financijska / obračunska godina .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
@@ -474,9 +477,9 @@
 DocType: Project Task,Project Task,Projektnog zadatka
 ,Lead Id,Id potencijalnog kupca
 DocType: C-Form Invoice Detail,Grand Total,Ukupno za platiti
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskalna godina Start Date ne bi trebao biti veći od Fiskalna godina End Date
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskalna godina Start Date ne bi trebao biti veći od Fiskalna godina End Date
 DocType: Warranty Claim,Resolution,Rezolucija
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Isporučuje se: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Isporučuje se: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Račun se plaća
 DocType: Sales Order,Billing and Delivery Status,Obračun i Status isporuke
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Kupci
@@ -491,7 +494,7 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 DocType: Purchase Order Item,Billed Amt,Naplaćeni izn
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logično Skladište protiv kojih su napravljeni unosa zaliha.
@@ -500,7 +503,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Proizvodnja Order je obavezna
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Pisanje prijedlog
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativna Stock Error ( {6} ) za točke {0} u skladište {1} na {2} {3} u {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativna Stock Error ( {6} ) za točke {0} u skladište {1} na {2} {3} u {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina Company
 DocType: Packing Slip Item,DN Detail,DN detalj
 DocType: Time Log,Billed,Naplaćeno
@@ -519,16 +522,17 @@
 DocType: Activity Type,Default Costing Rate,Uobičajeno Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Održavanje Raspored
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Zatim Cjenovna Pravila filtriraju se temelji na Kupca, Kupac Group, Teritorij, dobavljač, proizvođač tip, Kampanja, prodajni partner i sl."
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Neto promjena u zalihama
 DocType: Employee,Passport Number,Putovnica Broj
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,menadžer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Od Račun kupnje
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Istu stavku je ušao više puta.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Od Račun kupnje
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Istu stavku je ušao više puta.
 DocType: SMS Settings,Receiver Parameter,Prijemnik parametra
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' Temelji se na' i 'Grupiranje po ' ne mogu biti isti
 DocType: Sales Person,Sales Person Targets,Prodaje osobi Mete
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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}
 DocType: Selling Settings,Customer Naming By,Kupac Imenovanje By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Pretvori u Grupi
 DocType: Activity Cost,Activity Type,Tip aktivnosti
@@ -539,7 +543,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,objavljivanje
 DocType: Activity Cost,Projects User,Projekti korisnika
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumed
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
 DocType: Company,Round Off Cost Center,Zaokružimo troškova Center
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 DocType: Material Request,Material Transfer,Materijal transfera
@@ -561,13 +565,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Za praćenje stavke u prodaji i kupnji dokumenata na temelju njihovih serijskih br. To je također može koristiti za praćenje jamstvene podatke o proizvodu.
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutni Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Ukupno naplatu ove godine
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 DocType: Employee,Provide email id registered in company,Osigurati e id registriran u tvrtki
 DocType: Hub Settings,Seller City,Prodavač City
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Stavka ima varijante.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -585,18 +589,18 @@
 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 +92,{0} is not a stock Item,{0} nijestock Stavka
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nijestock Stavka
 DocType: Mode of Payment Account,Default Account,Podrazumjevani konto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,Odaberite tjednik off dan
 DocType: Production Order Operation,Planned End Time,Planirani End Time
 ,Sales Person Target Variance Item Group-Wise,Prodaja Osoba Target varijance artikla Group - Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konto sa postojećim transakcijama se ne može pretvoriti u glavnu knjigu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Konto sa postojećim transakcijama se ne može pretvoriti u glavnu knjigu
 DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
 DocType: Employee,Cell Number,Mobitel Broj
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto materijala Zahtjevi Generirano
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ne možete ući trenutni voucher u 'Protiv Journal Entry' koloni
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Ne možete ući trenutni voucher u 'Protiv Journal Entry' koloni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mjesečna plaća izjava.
@@ -605,9 +609,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} {1} tipa
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Računovodstva unosi može biti pokrenuta protiv lista čvorova. Nisu dozvoljeni stavke protiv Grupe.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
 DocType: Item Attribute Value,Item Attribute Value,Stavka vrijednost atributa
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodajne kampanje.
 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.
@@ -665,7 +669,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Process Payroll,Send Email,Pošaljite e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Bez dozvole
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Da biste filtrirali na osnovu stranke, izaberite Party prvog tipa"
@@ -673,7 +677,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Predmeti sa višim weightage će biti prikazan veći
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Moj Fakture
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Moj Fakture
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Niti jedan zaposlenik pronađena
 DocType: Purchase Order,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podizvođača na dobavljača
@@ -683,6 +687,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošalji odmah
 ,Support Analytics,Analitike podrške
 DocType: Item,Website Warehouse,Web stranica galerije
+DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalni iznos fakture
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C - Form zapisi
@@ -692,7 +697,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Da biste omogućili &quot;Point of Sale&quot; karakteristika
 DocType: Bin,Moving Average Rate,Premještanje prosječna stopa
 DocType: Production Planning Tool,Select Items,Odaberite artikle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} {1} protiv Bill od {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} {1} protiv Bill od {2}
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: Sales Invoice Item,Target Warehouse,Ciljana galerija
 DocType: Item,Allow over delivery or receipt upto this percent,Dozvolite preko isporuke ili primitka upto ovu posto
@@ -704,7 +709,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatski nova poruka na podnošenje transakcija .
 DocType: Production Order,Item To Manufacture,Artikal za proizvodnju
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} {2} status
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Purchase Order na isplatu
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Purchase Order na isplatu
 DocType: Sales Order Item,Projected Qty,Predviđen Kol
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
@@ -728,7 +733,7 @@
 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,Projekt Vrijednost
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-prodaju
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
 DocType: Account,Balance must be,Bilans mora biti
 DocType: Hub Settings,Publish Pricing,Objavite Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Rashodi Zahtjev odbijen poruku
@@ -751,7 +756,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Majstor valute .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} mora biti aktivna
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} mora biti aktivna
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Ostavite Encashment Iznos
@@ -769,17 +774,17 @@
 DocType: Supplier,Default Payable Accounts,Uobičajeno Računi dobavljača
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Features Setup,Item Barcode,Barkod artikla
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Kupnja fakture Predujam
 DocType: Address,Shop,Prodavnica
 DocType: Hub Settings,Sync Now,Sync Sada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Row {0}: Kredit stavka ne može se povezati sa {1}
 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."
 DocType: Employee,Permanent Address Is,Stalna adresa je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacija završena za koliko gotovih proizvoda?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,The Brand
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Dodatak za prekomjerno {0} prešao za točku {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Dodatak za prekomjerno {0} prešao za točku {1}.
 DocType: Employee,Exit Interview Details,Izlaz Intervju Detalji
 DocType: Item,Is Purchase Item,Je dobavljivi proizvod
 DocType: Journal Entry Account,Purchase Invoice,Kupnja fakture
@@ -791,7 +796,7 @@
 DocType: Salary Slip,Total in words,Ukupno je u riječima
 DocType: Material Request Item,Lead Time Date,Potencijalni kupac - datum
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,je obavezno. Možda Mjenjačnica zapis nije stvoren za
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Navedite rednim brojem predmeta za {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Navedite rednim brojem predmeta za {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Za &#39;proizvoda Bundle&#39; stavki, Magacin, serijski broj i serijski broj smatrat će se iz &#39;Pakiranje List&#39; stol. Ako Skladište i serijski broj su isti za sve pakovanje stavke za bilo &#39;Bundle proizvoda&#39; stavku, te vrijednosti mogu se unijeti u glavnom Stavka stola, vrijednosti će se kopirati u &#39;Pakiranje List&#39; stol."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Isporuke kupcima.
 DocType: Purchase Invoice Item,Purchase Order Item,Narudžbenica predmet
@@ -800,14 +805,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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 +626,Select Item for Transfer,Izaberite Stavka za transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Dopustite korisniku uređivanje cjenika u transakcijama
 DocType: Pricing Rule,Max Qty,Max kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Plaćanje protiv Prodaja / narudžbenice treba uvijek biti označeni kao unaprijed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Hemijski
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Svi predmeti su već prebačen za ovu proizvodnju Order.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Svi predmeti su već prebačen za ovu proizvodnju Order.
 DocType: Process Payroll,Select Payroll Year and Month,Odaberite plata i godina Mjesec
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Idi na odgovarajuću grupu (obično Primjena sredstava&gt; Kratkotrajna imovina&gt; bankovnih računa i stvoriti novi račun (klikom na Dodaj djeteta) tipa &quot;Banka&quot;
 DocType: Workstation,Electricity Cost,Troškovi struje
@@ -821,10 +827,10 @@
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Priložite svoju sliku
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Napraviti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Napraviti
 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 +3,My Cart,Moja košarica
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Moja košarica
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
 DocType: Lead,Next Contact Date,Sljedeća Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otvaranje Kol
@@ -843,10 +849,10 @@
 DocType: POS Profile,Cash/Bank Account,Novac / bankovni račun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Atribut sto je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} ne može biti negativna
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Popust
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Popust
 DocType: Features Setup,Purchase Discounts,Kupnja Popusti
 DocType: Workstation,Wages,Plata
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Će se ažurirati samo ako Vrijeme dnevnika &#39;naplative&#39;
@@ -871,7 +877,7 @@
 DocType: Tax Rule,Shipping State,State dostava
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodan pomoću 'Get stavki iz Kupovina Primici' gumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodajni troškovi
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standardna kupnju
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standardna kupnju
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
@@ -913,6 +919,7 @@
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Shipping pravilo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja Red {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Molimo podesite &#39;primijeniti dodatne popusta na&#39;
 ,Ordered Items To Be Billed,Naručeni artikli za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od opseg mora biti manji od u rasponu
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Odaberite vrijeme Evidencije i slanje stvoriti novi prodajni fakture.
@@ -922,13 +929,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ovo Batch Vrijeme Log je naplaćeno.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Stvaranje prilika
 DocType: Salary Slip,Leave Without Pay,Ostavite bez plaće
-DocType: Supplier,Communications,Communications
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Kapaciteta za planiranje Error
 ,Trial Balance for Party,Suđenje Balance za stranke
 DocType: Lead,Consultant,Konzultant
 DocType: Salary Slip,Earnings,Zarada
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Završio Stavka {0} mora biti unesen za tip Proizvodnja unos
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Otvaranje Računovodstvo Balance
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Završio Stavka {0} mora biti unesen za tip Proizvodnja unos
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otvaranje Računovodstvo Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ništa se zatražiti
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"' Stvarni datum početka ' ne može biti veći od stvarnih datuma završetka """
@@ -970,7 +976,7 @@
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Global Defaults,Disable Rounded Total,Ugasiti zaokruženi iznos
 DocType: Lead,Call,Poziv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' Prijave ' ne može biti prazno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,' Prijave ' ne može biti prazno
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Postavljanje Zaposleni
@@ -982,9 +988,9 @@
 DocType: Contact,User ID,Korisnički ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Pogledaj Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Proizvodnja protiv prodaje Reda
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -1014,7 +1020,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Nije ovlašten za uređivanje smrznute račun {0}
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mali
 DocType: Employee,Employee Number,Zaposlenik Broj
 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}
@@ -1027,13 +1033,13 @@
 DocType: Employee,Place of Issue,Mjesto izdavanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ugovor
 DocType: Email Digest,Add Quote,Dodaj Citat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,Website Image should be a public file or website URL,Sajt slika treba da bude javni datoteke ili web stranice URL
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
 DocType: Journal Entry Account,Purchase Order,Narudžbenica
 DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
@@ -1042,8 +1048,8 @@
 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/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Kapitalni oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1053,7 +1059,7 @@
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekivani datum isporuke je manje nego što je planirano Ozljede Datum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,za Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Postavljanje Vrsta računa pomaže u odabiru ovaj račun u prometu.
 DocType: Purchase Invoice,Grand Total (Company Currency),Sveukupno (valuta tvrtke)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Ukupno Odlazni
@@ -1066,7 +1072,7 @@
 DocType: Journal Entry,Journal Entry,Časopis Stupanje
 DocType: Workstation,Workstation Name,Ime Workstation
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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
@@ -1098,7 +1104,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Brošure za kontakte, vodi."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operacije se ne može ostati prazno.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operacije se ne može ostati prazno.
 ,Delivered Items To Be Billed,Isporučeni proizvodi za naplatiti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
 DocType: Authorization Rule,Average Discount,Prosječni popust
@@ -1113,7 +1119,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operacija Opis
 DocType: Item,Will also apply to variants,Primjenjivat će se i na varijanti
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Ne možete promijeniti fiskalnu godinu datum početka i datum završetka fiskalne godine kada Fiskalna godina se sprema.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Ne možete promijeniti fiskalnu godinu datum početka i datum završetka fiskalne godine kada Fiskalna godina se sprema.
 DocType: Quotation,Shopping Cart,Korpa
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odlazni
 DocType: Pricing Rule,Campaign,Kampanja
@@ -1124,7 +1130,8 @@
 DocType: Sales Order Item,Planned Quantity,Planirana količina
 DocType: Purchase Invoice Item,Item Tax Amount,Iznos poreza artikla
 DocType: Item,Maintain Stock,Održavati Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Stock unosi već stvorene za proizvodnju Order
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1136,7 +1143,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Ovisi o neplaćeni odmor
@@ -1174,7 +1181,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,pod skupštine
 DocType: Shipping Rule Condition,To Value,Za vrijednost
 DocType: Supplier,Stock Manager,Stock Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Odreskom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,najam ureda
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Postavke Setup SMS gateway
@@ -1182,10 +1189,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No adresu dodao još.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analitičar
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak JV iznos {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak JV iznos {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",Da biste omogućili &quot;Point of Sale&quot; pogled
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
 DocType: Item,Sales Details,Prodajni detalji
 DocType: Opportunity,With Items,Sa stavkama
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,u kol
@@ -1200,10 +1207,11 @@
 DocType: Cost Center,Parent Cost Center,Roditelj troška
 DocType: Sales Invoice,Source,Izvor
 DocType: Leave Type,Is Leave Without Pay,Ostavi se bez plate
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nisu pronađeni u tablici plaćanja
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nisu pronađeni u tablici plaćanja
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Financijska godina Start Date
 DocType: Employee External Work History,Total Experience,Ukupno Iskustvo
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Novčani tok iz ulagačkih
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Material Request Item,Sales Order No,Narudžba kupca br
 DocType: Item Group,Item Group Name,Naziv grupe artikla
@@ -1211,12 +1219,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Materijali za Proizvodnja
 DocType: Pricing Rule,For Price List,Za Cjeniku
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Stopa Kupovina za stavku: {0} nije pronađena, koja je potrebna za rezervaciju računovodstvo unos (rashodi). Navedite stavke cijenu protiv otkupna cijena liste."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Stopa Kupovina za stavku: {0} nije pronađena, koja je potrebna za rezervaciju računovodstvo unos (rashodi). Navedite stavke cijenu protiv otkupna cijena liste."
 DocType: Maintenance Schedule,Schedules,Rasporedi
 DocType: Purchase Invoice Item,Net Amount,Neto iznos
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (Company valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Pogreška : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Pogreška : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Molimo stvoriti novi račun iz kontnog plana .
 DocType: Maintenance Visit,Maintenance Visit,Održavanje Posjetite
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kupac> Korisnička Group> Regija
@@ -1242,7 +1250,7 @@
 DocType: Sales Partner,Sales Partner Target,Prodaja partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{1}: knjiženju za {0} može se vršiti samo u valuti
 DocType: Pricing Rule,Pricing Rule,cijene Pravilo
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materijal Zahtjev za narudžbenice
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materijal Zahtjev za narudžbenice
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: {1} Returned Stavka ne postoji u {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovni računi
 ,Bank Reconciliation Statement,Izjava banka pomirenja
@@ -1250,11 +1258,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Otvaranje Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} mora pojaviti samo jednom
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezno
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezno
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Iznosi ne ogleda u banci
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Potraživanja za tvrtke trošak.
@@ -1266,33 +1274,34 @@
 ,Material Requests for which Supplier Quotations are not created,Materijalni Zahtjevi za koje Supplier Citati nisu stvorene
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Za praćenje stavki pomoću barkod. Vi ćete biti u mogućnosti da unesete stavke u otpremnici i prodaje Računa skeniranjem barkod stavke.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Mark kao Isporučena
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Mark kao Isporučena
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make ponudu
 DocType: Dependent Task,Dependent Task,Zavisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Prijemnik Popis
 DocType: Payment Tool Detail,Payment Amount,Plaćanje Iznos
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumed Iznos
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Pogledaj
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Pogledaj
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Neto promjena u gotovini
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plaća Struktura Odbitak
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Troškovi Izdata Predmeti
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Količina ne smije biti više od {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Starost (dani)
 DocType: Quotation Item,Quotation Item,Artikl iz ponude
 DocType: Account,Account Name,Naziv konta
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serijski Ne {0} {1} količina ne može bitidio
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
 DocType: Company,Default Payable Account,Uobičajeno računa se plaća
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% Fakturisana
@@ -1304,15 +1313,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moja pitanja
 DocType: BOM Item,BOM Item,BOM proizvod
 DocType: Appraisal,For Employee,Za zaposlenom
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,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/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: iznos plaćanja ne može biti negativna
 DocType: Expense Claim,Total Amount Reimbursed,Ukupan iznos nadoknađeni
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Protiv Dobavljač fakture {0} od {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Protiv Dobavljač fakture {0} od {1}
 DocType: Customer,Default Price List,Zadani cjenik
 DocType: Payment Reconciliation,Payments,Plaćanja
 DocType: Budget Detail,Budget Allocated,Dodijeljeni proračun
 DocType: Journal Entry,Entry Type,Entry Tip
 ,Customer Credit Balance,Customer Credit Balance
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Neto promjena na računima dobavljača
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Molimo vas da provjerite svoj e-mail id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kupac je potrebno za ' Customerwise Popust '
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
@@ -1333,7 +1344,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Enable Košarica
 DocType: Employee,Permanent Address,Stalna adresa
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Stavka {0} mora bitiusluga artikla .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Unaprijed plaćeni protiv {0} {1} ne može biti veći \ od Grand Ukupno {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Odaberite Šifra
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Smanjite odbitak za ostaviti bez plaća (lwp)
@@ -1350,18 +1361,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Jedna jedinica stavku.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',"Vrijeme Log Batch {0} mora biti "" Postavio '"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"Vrijeme Log Batch {0} mora biti "" Postavio '"
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Skladište potrebno na red No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Skladište potrebno na red No {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Poštanski
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa kupaca sa istim nazivom već postoji. Promijenite naziv kupca ili promijenite naziv grupe kupaca.
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Odaberite {0} na prvom mjestu.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Odaberite {0} na prvom mjestu.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},text {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Novi kontakt
 DocType: Territory,Parent Territory,Roditelj Regija
 DocType: Quality Inspection Reading,Reading 2,Čitanje 2
 DocType: Stock Entry,Material Receipt,Materijal Potvrda
@@ -1369,7 +1381,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Tip i stranka je potreban za potraživanja / računa plaćaju {0}
 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,Sljedeća Kontakt Do
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +213,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 +85,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
@@ -1386,15 +1398,15 @@
 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: Sales Invoice Item,Batch No,Broj serije
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopustite više prodajnih naloga protiv narudžbenicu Kupca
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Glavni
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Glavni
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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,Opportunity Od polje je obavezno
 DocType: Item,Variants,Varijante
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Provjerite narudžbenice
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,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 +129,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
@@ -1407,7 +1419,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Skladište i upute
 DocType: Supplier,Statutory info and other general information about your Supplier,Zakonska info i druge opće informacije o vašem Dobavljaču
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adrese
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Journal Entry {0} nema premca {1} unos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Journal Entry {0} nema premca {1} unos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Stavka nije dozvoljeno da ima proizvodni Order.
@@ -1416,10 +1428,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Iznos kredita u računu valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Dnevnici vremena za proizvodnju.
 DocType: Item,Apply Warehouse-wise Reorder Level,Nanesite Skladište-mudar Ponovno red Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} mora biti dostavljena
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} mora biti dostavljena
 DocType: Authorization Control,Authorization Control,Odobrenje kontrole
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Odbijena Skladište je obavezno protiv odbijen Stavka {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Vrijeme Prijava za zadatke.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Plaćanje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Plaćanje
 DocType: Production Order Operation,Actual Time and Cost,Stvarno vrijeme i troškovi
 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},Materijal Zahtjev maksimalno {0} može biti za točku {1} od prodajnog naloga {2}
 DocType: Employee,Salutation,Pozdrav
@@ -1436,7 +1449,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Pomoćnik
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Stavka {0} nijeserijaliziranom predmeta
 DocType: SMS Center,Create Receiver List,Stvaranje Receiver popis
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Istekla
 DocType: Packing Slip,To Package No.,Za Paket br
 DocType: Warranty Claim,Issue Date,Datum izdavanja
 DocType: Activity Cost,Activity Cost,Aktivnost troškova
@@ -1474,7 +1486,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Ostvareni
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Teritorij / Customer
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,na primjer 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak naplatiti preostali iznos {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak naplatiti preostali iznos {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,U riječi će biti vidljiv nakon što spremite prodaje fakture.
 DocType: Item,Is Sales Item,Je artikl namijenjen prodaji
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Raspodjela grupe artikala
@@ -1486,7 +1498,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} stvorio
 DocType: Delivery Note Item,Against Sales Order,Protiv prodajnog naloga
 ,Serial No Status,Serijski Bez Status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Tablica ne može biti prazna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Tablica ne može biti prazna
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: {1} Za postavljanje periodici, razlika između od i do danas \
  mora biti veći ili jednak {2}"
@@ -1496,7 +1508,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Carine i porezi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Unesite Referentni datum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Unesite Referentni datum
 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} unosa isplate ne može biti filtrirani po {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Sto za stavku koja će se prikazati u Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Isporučeni Količina
@@ -1511,7 +1523,7 @@
 DocType: Installation Note,Installation Time,Vrijeme instalacije
 DocType: Sales Invoice,Accounting Details,Računovodstvo Detalji
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Izbrisati sve transakcije za ovu kompaniju
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: {1} Operacija nije završen za {2} Količina gotovih proizvoda u proizvodnji Order # {3}. Molimo vas da ažurirate rad status via Time Dnevnici
+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,Row # {0}: {1} Operacija nije završen za {2} Količina gotovih proizvoda u proizvodnji Order # {3}. Molimo vas da ažurirate rad status via Time Dnevnici
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investicije
 DocType: Issue,Resolution Details,Rezolucija o Brodu
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriterij prihvaćanja
@@ -1527,7 +1539,7 @@
 DocType: Holiday List,Clear Table,Poništi tabelu
 DocType: Features Setup,Brands,Brendovi
 DocType: C-Form Invoice Detail,Invoice No,Račun br
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Od narudžbenice
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Od narudžbenice
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite ne može se primijeniti / otkazan prije nego {0}, kao odsustvo ravnoteža je već carry-proslijeđen u budućnosti rekord raspodjeli odsustvo {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Kupac adrese i kontakti
@@ -1544,7 +1556,7 @@
 ,Maintenance Schedules,Održavanje Raspored
 ,Quotation Trends,Trendovi ponude
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,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
 ,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
@@ -1561,12 +1573,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Drvo finanial račune .
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} mora biti tipa 'Nepokretne imovine' jer je proizvod {1} imovina proizvoda
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} mora biti tipa 'Nepokretne imovine' jer je proizvod {1} imovina proizvoda
 DocType: HR Settings,HR Settings,Podešavanja ljudskih resursa
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Rashodi Tužba se čeka odobrenje . SamoRashodi Odobritelj može ažurirati status .
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Iznos
 DocType: Leave Block List Allow,Leave Block List Allow,Ostavite Blok Popis Dopustite
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Ukupno Actual
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,jedinica
@@ -1578,6 +1590,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je sadazadana Fiskalna godina . Osvježite svoj preglednik za promjene stupiti na snagu.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Trošak potraživanja
 DocType: Issue,Support,Podrška
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Pregled košarice
 ,BOM Search,BOM pretraga
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zatvaranje (Otvaranje + Ukupno)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Navedite valuta u Company
@@ -1589,13 +1602,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM pretvorbe je potrebno u redu {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Datum rasprodaja ne može biti prije datuma check u redu {0}
 DocType: Salary Slip,Deduction,Odbitak
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Stavka Cijena je dodao za {0} u {1} Cjenik
 DocType: Address Template,Address Template,Predložak adrese
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,Zadaci% Završen
 DocType: Project,Gross Margin,Bruto marža
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,invaliditetom korisnika
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,invaliditetom korisnika
 DocType: Opportunity,Quotation,Ponude
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 DocType: Quotation,Maintenance User,Održavanje korisnika
@@ -1604,7 +1618,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 / Olovo Adresa
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
 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
@@ -1614,12 +1628,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pratite prodajne akcije. Pratite Leads, Citati, naloga prodaje itd iz Kampanje procijeniti povrat investicije."
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock unosa postoje protiv skladište {0}, stoga ne možete ponovo dodijeliti ili mijenjati Skladište"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock unosa postoje protiv skladište {0}, stoga ne možete ponovo dodijeliti ili mijenjati Skladište"
 DocType: Appraisal,Calculate Total Score,Izračunaj ukupan rezultat
 DocType: Supplier Quotation,Manufacturing Manager,Proizvodnja Manager
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Split otpremnici u paketima.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Pošiljke
+apps/erpnext/erpnext/hooks.py +69,Shipments,Pošiljke
 DocType: Purchase Order Item,To be delivered to customer,Dostaviti kupcu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Vrijeme Log Status moraju biti dostavljeni.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada nijednoj Skladište
@@ -1639,10 +1653,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +356,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
 DocType: Currency Exchange,From Currency,Od novca
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Molimo odaberite Izdvojena količina, vrsta fakture i fakture Broj u atleast jednom redu"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Molimo odaberite Izdvojena količina, vrsta fakture i fakture Broj u atleast jednom redu"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Iznosi ne ogleda u sustav
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Drugi
@@ -1658,7 +1672,7 @@
 DocType: Quality Inspection,In Process,U procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Popust
 DocType: Purchase Order Item,Reference Document Type,Referentni dokument Tip
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} protiv naloga prodaje {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} protiv naloga prodaje {1}
 DocType: Account,Fixed Asset,Dugotrajne imovine
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serijalizovanoj zaliha
 DocType: Activity Type,Default Billing Rate,Uobičajeno Billing Rate
@@ -1668,7 +1682,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Naloga prodaje na isplatu
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time logova:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Molimo odaberite ispravan račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Molimo odaberite ispravan račun
 DocType: Item,Weight UOM,Težina UOM
 DocType: Employee,Blood Group,Krvna grupa
 DocType: Purchase Invoice Item,Page Break,Prijelom stranice
@@ -1699,10 +1713,10 @@
 DocType: Time Log,To Time,Za vrijeme
 DocType: Authorization Rule,Approving Role (above authorized value),Odobravanje ulogu (iznad ovlašteni vrijednost)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Da biste dodali djece čvorova , istražiti stablo i kliknite na čvoru pod kojima želite dodati više čvorova ."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
 DocType: Production Order Operation,Completed Qty,Završen Kol
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Cjenik {0} je onemogućen
 DocType: Manufacturing Settings,Allow Overtime,Omogućiti Prekovremeni rad
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za Stavka {1}. Ste dali za {2}.
@@ -1710,8 +1724,9 @@
 DocType: Item,Customer Item Codes,Customer Stavka Codes
 DocType: Opportunity,Lost Reason,Razlog gubitka
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Kreirajte plaćanja unosi protiv naloga ili faktura.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nova adresa
 DocType: Quality Inspection,Sample Size,Veličina uzorka
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Svi artikli su već fakturisani
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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"
 DocType: Project,External,Vanjski
@@ -1767,13 +1782,14 @@
 DocType: Rename Tool,Rename Tool,Preimenovanje alat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba artikla
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Prijenos materijala
 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 ."
 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
 DocType: Installation Note,Installation Note,Napomena instalacije
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Dodaj poreze
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Novčani tok iz Financiranje
 ,Financial Analytics,Financijski Analytics
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 DocType: Address,Subsidiary,Podružnica
@@ -1783,19 +1799,19 @@
 DocType: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Očekivani Stanje po banci
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Izvor sredstava ( pasiva)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redu {0} ( {1} ) mora biti isti kao proizvedena količina {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redu {0} ( {1} ) mora biti isti kao proizvedena količina {2}
 DocType: Appraisal,Employee,Zaposlenik
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Uvoz e-mail od
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Pozovi kao korisnika
 DocType: Features Setup,After Sale Installations,Nakon prodaje postrojenja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} je u potpunosti naplaćeno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} je u potpunosti naplaćeno
 DocType: Workstation Working Hour,End Time,End Time
 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 +75,Group by Voucher,Grupa po jamcu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Sales Invoice,Mass Mailing,Misa mailing
 DocType: Rename Tool,File to Rename,File da biste preimenovali
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Broj Purchse Order potrebno za točke {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Broj Purchse Order potrebno za točke {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Pokaži Plaćanja
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Raspored održavanja {0} mora biti otkazana prije poništenja ovu prodajnog naloga
@@ -1805,6 +1821,7 @@
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Kreiraj novog kupca
 DocType: Purchase Invoice,Credit To,Kreditne Da
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktivno Leads / kupaca
 DocType: Employee Education,Post Graduate,Post diplomski
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Održavanje Raspored Detalj
 DocType: Quality Inspection Reading,Reading 9,Čitanje 9
@@ -1816,6 +1833,7 @@
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Tool,Payment Account,Plaćanje računa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Neto promjena u Potraživanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
 DocType: Quality Inspection Reading,Accepted,Prihvaćeno
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.
@@ -1823,17 +1841,17 @@
 DocType: Payment Tool,Total Payment Amount,Ukupan iznos za plaćanje
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne može biti veći nego što je planirano quanitity ({2}) u proizvodnji Order {3}
 DocType: Shipping Rule,Shipping Rule Label,Naziv pravila transporta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kao što postoje postojećih zaliha transakcije za ovu stavku, \ ne možete promijeniti vrijednosti &#39;Ima Serial Ne&#39;, &#39;Ima serijski br&#39;, &#39;Je li Stock Stavka&#39; i &#39;Vrednovanje metoda&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Brzi unos u dnevniku
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Brzi unos u dnevniku
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti brzinu ako BOM spomenuo agianst bilo predmet
 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 +157,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 +211,{0} {1} is not submitted,{0} {1} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} nije podnesen
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
@@ -1846,7 +1864,7 @@
 DocType: Authorization Rule,Authorized Value,Ovlašteni Vrijednost
 DocType: Contact,Enter department to which this Contact belongs,Unesite odjel na koji se ovaj Kontakt pripada
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Ukupno Odsutan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Artikal ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Artikal ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Jedinica mjere
 DocType: Fiscal Year,Year End Date,Završni datum godine
 DocType: Task Depends On,Task Depends On,Zadatak ovisi o
@@ -1872,7 +1890,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 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.
 DocType: Customer Group,Has Child Node,Je li čvor dijete
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} protiv narudžbenicu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} protiv narudžbenicu {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Unesite statičke parametre URL ovdje (npr. pošiljatelj = ERPNext, username = ERPNext, lozinkom = 1234 itd.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ni na koji aktivno fiskalne godine. Za više detalja provjerite {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
@@ -1920,7 +1938,7 @@
  10. Dodavanje ili Oduzeti: Bilo da želite dodati ili oduzeti porez."
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 DocType: Tax Rule,Billing City,Billing Grad
 DocType: Global Defaults,Hide Currency Symbol,Sakrij simbol valute
@@ -1952,6 +1970,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,komunalna Troškovi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
 DocType: Buying Settings,Default Buying Price List,Zadani cjenik kupnje
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,No zaposlenih za gore odabrane kriterije ili plate klizanja već stvorio
 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."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Vrsta plaćanja
@@ -1987,7 +2006,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Pogledajte &quot;stopa materijali na temelju troškova&quot; u odjeljak
 DocType: Appraisal Goal,Key Responsibility Area,Područje odgovornosti
 DocType: Item Reorder,Material Request Type,Materijal Zahtjev Tip
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Red {0}: UOM Faktor konverzije je obavezno
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref.
 DocType: Cost Center,Cost Center,Troška
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,bon #
@@ -2010,7 +2029,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Stock Postavke
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeće osobine su iste u oba zapisa. Grupa je, Root Tip, Društvo"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeće osobine su iste u oba zapisa. Grupa je, Root Tip, Društvo"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Upravljanje grupi kupaca stablo .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Novi troška Naziv
 DocType: Leave Control Panel,Leave Control Panel,Ostavite Upravljačka ploča
@@ -2030,8 +2049,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Alat plaćanja Detail
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} {1} # postoji protiv ulaska zaliha {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} {1} # postoji protiv ulaska zaliha {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Zajmovi i predujmovi (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Veliki
@@ -2050,7 +2069,7 @@
 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.
 DocType: Production Order Operation,Make Time Log,Make Time Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Molimo podesite Ponovno redj količinu
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Molimo podesite Ponovno redj količinu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
 DocType: Price List,Applicable for Countries,Za zemlje u
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Računari
@@ -2110,10 +2129,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,No Napomene
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,No Napomene
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Istekao
 DocType: Account,Stock Received But Not Billed,Stock primljeni Ali ne Naplaćeno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root račun mora biti grupa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root račun mora biti grupa
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plaće + + zaostatak Iznos Iznos Encashment - Ukupno Odbitak
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
 DocType: Features Setup,Sales and Purchase,Prodaja i nabavka
@@ -2127,6 +2146,7 @@
 DocType: Journal Entry Account,Party Balance,Party Balance
 DocType: Sales Invoice Item,Time Log Batch,Vrijeme Log Hrpa
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Molimo odaberite Apply popusta na
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Plaća Slip Created
 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: Stock Entry,Material Transfer for Manufacture,Prijenos materijala za izradu
@@ -2134,9 +2154,9 @@
 DocType: Purchase Invoice,Half-yearly,Polugodišnje
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskalna godina {0} nije pronađen.
 DocType: Bank Reconciliation,Get Relevant Entries,Kreiraj relevantne ulaze
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Računovodstvo Entry za Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Računovodstvo Entry za Stock
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Artikal {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Artikal {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
 DocType: Account,Root Type,korijen Tip
@@ -2145,15 +2165,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Prikaži ovaj slideshow na vrhu stranice
 DocType: BOM,Item UOM,Mjerna jedinica artikla
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Iznos PDV-a Nakon Popust Iznos (Company valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
 DocType: Quality Inspection,Quality Inspection,Provjera kvalitete
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ili BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Mogu samo napraviti uplatu protiv nenaplaćenu {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Mogu samo napraviti uplatu protiv nenaplaćenu {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventar Level
 DocType: Stock Entry,Subcontract,Podugovor
@@ -2191,7 +2211,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Dolazni kvalitete inspekcije.
 DocType: Purchase Order Item,Returned Qty,Vraćeni Količina
 DocType: Employee,Exit,Izlaz
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Korijen Tip je obvezno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Korijen Tip je obvezno
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijski Ne {0} stvorio
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
 DocType: Employee,You can enter any date manually,Možete unijeti bilo koji datum ručno
@@ -2199,8 +2219,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Probni rad
 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 +110,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Klijent mora biti kredit
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kupnja Prijem artikla Isporuka
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Platiti
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Platiti
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,To datuma i vremena
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Dnevnici za održavanje sms statusa isporuke
@@ -2217,7 +2238,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Ponovno red Level
 DocType: Attendance,Attendance Date,Gledatelja Datum
 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 +110,Account with child nodes cannot be converted to ledger,Konto sa pod-kontima se ne može pretvoriti u glavnoj knjizi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Konto sa pod-kontima se ne može pretvoriti u glavnoj knjizi
 DocType: Address,Preferred Shipping Address,Željena Dostava Adresa
 DocType: Purchase Receipt Item,Accepted Warehouse,Prihvaćeno skladište
 DocType: Bank Reconciliation Detail,Posting Date,Objavljivanje Datum
@@ -2235,7 +2256,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serijski Ne {0} ne postoji
 DocType: Pricing Rule,Discount Percentage,Postotak rabata
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
-apps/erpnext/erpnext/hooks.py +54,Orders,Narudžbe
+apps/erpnext/erpnext/hooks.py +55,Orders,Narudžbe
 DocType: Leave Control Panel,Employee Type,Zaposlenik Tip
 DocType: Employee Leave Approver,Leave Approver,Ostavite odobravatelju
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materijal za Preneseni Proizvodnja
@@ -2247,7 +2268,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Materijala naplaćeno protiv ovog prodajnog naloga
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Period zatvaranja Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija
+DocType: Account,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
 DocType: Customer,Credit Limit,Kreditni limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Odaberite vrstu transakcije
@@ -2272,11 +2293,12 @@
 DocType: Material Request,Requested For,Traženi Za
 DocType: Quotation Item,Against Doctype,Protiv DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Prati ovu napomenu isporuke protiv bilo Projekta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Korijen račun ne može biti izbrisan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Neto novčani tok od investicione
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Korijen račun ne može biti izbrisan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Show Stock unosi
 ,Is Primary Address,Je primarna adresa
 DocType: Production Order,Work-in-Progress Warehouse,Rad u tijeku Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} od {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Upravljanje Adrese
 DocType: Pricing Rule,Item Code,Šifra artikla
 DocType: Production Planning Tool,Create Production Orders,Stvaranje radne naloge
@@ -2284,7 +2306,7 @@
 DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposlenik Unutarnji Rad Povijest
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Zatvaranje (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Zatvaranje (Dr)
 DocType: Contact,Passive,Pasiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijski Ne {0} nije u dioničko
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Porezna predložak za prodaju transakcije .
@@ -2300,7 +2322,7 @@
 ,Billed Amount,Naplaćeni iznos
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get Updates
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materijal Zahtjev {0} je otkazan ili zaustavljen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Materijal Zahtjev {0} je otkazan ili zaustavljen
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Dodati nekoliko uzorku zapisa
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Ostavite Management
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa po računu
@@ -2309,14 +2331,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Glava računa pod odgovornosti , u kojoj dobit / gubitak će biti rezerviran"
 DocType: Payment Tool,Against Vouchers,Protiv Vaučeri
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Brza pomoć
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Prodajni dodaci
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} od troška {2} premašit će po {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
 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 ' To Date """
 ,Stock Projected Qty,Stock Projekcija Kol
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
 DocType: Sales Order,Customer's Purchase Order,Narudžbenica kupca
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,"Vrijednost, ili kol"
@@ -2326,9 +2348,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Ostavite Block List dopuštenih
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Vi ćete ga koristiti za prijavu
 DocType: Sales Partner,Retailer,Prodavač na malo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit na račun mora biti bilans stanja računa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Sve vrste dobavljača
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +46,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 +93,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Održavanje Raspored predmeta
 DocType: Sales Order,%  Delivered,Isporučena%
@@ -2372,7 +2394,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + ambalaža težina. (Za tisak)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
 DocType: Serial No,Is Cancelled,Je otkazan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moj Pošiljke
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Moj Pošiljke
 DocType: Journal Entry,Bill Date,Datum računa
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Čak i ako postoji više Cijene pravila s najvišim prioritetom, onda sljedeći interni prioriteti primjenjuje se:"
 DocType: Supplier,Supplier Details,Dobavljač Detalji
@@ -2393,10 +2415,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Pozivi
 DocType: Project,Total Costing Amount (via Time Logs),Ukupan iznos Costing (putem Time Dnevnici)
 DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,projektiran
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
 DocType: Notification Control,Quotation Message,Ponuda - poruka
 DocType: Issue,Opening Date,Otvaranje Datum
 DocType: Journal Entry,Remark,Primjedba
@@ -2409,9 +2431,9 @@
 DocType: Time Log,Batched for Billing,Izmiješane za naplatu
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Mjenice podigao dobavljače.
 DocType: POS Profile,Write Off Account,Napišite Off račun
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Neto novčani tok od operacije
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,na primjer PDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Stavka 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun
@@ -2452,7 +2474,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Isporučena
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Teritorij Mete
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2480,10 +2502,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch broj je obavezno za Stavka {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To jekorijen prodavač i ne može se mijenjati .
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Stopa: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Stopa: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plaća proklizavanja Odbitak
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Odaberite grupu čvora prvi.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Svrha mora biti jedan od {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Svrha mora biti jedan od {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Ispunite obrazac i spremite ga
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Preuzmite izvješće koje sadrži sve sirovine sa svojim najnovijim statusom inventara
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
@@ -2521,7 +2543,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za točku {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Napomena: Ako se plaćanje ne vrši protiv bilo koje reference, ručno napraviti Journal Entry."
@@ -2538,12 +2560,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' je onemogućena
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi kao Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski da Kontakti na podnošenje transakcija.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Red {0}: Količina nije avalable u skladištu {1} {2} na {3}. Dostupno Količina: {4}, transfera Qty: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Stavka 3
 DocType: Purchase Order,Customer Contact Email,Customer Contact mail
 DocType: Sales Team,Contribution (%),Doprinos (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Predložak
 DocType: Sales Person,Sales Person Name,Ime referenta prodaje
@@ -2554,20 +2576,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Prije nego pomirenje
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,Zadani BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Molimo vas da ponovno tipa naziv firme za potvrdu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Ukupno Outstanding Amt
 DocType: Time Log Batch,Total Hours,Ukupno vrijeme
 DocType: Journal Entry,Printing Settings,Printing Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilska industrija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od otpremnici
 DocType: Time Log,From Time,S vremena
 DocType: Notification Control,Custom Message,Prilagođena poruka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,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/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
 DocType: Purchase Invoice,Price List Exchange Rate,Cjenik tečajna
 DocType: Purchase Invoice Item,Rate,VPC
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,stažista
@@ -2586,9 +2608,10 @@
  dodjeljivanjem prioriteta. Cijena Pravila: {0}"
 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 +580,Issue Material,Izdanje materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Izdanje materijala
 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
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,Serijski br
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Unesite prva Maintaince Detalji
@@ -2602,10 +2625,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalni iznos fakture
 DocType: Purchase Invoice Item,Image View,Prikaz slike
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
@@ -2613,6 +2638,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ovaj proizvod varijanta {0} (Template). Atributi će se kopirati preko iz predloška, osim 'Ne Copy ""je postavljena"
 DocType: Account,Purchase User,Kupovina korisnika
 DocType: Notification Control,Customize the Notification,Prilagodite Obavijest
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Novčani tok iz poslovanja
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
 DocType: Sales Invoice,Shipping Rule,Pravilo transporta
 DocType: Journal Entry,Print Heading,Ispis Naslov
@@ -2623,7 +2649,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,sirovine
 DocType: Leave Application,Follow via Email,Slijedite putem e-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Molimo najprije odaberite Datum knjiženja
@@ -2641,6 +2667,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serijski Nos potrebna za serijaliziranom točke {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Odnosi se na (Oznaka)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Dodaj u košaricu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Omogućiti / onemogućiti valute .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštanski troškovi
@@ -2648,30 +2675,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Purchase Order,The date on which recurring order will be stop,Datum na koji se ponavlja kako će se zaustaviti
 DocType: Quality Inspection,Item Serial No,Serijski broj artikla
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati overflow toleranciju
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati overflow toleranciju
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Ukupno Present
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Sat
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serijalizovani Stavka {0} ne može se ažurirati \
  koristeći Stock pomirenje"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transfera Materijal dobavljaču
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Transfera Materijal dobavljaču
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,stvaranje citata
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće na bloku Termini
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Svi ovi artikli su već fakturisani
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Svi ovi artikli su već fakturisani
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Može biti odobren od strane {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Uslovi pravila transporta
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM nakon zamjene
 DocType: Features Setup,Point of Sale,Point of Sale
 DocType: Account,Tax,Porez
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} nije važeći {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Od Bundle proizvoda
 DocType: Production Planning Tool,Production Planning Tool,Planiranje proizvodnje alat
 DocType: Quality Inspection,Report Date,Prijavi Datum
 DocType: C-Form,Invoices,Fakture
 DocType: Job Opening,Job Title,Titula
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Primatelji
 DocType: Features Setup,Item Groups in Details,Grupe artikala u detaljima
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -2679,8 +2705,9 @@
 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: Pricing Rule,Customer Group,Kupac Grupa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: Item,Website Description,Web stranica Opis
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Neto promjena u kapitalu
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
 ,Sales Register,Prodaja Registracija
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
@@ -2688,12 +2715,12 @@
 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/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Sažetak za ovaj mjesec i aktivnostima na čekanju
 DocType: Customer Group,Customer Group Name,Kupac Grupa Ime
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Atributi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Kreiraj proizvode
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Unesite otpis račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Kreiraj proizvode
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order Datum
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Provjerite trošarinske fakturu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Računa {0} ne pripada kompaniji {1}
@@ -2709,7 +2736,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt - mudar podaci nisu dostupni za ponudu
 DocType: Project,Expected End Date,Očekivani Datum završetka
 DocType: Appraisal Template,Appraisal Template Title,Procjena Predložak Naslov
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,trgovački
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,trgovački
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti Stock Item
 DocType: Cost Center,Distribution Id,ID distribucije
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Nevjerovatne usluge
@@ -2722,7 +2749,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vrijednost za Atributi {0} mora biti u rasponu od {1} {2} da u koracima od {3}
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Uobičajeno Potraživanja Računi
@@ -2734,16 +2761,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Kupovina Primici
-DocType: Payment Reconciliation,Maximum Amount,Maksimalni iznos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kako se primjenjuje pravilo cijena?
 DocType: Quality Inspection,Delivery Note No,Otpremnica br
 DocType: Company,Retail,Maloprodaja
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Korisnik {0} ne postoji
 DocType: Attendance,Absent,Odsutan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle proizvoda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Red {0}: Invalid referentni {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Red {0}: Invalid referentni {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupiti poreza i naknada Template
 DocType: Upload Attendance,Download Template,Preuzmite predložak
 DocType: GL Entry,Remarks,Primjedbe
@@ -2770,7 +2797,7 @@
 ,Monthly Attendance Sheet,Mjesečna posjećenost list
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ne rekord naći
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: troška je obvezno za točku {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} nije aktivan
 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
@@ -2779,8 +2806,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' Račun dobiti i gubitka ' vrsta računa {0} nije dopuštena u otvor za
 DocType: Features Setup,Sales Discounts,Prodajni popusti
 DocType: Hub Settings,Seller Country,Prodavač Država
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Objavite Artikli na sajtu
 DocType: Authorization Rule,Authorization Rule,Autorizacija Pravilo
 DocType: Sales Invoice,Terms and Conditions Details,Uvjeti Detalji
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,tehnički podaci
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodaja poreza i naknada Template
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Broj Order
@@ -2802,7 +2831,7 @@
 DocType: Time Log,Billing Amount,Billing Iznos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Navedena je pogrešna količina za proizvod {0}. Količina treba biti veći od 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Prijave za odsustvo.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konto sa postojećim transakcijama se ne može izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Konto sa postojećim transakcijama se ne može izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Pravni troškovi
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Na dan u mjesecu na kojima auto kako će biti generiran npr 05, 28 itd"
 DocType: Sales Invoice,Posting Time,Objavljivanje Vrijeme
@@ -2818,11 +2847,11 @@
 DocType: Maintenance Visit,Breakdown,Slom
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutnom: {1} se ne mogu odabrati
 DocType: Bank Reconciliation Detail,Cheque Date,Datum čeka
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Nadređeni konto {1} ne pripada preduzeću: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Nadređeni konto {1} ne pripada preduzeću: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Uspješno obrisane sve transakcije koje se odnose na ove kompanije!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kao i na datum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probni rad
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto umetak Cjenik stopa ako nedostaje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Ukupno uplaćeni iznos
@@ -2834,6 +2863,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Ukupan iznos naplate (putem Time Dnevnici)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Prodajemo ovaj artikal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dobavljač Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Količina bi trebao biti veći od 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt ukratko
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Tip lišća poput casual, bolovanja i sl."
@@ -2842,7 +2872,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Dodaj redak za izračun godišnjeg proračuna.
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
 DocType: Production Order,Total Operating Cost,Ukupni trošak
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Napomena : Stavka {0} upisan je više puta
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Napomena : Stavka {0} upisan je više puta
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Svi kontakti.
 DocType: Newsletter,Test Email Id,Test E-mail ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Skraćeni naziv preduzeća
@@ -2867,7 +2897,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Porez Template je obavezno.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Nadređeni konto {1} ne postoji
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Privremen
 DocType: Address,Preferred Billing Address,Željena adresa za naplatu
@@ -2885,8 +2915,8 @@
 ,Item-wise Price List Rate,Stavka - mudar Cjenovnik Ocijenite
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zaustavljen
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} je zaustavljen
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
 DocType: Lead,Add to calendar on this date,Dodaj u kalendar na ovaj datum
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravila za dodavanjem troškove prijevoza .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Najave događaja
@@ -2907,24 +2937,24 @@
 DocType: Customer,From Lead,Od Olovo
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
 DocType: Hub Settings,Name Token,Ime Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standardna prodaja
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Replace Tool,Replace,Zamijeniti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} protiv prodaje fakture {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} protiv prodaje fakture {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
 DocType: Purchase Invoice Item,Project Name,Naziv projekta
 DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
 DocType: Features Setup,Item Batch Nos,Broj serije artikla
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Vrijednost razlika
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Human Resource
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,porezna imovina
 DocType: BOM Item,BOM No,BOM br.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM koji će biti zamijenjen
 DocType: Account,Debit,Zaduženje
@@ -2961,7 +2991,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Financijska godina End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Provjerite Supplier kotaciji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Provjerite Supplier kotaciji
 DocType: Quality Inspection,Incoming,Dolazni
 DocType: BOM,Materials Required (Exploded),Materijali Obavezno (eksplodirala)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Smanjenje plaća za ostaviti bez plaće (lwp)
@@ -2969,7 +2999,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: {1} Serial No ne odgovara {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual dopust
 DocType: Batch,Batch ID,ID serije
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Napomena : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Napomena : {0}
 ,Delivery Note Trends,Trendovi otpremnica
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ovonedeljnom Pregled
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora bitikupljen ili pod-ugovori stavka u nizu {1}
@@ -2984,6 +3014,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Prosj. Buying Rate
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Količina ukupne emisije / Prijevoz {0} u Industrijska Zahtjev {1} ne može biti veća od tražene količine {2} {3} za artikl
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletteri
 DocType: Address,Shipping,Transport
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Stupanje
@@ -3003,7 +3034,6 @@
 DocType: Purchase Order,End date of current order's period,Datum završetka perioda trenutne Reda
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Make Ponuda Pismo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Povratak
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Uobičajeno mjerna jedinica za varijantu mora biti isti kao predložak
 DocType: Production Order Operation,Production Order Operation,Proizvodnja Order Operation
 DocType: Pricing Rule,Disable,Ugasiti
 DocType: Project Task,Pending Review,U tijeku pregled
@@ -3011,7 +3041,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Customer Id
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Vrijeme da mora biti veći od s vremena
 DocType: Journal Entry Account,Exchange Rate,Tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladište {0}: Parent račun {1} ne Bolong tvrtki {2}
 DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
 DocType: Account,Asset,Asset
@@ -3031,7 +3061,7 @@
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,upravljanja kvalitetom
 DocType: Production Planning Tool,Filter based on customer,Filter temelji se na kupca
 DocType: Payment Tool Detail,Against Voucher No,Protiv vaučera Nema
@@ -3048,6 +3078,7 @@
 DocType: Opportunity,Next Contact,Sljedeći Kontakt
 DocType: Employee,Employment Type,Zapošljavanje Tip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dugotrajna imovina
+,Cash Flow,Priliv novca
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Period aplikacija ne može biti na dva alocation Records
 DocType: Item Group,Default Expense Account,Zadani račun rashoda
 DocType: Employee,Notice (days),Obavijest (dani )
@@ -3079,13 +3110,12 @@
 DocType: Production Order,Warehouses,Skladišta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Ispis i stacionarnih
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
-DocType: Payment Reconciliation,Minimum Amount,Minimalni iznos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Update gotovih proizvoda
 DocType: Workstation,per hour,na sat
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto za skladište (stalni inventar) stvorit će se na osnovu ovog konta .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladište se ne može izbrisati , kao entry stock knjiga postoji za to skladište ."
 DocType: Company,Distribution,Distribucija
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Plaćeni iznos
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Plaćeni iznos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksimalni popust dopušteno za predmet: {0} je {1}%
@@ -3109,7 +3139,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitike podrške
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Tvrtka je nestalo u skladištima {0}
 DocType: POS Profile,Terms and Conditions,Odredbe i uvjeti
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Za datum mora biti unutar fiskalne godine. Pod pretpostavkom da bi datum = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Za datum mora biti unutar fiskalne godine. Pod pretpostavkom da bi datum = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ovdje možete održavati visina, težina, alergije, medicinske brige itd."
 DocType: Leave Block List,Applies to Company,Odnosi se na preduzeće
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Ne mogu otkazati , jer podnijela Stock Stupanje {0} postoji"
@@ -3123,11 +3153,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Unesite Kupovina Primici
 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 +425,Transaction not allowed against stopped Production Order {0},Transakcija nije dopuštena protiv zaustavljena proizvodnja Reda {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Postavljanje dolazni poslužitelj za podršku e-mail ID . ( npr. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatak Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' To Date ' je potrebno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generirajte pakovanje Slips za pakete dostaviti. Koristi se za obavijesti paket broja, sadržaj paket i njegove težine."
@@ -3216,7 +3246,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Zaposlenih evidencija.
 DocType: HR Settings,Payroll Settings,Postavke plaće
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Place Order
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Place Order
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Korijen ne mogu imati središte troškova roditelj
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Odaberite Marka ...
 DocType: Sales Invoice,C-Form Applicable,C-obrascu
@@ -3231,7 +3261,7 @@
 DocType: Appraisal,Start Date,Datum početka
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Dodijeli odsustva za period.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Kliknite ovdje za provjeru
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Ne može se označiti kao nadređeni konto samom sebi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Konto {0}: Ne može se označiti kao nadređeni konto samom sebi
 DocType: Purchase Invoice Item,Price List Rate,Cjenik Stopa
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Show &quot;na lageru&quot; ili &quot;Nije u skladištu&quot; temelji se na skladištu dostupna u tom skladištu.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Sastavnice (BOM)
@@ -3240,17 +3270,17 @@
 DocType: Project,Expected Start Date,Očekivani datum početka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Uklonite stavku ako naknada nije primjenjiv na tu stavku
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr.. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Primiti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Primiti
 DocType: Maintenance Visit,Fully Completed,Potpuno Završeni
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} je uspješno dodan u newsletter listu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Ne može proglasiti izgubili , jer citat je napravio ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kupovina Master Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +136,Main Reports,Glavni izvještaji
 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
@@ -3268,7 +3298,7 @@
 DocType: Industry Type,Industry Type,Industrija Tip
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Nešto nije bilo u redu!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Završetak Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Iznos (valuta preduzeća)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
@@ -3287,10 +3317,10 @@
 ,Serial No Service Contract Expiry,Serijski Bez isteka Ugovor o pružanju usluga
 DocType: Item,Unit of Measure Conversion,Jedinica mjere pretvorbe
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaposleni se ne može mijenjati
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ne možete kreditnim i debitnim isti račun u isto vrijeme
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Ne možete kreditnim i debitnim isti račun u isto vrijeme
 DocType: Naming Series,Help HTML,HTML pomoć
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
 DocType: Address,Name of person or organization that this address belongs to.,Ime osobe ili organizacije kojoj ova adresa pripada.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Vaši dobavljači
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
@@ -3302,35 +3332,35 @@
 DocType: Item,Has Serial No,Ima serijski br
 DocType: Employee,Date of Issue,Datum izdavanja
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} {1} za
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite Multi opciju valuta kako bi se omogućilo račune sa drugoj valuti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite Multi opciju valuta kako bi se omogućilo račune sa drugoj valuti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Detaljnije: {0} ne postoji u sustavu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje Frozen vrijednost
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje Frozen vrijednost
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
+DocType: Payment Reconciliation,From Invoice Date,Iz Datum računa
 DocType: Cost Center,Budgets,Budžeti
-DocType: Employee,Emergency Contact Details,Hitna Kontaktni podaci
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Što učiniti ?
 DocType: Delivery Note,To Warehouse,Za skladište
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} je upisan više od jednom za fiskalnu godinu {1}
 ,Average Commission Rate,Prosječna stopa komisija
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,' Je rednim brojem ' ne može biti ' Da ' za ne - stock stavke
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,' Je rednim brojem ' ne može biti ' Da ' za ne - stock stavke
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,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ć
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje konta
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Update dodatne troškove za izračun troškova spustio stavki
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Električna
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost Razlika (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Red {0}: kursa obavezna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Red {0}: kursa obavezna
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Korisnik ID nije postavljen za zaposlenika {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od garantnom roku
 DocType: Stock Entry,Default Source Warehouse,Zadano izvorno skladište
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dana od posljednje narudžbe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
@@ -3343,7 +3373,7 @@
 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
 DocType: Authorization Rule,Based On,Na osnovu
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Stavka {0} je onemogućeno
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Stavka {0} je onemogućeno
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Period od perioda i datumima obavezno ponavljaju {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt aktivnost / zadatak.
@@ -3351,7 +3381,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis Iznos (poduzeća Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Sleteo Cost vaučera
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Molimo postavite {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan u mjesecu
@@ -3381,12 +3411,12 @@
 DocType: Upload Attendance,Upload Attendance,Upload Attendance
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina su potrebne
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Range 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Iznos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Iznos
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM zamijenjeno
 ,Sales Analytics,Prodajna analitika
 DocType: Manufacturing Settings,Manufacturing Settings,Proizvodnja Settings
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Postavljanje e-pošte
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Unesite zadanu valutu u tvrtki Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Daily Podsjetnici
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Porez pravilo sukoba sa {0}
@@ -3412,13 +3442,13 @@
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,inženjer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Traži Sub skupština
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Kod artikla je potreban u redu broj {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Kod artikla je potreban u redu broj {0}
 DocType: Sales Partner,Partner Type,Partner Tip
 DocType: Purchase Taxes and Charges,Actual,Stvaran
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 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 +263,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
 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
@@ -3430,15 +3460,15 @@
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
 DocType: Employee,Cheque,Ček
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija Updated
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Vrsta izvješća je obvezno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Vrsta izvješća je obvezno
 DocType: Item,Serial Number Series,Serijski broj serije
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,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/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,Cross Oglas tačke u više grupa
 apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Prvo Korisnik : Vi
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Uspješno Pomirio
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Uspješno Pomirio
 DocType: Production Order,Planned End Date,Planirani Završni datum
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Gdje predmeti su pohranjeni.
 DocType: Tax Rule,Validity,Punovažnost
@@ -3446,7 +3476,7 @@
 DocType: Attendance,Attendance,Pohađanje
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Porezna Predložak za kupnju transakcije .
 ,Item Prices,Cijene artikala
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,U riječi će biti vidljiv nakon što spremite narudžbenice.
@@ -3455,15 +3485,15 @@
 DocType: Task,Review Date,Recenzija Datum
 DocType: Purchase Invoice,Advance Payments,Avansna plaćanja
 DocType: Purchase Taxes and Charges,On Net Total,Na Net Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target skladište u redu {0} mora biti ista kao Production Order
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,No dozvolu za korištenje alat za plaćanje
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Obavijest E-mail adrese' nije specificirano ponavljaju% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Valuta ne mogu se mijenjati nakon što unose preko neke druge valute
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Zaokružiti račun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni troškovi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,savjetodavni
 DocType: Customer Group,Parent Customer Group,Roditelj Kupac Grupa
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Promjena
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Promjena
 DocType: Purchase Invoice,Contact Email,Kontakt email
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
@@ -3473,13 +3503,13 @@
 DocType: Packing Slip,Gross Weight UOM,Bruto težina UOM
 DocType: Email Digest,Receivables / Payables,Potraživanja / obveze
 DocType: Delivery Note Item,Against Sales Invoice,Protiv prodaje fakture
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Kreditni račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Sletio Troškovi artikla
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Pokazati nultu vrijednosti
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina predmeta dobije nakon proizvodnju / pakiranje od navedenih količina sirovina
 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 +562,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 DocType: Task,Actual End Date (via Time Logs),Stvarni Završni datum (via vrijeme Dnevnici)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budžet se ne može dodijeliti protiv grupe računa {0}
@@ -3515,29 +3545,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planirajte vrijeme za rezanje izvan Workstation Radno vrijeme.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} je već poslan
 ,Items To Be Requested,Potraživani artikli
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing brzine na osnovu aktivnosti Tip (po satu)
 DocType: Company,Company Info,Podaci o preduzeću
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","E-mail nije poslan, preduzeće nema definisan e-mail"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 DocType: Production Planning Tool,Filter based on item,Filtrirati na temelju točki
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Zaduži račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Zaduži račun
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
 DocType: Attendance,Employee Name,Zaposlenik Ime
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaobljeni Ukupno (Društvo valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Ne mogu da konvertovanje Group, jer je izabran Account Type."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Ne mogu da konvertovanje Group, jer je izabran Account Type."
 DocType: Purchase Common,Purchase Common,Kupnja Zajednička
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} je izmijenjen . Osvježite.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Prestani korisnike od izrade ostaviti aplikacija na sljedećim danima.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,od Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne postoji
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Mjenice podignuta na kupce.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} pretplatnika dodao
 DocType: Maintenance Schedule,Schedule,Raspored
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definirati budžeta za ovu troškova Centra. Za postavljanje budžet akciju, pogledajte &quot;Lista preduzeća&quot;"
@@ -3545,7 +3576,7 @@
 DocType: Quality Inspection Reading,Reading 3,Čitanje 3
 ,Hub,Čvor
 DocType: GL Entry,Voucher Type,Bon Tip
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
 DocType: Expense Claim,Approved,Odobreno
 DocType: Pricing Rule,Price,Cijena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
@@ -3559,7 +3590,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Računovodstvene stavke
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina na Od Skladište
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Molimo odaberite zaposlenih Record prvi.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: Party / računa ne odgovara {1} / {2} u {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: Party / računa ne odgovara {1} / {2} u {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Za stvaranje porezno
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Zaliha
@@ -3570,7 +3601,7 @@
 DocType: Employee,Contract End Date,Ugovor Datum završetka
 DocType: Sales Order,Track this Sales Order against any Project,Prati ovu prodajni nalog protiv bilo Projekta
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Povucite prodajne naloge (na čekanju za isporuku) na temelju navedenih kriterija
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Od dobavljača kotaciju
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Od dobavljača kotaciju
 DocType: Deduction Type,Deduction Type,Tip odbitka
 DocType: Attendance,Half Day,Pola dana
 DocType: Pricing Rule,Min Qty,Min kol
@@ -3578,7 +3609,7 @@
 DocType: GL Entry,Transaction Date,Transakcija Datum
 DocType: Production Plan Item,Planned Qty,Planirani Kol
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Ukupno porez
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Qty) je obavezno
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Qty) je obavezno
 DocType: Stock Entry,Default Target Warehouse,Centralno skladište
 DocType: Purchase Invoice,Net Total (Company Currency),Neto Ukupno (Društvo valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Party Tip i stranka je primjenjiv samo protiv potraživanja / računa dobavljača
@@ -3632,9 +3663,9 @@
 DocType: Customer,Commission Rate,Komisija Stopa
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Košarica je prazna
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košarica je prazna
 DocType: Production Order,Actual Operating Cost,Stvarni operativnih troškova
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Korijen ne može se mijenjati .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Korijen ne može se mijenjati .
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Dodijeljeni iznos ne može veći od iznosa unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Dopustite Production o praznicima
 DocType: Sales Order,Customer's Purchase Order Date,Kupca narudžbenice Datum
@@ -3645,11 +3676,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Uvjeti predloška
 DocType: Serial No,Delivery Details,Detalji isporuke
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatski kreirati Materijal Zahtjev ako količina padne ispod tog nivoa
 ,Item-wise Purchase Register,Stavka-mudar Kupnja Registracija
 DocType: Batch,Expiry Date,Datum isteka
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Da biste postavili Ponovno redj nivo, stavka mora biti kupovine stavke ili Proizvodnja artikla"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Da biste postavili Ponovno redj nivo, stavka mora biti kupovine stavke ili Proizvodnja artikla"
 ,Supplier Addresses and Contacts,Supplier Adrese i kontakti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Molimo odaberite kategoriju prvi
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt majstor.
@@ -3657,7 +3688,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Party Tip i stranka je potreban za potraživanja / računa plaćaju {1}
@@ -3665,7 +3696,7 @@
 DocType: Employee,Reason for Leaving,Razlog za odlazak
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: GL Entry,Is Opening,Je Otvaranje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debitne stavka ne može se povezati sa {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konto {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debitne stavka ne može se povezati sa {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Konto {0} ne postoji
 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 a06b7f5..8d9c6ed 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productes de Consum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Seleccioneu Partit Tipus primer
 DocType: Item,Customer Items,Articles de clients
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Compte {0}: compte pare {1} no pot ser un llibre de comptabilitat
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Compte {0}: compte pare {1} no pot ser un llibre de comptabilitat
 DocType: Item,Publish Item to hub.erpnext.com,Publicar article a hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Notificacions per correu electrònic
 DocType: Item,Default Unit of Measure,Unitat de mesura per defecte
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Informa de la divisa pera la Llista de preus {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Es calcularà en la transacció.
 DocType: Purchase Order,Customer Contact,Client Contacte
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,De Sol·licituds de materials
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,De Sol·licituds de materials
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Arbre
 DocType: Job Applicant,Job Applicant,Job Applicant
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hi ha més resultats.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Utilitza aquesta opció per mantenir el codi de l'article del client i incloure'l en les cerques en base al seu codi
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de Compte de Pagament
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mostra variants
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Quantitat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Quantitat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstecs (passius)
 DocType: Employee Education,Year of Passing,Any de defunció
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En estoc
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sanitari
 DocType: Purchase Invoice,Monthly,Mensual
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Retard en el pagament (dies)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitat
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adreça de correu electrònic
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Any fiscal {0} és necessari
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Puntuació (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincideix amb {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincideix amb {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle n
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Seleccionla llista de preus
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Seleccionla llista de preus
 DocType: Production Order Operation,Work In Progress,Treball en curs
 DocType: Employee,Holiday List,Llista de vacances
 DocType: Time Log,Time Log,Hora de registre
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Igual Company s&#39;introdueix més d&#39;una vegada
 DocType: Employee,Married,Casat
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},No està permès per {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Botiga
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Feu entrada del banc
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fons de Pensions
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Warehouse és obligatori si el tipus de compte és Magatzem
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Warehouse és obligatori si el tipus de compte és Magatzem
 DocType: SMS Center,All Sales Person,Tot el personal de vendes
 DocType: Lead,Person Name,Nom de la Persona
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Marca-ho si és una ordre recurrent, desmarca per aturar recurrents o posa la data final"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Interessat
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Llista de materials (BOM)
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Obertura
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Des {0} a {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Des {0} a {1}
 DocType: Item,Copy From Item Group,Copiar del Grup d'Articles
 DocType: Journal Entry,Opening Entry,Entrada Obertura
 DocType: Stock Entry,Additional Costs,Despeses addicionals
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Compta amb la transacció existent no es pot convertir en grup.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Compta amb la transacció existent no es pot convertir en grup.
 DocType: Lead,Product Enquiry,Consulta de producte
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Si us plau ingressi empresa primer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Si us plau seleccioneu l'empresa primer
 DocType: Employee Education,Under Graduate,Baix de Postgrau
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Cost total
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registre d'activitat:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,L'Article {0} no existeix en el sistema o ha caducat
@@ -165,7 +165,7 @@
 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","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 +444,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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,S'actualitzarà després de la presentació de la factura de venda.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Ajustaments per al Mòdul de Recursos Humans
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Els detalls de les operacions realitzades.
 DocType: Serial No,Maintenance Status,Estat de manteniment
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Articles i preus
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de la data ha de ser dins de l'any fiscal. Suposant De Data = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de la data ha de ser dins de l'any fiscal. Suposant De Data = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Seleccioneu l'empleat per al qual està creant l'Avaluació.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},El Centre de cost {0} no pertany a l'empresa {1}
 DocType: Customer,Individual,Individual
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Efectiu net de Finançament
 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
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Següent Recurrent {0} es crearà a {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Nom de Contacte
 DocType: Production Plan Item,SO Pending Qty,SO Pendent Quantitat
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nòmina per als criteris abans esmentats.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Cap descripció donada
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Sol·licitud de venda.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,Especificacions d'article al Web
 DocType: Payment Tool,Reference No,Referència número
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,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/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Estoc Reconciliació article
 DocType: Stock Entry,Sales Invoice No,Factura No
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Tipus de Proveïdor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,L'article {0} està cancel·lat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Relació
 DocType: Shipping Rule,Worldwide Shipping,Enviament mundial
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Comandes en ferm dels clients.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Suggeriments
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Pressupostos Set-Group savi article sobre aquest territori. També pot incloure l'estacionalitat mitjançant l'establiment de la Distribució.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Si us plau ingressi grup de comptes dels pares per al magatzem {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagament contra {0} {1} no pot ser més gran que Destacat Suma {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagament contra {0} {1} no pot ser més gran que Destacat Suma {2}
 DocType: Supplier,Address HTML,Adreça HTML
 DocType: Lead,Mobile No.,No mòbil
 DocType: Maintenance Schedule,Generate Schedule,Generar Calendari
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Més recent
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caràcters
 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
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Aprendre
 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
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Organigrama de vendes
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Multi moneda
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipus de Factura
 DocType: Sales Invoice Item,Delivery Note,Nota de lliurament
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuració d&#39;Impostos
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configuració d&#39;Impostos
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +105,Summary for this week and pending activities,Resum per a aquesta setmana i activitats pendents
 DocType: Workstation,Rent Cost,Cost de lloguer
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecciona el mes i l'any
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible a la llista de materials, nota de lliurament, factura de compra, ordre de producció, ordres de compra, rebut de compra, factura de venda, ordres de venda, entrada d'estoc, fulla d'hores"
 DocType: Item Tax,Tax Rate,Tax Rate
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ja assignat per Empleat {1} per al període {2} a {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Seleccioneu Producte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Seleccioneu Producte
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Article: {0} gestionat per lots, no pot conciliar l'ús \
  Stock Reconciliació, en lloc d'utilitzar l'entrada Stock"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Convertir la no-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Rebut de compra s'ha de presentar
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Metge
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motiu de pèrdua
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Estació de treball està tancada en les següents dates segons Llista de vacances: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunitats
 DocType: Employee,Single,Solter
 DocType: Issue,Attachment,Accessori
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Pressupost no es pot establir de centres de cost Grup
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,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 +563,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 +140,Holiday master.,Mestre de vacances.
 DocType: Material Request Item,Required Date,Data Requerit
 DocType: Delivery Note,Billing Address,Direcció De Enviament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
 DocType: BOM,Costing,Costejament
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantitat total
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productes cosmètics
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Venciment de la garantia del número de sèrie
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Article {0} no és article de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Article {0} no és article de Compra
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} és una adreça de correu electrònic vàlida en el '\
  Notificació Adreça de correu electrònic'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Facturació total aquest any:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Afegeix / Edita les taxes i càrrecs
 DocType: Purchase Invoice,Supplier Invoice No,Número de Factura de Proveïdor
 DocType: Territory,For reference,Per referència
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Tancament (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Tancament (Cr)
 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
 ,Pending Qty,Pendent Quantitat
@@ -466,7 +469,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Distribució Mensual ** l'ajuda a distribuir el seu pressupost a través de mesos si té l'estacionalitat del seu negoci.
 
  Per distribuir un pressupost utilitzant aquesta distribució, establir aquesta distribució mensual ** ** ** al centre de costos **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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.py +126,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 +20,Please select Company and Party Type first,Seleccioneu de l'empresa i el Partit Tipus primer
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Exercici comptabilitat /.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Ho sentim, els números de sèrie no es poden combinar"
@@ -474,9 +477,9 @@
 DocType: Project Task,Project Task,Tasca del projecte
 ,Lead Id,Identificador del client potencial
 DocType: C-Form Invoice Detail,Grand Total,Gran Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiscal Any Data d'inici no ha de ser major que l'any fiscal Data de finalització
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiscal Any Data d'inici no ha de ser major que l'any fiscal Data de finalització
 DocType: Warranty Claim,Resolution,Resolució
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Lliurat: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Lliurat: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Compte per Pagar
 DocType: Sales Order,Billing and Delivery Status,Facturació i Lliurament Estat
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repetiu els Clients
@@ -491,7 +494,7 @@
 DocType: Quotation,Quotation To,Oferta per
 DocType: Lead,Middle Income,Ingrés Mig
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Obertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Suma assignat no pot ser negatiu
 DocType: Purchase Order Item,Billed Amt,Quantitat facturada
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Magatzem lògic contra el qual es fan les entrades en existències.
@@ -500,7 +503,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordre de Producció és obligatori
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacció de propostes
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatiu Stock Error ({6}) per al punt {0} a Magatzem {1} a {2} {3} a {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatiu Stock Error ({6}) per al punt {0} a Magatzem {1} a {2} {3} a {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Any fiscal Companyia
 DocType: Packing Slip Item,DN Detail,Detall DN
 DocType: Time Log,Billed,Facturat
@@ -519,16 +522,17 @@
 DocType: Activity Type,Default Costing Rate,Taxa d&#39;Incompliment Costea
 DocType: Maintenance Schedule,Maintenance Schedule,Programa de manteniment
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Llavors Tarifes de Preu es filtren sobre la base de client, grup de clients, Territori, Proveïdor, Tipus Proveïdor, Campanya, soci de vendes, etc."
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Canvi net en l&#39;Inventari
 DocType: Employee,Passport Number,Nombre de Passaport
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Des rebut de compra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,El mateix article s'ha introduït diverses vegades.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Des rebut de compra
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,El mateix article s'ha introduït diverses vegades.
 DocType: SMS Settings,Receiver Parameter,Paràmetre de Receptor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basat En' i 'Agrupar Per' no pot ser el mateix
 DocType: Sales Person,Sales Person Targets,Objectius persona de vendes
 DocType: Production Order Operation,In minutes,En qüestió de minuts
 DocType: Issue,Resolution Date,Resolució Data
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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}"
 DocType: Selling Settings,Customer Naming By,Customer Naming By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir el Grup
 DocType: Activity Cost,Activity Type,Tipus d'activitat
@@ -539,7 +543,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicant
 DocType: Activity Cost,Projects User,Usuari de Projectes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumit
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} no es troba a Detalls de la factura taula
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} no es troba a Detalls de la factura taula
 DocType: Company,Round Off Cost Center,Completen centres de cost
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manteniment Visita {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 DocType: Material Request,Material Transfer,Transferència de material
@@ -561,13 +565,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Màrqueting
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Per realitzar el seguiment de l'article en vendes i documents de compra en base als seus números de sèrie. Aquest és també pugui utilitzat per rastrejar informació sobre la garantia del producte.
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoc actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Cal indicar el magatzem de no conformitats per la partida rebutjada
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,La facturació total d&#39;aquest any
 DocType: Account,Expenses Included In Valuation,Despeses incloses en la valoració
 DocType: Employee,Provide email id registered in company,Provide email id registered in company
 DocType: Hub Settings,Seller City,Ciutat del venedor
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,L&#39;article té variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,L&#39;article té variants.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipus Arbre
@@ -585,18 +589,18 @@
 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 +92,{0} is not a stock Item,{0} no és un article d'estoc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} no és un article d'estoc
 DocType: Mode of Payment Account,Default Account,Compte predeterminat
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,Si us plau seleccioni el dia lliure setmanal
 DocType: Production Order Operation,Planned End Time,Planificació de Temps Final
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Variance Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,El Compte de la transacció existent no es pot convertir a llibre major
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,El Compte de la transacció existent no es pot convertir a llibre major
 DocType: Delivery Note,Customer's Purchase Order No,Del client Ordre de Compra No
 DocType: Employee,Cell Number,Número de cel·la
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Les sol·licituds de material auto generada
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Vostè no pot entrar bo actual a 'Contra entrada de diari' columna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Vostè no pot entrar bo actual a 'Contra entrada de diari' columna
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Oportunitat De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nòmina mensual.
@@ -605,9 +609,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Des {0} de tipus {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Entrades de Comptabilitat es poden fer en contra de nodes fulla. No es permeten els comentaris en contra dels grups.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Nombre de recepció de compra d'articles requerits per {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Nombre de recepció de compra d'articles requerits per {0}
 DocType: Item Attribute Value,Item Attribute Value,Element Atribut Valor
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campanyes de venda.
 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.
@@ -665,7 +669,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Llista de preus no seleccionat
 DocType: Employee,Family Background,Antecedents de família
 DocType: Process Payroll,Send Email,Enviar per correu electrònic
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,No permission
 DocType: Company,Default Bank Account,Compte bancari per defecte
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Per filtrar la base de la festa, seleccioneu Partit Escrigui primer"
@@ -673,7 +677,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Ens
 DocType: Item,Items with higher weightage will be shown higher,Els productes amb major coeficient de ponderació se li apareixen més alta
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detall Conciliació Bancària
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Els meus Factures
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Els meus Factures
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,No s'ha trobat cap empeat
 DocType: Purchase Order,Stopped,Detingut
 DocType: Item,If subcontracted to a vendor,Si subcontractat a un proveïdor
@@ -683,6 +687,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ara
 ,Support Analytics,Suport Analytics
 DocType: Item,Website Warehouse,Lloc Web del magatzem
+DocType: Payment Reconciliation,Minimum Invoice Amount,Volum mínim Factura
 DocType: Sales 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."
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Registres C-Form
@@ -692,7 +697,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Per habilitar les característiques de &quot;Punt de Venda&quot;
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Seleccionar elements
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra Bill {1} {2} de data
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} contra Bill {1} {2} de data
 DocType: Maintenance Visit,Completion Status,Estat de finalització
 DocType: Sales Invoice Item,Target Warehouse,Magatzem destí
 DocType: Item,Allow over delivery or receipt upto this percent,Permetre sobre el lliurament o recepció fins aquest percentatge
@@ -704,7 +709,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compondre automàticament el missatge en la presentació de les transaccions.
 DocType: Production Order,Item To Manufacture,Article a fabricar
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Estat és {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordre de compra de Pagament
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ordre de compra de Pagament
 DocType: Sales Order Item,Projected Qty,Quantitat projectada
 DocType: Sales Invoice,Payment Due Date,Data de pagament
 DocType: Newsletter,Newsletter Manager,Butlletí Administrador
@@ -728,7 +733,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punt de venda
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","El saldo del compte ja està en crèdit, no tens permisos per establir-lo com 'El balanç ha de ser ""com ""Dèbit """
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","El saldo del compte ja està en crèdit, no tens permisos per establir-lo com 'El balanç ha de ser ""com ""Dèbit """
 DocType: Account,Balance must be,El balanç ha de ser
 DocType: Hub Settings,Publish Pricing,Publicar preus
 DocType: Notification Control,Expense Claim Rejected Message,Missatge de rebuig de petició de despeses
@@ -751,7 +756,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Tipus de canvi principal.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} ha d'estar activa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} ha d'estar activa
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Si us plau. Primer seleccioneu el tipus de document
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Deixa Cobrament Monto
@@ -769,17 +774,17 @@
 DocType: Supplier,Default Payable Accounts,Comptes per Pagar per defecte
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
 DocType: Features Setup,Item Barcode,Codi de barres d'article
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Article Variants {0} actualitza
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Address,Shop,Botiga
 DocType: Hub Settings,Sync Now,Sincronitza ara
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Fila {0}: entrada de crèdit no pot vincular amb un {1}
 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.
 DocType: Employee,Permanent Address Is,Adreça permanent
 DocType: Production Order Operation,Operation completed for how many finished goods?,L'operació es va realitzar per la quantitat de productes acabats?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,La Marca
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Provisió per superar {0} creuat per Punt {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Provisió per superar {0} creuat per Punt {1}.
 DocType: Employee,Exit Interview Details,Detalls de l'entrevista final
 DocType: Item,Is Purchase Item,És Compra d'articles
 DocType: Journal Entry Account,Purchase Invoice,Factura de Compra
@@ -791,7 +796,7 @@
 DocType: Salary Slip,Total in words,Total en paraules
 DocType: Material Request Item,Lead Time Date,Termini d'execució Data
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,és obligatori. Potser no es crea registre de canvi de divisa per
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Fila #{0}: Si us plau especifica el número de sèrie per l'article {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Fila #{0}: Si us plau especifica el número de sèrie per l'article {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Pels articles &#39;Producte Bundle&#39;, Magatzem, Serial No i lots No serà considerat en el quadre &#39;Packing List&#39;. Si Warehouse i lots No són les mateixes per a tots els elements d&#39;embalatge per a qualsevol element &#39;Producte Bundle&#39;, aquests valors es poden introduir a la taula principal de l&#39;article, els valors es copiaran a la taula &quot;Packing List &#39;."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Enviaments a clients.
 DocType: Purchase Invoice Item,Purchase Order Item,Ordre de compra d'articles
@@ -800,14 +805,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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 +626,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permetre a l'usuari editar la Llista de Preus de Tarifa en transaccions
 DocType: Pricing Rule,Max Qty,Quantitat màxima
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pagament contra Vendes / Ordre de Compra sempre ha d'estar marcat com a pagamet anticipat (bestreta)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químic
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Tots els articles ja han estat transferits per aquesta ordre de producció.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Tots els articles ja han estat transferits per aquesta ordre de producció.
 DocType: Process Payroll,Select Payroll Year and Month,Seleccioneu nòmina Any i Mes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Anar al grup apropiat (generalment Aplicació de Fons&gt; Actiu Circulant&gt; Comptes Bancàries i crear un nou compte (fent clic a Afegeix nen) de tipus &quot;Banc&quot;
 DocType: Workstation,Electricity Cost,Cost d'electricitat
@@ -821,10 +827,10 @@
 DocType: SMS Center,All Lead (Open),Tots els clients potencials (Obert)
 DocType: Purchase Invoice,Get Advances Paid,Obtenir bestretes pagades
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Adjunta la teva imatge
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Fer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Fer
 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 +3,My Cart,Carro de la compra
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Carro de la compra
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Quantitat d'obertura
@@ -843,10 +849,10 @@
 DocType: POS Profile,Cash/Bank Account,Compte de Caixa / Banc
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} no pot ser negatiu
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Descompte
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Descompte
 DocType: Features Setup,Purchase Discounts,Compra Descomptes
 DocType: Workstation,Wages,Salari
 DocType: Time Log,Will be updated only if Time Log is 'Billable',S&#39;actualitza només si Hora de registre és &quot;facturable&quot;
@@ -871,7 +877,7 @@
 DocType: Tax Rule,Shipping State,Estat de l&#39;enviament
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'article ha de ser afegit usant 'Obtenir elements de rebuts de compra' botó
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Despeses de venda
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Compra Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Compra Standard
 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ó
@@ -913,6 +919,7 @@
 DocType: Sales Partner,Distributor,Distribuïdor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regles d'enviament de la cistella de lacompra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ordre de Producció {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',"Si us plau, estableix &quot;Aplicar descompte addicional en &#39;"
 ,Ordered Items To Be Billed,Els articles comandes a facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gamma ha de ser menor que en la nostra gamma
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecciona Registres de temps i Presenta per a crear una nova factura de venda.
@@ -922,13 +929,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Aquest registre de temps ha estat facturat.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Crear Oportunitats
 DocType: Salary Slip,Leave Without Pay,Absències sense sou
-DocType: Supplier,Communications,Comunicacions
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Planificació de la capacitat d&#39;error
 ,Trial Balance for Party,Balanç de comprovació per a la festa
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Guanys
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Article Acabat {0} ha de ser introduït per a l&#39;entrada Tipus de Fabricació
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Obertura de Balanç de Comptabilitat
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Article Acabat {0} ha de ser introduït per a l&#39;entrada Tipus de Fabricació
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Obertura de Balanç de Comptabilitat
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura proforma
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Res per sol·licitar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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'
@@ -970,7 +976,7 @@
 DocType: Global Defaults,Current Fiscal Year,Any fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar total arrodonit
 DocType: Lead,Call,Truca
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Entrades' no pot estar buit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'Entrades' no pot estar buit
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar fila {0} amb el mateix {1}
 ,Trial Balance,Balanç provisional
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configuració d&#39;Empleats
@@ -982,9 +988,9 @@
 DocType: Contact,User ID,ID d'usuari
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Veure Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Earliest
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Fabricació contra ordre de vendes
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resta del món
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -1014,7 +1020,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},No autoritzat per editar el compte bloquejat {0}
 DocType: Journal Entry,Get Outstanding Invoices,Rep les factures pendents
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1027,13 +1033,13 @@
 DocType: Employee,Place of Issue,Lloc de la incidència
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contracte
 DocType: Email Digest,Add Quote,Afegir Cita
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Es necessita un factor de coversió per la UDM: {0} per l'article: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Es necessita un factor de coversió per la UDM: {0} per l'article: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Despeses Indirectes
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Els Productes o Serveis de la teva companyia
 DocType: Mode of Payment,Mode of Payment,Forma de pagament
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,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/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,This is a root item group and cannot be edited.
 DocType: Journal Entry Account,Purchase Order,Ordre De Compra
 DocType: Warehouse,Warehouse Contact Info,Informació del contacte del magatzem
@@ -1042,8 +1048,8 @@
 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/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1053,7 +1059,7 @@
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Descripció
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data prevista de lliurament és menor que la data d&#39;inici prevista.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Per Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Per Proveïdor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Configurar el Tipus de compte ajuda en la selecció d'aquest compte en les transaccions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total (En la moneda de la companyia)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sortint total
@@ -1066,7 +1072,7 @@
 DocType: Journal Entry,Journal Entry,Entrada de diari
 DocType: Workstation,Workstation Name,Nom de l'Estació de treball
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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
@@ -1098,7 +1104,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Newsletters a contactes, clients potencials."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Les operacions no es poden deixar en blanc.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Les operacions no es poden deixar en blanc.
 ,Delivered Items To Be Billed,Articles lliurats pendents de facturar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magatzem no pot ser canviat pel Nº de Sèrie
 DocType: Authorization Rule,Average Discount,Descompte Mig
@@ -1113,7 +1119,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Des {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Descripció de la operació
 DocType: Item,Will also apply to variants,També s'aplicarà a les variants
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No es poden canviar les dates de l'any finscal (inici i fi) una vegada ha estat desat
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No es poden canviar les dates de l'any finscal (inici i fi) una vegada ha estat desat
 DocType: Quotation,Shopping Cart,Carro De La Compra
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Mitjana diària sortint
 DocType: Pricing Rule,Campaign,Campanya
@@ -1124,7 +1130,8 @@
 DocType: Sales Order Item,Planned Quantity,Quantitat planificada
 DocType: Purchase Invoice Item,Item Tax Amount,Suma d'impostos d'articles
 DocType: Item,Maintain Stock,Mantenir Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció
+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ó
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1136,7 +1143,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,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 Slip Deduction,Depends on Leave Without Pay,Depèn de la llicència sense sou
@@ -1174,7 +1181,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,Per Valor
 DocType: Supplier,Stock Manager,Gerent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Magatzem d'origen obligatori per a la fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Magatzem d'origen obligatori per a la fila {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Llista de presència
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,lloguer de l'oficina
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Paràmetres de configuració de Porta de SMS
@@ -1182,10 +1189,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Sense direcció no afegeix encara.
 DocType: Workstation Working Hour,Workstation Working Hour,Estació de treball Hores de Treball
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a l'import JV {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a l'import JV {2}
 DocType: Item,Inventory,Inventari
 DocType: Features Setup,"To enable ""Point of Sale"" view",Per habilitar &quot;Punt de Venda&quot; vista
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,El pagament no es pot fer per al carro buit
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,El pagament no es pot fer per al carro buit
 DocType: Item,Sales Details,Detalls de venda
 DocType: Opportunity,With Items,Amb articles
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Quantitat
@@ -1200,10 +1207,11 @@
 DocType: Cost Center,Parent Cost Center,Centre de Cost de Pares
 DocType: Sales Invoice,Source,Font
 DocType: Leave Type,Is Leave Without Pay,Es llicencia sense sou
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,No hi ha registres a la taula de Pagaments
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,No hi ha registres a la taula de Pagaments
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Data d'Inici de l'Exercici fiscal
 DocType: Employee External Work History,Total Experience,Experiència total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flux d&#39;efectiu d&#39;inversió
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight and Forwarding Charges
 DocType: Material Request Item,Sales Order No,Ordre de Venda No
 DocType: Item Group,Item Group Name,Nom del Grup d'Articles
@@ -1211,12 +1219,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materials de transferència per Fabricació
 DocType: Pricing Rule,For Price List,Per Preu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cerca d'Executius
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Tarifa de compra per l'article: {0} no es troba, el que es requereix per reservar l'entrada comptable (despeses). Si us plau, esmentar el preu de l'article contra una llista de preus de compra."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Tarifa de compra per l'article: {0} no es troba, el que es requereix per reservar l'entrada comptable (despeses). Si us plau, esmentar el preu de l'article contra una llista de preus de compra."
 DocType: Maintenance Schedule,Schedules,Horaris
 DocType: Purchase Invoice Item,Net Amount,Import Net
 DocType: Purchase Order Item Supplied,BOM Detail No,Detall del BOM No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Import addicional de descompte (moneda Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Error: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Error: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Si us plau, creu un nou compte de Pla de Comptes."
 DocType: Maintenance Visit,Maintenance Visit,Manteniment Visita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Grup de Clients> Territori
@@ -1242,7 +1250,7 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada de Comptabilitat per a {0} només es pot fer en moneda: {1}
 DocType: Pricing Rule,Pricing Rule,Regla preus
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Sol·licitud de materials d&#39;Ordre de Compra
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Sol·licitud de materials d&#39;Ordre de Compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: L&#39;article tornat {1} no existeix en {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Comptes bancaris
 ,Bank Reconciliation Statement,Declaració de Conciliació Bancària
@@ -1250,11 +1258,11 @@
 ,POS,TPV
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Obertura de la balança
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} ha d'aparèixer només una vegada
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,De Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Les quantitats no es reflecteixen en el banc
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Les reclamacions per compte de l'empresa.
@@ -1266,33 +1274,34 @@
 ,Material Requests for which Supplier Quotations are not created,Les sol·licituds de material per als quals no es creen Ofertes de Proveïdor
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Per realitzar un seguiment d'elements mitjançant codi de barres. Vostè serà capaç d'entrar en els elements de la nota de lliurament i la factura de venda mitjançant l'escaneig de codi de barres de l'article.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Marcar com Lliurat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Marcar com Lliurat
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Fer Cita
 DocType: Dependent Task,Dependent Task,Tasca dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Llista de receptors
 DocType: Payment Tool Detail,Payment Amount,Quantitat de pagament
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantitat consumida
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Veure
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Veure
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Canvi Net en Efectiu
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salary Structure Deduction
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost d'articles Emeses
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Edat (dies)
 DocType: Quotation Item,Quotation Item,Cita d'article
 DocType: Account,Account Name,Nom del Compte
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,De la data no pot ser més gran que A Data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,De la data no pot ser més gran que A Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Número de sèrie {0} quantitat {1} no pot ser una fracció
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,La taxa de conversió no pot ser 0 o 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,La taxa de conversió no pot ser 0 o 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} és cancel·lat o detingut
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Dispatch Date
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,El rebut de compra {0} no està presentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,El rebut de compra {0} no està presentat
 DocType: Company,Default Payable Account,Compte per Pagar per defecte
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% Anunciat
@@ -1304,15 +1313,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Els meus Qüestions
 DocType: BOM Item,BOM Item,Article BOM
 DocType: Appraisal,For Employee,Per als Empleats
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,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/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Fila {0}: Quantitat de pagament no pot ser negatiu
 DocType: Expense Claim,Total Amount Reimbursed,Suma total reemborsat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra Proveïdor Factura {0} {1} datat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Contra Proveïdor Factura {0} {1} datat
 DocType: Customer,Default Price List,Llista de preus per defecte
 DocType: Payment Reconciliation,Payments,Pagaments
 DocType: Budget Detail,Budget Allocated,Pressupost assignat
 DocType: Journal Entry,Entry Type,Tipus d&#39;entrada
 ,Customer Credit Balance,Saldo de crèdit al Client
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Canvi net en comptes per pagar
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Verifiqui si us plau el seu correu electrònic d&#39;identificació
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Client requereix per a 'Descompte Customerwise'
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Actualització de les dates de pagament dels bancs amb les revistes.
@@ -1333,7 +1344,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Habilita Compres
 DocType: Employee,Permanent Address,Adreça Permanent
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Article {0} ha de ser un element de servei.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Avançament pagat contra {0} {1} no pot ser major \ de Gran Total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Seleccioneu el codi de l'article
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduir Deducció per absències sense sou (LWP)
@@ -1350,18 +1361,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Unitat individual d'un article
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',S'ha de 'Presentar' el registre de temps {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',S'ha de 'Presentar' el registre de temps {0}
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Magatzem requerit a la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Magatzem requerit a la fila n {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Hi ha un grup de clients amb el mateix nom, si us plau canvia el nom del client o el nom del Grup de Clients"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Seleccioneu {0} primer.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Seleccioneu {0} primer.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},text {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nou contacte
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
 DocType: Stock Entry,Material Receipt,Recepció de materials
@@ -1369,7 +1381,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partit Tipus i Partit es requereix per al compte per cobrar / pagar {0}
 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 +210,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 +213,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 +85,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
@@ -1386,15 +1398,15 @@
 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: Sales Invoice Item,Batch No,Lot número
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Inici
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Inici
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Detingut ordre no es pot cancel·lar. Unstop per cancel·lar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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: Item,Variants,Variants
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Feu l'Ordre de Compra
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,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 +129,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
@@ -1407,7 +1419,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Magatzem i Referència
 DocType: Supplier,Statutory info and other general information about your Supplier,Informació legal i altra informació general sobre el Proveïdor
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Direccions
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diari entrada {0} no té cap {1} entrada inigualable
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diari entrada {0} no té cap {1} entrada inigualable
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,L&#39;article no se li permet tenir ordre de producció.
@@ -1416,10 +1428,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Suma de crèdit en compte Moneda
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Registres de temps per a la seva fabricació.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Warehouse-savi Nivell de Reabastament
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} ha de ser presentat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} ha de ser presentat
 DocType: Authorization Control,Authorization Control,Control d'Autorització
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Magatzem Rebutjat és obligatori en la partida rebutjada {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Registre de temps per a les tasques.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pagament
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Pagament
 DocType: Production Order Operation,Actual Time and Cost,Temps real i 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},Per l'article {1} es poden fer un màxim de {0} sol·licituds de materials destinats a l'ordre de venda {2}
 DocType: Employee,Salutation,Salutació
@@ -1436,7 +1449,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associat
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Article {0} no és un article serialitzat
 DocType: SMS Center,Create Receiver List,Crear Llista de receptors
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Caducat
 DocType: Packing Slip,To Package No.,Al paquet No.
 DocType: Warranty Claim,Issue Date,Data De Assumpte
 DocType: Activity Cost,Activity Cost,Cost Activitat
@@ -1474,7 +1486,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Aconseguit
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Localitat / Client
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,per exemple 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a quantitat pendent de facturar {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a quantitat pendent de facturar {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En paraules seran visibles un cop que guardi la factura de venda.
 DocType: Item,Is Sales Item,És article de venda
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Arbre de grups d'article
@@ -1486,7 +1498,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Taula d'articles no pot estar en blanc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Taula d'articles no pot estar en blanc
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Per establir {1} periodicitat, diferència entre des de i fins a la data \
  ha de ser més gran que o igual a {2}"
@@ -1496,7 +1508,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Taxes i impostos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Si us plau, introduïu la data de referència"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,"Si us plau, introduïu la data de referència"
 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} entrades de pagament no es poden filtrar per {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Taula d'article que es mostra en el lloc web
 DocType: Purchase Order Item Supplied,Supplied Qty,Subministrat Quantitat
@@ -1511,7 +1523,7 @@
 DocType: Installation Note,Installation Time,Temps d'instal·lació
 DocType: Sales Invoice,Accounting Details,Detalls de Comptabilitat
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Eliminar totes les transaccions per aquesta empresa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,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}: Operació {1} no s'ha completat per {2} Quantitat de productes acabats en ordre de producció # {3}. Si us plau, actualitzi l'estat de funcionament a través dels registres de temps"
+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}: Operació {1} no s'ha completat per {2} Quantitat de productes acabats en ordre de producció # {3}. Si us plau, actualitzi l'estat de funcionament a través dels registres de temps"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Inversions
 DocType: Issue,Resolution Details,Resolució Detalls
 DocType: Quality Inspection Reading,Acceptance Criteria,Criteris d'acceptació
@@ -1527,7 +1539,7 @@
 DocType: Holiday List,Clear Table,Taula en blanc
 DocType: Features Setup,Brands,Marques
 DocType: C-Form Invoice Detail,Invoice No,Número de Factura
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,De l'Ordre de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,De l'Ordre de Compra
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixa no pot aplicar / cancel·lada abans de {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
 DocType: Activity Cost,Costing Rate,Pago Rate
 ,Customer Addresses And Contacts,Adreces de clients i contactes
@@ -1544,7 +1556,7 @@
 ,Maintenance Schedules,Programes de manteniment
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,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
 ,Pending Amount,A l'espera de l'Import
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversió
@@ -1561,12 +1573,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Arbre dels comptes financers
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,El compte {0} ha de ser del tipus 'd'actius fixos' perquè l'article {1} és un element d'actiu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,El compte {0} ha de ser del tipus 'd'actius fixos' perquè l'article {1} és un element d'actiu
 DocType: HR Settings,HR Settings,Configuració de recursos humans
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,El compte de despeses està pendent d'aprovació. Només l'aprovador de despeses pot actualitzar l'estat.
 DocType: Purchase Invoice,Additional Discount Amount,Import addicional de descompte
 DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,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 +225,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Esports
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Actual total
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Unitat
@@ -1578,6 +1590,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Les reclamacions de despeses
 DocType: Issue,Support,Suport
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Veure el carro
 ,BOM Search,BOM Cercar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Tancament (Obertura + totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Si us plau, especifiqui la moneda a l'empresa"
@@ -1589,13 +1602,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Es requereix el factor de conversió de la UOM a la fila {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},La data de liquidació no pot ser anterior a la data de verificació a la fila {0}
 DocType: Salary Slip,Deduction,Deducció
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Article Preu afegit per {0} en Preu de llista {1}
 DocType: Address Template,Address Template,Plantilla de Direcció
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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ó
 DocType: Project,% Tasks Completed,% Tasques Completades
 DocType: Project,Gross Margin,Marge Brut
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Si us plau indica primer l'Article a Producció
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,desactivat usuari
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,desactivat usuari
 DocType: Opportunity,Quotation,Oferta
 DocType: Salary Slip,Total Deduction,Deducció total
 DocType: Quotation,Maintenance User,Usuari de Manteniment
@@ -1604,7 +1618,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
 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
@@ -1614,12 +1628,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Porteu un registre de les campanyes de venda. Porteu un registre de conductors, Cites, comandes de venda, etc de Campanyes per mesurar retorn de la inversió."
 DocType: Expense Claim,Approver,Aprovador
 ,SO Qty,SO Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Hi entrades Imatges contra magatzem de {0}, per tant, no es pot tornar a assignar o modificar Magatzem"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Hi entrades Imatges contra magatzem de {0}, per tant, no es pot tornar a assignar o modificar Magatzem"
 DocType: Appraisal,Calculate Total Score,Calcular Puntuació total
 DocType: Supplier Quotation,Manufacturing Manager,Gerent de Fàbrica
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Dividir nota de lliurament en paquets.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Els enviaments
+apps/erpnext/erpnext/hooks.py +69,Shipments,Els enviaments
 DocType: Purchase Order Item,To be delivered to customer,Per ser lliurat al client
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Hora de registre d'estat ha de ser presentada.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Número de sèrie {0} no pertany a cap magatzem
@@ -1639,10 +1653,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"Types of employment (permanent, contract, intern etc.).","Tipus d'ocupació (permanent, contractats, intern etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
 DocType: Currency Exchange,From Currency,De la divisa
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleccioneu suma assignat, Tipus factura i número de factura en almenys una fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordres de venda requerides per l'article {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleccioneu suma assignat, Tipus factura i número de factura en almenys una fila"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Ordres de venda requerides per l'article {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Les quantitats no es reflecteix en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Companyia moneda)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Altres
@@ -1658,7 +1672,7 @@
 DocType: Quality Inspection,In Process,En procés
 DocType: Authorization Rule,Itemwise Discount,Descompte d'articles
 DocType: Purchase Order Item,Reference Document Type,Referència Tipus de document
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
 DocType: Account,Fixed Asset,Actius Fixos
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inventari serialitzat
 DocType: Activity Type,Default Billing Rate,Per defecte Facturació Tarifa
@@ -1668,7 +1682,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Ordres de venda al Pagament
 DocType: Expense Claim Detail,Expense Claim Detail,Reclamació de detall de despesa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Registres de temps de creació:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Seleccioneu el compte correcte
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Seleccioneu el compte correcte
 DocType: Item,Weight UOM,UDM del pes
 DocType: Employee,Blood Group,Grup sanguini
 DocType: Purchase Invoice Item,Page Break,Salt de pàgina
@@ -1699,10 +1713,10 @@
 DocType: Time Log,To Time,Per Temps
 DocType: Authorization Rule,Approving Role (above authorized value),Aprovar Rol (per sobre del valor autoritzat)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Per afegir nodes secundaris, explora arbre i feu clic al node en el qual voleu afegir més nodes."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
 DocType: Production Order Operation,Completed Qty,Quantitat completada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,La llista de preus {0} està deshabilitada
 DocType: Manufacturing Settings,Allow Overtime,Permetre Overtime
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{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}.
@@ -1710,8 +1724,9 @@
 DocType: Item,Customer Item Codes,Codis dels clients
 DocType: Opportunity,Lost Reason,Raó Perdut
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Crear entrades de pagament contra ordres o factures.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nova adreça
 DocType: Quality Inspection,Sample Size,Mida de la mostra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,S'han facturat tots els articles
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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"
 DocType: Project,External,Extern
@@ -1767,13 +1782,14 @@
 DocType: Rename Tool,Rename Tool,Eina de canvi de nom
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualització de Costos
 DocType: Item Reorder,Item Reorder,Punt de reorden
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transferir material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transferir material
 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."
 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
 DocType: Installation Note,Installation Note,Nota d'instal·lació
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Afegir Impostos
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Flux de caixa de finançament
 ,Financial Analytics,Comptabilitat analítica
 DocType: Quality Inspection,Verified By,Verified Per
 DocType: Address,Subsidiary,Filial
@@ -1783,19 +1799,19 @@
 DocType: Process Payroll,Create Salary Slip,Crear fulla de nòmina
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Import pendent de rebre com per banc
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Font dels fons (Passius)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantitat a la fila {0} ({1}) ha de ser igual que la quantitat fabricada {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantitat a la fila {0} ({1}) ha de ser igual que la quantitat fabricada {2}
 DocType: Appraisal,Employee,Empleat
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importació de correu electrònic De
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Convida com usuari
 DocType: Features Setup,After Sale Installations,Instal·lacions després de venda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} està totalment facturat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} està totalment facturat
 DocType: Workstation Working Hour,End Time,Hora de finalització
 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 +75,Group by Voucher,Agrupa per comprovants
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerit Per
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Rename Tool,File to Rename,Arxiu per canviar el nom de
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Nombre de comanda purchse requerit per Punt {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Nombre de comanda purchse requerit per Punt {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagaments
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,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
@@ -1805,6 +1821,7 @@
 DocType: Selling Settings,Sales Order Required,Ordres de venda Obligatori
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crear Client
 DocType: Purchase Invoice,Credit To,Crèdit Per
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Leads actius / Clients
 DocType: Employee Education,Post Graduate,Postgrau
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detall del Programa de manteniment
 DocType: Quality Inspection Reading,Reading 9,Lectura 9
@@ -1816,6 +1833,7 @@
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Compte de Pagament
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Canvi net en els comptes per cobrar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatori
 DocType: Quality Inspection Reading,Accepted,Acceptat
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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."
@@ -1823,17 +1841,17 @@
 DocType: Payment Tool,Total Payment Amount,Suma total de Pagament
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"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: Newsletter,Test,Prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Com que hi ha transaccions d&#39;accions existents per aquest concepte, \ no pot canviar els valors de &#39;no té de sèrie&#39;, &#39;Té lot n&#39;, &#39;És de la Element &quot;i&quot; Mètode de valoració&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Seient Ràpida
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Seient Ràpida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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: 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 +157,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 +211,{0} {1} is not submitted,{0} {1} no es presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} no es presenta
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Termes i Condicions 1
@@ -1846,7 +1864,7 @@
 DocType: Authorization Rule,Authorized Value,Valor Autoritzat
 DocType: Contact,Enter department to which this Contact belongs,Introduïu departament al qual pertany aquest contacte
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Article o magatzem per a la fila {0} no coincideix Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Article o magatzem per a la fila {0} no coincideix Sol·licitud de materials
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unitat de mesura
 DocType: Fiscal Year,Year End Date,Any Data de finalització
 DocType: Task Depends On,Task Depends On,Tasca Depèn de
@@ -1872,7 +1890,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,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: 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ó.
 DocType: Customer Group,Has Child Node,Té Node Nen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduïu els paràmetres d'URL estàtiques aquí (Ex. Remitent = ERPNext, nom d'usuari = ERPNext, password = 1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no en qualsevol any fiscal activa. Per a més detalls de verificació {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Aquest és un lloc web d'exemple d'auto-generada a partir ERPNext
@@ -1920,7 +1938,7 @@
  10. Afegir o deduir: Si vostè vol afegir o deduir l'impost."
 DocType: Purchase Receipt Item,Recd Quantity,Recd Quantitat
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No es pot produir més Article {0} que en la quantitat de comandes de client {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Compte Bancari / Efectiu
 DocType: Tax Rule,Billing City,Facturació Ciutat
 DocType: Global Defaults,Hide Currency Symbol,Amaga Símbol de moneda
@@ -1952,6 +1970,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Despeses de serveis públics
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Per sobre de 90-
 DocType: Buying Settings,Default Buying Price List,Llista de preus per defecte
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Cap empleat per als criteris anteriorment seleccionat o nòmina ja creat
 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."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tipus de Pagament
@@ -1987,7 +2006,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Vegeu ""Taxa de materials basats en"" a la Secció Costea"
 DocType: Appraisal Goal,Key Responsibility Area,Àrea de Responsabilitat clau
 DocType: Item Reorder,Material Request Type,Material de Sol·licitud Tipus
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Fila {0}: UOM factor de conversió és obligatori
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Àrbitre
 DocType: Cost Center,Cost Center,Centre de Cost
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprovant #
@@ -2010,7 +2029,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Totes les direccions.
 DocType: Company,Stock Settings,Ajustaments d'estocs
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusió només és possible si les propietats són les mateixes en tots dos registres. És el Grup, Tipus Arrel, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusió només és possible si les propietats són les mateixes en tots dos registres. És el Grup, Tipus Arrel, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrar grup Client arbre.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Nou nom de centres de cost
 DocType: Leave Control Panel,Leave Control Panel,Deixa Panell de control
@@ -2030,8 +2049,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Detall mitjà de Pagament
 ,Sales Browser,Analista de Vendes
 DocType: Journal Entry,Total Credit,Crèdit Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l&#39;entrada de població {2}: Són els
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l&#39;entrada de població {2}: Són els
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstecs i bestretes (Actius)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deutors
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Gran
@@ -2050,7 +2069,7 @@
 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.
 DocType: Production Order Operation,Make Time Log,Feu l'hora de registre
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Si us plau ajust la quantitat de comanda
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Si us plau ajust la quantitat de comanda
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Si us plau, crea Client a partir del client potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicable per als Països
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Ordinadors
@@ -2110,10 +2129,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Sense Observacions
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Sense Observacions
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Endarrerit
 DocType: Account,Stock Received But Not Billed,Estoc Rebudes però no facturats
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Compte arrel ha de ser un grup
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Compte arrel ha de ser un grup
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salari brut + arriar Quantitat + Cobrament Suma - Deducció total
 DocType: Monthly Distribution,Distribution Name,Distribution Name
 DocType: Features Setup,Sales and Purchase,Compra i Venda
@@ -2127,6 +2146,7 @@
 DocType: Journal Entry Account,Party Balance,Equilibri Partit
 DocType: Sales Invoice Item,Time Log Batch,Registre de temps
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Seleccioneu Aplicar descompte en les
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Nòmina de creació
 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: Stock Entry,Material Transfer for Manufacture,Transferència de material per a la fabricació
@@ -2134,9 +2154,9 @@
 DocType: Purchase Invoice,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Any fiscal {0} no es troba.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtenir assentaments corresponents
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Entrada Comptabilitat de Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Entrada Comptabilitat de Stock
 DocType: Sales Invoice,Sales Team1,Equip de Vendes 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Article {0} no existeix
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Article {0} no existeix
 DocType: Sales Invoice,Customer Address,Direcció del client
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar addicional de descompte en les
 DocType: Account,Root Type,Escrigui root
@@ -2145,15 +2165,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Mostra aquesta presentació de diapositives a la part superior de la pàgina
 DocType: BOM,Item UOM,Article UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma d&#39;impostos Després Quantitat de Descompte (Companyia moneda)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Magatzem destí obligatori per a la fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Magatzem destí obligatori per a la fila {0}
 DocType: Quality Inspection,Quality Inspection,Inspecció de Qualitat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Petit
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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ó.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,La Comissió no pot ser major que 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivell d'inventari mínim
 DocType: Stock Entry,Subcontract,Subcontracte
@@ -2191,7 +2211,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspecció de qualitat entrant.
 DocType: Purchase Order Item,Returned Qty,Tornat Quantitat
 DocType: Employee,Exit,Sortida
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type is mandatory
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root Type is mandatory
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} creat
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per comoditat dels clients, aquests codis es poden utilitzar en formats d'impressió, com factures i albarans"
 DocType: Employee,You can enter any date manually,Podeu introduir qualsevol data manualment
@@ -2199,8 +2219,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Període De Prova
 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 +110,Row {0}: Advance against Customer must be credit,Fila {0}: Avanç contra el Client ha de ser de crèdit
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Rebut de compra dels articles subministrats
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagar
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,To Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Registres per mantenir l&#39;estat de lliurament de sms
@@ -2217,7 +2238,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivell de Reabastecimiento
 DocType: Attendance,Attendance Date,Assistència Data
 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 +110,Account with child nodes cannot be converted to ledger,Compta amb nodes secundaris no es pot convertir en llibre major
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Compta amb nodes secundaris no es pot convertir en llibre major
 DocType: Address,Preferred Shipping Address,Adreça d'enviament preferida
 DocType: Purchase Receipt Item,Accepted Warehouse,Magatzem Acceptat
 DocType: Bank Reconciliation Detail,Posting Date,Data de publicació
@@ -2235,7 +2256,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,El número de sèrie {0} no existeix
 DocType: Pricing Rule,Discount Percentage,%Descompte
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
-apps/erpnext/erpnext/hooks.py +54,Orders,Ordres
+apps/erpnext/erpnext/hooks.py +55,Orders,Ordres
 DocType: Leave Control Panel,Employee Type,Tipus d'ocupació
 DocType: Employee Leave Approver,Leave Approver,Aprovador d'absències
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferit per a la Fabricació
@@ -2247,7 +2268,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% de materials facturats d'aquesta Ordre de Venda
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Entrada de Tancament de Període
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciació
+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: Customer,Credit Limit,Límit de Crèdit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccioneu el tipus de transacció
@@ -2272,11 +2293,12 @@
 DocType: Material Request,Requested For,Requerida Per
 DocType: Quotation Item,Against Doctype,Contra Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir aquesta nota de lliurament contra qualsevol projecte
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Compte root no es pot esborrar
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Efectiu net d&#39;inversió
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Compte root no es pot esborrar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostra Imatges d'entrades
 ,Is Primary Address,És Direcció Primària
 DocType: Production Order,Work-in-Progress Warehouse,Magatzem de treballs en procés
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referència #{0} amb data {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referència #{0} amb data {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrar Direccions
 DocType: Pricing Rule,Item Code,Codi de l'article
 DocType: Production Planning Tool,Create Production Orders,Crear ordres de producció
@@ -2284,7 +2306,7 @@
 DocType: Journal Entry,User Remark,Observació de l'usuari
 DocType: Lead,Market Segment,Sector de mercat
 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 +223,Closing (Dr),Tancament (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Tancament (Dr)
 DocType: Contact,Passive,Passiu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,El número de sèrie {0} no està en estoc
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla d'Impostos per a la venda de les transaccions.
@@ -2300,7 +2322,7 @@
 ,Billed Amount,Quantitat facturada
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliació bancària
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtenir actualitzacions
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Afegir uns registres d&#39;exemple
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Deixa Gestió
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupa Per Comptes
@@ -2309,14 +2331,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","El compte capçalera amb responsabilitat, en el que es farà l'assentament de Guany / Pèrdua"
 DocType: Payment Tool,Against Vouchers,Contra Vals
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ajuda Ràpida
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Extres de venda
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} pressupost per al compte {1} contra Centre de Cost {2} superarà per {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
 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'
 ,Stock Projected Qty,Quantitat d'estoc previst
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
 DocType: Sales Order,Customer's Purchase Order,Àrea de clients Ordre de Compra
 DocType: Warranty Claim,From Company,Des de l'empresa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Quantitat
@@ -2326,9 +2348,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Llista d'absències permeses bloquejades
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,El utilitzarà per iniciar sessió
 DocType: Sales Partner,Retailer,Detallista
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Crèdit al compte ha de ser un compte de Balanç
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Tots els tipus de proveïdors
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +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/selling/doctype/sales_order/sales_order.py +93,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
@@ -2372,7 +2394,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"El pes brut del paquet. En general, el pes net + embalatge pes del material. (Per imprimir)"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Els usuaris amb aquest rol poden establir comptes bloquejats i crear/modificar els assentaments comptables contra els comptes bloquejats
 DocType: Serial No,Is Cancelled,Està cancel·lat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Els meus enviaments
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Els meus enviaments
 DocType: Journal Entry,Bill Date,Data de la factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Fins i tot si hi ha diverses regles de preus amb major prioritat, s'apliquen prioritats internes:"
 DocType: Supplier,Supplier Details,Detalls del proveïdor
@@ -2393,10 +2415,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Trucades
 DocType: Project,Total Costing Amount (via Time Logs),Suma total del càlcul del cost (a través dels registres de temps)
 DocType: Purchase Order Item Supplied,Stock UOM,UDM de l'Estoc
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Projectat
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} no pertany al Magatzem {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: El sistema no verificarà el lliurament excessiva i l'excés de reserves per Punt {0} com la quantitat o la quantitat és 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: El sistema no verificarà el lliurament excessiva i l'excés de reserves per Punt {0} com la quantitat o la quantitat és 0
 DocType: Notification Control,Quotation Message,Cita Missatge
 DocType: Issue,Opening Date,Data d'obertura
 DocType: Journal Entry,Remark,Observació
@@ -2409,9 +2431,9 @@
 DocType: Time Log,Batched for Billing,Agrupat per a la Facturació
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Bills plantejades pels proveïdors.
 DocType: POS Profile,Write Off Account,Escriu Off Compte
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Efectiu net de les operacions
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,"per exemple, l'IVA"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Article 4
 DocType: Journal Entry Account,Journal Entry Account,Compte entrada de diari
@@ -2452,7 +2474,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data de la jubilació ha de ser major que la data del contracte
 DocType: Sales Invoice,Against Income Account,Contra el Compte d'Ingressos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Lliurat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Objectius Territori
 DocType: Delivery Note,Transporter Info,Informació del transportista
@@ -2480,10 +2502,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nombre de lot és obligatori per Punt {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Es tracta d'una persona de les vendes de l'arrel i no es pot editar.
 ,Stock Ledger,Ledger Stock
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Qualificació: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Qualificació: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Deducció de la fulla de nòmina
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Seleccioneu un node de grup primer.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propòsit ha de ser un de {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Propòsit ha de ser un de {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Ompliu el formulari i deseu
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descarrega un informe amb totes les matèries primeres amb el seu estat últim inventari
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fòrum de la comunitat
@@ -2521,7 +2543,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Companyia (no client o proveïdor) mestre.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Si us plau, introdueixi 'la data prevista de lliurament'"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 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 és un nombre de lot vàlida per Punt {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Note: There is not enough leave balance for Leave Type {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Si el pagament no es fa en contra de qualsevol referència, fer entrada de diari manualment."
@@ -2538,13 +2560,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correus electrònics automàtics als Contactes al Presentar les transaccions
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Fila {0}: Quantitat no avalable a magatzem {1} del {2} {3}.
  Disponible Quantitat: {4}, Transfer Quantitat: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Article 3
 DocType: Purchase Order,Customer Contact Email,Client de correu electrònic de contacte
 DocType: Sales Team,Contribution (%),Contribució (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitats
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nom del venedor
@@ -2555,20 +2577,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Abans de la reconciliació
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,BOM predeterminat
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Si us plau, torneu a escriure nom de l&#39;empresa per confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Viu total Amt
 DocType: Time Log Batch,Total Hours,Total d'hores
 DocType: Journal Entry,Printing Settings,Paràmetres d&#39;impressió
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Dèbit total ha de ser igual al total de crèdit. La diferència és {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Dèbit total ha de ser igual al total de crèdit. La diferència és {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automòbil
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De la nota de lliurament
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Missatge personalitzat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca d'Inversió
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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
 DocType: Purchase Invoice,Price List Exchange Rate,Tipus de canvi per a la llista de preus
 DocType: Purchase Invoice Item,Rate,Tarifa
 DocType: Purchase Invoice Item,Rate,Tarifa
@@ -2588,9 +2610,10 @@
  conflicte mitjançant l'assignació de prioritat. Regles Preu: {0}"
 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 +580,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Material Issue
 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
 DocType: Hub Settings,Access Token,Token d'accés
 DocType: Sales Invoice Item,Serial No,Número de sèrie
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Si us plau entra primer els detalls de manteniment
@@ -2604,10 +2627,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Import Màxim Factura
 DocType: Purchase Invoice Item,Image View,Veure imatges
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Valoració i total
@@ -2615,6 +2640,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Aquest article és una variant de {0} (plantilla). Els atributs es copiaran de la plantilla llevat que 'No Copy' es fixa
 DocType: Account,Purchase User,Usuari de compres
 DocType: Notification Control,Customize the Notification,Personalitza la Notificació
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Flux de caixa operatiu
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,La Plantilla de la direcció predeterminada no es pot eliminar
 DocType: Sales Invoice,Shipping Rule,Regla d'enviament
 DocType: Journal Entry,Print Heading,Imprimir Capçalera
@@ -2625,7 +2651,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Matèria Primera
 DocType: Leave Application,Follow via Email,Seguiu per correu electrònic
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma d'impostos Després del Descompte
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,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 +335,Please select Posting Date first,Seleccioneu Data de comptabilització primer
@@ -2643,6 +2669,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Nº de Sèrie Necessari per article serialitzat {0}
 DocType: Journal Entry,Bank Entry,Entrada Banc
 DocType: Authorization Rule,Applicable To (Designation),Aplicable a (Designació)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Afegir a la cistella
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar per
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Activar / desactivar les divises.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Despeses postals
@@ -2650,30 +2677,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
 DocType: Purchase Order,The date on which recurring order will be stop,La data en què s'aturarà la comanda recurrent
 DocType: Quality Inspection,Item Serial No,Número de sèrie d'article
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} ha de ser reduït per {1} o s'ha d'augmentar la tolerància de desbordament
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} ha de ser reduït per {1} o s'ha d'augmentar la tolerància de desbordament
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Present total
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialitzat article {0} no es pot actualitzar utilitzant \
  Stock Reconciliació"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferència de material a proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Transferència de material a proveïdor
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear Cotització
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,No està autoritzat per aprovar els fulls de bloquejar les dates
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Tots aquests elements ja s'han facturat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Tots aquests elements ja s'han facturat
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pot ser aprovat per {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Condicions d'enviament
 DocType: BOM Replace Tool,The new BOM after replacement,La nova llista de materials després del reemplaçament
 DocType: Features Setup,Point of Sale,Punt de Venda
 DocType: Account,Tax,Impost
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},La fila {0}: {1} no és vàlida per {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,De Bundle Producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,De Bundle Producte
 DocType: Production Planning Tool,Production Planning Tool,Eina de Planificació de la producció
 DocType: Quality Inspection,Report Date,Data de l'informe
 DocType: C-Form,Invoices,Factures
 DocType: Job Opening,Job Title,Títol Professional
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinataris
 DocType: Features Setup,Item Groups in Details,Els grups d'articles en detalls
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Inici de punt de venda (POS)
@@ -2681,8 +2707,9 @@
 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: Pricing Rule,Customer Group,Grup de Clients
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},El compte de despeses és obligatòria per a cada element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},El compte de despeses és obligatòria per a cada element {0}
 DocType: Item,Website Description,Descripció del lloc web
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Canvi en el Patrimoni Net
 DocType: Serial No,AMC Expiry Date,AMC Data de caducitat
 ,Sales Register,Registre de vendes
 DocType: Quotation,Quotation Lost Reason,Cita Perduda Raó
@@ -2690,12 +2717,12 @@
 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/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resum per a aquest mes i activitats pendents
 DocType: Customer Group,Customer Group Name,Nom del grup al Client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Atributs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obtenir elements
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Si us plau indica el Compte d'annotació
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Obtenir elements
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Si us plau indica el Compte d'annotació
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Darrera Data de comanda
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Feu Factura impostos especials
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Compte {0} no pertany a la companyia de {1}
@@ -2711,7 +2738,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dades-Project savi no està disponible per a la cita
 DocType: Project,Expected End Date,Esperat Data de finalització
 DocType: Appraisal Template,Appraisal Template Title,Títol de plantilla d'avaluació
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Article Pare {0} no ha de ser un arxiu d&#39;articles
 DocType: Cost Center,Distribution Id,ID de Distribució
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serveis impressionants
@@ -2724,7 +2751,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor de l&#39;atribut {0} ha d&#39;estar dins del rang de {1} a {2} en els increments de {3}
 DocType: Tax Rule,Sales,Venda
 DocType: Stock Entry Detail,Basic Amount,Suma Bàsic
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
 DocType: Leave Allocation,Unused leaves,Fulles no utilitzades
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Per defecte Comptes per cobrar
@@ -2736,16 +2763,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Rebut de compra
-DocType: Payment Reconciliation,Maximum Amount,Import màxim
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Com s'aplica la regla de preus?
 DocType: Quality Inspection,Delivery Note No,Número d'albarà de lliurament
 DocType: Company,Retail,Venda al detall
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,El client {0} no existeix
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle Producte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Fila {0}: Referència no vàlida {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle Producte
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Fila {0}: Referència no vàlida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Compra les taxes i càrrecs Plantilla
 DocType: Upload Attendance,Download Template,Descarregar plantilla
 DocType: GL Entry,Remarks,Observacions
@@ -2772,7 +2799,7 @@
 ,Monthly Attendance Sheet,Full d'Assistència Mensual
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,No s'ha trobat registre
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de Cost és obligatori per l'article {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Obtenir elements del paquet del producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Obtenir elements del paquet del producte
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Compte {0} està inactiu
 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
@@ -2781,8 +2808,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Pèrdues i Guanys"" tipus de compte {0} no es permet l'entrada amb obertura"
 DocType: Features Setup,Sales Discounts,Descomptes de venda
 DocType: Hub Settings,Seller Country,Venedor País
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publicar articles per pàgina web
 DocType: Authorization Rule,Authorization Rule,Regla d'Autorització
 DocType: Sales Invoice,Terms and Conditions Details,Termes i Condicions Detalls
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Especificacions
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos i càrrecs de venda de plantilla
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Roba i Accessoris
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número d'ordre
@@ -2804,7 +2833,7 @@
 DocType: Time Log,Billing Amount,Facturació Monto
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantitat no vàlid per a l'aricle {0}. Quantitat ha de ser major que 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Les sol·licituds de llicència.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Un compte amb transaccions no es pot eliminar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Un compte amb transaccions no es pot eliminar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Despeses legals
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","El dia del mes en el qual l'ordre automàtic es generarà per exemple 05, 28, etc."
 DocType: Sales Invoice,Posting Time,Temps d'enviament
@@ -2820,11 +2849,11 @@
 DocType: Maintenance Visit,Breakdown,Breakdown
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
 DocType: Bank Reconciliation Detail,Cheque Date,Data Xec
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: el compte Pare {1} no pertany a la companyia: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: el compte Pare {1} no pertany a la companyia: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Eliminat correctament totes les transaccions relacionades amb aquesta empresa!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Com en la data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probation
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,El magatzem predeterminat és obligatòria pels articles d'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,El magatzem predeterminat és obligatòria pels articles d'estoc
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},El pagament del salari corresponent al mes {0} i {1} anys
 DocType: Stock Settings,Auto insert Price List rate if missing,Acte inserit taxa Llista de Preus si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Suma total de pagament
@@ -2836,6 +2865,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Suma total de facturació (a través dels registres de temps)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Venem aquest article
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Identificador de Proveïdor
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Quantitat ha de ser més gran que 0
 DocType: Journal Entry,Cash Entry,Entrada Efectiu
 DocType: Sales Partner,Contact Desc,Descripció del Contacte
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Tipus de fulles com casual, malalts, etc."
@@ -2844,7 +2874,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Afegir files per establir els pressupostos anuals de Comptes.
 DocType: Buying Settings,Default Supplier Type,Tipus predeterminat de Proveïdor
 DocType: Production Order,Total Operating Cost,Cost total de funcionament
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota: L'article {0} entrat diverses vegades
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Nota: L'article {0} entrat diverses vegades
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tots els contactes.
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abreviatura de l'empresa
@@ -2869,7 +2899,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tots els Grups de clients
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Plantilla d&#39;impostos és obligatori.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Compte {0}: el compte superior {1} no existeix
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Preferit Direcció de facturació
@@ -2887,8 +2917,8 @@
 ,Item-wise Price List Rate,Llista de Preus de tarifa d'article
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} està aturat
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} està aturat
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
 DocType: Lead,Add to calendar on this date,Afegir al calendari en aquesta data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regles per afegir les despeses d'enviament.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Pròxims esdeveniments
@@ -2909,24 +2939,24 @@
 DocType: Customer,From Lead,De client potencial
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Comandes llançades per a la producció.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccioneu l'Any Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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 +455,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
 DocType: Hub Settings,Name Token,Nom Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard Selling
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,Fora de la Garantia
 DocType: BOM Replace Tool,Replace,Reemplaçar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Si us plau ingressi Unitat de mesura per defecte
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Si us plau ingressi Unitat de mesura per defecte
 DocType: Purchase Invoice Item,Project Name,Nom del projecte
 DocType: Supplier,Mention if non-standard receivable account,Esmenteu si compta per cobrar no estàndard
 DocType: Journal Entry Account,If Income or Expense,Si ingressos o despeses
 DocType: Features Setup,Item Batch Nos,Números de Lot d'articles
 DocType: Stock Ledger Entry,Stock Value Difference,Diferència del valor d'estoc
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Recursos Humans
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Actius per impostos
 DocType: BOM Item,BOM No,No BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Mitjana Mòbil
 DocType: BOM Replace Tool,The BOM which will be replaced,Llista de materials que serà substituïda
 DocType: Account,Debit,Dèbit
@@ -2963,7 +2993,7 @@
 DocType: Stock Entry Detail,Additional Cost,Cost addicional
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data de finalització de l'exercici fiscal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Can not filter based on Voucher No, if grouped by Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Fer Oferta de Proveïdor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Fer Oferta de Proveïdor
 DocType: Quality Inspection,Incoming,Entrant
 DocType: BOM,Materials Required (Exploded),Materials necessaris (explotat)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduir el guany per absències sense sou (LWP)
@@ -2971,7 +3001,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,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/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Deixar Casual
 DocType: Batch,Batch ID,Identificació de lots
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Nota: {0}
 ,Delivery Note Trends,Nota de lliurament Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resum de la setmana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} ha de ser un article de compra o de subcontractació a la fila {1}
@@ -2986,6 +3016,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Quota de compra mitja
 DocType: Task,Actual Time (in Hours),Temps real (en hores)
 DocType: Employee,History In Company,Història a la Companyia
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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 Sol·licitud de material {1} no pot ser superior a la quantitat sol·licitada {2} d&#39;article {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Butlletins
 DocType: Address,Shipping,Enviament
 DocType: Stock Ledger Entry,Stock Ledger Entry,Ledger entrada Stock
@@ -3005,7 +3036,6 @@
 DocType: Purchase Order,End date of current order's period,Data de finalització del període de l'ordre actual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Fer una Oferta Carta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorn
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Unitat de mesura per defecte per a la variant ha de ser la mateixa que la plantilla
 DocType: Production Order Operation,Production Order Operation,Ordre de Producció Operació
 DocType: Pricing Rule,Disable,Desactiva
 DocType: Project Task,Pending Review,Pendent de Revisió
@@ -3013,7 +3043,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID del client
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Per Temps ha de ser més gran que From Time
 DocType: Journal Entry Account,Exchange Rate,Tipus De Canvi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magatzem {0}: compte de Pares {1} no Bolong a l'empresa {2}
 DocType: BOM,Last Purchase Rate,Darrera Compra Rate
 DocType: Account,Asset,Basa
@@ -3033,7 +3063,7 @@
 ,Available Stock for Packing Items,Estoc disponible per articles d'embalatge
 DocType: Item Variant,Item Variant,Article Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,En establir aquesta plantilla de direcció per defecte ja que no hi ha altre defecte
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Gestió de la Qualitat
 DocType: Production Planning Tool,Filter based on customer,Filtre basat en el client
 DocType: Payment Tool Detail,Against Voucher No,Contra el comprovant número
@@ -3050,6 +3080,7 @@
 DocType: Opportunity,Next Contact,Següent Contacte
 DocType: Employee,Employment Type,Tipus d'Ocupació
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Actius Fixos
+,Cash Flow,Flux d&#39;Efectiu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Període d&#39;aplicació no pot ser a través de dos registres alocation
 DocType: Item Group,Default Expense Account,Compte de Despeses predeterminat
 DocType: Employee,Notice (days),Avís (dies)
@@ -3081,13 +3112,12 @@
 DocType: Production Order,Warehouses,Magatzems
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Imprimir i Papereria
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
-DocType: Payment Reconciliation,Minimum Amount,Quantitat mínima
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Actualitzar Productes Acabats
 DocType: Workstation,per hour,per hores
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Es crearà un Compte per al magatzem (Inventari Permanent) en aquest Compte
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,El Magatzem no es pot eliminar perquè hi ha entrades al llibre major d'existències d'aquest magatzem.
 DocType: Company,Distribution,Distribució
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Quantitat pagada
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Quantitat pagada
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerent De Projecte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Despatx
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descompte màxim permès per l'article: {0} és {1}%
@@ -3111,7 +3141,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suport
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Falta Empresa als magatzems {0}
 DocType: POS Profile,Terms and Conditions,Condicions
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Per a la data ha d'estar dins de l'any fiscal. Suposant Per Data = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Per a la data ha d'estar dins de l'any fiscal. Suposant Per Data = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí pot actualitzar l'alçada, el pes, al·lèrgies, problemes mèdics, etc."
 DocType: Leave Block List,Applies to Company,S'aplica a l'empresa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,No es pot cancel·lar perquè l'entrada d'estoc {0} ja ha estat Presentada
@@ -3125,11 +3155,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Si us plau ingressi rebuts de compra
 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 +425,Transaction not allowed against stopped Production Order {0},No es permet la transacció cap a l'ordre de producció aturada {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuració del servidor d'entrada per l'id de suport per correu electrònic. (Per exemple support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Quantitat escassetat
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,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 +577,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
 DocType: Salary Slip,Salary Slip,Slip Salari
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Per Dóna't' es requereix
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar albarans paquets que es lliuraran. S'utilitza per notificar el nombre de paquets, el contingut del paquet i el seu pes."
@@ -3218,7 +3248,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Registres d'empleats.
 DocType: HR Settings,Payroll Settings,Ajustaments de Nòmines
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Coincideixen amb les factures i pagaments no vinculats.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Poseu l&#39;ordre
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Poseu l&#39;ordre
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root no pot tenir un centre de costos pares
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Seleccioneu una marca ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Applicable
@@ -3233,7 +3263,7 @@
 DocType: Appraisal,Start Date,Data De Inici
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Assignar absències per un període.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Fes clic aquí per verificar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Compte {0}: No es pot assignar com compte principal
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Compte {0}: No es pot assignar com compte principal
 DocType: Purchase Invoice Item,Price List Rate,Preu de llista Rate
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostra ""En estock"" o ""No en estoc"", basat en l'estoc disponible en aquest magatzem."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Llista de materials (BOM)
@@ -3242,17 +3272,17 @@
 DocType: Project,Expected Start Date,Data prevista d'inici
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Treure article si els càrrecs no és aplicable a aquest
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ex. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Rebre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Rebre
 DocType: Maintenance Visit,Fully Completed,Totalment Acabat
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complet
 DocType: Employee,Educational Qualification,Capacitació per a l'Educació
 DocType: Workstation,Operating Costs,Costos Operatius
 DocType: Employee Leave Approver,Employee Leave Approver,Empleat Deixar aprovador
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha estat afegit amb èxit al llistat de Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","No es pot declarar com perdut, perquè s'han fet ofertes"
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Administraodr principal de compres
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,L'Ordre de Producció {0} ha d'estar Presentada
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,L'Ordre de Producció {0} ha d'estar Presentada
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +136,Main Reports,Informes principals
 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
@@ -3270,7 +3300,7 @@
 DocType: Industry Type,Industry Type,Tipus d'Indústria
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Quelcom ha fallat!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Advertència: Deixa aplicació conté dates bloc
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data d'acabament
 DocType: Purchase Invoice Item,Amount (Company Currency),Import (Companyia moneda)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unitat d'Organització (departament) mestre.
@@ -3289,10 +3319,10 @@
 ,Serial No Service Contract Expiry,Número de sèrie del contracte de venciment del servei
 DocType: Item,Unit of Measure Conversion,Unitat de conversió de la mesura
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empleat no es pot canviar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,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
 DocType: Naming Series,Help HTML,Ajuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},El pes total assignat ha de ser 100%. És {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Permissió de superació {0} superat per l'article {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Permissió de superació {0} superat per l'article {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nom de la persona o organització a la que pertany aquesta direcció.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Els seus Proveïdors
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,No es pot establir tan perdut com està feta d'ordres de venda.
@@ -3305,35 +3335,35 @@
 DocType: Employee,Date of Issue,Data d'emissió
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Des {0} de {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Si us plau, consulti l&#39;opció Multi moneda per permetre comptes amb una altra moneda"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,"Si us plau, consulti l&#39;opció Multi moneda per permetre comptes amb una altra moneda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Article: {0} no existeix en el sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,No estàs autoritzat per establir el valor bloquejat
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,No estàs autoritzat per establir el valor bloquejat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Aconsegueix entrades no reconciliades
+DocType: Payment Reconciliation,From Invoice Date,Des Data de la factura
 DocType: Cost Center,Budgets,Pressupostos
-DocType: Employee,Emergency Contact Details,Detalls de Contacte d'Emergència
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Què fa?
 DocType: Delivery Note,To Warehouse,Magatzem destí
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Compte {0} s'ha introduït més d'una vegada per a l'any fiscal {1}
 ,Average Commission Rate,Comissió de Tarifes mitjana
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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/hr/doctype/attendance/attendance.py +34,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
 DocType: Purchase Taxes and Charges,Account Head,Cap Compte
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualització dels costos addicionals per al càlcul del preu al desembarcament d'articles
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elèctric
 DocType: Stock Entry,Total Value Difference (Out - In),Diferència Total Valor (Out - En)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipus de canvi és obligatori
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipus de canvi és obligatori
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID d'usuari no entrat per l'Empleat {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De reclam de garantia
 DocType: Stock Entry,Default Source Warehouse,Magatzem d'origen predeterminat
 DocType: Item,Customer Code,Codi de Client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Recordatori d'aniversari per {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dies des de l'última comanda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Actius
@@ -3346,7 +3376,7 @@
 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
 DocType: Authorization Rule,Based On,Basat en
 DocType: Sales Order Item,Ordered Qty,Quantitat demanada
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Article {0} està deshabilitat
 DocType: Stock Settings,Stock Frozen Upto,Estoc bloquejat fins a
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Període Des i Període Per dates obligatòries per als recurrents {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activitat del projecte / tasca.
@@ -3354,7 +3384,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escriu Off Import (Companyia moneda)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
 DocType: Landed Cost Voucher,Landed Cost Voucher,Val Landed Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Si us plau, estableix {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repetiu el Dia del Mes
@@ -3384,12 +3414,12 @@
 DocType: Upload Attendance,Upload Attendance,Pujar Assistència
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Llista de materials i de fabricació es requereixen Quantitat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rang 2 Envelliment
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Quantitat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Quantitat
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM reemplaçat
 ,Sales Analytics,Analytics de venda
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustaments de Manufactura
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuració de Correu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Si us plau ingressi moneda per defecte en l'empresa Mestre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Recordatoris diaris
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflictes norma fiscal amb {0}
@@ -3415,13 +3445,13 @@
 DocType: Sales Order Item,Produced Quantity,Quantitat produïda
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Enginyer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Assemblees Cercar Sub
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Codi de l'article necessari a la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Codi de l'article necessari a la fila n {0}
 DocType: Sales Partner,Partner Type,Tipus de Partner
 DocType: Purchase Taxes and Charges,Actual,Reial
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descompte
 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 +263,Installation Note {0} has already been submitted,La Nota d'Instal·lació {0} ja s'ha presentat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,La Nota d'Instal·lació {0} ja s'ha presentat
 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
@@ -3433,15 +3463,15 @@
 DocType: Employee,Applicable Holiday List,Llista de vacances aplicable
 DocType: Employee,Cheque,Xec
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Sèries Actualitzat
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Tipus d'informe és obligatori
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,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/doctype/purchase_common/purchase_common.py +69,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/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/public/js/setup_wizard.js +101,The First User: You,La Primera Usuari:
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliats amb èxit
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Reconciliats amb èxit
 DocType: Production Order,Planned End Date,Planejat Data de finalització
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Lloc d'emmagatzematge dels articles.
 DocType: Tax Rule,Validity,Validesa
@@ -3449,7 +3479,7 @@
 DocType: Attendance,Attendance,Assistència
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Data de publicació i l'hora de publicar és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Data de publicació i l'hora de publicar és obligatori
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Plantilla d'Impostos per a les transaccions de compres
 ,Item Prices,Preus de l'article
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,En paraules seran visibles un cop que es guardi l'ordre de compra.
@@ -3458,15 +3488,15 @@
 DocType: Task,Review Date,Data de revisió
 DocType: Purchase Invoice,Advance Payments,Pagaments avançats
 DocType: Purchase Taxes and Charges,On Net Total,En total net
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,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ó
+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ó
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,No té permís per utilitzar l'eina de Pagament
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,«Notificació adreces de correu electrònic 'no especificats per recurrent% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Per arrodonir el compte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despeses d'Administració
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Pares Grup de Clients
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Canvi
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Canvi
 DocType: Purchase Invoice,Contact Email,Correu electrònic de contacte
 DocType: Appraisal Goal,Score Earned,Score Earned
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","per exemple ""El meu Company LLC """
@@ -3476,13 +3506,13 @@
 DocType: Packing Slip,Gross Weight UOM,Pes brut UDM
 DocType: Email Digest,Receivables / Payables,Cobrar / pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Compte de Crèdit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Compte de Crèdit
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost article
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostra valors zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantitat de punt obtingut després de la fabricació / reempaque de determinades quantitats de matèries primeres
 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 +562,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 +572,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
 DocType: Item,Default Warehouse,Magatzem predeterminat
 DocType: Task,Actual End Date (via Time Logs),Actual Data de finalització (a través dels registres de temps)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Pressupost no es pot assignar contra comptes de grup {0}
@@ -3518,29 +3548,30 @@
 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/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ja s'ha presentat
 ,Items To Be Requested,Articles que s'han de demanar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Obtenir Darrera Tarifa de compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Facturació Tarifa basada en Tipus d&#39;activitat (per hora)
 DocType: Company,Company Info,Qui Som
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","ID de correu electrònic de l'empresa no trobat, per tant, no s'ha enviat el correu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicació de Fons (Actius)
 DocType: Production Planning Tool,Filter based on item,Filtre basada en l'apartat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Compte Dèbit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Compte Dèbit
 DocType: Fiscal Year,Year Start Date,Any Data d'Inici
 DocType: Attendance,Employee Name,Nom de l'Empleat
 DocType: Sales Invoice,Rounded Total (Company Currency),Total arrodonit (en la divisa de la companyia)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,No es pot encoberta al grup perquè es selecciona Tipus de compte.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,No es pot encoberta al grup perquè es selecciona Tipus de compte.
 DocType: Purchase Common,Purchase Common,Purchase Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} ha estat modificat. Si us plau, actualitzia"
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permetis que els usuaris realitzin Aplicacions d'absències els següents dies.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,De Oportunitat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficis als empleats
 DocType: Sales Invoice,Is POS,És TPV
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Quantitat Acceptada
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existeix
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Factures enviades als clients.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Identificació del projecte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonats afegir
 DocType: Maintenance Schedule,Schedule,Horari
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definir Pressupost per a aquest centre de cost. Per configurar l&#39;acció de pressupost, vegeu &quot;Llista de l&#39;Empresa&quot;"
@@ -3548,7 +3579,7 @@
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Cub
 DocType: GL Entry,Voucher Type,Tipus de Vals
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
 DocType: Expense Claim,Approved,Aprovat
 DocType: Pricing Rule,Price,Preu
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
@@ -3562,7 +3593,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entrades de diari de Comptabilitat.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Quantitat a partir de Magatzem
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Seleccioneu Employee Record primer.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Fila {0}: Festa / Compte no coincideix amb {1} / {2} en {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Fila {0}: Festa / Compte no coincideix amb {1} / {2} en {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Per crear un compte d'impostos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Si us plau ingressi Compte de Despeses
 DocType: Account,Stock,Estoc
@@ -3573,7 +3604,7 @@
 DocType: Employee,Contract End Date,Data de finalització de contracte
 DocType: Sales Order,Track this Sales Order against any Project,Seguir aquesta Ordre Vendes cap algun projecte
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Ordres de venda i halar (pendent d'entregar) basat en els criteris anteriors
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Oferta de Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Oferta de Proveïdor
 DocType: Deduction Type,Deduction Type,Tipus Deducció
 DocType: Attendance,Half Day,Medi Dia
 DocType: Pricing Rule,Min Qty,Quantitat mínima
@@ -3581,7 +3612,7 @@
 DocType: GL Entry,Transaction Date,Data de Transacció
 DocType: Production Plan Item,Planned Qty,Planificada Quantitat
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Impost Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Per Quantitat (Fabricat Quantitat) és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Per Quantitat (Fabricat Quantitat) és obligatori
 DocType: Stock Entry,Default Target Warehouse,Magatzem de destí predeterminat
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (En la moneda de la Companyia)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: Partit Tipus i Partit és aplicable únicament contra el compte de cobrament / pagament
@@ -3635,9 +3666,9 @@
 DocType: Customer,Commission Rate,Percentatge de comissió
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Fer Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquejar sol·licituds d'absències per departament.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,El carret està buit
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,El carret està buit
 DocType: Production Order,Actual Operating Cost,Cost de funcionament real
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root no es pot editar.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root no es pot editar.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Suma assignat no pot superar l'import a unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Permetre Producció en Vacances
 DocType: Sales Order,Customer's Purchase Order Date,Data de l'ordre de compra del client
@@ -3648,11 +3679,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Dissenyador
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantilla de Termes i Condicions
 DocType: Serial No,Delivery Details,Detalls del lliurament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Es requereix de centres de cost a la fila {0} en Impostos taula per al tipus {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Es requereix de centres de cost a la fila {0} en Impostos taula per al tipus {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Creació automàtica de sol·licitud de materials si la quantitat és inferior a aquest nivell
 ,Item-wise Purchase Register,Registre de compra d'articles
 DocType: Batch,Expiry Date,Data De Caducitat
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per establir el nivell de comanda, article ha de ser un article de compra o fabricació d&#39;articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per establir el nivell de comanda, article ha de ser un article de compra o fabricació d&#39;articles"
 ,Supplier Addresses and Contacts,Adreces i contactes dels proveïdors
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Si us plau, Selecciona primer la Categoria"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projecte mestre.
@@ -3660,7 +3691,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Mig dia)
 DocType: Supplier,Credit Days,Dies de Crèdit
 DocType: Leave Type,Is Carry Forward,Is Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obtenir elements de la llista de materials
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Llista de materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: Partit Tipus i Partit es requereix per al compte per cobrar / pagar {1}
@@ -3668,7 +3699,7 @@
 DocType: Employee,Reason for Leaving,Raons per deixar el
 DocType: Expense Claim Detail,Sanctioned Amount,Sanctioned Amount
 DocType: GL Entry,Is Opening,Està obrint
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Fila {0}: seient de dèbit no pot vincular amb un {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,El compte {0} no existeix
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Fila {0}: seient de dèbit no pot vincular amb un {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,El compte {0} no existeix
 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 459c489..610e5f7 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Spotřební zboží
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Prosím, vyberte typ Party první"
 DocType: Item,Customer Items,Zákazník položky
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
 DocType: Item,Publish Item to hub.erpnext.com,Publikování položku do hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mailová upozornění
 DocType: Item,Default Unit of Measure,Výchozí Měrná jednotka
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude se vypočítá v transakci.
 DocType: Purchase Order,Customer Contact,Kontakt se zákazníky
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Z materiálu Poptávka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Z materiálu Poptávka
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Strom
 DocType: Job Applicant,Job Applicant,Job Žadatel
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Žádné další výsledky.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1.Chcete-li zachovat zákazníkovo produktové číslo a také podle něj vyhledávat, použijte tuto možnost"
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Zobrazit Varianty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Množství
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Množství
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Úvěry (závazky)
 DocType: Employee Education,Year of Passing,Rok Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na skladě
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Péče o zdraví
 DocType: Purchase Invoice,Monthly,Měsíčně
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Zpoždění s platbou (dny)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mailová adresa
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,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
 DocType: Company,Abbr,Zkr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Řádek č. {0}:
 DocType: Delivery Note,Vehicle No,Vozidle
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Prosím, vyberte Ceník"
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,"Prosím, vyberte Ceník"
 DocType: Production Order Operation,Work In Progress,Work in Progress
 DocType: Employee,Holiday List,Dovolená Seznam
 DocType: Time Log,Time Log,Time Log
@@ -99,17 +99,17 @@
 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: Employee,Married,Ženatý
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Není dovoleno {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 DocType: Payment Reconciliation,Reconcile,Srovnat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Proveďte Bank Vstup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Penzijní fondy
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
 DocType: Lead,Person Name,Osoba Jméno
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Zkontrolujte, zda je opakující se, zrušte zaškrtnutí políčka zastavit opakované nebo dát správné datum ukončení"
-DocType: Sales Invoice Item,Sales Invoice Item,Prodejní faktuře položka
+DocType: Sales Invoice Item,Sales Invoice Item,Položka prodejní faktury
 DocType: Account,Credit,Úvěr
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,"Prosím, setup zaměstnanců pojmenování systému v oblasti lidských zdrojů> Nastavení HR"
 DocType: POS Profile,Write Off Cost Center,Odepsat nákladové středisko
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Zájemci
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of materiálu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopírovat z bodu Group
 DocType: Journal Entry,Opening Entry,Otevření Entry
 DocType: Stock Entry,Additional Costs,Dodatečné náklady
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
 DocType: Lead,Product Enquiry,Dotaz Product
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Prosím, nejprave zadejte společnost"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Prosím, vyberte první firma"
 DocType: Employee Education,Under Graduate,Za absolventa
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivita Log:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
@@ -165,7 +165,7 @@
 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","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 +444,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bude aktualizováno po odeslání faktury.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Nastavení pro HR modul
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Podrobnosti o prováděných operací.
 DocType: Serial No,Maintenance Status,Status Maintenance
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Položky a Ceny
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},"Od data by měla být v rámci fiskálního roku. Za předpokladu, že od data = {0}"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},"Od data by měla být v rámci fiskálního roku. Za předpokladu, že od data = {0}"
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vyberte zaměstnance, pro kterého vytváříte hodnocení."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Náklady Center {0} nepatří do společnosti {1}
 DocType: Customer,Individual,Individuální
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Čistý peněžní tok z financování
 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ů
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Kontakt Jméno
 DocType: Production Plan Item,SO Pending Qty,SO Pending Množství
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Vytvoří výplatní pásku na výše uvedených kritérií.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,No vzhledem k tomu popis
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Žádost o koupi.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 DocType: Payment Tool,Reference No,Referenční číslo
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Absence blokována
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Item,Publish in Hub,Publikovat v Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Položka {0} je zrušen
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Položka {0} je zrušen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Vztah
 DocType: Shipping Rule,Worldwide Shipping,Celosvětově doprava
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potvrzené objednávky od zákazníků.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Návrhy
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Položka Skupina-moudrý rozpočty na tomto území. Můžete také sezónnosti nastavením distribuce.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Prosím, zadejte mateřskou skupinu účtu pro sklad {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemůže být větší než dlužné částky {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemůže být větší než dlužné částky {2}
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generování plán
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Nejnovější
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 znaků
 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
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Učit se
 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ů
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Správa obchodník strom.
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Více měn
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
 DocType: Sales Invoice Item,Delivery Note,Dodací list
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Nastavení Daně
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Nastavení Daně
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +105,Summary for this week and pending activities,Shrnutí pro tento týden a probíhajícím činnostem
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vyberte měsíc a rok
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","K dispozici v BOM, dodací list, fakturu, výrobní zakázky, objednávky, doklad o koupi, prodejní faktury odběratele, Stock vstupu, časový rozvrh"
 DocType: Item Tax,Tax Rate,Tax Rate
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Select Položka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Select Položka
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} podařilo dávkové, nemůže být v souladu s použitím \
  Stock usmíření, použijte Reklamní Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Převést na non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Příjmka musí být odeslána
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Lékařský
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Důvod ztráty
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Příležitosti
 DocType: Employee,Single,Jednolůžkový
 DocType: Issue,Attachment,Příloha
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Rozpočet nelze nastavit pro skupinu nákladového střediska
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,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 +563,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 +140,Holiday master.,Holiday master.
 DocType: Material Request Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Prosím, zadejte kód položky."
 DocType: BOM,Costing,Rozpočet
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Je-li zaškrtnuto, bude částka daně považovat za již zahrnuty v tisku Rate / Tisk Částka"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Celkem Množství
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Pořadové č záruční lhůty
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Přírůstek nemůže být 0
 DocType: Production Planning Tool,Material Requirement,Materiál Požadavek
 DocType: Company,Delete Company Transactions,Smazat transakcí Company
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Položka {0} není Nákup položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Položka {0} není Nákup položky
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} je neplatná e-mailová adresa v ""Oznámení \
  E-mailová adresa"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Celkem Billing Tento rok:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
 DocType: Purchase Invoice,Supplier Invoice No,Dodavatelské faktury č
 DocType: Territory,For reference,Pro srovnání
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Uzavření (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Uzavření (Cr)
 DocType: Serial No,Warranty Period (Days),Záruční doba (dny)
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 ,Pending Qty,Čekající Množství
@@ -466,7 +469,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Měsíční rozložení** vám pomůže váš rozpočet distribuovat do více měsíců, pokud Vaše podnikání ovlivňuje sezónnost.
 
  Chcete-li distribuovat rozpočet pomocí tohoto rozdělení, nastavte toto ** měsíční rozložení ** v ** nákladovém středisku **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
@@ -474,9 +477,9 @@
 DocType: Project Task,Project Task,Úkol Project
 ,Lead Id,Id leadu
 DocType: C-Form Invoice Detail,Grand Total,Celkem
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Datum zahájení Fiskálního roku by nemělo být větší než datum ukončení
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Datum zahájení Fiskálního roku by nemělo být větší než datum ukončení
 DocType: Warranty Claim,Resolution,Řešení
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dodává: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Dodává: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Splatnost účtu
 DocType: Sales Order,Billing and Delivery Status,Fakturace a Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Opakujte zákazníci
@@ -491,7 +494,7 @@
 DocType: Quotation,Quotation To,Nabídka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
@@ -500,7 +503,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Výrobní zakázka je povinné
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Návrh Psaní
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativní Sklad Error ({6}) k bodu {0} ve skladu {1} na {2} {3} v {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativní Sklad Error ({6}) k bodu {0} ve skladu {1} na {2} {3} v {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskální rok Společnosti
 DocType: Packing Slip Item,DN Detail,DN Detail
 DocType: Time Log,Billed,Fakturováno
@@ -519,16 +522,17 @@
 DocType: Activity Type,Default Costing Rate,Výchozí kalkulace Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Plán údržby
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pak se pravidla pro tvorbu cen jsou odfiltrovány založeny na zákazníka, skupiny zákazníků, území, dodavatel, dodavatel typ, kampaň, obchodní partner atd"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Čistá Změna stavu zásob
 DocType: Employee,Passport Number,Číslo pasu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manažer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Z příjemky
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Z příjemky
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
 DocType: SMS Settings,Receiver Parameter,Přijímač parametrů
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založeno na"" a ""Seskupeno podle"", nemůže být stejné"
 DocType: Sales Person,Sales Person Targets,Obchodník cíle
 DocType: Production Order Operation,In minutes,V minutách
 DocType: Issue,Resolution Date,Rozlišení Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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}
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Převést do skupiny
 DocType: Activity Cost,Activity Type,Druh činnosti
@@ -539,7 +543,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publikování
 DocType: Activity Cost,Projects User,Projekty uživatele
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Spotřeba
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nebyla nalezena v tabulce Podrobnosti Faktury
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} nebyla nalezena v tabulce Podrobnosti Faktury
 DocType: Company,Round Off Cost Center,Zaokrouhlovací nákladové středisko
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
 DocType: Material Request,Material Transfer,Přesun materiálu
@@ -561,13 +565,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Chcete-li sledovat položky v oblasti prodeje a nákupu dokumentů na základě jejich sériových čísel. To je možné také použít ke sledování detailů produktu záruční.
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Celkem fakturace tento rok
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 DocType: Employee,Provide email id registered in company,Poskytnout e-mail id zapsané ve firmě
 DocType: Hub Settings,Seller City,Prodejce City
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Položka má varianty.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -585,18 +589,18 @@
 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 +92,{0} is not a stock Item,{0} není skladová položka
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} není skladová položka
 DocType: Mode of Payment Account,Default Account,Výchozí účet
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,"Prosím, vyberte týdenní off den"
 DocType: Production Order Operation,Planned End Time,Plánované End Time
 ,Sales Person Target Variance Item Group-Wise,Prodej Osoba Cílová Odchylka Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
 DocType: Delivery Note,Customer's Purchase Order No,Zákazníka Objednávka No
 DocType: Employee,Cell Number,Číslo buňky
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Žádosti Auto materiál vygenerovaný
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
 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 +33,Monthly salary statement.,Měsíční plat prohlášení.
@@ -605,9 +609,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} typu {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Účetní Přihlášky lze proti koncové uzly. Záznamy proti skupinám nejsou povoleny.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
 DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodej kampaně.
 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.
@@ -665,7 +669,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ceník není zvolen
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Process Payroll,Send Email,Odeslat email
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nemáte oprávnění
 DocType: Company,Default Bank Account,Výchozí Bankovní účet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Chcete-li filtrovat na základě Party, vyberte typ Party první"
@@ -673,7 +677,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budou zobrazeny vyšší
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Odsouhlasení Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Moje Faktury
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Moje Faktury
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Žádný zaměstnanec nalezeno
 DocType: Purchase Order,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Pokud se subdodávky na dodavatele
@@ -683,6 +687,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Odeslat nyní
 ,Support Analytics,Podpora Analytics
 DocType: Item,Website Warehouse,Sklad pro web
+DocType: Payment Reconciliation,Minimum Invoice Amount,Minimální částka faktury
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form záznamy
@@ -692,7 +697,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Chcete-li povolit &quot;Point of Sale&quot; představuje
 DocType: Bin,Moving Average Rate,Klouzavý průměr
 DocType: Production Planning Tool,Select Items,Vyberte položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} proti účtence {1} ze dne {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} proti účtence {1} ze dne {2}
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Nechte přes dodávku nebo příjem aľ tohoto procenta
@@ -704,7 +709,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
 DocType: Production Order,Item To Manufacture,Bod K výrobě
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} je stav {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Objednávka na platební
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Objednávka na platební
 DocType: Sales Order Item,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatno dne
 DocType: Newsletter,Newsletter Manager,Newsletter Manažer
@@ -728,7 +733,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Místě prodeje
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
 DocType: Account,Balance must be,Zůstatek musí být
 DocType: Hub Settings,Publish Pricing,Publikovat Ceník
 DocType: Notification Control,Expense Claim Rejected Message,Zpráva o zamítnutí úhrady výdajů
@@ -751,7 +756,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Devizový kurz master.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} musí být aktivní
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} musí být aktivní
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vyberte první typ dokumentu
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Částka proplacené dovolené
@@ -761,7 +766,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Výrobní Objednávky
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Zůstatek Hodnota
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Ceník
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodejní ceník
 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
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Prosím, uveďte zaokrouhlit účet v společnosti"
@@ -769,17 +774,17 @@
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Features Setup,Item Barcode,Položka Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Bod Varianty {0} aktualizováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Bod Varianty {0} aktualizováno
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
 DocType: Address,Shop,Obchod
 DocType: Hub Settings,Sync Now,Sync teď
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
 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."
 DocType: Employee,Permanent Address Is,Trvalé bydliště je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Provoz dokončeno kolika hotových výrobků?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
 DocType: Employee,Exit Interview Details,Exit Rozhovor Podrobnosti
 DocType: Item,Is Purchase Item,je Nákupní Položka
 DocType: Journal Entry Account,Purchase Invoice,Přijatá faktura
@@ -791,7 +796,7 @@
 DocType: Salary Slip,Total in words,Celkem slovy
 DocType: Material Request Item,Lead Time Date,Datum a čas Leadu
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,je povinné. Možná chybí záznam směnného kurzu pro
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Pro &quot;produktem Bundle předměty, sklad, sériové číslo a dávkové No bude považována ze&quot; Balení seznam &#39;tabulky. Pokud Warehouse a Batch No jsou stejné pro všechny balení položky pro jakoukoli &quot;Výrobek balík&quot; položky, tyto hodnoty mohou být zapsány do hlavní tabulky položky, budou hodnoty zkopírovány do &quot;Balení seznam&quot; tabulku."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Zásilky zákazníkům.
 DocType: Purchase Invoice Item,Purchase Order Item,Položka vydané objednávky
@@ -800,14 +805,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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 +626,Select Item for Transfer,Vybrat položku pro převod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Povolit uživateli upravovat Ceník Cena při transakcích
 DocType: Pricing Rule,Max Qty,Max Množství
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemický
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
 DocType: Process Payroll,Select Payroll Year and Month,Vyberte Payroll rok a měsíc
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Přejděte na příslušné skupiny (obvykle využití finančních prostředků&gt; oběžných aktiv&gt; bankovních účtů a vytvořit nový účet (kliknutím na Přidat dítě) typu &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Cena elektřiny
@@ -821,10 +827,10 @@
 DocType: SMS Center,All Lead (Open),Všechny Lead (Otevřeny)
 DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Připojit svůj obrázek
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Dělat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Dělat
 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 +3,My Cart,Můj košík
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Můj košík
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Otevření POČET
@@ -843,10 +849,10 @@
 DocType: POS Profile,Cash/Bank Account,Hotovostní / Bankovní účet
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Atribut tabulka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} nemůže být negativní
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Sleva
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Sleva
 DocType: Features Setup,Purchase Discounts,Nákup Slevy
 DocType: Workstation,Wages,Mzdy
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Bude aktualizována pouze v případě, Time Log je &quot;Zúčtovatelná&quot;"
@@ -862,7 +868,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jste Expense schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
 DocType: Serial No,Creation Document No,Tvorba dokument č
 DocType: Issue,Issue,Problém
-apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Účet neodpovídá Company
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Účet neodpovídá Společnosti
 apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
@@ -871,7 +877,7 @@
 DocType: Tax Rule,Shipping State,Přepravní State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodejní náklady
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standardní Nakupování
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standardní Nakupování
 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
@@ -913,6 +919,7 @@
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použít dodatečnou slevu On&quot;
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"Z rozsahu, musí být nižší než na Range"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vyberte Time protokolů a předložit k vytvoření nové prodejní faktury.
@@ -922,13 +929,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,To Batch Time Log bylo účtováno.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Vytvořit příležitost
 DocType: Salary Slip,Leave Without Pay,Volno bez nároku na mzdu
-DocType: Supplier,Communications,Komunikace
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Plánování kapacit Chyba
 ,Trial Balance for Party,Trial váhy pro stranu
 DocType: Lead,Consultant,Konzultant
 DocType: Salary Slip,Earnings,Výdělek
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Dokončeno Položka {0} musí být zadán pro vstup typu Výroba
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Otevření účetnictví Balance
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Dokončeno Položka {0} musí být zadán pro vstup typu Výroba
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otevření účetnictví Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nic požadovat
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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í"""
@@ -970,7 +976,7 @@
 DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
 DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem
 DocType: Lead,Call,Volání
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Záznamy"" nemohou být prázdné"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,"""Záznamy"" nemohou být prázdné"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicitní řádek {0} se stejným {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Nastavení Zaměstnanci
@@ -982,9 +988,9 @@
 DocType: Contact,User ID,User ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Výroba na odběratele
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -1014,7 +1020,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
 DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"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 +159,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1027,13 +1033,13 @@
 DocType: Employee,Place of Issue,Místo vydání
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Smlouva
 DocType: Email Digest,Add Quote,Přidat nabídku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Vaše Produkty nebo Služby
 DocType: Mode of Payment,Mode of Payment,Způsob platby
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,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/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
 DocType: Journal Entry Account,Purchase Order,Vydaná objednávka
 DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
@@ -1042,8 +1048,8 @@
 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/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Kapitálové Vybavení
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1053,7 +1059,7 @@
 DocType: Appraisal Goal,Goal,Cíl
 DocType: Sales Invoice Item,Edit Description,Upravit popis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekávané datum dodání je menší než plánované datum zahájení.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Pro Dodavatele
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavení typu účtu pomáhá při výběru tohoto účtu v transakcích.
 DocType: Purchase Invoice,Grand Total (Company Currency),Celkový součet (Měna společnosti)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Celkem Odchozí
@@ -1066,7 +1072,7 @@
 DocType: Journal Entry,Journal Entry,Zápis do deníku
 DocType: Workstation,Workstation Name,Meno pracovnej stanice
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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
@@ -1098,7 +1104,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Zpravodaje ke kontaktům, vede."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operace nemůže být prázdné.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operace nemůže být prázdné.
 ,Delivered Items To Be Billed,Dodávaných výrobků fakturovaných
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
 DocType: Authorization Rule,Average Discount,Průměrná sleva
@@ -1113,7 +1119,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operace Popis
 DocType: Item,Will also apply to variants,Bude se vztahovat i na varianty
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nelze měnit Fiskální rok Datum zahájení a fiskální rok datum ukončení, jakmile fiskální rok se uloží."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nelze měnit Fiskální rok Datum zahájení a fiskální rok datum ukončení, jakmile fiskální rok se uloží."
 DocType: Quotation,Shopping Cart,Nákupní vozík
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odchozí
 DocType: Pricing Rule,Campaign,Kampaň
@@ -1124,7 +1130,8 @@
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1132,11 +1139,11 @@
 DocType: Email Digest,For Company,Pro Společnost
 apps/erpnext/erpnext/config/support.py +38,Communication log.,Komunikační protokol.
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Nákup Částka
-DocType: Sales Invoice,Shipping Address Name,Přepravní Adresa Název
+DocType: Sales Invoice,Shipping Address Name,Název dodací adresy
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,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 Slip Deduction,Depends on Leave Without Pay,Závisí na dovolené bez nároku na mzdu
@@ -1174,18 +1181,18 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Podsestavy
 DocType: Shipping Rule Condition,To Value,Chcete-li hodnota
 DocType: Supplier,Stock Manager,Reklamní manažer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Balení Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Pronájem kanceláře
-apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Nastavení Nastavení SMS brána
+apps/erpnext/erpnext/config/setup.py +110,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/public/js/templates/address_list.html +21,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytik
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
 DocType: Item,Inventory,Inventář
 DocType: Features Setup,"To enable ""Point of Sale"" view",Chcete-li povolit &quot;Point of Sale&quot; pohledu
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
 DocType: Item,Sales Details,Prodejní Podrobnosti
 DocType: Opportunity,With Items,S položkami
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Množství
@@ -1200,10 +1207,11 @@
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
 DocType: Sales Invoice,Source,Zdroj
 DocType: Leave Type,Is Leave Without Pay,Je odejít bez Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Finanční rok Datum zahájení
 DocType: Employee External Work History,Total Experience,Celková zkušenost
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Peněžní tok z investičních
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Material Request Item,Sales Order No,Prodejní objednávky No
 DocType: Item Group,Item Group Name,Položka Název skupiny
@@ -1211,12 +1219,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Přenos Materiály pro výrobu
 DocType: Pricing Rule,For Price List,Pro Ceník
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Cena při platbě za položku: {0} nebyl nalezen, který je povinen si účetní položka (náklady). Prosím, uveďte zboží Cena podle seznamu kupní cenou."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Cena při platbě za položku: {0} nebyl nalezen, který je povinen si účetní položka (náklady). Prosím, uveďte zboží Cena podle seznamu kupní cenou."
 DocType: Maintenance Schedule,Schedules,Plány
 DocType: Purchase Invoice Item,Net Amount,Čistá částka
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatečná sleva Částka (Měna Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Chyba: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Chyba: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
 DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Zákazník> Zákazník Group> Territory
@@ -1228,7 +1236,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
 DocType: UOM,UOM Name,UOM Name
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Výše příspěvku
-DocType: Sales Invoice,Shipping Address,Shipping Address
+DocType: Sales Invoice,Shipping Address,Dodací adresa
 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.,"Tento nástroj vám pomůže aktualizovat nebo opravit množství a ocenění zásob v systému. To se obvykle používá k synchronizaci hodnot systému a to, co ve skutečnosti existuje ve vašich skladech."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"Ve slovech budou viditelné, jakmile uložíte doručení poznámku."
 apps/erpnext/erpnext/config/stock.py +115,Brand master.,Master Značky
@@ -1242,7 +1250,7 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Účetní záznam pro {0} lze provádět pouze v měně: {1}
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiál Žádost o příkazu k nákupu
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiál Žádost o příkazu k nákupu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Řádek # {0}: vrácené položky {1} neexistuje v {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovní účty
 ,Bank Reconciliation Statement,Bank Odsouhlasení prohlášení
@@ -1250,11 +1258,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Otevření Sklad Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} musí být uvedeny pouze jednou
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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í
 DocType: Shipping Rule Condition,From Value,Od hodnoty
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Výrobní množství je povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Výrobní množství je povinné
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Částky nezohledněny v bance
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Nároky na náklady firmy.
@@ -1266,33 +1274,34 @@
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Chcete-li sledovat položky pomocí čárového kódu. Budete mít možnost zadat položky dodacího listu a prodejní faktury snímáním čárového kódu položky.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Označit jako Dodává
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Označit jako Dodává
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Vytvořit nabídku
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Přijímač Seznam
 DocType: Payment Tool Detail,Payment Amount,Částka platby
 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/public/js/pos/pos.js +491,{0} View,{0} Zobrazit
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Zobrazit
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Čistá změna v hotovosti
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plat Struktura Odpočet
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Množství nesmí být větší než {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Stáří (dny)
 DocType: Quotation Item,Quotation Item,Položka Nabídky
 DocType: Account,Account Name,Název účtu
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Pořadové číslo {0} {1} množství nemůže být zlomek
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
 DocType: Company,Default Payable Account,Výchozí Splatnost účtu
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% účtovano
@@ -1304,15 +1313,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moje problémy
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,Pro zaměstnance
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,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/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Částka platby nemůže být záporný
 DocType: Expense Claim,Total Amount Reimbursed,Celkové částky proplacené
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
 DocType: Payment Reconciliation,Payments,Platby
 DocType: Budget Detail,Budget Allocated,Přidělený Rozpočet
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Zákazník Credit Balance
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Čistá Změna účty závazků
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Ověřte prosím svou e-mailovou id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Zákazník požadoval pro 'Customerwise sleva """
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
@@ -1333,7 +1344,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Povolit Nákupní košík
 DocType: Employee,Permanent Address,Trvalé bydliště
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Položka {0} musí být služba položky.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Vyplacena záloha proti {0} {1} nemůže být větší \ než Grand Celkem {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Prosím, vyberte položku kód"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Snížit Odpočet o dovolenou bez nároku na odměnu (LWP)
@@ -1350,18 +1361,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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,Materiál Žádost používá k výrobě této populace Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Single jednotka položky.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Warehouse vyžadováno při Row No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Warehouse vyžadováno při Row No {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Poštovní
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,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/public/js/pos/pos.js +147,Please select {0} first.,"Prosím, vyberte {0} jako první."
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Text {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,"Prosím, vyberte {0} jako první."
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},Text {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nový kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
 DocType: Stock Entry,Material Receipt,Příjem materiálu
@@ -1369,7 +1381,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Zadejte Party Party a je nutné pro pohledávky / závazky na účtu {0}
 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 +210,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 +213,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 +85,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
@@ -1386,15 +1398,15 @@
 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: Sales Invoice Item,Batch No,Č. šarže
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hlavní
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Hlavní
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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: Item,Variants,Varianty
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1407,7 +1419,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Sklad a reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutární info a další obecné informace o váš dodavatel
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresy
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Položka nesmí mít výrobní zakázky.
@@ -1416,10 +1428,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Kreditní Částka v měně účtu
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Čas Protokoly pro výrobu.
 DocType: Item,Apply Warehouse-wise Reorder Level,Použít Skladovací-moudrý Seřadit sezn Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} musí být předloženy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} musí být předloženy
 DocType: Authorization Control,Authorization Control,Autorizace Control
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,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/config/projects.py +23,Time Log for tasks.,Time Log pro úkoly.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Splátka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Splátka
 DocType: Production Order Operation,Actual Time and Cost,Skutečný Čas a Náklady
 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},Materiál Žádost maximálně {0} lze k bodu {1} na odběratele {2}
 DocType: Employee,Salutation,Oslovení
@@ -1436,7 +1449,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Spolupracovník
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,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
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Vypršela
 DocType: Packing Slip,To Package No.,Balit No.
 DocType: Warranty Claim,Issue Date,Datum vydání
 DocType: Activity Cost,Activity Cost,Náklady Aktivita
@@ -1474,7 +1486,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dosažená
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territory / Customer
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,např. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Ve slovech budou viditelné, jakmile uložíte prodejní faktury."
 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
@@ -1486,7 +1498,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} vytvořil
 DocType: Delivery Note Item,Against Sales Order,Proti přijaté objednávce
 ,Serial No Status,Serial No Status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Tabulka Položka nemůže být prázdný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Tabulka Položka nemůže být prázdný
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Řádek {0}: Pro nastavení {1} periodicita, rozdíl mezi z a aktuální \
  musí být větší než nebo rovno {2}"
@@ -1496,7 +1508,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Odvody a daně
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Prosím, zadejte Referenční den"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,"Prosím, zadejte Referenční den"
 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} platební položky mohou není možné filtrovat {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabulka k bodu, který se zobrazí na webových stránkách"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané Množství
@@ -1509,9 +1521,9 @@
 DocType: Account,Frozen,Zmražený
 ,Open Production Orders,Otevřené výrobní zakázky
 DocType: Installation Note,Installation Time,Instalace Time
-DocType: Sales Invoice,Accounting Details,Účetní Podrobnosti
+DocType: Sales Invoice,Accounting Details,Účetní detaily
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Odstraňte všechny transakce pro tuto společnost
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} není dokončen {2} Množství hotových výrobků ve výrobním procesu objednávky # {3}. Prosím aktualizujte provozní stav přes čas protokoly
+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,Row # {0}: Operation {1} není dokončen {2} Množství hotových výrobků ve výrobním procesu objednávky # {3}. Prosím aktualizujte provozní stav přes čas protokoly
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investice
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
 DocType: Quality Inspection Reading,Acceptance Criteria,Kritéria přijetí
@@ -1527,7 +1539,7 @@
 DocType: Holiday List,Clear Table,Clear Table
 DocType: Features Setup,Brands,Značky
 DocType: C-Form Invoice Detail,Invoice No,Faktura č
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Z vydané objednávky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Z vydané objednávky
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Nechte nelze aplikovat / zrušena před {0}, protože rovnováha dovolené již bylo carry-předávány v budoucí přidělení dovolenou záznamu {1}"
 DocType: Activity Cost,Costing Rate,Kalkulace Rate
 ,Customer Addresses And Contacts,Adresy zákazníků a kontakty
@@ -1544,8 +1556,8 @@
 ,Maintenance Schedules,Plány údržby
 ,Quotation Trends,Uvozovky Trendy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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,Přepravní Částka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,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
 ,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
 DocType: Purchase Order,Delivered,Dodává
@@ -1561,12 +1573,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Strom finanial účtů.
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Účet {0} musí být typu ""dlouhodobého majetku"", protože položka {1} je majetková položka"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Účet {0} musí být typu ""dlouhodobého majetku"", protože položka {1} je majetková položka"
 DocType: HR Settings,HR Settings,Nastavení HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Úhrada výdajů čeká na schválení. Pouze schalovatel výdajů může aktualizovat stav.
 DocType: Purchase Invoice,Additional Discount Amount,Dodatečná sleva Částka
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Zkrácená nemůže být prázdné nebo prostor
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Zkrácená nemůže být prázdné nebo prostor
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Celkem Aktuální
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Jednotka
@@ -1578,6 +1590,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Nákladové Pohledávky
 DocType: Issue,Support,Podpora
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Prohlédnout košík
 ,BOM Search,BOM Search
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Uzavření (Otevření + součty)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
@@ -1585,17 +1598,18 @@
 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},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Zobrazit / skrýt funkce, jako pořadová čísla, POS atd"
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Následující materiál žádosti byly automaticky zvýšena na základě úrovni re-pořadí položky
-apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Měna účtu musí být {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatný. Měna účtu musí být {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Datum vůle nemůže být před přihlášením dnem v řadě {0}
 DocType: Salary Slip,Deduction,Dedukce
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Položka Cena přidán pro {0} v Ceníku {1}
 DocType: Address Template,Address Template,Šablona adresy
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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ů
 DocType: Project,% Tasks Completed,% splněných úkolů
 DocType: Project,Gross Margin,Hrubá marže
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,zakázané uživatelské
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,zakázané uživatelské
 DocType: Opportunity,Quotation,Nabídka
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
 DocType: Quotation,Maintenance User,Údržba uživatele
@@ -1604,7 +1618,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
 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
@@ -1614,12 +1628,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic."
 DocType: Expense Claim,Approver,Schvalovatel
 ,SO Qty,SO Množství
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
 DocType: Appraisal,Calculate Total Score,Vypočítat Celková skóre
 DocType: Supplier Quotation,Manufacturing Manager,Výrobní ředitel
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Zásilky
+apps/erpnext/erpnext/hooks.py +69,Shipments,Zásilky
 DocType: Purchase Order Item,To be delivered to customer,Chcete-li být doručeno zákazníkovi
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log Status musí být předloženy.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,"Pořadové číslo {0} nepatří do skladu,"
@@ -1639,10 +1653,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +356,{0} is mandatory for Item {1},{0} je povinná k položce {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} je povinná k položce {1}
 DocType: Currency Exchange,From Currency,Od Měny
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Částky nejsou zohledněny v systému
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Ostatní
@@ -1658,7 +1672,7 @@
 DocType: Quality Inspection,In Process,V procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Sleva
 DocType: Purchase Order Item,Reference Document Type,Referenční Typ dokumentu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} proti Prodejní objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} proti Prodejní objednávce {1}
 DocType: Account,Fixed Asset,Základní Jmění
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialized Zásoby
 DocType: Activity Type,Default Billing Rate,Výchozí fakturace Rate
@@ -1668,7 +1682,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Prodejní objednávky na platby
 DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Čas Záznamy vytvořil:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,"Prosím, vyberte správný účet"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,"Prosím, vyberte správný účet"
 DocType: Item,Weight UOM,Hmotnostní jedn.
 DocType: Employee,Blood Group,Krevní Skupina
 DocType: Purchase Invoice Item,Page Break,Zalomení stránky
@@ -1699,10 +1713,10 @@
 DocType: Time Log,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/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Chcete-li přidat podřízené uzly, prozkoumat stromu a klepněte na položku, pod kterou chcete přidat více uzlů."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
 DocType: Production Order Operation,Completed Qty,Dokončené Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Ceník {0} je zakázána
 DocType: Manufacturing Settings,Allow Overtime,Povolit Přesčasy
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériová čísla požadované pro položky {1}. Poskytli jste {2}.
@@ -1710,8 +1724,9 @@
 DocType: Item,Customer Item Codes,Zákazník Položka Kódy
 DocType: Opportunity,Lost Reason,Důvod ztráty
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Vytvořte Platební záznamy proti objednávky nebo faktury.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nová adresa
 DocType: Quality Inspection,Sample Size,Velikost vzorku
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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"
 DocType: Project,External,Externí
@@ -1767,13 +1782,14 @@
 DocType: Rename Tool,Rename Tool,Přejmenování
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Aktualizace Cost
 DocType: Item Reorder,Item Reorder,Položka Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Přenos materiálu
 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."
 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
 DocType: Installation Note,Installation Note,Poznámka k instalaci
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Přidejte daně
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Peněžní tok z finanční
 ,Financial Analytics,Finanční Analýza
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Dceřiný
@@ -1783,19 +1799,19 @@
 DocType: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Očekávaný zůstatek podle banky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
 DocType: Appraisal,Employee,Zaměstnanec
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importovat e-maily z
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Pozvat jako Uživatel
 DocType: Features Setup,After Sale Installations,Po prodeji instalací
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} je plně fakturováno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} je plně fakturováno
 DocType: Workstation Working Hour,End Time,End Time
 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 +75,Group by Voucher,Seskupit podle Poukazu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Sales Invoice,Mass Mailing,Hromadné emaily
 DocType: Rename Tool,File to Rename,Soubor přejmenovat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Zobrazit Platby
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,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
@@ -1805,6 +1821,7 @@
 DocType: Selling Settings,Sales Order Required,Prodejní objednávky Povinné
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Vytvořit zákazníka
 DocType: Purchase Invoice,Credit To,Kredit:
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktivní LEADS / Zákazníci
 DocType: Employee Education,Post Graduate,Postgraduální
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Plán údržby Detail
 DocType: Quality Inspection Reading,Reading 9,Čtení 9
@@ -1816,6 +1833,7 @@
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Tool,Payment Account,Platební účet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Čistá změna objemu pohledávek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
 DocType: Quality Inspection Reading,Accepted,Přijato
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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."
@@ -1823,17 +1841,17 @@
 DocType: Payment Tool,Total Payment Amount,Celková Částka platby
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Jak tam jsou stávající skladové transakce pro tuto položku, \ nemůžete změnit hodnoty &quot;Má sériové číslo&quot;, &quot;má Batch Ne&quot;, &quot;Je skladem&quot; a &quot;ocenění Method&quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Rychlý vstup Journal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Rychlý vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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: 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 +157,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 +211,{0} {1} is not submitted,{0} {1} není odesláno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} není odesláno
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
@@ -1846,7 +1864,7 @@
 DocType: Authorization Rule,Authorized Value,Autorizovaný Hodnota
 DocType: Contact,Enter department to which this Contact belongs,"Zadejte útvar, který tento kontaktní patří"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Celkem Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Měrná jednotka
 DocType: Fiscal Year,Year End Date,Datum Konce Roku
 DocType: Task Depends On,Task Depends On,Úkol je závislá na
@@ -1872,7 +1890,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 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."
 DocType: Customer Group,Has Child Node,Má děti Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} proti nákupní objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} proti nákupní objednávce {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Zadejte statické parametry url zde (Např odesílatel = ERPNext, username = ERPNext, password. = 1234 atd.),"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} není v žádném aktivním fiskálním roce. Pro více informací zkontrolujte {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
@@ -1920,7 +1938,7 @@
  10. Přidat nebo odečítat: Ať už chcete přidat nebo odečíst daň."
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,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 +477,Stock Entry {0} is not submitted,Sklad Entry {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Sklad Entry {0} není předložena
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 DocType: Tax Rule,Billing City,Fakturace City
 DocType: Global Defaults,Hide Currency Symbol,Skrýt symbol měny
@@ -1952,6 +1970,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Náklady
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Nad
 DocType: Buying Settings,Default Buying Price List,Výchozí Nákup Ceník
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Žádný zaměstnanec pro výše zvolených kritérií nebo výplatní pásce již vytvořili
 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"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Typ platby
@@ -1987,12 +2006,12 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Řádek {0}: UOM Konverzní faktor je povinné
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Nákladové středisko
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Zprávy vydané objenávky
-DocType: Tax Rule,Shipping Country,Přepravní Země
+DocType: Tax Rule,Shipping Country,Země dodání
 DocType: Upload Attendance,Upload HTML,Nahrát HTML
 apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Celkem předem ({0}) na objednávku {1} nemůže být větší než \
@@ -2010,7 +2029,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Všechny adresy.
 DocType: Company,Stock Settings,Stock Nastavení
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojení je možné pouze tehdy, pokud tyto vlastnosti jsou stejné v obou záznamech. Je Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojení je možné pouze tehdy, pokud tyto vlastnosti jsou stejné v obou záznamech. Je Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Jméno Nového Nákladového Střediska
 DocType: Leave Control Panel,Leave Control Panel,Ovládací panel dovolených
@@ -2030,8 +2049,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Detail platební nástroj
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Celkový Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: dalším {0} č. {1} existuje proti pohybu skladu {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Místní
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: dalším {0} č. {1} existuje proti pohybu skladu {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Místní
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěry a zálohy (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Velký
@@ -2050,7 +2069,7 @@
 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.
 DocType: Production Order Operation,Make Time Log,Udělejte si čas Přihlásit
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Prosím nastavte množství objednací
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Prosím nastavte množství objednací
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Prosím vytvořte Zákazník z olova {0}
 DocType: Price List,Applicable for Countries,Pro země
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Počítače
@@ -2110,10 +2129,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Žádné poznámky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Žádné poznámky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zpožděný
 DocType: Account,Stock Received But Not Billed,Sklad nepřijali Účtovaný
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root účet musí být skupina
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root účet musí být skupina
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + nedoplatek Částka + Inkaso Částka - Total Odpočet
 DocType: Monthly Distribution,Distribution Name,Distribuce Name
 DocType: Features Setup,Sales and Purchase,Prodej a nákup
@@ -2127,6 +2146,7 @@
 DocType: Journal Entry Account,Party Balance,Balance Party
 DocType: Sales Invoice Item,Time Log Batch,Time Log Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Prosím, vyberte Použít Sleva na"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Plat Slip Vytvořeno
 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: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
@@ -2134,9 +2154,9 @@
 DocType: Purchase Invoice,Half-yearly,Pololetní
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskální rok {0} nebyl nalezen.
 DocType: Bank Reconciliation,Get Relevant Entries,Získat příslušné zápisy
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Účetní položka na skladě
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 DocType: Purchase Invoice,Apply Additional Discount On,Použít dodatečné Sleva na
 DocType: Account,Root Type,Root Type
@@ -2145,15 +2165,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Zobrazit tuto prezentaci v horní části stránky
 DocType: BOM,Item UOM,Položka UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Částka daně po slevě Částka (Company měny)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
 DocType: Quality Inspection,Quality Inspection,Kontrola kvality
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL nebo BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Lze provést pouze platbu proti nevyfakturované {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Lze provést pouze platbu proti nevyfakturované {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimální úroveň zásob
 DocType: Stock Entry,Subcontract,Subdodávka
@@ -2191,7 +2211,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Vstupní kontrola jakosti.
 DocType: Purchase Order Item,Returned Qty,Vrácené Množství
 DocType: Employee,Exit,Východ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type je povinné
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root Type je povinné
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Pořadové číslo {0} vytvořil
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
 DocType: Employee,You can enter any date manually,Můžete zadat datum ručně
@@ -2199,8 +2219,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Zkušební doba
 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 +110,Row {0}: Advance against Customer must be credit,Řádek {0}: Advance proti zákazník musí být úvěr
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Doklad o koupi Item Dodávané
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Platit
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Platit
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Chcete-li datetime
 DocType: SMS Settings,SMS Gateway URL,SMS brána URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokoly pro udržení stavu doručení sms
@@ -2217,7 +2238,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Změna pořadí Level
 DocType: Attendance,Attendance Date,Účast Datum
 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 +110,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
 DocType: Address,Preferred Shipping Address,Preferovaná dodací adresa
 DocType: Purchase Receipt Item,Accepted Warehouse,Schválené Sklad
 DocType: Bank Reconciliation Detail,Posting Date,Datum zveřejnění
@@ -2235,7 +2256,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
 DocType: Pricing Rule,Discount Percentage,Sleva v procentech
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktury
-apps/erpnext/erpnext/hooks.py +54,Orders,Objednávky
+apps/erpnext/erpnext/hooks.py +55,Orders,Objednávky
 DocType: Leave Control Panel,Employee Type,Type zaměstnanců
 DocType: Employee Leave Approver,Leave Approver,Schvalovatel absenece
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Převádí jaderný materiál pro Výroba
@@ -2247,7 +2268,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% materiálů fakturovaných proti této prodejní obědnávce
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Období Uzávěrka Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Znehodnocení
+DocType: Account,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
 DocType: Customer,Credit Limit,Úvěrový limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vyberte typ transakce
@@ -2272,11 +2293,12 @@
 DocType: Material Request,Requested For,Požadovaných pro
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledovat tento dodacím listu proti jakémukoli projektu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root účet nemůže být smazán
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Čistý peněžní tok z investiční
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root účet nemůže být smazán
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Zobrazit Stock Příspěvky
 ,Is Primary Address,Je Hlavní adresa
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress sklad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} ze dne {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Správa adres
 DocType: Pricing Rule,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
@@ -2284,7 +2306,7 @@
 DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
 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 +223,Closing (Dr),Uzavření (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Uzavření (Dr)
 DocType: Contact,Passive,Pasivní
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Pořadové číslo {0} není skladem
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Daňové šablona na prodej transakce.
@@ -2300,7 +2322,7 @@
 ,Billed Amount,Fakturovaná částka
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Získat aktualizace
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Přidat několik ukázkových záznamů
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Správa absencí
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Seskupit podle účtu
@@ -2309,14 +2331,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Účet hlavu pod odpovědnosti, ve kterém se bude Zisk / ztráta rezervovali"
 DocType: Payment Tool,Against Vouchers,Proti Poukázky
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Rychlá pomoc
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Prodejní Extras
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} rozpočet na účet {1} proti nákladovému středisku {2} bude překročen o {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
 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"""
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Hodnota nebo Množství
@@ -2326,9 +2348,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Nechte Block List povolena
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Budete ho používat k přihlášení
 DocType: Sales Partner,Retailer,Maloobchodník
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Připsat na účet musí být účtu Rozvaha
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Všechny typy Dodavatele
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +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/selling/doctype/sales_order/sales_order.py +93,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
@@ -2372,7 +2394,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
 DocType: Serial No,Is Cancelled,Je Zrušeno
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje dodávky
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Moje dodávky
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","I když existuje více pravidla pro tvorbu cen s nejvyšší prioritou, pak následující interní priority jsou použity:"
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
@@ -2393,10 +2415,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Volá
 DocType: Project,Total Costing Amount (via Time Logs),Celková kalkulace Částka (přes Time Záznamy)
 DocType: Purchase Order Item Supplied,Stock UOM,Reklamní UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Plánovaná
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
 DocType: Notification Control,Quotation Message,Zpráva Nabídky
 DocType: Issue,Opening Date,Datum otevření
 DocType: Journal Entry,Remark,Poznámka
@@ -2409,9 +2431,9 @@
 DocType: Time Log,Batched for Billing,Zarazeno pro fakturaci
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Směnky vznesené dodavately
 DocType: POS Profile,Write Off Account,Odepsat účet
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Čistý peněžní tok z provozní
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,např. DPH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Bod 4
 DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
@@ -2452,7 +2474,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% dodávno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2480,10 +2502,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To je kořen prodejní člověk a nelze upravovat.
 ,Stock Ledger,Reklamní Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Rychlost: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Rychlost: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plat Slip Odpočet
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Vyberte první uzel skupinu.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cíl musí být jedním z {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Cíl musí být jedním z {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Vyplňte formulář a uložte jej
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Stáhněte si zprávu, která obsahuje všechny suroviny s jejich aktuální stav zásob"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
@@ -2521,7 +2543,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než Grand Total
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než 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} není platná Šarže pro Položku {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Poznámka: Není-li platba provedena proti jakémukoli rozhodnutí, jak položka deníku ručně."
@@ -2538,13 +2560,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Množství nejsou dostupné iv skladu {1} na {2} {3}.
  Dispozici Množství: {4}, transfer Množství: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Položka 3
 DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktní e-mail
 DocType: Sales Team,Contribution (%),Příspěvek (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Odpovědnost
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Šablona
 DocType: Sales Person,Sales Person Name,Prodej Osoba Name
@@ -2555,20 +2577,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Před smíření
 apps/erpnext/erpnext/support/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 +374,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 +383,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ý
 DocType: Item,Default BOM,Výchozí BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prosím re-typ název společnosti na potvrzení
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Celkem Vynikající Amt
 DocType: Time Log Batch,Total Hours,Celkem hodin
 DocType: Journal Entry,Printing Settings,Tisk Nastavení
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilový
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Z Dodacího Listu
 DocType: Time Log,From Time,Času od
 DocType: Notification Control,Custom Message,Custom Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investiční bankovnictví
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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
 DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rate
 DocType: Purchase Invoice Item,Rate,Cena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Internovat
@@ -2587,9 +2609,10 @@
  konflikt přiřazením prioritu. Cena Pravidla: {0}"
 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 +580,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Vydání Material
 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
 DocType: Hub Settings,Access Token,Přístupový Token
 DocType: Sales Invoice Item,Serial No,Výrobní číslo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
@@ -2603,19 +2626,22 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maximální částka faktury
 DocType: Purchase Invoice Item,Image View,Image View
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
-DocType: Tax Rule,Shipping City,Přepravní City
+DocType: Tax Rule,Shipping City,Dodací město
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tento bod je varianta {0} (šablony). Atributy budou zkopírovány z šablony, pokud je nastaveno ""No Copy"""
 DocType: Account,Purchase User,Nákup Uživatel
 DocType: Notification Control,Customize the Notification,Přizpůsobit oznámení
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cash flow z provozních činností
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
-DocType: Sales Invoice,Shipping Rule,Přepravní Pravidlo
+DocType: Sales Invoice,Shipping Rule,Pravidlo dopravy
 DocType: Journal Entry,Print Heading,Tisk záhlaví
 DocType: Quotation,Maintenance Manager,Správce údržby
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Celkem nemůže být nula
@@ -2624,7 +2650,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledovat e-mailem
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Prosím, vyberte nejprve Datum zveřejnění"
@@ -2642,6 +2668,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Přidat do košíku
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Seskupit podle
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Povolit / zakázat měny.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštovní náklady
@@ -2649,30 +2676,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Datum, ke kterému se opakující objednávka bude zastaví"
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí být sníženy o {1} nebo byste měli zvýšit toleranci přesahu
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí být sníženy o {1} nebo byste měli zvýšit toleranci přesahu
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Celkem Present
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Hodina
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
  pomocí Reklamní Odsouhlasení"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Přeneste materiál Dodavateli
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Přeneste materiál Dodavateli
 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 leadu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Vytvořit Citace
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,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 +311,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
 DocType: BOM Replace Tool,The new BOM after replacement,Nový BOM po výměně
 DocType: Features Setup,Point of Sale,Místo Prodeje
 DocType: Account,Tax,Daň
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Řádek {0}: {1} není platný {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle zboží
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Od Bundle zboží
 DocType: Production Planning Tool,Production Planning Tool,Plánování výroby Tool
 DocType: Quality Inspection,Report Date,Datum Reportu
 DocType: C-Form,Invoices,Faktury
 DocType: Job Opening,Job Title,Název pozice
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} příjemci
 DocType: Features Setup,Item Groups in Details,Položka skupiny v detailech
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,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/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -2680,8 +2706,9 @@
 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: Pricing Rule,Customer Group,Zákazník Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: Item,Website Description,Popis webu
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Čistá změna ve vlastním kapitálu
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
 ,Sales Register,Sales Register
 DocType: Quotation,Quotation Lost Reason,Důvod ztráty nabídky
@@ -2689,15 +2716,15 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Shrnutí pro tento měsíc a probíhajícím činnostem
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Atributy
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Získat položky
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Získat položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Datum poslední objednávky
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Proveďte Spotřební faktury
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Účet {0} není patří společnosti {1}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Účet {0} nepatří společnosti {1}
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Provoz ID není nastaveno
 DocType: Production Order,Planned Start Date,Plánované datum zahájení
@@ -2710,7 +2737,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
 DocType: Project,Expected End Date,Očekávané datum ukončení
 DocType: Appraisal Template,Appraisal Template Title,Posouzení Template Název
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Obchodní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Obchodní
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmí být skladem
 DocType: Cost Center,Distribution Id,Distribuce Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
@@ -2723,7 +2750,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Poměr atribut {0} musí být v rozmezí od {1} až {2} v krocích po {3}
 DocType: Tax Rule,Sales,Prodej
 DocType: Stock Entry Detail,Basic Amount,Základní částka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Výchozí pohledávka účty
@@ -2734,17 +2761,17 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Datum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +51,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,Řada Setup
+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
 DocType: Landed Cost Voucher,Purchase Receipts,Příjmky
-DocType: Payment Reconciliation,Maximum Amount,Maximální částka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Jak Ceny pravidlo platí?
 DocType: Quality Inspection,Delivery Note No,Dodacího listu
 DocType: Company,Retail,Maloobchodní
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Zákazník {0} neexistuje
 DocType: Attendance,Absent,Nepřítomný
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle Product
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Řádek {0}: Neplatná reference {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Řádek {0}: Neplatná reference {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupte Daně a poplatky šablony
 DocType: Upload Attendance,Download Template,Stáhnout šablonu
 DocType: GL Entry,Remarks,Poznámky
@@ -2771,7 +2798,7 @@
 ,Monthly Attendance Sheet,Měsíční Účast Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nebyl nalezen žádný záznam
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové středisko je povinný údaj pro položku {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Získat předměty z Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Získat předměty z Bundle Product
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Účet {0} je neaktivní
 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á
@@ -2780,8 +2807,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Výkaz zisku a ztráty"" typ účtu {0} není povoleno pro Vstupní Údaj"
 DocType: Features Setup,Sales Discounts,Prodejní Slevy
 DocType: Hub Settings,Seller Country,Prodejce Country
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publikovat položky na webových stránkách
 DocType: Authorization Rule,Authorization Rule,Autorizační pravidlo
 DocType: Sales Invoice,Terms and Conditions Details,Podmínky podrobnosti
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Specifikace
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodej Daně a poplatky šablony
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Číslo objednávky
@@ -2803,7 +2832,7 @@
 DocType: Time Log,Billing Amount,Fakturace Částka
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Neplatný množství uvedené na položku {0}. Množství by mělo být větší než 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Žádosti o dovolenou.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Výdaje na právní služby
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto objednávka bude generován například 05, 28 atd"
 DocType: Sales Invoice,Posting Time,Čas zadání
@@ -2819,11 +2848,11 @@
 DocType: Maintenance Visit,Breakdown,Rozbor
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Účet: {0} s měnou: {1} nelze vybrat
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Úspěšně vypouští všechny transakce související s tímto společnosti!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Stejně jako u Date
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Zkouška
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto vložka Ceník sazba, pokud chybí"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Celkem uhrazené částky
@@ -2835,6 +2864,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Celkem Billing Částka (přes Time Záznamy)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Nabízíme k prodeji tuto položku
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dodavatel Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Množství by měla být větší než 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt Popis
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Typ ponechává jako neformální, nevolnosti atd."
@@ -2843,7 +2873,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Přidat řádky stanovit roční rozpočty na účtech.
 DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
 DocType: Production Order,Total Operating Cost,Celkové provozní náklady
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Všechny kontakty.
 DocType: Newsletter,Test Email Id,Testovací Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Zkratka Company
@@ -2868,7 +2898,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Daňová šablona je povinné.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Dočasný
 DocType: Address,Preferred Billing Address,Preferovaná Fakturační Adresa
@@ -2886,8 +2916,8 @@
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zastaven
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} je zastaven
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
 DocType: Lead,Add to calendar on this date,Přidat do kalendáře k tomuto datu
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Připravované akce
@@ -2908,24 +2938,24 @@
 DocType: Customer,From Lead,Od Leadu
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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 +455,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
 DocType: Hub Settings,Name Token,Jméno Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standardní prodejní
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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ý
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Replace Tool,Replace,Vyměnit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} proti vystavené faktuře {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} proti vystavené faktuře {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
 DocType: Purchase Invoice Item,Project Name,Název projektu
 DocType: Supplier,Mention if non-standard receivable account,Zmínka v případě nestandardní pohledávky účet
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
 DocType: Features Setup,Item Batch Nos,Položka Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Reklamní Value Rozdíl
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Lidské Zdroje
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Daňové Aktiva
 DocType: BOM Item,BOM No,BOM No
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Klouzavý průměr
 DocType: BOM Replace Tool,The BOM which will be replaced,"BOM, který bude nahrazen"
 DocType: Account,Debit,Debet
@@ -2962,7 +2992,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatečné náklady
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Finanční rok Datum ukončení
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Vytvořit nabídku dodavatele
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Vytvořit nabídku dodavatele
 DocType: Quality Inspection,Incoming,Přicházející
 DocType: BOM,Materials Required (Exploded),Potřebný materiál (Rozložený)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Snížit Zisk na vstup bez nároku na mzdu (LWP)
@@ -2970,7 +3000,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Řádek # {0}: Výrobní číslo {1} neodpovídá {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Šarže ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Poznámka: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Tento týden Shrnutí
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} musí být Zakoupená, nebo Subdodavatelská položka v řádku {1}"
@@ -2985,8 +3015,9 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Task,Actual Time (in Hours),Skutečná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Množství celkové emisi / přenosu {0} v hmotné Request {1} nemůže být větší než množství požadovaná v {2} pro položku {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Zpravodaje
-DocType: Address,Shipping,Lodní
+DocType: Address,Shipping,Doprava
 DocType: Stock Ledger Entry,Stock Ledger Entry,Reklamní Ledger Entry
 DocType: Department,Leave Block List,Nechte Block List
 DocType: Customer,Tax ID,DIČ
@@ -3004,7 +3035,6 @@
 DocType: Purchase Order,End date of current order's period,Datum ukončení doby aktuální objednávky
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Vytvořte nabídku Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Zpáteční
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Výchozí měrná jednotka varianty musí být stejné jako šablonu
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
 DocType: Project Task,Pending Review,Čeká Review
@@ -3012,7 +3042,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Zákazník Id
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Chcete-li čas musí být větší než From Time
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
 DocType: BOM,Last Purchase Rate,Poslední nákupní sazba
 DocType: Account,Asset,Majetek
@@ -3032,7 +3062,7 @@
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 DocType: Item Variant,Item Variant,Položka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Nastavení Tato adresa šablonu jako výchozí, protože není jiná výchozí"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Řízení kvality
 DocType: Production Planning Tool,Filter based on customer,Filtr dle zákazníka
 DocType: Payment Tool Detail,Against Voucher No,Proti poukaz č
@@ -3049,6 +3079,7 @@
 DocType: Opportunity,Next Contact,Následující Kontakt
 DocType: Employee,Employment Type,Typ zaměstnání
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dlouhodobý majetek
+,Cash Flow,Tok peněz
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,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: Employee,Notice (days),Oznámení (dny)
@@ -3080,13 +3111,12 @@
 DocType: Production Order,Warehouses,Sklady
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print a Stacionární
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
-DocType: Payment Reconciliation,Minimum Amount,Minimální částka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Dokončení aktualizace zboží
 DocType: Workstation,per hour,za hodinu
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Účet pro skladu (průběžné inventarizace), bude vytvořena v rámci tohoto účtu."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
 DocType: Company,Distribution,Distribuce
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zaplacené částky
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Zaplacené částky
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
@@ -3110,7 +3140,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Společnost chybí ve skladech {0}
 DocType: POS Profile,Terms and Conditions,Podmínky
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Chcete-li data by měla být v rámci fiskálního roku. Za předpokladu, že To Date = {0}"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},"Chcete-li data by měla být v rámci fiskálního roku. Za předpokladu, že To Date = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Zde si můžete udržet výšku, váhu, alergie, zdravotní problémy atd"
 DocType: Leave Block List,Applies to Company,Platí pro firmy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
@@ -3124,12 +3154,12 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Prosím, zadejte Nákup Příjmy"
 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 +425,Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Nastavení příchozí server pro podporu e-mailovou id. (Např support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
-DocType: Salary Slip,Salary Slip,Plat Slip
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+DocType: Salary Slip,Salary Slip,Výplatní páska
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Datum DO"" je povinné"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generování balení pásky pro obaly mají být dodány. Používá se k oznámit číslo balíku, obsah balení a jeho hmotnost."
 DocType: Sales Invoice Item,Sales Order Item,Prodejní objednávky Item
@@ -3217,7 +3247,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Zaměstnanecké záznamy.
 DocType: HR Settings,Payroll Settings,Nastavení Mzdové
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Objednat
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Objednat
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root nemůže mít rodič nákladové středisko
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Select Brand ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Použitelné
@@ -3232,7 +3262,7 @@
 DocType: Appraisal,Start Date,Datum zahájení
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Přidělit listy dobu.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klikněte zde pro ověření
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
 DocType: Purchase Invoice Item,Price List Rate,Ceník Rate
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Zobrazit ""Skladem"" nebo ""Není skladem"" na základě skladem k dispozici v tomto skladu."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
@@ -3241,17 +3271,17 @@
 DocType: Project,Expected Start Date,Očekávané datum zahájení
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Odebrat pokud poplatků není pro tuto položku
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Příjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Příjem
 DocType: Maintenance Visit,Fully Completed,Plně Dokončeno
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% hotovo
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} byl úspěšně přidán do našeho seznamu novinek.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +136,Main Reports,Hlavní zprávy
 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
@@ -3269,7 +3299,7 @@
 DocType: Industry Type,Industry Type,Typ Průmyslu
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Něco se pokazilo!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Dokončení Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Částka (Měna Společnosti)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizace jednotka (departement) master.
@@ -3288,10 +3318,10 @@
 ,Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti
 DocType: Item,Unit of Measure Conversion,Jednotka míry konverze
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaměstnanec nemůže být změněn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,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.
 DocType: Naming Series,Help HTML,Nápověda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,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/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Jméno osoby nebo organizace, která tato adresa patří."
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Vaši Dodavatelé
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
@@ -3304,35 +3334,35 @@
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Řádek # {0}: Nastavte Dodavatel pro položku {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Prosím, zkontrolujte více měn možnost povolit účty s jinou měnu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,"Prosím, zkontrolujte více měn možnost povolit účty s jinou měnu"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
+DocType: Payment Reconciliation,From Invoice Date,Z faktury Datum
 DocType: Cost Center,Budgets,Rozpočty
-DocType: Employee,Emergency Contact Details,Nouzové kontaktní údaje
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Co to dělá?
 DocType: Delivery Note,To Warehouse,Do skladu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Účet {0} byl zadán více než jednou za fiskální rok {1}
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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/hr/doctype/attendance/attendance.py +34,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
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Aktualizace dodatečné náklady pro výpočet vyložené náklady položek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrický
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Řádek {0}: Exchange Rate je povinné
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,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}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od reklamačnímu
 DocType: Stock Entry,Default Source Warehouse,Výchozí zdroj Warehouse
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Narozeninová připomínka pro {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Počet dnů od poslední objednávky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
@@ -3345,7 +3375,7 @@
 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
 DocType: Authorization Rule,Based On,Založeno na
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Položka {0} je zakázána
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Položka {0} je zakázána
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},"Období od a období, k datům povinné pro opakované {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektová činnost / úkol.
@@ -3353,7 +3383,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odepsat Částka (Company měny)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Prosím nastavte {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Opakujte na den v měsíci
@@ -3383,12 +3413,12 @@
 DocType: Upload Attendance,Upload Attendance,Nahrát Návštěvnost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM a výroba množství jsou povinné
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Částka
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Částka
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nahradil
 ,Sales Analytics,Prodejní Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Výrobní nastavení
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Nastavení e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
 DocType: Stock Entry Detail,Stock Entry Detail,Reklamní Entry Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Denní Upomínky
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Daňové Pravidlo Konflikty s {0}
@@ -3414,13 +3444,13 @@
 DocType: Sales Order Item,Produced Quantity,Produkoval Množství
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inženýr
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Vyhledávání Sub Assemblies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Aktuální
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
 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 +263,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
 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í
@@ -3432,15 +3462,15 @@
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
 DocType: Employee,Cheque,Šek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Řada Aktualizováno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Report Type je povinné
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
 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/public/js/setup_wizard.js +101,The First User: You,První Uživatel: Vy
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Úspěšně smířeni
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Úspěšně smířeni
 DocType: Production Order,Planned End Date,Plánované datum ukončení
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,"Tam, kde jsou uloženy předměty."
 DocType: Tax Rule,Validity,Doba platnosti
@@ -3448,7 +3478,7 @@
 DocType: Attendance,Attendance,Účast
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Datum a čas zadání je povinný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Datum a čas zadání je povinný
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
 ,Item Prices,Ceny Položek
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Ve slovech budou viditelné, jakmile uložíte objednávce."
@@ -3457,15 +3487,15 @@
 DocType: Task,Review Date,Review Datum
 DocType: Purchase Invoice,Advance Payments,Zálohové platby
 DocType: Purchase Taxes and Charges,On Net Total,On Net Celkem
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,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
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pro oznámení"" nejsou uvedeny pro opakující se %s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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ě
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Zaokrouhlovací účet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativní náklady
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Změna
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Změna
 DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","např ""My Company LLC """
@@ -3475,13 +3505,13 @@
 DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnost UOM
 DocType: Email Digest,Receivables / Payables,Pohledávky / Závazky
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodejní faktuře
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Úvěrový účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Úvěrový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Ukázat nulové hodnoty
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Množství položky získané po výrobě / přebalení z daných množství surovin
 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 +562,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 DocType: Task,Actual End Date (via Time Logs),Skutečné Datum ukončení (přes Time Záznamy)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Rozpočet nemůže být přiřazena na skupinový účet {0}
@@ -3500,7 +3530,7 @@
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Výchozí hotových výrobků Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Prodej Osoba
 DocType: Sales Invoice,Cold Calling,Cold Calling
-DocType: SMS Parameter,SMS Parameter,SMS parametrů
+DocType: SMS Parameter,SMS Parameter,SMS parametr
 DocType: Maintenance Schedule Item,Half Yearly,Pololetní
 DocType: Lead,Blog Subscriber,Blog Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Vytvoření pravidla pro omezení transakce na základě hodnot.
@@ -3517,29 +3547,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Naplánujte čas protokoly mimo Workstation pracovních hodin.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} již byla odeslána
 ,Items To Be Requested,Položky se budou vyžadovat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Účtovaná sazba založená na typ aktivity (za hodinu)
 DocType: Company,Company Info,Společnost info
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 DocType: Production Planning Tool,Filter based on item,Filtr dle položek
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Debetní účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debetní účet
 DocType: Fiscal Year,Year Start Date,Datum Zahájení Roku
 DocType: Attendance,Employee Name,Jméno zaměstnance
 DocType: Sales Invoice,Rounded Total (Company Currency),Celkem zaokrouhleno (měna solečnosti)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
 DocType: Purchase Common,Purchase Common,Nákup Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} byl změněn. Prosím aktualizujte.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Od Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Zaměstnanecké benefity
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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í
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množství
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Směnky vznesené zákazníkům.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} odběratelé přidáni
 DocType: Maintenance Schedule,Schedule,Plán
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definovat rozpočtu pro tento nákladového střediska. Chcete-li nastavit rozpočet akce, viz &quot;Seznam firem&quot;"
@@ -3547,7 +3578,7 @@
 DocType: Quality Inspection Reading,Reading 3,Čtení 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Expense Claim,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
@@ -3561,7 +3592,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Zápisy v účetním deníku.
 DocType: Delivery Note Item,Available Qty at From Warehouse,K dispozici Množství na Od Warehouse
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Řádek {0}: Party / Account neshoduje s {1} / {2} do {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Řádek {0}: Party / Account neshoduje s {1} / {2} do {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Chcete-li vytvořit daňovém účtu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
 DocType: Account,Stock,Sklad
@@ -3572,7 +3603,7 @@
 DocType: Employee,Contract End Date,Smlouva Datum ukončení
 DocType: Sales Order,Track this Sales Order against any Project,Sledovat tento prodejní objednávky na jakýkoli projekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodejní Pull zakázky (čeká dodat), na základě výše uvedených kritérií"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Z nabídky dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Z nabídky dodavatele
 DocType: Deduction Type,Deduction Type,Odpočet Type
 DocType: Attendance,Half Day,Půl den
 DocType: Pricing Rule,Min Qty,Min Množství
@@ -3580,7 +3611,7 @@
 DocType: GL Entry,Transaction Date,Transakce Datum
 DocType: Production Plan Item,Planned Qty,Plánované Množství
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Tax
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Pro Množství (Vyrobeno ks) je povinné
+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: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,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
@@ -3634,9 +3665,9 @@
 DocType: Customer,Commission Rate,Výše provize
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Udělat Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Košík je prázdný
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košík je prázdný
 DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root nelze upravovat.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root nelze upravovat.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Přidělená částka nemůže vyšší než částka unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Povolit Výrobu při dovolené
 DocType: Sales Order,Customer's Purchase Order Date,Zákazníka Objednávka Datum
@@ -3647,11 +3678,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Návrhář
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatické vytvoření Materiál žádosti, pokud množství klesne pod tuto úroveň"
 ,Item-wise Purchase Register,Item-moudrý Nákup Register
 DocType: Batch,Expiry Date,Datum vypršení platnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Chcete-li nastavit úroveň objednací, položka musí být Nákup položka nebo výrobní položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Chcete-li nastavit úroveň objednací, položka musí být Nákup položka nebo výrobní položky"
 ,Supplier Addresses and Contacts,Dodavatel Adresy a kontakty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Nejdřív vyberte kategorii
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Master Project.
@@ -3659,7 +3690,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(půlden)
 DocType: Supplier,Credit Days,Úvěrové dny
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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,Dodací lhůta dny
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Kusovník
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Řádek {0}: Typ Party Party a je nutné pro pohledávky / závazky na účtu {1}
@@ -3667,7 +3698,7 @@
 DocType: Employee,Reason for Leaving,Důvod Leaving
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
 DocType: GL Entry,Is Opening,Se otevírá
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Účet {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Účet {0} neexistuje
 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 5b8120b..f70ef8a 100644
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
@@ -7,7 +7,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Forbrugerprodukter
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vælg Party Type først
 DocType: Item,Customer Items,Kunde Varer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
 DocType: Item,Publish Item to hub.erpnext.com,Udgive Vare til hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mail-meddelelser
 DocType: Item,Default Unit of Measure,Standard Måleenhed
@@ -17,7 +17,7 @@
 DocType: Employee,Rented,Lejet
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Fra Material Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Fra Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Ansøger
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
@@ -48,7 +48,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For at bevare kunden kloge post kode og gøre dem søgbare baseret på deres kode brug denne mulighed
 DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Vis varianter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Mængde
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Mængde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (passiver)
 DocType: Employee Education,Year of Passing,År for Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På lager
@@ -58,16 +58,15 @@
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Foretag ny POS profil
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 DocType: Purchase Invoice,Monthly,Månedlig
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Hyppighed
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail-adresse
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvar
 DocType: Company,Abbr,Fork
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle Ingen
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vælg venligst prislisten
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Vælg venligst prislisten
 DocType: Production Order Operation,Work In Progress,Work In Progress
 DocType: Employee,Holiday List,Holiday List
 DocType: Time Log,Time Log,Time Log
@@ -88,13 +87,13 @@
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Åbning for et job.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklame
 DocType: Employee,Married,Gift
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
 DocType: Payment Reconciliation,Reconcile,Forene
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Købmand
 DocType: Quality Inspection Reading,Reading 1,Læsning 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank indtastning
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionskasserne
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
 DocType: SMS Center,All Sales Person,Alle Sales Person
 DocType: Lead,Person Name,Person Name
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende orden, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
@@ -114,15 +113,15 @@
 DocType: Lead,Interested,Interesseret
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Åbning
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Fra {0} til {1}
 DocType: Item,Copy From Item Group,Kopier fra Item Group
 DocType: Journal Entry,Opening Entry,Åbning indtastning
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
 DocType: Lead,Product Enquiry,Produkt Forespørgsel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Indtast venligst selskab først
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vælg venligst Company først
 DocType: Employee Education,Under Graduate,Under Graduate
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Total Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitet Log:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
@@ -149,7 +148,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Vare {0} skal være et køb Vare
 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 +444,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af livet er nået
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil blive opdateret efter Sales Invoice er indgivet.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Indstillinger for HR modul
@@ -165,7 +164,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
 DocType: Serial No,Maintenance Status,Vedligeholdelse status
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Varer og Priser
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato skal være inden regnskabsåret. Antages Fra dato = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato skal være inden regnskabsåret. Antages Fra dato = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vælg Medarbejder, for hvem du opretter Vurdering."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Omkostningssted {0} ikke tilhører selskabet {1}
 DocType: Customer,Individual,Individuel
@@ -204,6 +203,7 @@
 ,Contact Name,Kontakt Navn
 DocType: Production Plan Item,SO Pending Qty,SO Afventer Antal
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ingen beskrivelse
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Anmodning om køb.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
@@ -215,7 +215,7 @@
 DocType: Item Website Specification,Item Website Specification,Item Website Specification
 DocType: Payment Tool,Reference No,Referencenummer
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Årligt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
 DocType: Stock Entry,Sales Invoice No,Salg faktura nr
@@ -227,11 +227,11 @@
 DocType: Pricing Rule,Supplier Type,Leverandør Type
 DocType: Item,Publish in Hub,Offentliggør i Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Vare {0} er aflyst
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materiale Request
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 DocType: Item,Purchase Details,Køb Detaljer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Relation
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekræftede ordrer fra kunder.
 DocType: Purchase Receipt Item,Rejected Quantity,Afvist Mængde
@@ -267,9 +267,9 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på mail om oprettelse af automatiske Materiale Request
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura type
 DocType: Sales Invoice Item,Delivery Note,Følgeseddel
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Opsætning Skatter
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Opsætning Skatter
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
 DocType: Workstation,Rent Cost,Leje Omkostninger
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vælg måned og år
 DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Indtast email id adskilt af kommaer, vil faktura blive sendt automatisk på bestemt dato"
@@ -282,10 +282,10 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Fås i BOM, følgeseddel, købsfaktura, produktionsordre, Indkøbsordre, kvittering, Sales Invoice, Sales Order, Stock indtastning, Timesheet"
 DocType: Item Tax,Tax Rate,Skat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Vælg Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Vælg Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvittering skal indsendes
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (parti) af et element.
@@ -353,7 +353,7 @@
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ferie mester.
 DocType: Material Request Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Faktureringsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Indtast venligst Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Indtast venligst Item Code.
 DocType: BOM,Costing,Koster
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis markeret, vil momsbeløbet blive betragtet som allerede er inkluderet i Print Rate / Print Beløb"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal Total
@@ -383,7 +383,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
 DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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,Vægt
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Seriel Ingen garanti Udløb
@@ -400,14 +400,13 @@
 ,Gross Profit,Gross Profit
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Slet Company Transaktioner
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} er en ugyldig e-mail-adresse i ""Notification \ e-mail adresse'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Samlet fakturering Dette år:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør faktura nr
 DocType: Territory,For reference,For reference
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Lukning (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Lukning (Cr)
 DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
 DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
 DocType: Job Applicant,Thread HTML,Tråd HTML
@@ -421,7 +420,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månedlig Distribution ** hjælper du distribuerer dit budget tværs måneder, hvis du har sæsonudsving i din virksomhed. At distribuere et budget ved hjælp af denne fordeling, skal du indstille dette ** Månedlig Distribution ** i ** Cost Center **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Ingen resultater i Invoice tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Ingen resultater i Invoice tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vælg Company og Party Type først
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finansiel / regnskabsår.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, kan Serial Nos ikke blive slået sammen"
@@ -429,7 +428,7 @@
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Bly Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskabsår Startdato må ikke være større end Skatteårsafslutning Dato
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskabsår Startdato må ikke være større end Skatteårsafslutning Dato
 DocType: Warranty Claim,Resolution,Opløsning
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Betales konto
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag Kunder
@@ -450,7 +449,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsordre er Obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslag Skrivning
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden Sales Person {0} eksisterer med samme Medarbejder id
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativ Stock Error ({6}) for Item {0} i Warehouse {1} på {2} {3} i {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativ Stock Error ({6}) for Item {0} i Warehouse {1} på {2} {3} i {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
 DocType: Packing Slip Item,DN Detail,DN Detail
 DocType: Time Log,Billed,Billed
@@ -470,14 +469,14 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
 DocType: Employee,Passport Number,Passport Number
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leder
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Fra kvittering
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Samme element er indtastet flere gange.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Fra kvittering
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Samme element er indtastet flere gange.
 DocType: SMS Settings,Receiver Parameter,Modtager Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Grupper efter' ikke kan være samme
 DocType: Sales Person,Sales Person Targets,Salg person Mål
 DocType: Production Order Operation,In minutes,I minutter
 DocType: Issue,Resolution Date,Opløsning Dato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
 DocType: Selling Settings,Customer Naming By,Customer Navngivning Af
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konverter til Group
 DocType: Activity Cost,Activity Type,Aktivitet Type
@@ -488,7 +487,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Projekter Bruger
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrugt
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
 DocType: Company,Round Off Cost Center,Afrunde Cost center
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
 DocType: Material Request,Material Transfer,Materiale Transfer
@@ -509,13 +508,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,At spore post i salgs- og købsdokumenter baseret på deres løbenr. Dette er også bruges til at spore garantiforpligtelser detaljer af produktet.
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
 DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
 DocType: Employee,Provide email id registered in company,Giv email id er registreret i selskab
 DocType: Hub Settings,Seller City,Sælger By
 DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Tilbyd Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Element har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Element har varianter.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -533,17 +531,17 @@
 DocType: Purchase Order,Supply Raw Materials,Supply råstoffer
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
 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 +92,{0} is not a stock Item,{0} er ikke et lager Vare
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} er ikke et lager Vare
 DocType: Mode of Payment Account,Default Account,Standard-konto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Vælg ugentlige off dag
 DocType: Production Order Operation,Planned End Time,Planned Sluttid
 ,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,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: Employee,Cell Number,Cell Antal
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Mulighed Fra
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedlige lønseddel.
@@ -552,9 +550,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Bogføring kan foretages mod blad noder. Poster mod grupper er ikke tilladt.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
 DocType: Opportunity,Maintenance,Vedligeholdelse
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Salgskampagner.
 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.
@@ -600,7 +598,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 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/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Mine Fakturaer
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Mine Fakturaer
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen medarbejder fundet
 DocType: Purchase Order,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
@@ -618,7 +616,7 @@
 apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Support forespørgsler fra kunder.
 DocType: Bin,Moving Average Rate,Glidende gennemsnit Rate
 DocType: Production Planning Tool,Select Items,Vælg emner
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
 DocType: Maintenance Visit,Completion Status,Afslutning status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
@@ -649,7 +647,7 @@
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Præstationsvurdering.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Value
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
 DocType: Account,Balance must be,Balance skal være
 DocType: Hub Settings,Publish Pricing,Offentliggøre Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Expense krav Afvist Message
@@ -672,7 +670,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} skal være aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} skal være aktiv
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vælg dokumenttypen først
 apps/erpnext/erpnext/support/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"
 DocType: Salary Slip,Leave Encashment Amount,Lad Indløsning Beløb
@@ -689,17 +687,17 @@
 DocType: Supplier,Default Payable Accounts,Standard betales Konti
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
 DocType: Features Setup,Item Barcode,Item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Item Varianter {0} opdateret
 DocType: Quality Inspection Reading,Reading 6,Læsning 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
 DocType: Address,Shop,Butik
 DocType: Hub Settings,Sync Now,Synkroniser nu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Cash-konto vil automatisk blive opdateret i POS faktura, når denne tilstand er valgt."
 DocType: Employee,Permanent Address Is,Faste adresse
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operation afsluttet for hvor mange færdigvarer?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
 DocType: Employee,Exit Interview Details,Exit Interview Detaljer
 DocType: Item,Is Purchase Item,Er Indkøb Item
 DocType: Journal Entry Account,Purchase Invoice,Indkøb Faktura
@@ -709,7 +707,7 @@
 DocType: Payment Tool,Paid,Betalt
 DocType: Salary Slip,Total in words,I alt i ord
 DocType: Material Request Item,Lead Time Date,Leveringstid Dato
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Angiv Serial Nej for Item {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Angiv Serial Nej for Item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","For &#39;Product Bundle&#39; elementer, Warehouse, Serial No og Batch Ingen vil blive betragtet fra &quot;Packing List &#39;bord. Hvis Warehouse og Batch Ingen er ens for alle emballage poster for enhver &quot;Product Bundle &#39;post, kan indtastes disse værdier i de vigtigste element tabellen, vil værdierne blive kopieret til&quot; Packing List&#39; bord."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Forsendelser til kunderne.
 DocType: Purchase Invoice Item,Purchase Order Item,Indkøbsordre Item
@@ -717,13 +715,13 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varians
 ,Company Name,Firmaets navn
 DocType: SMS Center,Total Message(s),Total Besked (r)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Select Item for Transfer,Vælg Item for Transfer
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere Prisliste Rate i transaktioner
 DocType: Pricing Rule,Max Qty,Max Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
 DocType: Process Payroll,Select Payroll Year and Month,Vælg Payroll År og Måned
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den relevante gruppe (som regel Anvendelse af fondene&gt; Omsætningsaktiver&gt; bankkonti og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Elektricitet Omkostninger
@@ -737,7 +735,7 @@
 DocType: SMS Center,All Lead (Open),Alle Bly (Open)
 DocType: Purchase Invoice,Get Advances Paid,Få forskud
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Vedhæft dit billede
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Lave
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Lave
 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/controllers/selling_controller.py +150,Order Type must be one of {0},Bestil type skal være en af {0}
@@ -759,7 +757,7 @@
 DocType: Delivery Note,Delivery To,Levering Til
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabat
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Rabat
 DocType: Features Setup,Purchase Discounts,Køb Rabatter
 DocType: Workstation,Wages,Løn
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Vil kun blive opdateret, hvis Time Log er &quot;faktureres&quot;"
@@ -781,7 +779,7 @@
 DocType: Lead,Organization Name,Organisationens navn
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Konto suppleres ved hjælp af &quot;Find varer fra Køb Kvitteringer &#39;knappen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgsomkostninger
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard Buying
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standard Buying
 DocType: GL Entry,Against,Imod
 DocType: Item,Default Selling Cost Center,Standard Selling Cost center
 DocType: Sales Partner,Implementation Partner,Implementering Partner
@@ -828,12 +826,11 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log Batch er blevet faktureret.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Opret Opportunity
 DocType: Salary Slip,Leave Without Pay,Lad uden løn
-DocType: Supplier,Communications,Kommunikation
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacity Planning Fejl
 DocType: Lead,Consultant,Konsulent
 DocType: Salary Slip,Earnings,Indtjening
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Åbning Regnskab Balance
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Åbning Regnskab Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Intet at anmode
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
@@ -873,7 +870,7 @@
 DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
 DocType: Lead,Call,Opkald
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Opsætning af Medarbejdere
@@ -884,9 +881,9 @@
 DocType: Contact,User ID,Bruger-id
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +444,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
 DocType: Production Order,Manufacture against Sales Order,Fremstilling mod kundeordre
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resten af verden
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,Item {0} kan ikke have Batch
 ,Budget Variance Report,Budget Variance Report
 DocType: Salary Slip,Gross Pay,Gross Pay
@@ -913,7 +910,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere frosne konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Lille
 DocType: Employee,Employee Number,Medarbejder nummer
 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}"
@@ -925,7 +922,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Opnået
 DocType: Employee,Place of Issue,Sted for Issue
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte udgifter
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbrug
@@ -938,8 +935,8 @@
 DocType: Address,City/Town,By / Town
 DocType: Serial No,Serial No Details,Serial Ingen Oplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Item Skat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Capital Udstyr
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelse Regel først valgt baseret på &quot;Apply On &#39;felt, som kan være Item, punkt Group eller Brand."
@@ -948,7 +945,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produktionsordre status er {0}
 DocType: Appraisal Goal,Goal,Goal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,For Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,For Leverandøren
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Indstilling Kontotype hjælper med at vælge denne konto i transaktioner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Samlet Udgående
@@ -961,7 +958,7 @@
 DocType: Journal Entry,Journal Entry,Kassekladde
 DocType: Workstation,Workstation Name,Workstation Navn
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} does not belong to Item {1},BOM {0} ikke hører 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
@@ -989,7 +986,7 @@
 DocType: Maintenance Schedule Item,No of Visits,Ingen af besøg
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhedsbreve til kontakter, fører."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operationer kan ikke være tomt.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operationer kan ikke være tomt.
 ,Delivered Items To Be Billed,Leverede varer at blive faktureret
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke ændres for Serial No.
 DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
@@ -1003,7 +1000,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operation Beskrivelse
 DocType: Item,Will also apply to variants,Vil også gælde for varianter
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke ændre regnskabsår Start Dato og Skatteårsafslutning Dato når regnskabsår er gemt.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke ændre regnskabsår Start Dato og Skatteårsafslutning Dato når regnskabsår er gemt.
 DocType: Quotation,Shopping Cart,Indkøbskurv
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gennemsnitlig Daily Udgående
 DocType: Pricing Rule,Campaign,Kampagne
@@ -1014,7 +1011,7 @@
 DocType: Sales Order Item,Planned Quantity,Planlagt Mængde
 DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb
 DocType: Item,Maintain Stock,Vedligehold Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
+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: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,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 +182,Max: {0},Max: {0}
@@ -1026,7 +1023,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
 DocType: Maintenance Visit,Unscheduled,Uplanlagt
 DocType: Employee,Owned,Ejet
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhænger Leave uden løn
@@ -1058,7 +1055,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub forsamlinger
 DocType: Shipping Rule Condition,To Value,Til Value
 DocType: Supplier,Stock Manager,Stock manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Packing Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorleje
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
@@ -1066,9 +1063,9 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse tilføjet endnu.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
 DocType: Item,Inventory,Inventory
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
 DocType: Item,Sales Details,Salg Detaljer
 DocType: Opportunity,With Items,Med Varer
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antal
@@ -1083,10 +1080,10 @@
 DocType: Cost Center,Parent Cost Center,Parent Cost center
 DocType: Sales Invoice,Source,Kilde
 DocType: Leave Type,Is Leave Without Pay,Er Lad uden løn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ingen resultater i Payment tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Ingen resultater i Payment tabellen
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Regnskabsår Startdato
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packing Slip (r) annulleret
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Packing Slip (r) annulleret
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
 DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr
 DocType: Item Group,Item Group Name,Item Group Name
@@ -1094,12 +1091,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling
 DocType: Pricing Rule,For Price List,For prisliste
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Købskurs for vare: {0} ikke fundet, som er nødvendig for at booke regnskabsmæssig post (udgift). Nævne venligst vare pris mod en købskurs listen."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Købskurs for vare: {0} ikke fundet, som er nødvendig for at booke regnskabsmæssig post (udgift). Nævne venligst vare pris mod en købskurs listen."
 DocType: Maintenance Schedule,Schedules,Tidsplaner
 DocType: Purchase Invoice Item,Net Amount,Nettobeløb
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Yderligere Discount Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Fejl: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Fejl: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
 DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde&gt; Customer Group&gt; Territory
@@ -1123,7 +1120,7 @@
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produktion Plan kundeordre
 DocType: Sales Partner,Sales Partner Target,Salg Partner Target
 DocType: Pricing Rule,Pricing Rule,Prisfastsættelse Rule
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonti
 ,Bank Reconciliation Statement,Bank Saldoopgørelsen
@@ -1131,11 +1128,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Åbning Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} må kun optræde én gang
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Blade Tildelt Succesfuld for {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,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 +550,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,"Beløb, der ikke afspejles i bank"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav om selskabets regning.
@@ -1148,28 +1145,28 @@
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,At spore elementer ved hjælp af stregkode. Du vil være i stand til at indtaste poster i følgeseddel og salgsfaktura ved at scanne stregkoden på varen.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make Citat
 DocType: Dependent Task,Dependent Task,Afhængig Opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være 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
 DocType: SMS Center,Receiver List,Modtager liste
 DocType: Payment Tool Detail,Payment Amount,Betaling Beløb
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Vis
 DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Mængde må ikke være mere end {0}
 DocType: Quotation Item,Quotation Item,Citat Vare
 DocType: Account,Account Name,Kontonavn
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverandør Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Køretøj Dispatch Dato
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom skibsfart regler, prisliste mv"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Billed
@@ -1183,7 +1180,7 @@
 DocType: Company,Default Values,Standardværdier
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Række {0}: Betaling beløb kan ikke være negativ
 DocType: Expense Claim,Total Amount Reimbursed,Samlede godtgjorte beløb
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
 DocType: Customer,Default Price List,Standard prisliste
 DocType: Payment Reconciliation,Payments,Betalinger
 DocType: Budget Detail,Budget Allocated,Budgettet
@@ -1219,16 +1216,16 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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,Materiale Request bruges til at gøre dette Stock indtastning
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkelt enhed af et element.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Total Blade Allokeret
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
 DocType: Employee,Date Of Retirement,Dato for pensionering
 DocType: Upload Attendance,Get Template,Få skabelon
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vælg {0} først.
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Vælg {0} først.
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Materiale Kvittering
@@ -1236,7 +1233,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Type og parti er nødvendig for Tilgodehavende / Betales konto {0}
 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: Lead,Next Contact By,Næste Kontakt By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +213,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 +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} kan ikke slettes, da mængden findes for Item {1}"
 DocType: Quotation,Order Type,Bestil Type
 DocType: Purchase Invoice,Notification Email Address,Meddelelse E-mailadresse
@@ -1251,15 +1248,15 @@
 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.,Alt for mange kolonner. Eksportere rapporten og udskrive det ved hjælp af en regnearksprogram.
 DocType: Sales Invoice Item,Batch No,Batch Nej
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
 DocType: Employee,Leave Encashed?,Efterlad indkasseres?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Make indkøbsordre
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Make indkøbsordre
 DocType: SMS Center,Send To,Send til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Der er ikke nok orlov balance for Leave Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Tildelte beløb
@@ -1272,7 +1269,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse og reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig info og andre generelle oplysninger om din leverandør
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Løbenummer indtastet for Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Varen er ikke tilladt at have produktionsordre.
@@ -1280,7 +1277,7 @@
 DocType: Sales Order,To Deliver and Bill,At levere og Bill
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Logs til produktion.
 DocType: Item,Apply Warehouse-wise Reorder Level,Påfør Warehouse-wise Omarranger Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} skal indsendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} skal indsendes
 DocType: Authorization Control,Authorization Control,Authorization Kontrol
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Log til opgaver.
 DocType: Production Order Operation,Actual Time and Cost,Aktuel leveringstid og omkostninger
@@ -1297,7 +1294,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
 DocType: SMS Center,Create Receiver List,Opret Modtager liste
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Udløbet
 DocType: Packing Slip,To Package No.,At pakke No.
 DocType: Warranty Claim,Issue Date,Udstedelsesdagen
 DocType: Activity Cost,Activity Cost,Aktivitet Omkostninger
@@ -1332,7 +1328,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Opnået
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Område / kunde
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,f.eks 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"I Ord vil være synlig, når du gemmer salgsfakturaen."
 DocType: Item,Is Sales Item,Er Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
@@ -1344,7 +1340,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} oprettet
 DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
 ,Serial No Status,Løbenummer status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Item tabel kan ikke være tom
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Item tabel kan ikke være tom
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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}"
 DocType: Pricing Rule,Selling,Selling
@@ -1353,7 +1349,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
 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 +170,Duties and Taxes,Told og afgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Indtast Referencedato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Indtast Referencedato
 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} betalingssystemer poster ikke kan filtreres af {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel til Vare, der vil blive vist i Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
@@ -1367,7 +1363,7 @@
 ,Open Production Orders,Åbne produktionsordrer
 DocType: Installation Note,Installation Time,Installation Time
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Slette alle transaktioner for denne Company
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ikke afsluttet for {2} qty af færdigvarer i produktionsordre # {3}. Du opdatere driftsstatus via Time Logs
+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,Row # {0}: Operation {1} er ikke afsluttet for {2} qty af færdigvarer i produktionsordre # {3}. Du opdatere driftsstatus via Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringer
 DocType: Issue,Resolution Details,Opløsning Detaljer
 DocType: Quality Inspection Reading,Acceptance Criteria,Acceptkriterier
@@ -1383,7 +1379,7 @@
 DocType: Holiday List,Clear Table,Klar Table
 DocType: Features Setup,Brands,Mærker
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nej
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Fra indkøbsordre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Fra indkøbsordre
 DocType: Activity Cost,Costing Rate,Costing Rate
 DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Priser Regler er yderligere filtreret baseret på mængde.
@@ -1398,7 +1394,7 @@
 ,Maintenance Schedules,Vedligeholdelsesplaner
 ,Quotation Trends,Citat Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Group ikke er nævnt i punkt master for element {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
 DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
 ,Pending Amount,Afventer Beløb
 DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
@@ -1413,12 +1409,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree of finanial konti.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv
 DocType: HR Settings,HR Settings,HR-indstillinger
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
 DocType: Purchase Invoice,Additional Discount Amount,Yderligere Discount Beløb
 DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,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 +225,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Samlede faktiske
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Enhed
@@ -1445,7 +1441,7 @@
 DocType: Project,% Tasks Completed,% Opgaver Afsluttet
 DocType: Project,Gross Margin,Gross Margin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Indtast venligst Produktion Vare først
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,handicappet bruger
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,handicappet bruger
 DocType: Opportunity,Quotation,Citat
 DocType: Salary Slip,Total Deduction,Samlet Fradrag
 DocType: Quotation,Maintenance User,Vedligeholdelse Bruger
@@ -1463,12 +1459,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på Leads, Citater, Sales Order osv fra kampagner til at måle Return on Investment."
 DocType: Expense Claim,Approver,Godkender
 ,SO Qty,SO Antal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
 DocType: Appraisal,Calculate Total Score,Beregn Total Score
 DocType: Supplier Quotation,Manufacturing Manager,Produktion manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Forsendelser
+apps/erpnext/erpnext/hooks.py +69,Shipments,Forsendelser
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log status skal indsendes.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
@@ -1486,10 +1482,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Vælg Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lad stå tomt hvis det anses for alle afdelinger
 apps/erpnext/erpnext/config/hr.py +95,"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 +356,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
 DocType: Currency Exchange,From Currency,Fra Valuta
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Sales Order kræves for Item {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Sales Order kræves for Item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,"Beløb, der ikke afspejles i systemet"
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Andre
@@ -1503,7 +1499,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
 DocType: Quality Inspection,In Process,I Process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} mod salgsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} mod salgsordre {1}
 DocType: Account,Fixed Asset,Fast Asset
 DocType: Time Log Batch,Total Billing Amount,Samlet Billing Beløb
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Tilgodehavende konto
@@ -1539,10 +1535,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Samlede fakturerede Amt
 DocType: Time Log,To Time,Til Time
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Hvis du vil tilføje barn noder, udforske træet og klik på noden, hvorunder du ønsker at tilføje flere noder."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
 DocType: Production Order Operation,Completed Qty,Afsluttet Antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Prisliste {0} er deaktiveret
 DocType: Manufacturing Settings,Allow Overtime,Tillad Overarbejde
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuel Værdiansættelse Rate
@@ -1550,7 +1546,7 @@
 DocType: Opportunity,Lost Reason,Tabt Årsag
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Opret Betaling Entries mod ordrer eller fakturaer.
 DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle elementer er allerede blevet faktureret
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,All items have already been invoiced,Alle elementer 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/accounts/page/accounts_browser/accounts_browser.js +304,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
 DocType: Project,External,Ekstern
@@ -1605,7 +1601,7 @@
 DocType: Rename Tool,Rename Tool,Omdøb Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Opdatering Omkostninger
 DocType: Item Reorder,Item Reorder,Item Genbestil
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transfer Materiale
 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."
 DocType: Purchase Invoice,Price List Currency,Pris List Valuta
 DocType: Naming Series,User must always select,Brugeren skal altid vælge
@@ -1621,18 +1617,18 @@
 DocType: Process Payroll,Create Salary Slip,Opret lønseddel
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Forventet balance pr bank
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Finansieringskilde (Passiver)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
 DocType: Appraisal,Employee,Medarbejder
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email Fra
 DocType: Features Setup,After Sale Installations,Efter salg Installationer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} er fuldt faktureret
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} er fuldt faktureret
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktvilkår for Salg eller Indkøb.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppe af Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig On
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Rename Tool,File to Rename,Fil til Omdøb
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
 DocType: Notification Control,Expense Claim Approved,Expense krav Godkendt
@@ -1658,15 +1654,15 @@
 DocType: Payment Tool,Total Payment Amount,Samlet Betaling Beløb
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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,Forsendelse Rule Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
 DocType: Newsletter,Test,Prøve
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Da der er eksisterende lagertransaktioner til denne vare, \ du ikke kan ændre værdierne af &quot;Har Serial Nej &#39;,&#39; Har Batch Nej &#39;,&#39; Er Stock Item&quot; og &quot;værdiansættelsesmetode &#39;"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
 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 +157,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 +211,{0} {1} is not submitted,{0} {1} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} er ikke indsendt
 apps/erpnext/erpnext/config/stock.py +18,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."
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold1
@@ -1678,7 +1674,7 @@
 DocType: Delivery Note,Transporter Name,Transporter Navn
 DocType: Contact,Enter department to which this Contact belongs,"Indtast afdeling, som denne Kontakt hører"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Måleenhed
 DocType: Fiscal Year,Year End Date,År Slutdato
 DocType: Task Depends On,Task Depends On,Task Afhænger On
@@ -1702,7 +1698,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
 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/sælger/affiliate/butik der, der sælger selskabernes varer/tjenesteydelser mod provision."
 DocType: Customer Group,Has Child Node,Har Child Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Indtast statiske url parametre her (F.eks. Afsender = ERPNext, brugernavn = ERPNext, password = 1234 mm)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noget aktiv regnskabsår. For flere detaljer tjek {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
@@ -1730,7 +1726,7 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standard skat skabelon, der kan anvendes på alle købstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre bekostning hoveder som &quot;Shipping&quot;, &quot;forsikring&quot;, &quot;Håndtering&quot; 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å &quot;Forrige Row alt&quot; 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: Purchase Receipt Item,Recd Quantity,RECD Mængde
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
 DocType: Global Defaults,Hide Currency Symbol,Skjul Valuta Symbol
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","fx Bank, Kontant, Kreditkort"
@@ -1811,7 +1807,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Stock Indstillinger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrer Customer Group Tree.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Ny Cost center navn
 DocType: Leave Control Panel,Leave Control Panel,Lad Kontrolpanel
@@ -1830,8 +1826,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Udlån (aktiver)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Large
@@ -1893,7 +1889,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Ingen Bemærkninger
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Ingen Bemærkninger
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfaldne
 DocType: Account,Stock Received But Not Billed,Stock Modtaget men ikke faktureret
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + bagud Beløb + Indløsning Beløb - Total Fradrag
@@ -1916,9 +1912,9 @@
 DocType: Purchase Invoice,Half-yearly,Halvårligt
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Regnskabsår {0} ikke fundet.
 DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Regnskab Punktet om Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Regnskab Punktet om Stock
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Element {0} eksisterer ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Element {0} eksisterer ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
 DocType: Account,Root Type,Root Type
@@ -1927,10 +1923,10 @@
 DocType: Item Group,Show this slideshow at the top of the page,Vis denne slideshow øverst på siden
 DocType: BOM,Item UOM,Item UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
@@ -1970,7 +1966,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Navn eller E-mail er obligatorisk
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspektion indkommende kvalitet.
 DocType: Employee,Exit,Udgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Typen er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root Typen er obligatorisk
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Løbenummer {0} oprettet
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For nemheds af kunder, kan disse koder bruges i trykte formater som fakturaer og følgesedler"
 DocType: Employee,You can enter any date manually,Du kan indtaste et hvilket som helst tidspunkt manuelt
@@ -1979,7 +1975,7 @@
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
 DocType: Expense Claim,Expense Approver,Expense Godkender
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betale
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Betale
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til datotid
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
@@ -1995,7 +1991,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
 DocType: Attendance,Attendance Date,Fremmøde Dato
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Løn breakup baseret på Optjening og fradrag.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
 DocType: Address,Preferred Shipping Address,Foretrukne Forsendelsesadresse
 DocType: Purchase Receipt Item,Accepted Warehouse,Accepteret varelager
 DocType: Bank Reconciliation Detail,Posting Date,Udstationering Dato
@@ -2012,7 +2008,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
 DocType: Pricing Rule,Discount Percentage,Discount Procent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
-apps/erpnext/erpnext/hooks.py +54,Orders,Ordrer
+apps/erpnext/erpnext/hooks.py +55,Orders,Ordrer
 DocType: Leave Control Panel,Employee Type,Medarbejder Type
 DocType: Employee Leave Approver,Leave Approver,Lad Godkender
 DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Godkend udgifter' rolle
@@ -2023,7 +2019,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periode Lukning indtastning
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afskrivninger
+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: Customer,Credit Limit,Kreditgrænse
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vælg type transaktion
@@ -2044,17 +2040,17 @@
 DocType: Material Request,Requested For,Anmodet om
 DocType: Quotation Item,Against Doctype,Mod DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette Delivery Note mod enhver Project
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-konto kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root-konto kan ikke slettes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Stock Entries
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Henvisning # {0} dateret {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Henvisning # {0} dateret {1}
 DocType: Pricing Rule,Item Code,Item Code
 DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
 DocType: Journal Entry,User Remark,Bruger Bemærkning
 DocType: Lead,Market Segment,Market Segment
 DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Lukning (dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Lukning (dr)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Løbenummer {0} ikke er på lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
@@ -2069,7 +2065,7 @@
 ,Billed Amount,Faktureret beløb
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hent opdateringer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Tilføj et par prøve optegnelser
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lad Management
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppe af konto
@@ -2078,14 +2074,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontoen hoved under ansvar, hvor gevinst / tab vil være reserveret"
 DocType: Payment Tool,Against Vouchers,Mod Vouchers
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hurtig hjælp
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Salg Extras
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget for konto {1} mod udgiftsområde {2} vil blive overskredet med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
 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'
 ,Stock Projected Qty,Stock Forventet Antal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
 DocType: Warranty Claim,From Company,Fra Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Værdi eller Antal
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Minute,Minut
@@ -2095,7 +2091,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Du vil bruge det til login
 DocType: Sales Partner,Retailer,Forhandler
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
+apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
 DocType: Sales Order,%  Delivered,% Leveres
@@ -2136,7 +2132,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagemateriale vægt. (Til print)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
 DocType: Serial No,Is Cancelled,Er Annulleret
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mine forsendelser
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Mine forsendelser
 DocType: Journal Entry,Bill Date,Bill Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv hvis der er flere Priser Regler med højeste prioritet, derefter følgende interne prioriteringer anvendt:"
 DocType: Supplier,Supplier Details,Leverandør Detaljer
@@ -2157,10 +2153,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Opkald
 DocType: Project,Total Costing Amount (via Time Logs),Total Costing Beløb (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Projiceret
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Løbenummer {0} ikke hører til Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
 DocType: Notification Control,Quotation Message,Citat Message
 DocType: Issue,Opening Date,Åbning Dato
 DocType: Journal Entry,Remark,Bemærkning
@@ -2173,7 +2169,6 @@
 DocType: Time Log,Batched for Billing,Batched for fakturering
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger rejst af leverandører.
 DocType: POS Profile,Write Off Account,Skriv Off konto
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabat Beløb
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
 DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,fx moms
@@ -2214,7 +2209,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Dato for pensionering skal være større end Dato for Sammenføjning
 DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Delivered
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Territory Mål
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2242,7 +2237,7 @@
 ,Stock Ledger,Stock Ledger
 DocType: Salary Slip Deduction,Salary Slip Deduction,Lønseddel Fradrag
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Vælg en gruppe node først.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Formålet skal være en af {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Formålet skal være en af {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Udfyld formularen og gemme det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download en rapport med alle råvarer med deres seneste opgørelse status
 DocType: Leave Application,Leave Balance Before Application,Lad Balance Før Application
@@ -2275,7 +2270,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,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 Grand Total
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 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} er ikke en gyldig Batchnummer for Item {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Bemærk: Hvis betaling ikke sker mod nogen reference, gør Kassekladde manuelt."
@@ -2292,11 +2287,11 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Række {0}: Antal ikke avalable i lageret {1} på {2} {3}. Tilgængelig Antal: {4}, Transfer Antal: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Skabelon
 DocType: Sales Person,Sales Person Name,Salg Person Name
@@ -2307,19 +2302,19 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
 apps/erpnext/erpnext/support/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 +374,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
+apps/erpnext/erpnext/stock/doctype/item/item.py +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
 DocType: Sales Order,Partly Billed,Delvist Billed
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Enestående Amt
 DocType: Time Log Batch,Total Hours,Total Hours
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
 DocType: Time Log,From Time,Fra Time
 DocType: Notification Control,Custom Message,Tilpasset Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
 DocType: Purchase Invoice Item,Rate,Rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
@@ -2337,7 +2332,7 @@
 			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriterier, skal du løse \ konflikten ved at tildele prioritet. Pris Regler: {0}"
 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 +580,Issue Material,Issue Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Issue Materiale
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Offer Dato
 DocType: Hub Settings,Access Token,Access Token
@@ -2372,7 +2367,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Raw Material
 DocType: Leave Application,Follow via Email,Følg via e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -2388,6 +2383,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriel Nos Nødvendig for Serialized Item {0}
 DocType: Journal Entry,Bank Entry,Bank indtastning
 DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Tilføj til indkøbsvogn
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppér efter
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivere / deaktivere valutaer.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postale Udgifter
@@ -2395,16 +2391,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Den dato, hvor tilbagevendende ordre vil blive stoppe"
 DocType: Quality Inspection,Item Serial No,Vare Løbenummer
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Samlet Present
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Time
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
 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,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Opret Citat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Forsendelse Regel Betingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
@@ -2415,13 +2411,12 @@
 DocType: Quality Inspection,Report Date,Report Date
 DocType: C-Form,Invoices,Fakturaer
 DocType: Job Opening,Job Title,Jobtitel
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Modtagere
 DocType: Features Setup,Item Groups in Details,Varegrupper i Detaljer
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
 apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Besøg rapport til vedligeholdelse opkald.
 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: Pricing Rule,Customer Group,Customer Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
 DocType: Item,Website Description,Website Beskrivelse
 DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
 ,Sales Register,Salg Register
@@ -2429,12 +2424,12 @@
 DocType: Address,Plant,Plant
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
 DocType: Customer Group,Customer Group Name,Customer Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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 Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
 DocType: GL Entry,Against Voucher Type,Mod Voucher Type
 DocType: Item,Attributes,Attributter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Få Varer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Indtast venligst Skriv Off konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Få Varer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Indtast venligst Skriv Off konto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sidste Ordredato
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Make Excise Faktura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
@@ -2449,7 +2444,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
 DocType: Project,Expected End Date,Forventet Slutdato
 DocType: Appraisal Template,Appraisal Template Title,Vurdering Template Titel
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Kommerciel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Kommerciel
 DocType: Cost Center,Distribution Id,Distribution Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle produkter eller tjenesteydelser.
@@ -2459,7 +2454,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serien er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 DocType: Tax Rule,Sales,Salg
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard kan modtages Konti
 DocType: Item Reorder,Transfer,Transfer
@@ -2470,13 +2465,12 @@
 DocType: Naming Series,Setup Series,Opsætning Series
 DocType: Supplier,Contact HTML,Kontakt HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Køb Kvitteringer
-DocType: Payment Reconciliation,Maximum Amount,Maksimumbeløb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan Prisfastsættelse Regel anvendes?
 DocType: Quality Inspection,Delivery Note No,Levering Note Nej
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} eksisterer ikke
 DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Produkt Bundle
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
 DocType: Upload Attendance,Download Template,Hent skabelon
 DocType: GL Entry,Remarks,Bemærkninger
@@ -2512,6 +2506,7 @@
 DocType: Hub Settings,Seller Country,Sælger Land
 DocType: Authorization Rule,Authorization Rule,Autorisation Rule
 DocType: Sales Invoice,Terms and Conditions Details,Betingelser Detaljer
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Specifikationer
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salg Skatter og Afgifter Skabelon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antal Order
@@ -2532,7 +2527,7 @@
 DocType: Time Log,Billing Amount,Fakturering Beløb
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig mængde angivet for element {0}. Mængde bør være større end 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ansøgning om orlov.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridiske Udgifter
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto ordre vil blive genereret f.eks 05, 28 osv"
 DocType: Sales Invoice,Posting Time,Udstationering Time
@@ -2546,10 +2541,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Rejser Udgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrud
 DocType: Bank Reconciliation Detail,Cheque Date,Check Dato
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Samlet indbetalte beløb
 ,Transferred Qty,Overført Antal
@@ -2568,7 +2563,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tilføj rækker til at fastsætte årlige budgetter på Konti.
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
 DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Firma Forkortelse
@@ -2590,7 +2585,7 @@
 ,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Midlertidig
 DocType: Address,Preferred Billing Address,Foretrukne Faktureringsadresse
@@ -2606,8 +2601,8 @@
 ,Item-wise Price List Rate,Item-wise Prisliste Rate
 DocType: Purchase Order Item,Supplier Quotation,Leverandør Citat
 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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} er stoppet
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
 DocType: Lead,Add to calendar on this date,Føj til kalender på denne dato
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden er nødvendig
@@ -2624,23 +2619,23 @@
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordrer frigives til produktion.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vælg regnskabsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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 +455,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
 DocType: Hub Settings,Name Token,Navn Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard Selling
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Selling,Standard Selling
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
 DocType: Serial No,Out of Warranty,Ud af garanti
 DocType: BOM Replace Tool,Replace,Udskifte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
 DocType: Purchase Invoice Item,Project Name,Projektnavn
 DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
 DocType: Features Setup,Item Batch Nos,Item Batch nr
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Menneskelige Ressourcer
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Skatteaktiver
 DocType: BOM Item,BOM No,BOM Ingen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Glidende gennemsnit
 DocType: BOM Replace Tool,The BOM which will be replaced,Den BOM som vil blive erstattet
 DocType: Account,Debit,Betalingskort
@@ -2675,14 +2670,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),Sats (%)
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Regnskabsår Slutdato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere baseret på blad nr, hvis grupperet efter Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Foretag Leverandør Citat
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Foretag Leverandør Citat
 DocType: Quality Inspection,Incoming,Indgående
 DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reducer Optjening for Leave uden løn (LWP)
 apps/erpnext/erpnext/public/js/setup_wizard.js +274,"Add users to your organization, other than yourself","Tilføj brugere til din organisation, andre end dig selv"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Batch-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Bemærk: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Bemærk: {0}
 ,Delivery Note Trends,Følgeseddel Tendenser
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} skal være en Købt eller underentreprise element i række {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Stock Transaktioner
@@ -2718,7 +2713,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunde-id
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Til Time skal være større end From Time
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Forældre-konto {1} ikke Bolong til virksomheden {2}
 DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
 DocType: Account,Asset,Asset
@@ -2738,7 +2733,7 @@
 ,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Angivelse af denne adresse skabelon som standard, da der ikke er nogen anden standard"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,Filter baseret på kundernes
 DocType: Payment Tool Detail,Against Voucher No,Mod blad nr
@@ -2782,13 +2777,12 @@
 DocType: Production Order,Warehouses,Pakhuse
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print og Stationær
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppe Node
-DocType: Payment Reconciliation,Minimum Amount,Minimumsbeløb
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Opdater færdigvarer
 DocType: Workstation,per hour,per time
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
 DocType: Company,Distribution,Distribution
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløb betalt
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Beløb betalt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
@@ -2811,7 +2805,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Virksomheden mangler i pakhuse {0}
 DocType: POS Profile,Terms and Conditions,Betingelser
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
 DocType: Leave Block List,Applies to Company,Gælder for Company
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke annullere fordi indsendt Stock indtastning {0} eksisterer
@@ -2825,7 +2819,7 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Indtast venligst Køb Kvitteringer
 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 +425,Transaction not allowed against stopped Production Order {0},Transaktion ikke tilladt mod stoppet produktionsordre {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Opsætning indgående server til support email id. (F.eks support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antal
@@ -2913,7 +2907,7 @@
 DocType: Appraisal,Start Date,Startdato
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Afsætte blade i en periode.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik her for at verificere
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
 DocType: Purchase Invoice Item,Price List Rate,Prisliste Rate
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Vis &quot;På lager&quot; eller &quot;Ikke på lager&quot; baseret på lager til rådighed i dette lager.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
@@ -2928,10 +2922,10 @@
 DocType: Workstation,Operating Costs,Drifts- omkostninger
 DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} er blevet føjet til vores nyhedsliste.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære så tabt, fordi Citat er blevet gjort."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Vigtigste Reports
 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
@@ -2949,7 +2943,7 @@
 DocType: Industry Type,Industry Type,Industri Type
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Noget gik galt!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Afslutning Dato
 DocType: Purchase Invoice Item,Amount (Company Currency),Beløb (Company Valuta)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisation enhed (departement) herre.
@@ -2968,10 +2962,10 @@
 ,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
 DocType: Item,Unit of Measure Conversion,Måleenhed Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Medarbejder kan ikke ændres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
 DocType: Naming Series,Help HTML,Hjælp HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Navn på den person eller organisation, der denne adresse tilhører."
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Dine Leverandører
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
@@ -2986,15 +2980,14 @@
 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.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få ikke-afstemte Entries
 DocType: Cost Center,Budgets,Budgetter
-DocType: Employee,Emergency Contact Details,Emergency Kontaktoplysning
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Hvad gør det?
 DocType: Delivery Note,To Warehouse,Til Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} er indtastet mere end en gang for regnskabsåret {1}
 ,Average Commission Rate,Gennemsnitlig Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
 DocType: Purchase Taxes and Charges,Account Head,Konto hoved
@@ -3050,12 +3043,12 @@
 DocType: Upload Attendance,Upload Attendance,Upload Fremmøde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Beløb
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Beløb
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
 ,Sales Analytics,Salg Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Manufacturing Indstillinger
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Opsætning af E-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Indtast standard valuta i Company Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Indtast standard valuta i Company Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock indtastning Detail
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,New Account Name,Ny Kontonavn
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Leveres Cost
@@ -3075,13 +3068,13 @@
 DocType: Sales Order Item,Produced Quantity,Produceret Mængde
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søg Sub Assemblies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Faktiske
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
 DocType: Purchase Invoice,Against Expense Account,Mod udgiftskonto
 DocType: Production Order,Production Order,Produktionsordre
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
 DocType: Quotation Item,Against Docname,Mod Docname
 DocType: SMS Center,All Employee (Active),Alle Medarbejder (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Se nu
@@ -3093,22 +3086,22 @@
 DocType: Employee,Applicable Holiday List,Gældende Holiday List
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Opdateret
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapporttype er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Rapporttype er obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Vare {0} i række {1}
 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/public/js/setup_wizard.js +101,The First User: You,Den første bruger: Du
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Succesfuld Afstemt
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Succesfuld Afstemt
 DocType: Production Order,Planned End Date,Planlagt Slutdato
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Hvor emner er gemt.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturerede beløb
 DocType: Attendance,Attendance,Fremmøde
 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, vil listen skal lægges til hver afdeling, hvor det skal anvendes."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Skat skabelon til at købe transaktioner.
 ,Item Prices,Item Priser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"I Ord vil være synlig, når du gemmer indkøbsordre."
@@ -3116,14 +3109,14 @@
 apps/erpnext/erpnext/config/stock.py +120,Price List master.,Pris List mester.
 DocType: Task,Review Date,Anmeldelse Dato
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rækken {0} skal være samme som produktionsordre
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
 DocType: Company,Round Off Account,Afrunde konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Rådgivning
 DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ændring
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Ændring
 DocType: Purchase Invoice,Contact Email,Kontakt E-mail
 DocType: Appraisal Goal,Score Earned,Score tjent
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",fx &quot;My Company LLC&quot;
@@ -3168,6 +3161,7 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tid logs uden Workstation arbejdstid.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} er allerede indsendt
 ,Items To Be Requested,Varer skal ansøges
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Få Sidste Purchase Rate
 DocType: Company,Company Info,Firma Info
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Firma Email ID ikke fundet, dermed mail ikke sendt"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
@@ -3175,27 +3169,27 @@
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Medarbejder Navn
 DocType: Sales Invoice,Rounded Total (Company Currency),Afrundet alt (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
 DocType: Purchase Common,Purchase Common,Indkøb Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at Udfyld Programmer på følgende dage.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fra Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
 DocType: Sales Invoice,Is POS,Er POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
 DocType: Production Order,Manufactured Qty,Fremstillet Antal
 DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger rejst til kunder.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tilføjet
 DocType: Maintenance Schedule,Schedule,Køreplan
 DocType: Account,Parent Account,Parent Konto
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke fundet eller handicappede
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Prisliste ikke fundet eller handicappede
 DocType: Expense Claim,Approved,Godkendt
 DocType: Pricing Rule,Price,Pris
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
@@ -3216,14 +3210,14 @@
 DocType: Employee,Contract End Date,Kontrakt Slutdato
 DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Fra Leverandør Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Fra Leverandør Citat
 DocType: Deduction Type,Deduction Type,Fradrag Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Antal
 DocType: GL Entry,Transaction Date,Transaktion Dato
 DocType: Production Plan Item,Planned Qty,Planned Antal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,I alt Skat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net alt (Company Valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
@@ -3274,7 +3268,7 @@
 DocType: Customer,Commission Rate,Kommissionens Rate
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
 DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root kan ikke redigeres.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root kan ikke redigeres.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Tildelte beløb kan ikke er større end unadusted beløb
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillad Produktion på helligdage
 DocType: Sales Order,Customer's Purchase Order Date,Kundens Indkøbsordre Dato
@@ -3285,7 +3279,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vilkår og betingelser Skabelon
 DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk oprette Materiale Request hvis mængde falder under dette niveau
 ,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
 DocType: Batch,Expiry Date,Udløbsdato
@@ -3296,7 +3290,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Halv dag)
 DocType: Supplier,Credit Days,Credit Dage
 DocType: Leave Type,Is Carry Forward,Er Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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,Lead Time dage
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
@@ -3304,7 +3298,7 @@
 DocType: Employee,Reason for Leaving,Årsag til Leaving
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktioneret Beløb
 DocType: GL Entry,Is Opening,Er Åbning
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konto {0} findes ikke
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Konto {0} findes ikke
 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/da.csv b/erpnext/translations/da.csv
index 103852d..84b03b0 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Forbrugerprodukter
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vælg Party Type først
 DocType: Item,Customer Items,Kunde Varer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
 DocType: Item,Publish Item to hub.erpnext.com,Udgive Vare til hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mail-meddelelser
 DocType: Item,Default Unit of Measure,Standard Måleenhed
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
 DocType: Purchase Order,Customer Contact,Kundeservice Kontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Fra Material Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Fra Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Ansøger
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For at bevare kunden kloge post kode og gøre dem søgbare baseret på deres kode brug denne mulighed
 DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Vis varianter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Mængde
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Mængde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (passiver)
 DocType: Employee Education,Year of Passing,År for Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På lager
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 DocType: Purchase Invoice,Monthly,Månedlig
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Forsinket betaling (dage)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Hyppighed
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail-adresse
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Regnskabsår {0} er påkrævet
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvar
 DocType: Company,Abbr,Fork
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle Ingen
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vælg venligst prislisten
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Vælg venligst prislisten
 DocType: Production Order Operation,Work In Progress,Work In Progress
 DocType: Employee,Holiday List,Holiday List
 DocType: Time Log,Time Log,Time Log
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samme Company indtastes mere end én gang
 DocType: Employee,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ikke tilladt for {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
 DocType: Payment Reconciliation,Reconcile,Forene
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Købmand
 DocType: Quality Inspection Reading,Reading 1,Læsning 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank indtastning
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionskasserne
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
 DocType: SMS Center,All Sales Person,Alle Sales Person
 DocType: Lead,Person Name,Person Name
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende orden, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Interesseret
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Åbning
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Fra {0} til {1}
 DocType: Item,Copy From Item Group,Kopier fra Item Group
 DocType: Journal Entry,Opening Entry,Åbning indtastning
 DocType: Stock Entry,Additional Costs,Yderligere omkostninger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
 DocType: Lead,Product Enquiry,Produkt Forespørgsel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Indtast venligst selskab først
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vælg venligst Company først
 DocType: Employee Education,Under Graduate,Under Graduate
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Total Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitet Log:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Vare {0} skal være et køb Vare
 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 +444,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af livet er nået
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil blive opdateret efter Sales Invoice er indgivet.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Indstillinger for HR modul
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
 DocType: Serial No,Maintenance Status,Vedligeholdelse status
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Varer og Priser
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato skal være inden regnskabsåret. Antages Fra dato = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato skal være inden regnskabsåret. Antages Fra dato = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vælg Medarbejder, for hvem du opretter Vurdering."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Omkostningssted {0} ikke tilhører selskabet {1}
 DocType: Customer,Individual,Individuel
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Indtast Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Mod Sales Invoice Item
 ,Production Orders in Progress,Produktionsordrer i Progress
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Netto kontant fra Finansiering
 DocType: Lead,Address & Contact,Adresse og kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tilføj ubrugte blade fra tidligere tildelinger
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Kontakt Navn
 DocType: Production Plan Item,SO Pending Qty,SO Afventer Antal
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ingen beskrivelse
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Anmodning om køb.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Item Website Specification
 DocType: Payment Tool,Reference No,Referencenummer
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Årligt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
 DocType: Stock Entry,Sales Invoice No,Salg faktura nr
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Leverandør Type
 DocType: Item,Publish in Hub,Offentliggør i Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Vare {0} er aflyst
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materiale Request
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 DocType: Item,Purchase Details,Køb Detaljer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Relation
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekræftede ordrer fra kunder.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Forslag
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set varegruppe-wise budgetter på denne Territory. Du kan også medtage sæsonudsving ved at indstille Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Indtast venligst forælder konto gruppe for lager {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mod {0} {1} kan ikke være større end udestående beløb {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mod {0} {1} kan ikke være større end udestående beløb {2}
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobil No.
 DocType: Maintenance Schedule,Generate Schedule,Generer Schedule
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Seneste
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 tegn
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første Lad Godkender i listen, vil blive indstillet som standard Forlad Godkender"
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Lære
 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 konti
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrer Sales Person Tree.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura type
 DocType: Sales Invoice Item,Delivery Note,Følgeseddel
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Opsætning Skatter
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Opsætning Skatter
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumé for denne uge og verserende aktiviteter
 DocType: Workstation,Rent Cost,Leje Omkostninger
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vælg måned og år
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Fås i BOM, følgeseddel, købsfaktura, produktionsordre, Indkøbsordre, kvittering, Sales Invoice, Sales Order, Stock indtastning, Timesheet"
 DocType: Item Tax,Tax Rate,Skat
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Vælg Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Vælg Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch nr skal være det samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvittering skal indsendes
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Årsag til at miste
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er lukket på følgende datoer som pr Holiday List: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Muligheder
 DocType: Employee,Single,Enkeltværelse
 DocType: Issue,Attachment,Attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan ikke indstilles for gruppe Cost center
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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,Gælder ikke
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ferie mester.
 DocType: Material Request Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Faktureringsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Indtast venligst Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Indtast venligst Item Code.
 DocType: BOM,Costing,Koster
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis markeret, vil momsbeløbet blive betragtet som allerede er inkluderet i Print Rate / Print Beløb"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal Total
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
 DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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,Vægt
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Seriel Ingen garanti Udløb
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} er en ugyldig e-mail-adresse i ""Notification \ e-mail adresse'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Samlet fakturering Dette år:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør faktura nr
 DocType: Territory,For reference,For reference
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette Løbenummer {0}, som det bruges på lager transaktioner"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Lukning (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Lukning (Cr)
 DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
 DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
 ,Pending Qty,Afventer Antal
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månedlig Distribution ** hjælper du distribuerer dit budget tværs måneder, hvis du har sæsonudsving i din virksomhed. At distribuere et budget ved hjælp af denne fordeling, skal du indstille dette ** Månedlig Distribution ** i ** Cost Center **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Ingen resultater i Invoice tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Ingen resultater i Invoice tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vælg Company og Party Type først
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finansiel / regnskabsår.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, kan Serial Nos ikke blive slået sammen"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Bly Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskabsår Startdato må ikke være større end Skatteårsafslutning Dato
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskabsår Startdato må ikke være større end Skatteårsafslutning Dato
 DocType: Warranty Claim,Resolution,Opløsning
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Leveret: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Leveret: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Betales konto
 DocType: Sales Order,Billing and Delivery Status,Fakturering og levering status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag Kunder
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,Citat Til
 DocType: Lead,Middle Income,Midterste indkomst
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åbning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk varelager hvor lagerændringer foretages.
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsordre er Obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslag Skrivning
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden Sales Person {0} eksisterer med samme Medarbejder id
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativ Stock Error ({6}) for Item {0} i Warehouse {1} på {2} {3} i {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativ Stock Error ({6}) for Item {0} i Warehouse {1} på {2} {3} i {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
 DocType: Packing Slip Item,DN Detail,DN Detail
 DocType: Time Log,Billed,Billed
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,Standard Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Vedligeholdelse Skema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Netto Ændring i Inventory
 DocType: Employee,Passport Number,Passport Number
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leder
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Fra kvittering
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Samme element er indtastet flere gange.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Fra kvittering
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Samme element er indtastet flere gange.
 DocType: SMS Settings,Receiver Parameter,Modtager Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Grupper efter' ikke kan være samme
 DocType: Sales Person,Sales Person Targets,Salg person Mål
 DocType: Production Order Operation,In minutes,I minutter
 DocType: Issue,Resolution Date,Opløsning Dato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
 DocType: Selling Settings,Customer Naming By,Customer Navngivning Af
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konverter til Group
 DocType: Activity Cost,Activity Type,Aktivitet Type
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Projekter Bruger
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrugt
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
 DocType: Company,Round Off Cost Center,Afrunde Cost center
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
 DocType: Material Request,Material Transfer,Materiale Transfer
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,At spore post i salgs- og købsdokumenter baseret på deres løbenr. Dette er også bruges til at spore garantiforpligtelser detaljer af produktet.
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Total fakturering år
 DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
 DocType: Employee,Provide email id registered in company,Giv email id er registreret i selskab
 DocType: Hub Settings,Seller City,Sælger By
 DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Tilbyd Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Element har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Element har varianter.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -580,18 +584,18 @@
 DocType: Purchase Order,Supply Raw Materials,Supply råstoffer
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
 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 +92,{0} is not a stock Item,{0} er ikke et lager Vare
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} er ikke et lager Vare
 DocType: Mode of Payment Account,Default Account,Standard-konto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Vælg ugentlige off dag
 DocType: Production Order Operation,Planned End Time,Planned Sluttid
 ,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,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: Employee,Cell Number,Cell Antal
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiale Anmodning Genereret
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Mulighed Fra
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedlige lønseddel.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Bogføring kan foretages mod blad noder. Poster mod grupper er ikke tilladt.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
 DocType: Opportunity,Maintenance,Vedligeholdelse
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Salgskampagner.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familie Baggrund
 DocType: Process Payroll,Send Email,Send Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Advarsel: Ugyldig Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Advarsel: Ugyldig Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ingen Tilladelse
 DocType: Company,Default Bank Account,Standard bankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 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/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Mine Fakturaer
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Mine Fakturaer
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen medarbejder fundet
 DocType: Purchase Order,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send nu
 ,Support Analytics,Support Analytics
 DocType: Item,Website Warehouse,Website Warehouse
+DocType: Payment Reconciliation,Minimum Invoice Amount,Mindste Faktura Beløb
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form optegnelser
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",For at aktivere &quot;Point of Sale&quot; funktioner
 DocType: Bin,Moving Average Rate,Glidende gennemsnit Rate
 DocType: Production Planning Tool,Select Items,Vælg emner
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
 DocType: Maintenance Visit,Completion Status,Afslutning status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
 DocType: Production Order,Item To Manufacture,Item Til Fremstilling
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status er {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Indkøbsordre til betaling
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Indkøbsordre til betaling
 DocType: Sales Order Item,Projected Qty,Projiceret Antal
 DocType: Sales Invoice,Payment Due Date,Betaling Due Date
 DocType: Newsletter,Newsletter Manager,Nyhedsbrev manager
@@ -704,7 +709,7 @@
 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,Projekt Value
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
 DocType: Account,Balance must be,Balance skal være
 DocType: Hub Settings,Publish Pricing,Offentliggøre Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Expense krav Afvist Message
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} skal være aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} skal være aktiv
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vælg dokumenttypen først
 apps/erpnext/erpnext/support/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"
 DocType: Salary Slip,Leave Encashment Amount,Lad Indløsning Beløb
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,Standard betales Konti
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
 DocType: Features Setup,Item Barcode,Item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Item Varianter {0} opdateret
 DocType: Quality Inspection Reading,Reading 6,Læsning 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
 DocType: Address,Shop,Butik
 DocType: Hub Settings,Sync Now,Synkroniser nu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Cash-konto vil automatisk blive opdateret i POS faktura, når denne tilstand er valgt."
 DocType: Employee,Permanent Address Is,Faste adresse
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operation afsluttet for hvor mange færdigvarer?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
 DocType: Employee,Exit Interview Details,Exit Interview Detaljer
 DocType: Item,Is Purchase Item,Er Indkøb Item
 DocType: Journal Entry Account,Purchase Invoice,Indkøb Faktura
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,I alt i ord
 DocType: Material Request Item,Lead Time Date,Leveringstid Dato
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,er obligatorisk. Måske Valutaveksling rekord er ikke skabt til
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Angiv Serial Nej for Item {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Angiv Serial Nej for Item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","For &#39;Product Bundle&#39; elementer, Warehouse, Serial No og Batch Ingen vil blive betragtet fra &quot;Packing List &#39;bord. Hvis Warehouse og Batch Ingen er ens for alle emballage poster for enhver &quot;Product Bundle &#39;post, kan indtastes disse værdier i de vigtigste element tabellen, vil værdierne blive kopieret til&quot; Packing List&#39; bord."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Forsendelser til kunderne.
 DocType: Purchase Invoice Item,Purchase Order Item,Indkøbsordre Item
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varians
 ,Company Name,Firmaets navn
 DocType: SMS Center,Total Message(s),Total Besked (r)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Select Item for Transfer,Vælg Item for Transfer
+DocType: Purchase Invoice,Additional Discount Percentage,Yderligere 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 de hjælpevideoer
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere Prisliste Rate i transaktioner
 DocType: Pricing Rule,Max Qty,Max Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
 DocType: Process Payroll,Select Payroll Year and Month,Vælg Payroll År og Måned
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den relevante gruppe (som regel Anvendelse af fondene&gt; Omsætningsaktiver&gt; bankkonti og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Elektricitet Omkostninger
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),Alle Bly (Open)
 DocType: Purchase Invoice,Get Advances Paid,Få forskud
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Vedhæft dit billede
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Lave
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Lave
 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 +3,My Cart,Indkøbskurv
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Indkøbskurv
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Bestil type skal være en af {0}
 DocType: Lead,Next Contact Date,Næste Kontakt Dato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Åbning Antal
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Attributtabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,Attributtabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabat
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Rabat
 DocType: Features Setup,Purchase Discounts,Køb Rabatter
 DocType: Workstation,Wages,Løn
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Vil kun blive opdateret, hvis Time Log er &quot;faktureres&quot;"
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,Forsendelse stat
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Konto suppleres ved hjælp af &quot;Find varer fra Køb Kvitteringer &#39;knappen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgsomkostninger
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard Buying
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standard Buying
 DocType: GL Entry,Against,Imod
 DocType: Item,Default Selling Cost Center,Standard Selling Cost center
 DocType: Sales Partner,Implementation Partner,Implementering Partner
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Venligst sæt &#39;Anvend Ekstra Rabat på&#39;
 ,Ordered Items To Be Billed,Bestilte varer at blive faktureret
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Fra Range skal være mindre end at ligge
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vælg Time Logs og Send for at oprette en ny Sales Invoice.
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log Batch er blevet faktureret.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Opret Opportunity
 DocType: Salary Slip,Leave Without Pay,Lad uden løn
-DocType: Supplier,Communications,Kommunikation
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacity Planning Fejl
 ,Trial Balance for Party,Trial Balance til Party
 DocType: Lead,Consultant,Konsulent
 DocType: Salary Slip,Earnings,Indtjening
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Åbning Regnskab Balance
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Åbning Regnskab Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Intet at anmode
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
 DocType: Lead,Call,Opkald
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Opsætning af Medarbejdere
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,Bruger-id
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +444,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
 DocType: Production Order,Manufacture against Sales Order,Fremstilling mod kundeordre
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resten af verden
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,Item {0} kan ikke have Batch
 ,Budget Variance Report,Budget Variance Report
 DocType: Salary Slip,Gross Pay,Gross Pay
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere frosne konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Lille
 DocType: Employee,Employee Number,Medarbejder nummer
 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}"
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,Sted for Issue
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
 DocType: Email Digest,Add Quote,Tilføj Citat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte udgifter
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Dine produkter eller tjenester
 DocType: Mode of Payment,Mode of Payment,Mode Betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rod varegruppe og kan ikke redigeres.
 DocType: Journal Entry Account,Purchase Order,Indkøbsordre
 DocType: Warehouse,Warehouse Contact Info,Lager Kontakt Info
@@ -1018,8 +1024,8 @@
 DocType: Email Digest,Annual Income,Årlige indkomst
 DocType: Serial No,Serial No Details,Serial Ingen Oplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Item Skat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Capital Udstyr
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelse Regel først valgt baseret på &quot;Apply On &#39;felt, som kan være Item, punkt Group eller Brand."
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,Goal
 DocType: Sales Invoice Item,Edit Description,Edit Beskrivelse
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,For Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,For Leverandøren
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Indstilling Kontotype hjælper med at vælge denne konto i transaktioner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Samlet Udgående
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,Kassekladde
 DocType: Workstation,Workstation Name,Workstation Navn
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} does not belong to Item {1},BOM {0} ikke hører 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
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhedsbreve til kontakter, fører."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operationer kan ikke være tomt.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operationer kan ikke være tomt.
 ,Delivered Items To Be Billed,Leverede varer at blive faktureret
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke ændres for Serial No.
 DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operation Beskrivelse
 DocType: Item,Will also apply to variants,Vil også gælde for varianter
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke ændre regnskabsår Start Dato og Skatteårsafslutning Dato når regnskabsår er gemt.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke ændre regnskabsår Start Dato og Skatteårsafslutning Dato når regnskabsår er gemt.
 DocType: Quotation,Shopping Cart,Indkøbskurv
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gennemsnitlig Daily Udgående
 DocType: Pricing Rule,Campaign,Kampagne
@@ -1100,7 +1106,8 @@
 DocType: Sales Order Item,Planned Quantity,Planlagt Mængde
 DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb
 DocType: Item,Maintain Stock,Vedligehold Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Nettoændring i anlægsaktiver
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,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 +182,Max: {0},Max: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
 DocType: Maintenance Visit,Unscheduled,Uplanlagt
 DocType: Employee,Owned,Ejet
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhænger Leave uden løn
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub forsamlinger
 DocType: Shipping Rule Condition,To Value,Til Value
 DocType: Supplier,Stock Manager,Stock manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Packing Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorleje
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse tilføjet endnu.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
 DocType: Item,Inventory,Inventory
 DocType: Features Setup,"To enable ""Point of Sale"" view",For at aktivere &quot;Point of Sale&quot; view
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
 DocType: Item,Sales Details,Salg Detaljer
 DocType: Opportunity,With Items,Med Varer
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antal
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,Parent Cost center
 DocType: Sales Invoice,Source,Kilde
 DocType: Leave Type,Is Leave Without Pay,Er Lad uden løn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ingen resultater i Payment tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Ingen resultater i Payment tabellen
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Regnskabsår Startdato
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packing Slip (r) annulleret
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Packing Slip (r) annulleret
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Pengestrømme fra investeringsaktivitet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
 DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr
 DocType: Item Group,Item Group Name,Item Group Name
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling
 DocType: Pricing Rule,For Price List,For prisliste
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Købskurs for vare: {0} ikke fundet, som er nødvendig for at booke regnskabsmæssig post (udgift). Nævne venligst vare pris mod en købskurs listen."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Købskurs for vare: {0} ikke fundet, som er nødvendig for at booke regnskabsmæssig post (udgift). Nævne venligst vare pris mod en købskurs listen."
 DocType: Maintenance Schedule,Schedules,Tidsplaner
 DocType: Purchase Invoice Item,Net Amount,Nettobeløb
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Yderligere Discount Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Fejl: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Fejl: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
 DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde&gt; Customer Group&gt; Territory
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,Salg Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Regnskab Punktet om {0} kan kun foretages i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prisfastsættelse Rule
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonti
 ,Bank Reconciliation Statement,Bank Saldoopgørelsen
@@ -1225,11 +1233,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Åbning Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} må kun optræde én gang
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Blade Tildelt Succesfuld for {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,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 +550,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,"Beløb, der ikke afspejles i bank"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav om selskabets regning.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,Materielle Anmodning om hvilke Leverandør Citater ikke er skabt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,At spore elementer ved hjælp af stregkode. Du vil være i stand til at indtaste poster i følgeseddel og salgsfaktura ved at scanne stregkoden på varen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Markér som Delivered
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Markér som Delivered
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make Citat
 DocType: Dependent Task,Dependent Task,Afhængig Opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være 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
 DocType: SMS Center,Receiver List,Modtager liste
 DocType: Payment Tool Detail,Payment Amount,Betaling Beløb
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Vis
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Netto Ændring i Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Mængde må ikke være mere end {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Alder (dage)
 DocType: Quotation Item,Quotation Item,Citat Vare
 DocType: Account,Account Name,Kontonavn
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverandør Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom skibsfart regler, prisliste mv"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Billed
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mine Issues
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,For Medarbejder
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,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/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Række {0}: Betaling beløb kan ikke være negativ
 DocType: Expense Claim,Total Amount Reimbursed,Samlede godtgjorte beløb
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
 DocType: Customer,Default Price List,Standard prisliste
 DocType: Payment Reconciliation,Payments,Betalinger
 DocType: Budget Detail,Budget Allocated,Budgettet
 DocType: Journal Entry,Entry Type,Posttype
 ,Customer Credit Balance,Customer Credit Balance
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Netto Ændring i Kreditor
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Skal du bekræfte din e-mail-id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kunden kræves for &#39;Customerwise Discount&#39;
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Opdater bank terminer med tidsskrifter.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Indkøbskurv
 DocType: Employee,Permanent Address,Permanent adresse
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Vare {0} skal være en service Item.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Forskud mod {0} {1} kan ikke være større \ end Grand alt {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vælg emne kode
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducer Fradrag for Leave uden løn (LWP)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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,Materiale Request bruges til at gøre dette Stock indtastning
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkelt enhed af et element.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Total Blade Allokeret
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Indtast venligst gyldigt Regnskabsår start- og slutdatoer
 DocType: Employee,Date Of Retirement,Dato for pensionering
 DocType: Upload Attendance,Get Template,Få skabelon
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vælg {0} først.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},tekst {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Vælg {0} først.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},tekst {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Ny kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Materiale Kvittering
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Type og parti er nødvendig for Tilgodehavende / Betales konto {0}
 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: Lead,Next Contact By,Næste Kontakt By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +213,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 +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} kan ikke slettes, da mængden findes for Item {1}"
 DocType: Quotation,Order Type,Bestil Type
 DocType: Purchase Invoice,Notification Email Address,Meddelelse E-mailadresse
@@ -1361,15 +1373,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alt for mange kolonner. Eksportere rapporten og udskrive det ved hjælp af en regnearksprogram.
 DocType: Sales Invoice Item,Batch No,Batch Nej
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillad flere salgsordrer mod Kundens Indkøbsordre
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
 DocType: Employee,Leave Encashed?,Efterlad indkasseres?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Make indkøbsordre
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Make indkøbsordre
 DocType: SMS Center,Send To,Send til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Der er ikke nok orlov balance for Leave Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Tildelte beløb
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse og reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig info og andre generelle oplysninger om din leverandør
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Løbenummer indtastet for Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Varen er ikke tilladt at have produktionsordre.
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Credit Beløb i Konto Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Logs til produktion.
 DocType: Item,Apply Warehouse-wise Reorder Level,Påfør Warehouse-wise Omarranger Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} skal indsendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} skal indsendes
 DocType: Authorization Control,Authorization Control,Authorization Kontrol
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Række # {0}: Afvist Warehouse er obligatorisk mod afvist element {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Log til opgaver.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Betaling
 DocType: Production Order Operation,Actual Time and Cost,Aktuel leveringstid og omkostninger
 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},Materiale Request af maksimum {0} kan gøres for Item {1} mod Sales Order {2}
 DocType: Employee,Salutation,Salutation
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
 DocType: SMS Center,Create Receiver List,Opret Modtager liste
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Udløbet
 DocType: Packing Slip,To Package No.,At pakke No.
 DocType: Warranty Claim,Issue Date,Udstedelsesdagen
 DocType: Activity Cost,Activity Cost,Aktivitet Omkostninger
@@ -1449,7 +1461,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Opnået
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Område / kunde
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,f.eks 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"I Ord vil være synlig, når du gemmer salgsfakturaen."
 DocType: Item,Is Sales Item,Er Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} oprettet
 DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
 ,Serial No Status,Løbenummer status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Item tabel kan ikke være tom
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Item tabel kan ikke være tom
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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}"
 DocType: Pricing Rule,Selling,Selling
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
 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 +170,Duties and Taxes,Told og afgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Indtast Referencedato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Indtast Referencedato
 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} betalingssystemer poster ikke kan filtreres af {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel til Vare, der vil blive vist i Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,Installation Time
 DocType: Sales Invoice,Accounting Details,Regnskab Detaljer
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Slette alle transaktioner for denne Company
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ikke afsluttet for {2} qty af færdigvarer i produktionsordre # {3}. Du opdatere driftsstatus via Time Logs
+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,Row # {0}: Operation {1} er ikke afsluttet for {2} qty af færdigvarer i produktionsordre # {3}. Du opdatere driftsstatus via Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringer
 DocType: Issue,Resolution Details,Opløsning Detaljer
 DocType: Quality Inspection Reading,Acceptance Criteria,Acceptkriterier
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,Klar Table
 DocType: Features Setup,Brands,Mærker
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nej
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Fra indkøbsordre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Fra indkøbsordre
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lad ikke kan anvendes / annulleres, før {0}, da orlov balance allerede har været carry-fremsendt i fremtiden orlov tildeling rekord {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Kunde Adresser og kontakter
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,Vedligeholdelsesplaner
 ,Quotation Trends,Citat Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Group ikke er nævnt i punkt master for element {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
 DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
 ,Pending Amount,Afventer Beløb
 DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree of finanial konti.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv
 DocType: HR Settings,HR Settings,HR-indstillinger
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
 DocType: Purchase Invoice,Additional Discount Amount,Yderligere Discount Beløb
 DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,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 +225,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Samlede faktiske
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Enhed
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Expense Krav
 DocType: Issue,Support,Support
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Se indkøbsvogn
 ,BOM Search,BOM Søg
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Lukning (Åbning + Totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Angiv venligst valuta i selskabet
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Clearance dato kan ikke være før check dato i række {0}
 DocType: Salary Slip,Deduction,Fradrag
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Vare Pris tilføjet for {0} i prisliste {1}
 DocType: Address Template,Address Template,Adresse Skabelon
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% Opgaver Afsluttet
 DocType: Project,Gross Margin,Gross Margin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Indtast venligst Produktion Vare først
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,handicappet bruger
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,handicappet bruger
 DocType: Opportunity,Quotation,Citat
 DocType: Salary Slip,Total Deduction,Samlet Fradrag
 DocType: Quotation,Maintenance User,Vedligeholdelse Bruger
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 / Lead Adresse
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL certifikat på vedhæftet fil {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL certifikat på vedhæftet fil {0}
 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ække
@@ -1588,12 +1602,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på Leads, Citater, Sales Order osv fra kampagner til at måle Return on Investment."
 DocType: Expense Claim,Approver,Godkender
 ,SO Qty,SO Antal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
 DocType: Appraisal,Calculate Total Score,Beregn Total Score
 DocType: Supplier Quotation,Manufacturing Manager,Produktion manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Forsendelser
+apps/erpnext/erpnext/hooks.py +69,Shipments,Forsendelser
 DocType: Purchase Order Item,To be delivered to customer,Der skal leveres til kunden
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log status skal indsendes.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Løbenummer {0} tilhører ikke nogen Warehouse
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Vælg Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lad stå tomt hvis det anses for alle afdelinger
 apps/erpnext/erpnext/config/hr.py +95,"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 +356,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
 DocType: Currency Exchange,From Currency,Fra Valuta
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Sales Order kræves for Item {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Sales Order kræves for Item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,"Beløb, der ikke afspejles i systemet"
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Andre
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,I Process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
 DocType: Purchase Order Item,Reference Document Type,Referencedokument type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} mod salgsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} mod salgsordre {1}
 DocType: Account,Fixed Asset,Fast Asset
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Føljeton Inventory
 DocType: Activity Type,Default Billing Rate,Standard Billing Rate
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order til Betaling
 DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs oprettet:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Vælg korrekt konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Vælg korrekt konto
 DocType: Item,Weight UOM,Vægt UOM
 DocType: Employee,Blood Group,Blood Group
 DocType: Purchase Invoice Item,Page Break,Side Break
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,Til Time
 DocType: Authorization Rule,Approving Role (above authorized value),Godkendelse (over autoriserede værdi) Rolle
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Hvis du vil tilføje barn noder, udforske træet og klik på noden, hvorunder du ønsker at tilføje flere noder."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
 DocType: Production Order Operation,Completed Qty,Afsluttet Antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Prisliste {0} er deaktiveret
 DocType: Manufacturing Settings,Allow Overtime,Tillad Overarbejde
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serienumre, der kræves for Item {1}. Du har givet {2}."
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,Kunde Item Koder
 DocType: Opportunity,Lost Reason,Tabt Årsag
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Opret Betaling Entries mod ordrer eller fakturaer.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Ny adresse
 DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle elementer er allerede blevet faktureret
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,All items have already been invoiced,Alle elementer 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/accounts/page/accounts_browser/accounts_browser.js +304,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
 DocType: Project,External,Ekstern
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,Omdøb Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Opdatering Omkostninger
 DocType: Item Reorder,Item Reorder,Item Genbestil
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transfer Materiale
 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."
 DocType: Purchase Invoice,Price List Currency,Pris List Valuta
 DocType: Naming Series,User must always select,Brugeren skal altid vælge
 DocType: Stock Settings,Allow Negative Stock,Tillad Negativ Stock
 DocType: Installation Note,Installation Note,Installation Bemærk
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Tilføj Skatter
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Pengestrømme fra finansieringsaktivitet
 ,Financial Analytics,Finansielle Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Datterselskab
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,Opret lønseddel
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Forventet balance pr bank
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Finansieringskilde (Passiver)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
 DocType: Appraisal,Employee,Medarbejder
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email Fra
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Inviter som Bruger
 DocType: Features Setup,After Sale Installations,Efter salg Installationer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} er fuldt faktureret
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} er fuldt faktureret
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktvilkår for Salg eller Indkøb.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppe af Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig On
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Rename Tool,File to Rename,Fil til Omdøb
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Vis Betalinger
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,Sales Order Påkrævet
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Opret kunde
 DocType: Purchase Invoice,Credit To,Credit Til
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktive Prøveledninger / Kunder
 DocType: Employee Education,Post Graduate,Post Graduate
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Vedligeholdelse Skema Detail
 DocType: Quality Inspection Reading,Reading 9,Reading 9
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,Rejst af
 DocType: Payment Tool,Payment Account,Betaling konto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Angiv venligst Company for at fortsætte
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Nettoændring i Debitor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
 DocType: Quality Inspection Reading,Accepted,Accepteret
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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."
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,Samlet Betaling Beløb
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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,Forsendelse Rule Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
 DocType: Newsletter,Test,Prøve
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Da der er eksisterende lagertransaktioner til denne vare, \ du ikke kan ændre værdierne af &quot;Har Serial Nej &#39;,&#39; Har Batch Nej &#39;,&#39; Er Stock Item&quot; og &quot;værdiansættelsesmetode &#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Hurtig Kassekladde
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hurtig Kassekladde
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
 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 +157,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 +211,{0} {1} is not submitted,{0} {1} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} er ikke indsendt
 apps/erpnext/erpnext/config/stock.py +18,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."
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,Autoriseret Værdi
 DocType: Contact,Enter department to which this Contact belongs,"Indtast afdeling, som denne Kontakt hører"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Måleenhed
 DocType: Fiscal Year,Year End Date,År Slutdato
 DocType: Task Depends On,Task Depends On,Task Afhænger On
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
 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/sælger/affiliate/butik der, der sælger selskabernes varer/tjenesteydelser mod provision."
 DocType: Customer Group,Has Child Node,Har Child Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Indtast statiske url parametre her (F.eks. Afsender = ERPNext, brugernavn = ERPNext, password = 1234 mm)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noget aktiv regnskabsår. For flere detaljer tjek {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
@@ -1874,7 +1892,7 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standard skat skabelon, der kan anvendes på alle købstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre bekostning hoveder som &quot;Shipping&quot;, &quot;forsikring&quot;, &quot;Håndtering&quot; 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å &quot;Forrige Row alt&quot; 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: Purchase Receipt Item,Recd Quantity,RECD Mængde
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
 DocType: Tax Rule,Billing City,Fakturering By
 DocType: Global Defaults,Hide Currency Symbol,Skjul Valuta Symbol
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Udgifter
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
 DocType: Buying Settings,Default Buying Price List,Standard Opkøb prisliste
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Ingen medarbejder for de ovenfor udvalgte kriterier eller lønseddel allerede skabt
 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.","Indstil standardværdier som Company, Valuta, indeværende finansår, etc."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betaling Type
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of Materials Based On&quot; i Costing afsnit
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
 DocType: Item Reorder,Material Request Type,Materiale Request Type
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Række {0}: UOM Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Række {0}: UOM Konvertering Factor er obligatorisk
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Cost center
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Stock Indstillinger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrer Customer Group Tree.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Ny Cost center navn
 DocType: Leave Control Panel,Leave Control Panel,Lad Kontrolpanel
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Udlån (aktiver)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Large
@@ -2003,7 +2022,7 @@
 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.
 DocType: Production Order Operation,Make Time Log,Make Time Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Venligst sæt genbestille mængde
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Venligst sæt genbestille mængde
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Opret Kunden fra Lead {0}
 DocType: Price List,Applicable for Countries,Gældende for lande
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Ingen Bemærkninger
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Ingen Bemærkninger
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfaldne
 DocType: Account,Stock Received But Not Billed,Stock Modtaget men ikke faktureret
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root Der skal være en gruppe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root Der skal være en gruppe
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + bagud Beløb + Indløsning Beløb - Total Fradrag
 DocType: Monthly Distribution,Distribution Name,Distribution Name
 DocType: Features Setup,Sales and Purchase,Salg og Indkøb
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,Party Balance
 DocType: Sales Invoice Item,Time Log Batch,Time Log Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Vælg Anvend Rabat på
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Lønseddel Oprettet
 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: Stock Entry,Material Transfer for Manufacture,Materiale Transfer til Fremstilling
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,Halvårligt
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Regnskabsår {0} ikke fundet.
 DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Regnskab Punktet om Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Regnskab Punktet om Stock
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Element {0} eksisterer ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Element {0} eksisterer ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
 DocType: Account,Root Type,Root Type
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Vis denne slideshow øverst på siden
 DocType: BOM,Item UOM,Item UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Kan kun gøre betaling mod faktureret {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Kan kun gøre betaling mod faktureret {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventory Level
 DocType: Stock Entry,Subcontract,Underleverance
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspektion indkommende kvalitet.
 DocType: Purchase Order Item,Returned Qty,Returneret Antal
 DocType: Employee,Exit,Udgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Typen er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root Typen er obligatorisk
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Løbenummer {0} oprettet
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For nemheds af kunder, kan disse koder bruges i trykte formater som fakturaer og følgesedler"
 DocType: Employee,You can enter any date manually,Du kan indtaste et hvilket som helst tidspunkt manuelt
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
 DocType: Expense Claim,Expense Approver,Expense Godkender
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +110,Row {0}: Advance against Customer must be credit,Række {0}: Advance mod Kunden skal være kredit
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betale
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Betale
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til datotid
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
 DocType: Attendance,Attendance Date,Fremmøde Dato
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Løn breakup baseret på Optjening og fradrag.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
 DocType: Address,Preferred Shipping Address,Foretrukne Forsendelsesadresse
 DocType: Purchase Receipt Item,Accepted Warehouse,Accepteret varelager
 DocType: Bank Reconciliation Detail,Posting Date,Udstationering Dato
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
 DocType: Pricing Rule,Discount Percentage,Discount Procent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
-apps/erpnext/erpnext/hooks.py +54,Orders,Ordrer
+apps/erpnext/erpnext/hooks.py +55,Orders,Ordrer
 DocType: Leave Control Panel,Employee Type,Medarbejder Type
 DocType: Employee Leave Approver,Leave Approver,Lad Godkender
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiale Overført til Fremstilling
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periode Lukning indtastning
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afskrivninger
+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: Customer,Credit Limit,Kreditgrænse
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vælg type transaktion
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,Anmodet om
 DocType: Quotation Item,Against Doctype,Mod DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette Delivery Note mod enhver Project
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-konto kan ikke slettes
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Netto kontant fra Investering
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root-konto kan ikke slettes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Stock Entries
 ,Is Primary Address,Er primære adresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Henvisning # {0} dateret {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Henvisning # {0} dateret {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrer Adresser
 DocType: Pricing Rule,Item Code,Item Code
 DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,Bruger Bemærkning
 DocType: Lead,Market Segment,Market Segment
 DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Lukning (dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Lukning (dr)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Løbenummer {0} ikke er på lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,Faktureret beløb
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hent opdateringer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Tilføj et par prøve optegnelser
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lad Management
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppe af konto
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontoen hoved under ansvar, hvor gevinst / tab vil være reserveret"
 DocType: Payment Tool,Against Vouchers,Mod Vouchers
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hurtig hjælp
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Salg Extras
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget for konto {1} mod udgiftsområde {2} vil blive overskredet med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
 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'
 ,Stock Projected Qty,Stock Forventet Antal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
 DocType: Sales Order,Customer's Purchase Order,Kundens Indkøbsordre
 DocType: Warranty Claim,From Company,Fra Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Værdi eller Antal
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Lad Block List tilladt
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Du vil bruge det til login
 DocType: Sales Partner,Retailer,Forhandler
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit til konto skal være en balance konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Alle Leverandør Typer
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
+apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
 DocType: Sales Order,%  Delivered,% Leveres
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagemateriale vægt. (Til print)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
 DocType: Serial No,Is Cancelled,Er Annulleret
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mine forsendelser
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Mine forsendelser
 DocType: Journal Entry,Bill Date,Bill Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv hvis der er flere Priser Regler med højeste prioritet, derefter følgende interne prioriteringer anvendt:"
 DocType: Supplier,Supplier Details,Leverandør Detaljer
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Opkald
 DocType: Project,Total Costing Amount (via Time Logs),Total Costing Beløb (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Projiceret
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Løbenummer {0} ikke hører til Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
 DocType: Notification Control,Quotation Message,Citat Message
 DocType: Issue,Opening Date,Åbning Dato
 DocType: Journal Entry,Remark,Bemærkning
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,Batched for fakturering
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger rejst af leverandører.
 DocType: POS Profile,Write Off Account,Skriv Off konto
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabat Beløb
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
 DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Netto kontant fra Operations
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,fx moms
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
 DocType: Journal Entry Account,Journal Entry Account,Kassekladde konto
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Dato for pensionering skal være større end Dato for Sammenføjning
 DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Delivered
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Territory Mål
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2421,10 +2443,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dette er en rod salg person og kan ikke redigeres.
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Pris: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Pris: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Lønseddel Fradrag
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Vælg en gruppe node først.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Formålet skal være en af {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Formålet skal være en af {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Udfyld formularen og gemme det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download en rapport med alle råvarer med deres seneste opgørelse status
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fællesskab Forum
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,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 Grand Total
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 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} er ikke en gyldig Batchnummer for Item {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Bemærk: Hvis betaling ikke sker mod nogen reference, gør Kassekladde manuelt."
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Række {0}: Antal ikke avalable i lageret {1} på {2} {3}. Tilgængelig Antal: {4}, Transfer Antal: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
 DocType: Purchase Order,Customer Contact Email,Kundeservice Kontakt E-mail
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Skabelon
 DocType: Sales Person,Sales Person Name,Salg Person Name
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
 apps/erpnext/erpnext/support/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 +374,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
+apps/erpnext/erpnext/stock/doctype/item/item.py +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
 DocType: Sales Order,Partly Billed,Delvist Billed
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Enestående Amt
 DocType: Time Log Batch,Total Hours,Total Hours
 DocType: Journal Entry,Printing Settings,Udskrivning Indstillinger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
 DocType: Time Log,From Time,Fra Time
 DocType: Notification Control,Custom Message,Tilpasset Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
 DocType: Purchase Invoice Item,Rate,Rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriterier, skal du løse \ konflikten ved at tildele prioritet. Pris Regler: {0}"
 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 +580,Issue Material,Issue Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Issue Materiale
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Offer Dato
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citater
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,Løbenummer
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Indtast venligst Maintaince Detaljer først
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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,Produkt Bundle Item
 DocType: Sales Partner,Sales Partner Name,Salg Partner Navn
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimal Faktura Beløb
 DocType: Purchase Invoice Item,Image View,Billede View
 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 +553,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 Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dette element er en Variant af {0} (skabelon). Attributter vil blive kopieret over fra skabelonen, medmindre &#39;Ingen Copy &quot;er indstillet"
 DocType: Account,Purchase User,Køb Bruger
 DocType: Notification Control,Customize the Notification,Tilpas Underretning
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Pengestrøm fra driften
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
 DocType: Sales Invoice,Shipping Rule,Forsendelse Rule
 DocType: Journal Entry,Print Heading,Print Overskrift
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Raw Material
 DocType: Leave Application,Follow via Email,Følg via e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Vælg Bogføringsdato først
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriel Nos Nødvendig for Serialized Item {0}
 DocType: Journal Entry,Bank Entry,Bank indtastning
 DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Tilføj til indkøbsvogn
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppér efter
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivere / deaktivere valutaer.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postale Udgifter
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Den dato, hvor tilbagevendende ordre vil blive stoppe"
 DocType: Quality Inspection,Item Serial No,Vare Løbenummer
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Samlet Present
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Time
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
 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,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Opret Citat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Du er ikke autoriseret til at godkende blade på Block Datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Forsendelse Regel Betingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
 DocType: Features Setup,Point of Sale,Point of Sale
 DocType: Account,Tax,Skat
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Række {0}: {1} er ikke en gyldig {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Fra produktpakke
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Fra produktpakke
 DocType: Production Planning Tool,Production Planning Tool,Produktionsplanlægning Tool
 DocType: Quality Inspection,Report Date,Report Date
 DocType: C-Form,Invoices,Fakturaer
 DocType: Job Opening,Job Title,Jobtitel
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Modtagere
 DocType: Features Setup,Item Groups in Details,Varegrupper i Detaljer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Mængde til Fremstilling skal være større end 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -2618,8 +2644,9 @@
 DocType: Stock Entry,Update Rate and Availability,Opdatering Vurder 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: Pricing Rule,Customer Group,Customer Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
 DocType: Item,Website Description,Website Beskrivelse
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Nettoændring i Equity
 DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
 ,Sales Register,Salg Register
 DocType: Quotation,Quotation Lost Reason,Citat Lost Årsag
@@ -2627,12 +2654,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resumé for denne måned og verserende aktiviteter
 DocType: Customer Group,Customer Group Name,Customer Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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 Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
 DocType: GL Entry,Against Voucher Type,Mod Voucher Type
 DocType: Item,Attributes,Attributter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Få Varer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Indtast venligst Skriv Off konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Få Varer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Indtast venligst Skriv Off konto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sidste Ordredato
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Make Excise Faktura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
 DocType: Project,Expected End Date,Forventet Slutdato
 DocType: Appraisal Template,Appraisal Template Title,Vurdering Template Titel
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Kommerciel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Kommerciel
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} må ikke være en lagervare
 DocType: Cost Center,Distribution Id,Distribution Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Værdi for Egenskab {0} skal være inden for området af {1} til {2} i intervaller på {3}
 DocType: Tax Rule,Sales,Salg
 DocType: Stock Entry Detail,Basic Amount,Grundbeløb
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
 DocType: Leave Allocation,Unused leaves,Ubrugte blade
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard kan modtages Konti
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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 Series
+DocType: Payment Reconciliation,To Invoice Date,Til faktura dato
 DocType: Supplier,Contact HTML,Kontakt HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Køb Kvitteringer
-DocType: Payment Reconciliation,Maximum Amount,Maksimumbeløb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan Prisfastsættelse Regel anvendes?
 DocType: Quality Inspection,Delivery Note No,Levering Note Nej
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} eksisterer ikke
 DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produkt Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Række {0}: Ugyldig henvisning {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Række {0}: Ugyldig henvisning {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
 DocType: Upload Attendance,Download Template,Hent skabelon
 DocType: GL Entry,Remarks,Bemærkninger
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,Månedlig Deltagelse Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post fundet
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Få elementer fra Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Få elementer fra Product Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} er inaktiv
 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 Fra Dato og fremmøde til dato er obligatorisk
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Resultatopgørelsen' konto {0} ikke tilladt i 'Åbning balance'
 DocType: Features Setup,Sales Discounts,Salg Rabatter
 DocType: Hub Settings,Seller Country,Sælger Land
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publicer Punkter på hjemmesiden
 DocType: Authorization Rule,Authorization Rule,Autorisation Rule
 DocType: Sales Invoice,Terms and Conditions Details,Betingelser Detaljer
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Specifikationer
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salg Skatter og Afgifter Skabelon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antal Order
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,Fakturering Beløb
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig mængde angivet for element {0}. Mængde bør være større end 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ansøgning om orlov.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridiske Udgifter
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto ordre vil blive genereret f.eks 05, 28 osv"
 DocType: Sales Invoice,Posting Time,Udstationering Time
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,Sammenbrud
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Check Dato
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på dato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert Prisliste sats, hvis der mangler"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Samlet indbetalte beløb
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløb (via Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Vi sælger denne Vare
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverandør id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Mængde bør være større end 0
 DocType: Journal Entry,Cash Entry,Cash indtastning
 DocType: Sales Partner,Contact Desc,Kontakt Desc
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Type blade som afslappet, syge etc."
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tilføj rækker til at fastsætte årlige budgetter på Konti.
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
 DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Firma Forkortelse
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Skat Skabelon er obligatorisk.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Midlertidig
 DocType: Address,Preferred Billing Address,Foretrukne Faktureringsadresse
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,Item-wise Prisliste Rate
 DocType: Purchase Order Item,Supplier Quotation,Leverandør Citat
 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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} er stoppet
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
 DocType: Lead,Add to calendar on this date,Føj til kalender på denne dato
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende begivenheder
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordrer frigives til produktion.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vælg regnskabsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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 +455,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
 DocType: Hub Settings,Name Token,Navn Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard Selling
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Selling,Standard Selling
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
 DocType: Serial No,Out of Warranty,Ud af garanti
 DocType: BOM Replace Tool,Replace,Udskifte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
 DocType: Purchase Invoice Item,Project Name,Projektnavn
 DocType: Supplier,Mention if non-standard receivable account,"Nævne, hvis ikke-standard tilgodehavende konto"
 DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
 DocType: Features Setup,Item Batch Nos,Item Batch nr
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Menneskelige Ressourcer
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Skatteaktiver
 DocType: BOM Item,BOM No,BOM Ingen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Glidende gennemsnit
 DocType: BOM Replace Tool,The BOM which will be replaced,Den BOM som vil blive erstattet
 DocType: Account,Debit,Betalingskort
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,Yderligere omkostninger
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Regnskabsår Slutdato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere baseret på blad nr, hvis grupperet efter Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Foretag Leverandør Citat
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Foretag Leverandør Citat
 DocType: Quality Inspection,Incoming,Indgående
 DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reducer Optjening for Leave uden løn (LWP)
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Række # {0}: Løbenummer {1} matcher ikke med {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Batch-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Bemærk: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Bemærk: {0}
 ,Delivery Note Trends,Følgeseddel Tendenser
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Denne uges Summary
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} skal være en Købt eller underentreprise element i række {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gns. Køb Rate
 DocType: Task,Actual Time (in Hours),Faktiske tid (i timer)
 DocType: Employee,History In Company,Historie I Company
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Samlede Udstedelse / Transfer mængde på {0} i Material Request {1} kan ikke være større end anmodet mængde {2} til konto {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Nyhedsbreve
 DocType: Address,Shipping,Forsendelse
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger indtastning
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,Slutdato for aktuelle ordres periode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Kom med et tilbud Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retur
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Standard måleenhed for Variant skal være samme som skabelon
 DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
 DocType: Pricing Rule,Disable,Deaktiver
 DocType: Project Task,Pending Review,Afventer anmeldelse
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunde-id
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Til Time skal være større end From Time
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Forældre-konto {1} ikke Bolong til virksomheden {2}
 DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
 DocType: Account,Asset,Asset
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Angivelse af denne adresse skabelon som standard, da der ikke er nogen anden standard"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,Filter baseret på kundernes
 DocType: Payment Tool Detail,Against Voucher No,Mod blad nr
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,Næste Kontakt
 DocType: Employee,Employment Type,Beskæftigelse type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlægsaktiver
+,Cash Flow,Penge strøm
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Ansøgningsperiode kan ikke være på tværs af to alocation optegnelser
 DocType: Item Group,Default Expense Account,Standard udgiftskonto
 DocType: Employee,Notice (days),Varsel (dage)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,Pakhuse
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print og Stationær
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppe Node
-DocType: Payment Reconciliation,Minimum Amount,Minimumsbeløb
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Opdater færdigvarer
 DocType: Workstation,per hour,per time
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
 DocType: Company,Distribution,Distribution
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløb betalt
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Beløb betalt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Virksomheden mangler i pakhuse {0}
 DocType: POS Profile,Terms and Conditions,Betingelser
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
 DocType: Leave Block List,Applies to Company,Gælder for Company
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke annullere fordi indsendt Stock indtastning {0} eksisterer
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Indtast venligst Køb Kvitteringer
 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 +425,Transaction not allowed against stopped Production Order {0},Transaktion ikke tilladt mod stoppet produktionsordre {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Opsætning indgående server til support email id. (F.eks support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
 DocType: Salary Slip,Salary Slip,Lønseddel
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;Til dato&#39; er nødvendig
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generer pakkesedler for pakker, der skal leveres. Bruges til at anmelde pakke nummer, pakkens indhold og dens vægt."
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Medarbejder Records.
 DocType: HR Settings,Payroll Settings,Payroll Indstillinger
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match ikke-forbundne fakturaer og betalinger.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Angiv bestilling
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Angiv bestilling
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan ikke have en forælder cost center
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Vælg mærke ...
 DocType: Sales Invoice,C-Form Applicable,C-anvendelig
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,Startdato
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Afsætte blade i en periode.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik her for at verificere
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
 DocType: Purchase Invoice Item,Price List Rate,Prisliste Rate
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Vis &quot;På lager&quot; eller &quot;Ikke på lager&quot; baseret på lager til rådighed i dette lager.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,Forventet startdato
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Fjern element, hvis afgifter ikke finder anvendelse på denne post"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,F.eks. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Modtag
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Modtag
 DocType: Maintenance Visit,Fully Completed,Fuldt Afsluttet
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Pædagogisk Kvalifikation
 DocType: Workstation,Operating Costs,Drifts- omkostninger
 DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} er blevet føjet til vores nyhedsliste.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære så tabt, fordi Citat er blevet gjort."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Vigtigste Reports
 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
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,Industri Type
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Noget gik galt!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Afslutning Dato
 DocType: Purchase Invoice Item,Amount (Company Currency),Beløb (Company Valuta)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisation enhed (departement) herre.
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
 DocType: Item,Unit of Measure Conversion,Måleenhed Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Medarbejder kan ikke ændres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
 DocType: Naming Series,Help HTML,Hjælp HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Navn på den person eller organisation, der denne adresse tilhører."
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Dine Leverandører
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,Udstedelsesdato
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Række # {0}: Indstil Leverandør for vare {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Kontroller venligst Multi Valuta indstilling for at tillade konti med anden valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Kontroller venligst Multi Valuta indstilling for at tillade konti med anden valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få ikke-afstemte Entries
+DocType: Payment Reconciliation,From Invoice Date,Fra fakturadato
 DocType: Cost Center,Budgets,Budgetter
-DocType: Employee,Emergency Contact Details,Emergency Kontaktoplysning
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Hvad gør det?
 DocType: Delivery Note,To Warehouse,Til Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} er indtastet mere end en gang for regnskabsåret {1}
 ,Average Commission Rate,Gennemsnitlig Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
 DocType: Purchase Taxes and Charges,Account Head,Konto hoved
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Opdater yderligere omkostninger til at beregne landede udgifter til poster
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi Difference (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Række {0}: Valutakursen er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Række {0}: Valutakursen er obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruger-id ikke indstillet til Medarbejder {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garanti krav
 DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
 DocType: Item,Customer Code,Customer Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder for {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dage siden sidste ordre
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Betalingskort Til konto skal være en balance konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,Debit To account must be a Balance Sheet account,Betalingskort Til konto skal være en balance konto
 DocType: Buying Settings,Naming Series,Navngivning Series
 DocType: Leave Block List,Leave Block List Name,Lad Block List Name
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
@@ -3271,7 +3301,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lukning konto {0} skal være af typen Ansvar / Equity
 DocType: Authorization Rule,Based On,Baseret på
 DocType: Sales Order Item,Ordered Qty,Bestilt Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Konto {0} er deaktiveret
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Konto {0} er deaktiveret
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periode fra og periode datoer obligatorisk for tilbagevendende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivitet / opgave.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Opkø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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Indstil {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Gentag på Dag Måned
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,Upload Fremmøde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Beløb
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Beløb
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
 ,Sales Analytics,Salg Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Manufacturing Indstillinger
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Opsætning af E-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Indtast standard valuta i Company Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Indtast standard valuta i Company Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock indtastning Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Daglige Påmindelser
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Skatteregel Konflikter med {0}
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,Produceret Mængde
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søg Sub Assemblies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Faktiske
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
 DocType: Purchase Invoice,Against Expense Account,Mod udgiftskonto
 DocType: Production Order,Production Order,Produktionsordre
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
 DocType: Quotation Item,Against Docname,Mod Docname
 DocType: SMS Center,All Employee (Active),Alle Medarbejder (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Se nu
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,Gældende Holiday List
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Opdateret
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapporttype er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Rapporttype er obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Vare {0} i række {1}
 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/public/js/setup_wizard.js +101,The First User: You,Den første bruger: Du
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Succesfuld Afstemt
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Succesfuld Afstemt
 DocType: Production Order,Planned End Date,Planlagt Slutdato
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Hvor emner er gemt.
 DocType: Tax Rule,Validity,Gyldighed
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,Fremmøde
 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, vil listen skal lægges til hver afdeling, hvor det skal anvendes."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Skat skabelon til at købe transaktioner.
 ,Item Prices,Item Priser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"I Ord vil være synlig, når du gemmer indkøbsordre."
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,Anmeldelse Dato
 DocType: Purchase Invoice,Advance Payments,Forudbetalinger
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rækken {0} skal være samme som produktionsordre
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Afrunde konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Rådgivning
 DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ændring
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Ændring
 DocType: Purchase Invoice,Contact Email,Kontakt E-mail
 DocType: Appraisal Goal,Score Earned,Score tjent
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",fx &quot;My Company LLC&quot;
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
 DocType: Email Digest,Receivables / Payables,Tilgodehavender / Gæld
 DocType: Delivery Note Item,Against Sales Invoice,Mod Salg Faktura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Credit konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Credit konto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nul værdier
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mængde post opnået efter fremstilling / ompakning fra givne mængde råvarer
 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 +562,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 DocType: Task,Actual End Date (via Time Logs),Faktiske Slutdato (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tid logs uden Workstation arbejdstid.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} er allerede indsendt
 ,Items To Be Requested,Varer skal ansøges
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Få Sidste Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Fakturering Pris baseret på Activity type (i timen)
 DocType: Company,Company Info,Firma Info
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Firma Email ID ikke fundet, dermed mail ikke sendt"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
 DocType: Production Planning Tool,Filter based on item,Filter baseret på emne
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Debet konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debet konto
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Medarbejder Navn
 DocType: Sales Invoice,Rounded Total (Company Currency),Afrundet alt (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
 DocType: Purchase Common,Purchase Common,Indkøb Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at Udfyld Programmer på følgende dage.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fra Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
 DocType: Sales Invoice,Is POS,Er POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
 DocType: Production Order,Manufactured Qty,Fremstillet Antal
 DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger rejst til kunder.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tilføjet
 DocType: Maintenance Schedule,Schedule,Køreplan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definer budget for denne Cost Center. For at indstille budgettet handling, se &quot;Company List&quot;"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke fundet eller handicappede
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Prisliste ikke fundet eller handicappede
 DocType: Expense Claim,Approved,Godkendt
 DocType: Pricing Rule,Price,Pris
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskab journaloptegnelser.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgængelige Antal ved fra vores varelager
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Vælg Medarbejder Record først.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Række {0}: Party / Konto matcher ikke med {1} / {2} i {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Række {0}: Party / Konto matcher ikke med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Sådan opretter du en Tax-konto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Indtast venligst udgiftskonto
 DocType: Account,Stock,Lager
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,Kontrakt Slutdato
 DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Fra Leverandør Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Fra Leverandør Citat
 DocType: Deduction Type,Deduction Type,Fradrag Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Antal
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,Transaktion Dato
 DocType: Production Plan Item,Planned Qty,Planned Antal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,I alt Skat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net alt (Company Valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,Kommissionens Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Er tom Indkøbskurv
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Er tom Indkøbskurv
 DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root kan ikke redigeres.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root kan ikke redigeres.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Tildelte beløb kan ikke er større end unadusted beløb
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillad Produktion på helligdage
 DocType: Sales Order,Customer's Purchase Order Date,Kundens Indkøbsordre Dato
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vilkår og betingelser Skabelon
 DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk oprette Materiale Request hvis mængde falder under dette niveau
 ,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
 DocType: Batch,Expiry Date,Udløbsdato
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","For at indstille genbestille niveau, skal post være et køb Item eller Manufacturing Vare"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","For at indstille genbestille niveau, skal post være et køb Item eller Manufacturing Vare"
 ,Supplier Addresses and Contacts,Leverandør Adresser og kontaktpersoner
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vælg Kategori først
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt mester.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Halv dag)
 DocType: Supplier,Credit Days,Credit Dage
 DocType: Leave Type,Is Carry Forward,Er Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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,Lead Time dage
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,Årsag til Leaving
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktioneret Beløb
 DocType: GL Entry,Is Opening,Er Åbning
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konto {0} findes ikke
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Konto {0} findes ikke
 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 c403e8a..3f64314 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Verbrauchsgüter
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Bitte zuerst Gruppentyp auswählen
 DocType: Item,Customer Items,Kunden-Artikel
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Übergeordnetes Konto {1} kann kein Kontenblatt sein
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Übergeordnetes Konto {1} kann kein Kontenblatt sein
 DocType: Item,Publish Item to hub.erpnext.com,Artikel über hub.erpnext.com veröffentlichen
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-Mail-Benachrichtigungen
 DocType: Item,Default Unit of Measure,Standardmaßeinheit
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Währung für Preisliste {0} erforderlich
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Wird in der Transaktion berechnet.
 DocType: Purchase Order,Customer Contact,Kundenkontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Von Materialanfrage
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Von Materialanfrage
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Baumstruktur
 DocType: Job Applicant,Job Applicant,Bewerber
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Keine weiteren Ergebnisse.
@@ -52,9 +52,9 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"Diese Option wird verwendet, um die kundenspezifische Artikelnummer zu erhalten und den Artikel aufgrund der Artikelnummer auffindbar zu machen"
 DocType: Mode of Payment Account,Mode of Payment Account,Art des Zahlungskontos
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Varianten anzeigen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Menge
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Menge
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Darlehen/Kredite (Verbindlichkeiten)
-DocType: Employee Education,Year of Passing,Jahr des Abgangs
+DocType: Employee Education,Year of Passing,Abschlussjahr
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Auf Lager
 DocType: Designation,Designation,Bezeichnung
 DocType: Production Plan Item,Production Plan Item,Artikel auf dem Produktionsplan
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Gesundheitswesen
 DocType: Purchase Invoice,Monthly,Monatlich
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Zahlungsverzug (Tage)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Rechnung
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Rechnung
 DocType: Maintenance Schedule Item,Periodicity,Periodizität
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-Mail-Addresse
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Fiscal Year {0} ist erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Verteidigung
 DocType: Company,Abbr,Kürzel
 DocType: Appraisal Goal,Score (0-5),Punktzahl (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Zeile {0}: {1} {2} stimmt nicht mit {3} überein
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Zeile {0}: {1} {2} stimmt nicht mit {3} überein
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Zeile # {0}:
 DocType: Delivery Note,Vehicle No,Fahrzeug-Nr.
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Bitte eine Preisliste auswählen
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Bitte eine Preisliste auswählen
 DocType: Production Order Operation,Work In Progress,Laufende Arbeit/-en
 DocType: Employee,Holiday List,Urlaubsübersicht
 DocType: Time Log,Time Log,Zeitprotokoll
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Gleiche Firma wurde mehr als einmal eingegeben
 DocType: Employee,Married,Verheiratet
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nicht zulässig für {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
 DocType: Payment Reconciliation,Reconcile,Abgleichen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Lebensmittelgeschäft
 DocType: Quality Inspection Reading,Reading 1,Ablesewert 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Bankbuchung erstellen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionsfonds
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Angabe des Lagers ist zwingend erforderlich, wenn der Kontotyp ""Lager"" ist"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,"Angabe des Lagers ist zwingend erforderlich, wenn der Kontotyp ""Lager"" ist"
 DocType: SMS Center,All Sales Person,Alle Vertriebsmitarbeiter
 DocType: Lead,Person Name,Name der Person
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Aktivieren, wenn es sich um eine wiederkehrende Bestellung handelt. Deaktivieren um die Wiederholungen anzuhalten oder ein entsprechendes Ende-Datum angeben"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Interessiert
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Stückliste
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Eröffnung
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Von {0} bis {1}
+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
 DocType: Stock Entry,Additional Costs,Zusätzliche Kosten
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Ein Konto mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,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
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Bitte zuerst die Firma angeben
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,Ziel auf
+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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitätsprotokoll:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Artikel {0} ist nicht im System vorhanden oder abgelaufen
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Artikel {0} muss ein Kaufartikel sein
 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 +444,Item {0} is not active or end of life has been reached,Artikel {0} ist nicht aktiv oder hat das Ende der Lebensdauer erreicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,"Wird aktualisiert, wenn die Ausgangsrechnung übertragen wurde."
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Einstellungen für das Personal-Modul
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Details der durchgeführten Arbeitsgänge
 DocType: Serial No,Maintenance Status,Wartungsstatus
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Artikel und Preise
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,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}"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,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: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Mitarbeiter auswählen, für den die Bewertung erstellt werden soll."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Kostenstelle {0} gehört nicht zu Firma {1}
 DocType: Customer,Individual,Einzelperson
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Nettocashflow aus Finanzierung
 DocType: Lead,Address & Contact,Adresse & Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Ungenutzten Urlaub von vorherigen Zuteilungen hinzufügen
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Nächste Wiederholung {0} wird erstellt am {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Ansprechpartner
 DocType: Production Plan Item,SO Pending Qty,Ausstehende Menge des Kundenauftrags
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Erstellt eine Gehaltsabrechnung gemäß der oben getroffenen Auswahl.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Keine Beschreibung angegeben
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Lieferantenanfrage
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Freitstellungsdatum muss nach dem Eintrittsdatum liegen
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Artikel-Webseitenspezifikation
 DocType: Payment Tool,Reference No,Referenznr.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Urlaub gesperrt
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Jährlich
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bestandsabgleich-Artikel
 DocType: Stock Entry,Sales Invoice No,Ausgangsrechnungs-Nr.
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Lieferantentyp
 DocType: Item,Publish in Hub,Im Hub veröffentlichen
 ,Terretory,Region
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Artikel {0} wird storniert
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Artikel {0} wird storniert
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Artikel {0} in Tabelle ""Rohmaterialien geliefert"" des Lieferantenauftrags {1} nicht gefunden"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Beziehung
 DocType: Shipping Rule,Worldwide Shipping,Weltweiter Versand
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bestätigte Aufträge von Kunden
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Vorschläge
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Artikelgruppenbezogene Budgets für diese Region erstellen. Durch Setzen der Auslieferungseinstellungen können auch saisonale Aspekte mit einbezogen werden.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Bitte die übergeordnete Kontengruppe für das Lager {0} eingeben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Zahlung zu {0} {1} kann nicht größer als ausstehender Betrag {2} sein
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Zahlung zu {0} {1} kann nicht größer als ausstehender Betrag {2} sein
 DocType: Supplier,Address HTML,Adresse im HTML-Format
 DocType: Lead,Mobile No.,Mobilfunknr.
 DocType: Maintenance Schedule,Generate Schedule,Zeitplan generieren
@@ -269,7 +271,8 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Neueste(r/s)
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 Zeichen
 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
-apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitätskosten je Beschäftigten
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Lernen
+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
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Baumstruktur der Vertriebsmitarbeiter verwalten
 DocType: Item,Synced With Hub,Synchronisiert mit Hub
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Unterschiedliche Währungen
 DocType: Payment Reconciliation Invoice,Invoice Type,Rechnungstyp
 DocType: Sales Invoice Item,Delivery Note,Lieferschein
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Steuern einrichten
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Steuern einrichten
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Zusammenfassung für diese Woche und anstehende Aktivitäten
 DocType: Workstation,Rent Cost,Mietkosten
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Bitte Monat und Jahr auswählen
@@ -306,11 +309,11 @@
 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: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Verfügbar in Stückliste, Lieferschein, Eingangsrechnung, Fertigungsauftrag, Lieferantenauftrag, Kaufbeleg, Ausgangsrechnung, Kundenauftrag, Lagerbuchung, Zeiterfassung"
 DocType: Item Tax,Tax Rate,Steuersatz
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} bereits für Arbeitnehmer zugeteilt {1} für die Periode {2} auf {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Artikel auswählen
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +631,Select Item,Artikel auswählen
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",Der chargenweise verwaltete Artikel: {0} kann nicht mit dem Lager abgeglichen werden. Stattdessen Lagerbuchung verwenden
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Zeile # {0}: Chargennummer muss dieselbe sein wie {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,In nicht-Gruppe umwandeln
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kaufbeleg muss übertragen werden
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medizinisch
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Grund für das Verlieren
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,Ledig
 DocType: Issue,Attachment,Anhang
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kann nicht für Gruppenkostenstelle eingestellt werden
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,Stammdaten zum Urlaub
 DocType: Material Request Item,Required Date,Angefragtes Datum
 DocType: Delivery Note,Billing Address,Rechnungsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Bitte die Artikelnummer eingeben
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Bitte die Artikelnummer eingeben
 DocType: BOM,Costing,Kalkulation
 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."
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Gesamtmenge
@@ -397,7 +401,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Wertpapiere und Einlagen
 DocType: Features Setup,Imports,Importe
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Die Gesamtmenge des zugeteilten Urlaubs ist zwingend erforderlich
-DocType: Job Opening,Description of a Job Opening,Beschreibung eines Stellenangebot
+DocType: Job Opening,Description of a Job Opening,Stellenbeschreibung
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Ausstehende Aktivitäten für heute
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Anwesenheitsnachweis
 DocType: Bank Reconciliation,Journal Entries,Buchungssätze
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Ablaufdatum der Garantie zu Seriennummer
@@ -438,20 +442,19 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Artikel {0} ist kein Kaufartikel
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Artikel {0} ist kein Kaufartikel
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} ist keine gültige E-Mail Adresse in ""Benachrichtigung \
  Email-Adresse"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Gesamtumsatz dieses Jahr:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Hinzufügen/Bearbeiten von Steuern und Abgaben
 DocType: Purchase Invoice,Supplier Invoice No,Lieferantenrechnungsnr.
 DocType: Territory,For reference,Zu Referenzzwecken
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Schlußstand (Haben)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Schlußstand (Haben)
 DocType: Serial No,Warranty Period (Days),Garantiefrist (Tage)
 DocType: Installation Note Item,Installation Note Item,Bestandteil des Installationshinweises
-,Pending Qty,Ausstehend Menge
-DocType: Job Applicant,Thread HTML,Thread HTML
+,Pending Qty,Ausstehende Menge
+DocType: Job Applicant,Thread HTML,Thread-HTML
 DocType: Company,Ignore,Ignorieren
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS an folgende Nummern versendet: {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Lieferantenlager notwendig für Kaufbeleg aus Unteraufträgen
@@ -463,24 +466,24 @@
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","""Monatsweise Verteilung"" hilft dabei das Budget über Monate zu verteilen, wenn es im Unternehmen saisonale Einflüsse gibt.
 Um ein Budget auf diese Art zu verteilen, ""monatsweise Verteilung"" bei ""Kostenstelle"" einstellen"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Keine Datensätze in der Rechnungstabelle gefunden
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Keine Datensätze in der Rechnungstabelle gefunden
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Bitte zuerst Firma und Gruppentyp auswählen
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanz-/Rechnungsjahr
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Verzeihung! Seriennummern können nicht zusammengeführt werden,"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Kundenauftrag erstellen
-DocType: Project Task,Project Task,Projektaufgabe
+DocType: Project Task,Project Task,Projekt-Teilaufgabe
 ,Lead Id,Lead-ID
 DocType: C-Form Invoice Detail,Grand Total,Gesamtbetrag
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Das Startdatum des Geschäftsjahres sollte nicht nach dem Enddatum des Gschäftsjahres liegen
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Das Startdatum des Geschäftsjahres sollte nicht nach dem Enddatum des Gschäftsjahres liegen
 DocType: Warranty Claim,Resolution,Entscheidung
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Geliefert: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Geliefert: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Verbindlichkeiten-Konto
 DocType: Sales Order,Billing and Delivery Status,Abrechnungs- und Lieferstatus
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Kunden wiederholen
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Bestandskunden
 DocType: Leave Control Panel,Allocate,Zuweisen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Umsatzrendite
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Kundenaufträge auswählen, aus denen Fertigungsaufträge erstellt werden sollen."
-DocType: Item,Delivered by Supplier (Drop Ship),Geliefert von Lieferant (Direktlieferung)
+DocType: Item,Delivered by Supplier (Drop Ship),Geliefert von Lieferant (Streckengeschäft)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Gehaltskomponenten
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Datenbank von potentiellen Kunden
 DocType: Authorization Rule,Customer or Item,Kunde oder Artikel
@@ -488,7 +491,7 @@
 DocType: Quotation,Quotation To,Angebot für
 DocType: Lead,Middle Income,Mittleres Einkommen
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Anfangssstand (Haben)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Zugewiesene Menge kann nicht negativ sein
 DocType: Purchase Order Item,Billed Amt,Rechnungsbetrag
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ein logisches Lager zu dem Lagerbuchungen gemacht werden.
@@ -497,7 +500,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Fertigungsauftrag ist zwingend erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Verfassen von Angeboten
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Fehler aufgrund negativen Lagerbestands ({6}) für Artikel {0} im Lager {1} auf {2} {3} in {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Fehler aufgrund negativen Lagerbestands ({6}) für Artikel {0} im Lager {1} auf {2} {3} in {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Geschäftsjahr Firma
 DocType: Packing Slip Item,DN Detail,DN-Detail
 DocType: Time Log,Billed,Abgerechnet
@@ -509,23 +512,24 @@
 DocType: Employee,Reason for Resignation,Kündigungsgrund
 apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Vorlage für Mitarbeiterbeurteilungen
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Einzelheiten zu Rechnungs-/Journalbuchungen
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} ' {1}' nicht im Geschäftsjahr {2}
+apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nicht im Geschäftsjahr {2}
 DocType: Buying Settings,Settings for Buying Module,Einstellungen für Einkaufsmodul
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,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 +34,"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 +22,Net Change in Inventory,Nettoveränderung des Bestands
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leiter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Von Kaufbeleg
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Gleicher Artikel wurde mehrfach eingetragen.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Von Kaufbeleg
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Gleicher Artikel wurde mehrfach eingetragen.
 DocType: SMS Settings,Receiver Parameter,Empfängerparameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""basierend auf"" und ""guppiert nach"" können nicht gleich sein"
 DocType: Sales Person,Sales Person Targets,Ziele für Vertriebsmitarbeiter
 DocType: Production Order Operation,In minutes,In Minuten
 DocType: Issue,Resolution Date,Datum der Entscheidung
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
 DocType: Selling Settings,Customer Naming By,Benennung der Kunden nach
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,In Gruppe umwandeln
 DocType: Activity Cost,Activity Type,Aktivitätsart
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Veröffentlichung
 DocType: Activity Cost,Projects User,Nutzer Projekt
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Verbraucht
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nicht in der Rechnungs-Details-Tabelle gefunden
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} nicht in der Rechnungs-Details-Tabelle gefunden
 DocType: Company,Round Off Cost Center,Abschluss-Kostenstelle
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wartungsbesuch {0} muss vor Stornierung dieses Kundenauftrages abgebrochen werden
 DocType: Material Request,Material Transfer,Materialübertrag
@@ -556,15 +560,15 @@
 DocType: Purchase Receipt,Other Details,Sonstige Einzelheiten
 DocType: Account,Accounts,Rechnungswesen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Wird verwendet, um einen Artikel in Einkaufs-und Verkaufsdokumenten auf der Grundlage ihrer Seriennummern nachzuverfolgen. Diese Funktion kann auch verwendet werden, um die Einzelheiten zum Garantiefall des Produktes mit zu protokollieren."
+DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Wird verwendet, um Artikel in Einkaufs-und Verkaufsdokumenten auf der Grundlage ihrer Seriennummern nachzuverfolgen. Diese Funktion kann auch verwendet werden, um die Einzelheiten zum Garantiefall eines Produktes mit zu protokollieren."
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktueller Lagerbestand
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Ausschusslager ist zwingend erfoderlich für Ausschuss-Artikel
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Insgesamt Abrechnung in diesem Jahr
 DocType: Account,Expenses Included In Valuation,In der Bewertung enthaltene Aufwendungen
 DocType: Employee,Provide email id registered in company,Geben Sie die in der Firma registrierte E-Mail-ID an
 DocType: Hub Settings,Seller City,Stadt des Verkäufers
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Artikel hat Varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Artikel hat Varianten.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Struktur-Typ
@@ -582,18 +586,18 @@
 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 +92,{0} is not a stock Item,{0} ist kein Lagerartikel
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ist kein Lagerartikel
 DocType: Mode of Payment Account,Default Account,Standardkonto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,Bitte die wöchentlichen Auszeittage auswählen
 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 +112,Account with existing transaction cannot be converted to ledger,Ein Konto mit bestehenden Transaktionen kann nicht in ein Kontoblatt umgewandelt werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Ein Konto mit bestehenden Transaktionen kann nicht in ein Kontoblatt umgewandelt werden
 DocType: Delivery Note,Customer's Purchase Order No,Kundenauftragsnr.
 DocType: Employee,Cell Number,Mobiltelefonnummer
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Automatische Materialanfragen generiert
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Momentan können keine Belege in die Spalte ""Zu Buchungssatz"" eingegeben werden"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"Momentan können keine Belege in die Spalte ""Zu Buchungssatz"" eingegeben werden"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Opportunity von
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Monatliche Gehaltsabrechnung
@@ -602,9 +606,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Von {0} vom Typ {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Buchungen können zu Unterknoten erfolgen. Buchungen zu Gruppen sind nicht erlaubt.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Kaufbelegnummer ist für Artikel {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Kaufbelegnummer ist für Artikel {0} erforderlich
 DocType: Item Attribute Value,Item Attribute Value,Attributwert des Artikels
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Vertriebskampagnen
 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.
@@ -662,7 +666,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Preisliste nicht ausgewählt
 DocType: Employee,Family Background,Familiärer Hintergrund
 DocType: Process Payroll,Send Email,E-Mail absenden
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Keine Berechtigung
 DocType: Company,Default Bank Account,Standardbankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Um auf der Grundlage von Gruppen zu filtern, bitte zuerst den Gruppentyp wählen"
@@ -670,7 +674,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Stk
 DocType: Item,Items with higher weightage will be shown higher,Artikel mit höherem Gewicht werden weiter oben angezeigt
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Ausführlicher Kontenabgleich
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Meine Rechnungen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Meine Rechnungen
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Kein Mitarbeiter gefunden
 DocType: Purchase Order,Stopped,Angehalten
 DocType: Item,If subcontracted to a vendor,Wenn an einen Zulieferer untervergeben
@@ -680,6 +684,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Jetzt senden
 ,Support Analytics,Support-Analyse
 DocType: Item,Website Warehouse,Webseiten-Lager
+DocType: Payment Reconciliation,Minimum Invoice Amount,Mindestabrechnung
 DocType: Sales 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."
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Kontakt-Formular Datensätze
@@ -689,7 +694,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features","Um ""Point of Sale""-Funktionen zu aktivieren"
 DocType: Bin,Moving Average Rate,Wert für den Gleitenden Durchschnitt
 DocType: Production Planning Tool,Select Items,Artikel auswählen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} zu Rechnung {1} vom {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} zu Rechnung {1} vom {2}
 DocType: Maintenance Visit,Completion Status,Fertigstellungsstatus
 DocType: Sales Invoice Item,Target Warehouse,Eingangslager
 DocType: Item,Allow over delivery or receipt upto this percent,Überlieferung bis zu diesem Prozentsatz zulassen
@@ -701,7 +706,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisch beim Übertragen von Transaktionen Mitteilungen verfassen
 DocType: Production Order,Item To Manufacture,Zu fertigender Artikel
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Status ist {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Vom Lieferantenauftrag zur Zahlung
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Vom Lieferantenauftrag zur Zahlung
 DocType: Sales Order Item,Projected Qty,Geplante Menge
 DocType: Sales Invoice,Payment Due Date,Zahlungsstichtag
 DocType: Newsletter,Newsletter Manager,Newsletter-Manager
@@ -725,7 +730,7 @@
 DocType: Sales Invoice Item,Stock Details,Lagerinformationen
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projektwert
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Verkaufsstelle
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"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
 DocType: Notification Control,Expense Claim Rejected Message,Benachrichtigung über abgelehnte Aufwandsabrechnung
@@ -748,7 +753,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Stammdaten zur Währungsumrechnung
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,Stückliste {0} muss aktiv sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,Stückliste {0} muss aktiv sein
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Bitte zuerst den Dokumententyp auswählen
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Materialkontrolle {0} stornieren vor Abbruch dieses Wartungsbesuchs
 DocType: Salary Slip,Leave Encashment Amount,Urlaubsgeld
@@ -766,17 +771,17 @@
 DocType: Supplier,Default Payable Accounts,Standard-Verbindlichkeitenkonten
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Mitarbeiter {0} ist nicht aktiv oder existiert nicht
 DocType: Features Setup,Item Barcode,Artikelbarcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
 DocType: Quality Inspection Reading,Reading 6,Ablesewert 6
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,Eingangsrechnung Vorkasse
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,Vorkasse zur Eingangsrechnung
 DocType: Address,Shop,Laden
 DocType: Hub Settings,Sync Now,Jetzt synchronisieren
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Zeile {0}: Habenbuchung kann nicht mit ein(em) {1} verknüpft werden
 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."
 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 +252,The Brand,Die Marke
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Zustimmung für Artikel {1} bei Überschreitung von {0}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Zustimmung für Artikel {1} bei Überschreitung von {0}.
 DocType: Employee,Exit Interview Details,Details zum Austrittsgespräch
 DocType: Item,Is Purchase Item,Ist Einkaufsartikel
 DocType: Journal Entry Account,Purchase Invoice,Eingangsrechnung
@@ -788,7 +793,7 @@
 DocType: Salary Slip,Total in words,Summe in Worten
 DocType: Material Request Item,Lead Time Date,Lieferzeit und -datum
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,ist zwingend erforderlich. Vielleicht wurde kein Datensatz für den Geldwechsel erstellt für
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Zeile #{0}: Bitte Seriennummer für Artikel {1} angeben
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Zeile #{0}: Bitte Seriennummer für Artikel {1} angeben
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Für Artikel aus ""Produkt-Bundles"" werden Lager, Seriennummer und Chargennummer aus der Tabelle ""Packliste"" berücksichtigt. Wenn Lager und Chargennummer für alle Packstücke in jedem Artikel eines Produkt-Bundles gleich sind, können diese Werte in die Tabelle ""Hauptpositionen"" eingetragen werden, Die Werte werden in die Tabelle ""Packliste"" kopiert."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Lieferungen an Kunden
 DocType: Purchase Invoice Item,Purchase Order Item,Lieferantenauftrags-Artikel
@@ -797,14 +802,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Abweichung
 ,Company Name,Firmenname
 DocType: SMS Center,Total Message(s),Summe Nachricht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Artikel für Übertrag auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,"Benutzer erlauben, die Preisliste in Transaktionen zu bearbeiten"
 DocType: Pricing Rule,Max Qty,Maximalmenge
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Zeile {0}: ""Zahlung zu Kunden-/Lieferantenauftrag"" sollte immer als ""Vorkasse"" eingestellt werden"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemische Industrie
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Alle Artikel wurden schon für diesen Fertigungsauftrag übernommen.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Alle Artikel wurden schon für diesen Fertigungsauftrag übernommen.
 DocType: Process Payroll,Select Payroll Year and Month,Jahr und Monat der Gehaltsabrechnung auswählen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Zur entsprechenden Gruppe gehen (normalerweise ""Mittelverwendung"" > ""Umlaufvermögen""  > ""Bankkonten"") und durck Klicken auf ""Unterpunkt hinzufügen"" ein neues Konto vom Typ ""Bank"" erstellen"
 DocType: Workstation,Electricity Cost,Stromkosten
@@ -818,10 +824,10 @@
 DocType: SMS Center,All Lead (Open),Alle Leads (offen)
 DocType: Purchase Invoice,Get Advances Paid,Gezahlte Anzahlungen aufrufen
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Eigenes Bild anhängen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Erstellen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Erstellen
 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 +3,My Cart,Mein Warenkorb
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mein Warenkorb
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Anfangsmenge
@@ -837,13 +843,13 @@
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Einstandspreis-Kaufbeleg
 DocType: Company,Default Terms,Allgemeine Geschäftsbedingungen
 DocType: Packing Slip Item,Packing Slip Item,Position auf dem Packzettel
-DocType: POS Profile,Cash/Bank Account,Kassen-/Bankkonto
+DocType: POS Profile,Cash/Bank Account,Bar-/Bankkonto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} kann nicht negativ sein
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabatt
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Rabatt
 DocType: Features Setup,Purchase Discounts,Einkaufsrabatte
 DocType: Workstation,Wages,Lohn
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Wird nur dann aktualisiert, wenn das Zeitprotokoll ""abrechenbar"" ist"
@@ -868,7 +874,7 @@
 DocType: Tax Rule,Shipping State,Versandstatus
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Artikel müssen über die Schaltfläche ""Artikel von Kaufbeleg übernehmen"" hinzugefügt werden"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Vertriebskosten
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard-Kauf
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standard-Kauf
 DocType: GL Entry,Against,Zu
 DocType: Item,Default Selling Cost Center,Standard-Vertriebskostenstelle
 DocType: Sales Partner,Implementation Partner,Umsetzungspartner
@@ -910,6 +916,7 @@
 DocType: Sales Partner,Distributor,Lieferant
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Warenkorb-Versandregel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Fertigungsauftrag {0} muss vor Stornierung dieses Kundenauftages abgebrochen werden
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',"Bitte ""Zusätzlichen Rabatt anwenden auf"" aktivieren"
 ,Ordered Items To Be Billed,"Bestellte Artikel, die abgerechnet werden müssen"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Von-Bereich muss kleiner sein als Bis-Bereich
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,"Bitte Zeitprotokolle auswählen und übertragen, um eine neue Ausgangsrechnung zu erstellen."
@@ -917,15 +924,14 @@
 DocType: Salary Slip,Deductions,Abzüge
 DocType: Purchase Invoice,Start date of current invoice's period,Startdatum der laufenden Rechnungsperiode
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Dieser Zeitprotokollstapel wurde abgerechnet.
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Vertriebs-Chance erstellen
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Opportunity erstellen
 DocType: Salary Slip,Leave Without Pay,Unbezahlter Urlaub
-DocType: Supplier,Communications,Kommunikationswesen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Fehler in der Kapazitätsplanung
 ,Trial Balance for Party,Summen- und Saldenliste für Gruppe
 DocType: Lead,Consultant,Berater
 DocType: Salary Slip,Earnings,Einkünfte
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Fertiger Artikel {0} muss für eine Fertigungsbuchung eingegeben werden
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Eröffnungsbilanz
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Fertiger Artikel {0} muss für eine Fertigungsbuchung eingegeben werden
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Eröffnungsbilanz
 DocType: Sales Invoice Advance,Sales Invoice Advance,Anzahlung auf Ausgangsrechnung
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nichts anzufragen
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"Das ""Tatsächliche Startdatum"" kann nicht nach dem  ""Tatsächlichen Enddatum"" liegen"
@@ -938,7 +944,7 @@
 DocType: Purchase Invoice,Is Return,Ist Rückgabe
 DocType: Price List Country,Price List Country,Preisliste Land
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Weitere Knoten können nur unter Knoten vom Typ ""Gruppe"" erstellt werden"
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Bitte stellen Sie E-Mail ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Bitte E-Mail-ID eingeben
 DocType: Item,UOMs,Maßeinheiten
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} gültige Seriennummern für Artikel {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Artikelnummer kann nicht für Seriennummer geändert werden
@@ -947,7 +953,7 @@
 DocType: Stock Settings,Default Item Group,Standard-Artikelgruppe
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Lieferantendatenbank
 DocType: Account,Balance Sheet,Bilanz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Ihr Vertriebsmitarbeiter erhält an diesem Datum eine Erinnerung, den Kunden zu kontaktieren"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,"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"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Steuer und sonstige Gehaltsabzüge
@@ -967,21 +973,21 @@
 DocType: Global Defaults,Current Fiscal Year,Laufendes Geschäftsjahr
 DocType: Global Defaults,Disable Rounded Total,Gerundete Gesamtsumme deaktivieren
 DocType: Lead,Call,Anruf
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Buchungen"" kann nicht leer sein"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,"""Buchungen"" kann nicht leer sein"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Doppelte Zeile {0} mit dem gleichen {1}
 ,Trial Balance,Probebilanz
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Mitarbeiter anlegen
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Verzeichnis """
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Bitte zuerstPräfix auswählen
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Bitte zuerst Präfix auswählen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Forschung
 DocType: Maintenance Visit Purpose,Work Done,Arbeit erledigt
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Bitte geben Sie mindestens ein Attribut in der Attributtabelle ein
 DocType: Contact,User ID,Benutzer-ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Hauptbuch anzeigen
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Frühestens
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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
 DocType: Production Order,Manufacture against Sales Order,Auftragsfertigung
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Rest der Welt
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -1011,7 +1017,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Keine Berechtigung gesperrtes Konto {0} zu bearbeiten
 DocType: Journal Entry,Get Outstanding Invoices,Ausstehende Rechnungen aufrufen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1021,16 +1027,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Grün
 DocType: Item,Auto re-order,Automatische Nachbestellung
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Gesamtsumme erreicht
-DocType: Employee,Place of Issue,Ausstellungsort
+DocType: Employee,Place of Issue,Ausgabeort
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Vertrag
 DocType: Email Digest,Add Quote,Angebot hinzufügen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Maßeinheit-Umrechnungsfaktor ist erforderlich für Maßeinheit: {0} bei Artikel: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Maßeinheit-Umrechnungsfaktor ist erforderlich für Maßeinheit: {0} bei Artikel: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte Aufwendungen
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Ihre Produkte oder Dienstleistungen
 DocType: Mode of Payment,Mode of Payment,Zahlungsweise
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,Website Bild sollte eine öffentliche Datei oder Website-URL sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,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/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dies ist eine Root-Artikelgruppe und kann nicht bearbeitet werden.
 DocType: Journal Entry Account,Purchase Order,Lieferantenauftrag
 DocType: Warehouse,Warehouse Contact Info,Kontaktinformation des Lager
@@ -1039,8 +1045,8 @@
 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/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Lieferschein {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Lieferschein {0} wurde nicht übertragen
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Betriebsvermögen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1050,7 +1056,7 @@
 DocType: Appraisal Goal,Goal,Ziel
 DocType: Sales Invoice Item,Edit Description,Beschreibung bearbeiten
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Voraussichtlicher Liefertermin liegt vor dem geplanten Starttermin.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Für Lieferant
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Summe Auslieferungen
@@ -1063,7 +1069,7 @@
 DocType: Journal Entry,Journal Entry,Buchungssatz
 DocType: Workstation,Workstation Name,Name des Arbeitsplatzes
 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 +427,BOM {0} does not belong to Item {1},Stückliste {0} gehört nicht zum Artikel {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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
@@ -1075,7 +1081,7 @@
 DocType: BOM Operation,Workstation,Arbeitsplatz
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Leiter der Personalabteilung
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Bitte wählen Sie ein Unternehmen
+apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Bitte ein Unternehmen auswählen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Bevorzugter Urlaub
 DocType: Purchase Invoice,Supplier Invoice Date,Lieferantenrechnungsdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sie müssen Ihren Einkaufswagen aktivieren.
@@ -1095,7 +1101,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter an Kontakte und Leads
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,"""Arbeitsvorbereitung"" kann nicht leer sein."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,"""Arbeitsvorbereitung"" kann nicht leer sein."
 ,Delivered Items To Be Billed,"Gelieferte Artikel, die abgerechnet werden müssen"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kann für Seriennummer nicht geändert werden
 DocType: Authorization Rule,Average Discount,Durchschnittlicher Rabatt
@@ -1110,18 +1116,19 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Von {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Vorgangsbeschreibung
 DocType: Item,Will also apply to variants,Gilt auch für Varianten
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Start- und Schlußdatum des Geschäftsjahres können nicht geändert werden, wenn das Geschäftsjahr gespeichert wurde."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Start- und Schlußdatum des Geschäftsjahres können nicht geändert werden, wenn das Geschäftsjahr gespeichert wurde."
 DocType: Quotation,Shopping Cart,Warenkorb
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Durchschnittlicher täglicher Abgang
 DocType: Pricing Rule,Campaign,Kampagne
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',"Genehmigungsstatus muss ""genehmigt"" oder ""abgelehnt"" sein"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',"Genehmigungsstatus muss ""Genehmigt"" oder ""Abgelehnt"" sein"
 DocType: Purchase Invoice,Contact Person,Kontaktperson
 apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',"""Voraussichtliches Startdatum"" kann nicht nach dem ""Voraussichtlichen Enddatum"" liegen"
 DocType: Holiday List,Holidays,Ferien
 DocType: Sales Order Item,Planned Quantity,Geplante Menge
 DocType: Purchase Invoice Item,Item Tax Amount,Artikelsteuerbetrag
 DocType: Item,Maintain Stock,Lager verwalten
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Es wurden bereits Lagerbuchungen zum Fertigungsauftrag erstellt
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1133,7 +1140,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,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 Slip Deduction,Depends on Leave Without Pay,Hängt von unbezahltem Urlaub ab
@@ -1170,7 +1177,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Unterbaugruppen
 DocType: Shipping Rule Condition,To Value,Bis-Wert
 DocType: Supplier,Stock Manager,Leitung Lager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Ausgangslager ist für Zeile {0} zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Ausgangslager ist für Zeile {0} zwingend erforderlich
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Packzettel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Büromiete
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Einstellungen für SMS-Gateway verwalten
@@ -1178,10 +1185,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Noch keine Adresse hinzugefügt.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeitsplatz-Arbeitsstunde
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich zu JV Menge {2} sein
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich zu JV Menge {2} sein
 DocType: Item,Inventory,Lagerbestand
 DocType: Features Setup,"To enable ""Point of Sale"" view","Um die ""Point of Sale""-Ansicht zu aktivieren"
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Für einen leeren Einkaufswagen kann keine Zahlung getätigt werden
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Für einen leeren Einkaufswagen kann keine Zahlung getätigt werden
 DocType: Item,Sales Details,Verkaufsdetails
 DocType: Opportunity,With Items,Mit Artikeln
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,In Menge
@@ -1196,10 +1203,11 @@
 DocType: Cost Center,Parent Cost Center,Übergeordnete Kostenstelle
 DocType: Sales Invoice,Source,Quelle
 DocType: Leave Type,Is Leave Without Pay,Ist unbezahlter Urlaub
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,"Keine Datensätze in der Tabelle ""Zahlungen"" gefunden"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,"Keine Datensätze in der Tabelle ""Zahlungen"" gefunden"
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Startdatum des Geschäftsjahres
 DocType: Employee External Work History,Total Experience,Gesamterfahrung
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packzettel storniert
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Packzettel storniert
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cashflow aus Investitionen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fracht- und Versandkosten
 DocType: Material Request Item,Sales Order No,Kundenauftrags-Nr.
 DocType: Item Group,Item Group Name,Name der Artikelgruppe
@@ -1207,12 +1215,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Material der Fertigung übergeben
 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/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Es wurde kein Einkaufspreis für Artikel: {0} gefunden. Er ist jedoch zwingend erforderlich, um Buchungssätze (Aufwendungen) zu buchen. Bitte Artikelpreis in einer Einkaufspreisliste hinterlegen."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Es wurde kein Einkaufspreis für Artikel: {0} gefunden. Er ist jedoch zwingend erforderlich, um Buchungssätze (Aufwendungen) zu buchen. Bitte Artikelpreis in einer Einkaufspreisliste hinterlegen."
 DocType: Maintenance Schedule,Schedules,Zeitablaufpläne
 DocType: Purchase Invoice Item,Net Amount,Nettobetrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stückliste Detailnr.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Zusätzlicher Rabatt (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Fehler: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Fehler: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Bitte neues Konto aus dem Kontenplan erstellen.
 DocType: Maintenance Visit,Maintenance Visit,Wartungsbesuch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde > Kundengruppe > Region
@@ -1234,11 +1242,11 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Die Firma
 DocType: Monthly Distribution,Monthly Distribution,Monatsbezogene Verteilung
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Empfängerliste ist leer. Bitte eine Empfängerliste erstellen
-DocType: Production Plan Sales Order,Production Plan Sales Order,Produktionsplan Kundenauftrag
+DocType: Production Plan Sales Order,Production Plan Sales Order,Produktionsplan für Kundenauftrag
 DocType: Sales Partner,Sales Partner Target,Vertriebspartner-Ziel
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Eine Buchung für {0} kann nur in der Währung: {1} vorgenommen werden
 DocType: Pricing Rule,Pricing Rule,Preisregel
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Von der Materialanfrage zum Lieferantenauftrag
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Von der Materialanfrage zum Lieferantenauftrag
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Zeile # {0}: Zurückgegebener Artikel {1} existiert nicht in {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonten
 ,Bank Reconciliation Statement,Kontoauszug zum Kontenabgleich
@@ -1246,11 +1254,11 @@
 ,POS,Verkaufsstelle
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Eröffnungsbestände
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} darf nur einmal vorkommen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Von-Wert
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Bei der Bank nicht berücksichtigte Beträge
 DocType: Quality Inspection Reading,Reading 4,Ablesewert 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Ansprüche auf Kostenübernahme durch das Unternehmen
@@ -1261,34 +1269,35 @@
 DocType: Production Planning Tool,Select Sales Orders,Kundenaufträge auswählen
 ,Material Requests for which Supplier Quotations are not created,"Materialanfragen, für die keine Lieferantenangebote erstellt werden"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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."
-DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Wird verwendet, um Artikel über den Barcode nachzuverfolgen. Durch das Scannen des Artikel-Barcodes können Artikel in einen Lieferschein und eine Ausgangsrechnung eingegeben werden."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Als geliefert kennzeichnen
+DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Wird verwendet, um Artikel über den Barcode nachzuverfolgen. Durch das Scannen des Artikelbarcodes können Artikel in einen Lieferschein und eine Ausgangsrechnung eingegeben werden."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Als geliefert kennzeichnen
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Angebot erstellen
 DocType: Dependent Task,Dependent Task,Abhängige Aufgabe
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Empfängerliste
 DocType: Payment Tool Detail,Payment Amount,Zahlungsbetrag
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbrauchte Menge
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} anzeigen
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} anzeigen
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Nettoveränderung der Barmittel
 DocType: Salary Structure Deduction,Salary Structure Deduction,Gehaltsstruktur-Abzug
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Aufwendungen für in Umlauf gebrachte Artikel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Menge darf nicht mehr als {0} sein
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Alter (Tage)
 DocType: Quotation Item,Quotation Item,Angebotsposition
 DocType: Account,Account Name,Kontenname
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Von-Datum kann später liegen als Bis-Datum
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Von-Datum kann später liegen als Bis-Datum
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Seriennummer {0} mit Menge {1} kann nicht eine Teilmenge sein
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Stammdaten zum Lieferantentyp
 DocType: Purchase Order Item,Supplier Part Number,Artikelnummer Lieferant
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Umrechnungskurs kann nicht 0 oder 1 sein
-apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} wird abgebrochen oder gestoppt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Umrechnungskurs kann nicht 0 oder 1 sein
+apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Kaufbeleg {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Kaufbeleg {0} wurde nicht übertragen
 DocType: Company,Default Payable Account,Standard-Verbindlichkeitenkonto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Einstellungen für Online-Warenkorb, wie Versandregeln, Preisliste usw."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% berechnet
@@ -1297,18 +1306,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Personalwesen
 DocType: Lead,Upper Income,Gehobenes Einkommen
 DocType: Journal Entry Account,Debit in Company Currency,Soll in Unternehmenswährung
-apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Meine Fragen
+apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Meine Fälle
 DocType: BOM Item,BOM Item,Stücklisten-Artikel
 DocType: Appraisal,For Employee,Für Mitarbeiter
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Row {0}: Voraus gegen Lieferant muss belasten werden
 DocType: Company,Default Values,Standardwerte
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Zeile {0}: Zahlungsbetrag kann nicht negativ sein
 DocType: Expense Claim,Total Amount Reimbursed,Gesamterstattungsbetrag
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Zu Eingangsrechnung {0} vom {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Zu Eingangsrechnung {0} vom {1}
 DocType: Customer,Default Price List,Standardpreisliste
 DocType: Payment Reconciliation,Payments,Zahlungen
 DocType: Budget Detail,Budget Allocated,Zugewiesenes Budget
 DocType: Journal Entry,Entry Type,Buchungstyp
 ,Customer Credit Balance,Kunden-Kreditlinien
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Nettoveränderung der Verbindlichkeiten
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Bitte E-Mail-ID überprüfen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Kunde erforderlich für ""Kundenbezogener Rabatt"""
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Zahlungstermine anhand der Journale aktualisieren
@@ -1329,7 +1340,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Warenkorb aktivieren
 DocType: Employee,Permanent Address,Feste Adresse
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Artikel {0} muss ein Dienstleistungsartikel sein.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Anzahlung zu {0} {1} kann nicht größer sein als als Gesamtsumme {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Bitte Artikelnummer auswählen
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Abzug für unbezahlten Urlaub (LWP) vermindern
@@ -1346,18 +1357,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Einzelnes Element eines Artikels
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',"Zeitprotokollstapel {0} muss ""übertragen"" sein"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"Zeitprotokollstapel {0} muss ""übertragen"" sein"
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Angabe des Lagers ist in Zeile {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Angabe des Lagers ist in Zeile {0} erforderlich
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Post
 DocType: Item,Weightage,Gewichtung
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Eine Kundengruppe mit dem gleichen Namen existiert bereits. Bitte den Kundennamen ändern oder die Kundengruppe umbenennen
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Bitte zuerst {0} auswählen.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Bitte zuerst {0} auswählen.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},text {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Neuer Kontakt
 DocType: Territory,Parent Territory,Übergeordnete Region
 DocType: Quality Inspection Reading,Reading 2,Ablesewert 2
 DocType: Stock Entry,Material Receipt,Materialannahme
@@ -1365,7 +1377,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},"""Gruppen-Typ"" und die ""Gruppe"" werden für das Konto ""Forderungen / Verbindlichkeiten"" {0} gebraucht"
 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 +210,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 +213,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 +85,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
@@ -1381,16 +1393,16 @@
 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: Sales Invoice Item,Batch No,Chargennummer
-DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Mehrere verschiedene Kundenaufträge zu einer Kundenbestellung zulassen
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Haupt
+DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Mehrfache Kundenaufträge zu einer Kundenbestellung zulassen
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Haupt
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Präfix für die Seriennummerierung Ihrer Transaktionen festlegen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Angehaltener Auftrag kann nicht abgebrochen werden. Bitte zuerst fortsetzen, um dann abzubrechen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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 ""Opportunity von"" ist zwingend erforderlich"
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Lieferantenauftrag erstellen
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Lieferantenauftrag erstellen
 DocType: SMS Center,Send To,Senden an
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1403,7 +1415,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Lager und Referenz
 DocType: Supplier,Statutory info and other general information about your Supplier,Rechtlich notwendige und andere allgemeine Informationen über Ihren Lieferanten
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adressen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Buchungssatz"" {0} hat nur abgeglichene {1} Buchungen"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Buchungssatz"" {0} hat nur abgeglichene {1} Buchungen"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Artikel darf keinen Fertigungsauftrag haben.
@@ -1412,10 +1424,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,(Gut)Haben-Betrag in Kontowährung
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Zeitprotokolle für die Fertigung
 DocType: Item,Apply Warehouse-wise Reorder Level,Anwenden des lagerbezogenen Meldebestands
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
 DocType: Authorization Control,Authorization Control,Berechtigungskontrolle
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Abgelehnt Warehouse ist obligatorisch gegen zurückgewiesen Artikel {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Zeitprotokoll für Aufgaben
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Bezahlung
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Bezahlung
 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: Employee,Salutation,Anrede
@@ -1429,10 +1442,9 @@
 DocType: Hub Settings,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/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Wert {0} für Attribut {1} gibt es nicht in der Liste der gültigen Artikel-Attributwerte
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Mitarbeiterin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Mitarbeiter/-in
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Artikel {0} ist kein Fortsetzungsartikel
 DocType: SMS Center,Create Receiver List,Empfängerliste erstellen
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Verfallen
 DocType: Packing Slip,To Package No.,Bis Paket Nr.
 DocType: Warranty Claim,Issue Date,Ausstellungsdatum
 DocType: Activity Cost,Activity Cost,Aktivitätskosten
@@ -1448,13 +1460,13 @@
 DocType: Sales Order Item,Delivery Warehouse,Auslieferungslager
 DocType: Stock Settings,Allowance Percent,Zugelassener Prozentsatz
 DocType: SMS Settings,Message Parameter,Mitteilungsparameter
-DocType: Serial No,Delivery Document No,Lieferbelegnummer
+DocType: Serial No,Delivery Document No,Lieferdokumentennummer
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Artikel vom Kaufbeleg übernehmen
 DocType: Serial No,Creation Date,Erstellungsdatum
 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/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Vertrieb muss aktiviert werden, wenn ""Anwenden auf"" ausgewählt ist bei {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Lieferantenangebotsposition
-DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Deaktiviert die Erstellung von Zeitprotokolle gegen Fertigungsaufträge. Operationen werden nicht auf Fertigungsauftrag verfolgt werden
+DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Deaktiviert die Erstellung von Zeitprotokollen zu Fertigungsaufträgen. Arbeitsgänge werden nicht zu Fertigungsaufträgen nachverfolgt
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Gehaltsübersicht erstellen
 DocType: Item,Has Variants,Hat Varianten
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Auf ""Ausgangsrechnung erstellen"" klicken, um eine neue Ausgangsrechnung zu erstellen."
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Erreicht
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Region / Kunde
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,z. B. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,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: Item,Is Sales Item,Ist Verkaufsartikel
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Artikelgruppenstruktur
@@ -1482,7 +1494,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} erstellt
 DocType: Delivery Note Item,Against Sales Order,Zu Kundenauftrag
 ,Serial No Status,Seriennummern-Status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Artikel-Tabelle kann nicht leer sein
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Artikel-Tabelle kann nicht leer sein
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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"
 DocType: Pricing Rule,Selling,Vertrieb
@@ -1491,7 +1503,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Zölle und Steuern
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Bitte den Stichtag eingeben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Bitte den Stichtag eingeben
 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} Zahlungsbuchungen können nicht nach {1} gefiltert werden
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabelle für Artikel, der auf der Webseite angezeigt wird"
 DocType: Purchase Order Item Supplied,Supplied Qty,Gelieferte Anzahl
@@ -1506,7 +1518,7 @@
 DocType: Installation Note,Installation Time,Installationszeit
 DocType: Sales Invoice,Accounting Details,Buchhaltungs-Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Löschen aller Transaktionen dieser Firma
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,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/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 +57,Investments,Investitionen
 DocType: Issue,Resolution Details,Details zur Entscheidung
 DocType: Quality Inspection Reading,Acceptance Criteria,Akzeptanzkriterien
@@ -1522,13 +1534,13 @@
 DocType: Holiday List,Clear Table,Tabelle leeren
 DocType: Features Setup,Brands,Marken
 DocType: C-Form Invoice Detail,Invoice No,Rechnungs-Nr.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Von Lieferantenauftrag
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Von Lieferantenauftrag
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled 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} genehmigt/abgelehnt werden."
 DocType: Activity Cost,Costing Rate,Kalkulationsbetrag
 ,Customer Addresses And Contacts,Kundenadressen und Ansprechpartner
 DocType: Employee,Resignation Letter Date,Datum des Kündigungsschreibens
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Preisregeln werden zudem nach Menge angewandt.
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Kundenumsatz wiederholen
+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 +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) muss die Rolle ""Ausgabengenehmiger"" haben"
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Pair,Paar
 DocType: Bank Reconciliation Detail,Against Account,Gegenkonto
@@ -1539,7 +1551,7 @@
 ,Maintenance Schedules,Wartungspläne
 ,Quotation Trends,Trendanalyse Angebote
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
 DocType: Shipping Rule Condition,Shipping Amount,Versandbetrag
 ,Pending Amount,Ausstehender Betrag
 DocType: Purchase Invoice Item,Conversion Factor,Umrechnungsfaktor
@@ -1556,23 +1568,24 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanzkontenstruktur
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konto {0} muss vom Typ ""Anlagegut"" sein, weil der Artikel {1} ein Anlagegut ist"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konto {0} muss vom Typ ""Anlagegut"" sein, weil der Artikel {1} ein Anlagegut ist"
 DocType: HR Settings,HR Settings,Einstellungen zum Modul Personalwesen
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Aufwandsabrechnung wartet auf Bewilligung. Nur der Ausgabenbewilliger kann den Status aktualisieren.
 DocType: Purchase Invoice,Additional Discount Amount,Zusätzlicher Rabatt
 DocType: Leave Block List Allow,Leave Block List Allow,Urlaubssperrenliste zulassen
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Summe Tatsächlich
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Einheit
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Bitte Firma angeben
 ,Customer Acquisition and Loyalty,Kundengewinnung und -bindung
-DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Lager, in dem zurückerhaltene Artikel aufbewahrt werden"
+DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Lager, in dem zurückerhaltene Artikel aufbewahrt werden (Sperrlager)"
 apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Ihr Geschäftsjahr endet am
 DocType: POS Profile,Price List,Preisliste
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Aufwandsabrechnungen
 DocType: Issue,Support,Support
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Zum Warenkorb
 ,BOM Search,Stücklisten-Suche
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Schlußstand (Anfangsstand + Summen)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Bitte die Firmenwährung angeben
@@ -1584,13 +1597,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Maßeinheit-Umrechnungsfaktor ist erforderlich in der Zeile {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Abwicklungsdatum kann nicht vor dem Prüfdatum in Zeile {0} liegen
 DocType: Salary Slip,Deduction,Abzug
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Artikel Preis hinzugefügt für {0} in Preisliste {1}
 DocType: Address Template,Address Template,Adressvorlage
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% der Aufgaben fertiggestellt
 DocType: Project,Gross Margin,Handelsspanne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Bitte zuerst Herstellungsartikel eingeben
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,deaktivierter Benutzer
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,deaktivierter Benutzer
 DocType: Opportunity,Quotation,Angebot
 DocType: Salary Slip,Total Deduction,Gesamtabzug
 DocType: Quotation,Maintenance User,Nutzer Instandhaltung
@@ -1599,7 +1613,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
 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
@@ -1609,12 +1623,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Verkaufskampagne verfolgen: Leads, Angebote, Kundenaufträge usw. von Kampagnen beobachten um die Kapitalverzinsung (RoI) zu messen."
 DocType: Expense Claim,Approver,Genehmiger
 ,SO Qty,Kd.-Auftr.-Menge
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Es gibt Lagerbuchungen zum Lager {0}, daher kann das Lager nicht umbenannt oder verändert werden"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Es gibt Lagerbuchungen zum Lager {0}, daher kann das Lager nicht umbenannt oder verändert werden"
 DocType: Appraisal,Calculate Total Score,Gesamtwertung berechnen
 DocType: Supplier Quotation,Manufacturing Manager,Fertigungsleiter
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Lieferschein in Pakete aufteilen
-apps/erpnext/erpnext/hooks.py +68,Shipments,Lieferungen
+apps/erpnext/erpnext/hooks.py +69,Shipments,Lieferungen
 DocType: Purchase Order Item,To be delivered to customer,Zur Auslieferung an den Kunden
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,"Status des Zeitprotokolls muss ""übertragen"" sein"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Seriennummer {0} gehört zu keinem Lager
@@ -1634,10 +1648,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +356,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
 DocType: Currency Exchange,From Currency,Von Währung
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"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/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Im System nicht berücksichtigte Beträge
 DocType: Purchase Invoice Item,Rate (Company Currency),Preis (Firmenwährung)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Andere
@@ -1653,7 +1667,7 @@
 DocType: Quality Inspection,In Process,Während des Fertigungsprozesses
 DocType: Authorization Rule,Itemwise Discount,Artikelbezogener Rabatt
 DocType: Purchase Order Item,Reference Document Type,Referenz-Dokumententyp
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} zu Kundenauftrag{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} zu Kundenauftrag{1}
 DocType: Account,Fixed Asset,Anlagevermögen
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialisierter Lagerbestand
 DocType: Activity Type,Default Billing Rate,Standard-Rechnungspreis
@@ -1663,7 +1677,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Vom Kundenauftrag zum Zahlungseinang
 DocType: Expense Claim Detail,Expense Claim Detail,Aufwandsabrechnungsdetail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Zeitprotokolle erstellt:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Bitte richtiges Konto auswählen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Bitte richtiges Konto auswählen
 DocType: Item,Weight UOM,Gewichts-Maßeinheit
 DocType: Employee,Blood Group,Blutgruppe
 DocType: Purchase Invoice Item,Page Break,Seitenumbruch
@@ -1694,10 +1708,10 @@
 DocType: Time Log,To Time,Bis-Zeit
 DocType: Authorization Rule,Approving Role (above authorized value),Genehmigende Rolle (über dem autorisierten Wert)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Um Unterknoten hinzuzufügen, klicken Sie in der Baumstruktur auf den Knoten, unter dem Sie weitere Knoten hinzufügen möchten."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Habenkonto muss ein Verbindlichkeitenkonto sein
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Habenkonto muss ein Verbindlichkeitenkonto sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},Stücklisten-Rekursion: {0} kann nicht übergeordnetes Element oder Unterpunkt von {2} sein
 DocType: Production Order Operation,Completed Qty,Gefertigte Menge
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Preisliste {0} ist deaktiviert
 DocType: Manufacturing Settings,Allow Overtime,Überstunden zulassen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{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.
@@ -1705,8 +1719,9 @@
 DocType: Item,Customer Item Codes,Kundenartikelnummern
 DocType: Opportunity,Lost Reason,Verlustgrund
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Neue Zahlungsbuchungen zu Aufträgen oder Rechnungen erstellen
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Neue Adresse
 DocType: Quality Inspection,Sample Size,Stichprobenumfang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle Artikel sind bereits abgerechnet
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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"
 DocType: Project,External,Extern
@@ -1732,14 +1747,14 @@
 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
-DocType: POS Profile,[Select],[Select ]
+DocType: POS Profile,[Select],[Select]
 DocType: SMS Log,Sent To,Gesendet An
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Verkaufsrechnung erstellen
 DocType: Company,For Reference Only.,Nur zu Referenzzwecken.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Ungültige(r/s) {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Anzahlungsbetrag
 DocType: Manufacturing Settings,Capacity Planning,Kapazitätsplanung
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Von-Datum"" ist erforderlich,"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Von-Datum"" ist erforderlich"
 DocType: Journal Entry,Reference Number,Referenznummer
 DocType: Employee,Employment Details,Beschäftigungsdetails
 DocType: Employee,New Workplace,Neuer Arbeitsplatz
@@ -1753,7 +1768,7 @@
 DocType: Time Log,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
-DocType: Item,End of Life,Lebensdauer
+DocType: Item,End of Life,Ende der Lebensdauer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Reise
 DocType: Leave Block List,Allow Users,Benutzer zulassen
 DocType: Purchase Order,Customer Mobile No,Mobilnummer des Kunden
@@ -1762,13 +1777,14 @@
 DocType: Rename Tool,Rename Tool,Werkzeug zum Umbenennen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Kosten aktualisieren
 DocType: Item Reorder,Item Reorder,Artikelnachbestellung
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Material übergeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Material übergeben
 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.
 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
 DocType: Installation Note,Installation Note,Installationshinweis
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Steuern hinzufügen
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Cashflow aus Finanzierung
 ,Financial Analytics,Finanzanalyse
 DocType: Quality Inspection,Verified By,Geprüft durch
 DocType: Address,Subsidiary,Tochtergesellschaft
@@ -1778,19 +1794,19 @@
 DocType: Process Payroll,Create Salary Slip,Gehaltsabrechnung erstellen
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Voraussichtlicher Kontostand laut Bank
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Mittelherkunft (Verbindlichkeiten)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Menge in Zeile {0} ({1}) muss die gleiche sein wie die hergestellte Menge {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Menge in Zeile {0} ({1}) muss die gleiche sein wie die hergestellte Menge {2}
 DocType: Appraisal,Employee,Mitarbeiter
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import von E-Mails aus
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Als Benutzer einladen
 DocType: Features Setup,After Sale Installations,After Sale-Installationen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} wird voll in Rechnung gestellt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} wird voll in Rechnung gestellt
 DocType: Workstation Working Hour,End Time,Endzeit
 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 +75,Group by Voucher,Gruppieren nach Beleg
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Benötigt am
 DocType: Sales Invoice,Mass Mailing,Massen-E-Mail-Versand
 DocType: Rename Tool,File to Rename,"Datei, die umbenannt werden soll"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Lieferantenbestellnummer ist für Artikel {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Lieferantenbestellnummer ist für Artikel {0} erforderlich
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Zahlungen anzeigen
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Wartungsplan {0} muss vor Stornierung dieses Kundenauftrages aufgehoben werden
@@ -1799,7 +1815,8 @@
 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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Neuen Kunden erstellen
-DocType: Purchase Invoice,Credit To,Gutschreiben an
+DocType: Purchase Invoice,Credit To,Gutschreiben auf
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktive Leads / Kunden
 DocType: Employee Education,Post Graduate,Graduation veröffentlichen
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Wartungsplandetail
 DocType: Quality Inspection Reading,Reading 9,Ablesewert 9
@@ -1811,6 +1828,7 @@
 DocType: Warranty Claim,Raised By,Gemeldet von
 DocType: Payment Tool,Payment Account,Zahlungskonto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Nettoveränderung der Forderungen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Ausgleich für
 DocType: Quality Inspection Reading,Accepted,Genehmigt
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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."
@@ -1818,17 +1836,17 @@
 DocType: Payment Tool,Total Payment Amount,Summe Zahlungen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","Stock konnte nicht aktualisiert werden, Rechnung enthält Drop Versand Artikel."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Streckenhandel-Artikel."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Da es bestehende Lagertransaktionen für diesen Artikel gibt, können die Werte von ""Hat Seriennummer"", ""Hat Losnummer"", ""Ist Lagerartikel"" und ""Bewertungsmethode"" nicht geändert werden"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Schnellbuchung
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Schnellbuchung
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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: 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 +157,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 +211,{0} {1} is not submitted,{0} {1} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} wurde nicht übertragen
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Allgemeine Geschäftsbedingungen1
@@ -1841,7 +1859,7 @@
 DocType: Authorization Rule,Authorized Value,Autorisierter Wert
 DocType: Contact,Enter department to which this Contact belongs,"Abteilung eingeben, zu der dieser Kontakt gehört"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Summe Abwesenheit
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Artikel oder Lager in Zeile {0} stimmen nicht mit Materialanfrage überein
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Artikel oder Lager in Zeile {0} stimmen nicht mit Materialanfrage überein
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Maßeinheit
 DocType: Fiscal Year,Year End Date,Enddatum des Geschäftsjahres
 DocType: Task Depends On,Task Depends On,Aufgabe hängt davon ab
@@ -1867,7 +1885,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Vertragsende muss weiter in der Zukunft liegen als Eintrittsdatum sein
 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."
 DocType: Customer Group,Has Child Node,Unterknoten vorhanden
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} zu Lieferantenauftrag {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} zu Lieferantenauftrag {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Statische URL-Parameter hier eingeben (z. B. Absender=ERPNext, Benutzername=ERPNext, Passwort=1234 usw.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} ist in keinem aktiven Geschäftsjahr. Für weitere Details, bitte {2} prüfen."
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"Dies ist eine Beispiel-Webseite, von ERPNext automatisch generiert"
@@ -1915,7 +1933,7 @@
 10. Hinzufügen oder abziehen: Gibt an, ob die Steuer/Abgabe hinzugefügt oder abgezogen wird."
 DocType: Purchase Receipt Item,Recd Quantity,Erhaltene Menge
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,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 +477,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht übertragen
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Geldkonto
 DocType: Tax Rule,Billing City,Stadt laut Rechnungsadresse
 DocType: Global Defaults,Hide Currency Symbol,Währungssymbol ausblenden
@@ -1926,7 +1944,7 @@
 DocType: Warranty Claim,Service Address,Serviceadresse
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 Zeilen für Lagerabgleich.
 DocType: Stock Entry,Manufacture,Fertigung
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Bitte Lieferschein zuerst
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Bitte zuerst den Lieferschein
 DocType: Purchase Invoice,Currency and Price List,Währungs- und Preisliste
 DocType: Opportunity,Customer / Lead Name,Kunden/Lead-Name
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Abwicklungsdatum nicht benannt
@@ -1947,6 +1965,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Versorgungsaufwendungen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Über 90
 DocType: Buying Settings,Default Buying Price List,Standard-Einkaufspreisliste
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Kein Mitarbeiter für die oben ausgewählten Kriterien oder Gehaltsabrechnung bereits erstellt
 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"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Zahlungsart
@@ -1956,7 +1975,7 @@
 DocType: Purchase Invoice,Total Taxes and Charges,Gesamte Steuern und Gebühren
 DocType: Employee,Emergency Contact,Notfallkontakt
 DocType: Item,Quality Parameters,Qualitätsparameter
-apps/erpnext/erpnext/stock/doctype/item/item.js +26,Ledger,Sachkonto
+apps/erpnext/erpnext/stock/doctype/item/item.js +26,Ledger,Hauptbuch
 DocType: Target Detail,Target  Amount,Zielbetrag
 DocType: Shopping Cart Settings,Shopping Cart Settings,Warenkorb-Einstellungen
 DocType: Journal Entry,Accounting Entries,Buchungen
@@ -1982,7 +2001,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Siehe „Anteil der zu Grunde liegenden Materialien“ im Abschnitt Kalkulation
 DocType: Appraisal Goal,Key Responsibility Area,Wichtigster Verantwortungsbereich
 DocType: Item Reorder,Material Request Type,Materialanfragetyp
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Zeile {0}: Umrechnungsfaktor für Maßeinheit ist zwingend erforderlich
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref.
 DocType: Cost Center,Cost Center,Kostenstelle
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Beleg #
@@ -2004,7 +2023,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Bitte einen Wert für {0} Angebot an {1} auswählen
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle Adressen
 DocType: Company,Stock Settings,Lager-Einstellungen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Zusammenführung ist nur möglich, wenn folgende Eigenschaften in beiden Datensätzen identisch sind:  Gruppe, Root-Typ, Firma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Zusammenführung ist nur möglich, wenn folgende Eigenschaften in beiden Datensätzen identisch sind:  Gruppe, Root-Typ, Firma"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Baumstruktur der Kundengruppen verwalten
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Neuer Kostenstellenname
 DocType: Leave Control Panel,Leave Control Panel,Urlaubsverwaltung
@@ -2013,7 +2032,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted,Steuern und Gebühren abgezogen
 apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Fälle
 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,Lastschrift für
+DocType: Sales Invoice,Debit To,Belasten auf
 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
 ,Pending SO Items For Purchase Request,Ausstehende Artikel aus Kundenaufträgen für Lieferantenanfrage
@@ -2024,8 +2043,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Zahlungswerkzeug-Details
 ,Sales Browser,Vertriebs-Browser
 DocType: Journal Entry,Total Credit,Gesamt-Haben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Darlehen und Anzahlungen (Aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Schuldner
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Groß
@@ -2042,9 +2061,9 @@
 DocType: Sales Partner,Targets,Ziele
 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.,Lieferantenbestellung Nr.
+,S.O. No.,Nummer der Lieferantenbestellung
 DocType: Production Order Operation,Make Time Log,Zeitprotokoll erstellen
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Bitte Nachbestellmenge einstellen
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Bitte Nachbestellmenge einstellen
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Bitte Kunden aus Lead {0} erstellen
 DocType: Price List,Applicable for Countries,Anwenden für Länder
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Rechner
@@ -2104,10 +2123,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Keine Anmerkungen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Keine Anmerkungen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Überfällig
 DocType: Account,Stock Received But Not Billed,"Empfangener, aber nicht berechneter Lagerbestand"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root-Konto muss eine Gruppe sein
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root-Konto muss eine Gruppe sein
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttolohn +  ausstehender Betrag +   Inkassobetrag - Summe aller Abzüge
 DocType: Monthly Distribution,Distribution Name,Bezeichnung der Verteilung
 DocType: Features Setup,Sales and Purchase,Vertrieb und Einkauf
@@ -2121,6 +2140,7 @@
 DocType: Journal Entry Account,Party Balance,Gruppen-Saldo
 DocType: Sales Invoice Item,Time Log Batch,Zeitprotokollstapel
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Bitte ""Rabatt anwenden auf"" auswählen"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Gehaltsabrechnung Erstellt
 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: Stock Entry,Material Transfer for Manufacture,Materialübertrag für Herstellung
@@ -2128,9 +2148,9 @@
 DocType: Purchase Invoice,Half-yearly,Halbjährlich
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Geschäftsjahr {0} nicht gefunden.
 DocType: Bank Reconciliation,Get Relevant Entries,Zutreffende Buchungen aufrufen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Lagerbuchung
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Lagerbuchung
 DocType: Sales Invoice,Sales Team1,Verkaufsteam1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Artikel {0} existiert nicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Artikel {0} existiert nicht
 DocType: Sales Invoice,Customer Address,Kundenadresse
 DocType: Purchase Invoice,Apply Additional Discount On,Zusätzlichen Rabatt gewähren auf
 DocType: Account,Root Type,Root-Typ
@@ -2139,15 +2159,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Diese Diaschau oben auf der Seite anzeigen
 DocType: BOM,Item UOM,Artikelmaßeinheit
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Steuerbetrag nach Abzug von Rabatt (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Eingangslager ist für Zeile {0} zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Eingangslager ist für Zeile {0} zwingend erforderlich
 DocType: Quality Inspection,Quality Inspection,Qualitätsprüfung
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Besonders klein
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Lebensmittel, Getränke und Tabak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL oder BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Zahlung kann nur zu einer noch nicht abgerechneten {0} erstellt werden
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,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 +122,Commission rate cannot be greater than 100,Provisionssatz kann nicht größer als 100 sein
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Mindestbestandshöhe
 DocType: Stock Entry,Subcontract,Zulieferer
@@ -2170,7 +2190,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Preislistenwährung nicht ausgewählt
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Artikel Zeile {0}: Kaufbeleg {1} existiert nicht in der obigen Tabelle ""Eingangslieferscheine"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Employee {0} has already applied for {1} between {2} and {3},Mitarbeiter {0} hat sich bereits für {1} zwischen {2} und {3} beworben
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projektstartdatum
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Startdatum des Projekts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Bis
 DocType: Rename Tool,Rename Log,Protokoll umbenennen
 DocType: Installation Note Item,Against Document No,Zu Dokument Nr.
@@ -2178,14 +2198,14 @@
 DocType: Quality Inspection,Inspection Type,Art der Prüfung
 apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Bitte {0} auswählen
 DocType: C-Form,C-Form No,Kontakt-Formular-Nr.
-DocType: BOM,Exploded_items,Exploded_items
+DocType: BOM,Exploded_items,Aufgelöste Artikel
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Wissenschaftler
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Bitte den Newsletter vor dem Senden speichern
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Name oder E-Mail-Adresse ist zwingend erforderlich
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Wareneingangs-Qualitätsprüfung
 DocType: Purchase Order Item,Returned Qty,Zurückgegebene Menge
-DocType: Employee,Exit,Beenden
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root-Typ ist zwingend erforderlich
+DocType: Employee,Exit,Austritt/Beenden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root-Typ ist zwingend erforderlich
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Seriennummer {0} erstellt
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Zum Vorteil für die Kunden, können diese Kodes in Druckformaten wie Rechnungen und Lieferscheinen verwendet werden"
 DocType: Employee,You can enter any date manually,Sie können jedes Datum manuell eingeben
@@ -2193,8 +2213,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Probezeit
 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 +110,Row {0}: Advance against Customer must be credit,Row {0}: Voraus gegen Kunde muss Kredit
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kaufbeleg-Artikel geliefert
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Zahlen
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Zahlen
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Bis Datum und Uhrzeit
 DocType: SMS Settings,SMS Gateway URL,SMS-Gateway-URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokolle über den SMS-Versand
@@ -2211,7 +2232,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Meldebestand
 DocType: Attendance,Attendance Date,Anwesenheitsdatum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gehaltsaufteilung nach Einkommen und Abzügen.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Ein Konto mit Unterknoten kann nicht in ein Kontoblatt umgewandelt werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Ein Konto mit Unterknoten kann nicht in ein Kontoblatt umgewandelt werden
 DocType: Address,Preferred Shipping Address,Bevorzugte Lieferadresse
 DocType: Purchase Receipt Item,Accepted Warehouse,Annahmelager
 DocType: Bank Reconciliation Detail,Posting Date,Buchungsdatum
@@ -2229,7 +2250,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Seriennummer {0} existiert nicht
 DocType: Pricing Rule,Discount Percentage,Rabatt in Prozent
 DocType: Payment Reconciliation Invoice,Invoice Number,Rechnungsnummer
-apps/erpnext/erpnext/hooks.py +54,Orders,Bestellungen
+apps/erpnext/erpnext/hooks.py +55,Orders,Bestellungen
 DocType: Leave Control Panel,Employee Type,Mitarbeitertyp
 DocType: Employee Leave Approver,Leave Approver,Urlaubsgenehmiger
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material zur Herstellung übertragen
@@ -2238,10 +2259,10 @@
 DocType: Pricing Rule,Purchase Manager,Einkaufsleiter
 DocType: Payment Tool,Payment Tool,Zahlungswerkzeug
 DocType: Target Detail,Target Detail,Zieldetail
-DocType: Sales Order,% of materials billed against this Sales Order,% der für diesen Kundenauftrag in Rechnung gestellten Materialien
+DocType: Sales Order,% of materials billed against this Sales Order,% der Materialien welche zu diesem Kundenauftrag gebucht wurden
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periodenabschlussbuchung
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Abschreibung
+DocType: Account,Depreciation,Abschreibung
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Lieferant(en)
 DocType: Customer,Credit Limit,Kreditlimit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Bitte Transaktionstyp auswählen
@@ -2266,11 +2287,12 @@
 DocType: Material Request,Requested For,Angefordert für
 DocType: Quotation Item,Against Doctype,Zu DocType
 DocType: Delivery Note,Track this Delivery Note against any Project,Diesen Lieferschein in jedem Projekt nachverfolgen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-Konto kann nicht gelöscht werden
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Nettocashflow aus Investitionen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root-Konto kann nicht gelöscht werden
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Lagerbuchungen anzeigen
 ,Is Primary Address,Ist Hauptadresse
 DocType: Production Order,Work-in-Progress Warehouse,Fertigungslager
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referenz #{0} vom {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referenz #{0} vom {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Adressen verwalten
 DocType: Pricing Rule,Item Code,Artikelnummer
 DocType: Production Planning Tool,Create Production Orders,Fertigungsaufträge erstellen
@@ -2278,10 +2300,10 @@
 DocType: Journal Entry,User Remark,Benutzerbemerkung
 DocType: Lead,Market Segment,Marktsegment
 DocType: Employee Internal Work History,Employee Internal Work History,Interne Berufserfahrung des Mitarbeiters
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Schlußstand (Soll)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Schlußstand (Soll)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Seriennummer {0} ist nicht auf Lager
-apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Steuer-Vorlage für Verkaufstransaktionen
+apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Steuervorlage für Verkaufstransaktionen
 DocType: Sales Invoice,Write Off Outstanding Amount,Offenen Betrag ausbuchen
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Aktivieren, wenn Sie automatisch wiederkehrende Ausgangsrechnungen benötigen. Nach dem Übertragen einer Ausgangsrechnung wird der Bereich für wiederkehrende Ausgangsrechnungen angezeigt."
 DocType: Account,Accounts Manager,Kontenmanager
@@ -2294,7 +2316,7 @@
 ,Billed Amount,Rechnungsbetrag
 DocType: Bank Reconciliation,Bank Reconciliation,Kontenabgleich
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Updates abholen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materialanfrage {0} wird storniert oder gestoppt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Materialanfrage {0} wird storniert oder gestoppt
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Ein paar Beispieldatensätze hinzufügen
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Urlaube verwalten
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppieren nach Konto
@@ -2303,14 +2325,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Bezeichnung des Kontos unter Verbindlichkeiten, in das Gewinn/Verlust verbucht werden"
 DocType: Payment Tool,Against Vouchers,Gegenbelege
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Schnellhilfe
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Vertriebsextras
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Budget für Konto {1} zu Kostenstelle {2} wird um {3} überschritten
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
 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"
 ,Stock Projected Qty,Projizierter Lagerbestand
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
 DocType: Sales Order,Customer's Purchase Order,Kundenauftrag
 DocType: Warranty Claim,From Company,Von Firma
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Wert oder Menge
@@ -2320,9 +2342,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Urlaubssperrenliste zugelassen
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,"Sie brauchen das, um sich anzumelden."
 DocType: Sales Partner,Retailer,Einzelhändler
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Habenkonto muss ein Bilanzkonto sein
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Habenkonto muss ein Bilanzkonto sein
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Lieferantentypen
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +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/selling/doctype/sales_order/sales_order.py +93,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
@@ -2334,7 +2356,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Anfangsstand Eigenkapital
 DocType: Appraisal,Appraisal,Bewertung
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Ereignis wiederholen
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Zeichnungsberechtigte
+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 +164,Leave approver must be one of {0},Urlaube und Abwesenheiten müssen von jemandem aus {0} genehmigt werden.
 DocType: Hub Settings,Seller Email,E-Mail-Adresse des Verkäufers
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Summe Einkaufskosten (über Einkaufsrechnung)
@@ -2342,9 +2364,9 @@
 DocType: Item Price,Bulk Import Help,Massen-Import Hilfe
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Menge wählen
 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 +66,Unsubscribe from this Email Digest,Abmelden von diesem E-Mail-Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Abmelden von diesem E-Mail-Bericht
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Mitteilung gesendet
-DocType: Production Plan Sales Order,SO Date,Auftragsdatum
+DocType: Production Plan Sales Order,SO Date,Datum des Kundenauftrags
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Kurs, zu dem die Währung der Preisliste in die Basiswährung des Kunden umgerechnet wird"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobetrag (Firmenwährung)
 DocType: BOM Operation,Hour Rate,Stundensatz
@@ -2366,7 +2388,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Das Bruttogewicht des Pakets. Normalerweise Nettogewicht + Gewicht des Verpackungsmaterials (Für den Ausdruck)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Benutzer mit dieser Rolle sind berechtigt Konten zu sperren und  Buchungen zu gesperrten Konten zu erstellen/verändern
 DocType: Serial No,Is Cancelled,Ist storniert
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Meine Lieferungen
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Meine Lieferungen
 DocType: Journal Entry,Bill Date,Rechnungsdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"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:"
 DocType: Supplier,Supplier Details,Lieferantendetails
@@ -2387,10 +2409,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Anrufe
 DocType: Project,Total Costing Amount (via Time Logs),Gesamtkostenbetrag (über Zeitprotokolle)
 DocType: Purchase Order Item Supplied,Stock UOM,Lagermaßeinheit
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Lieferantenauftrag {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Lieferantenauftrag {0} wurde nicht übertragen
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Geplant
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Seriennummer {0} gehört nicht zu Lager {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,Eröffnungsdatum
 DocType: Journal Entry,Remark,Bemerkung
@@ -2403,9 +2425,9 @@
 DocType: Time Log,Batched for Billing,Für Abrechnung gebündelt
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Rechnungen von Lieferanten
 DocType: POS Profile,Write Off Account,Abschreibungs-Konto
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Nettocashflow aus laufender Geschäftstätigkeit
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,z. B. Mehrwertsteuer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Position 4
 DocType: Journal Entry Account,Journal Entry Account,Journalbuchungskonto
@@ -2446,7 +2468,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Zeitpunkt der Pensionierung muss nach dem Eintrittsdatum liegen
 DocType: Sales Invoice,Against Income Account,Zu Ertragskonto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% geliefert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Ziele für die Region
 DocType: Delivery Note,Transporter Info,Informationen zum Transportunternehmer
@@ -2474,10 +2496,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Chargennummer ist zwingend erforderlich für Artikel {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dies ist ein Root-Vertriebsmitarbeiter und kann nicht bearbeitet werden.
 ,Stock Ledger,Lagerbuch
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Preis: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Preis: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Abzug auf der Gehaltsabrechnung
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Zuerst einen Gruppenknoten wählen.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Zweck muss einer von diesen sein: {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Zweck muss einer von diesen sein: {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Formular ausfüllen und speichern
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Einen Bericht herunterladen, der das gesamte Rohmaterial mit seinem neuesten Bestandsstatus angibt"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community-Forum
@@ -2515,7 +2537,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Unternehmensstammdaten (nicht Kunde oder Lieferant)
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Bitte ""voraussichtlichen Liefertermin"" eingeben"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ist keine gültige Chargennummer für Artikel {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Hinweis: Es gibt nicht genügend Urlaubsguthaben für Abwesenheitstyp {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Hinweis: Wenn die Zahlung nicht mit einer Referenz abgeglichen werden kann, bitte Buchungssatz manuell erstellen."
@@ -2532,12 +2554,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Beim Übertragen von Transaktionen automatisch E-Mails an Kontakte senden.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Zeile {0}: Menge nicht im Lager {1} auf {2} {3} verfügbar. Verfügbare Menge: {4}, Übertragsmenge: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Position 3
 DocType: Purchase Order,Customer Contact Email,Kontakt-E-Mail des Kunden
 DocType: Sales Team,Contribution (%),Beitrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Verantwortung
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Vorlage
 DocType: Sales Person,Sales Person Name,Name des Vertriebsmitarbeiters
@@ -2548,20 +2570,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Vor Ausgleich
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,Standardstückliste
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Bitte zum Bestätigen Firmenname erneut eingeben
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Offener Gesamtbetrag
 DocType: Time Log Batch,Total Hours,Summe der Stunden
 DocType: Journal Entry,Printing Settings,Druckeinstellungen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/journal_entry/journal_entry.py +264,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
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Von Lieferschein
 DocType: Time Log,From Time,Von-Zeit
 DocType: Notification Control,Custom Message,Benutzerdefinierte Mitteilung
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment-Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Kassen- oder Bankkonto ist zwingend notwendig  um eine Zahlungsbuchung zu erstellen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Kassen- oder Bankkonto ist zwingend notwendig  um eine Zahlungsbuchung zu erstellen
 DocType: Purchase Invoice,Price List Exchange Rate,Preislisten-Wechselkurs
 DocType: Purchase Invoice Item,Rate,Preis
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Praktikant
@@ -2579,9 +2601,10 @@
 			conflict by assigning priority. Price Rules: {0}",Es existieren mehrere Preisregeln mit denselben Kriterien. Bitte diesen Konflikt durch Vergabe von Vorrangregelungen lösen. Preisregeln: {0}
 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 +580,Issue Material,Material ausgeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Material ausgeben
 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,Zitate
 DocType: Hub Settings,Access Token,Zugriffstoken
 DocType: Sales Invoice Item,Serial No,Seriennummer
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Bitte zuerst die Einzelheiten zur Wartung eingeben
@@ -2595,10 +2618,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maximale Rechnungsbetrag
 DocType: Purchase Invoice Item,Image View,Bildansicht
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Bewertung und Summe
@@ -2606,6 +2631,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dieser Artikel ist eine Variante von {0} (Vorlage). Attribute werden von der Vorlage übernommen, ausser es wurde ""Nicht kopieren"" ausgewählt."
 DocType: Account,Purchase User,Nutzer Einkauf
 DocType: Notification Control,Customize the Notification,Mitteilungstext anpassen
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cashflow aus Geschäftstätigkeit
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard-Adressvorlage kann nicht gelöscht werden
 DocType: Sales Invoice,Shipping Rule,Versandregel
 DocType: Journal Entry,Print Heading,Druckkopf
@@ -2616,10 +2642,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Rohmaterial
 DocType: Leave Application,Follow via Email,Per E-Mail nachverfolgen
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Steuerbetrag nach Abzug von Rabatt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,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 +335,Please select Posting Date first,Bitte wählen Sie zuerst Buchungsdatum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Bitte zuerst ein Buchungsdatum auswählen
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,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 +54,Cost Center with existing transactions can not be converted to ledger,Kostenstelle mit bestehenden Transaktionen kann nicht in Sachkonto umgewandelt werden
@@ -2629,11 +2655,12 @@
 DocType: Issue,Raised By (Email),Gemeldet von (E-Mail)
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Allgemein
 apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Briefkopf anhängen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Abzug nicht möglich, wenn Kategorie ""Bewertung"" oder ""Bewertung und Summe"" ist"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Abzug nicht möglich, wenn Kategorie ""Wertbestimmtung"" oder ""Wertbestimmung und Summe"" ist"
 apps/erpnext/erpnext/public/js/setup_wizard.js +302,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Steuern (z. B. Mehrwertsteuer, Zoll, usw.; bitte möglichst eindeutige Bezeichnungen vergeben) und die zugehörigen Steuersätze auflisten. Dies erstellt eine Standardvorlage, die bearbeitet und später erweitert werden kann."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriennummern sind erforderlich für den Artikel mit Seriennummer {0}
 DocType: Journal Entry,Bank Entry,Bankbuchung
 DocType: Authorization Rule,Applicable To (Designation),Anwenden auf (Bezeichnung)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,In den Warenkorb legen
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppieren nach
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivieren / Deaktivieren der Währungen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Portoaufwendungen
@@ -2641,29 +2668,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Unterhaltung & Freizeit
 DocType: Purchase Order,The date on which recurring order will be stop,Das Datum an dem die sich wiederholende Bestellung endet
 DocType: Quality Inspection,Item Serial No,Artikel-Seriennummer
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} muss um {1} reduziert werden, oder die Überlauftoleranz sollte erhöht werden"
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} muss um {1} reduziert werden, oder die Überlauftoleranz sollte erhöht werden"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Summe Anwesend
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Stunde
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serienartikel {0} kann nicht über einen Lagerabgleich aktualisiert werden
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Material dem Lieferanten übergeben
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Material dem Lieferanten übergeben
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Angebot erstellen
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,"Sie sind nicht berechtigt, Urlaube für geblockte Termine zu genehmigen"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alle diese Artikel sind bereits in Rechnung gestellt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Alle diese Artikel sind bereits in Rechnung gestellt
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kann von {0} genehmigt werden
 DocType: Shipping Rule,Shipping Rule Conditions,Versandbedingungen
 DocType: BOM Replace Tool,The new BOM after replacement,Die neue Stückliste nach dem Austausch
 DocType: Features Setup,Point of Sale,POS (Point of Sale)
 DocType: Account,Tax,Steuer
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Zeile {0}: {1} ist keine gültige {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Aus Produkt-Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Aus Produkt-Bundle
 DocType: Production Planning Tool,Production Planning Tool,Werkzeug zur Fertigungsplanung
 DocType: Quality Inspection,Report Date,Berichtsdatum
 DocType: C-Form,Invoices,Rechnungen
 DocType: Job Opening,Job Title,Stellenbezeichnung
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Empfänger
 DocType: Features Setup,Item Groups in Details,Detaillierte Artikelgruppen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Menge Herstellung muss größer als 0 sein.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Point-of-Sale (POS) starten
@@ -2671,8 +2697,9 @@
 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: Pricing Rule,Customer Group,Kundengruppe
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0}
 DocType: Item,Website Description,Webseiten-Beschreibung
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Nettoveränderung des Eigenkapitals
 DocType: Serial No,AMC Expiry Date,Verfalldatum des jährlichen Wartungsvertrags
 ,Sales Register,Übersicht über den Umsatz
 DocType: Quotation,Quotation Lost Reason,Grund des verlorenen Angebotes
@@ -2680,12 +2707,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Es gibt nichts zu bearbeiten.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Zusammenfassung für diesen Monat und anstehende Aktivitäten
 DocType: Customer Group,Customer Group Name,Kundengruppenname
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Attribute
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Artikel aufrufen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Bitte Abschreibungskonto eingeben
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Artikel aufrufen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Bitte Abschreibungskonto eingeben
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Letztes Bestelldatum
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Verbrauchssteuerrechnung erstellen
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} gehört nicht zu Firma {1}
@@ -2701,7 +2728,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projektbezogene Daten sind für das Angebot nicht verfügbar
 DocType: Project,Expected End Date,Voraussichtliches Enddatum
 DocType: Appraisal Template,Appraisal Template Title,Bezeichnung der Bewertungsvorlage
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Werbung
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Werbung
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Übergeordneter Artikel {0} darf kein Lagerartikel sein
 DocType: Cost Center,Distribution Id,Verteilungs-ID
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Beeindruckende Dienstleistungen
@@ -2714,7 +2741,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Wert des Attributs {0} muss innerhalb des Bereichs von {1} bis {2} mit Schrittweite {3} liegen
 DocType: Tax Rule,Sales,Vertrieb
 DocType: Stock Entry Detail,Basic Amount,Grundbetrag
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
 DocType: Leave Allocation,Unused leaves,Ungenutzter Urlaub
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Haben
 DocType: Customer,Default Receivable Accounts,Standard-Forderungskonten
@@ -2726,16 +2753,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Kaufbelege
-DocType: Payment Reconciliation,Maximum Amount,Höchstbetrag
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Wie wird die Preisregel angewandt?
 DocType: Quality Inspection,Delivery Note No,Lieferschein-Nummer
 DocType: Company,Retail,Einzelhandel
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} existiert nicht
 DocType: Attendance,Absent,Abwesend
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produkt-Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Zeile {0}: Ungültige Referenz {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Produkt-Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Zeile {0}: Ungültige Referenz {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vorlage für Einkaufssteuern und -abgaben
 DocType: Upload Attendance,Download Template,Vorlage herunterladen
 DocType: GL Entry,Remarks,Bemerkungen
@@ -2762,7 +2789,7 @@
 ,Monthly Attendance Sheet,Monatliche Anwesenheitsliste
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Kein Datensatz gefunden
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostenstelle ist zwingend erfoderlich für Artikel {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} ist inaktiv
 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"
@@ -2771,8 +2798,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Konto vom Typ ""Gewinn und Verlust"" {0} ist in einer Eröffnungsbuchung nicht erlaubt"
 DocType: Features Setup,Sales Discounts,Verkaufsrabatte
 DocType: Hub Settings,Seller Country,Land des Verkäufers
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Veröffentlichen Sie Artikel auf der Website
 DocType: Authorization Rule,Authorization Rule,Autorisierungsregel
 DocType: Sales Invoice,Terms and Conditions Details,Allgemeine Geschäftsbedingungen Details
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Technische Daten
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Vorlage für Verkaufssteuern und -abgaben
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kleidung & Zubehör
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Nummer der Bestellung
@@ -2794,7 +2823,7 @@
 DocType: Time Log,Billing Amount,Rechnungsbetrag
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ungültzige Anzahl für Artikel {0} angegeben. Anzahl sollte größer als 0 sein.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Urlaubsanträge
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Ein Konto mit bestehenden Transaktionen kann nicht gelöscht werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Ein Konto mit bestehenden Transaktionen kann nicht gelöscht werden
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Rechtskosten
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Der Tag des Monats, an dem eine automatische Bestellung erzeugt wird, z. B. 05, 28 usw."
 DocType: Sales Invoice,Posting Time,Buchungszeit
@@ -2810,12 +2839,12 @@
 DocType: Maintenance Visit,Breakdown,Ausfall
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Konto: {0} mit Währung: {1} kann nicht ausgewählt werden
 DocType: Bank Reconciliation Detail,Cheque Date,Scheckdatum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Über-Konto {1} gehört nicht zur Firma: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Über-Konto {1} gehört nicht zur Firma: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Alle Transaktionen dieser Firma wurden erfolgreich gelöscht!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Zum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probezeit
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Standard-Lager ist für Lagerartikel zwingend notwendig.
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Zahlung des Gehalts für Monat {0} und Jahre {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Standard-Lager ist für Lagerartikel zwingend notwendig.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Zahlung des Gehalts für Monat {0} und Jahr {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Preisliste automatisch einfügen, wenn sie fehlt"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Summe gezahlte Beträge
 ,Transferred Qty,Übergebene Menge
@@ -2826,6 +2855,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Gesamtumsatz (über Zeitprotokolle)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Wir verkaufen diesen Artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Lieferanten-ID
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Sollte Menge größer als 0 sein
 DocType: Journal Entry,Cash Entry,Kassenbuchung
 DocType: Sales Partner,Contact Desc,Kontakt-Beschr.
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Grund für Beurlaubung, wie Erholung, krank usw."
@@ -2834,7 +2864,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Zeilen hinzufügen um Jahresbudgets in Konten festzulegen.
 DocType: Buying Settings,Default Supplier Type,Standardlieferantentyp
 DocType: Production Order,Total Operating Cost,Gesamtbetriebskosten
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Hinweis: Artikel {0} mehrfach eingegeben
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Hinweis: Artikel {0} mehrfach eingegeben
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle Kontakte
 DocType: Newsletter,Test Email Id,E-Mail-ID testen
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Firmenkürzel
@@ -2845,11 +2875,11 @@
 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 +115,Salary template master.,Stammdaten zur Gehaltsvorlage
 DocType: Leave Type,Max Days Leave Allowed,Maximal zulässige Urlaubstage
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set Steuerregel für Einkaufswagen
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Steuerregel für Einkaufswagen einstellen
 DocType: Payment Tool,Set Matching Amounts,Passende Beträge einstellen
 DocType: Purchase Invoice,Taxes and Charges Added,Steuern und Gebühren hinzugefügt
 ,Sales Funnel,Verkaufstrichter
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Abkürzung ist obligatorisch
+apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Abkürzung ist zwingend erforderlich
 apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Einkaufswagen
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Vielen Dank für Ihr Interesse an einem Abonnement unserer Aktualisierungen
 ,Qty to Transfer,Zu versendende Menge
@@ -2859,7 +2889,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Kundengruppen
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Steuer-Vorlage ist erforderlich.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Hauptkonto {1} existiert nicht
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Temporär
 DocType: Address,Preferred Billing Address,Bevorzugte Rechnungsadresse
@@ -2877,8 +2907,8 @@
 ,Item-wise Price List Rate,Artikelbezogene Preisliste
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} ist beendet
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} ist beendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
 DocType: Lead,Add to calendar on this date,Zu diesem Datum in Kalender einfügen
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regeln für das Hinzufügen von Versandkosten
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende Veranstaltungen
@@ -2898,24 +2928,24 @@
 DocType: Customer,From Lead,Von Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Für die Produktion freigegebene Bestellungen
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Geschäftsjahr auswählen ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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 +455,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
 DocType: Hub Settings,Name Token,Kürzel benennen
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard-Vertrieb
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindestens ein Lager ist zwingend erforderlich
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: BOM Replace Tool,Replace,Ersetzen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Bitte die Standardmaßeinheit eingeben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Bitte die Standardmaßeinheit eingeben
 DocType: Purchase Invoice Item,Project Name,Projektname
 DocType: Supplier,Mention if non-standard receivable account,"Vermerken, wenn es sich um kein Standard-Forderungskonto handelt"
 DocType: Journal Entry Account,If Income or Expense,Wenn Ertrag oder Aufwand
 DocType: Features Setup,Item Batch Nos,Artikel-Chargennummern
 DocType: Stock Ledger Entry,Stock Value Difference,Lagerwert-Differenz
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Personal
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Steuerguthaben
 DocType: BOM Item,BOM No,Stücklisten-Nr.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Gleitender Durchschnitt
 DocType: BOM Replace Tool,The BOM which will be replaced,"Die Stückliste, die ersetzt wird"
 DocType: Account,Debit,Soll
@@ -2944,7 +2974,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Diesen Fertigungsauftrag für die weitere Verarbeitung übertragen.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"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: Company,Domain,Domäne
-,Sales Order Trends,Kundenauftragstrends
+,Sales Order Trends,Trendanalyse Kundenaufträge
 DocType: Employee,Held On,Festgehalten am
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktions-Artikel
 ,Employee Information,Mitarbeiterinformationen
@@ -2952,15 +2982,15 @@
 DocType: Stock Entry Detail,Additional Cost,Zusätzliche Kosten
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Enddatum des Geschäftsjahres
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"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/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Lieferantenangebot erstellen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Lieferantenangebot erstellen
 DocType: Quality Inspection,Incoming,Eingehend
 DocType: BOM,Materials Required (Exploded),Benötigte Materialien (erweitert)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Verdienst für unbezahlten Urlaub (LWP) vermindern
 apps/erpnext/erpnext/public/js/setup_wizard.js +274,"Add users to your organization, other than yourself","Benutzer, außer Ihnen, zu Ihrer Firma hinzufügen"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Zeile # {0}: Seriennummer {1} stimmt nicht mit {2} {3} überein
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Urholungsurlaub
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Erholungsurlaub
 DocType: Batch,Batch ID,Chargen-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Hinweis: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Hinweis: {0}
 ,Delivery Note Trends,Entwicklung Lieferscheine
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Zusammenfassung dieser Woche
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} muss ein gekaufter oder unterbeauftragter Artikel in Zeile {1} sein
@@ -2975,6 +3005,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Durchschnittlicher Einkaufspreis
 DocType: Task,Actual Time (in Hours),Tatsächliche Zeit (in Stunden)
 DocType: Employee,History In Company,Historie im Unternehmen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Die Gesamtmenge {0} des auszugebenden/zu übertragenden Materials in der Materialanfrage {1} kann nicht größer sein als die angefragte Menge {2} für den Artikel {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletter
 DocType: Address,Shipping,Versand
 DocType: Stock Ledger Entry,Stock Ledger Entry,Buchung im Lagerbuch
@@ -2994,7 +3025,6 @@
 DocType: Purchase Order,End date of current order's period,Schlußdatum der laufenden Bestellperiode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Angebotsschreiben erstellen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Zurück
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Standard-Maßeinheit muss für eine Variante die gleiche wie für eine Vorlage sein
 DocType: Production Order Operation,Production Order Operation,Arbeitsgang im Fertigungsauftrag
 DocType: Pricing Rule,Disable,Deaktivieren
 DocType: Project Task,Pending Review,Wartet auf Überprüfung
@@ -3002,7 +3032,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunden-ID
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Bis-Zeit muss nach Von-Zeit liegen
 DocType: Journal Entry Account,Exchange Rate,Wechselkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Lager {0}: Übergeordnetes Konto {1} gehört nicht zu Firma {2}
 DocType: BOM,Last Purchase Rate,Letzter Anschaffungspreis
 DocType: Account,Asset,Vermögenswert
@@ -3014,7 +3044,7 @@
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Für ERPNext Hub anmelden
 DocType: Monthly Distribution,Monthly Distribution Percentages,Prozentuale Aufteilungen der monatsweisen Verteilung
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Der ausgewählte Artikel kann keine Charge haben
-DocType: Delivery Note,% of materials delivered against this Delivery Note,% der für diesen Lieferschein gelieferten Materialien
+DocType: Delivery Note,% of materials delivered against this Delivery Note,% der Materialien welche zu diesen Kundenauftrag geliefert  wurden
 DocType: Customer,Customer Details,Kundendaten
 DocType: Employee,Reports to,Berichte an
 DocType: SMS Settings,Enter url parameter for receiver nos,URL-Parameter für Empfängernummern eingeben
@@ -3022,7 +3052,7 @@
 ,Available Stock for Packing Items,Verfügbarer Bestand für Verpackungsartikel
 DocType: Item Variant,Item Variant,Artikelvariante
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Diese Adressvorlage als Standard einstellen, da es keinen anderen Standard gibt"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Qualitätsmanagement
 DocType: Production Planning Tool,Filter based on customer,Filtern nach Kunden
 DocType: Payment Tool Detail,Against Voucher No,Gegenbeleg-Nr.
@@ -3039,6 +3069,7 @@
 DocType: Opportunity,Next Contact,Nächster Kontakt
 DocType: Employee,Employment Type,Art der Beschäftigung
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlagevermögen
+,Cash Flow,Cash Flow
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Beantragter Zeitraum kann sich nicht über zwei Antragsdatensätze erstrecken
 DocType: Item Group,Default Expense Account,Standardaufwandskonto
 DocType: Employee,Notice (days),Meldung(s)(-Tage)
@@ -3070,13 +3101,12 @@
 DocType: Production Order,Warehouses,Lager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Druck- und Schreibwaren
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppen-Knoten
-DocType: Payment Reconciliation,Minimum Amount,Mindestbetrag
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Fertigwaren aktualisieren
 DocType: Workstation,per hour,pro stunde
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto für das Lager (Permanente Inventur) wird unter diesem Konto erstellt.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kann nicht gelöscht werden, da es Buchungen im Lagerbuch gibt."
 DocType: Company,Distribution,Großhandel
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zahlbetrag
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Zahlbetrag
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektleiter
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Versand
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max erlaubter Rabatt für Artikel: {0} ist {1}%
@@ -3100,7 +3130,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support-Analyse
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Firma fehlt in Lägern {0}
 DocType: POS Profile,Terms and Conditions,Allgemeine Geschäftsbedingungen
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Bis-Datum sollte im Geschäftsjahr liegen. Unter der Annahme, dass Bis-Datum = {0} ist"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},"Bis-Datum sollte im Geschäftsjahr liegen. Unter der Annahme, dass Bis-Datum = {0} ist"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hier können Sie Größe, Gewicht, Allergien, medizinische Belange usw. pflegen"
 DocType: Leave Block List,Applies to Company,Gilt für Firma
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Stornierung nicht möglich, weil übertragene Lagerbuchung {0} existiert"
@@ -3114,11 +3144,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Bitte Kaufbelege eingeben
 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 +425,Transaction not allowed against stopped Production Order {0},Transaktion für angehaltenen Fertigungsauftrag {0} nicht erlaubt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),E-Mail-Adresse für den Support einrichten. (z. B. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Engpassmenge
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
 DocType: Salary Slip,Salary Slip,Gehaltsabrechnung
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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."
@@ -3136,7 +3166,7 @@
 ,Requested Items To Be Transferred,"Angeforderte Artikel, die übertragen werden sollen"
 DocType: Purchase Invoice,Recurring Id,Wiederkehrende ID
 DocType: Customer,Sales Team Details,Verkaufsteamdetails
-DocType: Expense Claim,Total Claimed Amount,Summe des geforderten Betrags
+DocType: Expense Claim,Total Claimed Amount,Gesamtforderung
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Mögliche Opportunity für den Vertrieb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Ungültige(r) {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Krankheitsbedingte Abwesenheit
@@ -3207,7 +3237,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Mitarbeiterdatensätze
 DocType: HR Settings,Payroll Settings,Einstellungen zur Gehaltsabrechnung
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Nicht verknüpfte Rechnungen und Zahlungen verknüpfen
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Bestellung aufgeben
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Bestellung aufgeben
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kann keine übergeordnete Kostenstelle haben
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Marke auswählen ...
 DocType: Sales Invoice,C-Form Applicable,Anwenden auf Kontakt-Formular
@@ -3222,7 +3252,7 @@
 DocType: Appraisal,Start Date,Startdatum
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Urlaube für einen Zeitraum zuordnen
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Hier klicken um die Richtigkeit zu bestätigen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Sie können dieses Konto sich selbst nicht als Über-Konto zuweisen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Konto {0}: Sie können dieses Konto sich selbst nicht als Über-Konto zuweisen
 DocType: Purchase Invoice Item,Price List Rate,Preisliste
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","""Auf Lager"" oder ""Nicht auf Lager"" basierend auf dem in diesem Lager enthaltenen Bestand anzeigen"
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Stückliste
@@ -3231,17 +3261,17 @@
 DocType: Project,Expected Start Date,Voraussichtliches Startdatum
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Artikel entfernen, wenn keine Gebühren angerechtet werden können"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,z. B. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Empfangen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Empfangen
 DocType: Maintenance Visit,Fully Completed,Vollständig abgeschlossen
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% abgeschlossen
 DocType: Employee,Educational Qualification,Schulische Qualifikation
 DocType: Workstation,Operating Costs,Betriebskosten
 DocType: Employee Leave Approver,Employee Leave Approver,Urlaubsgenehmiger des Mitarbeiters
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} wurde erfolgreich zu unserer Newsletter-Liste hinzugefügt.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Kann nicht als verloren deklariert werden, da bereits ein Angebot erstellt wurde."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Einkaufsstammdaten-Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Fertigungsauftrag {0} muss übertragen werden
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Fertigungsauftrag {0} muss übertragen werden
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Bitte Start -und Enddatum für den Artikel {0} auswählen
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Hauptberichte
 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
@@ -3259,7 +3289,7 @@
 DocType: Industry Type,Industry Type,Wirtschaftsbranche
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Etwas ist schiefgelaufen!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Achtung: Die Urlaubsverwaltung enthält die folgenden gesperrten Daten
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Ausgangsrechnung {0} wurde bereits übertragen
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Ausgangsrechnung {0} wurde bereits übertragen
 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/config/hr.py +105,Organization unit (department) master.,Stammdaten der Organisationseinheit (Abteilung)
@@ -3270,7 +3300,7 @@
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Bitte SMS-Einstellungen aktualisieren
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Zeitprotokoll {0} bereits abgerechnet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Ungesicherte Kredite
-DocType: Cost Center,Cost Center Name,Kostenstellenname
+DocType: Cost Center,Cost Center Name,Kostenstellenbezeichnung
 DocType: Maintenance Schedule Detail,Scheduled Date,Geplantes Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,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
@@ -3278,10 +3308,10 @@
 ,Serial No Service Contract Expiry,Ablaufdatum des Wartungsvertrags zu Seriennummer
 DocType: Item,Unit of Measure Conversion,Maßeinheit-Konvertierung
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Mitarbeiter kann nicht verändert werden
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Sie können ein Konto nicht gleichzeitig be- und entlasten
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Sie können ein Konto nicht gleichzeitig be- und entlasten
 DocType: Naming Series,Help HTML,HTML-Hilfe
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Summe der zugeordneten Gewichtungen sollte 100% sein. Sie ist {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Zustimmung für Artikel {1} bei Überschreitung von {0}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Zustimmung für Artikel {1} bei Überschreitung von {0}
 DocType: Address,Name of person or organization that this address belongs to.,"Name der Person oder des Unternehmens, zu dem diese Adresse gehört."
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Ihre Lieferanten
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Kann nicht als verloren gekennzeichnet werden, da ein Kundenauftrag dazu existiert."
@@ -3294,37 +3324,37 @@
 DocType: Employee,Date of Issue,Ausstellungsdatum
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Von {0} für {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Zeile #{0}: Lieferanten für Artikel {1} einstellen
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,Website Bild {0} um {1} Artikel angebracht kann nicht gefunden werden
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Bitte die Option ""Unterschiedliche Währungen"" aktivieren um Konten mit anderen Währungen zu erlauben"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,"Bitte die Option ""Unterschiedliche Währungen"" aktivieren um Konten mit anderen Währungen zu erlauben"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Artikel: {0} ist nicht im System vorhanden
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Sie haben keine Berechtigung gesperrte Werte zu setzen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Sie haben keine Berechtigung gesperrte Werte zu setzen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nicht zugeordnete Buchungen aufrufen
+DocType: Payment Reconciliation,From Invoice Date,Ab Rechnungsdatum
 DocType: Cost Center,Budgets,Budgets
-DocType: Employee,Emergency Contact Details,Notfallkontaktdaten
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Unternehmenszweck
 DocType: Delivery Note,To Warehouse,An Lager
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} wurde mehr als einmal für das Geschäftsjahr {1} erfasst
 ,Average Commission Rate,Durchschnittlicher Provisionssatz
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'Has Serial No' can not be 'Yes' for non-stock item,"""Hat Seriennummer"" kann bei Nicht-Lagerartikeln nicht ""Ja"" sein"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,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
 DocType: Purchase Taxes and Charges,Account Head,Kontobezeichnung
 apps/erpnext/erpnext/config/stock.py +79,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 +111,Electrical,Elektro
 DocType: Stock Entry,Total Value Difference (Out - In),Gesamt-Wertdifferenz (Aus - Ein)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Wechselkurs ist obligatorisch
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Row {0}: Wechselkurs ist obligatorisch
 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
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Von Garantieantrag
 DocType: Stock Entry,Default Source Warehouse,Standard-Ausgangslager
 DocType: Item,Customer Code,Kunden-Nr.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Geburtstagserinnerung für {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Tage seit dem letzten Auftrag
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,Urlaubssperrenliste Name
+DocType: Leave Block List,Leave Block List Name,Name der Urlaubssperrenliste
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Wertpapiere
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Wollen Sie wirklich alle Gehaltsabrechnungen für den Monat {0} und das Jahr {1} übertragen
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import-Abonnenten
@@ -3335,7 +3365,7 @@
 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
 DocType: Authorization Rule,Based On,Basiert auf
 DocType: Sales Order Item,Ordered Qty,Bestellte Menge
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Artikel {0} ist deaktiviert
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Artikel {0} ist deaktiviert
 DocType: Stock Settings,Stock Frozen Upto,Bestand gesperrt bis
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Ab-Zeitraum und Bis-Zeitraum sind zwingend erforderlich für wiederkehrende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivität/Aufgabe
@@ -3343,7 +3373,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Abschreibungs-Betrag (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beleg über Einstandskosten
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Bitte {0} setzen
 DocType: Purchase Invoice,Repeat on Day of Month,Wiederholen an Tag des Monats
@@ -3353,7 +3383,7 @@
 DocType: Project,Estimated Costing,Geschätzte Kosten
 DocType: Purchase Invoice Advance,Journal Entry Detail No,Buchungssatz-Detail-Nr.
 DocType: Employee External Work History,Salary,Gehalt
-DocType: Serial No,Delivery Document Type,Lieferbelegtyp
+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
@@ -3373,12 +3403,12 @@
 DocType: Upload Attendance,Upload Attendance,Anwesenheit hochladen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Stückliste und Fertigungsmenge werden benötigt
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Alter Bereich 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Betrag
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Betrag
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stückliste ersetzt
 ,Sales Analytics,Vertriebsanalyse
 DocType: Manufacturing Settings,Manufacturing Settings,Fertigungseinstellungen
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,E-Mail einrichten
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Bitte die Standardwährung in die Firmenstammdaten eingeben
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Tägliche Erinnerungen
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Steuer-Regel steht in Konflikt mit {0}
@@ -3404,13 +3434,13 @@
 DocType: Sales Order Item,Produced Quantity,Produzierte Menge
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingenieur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Unterbaugruppen suchen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Artikelnummer wird in Zeile {0} benötigt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Artikelnummer wird in Zeile {0} benötigt
 DocType: Sales Partner,Partner Type,Partnertyp
 DocType: Purchase Taxes and Charges,Actual,Tatsächlich
 DocType: Authorization Rule,Customerwise Discount,Kundenspezifischer Rabatt
 DocType: Purchase Invoice,Against Expense Account,Zu Aufwandskonto
 DocType: Production Order,Production Order,Fertigungsauftrag
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installationshinweis {0} wurde bereits übertragen
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Installationshinweis {0} wurde bereits übertragen
 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
@@ -3422,15 +3452,15 @@
 DocType: Employee,Applicable Holiday List,Geltende Urlaubsliste
 DocType: Employee,Cheque,Scheck
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serie aktualisiert
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Berichtstyp ist zwingend erforderlich
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Berichtstyp ist zwingend erforderlich
 DocType: Item,Serial Number Series,Serie der Seriennummer
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,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/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/public/js/setup_wizard.js +101,The First User: You,Der erste Benutzer: Sie selbst!
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Erfolgreich abgestimmt
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Erfolgreich abgestimmt
 DocType: Production Order,Planned End Date,Geplantes Enddatum
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ort an dem Artikel gelagert werden
 DocType: Tax Rule,Validity,Gültigkeit
@@ -3438,8 +3468,8 @@
 DocType: Attendance,Attendance,Anwesenheit
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit sind zwingend erfoderlich
-apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Steuer-Vorlage für Einkaufstransaktionen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit sind zwingend erfoderlich
+apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Steuervorlage für Einkaufstransaktionen
 ,Item Prices,Artikelpreise
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"""In Worten"" wird sichtbar, sobald Sie den Lieferantenauftrag speichern."
 DocType: Period Closing Voucher,Period Closing Voucher,Periodenabschlussbeleg
@@ -3447,15 +3477,15 @@
 DocType: Task,Review Date,Überprüfungsdatum
 DocType: Purchase Invoice,Advance Payments,Anzahlungen
 DocType: Purchase Taxes and Charges,On Net Total,Auf Nettosumme
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Eingangslager in Zeile {0} muss dem Fertigungsauftrag entsprechen
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,"Keine Berechtigung, das Zahlungswerkzeug zu benutzen"
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""Benachrichtigungs-E-Mail-Adresse"" nicht angegeben für das wiederkehrende Ereignis %s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Abschlusskonto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Verwaltungskosten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Beratung
 DocType: Customer Group,Parent Customer Group,Übergeordnete Kundengruppe
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ändern
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Ändern
 DocType: Purchase Invoice,Contact Email,Kontakt-E-Mail
 DocType: Appraisal Goal,Score Earned,Erreichte Punktzahl
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","z. B. ""Meine Firma GmbH"""
@@ -3465,13 +3495,13 @@
 DocType: Packing Slip,Gross Weight UOM,Bruttogewicht-Maßeinheit
 DocType: Email Digest,Receivables / Payables,Forderungen/Verbindlichkeiten
 DocType: Delivery Note Item,Against Sales Invoice,Zu Ausgangsrechnung
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Guthabenkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Guthabenkonto
 DocType: Landed Cost Item,Landed Cost Item,Einstandspreis-Artikel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Nullwerte anzeigen
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Menge eines Artikels nach der Herstellung/dem Umpacken auf Basis vorgegebener Mengen von Rohmaterial
 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 +562,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
 DocType: Item,Default Warehouse,Standardlager
 DocType: Task,Actual End Date (via Time Logs),Tatsächliches Enddatum (über Zeitprotokoll)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kann nicht einem Gruppenkonto {0} zugeordnet werden
@@ -3507,29 +3537,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zeiten außerhalb der normalen Arbeitszeiten am Arbeitsplatz zulassen.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} wurde bereits übertragen
 ,Items To Be Requested,Anzufragende Artikel
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Letzten Einkaufspreis aufrufen
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Rechnungsbetrag basierend auf Aktivitätsart (pro Stunde)
 DocType: Company,Company Info,Informationen über das Unternehmen
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","ID der Firmen-E-Mail-Adresse wurde nicht gefunden, deshalb wird die E-Mail nicht gesendet"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Mittelverwendung (Aktiva)
 DocType: Production Planning Tool,Filter based on item,Filtern nach Artikeln
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Sollkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Sollkonto
 DocType: Fiscal Year,Year Start Date,Startdatum des Geschäftsjahres
 DocType: Attendance,Employee Name,Mitarbeitername
 DocType: Sales Invoice,Rounded Total (Company Currency),Gerundete Gesamtsumme (Firmenwährung)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Kann nicht in keine Gruppe umgewandelt werden, weil Kontentyp ausgewählt ist."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Kann nicht in keine Gruppe umgewandelt werden, weil Kontentyp ausgewählt ist."
 DocType: Purchase Common,Purchase Common,Einkauf Allgemein
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} wurde geändert. Bitte aktualisieren.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Benutzer davon abhalten, Urlaubsanträge für folgende Tage einzureichen."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Von Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Vergünstigungen an Mitarbeiter
 DocType: Sales Invoice,Is POS,Ist POS (Point of Sale)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Verpackte Menge muss gleich der Menge des Artikel {0} in Zeile {1} sein
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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,Hergestellte Menge
 DocType: Purchase Receipt Item,Accepted Quantity,Angenommene Menge
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} existiert nicht
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Rechnungen an Kunden
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} Empfänger hinzugefügt
 DocType: Maintenance Schedule,Schedule,Zeitplan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Budget für diese Kostenstelle definieren. Um das Budget wirksam werden zu lassen, bitte Unternehmensliste anschauen"
@@ -3537,7 +3568,7 @@
 DocType: Quality Inspection Reading,Reading 3,Ablesewert 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Belegtyp
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
 DocType: Expense Claim,Approved,Genehmigt
 DocType: Pricing Rule,Price,Preis
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden"
@@ -3551,7 +3582,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Buchungssätze
 DocType: Delivery Note Item,Available Qty at From Warehouse,Verfügbare Stückzahl im Ausgangslager
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Bitte zuerst Mitarbeiterdatensatz auswählen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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/accounts/doctype/journal_entry/journal_entry.py +191,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/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Um ein Steuerkonto zu erstellen
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Bitte das Aufwandskonto angeben
 DocType: Account,Stock,Lagerbestand
@@ -3562,7 +3593,7 @@
 DocType: Employee,Contract End Date,Vertragsende
 DocType: Sales Order,Track this Sales Order against any Project,Diesen Kundenauftrag in jedem Projekt nachverfolgen
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Aufträge (deren Lieferung aussteht) entsprechend der oben genannten Kriterien abrufen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Von Lieferantenangebot
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Von Lieferantenangebot
 DocType: Deduction Type,Deduction Type,Abzugsart
 DocType: Attendance,Half Day,Halbtags
 DocType: Pricing Rule,Min Qty,Mindestmenge
@@ -3570,7 +3601,7 @@
 DocType: GL Entry,Transaction Date,Transaktionsdatum
 DocType: Production Plan Item,Planned Qty,Geplante Menge
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Summe Steuern
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Für Menge (hergestellte Menge) ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Für Menge (hergestellte Menge) ist zwingend erforderlich
 DocType: Stock Entry,Default Target Warehouse,Standard-Eingangslager
 DocType: Purchase Invoice,Net Total (Company Currency),Nettosumme (Firmenwährung)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,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
@@ -3611,7 +3642,7 @@
 DocType: Purchase Invoice,Next Date,Nächster Termin
 DocType: Employee Education,Major/Optional Subjects,Wichtiger/wahlweiser Betreff
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Bitte Steuern und Gebühren eingeben
-DocType: Sales Invoice Item,Drop Ship,Direktlieferung
+DocType: Sales Invoice Item,Drop Ship,Streckengeschäft
 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: Hub Settings,Seller Name,Name des Verkäufers
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Steuern und Gebühren abgezogen (Firmenwährung)
@@ -3624,9 +3655,9 @@
 DocType: Customer,Commission Rate,Provisionssatz
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Variante erstellen
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Urlaubsanträge pro Abteilung sperren
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Der Warenkorb ist leer
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Der Warenkorb ist leer
 DocType: Production Order,Actual Operating Cost,Tatsächliche Betriebskosten
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root kann nicht bearbeitet werden.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root kann nicht bearbeitet werden.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Zugewiesene Menge kann nicht größer sein als unbereinigte Menge
 DocType: Manufacturing Settings,Allow Production on Holidays,Fertigung im Urlaub zulassen
 DocType: Sales Order,Customer's Purchase Order Date,Kundenauftragsdatum
@@ -3637,11 +3668,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Konstrukteur
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vorlage für Allgemeine Geschäftsbedingungen
 DocType: Serial No,Delivery Details,Lieferdetails
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatisch Materialfrage erstellen, wenn die Menge unter diesen Wert fällt"
 ,Item-wise Purchase Register,Artikelbezogene Übersicht der Einkäufe
 DocType: Batch,Expiry Date,Verfalldatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Um den Meldebestand festzulegen, muss der Artikel ein Einkaufsartikel oder ein Fertigungsartiel sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Um den Meldebestand festzulegen, muss der Artikel ein Einkaufsartikel oder ein Fertigungsartiel sein"
 ,Supplier Addresses and Contacts,Lieferanten-Adressen und Kontaktdaten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Bitte zuerst Kategorie auswählen
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt-Stammdaten
@@ -3649,7 +3680,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Halbtags)
 DocType: Supplier,Credit Days,Zahlungsziel
 DocType: Leave Type,Is Carry Forward,Ist Übertrag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Artikel aus der Stückliste holen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Stückliste
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Zeile {0}: Gruppen-Typ und Gruppe sind für Forderungen-/Verbindlichkeiten-Konto {1} zwingend erforderlich
@@ -3657,7 +3688,7 @@
 DocType: Employee,Reason for Leaving,Grund für den Austritt
 DocType: Expense Claim Detail,Sanctioned Amount,Genehmigter Betrag
 DocType: GL Entry,Is Opening,Ist Eröffnungsbuchung
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konto {0} existiert nicht
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Konto {0} existiert nicht
 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 725ac5b..8e0ea6e 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Καταναλωτικά προϊόντα
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Επιλέξτε Τύπος Πάρτυ πρώτη
 DocType: Item,Customer Items,Είδη πελάτη
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν μπορεί να είναι καθολικός
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν μπορεί να είναι καθολικός
 DocType: Item,Publish Item to hub.erpnext.com,Δημοσίευση είδους στο hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Ειδοποιήσεις μέσω email
 DocType: Item,Default Unit of Measure,Προεπιλεγμένη μονάδα μέτρησης
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,Επικοινωνία Πελατών
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Από αίτηση υλικού
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Από αίτηση υλικού
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Δέντρο
 DocType: Job Applicant,Job Applicant,Αιτών εργασία
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Δεν υπάρχουν άλλα αποτελέσματα.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Για να διατηρήσετε τον πελατοκεντρικό κωδικό είδους και να καταστούν προσβάσιμα με βάση τον κωδικό τους, χρησιμοποιήστε αυτή την επιλογή"
 DocType: Mode of Payment Account,Mode of Payment Account,Λογαριασμός τρόπου πληρωμής
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Προβολή παραλλαγών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Ποσότητα
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Ποσότητα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Δάνεια (παθητικό )
 DocType: Employee Education,Year of Passing,Έτος περάσματος
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Σε Απόθεμα
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Υγειονομική περίθαλψη
 DocType: Purchase Invoice,Monthly,Μηνιαίος
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Καθυστέρηση στην πληρωμή (Ημέρες)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Τιμολόγιο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Τιμολόγιο
 DocType: Maintenance Schedule Item,Periodicity,Περιοδικότητα
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Διεύθυνση ηλεκτρονικού ταχυδρομείου
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Χρήσεως {0} απαιτείται
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Άμυνα
 DocType: Company,Abbr,Συντ.
 DocType: Appraisal Goal,Score (0-5),Αποτέλεσμα (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Γραμμή {0}: {1} {2} δεν ταιριάζει με το {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Γραμμή {0}: {1} {2} δεν ταιριάζει με το {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Γραμμή # {0}:
 DocType: Delivery Note,Vehicle No,Αρ. οχήματος
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Παρακαλώ επιλέξτε τιμοκατάλογο
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Παρακαλώ επιλέξτε τιμοκατάλογο
 DocType: Production Order Operation,Work In Progress,Εργασία σε εξέλιξη
 DocType: Employee,Holiday List,Λίστα αργιών
 DocType: Time Log,Time Log,Αρχείο καταγραφής χρονολογίου
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ίδια Εταιρεία καταχωρήθηκε περισσότερο από μία φορά
 DocType: Employee,Married,Παντρεμένος
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Δεν επιτρέπεται η {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
 DocType: Payment Reconciliation,Reconcile,Συμφωνήστε
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Παντοπωλείο
 DocType: Quality Inspection Reading,Reading 1,Μέτρηση 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Δημιούργησε εγγυητική τραπέζης
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Ιδιωτικά ταμεία συντάξεων
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Η αποθήκη είναι απαραίτητη αν ο τύπος του λογαριασμού είναι 'Αποθήκη'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Η αποθήκη είναι απαραίτητη αν ο τύπος του λογαριασμού είναι 'Αποθήκη'
 DocType: SMS Center,All Sales Person,Όλοι οι πωλητές
 DocType: Lead,Person Name,Όνομα Πρόσωπο
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Επιλέξτε αν είναι επαναλαμβανόμενη παραγγελία, καταργήστε την επιλογή για να σταματήσει η επανάληψη ή θέστε σωστή ημερομηνία λήξης"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Ενδιαφερόμενος
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Λίστα υλικών
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Άνοιγμα
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Από {0} έως {1}
+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,Αρχική καταχώρηση
 DocType: Stock Entry,Additional Costs,Πρόσθετα έξοδα
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα.
 DocType: Lead,Product Enquiry,Ερώτηση για προϊόν
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Παρακαλώ εισάγετε πρώτα εταιρεία
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,Στόχος στις
+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 +9,Activity Log:,Αρχείο καταγραφής δραστηριότητας:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Το είδος {0} δεν υπάρχει στο σύστημα ή έχει λήξει
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Το είδος {0} πρέπει να είναι ένα είδος αγοράς
 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 +444,Item {0} is not active or end of life has been reached,Το είδος {0} δεν είναι ενεργό ή το τέλος της ζωής έχει περάσει
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,Το είδος {0} δεν είναι ενεργό ή το τέλος της ζωής έχει περάσει
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Θα ενημερωθεί μετά τήν έκδοση του τιμολογίου πωλήσεων.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Ρυθμίσεις για τη λειτουργική μονάδα HR
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Λεπτομέρειες σχετικά με τις λειτουργίες που πραγματοποιούνται.
 DocType: Serial No,Maintenance Status,Κατάσταση συντήρησης
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Προϊόντα και Τιμολόγηση
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Το πεδίο από ημερομηνία πρέπει να είναι εντός της χρήσης. Υποθέτοντας από ημερομηνία = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Το πεδίο από ημερομηνία πρέπει να είναι εντός της χρήσης. Υποθέτοντας από ημερομηνία = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Επιλέξτε τον υπάλληλο για τον οποίο δημιουργείται η εκτίμηση.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Το κέντρο κόστους {0} δεν ανήκει στην εταιρεία {1}
 DocType: Customer,Individual,Άτομο
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Καθαρές ροές από επενδυτικές
 DocType: Lead,Address & Contact,Διεύθυνση & Επαφή
 DocType: Leave Allocation,Add unused leaves from previous allocations,Προσθήκη αχρησιμοποίητα φύλλα από προηγούμενες κατανομές
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Το επόμενο επαναλαμβανόμενο {0} θα δημιουργηθεί στις {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Όνομα επαφής
 DocType: Production Plan Item,SO Pending Qty,Εκκρεμής ποσότητα παρ. πώλησης
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Δημιουργεί βεβαίωση αποδοχών για τα προαναφερόμενα κριτήρια.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Δεν έχει δοθεί περιγραφή
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Αίτηση αγοράς.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Μόνο ο επιλεγμένος υπεύθυνος έγκρισης άδειας μπορεί να υποβάλλει αυτήν την αίτηση άδειας
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Η ημερομηνία απαλλαγής πρέπει να είναι μεταγενέστερη από την ημερομηνία ένταξης
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Προδιαγραφή ιστότοπου για το είδος
 DocType: Payment Tool,Reference No,Αριθμός αναφοράς
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Η άδεια εμποδίστηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Ετήσιος
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Είδος συμφωνίας αποθέματος
 DocType: Stock Entry,Sales Invoice No,Αρ. Τιμολογίου πώλησης
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Τύπος προμηθευτή
 DocType: Item,Publish in Hub,Δημοσίευση στο hub
 ,Terretory,Περιοχή
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Αίτηση υλικού
 DocType: Bank Reconciliation,Update Clearance Date,Ενημέρωση ημερομηνίας εκκαθάρισης
 DocType: Item,Purchase Details,Λεπτομέρειες αγοράς
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Θέση {0} δεν βρέθηκε στο «πρώτες ύλες που προμηθεύεται« πίνακα Εντολή Αγοράς {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Θέση {0} δεν βρέθηκε στο «πρώτες ύλες που προμηθεύεται« πίνακα Εντολή Αγοράς {1}
 DocType: Employee,Relation,Σχέση
 DocType: Shipping Rule,Worldwide Shipping,Παγκόσμια ναυτιλία
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Επιβεβαιωμένες παραγγελίες από πελάτες.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Προτάσεις
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Ορισμός προϋπολογισμών ανά ομάδα είδους για αυτήν την περιοχή. Μπορείτε επίσης να συμπεριλάβετε εποχικότητα ρυθμίζοντας τη διανομή.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Παρακαλώ εισάγετε την γονική ομάδα λογαριασμού για την αποθήκη {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Πληρωμή κατά {0} {1} δεν μπορεί να είναι μεγαλύτερη από ό, τι οφειλόμενο ποσό {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Πληρωμή κατά {0} {1} δεν μπορεί να είναι μεγαλύτερη από ό, τι οφειλόμενο ποσό {2}"
 DocType: Supplier,Address HTML,Διεύθυνση ΗΤΜΛ
 DocType: Lead,Mobile No.,Αρ. Κινητού
 DocType: Maintenance Schedule,Generate Schedule,Δημιούργησε πρόγραμμα
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Το πιο πρόσφατο
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Μέγιστο 5 χαρακτήρες
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Ο πρώτος υπεύθυνος αδειών στον κατάλογο θα οριστεί ως ο προεπιλεγμένος υπεύθυνος αδειών
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Μαθαίνω
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Δραστηριότητα κόστος ανά εργαζόμενο
 DocType: Accounts Settings,Settings for Accounts,Ρυθμίσεις για τους λογαριασμούς
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Διαχειριστείτε το δέντρο πωλητών.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Πολλαπλό Νόμισμα
 DocType: Payment Reconciliation Invoice,Invoice Type,Τύπος τιμολογίου
 DocType: Sales Invoice Item,Delivery Note,Δελτίο αποστολής
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Ρύθμιση Φόροι
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Ρύθμιση Φόροι
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Η καταχώηρση πληρωμής έχει τροποποιηθεί μετά την λήψη της. Παρακαλώ επαναλάβετε τη λήψη.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Περίληψη για αυτή την εβδομάδα και εν αναμονή δραστηριότητες
 DocType: Workstation,Rent Cost,Κόστος ενοικίασης
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Παρακαλώ επιλέξτε μήνα και έτος
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Διαθέσιμο σε Λ.Υ., Δελτίο αποστολής, τιμολόγιο αγοράς, αίτηση παραγωγής, παραγγελία αγοράς, αποδεικτικό παραλαβής αγοράς, τιμολόγιο πωλήσεων, παραγγελίες πώλησης, καταχώρηση αποθέματος, φύλλο κατανομής χρόνου"
 DocType: Item Tax,Tax Rate,Φορολογικός συντελεστής
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Επιλέξτε Προϊόν
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Επιλέξτε Προϊόν
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Το είδος: {0} όσον αφορά παρτίδες, δεν μπορεί να συμφωνηθεί με τη χρήση \ συμφωνιών αποθέματος, χρησιμοποιήστε καταχωρήσεις αποθέματος"""
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Σειρά # {0}: Παρτίδα Δεν πρέπει να είναι ίδιο με το {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Μετατροπή σε μη-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Το αποδεικτικό παραλαβής αγοράς πρέπει να υποβληθεί
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Ιατρικός
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Αιτιολογία απώλειας
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,Μονό
 DocType: Issue,Attachment,Κατάσχεση
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Ο προϋπολογισμός δεν μπορεί να ρυθμιστεί για την Ομάδα Κέντρου Κόστους
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,Κύρια εγγραφή αργιών.
 DocType: Material Request Item,Required Date,Απαιτούμενη ημερομηνία
 DocType: Delivery Note,Billing Address,Διεύθυνση χρέωσης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Παρακαλώ εισάγετε κωδικό είδους.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Παρακαλώ εισάγετε κωδικό είδους.
 DocType: BOM,Costing,Κοστολόγηση
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Εάν είναι επιλεγμένο, το ποσό του φόρου θα πρέπει να θεωρείται ότι έχει ήδη συμπεριληφθεί στην τιμή / ποσό εκτύπωσης"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Συνολική ποσότητα
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
 DocType: Shipping Rule,Net Weight,Καθαρό βάρος
 DocType: Employee,Emergency Phone,Τηλέφωνο έκτακτης ανάγκης
 ,Serial No Warranty Expiry,Ημερομηνία λήξης της εγγύησης του σειριακού αριθμού
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Προσαύξηση δεν μπορεί να είναι 0
 DocType: Production Planning Tool,Material Requirement,Απαίτηση υλικού
 DocType: Company,Delete Company Transactions,Διαγραφή Συναλλαγές Εταιρείας
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Το είδος {0} δεν είναι είδος αγοράς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Το είδος {0} δεν είναι είδος αγοράς
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",Η {0} είναι μια μη έγκυρη διεύθυνση email στην ηλεκτρονική διεύθυνση κοινοποίησης
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Συνολική τιμολόγηση αυτό το έτος:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Προσθήκη / επεξεργασία φόρων και επιβαρύνσεων
 DocType: Purchase Invoice,Supplier Invoice No,Αρ. τιμολογίου του προμηθευτή
 DocType: Territory,For reference,Για αναφορά
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Δεν μπορείτε να διαγράψετε Αύξων αριθμός {0}, όπως χρησιμοποιείται στις συναλλαγές μετοχών"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Κλείσιμο (cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Κλείσιμο (cr)
 DocType: Serial No,Warranty Period (Days),Περίοδος εγγύησης (ημέρες)
 DocType: Installation Note Item,Installation Note Item,Είδος σημείωσης εγκατάστασης
 ,Pending Qty,Εν αναμονή Ποσότητα
@@ -463,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Η μηνιαία κατανομή ** σας βοηθά να διανείμετε τον προϋπολογισμό σας σε μήνες, αν έχετε εποχικότητα στην επιχείρησή σας.
 
  Για να κατανέμετε τον προϋπολογισμό χρησιμοποιώντας αυτή την κατανομή ορίστε αυτή την ** μηνιαία κατανομή ** στο ** κέντρο κόστους **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Δεν βρέθηκαν εγγραφές στον πίνακα τιμολογίων
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Δεν βρέθηκαν εγγραφές στον πίνακα τιμολογίων
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Παρακαλώ επιλέξτε πρώτα εταιρεία και τύπο συμβαλλόμενου
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Οικονομικό / λογιστικό έτος.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Λυπούμαστε, οι σειριακοί αρ. δεν μπορούν να συγχωνευθούν"
@@ -471,9 +474,9 @@
 DocType: Project Task,Project Task,Πρόγραμμα εργασιών
 ,Lead Id,ID επαφής
 DocType: C-Form Invoice Detail,Grand Total,Γενικό σύνολο
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Η ημερομηνία έναρξης για τη χρήση δεν πρέπει να είναι μεταγενέστερη της ημερομηνία λήξης
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Η ημερομηνία έναρξης για τη χρήση δεν πρέπει να είναι μεταγενέστερη της ημερομηνία λήξης
 DocType: Warranty Claim,Resolution,Επίλυση
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Δημοσιεύθηκε: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Δημοσιεύθηκε: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Πληρωτέος λογαριασμός
 DocType: Sales Order,Billing and Delivery Status,Χρέωση και Παράδοσης Κατάσταση
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Επαναλαμβανόμενοι πελάτες
@@ -488,7 +491,7 @@
 DocType: Quotation,Quotation To,Προσφορά προς
 DocType: Lead,Middle Income,Μέσα έσοδα
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Άνοιγμα ( cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Το χορηγούμενο ποσό δεν μπορεί να είναι αρνητικό
 DocType: Purchase Order Item,Billed Amt,Χρεωμένο ποσό
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Μια λογική αποθήκη στην οποία θα γίνονται οι καταχωρήσεις αποθέματος
@@ -497,7 +500,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Η εντολή παραγωγής είναι υποχρεωτική
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Συγγραφή πρότασης
 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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Σφάλμα αρνητικού αποθέματος ({6}) για το είδος {0} στην αποθήκη {1} στο {2} {3} σε {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Σφάλμα αρνητικού αποθέματος ({6}) για το είδος {0} στην αποθήκη {1} στο {2} {3} σε {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Εταιρεία χρήσης
 DocType: Packing Slip Item,DN Detail,Λεπτομέρεια dn
 DocType: Time Log,Billed,Χρεώνεται
@@ -516,16 +519,17 @@
 DocType: Activity Type,Default Costing Rate,Προεπιλογή Κοστολόγηση Τιμή
 DocType: Maintenance Schedule,Maintenance Schedule,Χρονοδιάγραμμα συντήρησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Στη συνέχεια, οι κανόνες τιμολόγησης φιλτράρονται με βάση τους πελάτες, την ομάδα πελατών, την περιοχή, τον προμηθευτής, τον τύπο του προμηθευτή, την εκστρατεία, τον συνεργάτη πωλήσεων κ.λ.π."
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Καθαρή Αλλαγή στο Απογραφή
 DocType: Employee,Passport Number,Αριθμός διαβατηρίου
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Προϊστάμενος
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Από το αποδεικτικό παραλαβής αγοράς
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Το ίδιο είδος έχει εισαχθεί πολλές φορές.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Από το αποδεικτικό παραλαβής αγοράς
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Το ίδιο είδος έχει εισαχθεί πολλές φορές.
 DocType: SMS Settings,Receiver Parameter,Παράμετρος παραλήπτη
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,Τα πεδία με βάση και ομαδοποίηση κατά δεν μπορεί να είναι ίδια
 DocType: Sales Person,Sales Person Targets,Στόχοι πωλητή
 DocType: Production Order Operation,In minutes,Σε λεπτά
 DocType: Issue,Resolution Date,Ημερομηνία επίλυσης
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
 DocType: Selling Settings,Customer Naming By,Ονομασία πελάτη από
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Μετατροπή σε ομάδα
 DocType: Activity Cost,Activity Type,Τύπος δραστηριότητας
@@ -536,7 +540,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} Δεν βρέθηκε στον πίνακα στοιχείων τιμολογίου
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Η επίσκεψη συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
 DocType: Material Request,Material Transfer,Μεταφορά υλικού
@@ -558,13 +562,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Για να παρακολουθήσετε το είδος στα παραστατικά πωλήσεων και αγοράς με βάση τους σειριακούς τους αριθμούς. Μπορεί επίσης να χρησιμοποιηθεί για να παρακολουθείτε τις λεπτομέρειες της εγγύησης του προϊόντος.
 DocType: Purchase Receipt Item Supplied,Current Stock,Τρέχον απόθεμα
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Η αποθήκη απορριφθέντων είναι απαραίτητη για το είδος που απορρίφθηκε
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Σύνολο χρέωσης του τρέχοντος έτους
 DocType: Account,Expenses Included In Valuation,Δαπάνες που περιλαμβάνονται στην αποτίμηση
 DocType: Employee,Provide email id registered in company,Παρέχετε ένα email ID εγγεγραμμένο στην εταιρεία
 DocType: Hub Settings,Seller City,Πόλη πωλητή
 DocType: Email Digest,Next email will be sent on:,Το επόμενο μήνυμα email θα αποσταλεί στις:
 DocType: Offer Letter Term,Offer Letter Term,Προσφορά Επιστολή Όρος
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Στοιχείο έχει παραλλαγές.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Τύπος δέντρου
@@ -582,18 +586,18 @@
 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 +92,{0} is not a stock Item,Το {0} δεν είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,Το {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Mode of Payment Account,Default Account,Προεπιλεγμένος λογαριασμός
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Η επαφή πρέπει να οριστεί αν η ευκαιρία προέρχεται από επαφή
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Παρακαλώ επιλέξτε εβδομαδιαίο ρεπό
 DocType: Production Order Operation,Planned End Time,Προγραμματισμένη ώρα λήξης
 ,Sales Person Target Variance Item Group-Wise,Εύρος στόχου πωλητή ανά ομάδα είδους
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε καθολικό
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε καθολικό
 DocType: Delivery Note,Customer's Purchase Order No,Αρ. παραγγελίας αγοράς πελάτη
 DocType: Employee,Cell Number,Αριθμός κινητού
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Αυτόματη Υλικό αιτήσεις που δημιουργούνται
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Απολεσθέν
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Δεν μπορείτε να εισάγετε την τρέχουσα εγγυητική στη στήλη 'κατά λογιστική εγγραφή'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Δεν μπορείτε να εισάγετε την τρέχουσα εγγυητική στη στήλη 'κατά λογιστική εγγραφή'
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Ενέργεια
 DocType: Opportunity,Opportunity From,Ευκαιρία από
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Μηνιαία κατάσταση μισθοδοσίας.
@@ -602,9 +606,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Από {0} του τύπου {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Γραμμή {0}: ο συντελεστής μετατροπής είναι υποχρεωτικός
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Οι λογιστικές εγγραφές μπορούν να γίνουν με την κόμβους. Ενδείξεις κατά ομάδες δεν επιτρέπονται.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Δεν είναι δυνατή η απενεργοποίηση ή ακύρωση της Λ.Υ. γιατί συνδέεται με άλλες Λ.Υ.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,Δεν είναι δυνατή η απενεργοποίηση ή ακύρωση της Λ.Υ. γιατί συνδέεται με άλλες Λ.Υ.
 DocType: Opportunity,Maintenance,Συντήρηση
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Ο αριθμός αποδεικτικού παραλαβής αγοράς για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Ο αριθμός αποδεικτικού παραλαβής αγοράς για το είδος {0} είναι απαραίτητος
 DocType: Item Attribute Value,Item Attribute Value,Τιμή χαρακτηριστικού είδους
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Εκστρατείες πωλήσεων.
 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.
@@ -662,7 +666,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
 DocType: Employee,Family Background,Ιστορικό οικογένειας
 DocType: Process Payroll,Send Email,Αποστολή email
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Δεν έχετε άδεια
 DocType: Company,Default Bank Account,Προεπιλεγμένος τραπεζικός λογαριασμός
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Για να φιλτράρετε με βάση Κόμμα, επιλέξτε Τύπος Πάρτυ πρώτα"
@@ -670,7 +674,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Αριθμοί
 DocType: Item,Items with higher weightage will be shown higher,Τα στοιχεία με υψηλότερες weightage θα δείξει υψηλότερη
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Λεπτομέρειες συμφωνίας τραπεζικού λογαριασμού
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Τιμολόγια μου
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Τιμολόγια μου
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Δεν βρέθηκε υπάλληλος
 DocType: Purchase Order,Stopped,Σταματημένη
 DocType: Item,If subcontracted to a vendor,Αν υπεργολαβία σε έναν πωλητή
@@ -680,6 +684,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Αποστολή τώρα
 ,Support Analytics,Στατιστικά στοιχεία υποστήριξης
 DocType: Item,Website Warehouse,Αποθήκη δικτυακού τόπου
+DocType: Payment Reconciliation,Minimum Invoice Amount,Ελάχιστο ποσό του τιμολογίου
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Η ημέρα του μήνα κατά την οποίο θα δημιουργηθεί το αυτοματοποιημένο τιμολόγιο, π.Χ. 05, 28 Κλπ"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Το αποτέλεσμα πρέπει να είναι μικρότερο από ή ίσο με 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-form εγγραφές
@@ -689,7 +694,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Για να ενεργοποιήσετε το &quot;Point of Sale&quot; χαρακτηριστικά
 DocType: Bin,Moving Average Rate,Κινητή μέση τιμή
 DocType: Production Planning Tool,Select Items,Επιλέξτε είδη
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} κατά τη χρέωση {1} της {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} κατά τη χρέωση {1} της {2}
 DocType: Maintenance Visit,Completion Status,Κατάσταση ολοκλήρωσης
 DocType: Sales Invoice Item,Target Warehouse,Αποθήκη προορισμού
 DocType: Item,Allow over delivery or receipt upto this percent,Επιτρέψτε πάνω από την παράδοση ή την παραλαβή μέχρι αυτή τη τοις εκατό
@@ -701,7 +706,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Αυτόματη σύνθεση μηνύματος για την υποβολή συναλλαγών .
 DocType: Production Order,Item To Manufacture,Είδος προς κατασκευή
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} κατάσταση είναι {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Εντολή Αγοράς για Πληρωμή
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Εντολή Αγοράς για Πληρωμή
 DocType: Sales Order Item,Projected Qty,Προβλεπόμενη ποσότητα
 DocType: Sales Invoice,Payment Due Date,Ημερομηνία λήξης προθεσμίας πληρωμής
 DocType: Newsletter,Newsletter Manager,Ενημερωτικό Δελτίο Διευθυντής
@@ -725,7 +730,7 @@
 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 +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Το υπόλοιπο του λογαριασμού είναι ήδη πιστωτικό, δεν επιτρέπεται να ορίσετε την επιλογή το υπόλοιπο πρέπει να είναι χρεωστικό"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Το υπόλοιπο του λογαριασμού είναι ήδη πιστωτικό, δεν επιτρέπεται να ορίσετε την επιλογή το υπόλοιπο πρέπει να είναι χρεωστικό"
 DocType: Account,Balance must be,Το υπόλοιπο πρέπει να
 DocType: Hub Settings,Publish Pricing,Δημοσιεύστε τιμολόγηση
 DocType: Notification Control,Expense Claim Rejected Message,Μήνυμα απόρριψης αξίωσης δαπανών
@@ -748,7 +753,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Κύρια εγγραφή συναλλαγματικής ισοτιμίας.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Παρακαλώ επιλέξτε τον τύπο του εγγράφου πρώτα
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Ακύρωση επισκέψεων {0} πριν από την ακύρωση αυτής της επίσκεψης για συντήρηση
 DocType: Salary Slip,Leave Encashment Amount,Ποσό εξαργύρωσης άδειας
@@ -766,17 +771,17 @@
 DocType: Supplier,Default Payable Accounts,Προεπιλεγμένοι λογαριασμοί πληρωτέων
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Ο υπάλληλος {0} δεν είναι ενεργός ή δεν υπάρχει
 DocType: Features Setup,Item Barcode,Barcode είδους
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
 DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Προκαταβολή τιμολογίου αγοράς
 DocType: Address,Shop,Κατάστημα
 DocType: Hub Settings,Sync Now,Συγχρονισμός τώρα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Γραμμή {0} : μια πιστωτική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Γραμμή {0} : μια πιστωτική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Ο προεπιλεγμένος λογαριασμός τραπέζης / μετρητών θα ενημερώνεται αυτόματα στην έκδοση τιμολογίου POS, όταν επιλέγεται αυτός ο τρόπος."
 DocType: Employee,Permanent Address Is,Η μόνιμη διεύθυνση είναι
 DocType: Production Order Operation,Operation completed for how many finished goods?,Για πόσα τελικά προϊόντα ολοκληρώθηκε η λειτουργία;
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Το εμπορικό σήμα
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}.
 DocType: Employee,Exit Interview Details,Λεπτομέρειες συνέντευξης εξόδου
 DocType: Item,Is Purchase Item,Είναι είδος αγοράς
 DocType: Journal Entry Account,Purchase Invoice,Τιμολόγιο αγοράς
@@ -788,7 +793,7 @@
 DocType: Salary Slip,Total in words,Σύνολο ολογράφως
 DocType: Material Request Item,Lead Time Date,Ημερομηνία ανοχής χρόνου
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,είναι υποχρεωτική. Ίσως συναλλάγματος αρχείο δεν έχει δημιουργηθεί για
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Γραμμή # {0}: παρακαλώ ορίστε σειριακό αριθμό για το είδος {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Γραμμή # {0}: παρακαλώ ορίστε σειριακό αριθμό για το είδος {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Για τα στοιχεία «Προϊόν Bundle», Αποθήκη, Αύξων αριθμός παρτίδας και Δεν θα θεωρηθεί από την «Packing List» πίνακα. Αν Αποθήκης και Μαζική Δεν είναι ίδιες για όλα τα είδη συσκευασίας για τη θέση του κάθε «Πακέτο Προϊόντων», οι αξίες αυτές μπορούν να εγγραφούν στον κύριο πίνακα Στοιχείο, οι τιμές θα αντιγραφούν στο «Packing List» πίνακα."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Αποστολές προς τους πελάτες.
 DocType: Purchase Invoice Item,Purchase Order Item,Είδος παραγγελίας αγοράς
@@ -797,14 +802,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Διακύμανση
 ,Company Name,Όνομα εταιρείας
 DocType: SMS Center,Total Message(s),Σύνολο μηνυμάτων
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,Επιλέξτε την κύρια εγγραφή λογαριασμού της τράπεζας όπου κατατέθηκε η επιταγή.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Επίτρεψε στο χρήστη να επεξεργάζεται τιμές τιμοκατάλογου στις συναλλαγές
 DocType: Pricing Rule,Max Qty,Μέγιστη ποσότητα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,Χημικό
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Όλα τα είδη έχουν ήδη μεταφερθεί για αυτήν την εντολή παραγωγής.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Όλα τα είδη έχουν ήδη μεταφερθεί για αυτήν την εντολή παραγωγής.
 DocType: Process Payroll,Select Payroll Year and Month,Επιλέξτε Μισθοδοσίας Έτος και Μήνας
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Πηγαίνετε στην κατάλληλη ομάδα (συνήθως Εφαρμογή των Ταμείων&gt; Κυκλοφορούν Ενεργητικό&gt; τραπεζικούς λογαριασμούς και να δημιουργήσετε ένα νέο λογαριασμό (κάνοντας κλικ στην επιλογή Προσθήκη Παιδί) του τύπου &quot;Τράπεζα&quot;
 DocType: Workstation,Electricity Cost,Κόστος ηλεκτρικής ενέργειας
@@ -818,10 +824,10 @@
 DocType: SMS Center,All Lead (Open),Όλες οι επαφές (ανοιχτές)
 DocType: Purchase Invoice,Get Advances Paid,Βρες προκαταβολές που καταβλήθηκαν
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Επισύναψη της εικόνα σας
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Δημιούργησε
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Δημιούργησε
 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 +3,My Cart,Το Καλάθι μου
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Το Καλάθι μου
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Αρχική ποσότητα
@@ -840,10 +846,10 @@
 DocType: POS Profile,Cash/Bank Account,Λογαριασμός μετρητών/τραπέζης
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
 DocType: Delivery Note,Delivery To,Παράδοση προς
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
 DocType: Production Planning Tool,Get Sales Orders,Βρες παραγγελίες πώλησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,Η {0} δεν μπορεί να είναι αρνητική
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Έκπτωση
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Έκπτωση
 DocType: Features Setup,Purchase Discounts,Εκπτώσεις αγοράς
 DocType: Workstation,Wages,œΜισθοί
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Θα πρέπει να ενημερώνεται μόνο αν ο χρόνος καταγραφής είναι «Χρεώσιμη»
@@ -868,7 +874,7 @@
 DocType: Tax Rule,Shipping State,Μέλος αποστολής
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Το στοιχείο πρέπει να προστεθεί με τη χρήση του κουμπιού 'Λήψη ειδών από αποδεικτικά παραλαβής'
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Έξοδα πωλήσεων
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Πρότυπες αγορές
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Πρότυπες αγορές
 DocType: GL Entry,Against,Κατά
 DocType: Item,Default Selling Cost Center,Προεπιλεγμένο κέντρο κόστους πωλήσεων
 DocType: Sales Partner,Implementation Partner,Συνεργάτης υλοποίησης
@@ -910,6 +916,7 @@
 DocType: Sales Partner,Distributor,Διανομέας
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Κανόνες αποστολής καλαθιού αγορών
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Η εντολή παραγωγής {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Παρακαλούμε να ορίσετε «Εφαρμόστε επιπλέον έκπτωση On»
 ,Ordered Items To Be Billed,Παραγγελθέντα είδη για τιμολόγηση
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"Από το φάσμα πρέπει να είναι μικρότερη από ό, τι στην γκάμα"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Επιλέξτε αρχεία καταγραφής χρονολογίου και πατήστε υποβολή για να δημιουργηθεί ένα νέο τιμολόγιο πώλησης
@@ -919,13 +926,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Αυτή η παρτίδα αρχείων καταγραφής χρονολογίου έχει χρεωθεί.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Δημιουργία ευκαιρίας
 DocType: Salary Slip,Leave Without Pay,Άδεια άνευ αποδοχών
-DocType: Supplier,Communications,Επικοινωνίες
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Χωρητικότητα Σφάλμα Προγραμματισμού
 ,Trial Balance for Party,Ισοζύγιο για το Κόμμα
 DocType: Lead,Consultant,Σύμβουλος
 DocType: Salary Slip,Earnings,Κέρδη
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Ολοκληρώθηκε Θέση {0} πρέπει να εισαχθούν για την είσοδο τύπου Κατασκευή
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Άνοιγμα λογιστικό υπόλοιπο
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Ολοκληρώθηκε Θέση {0} πρέπει να εισαχθούν για την είσοδο τύπου Κατασκευή
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Άνοιγμα λογιστικό υπόλοιπο
 DocType: Sales Invoice Advance,Sales Invoice Advance,Προκαταβολή τιμολογίου πώλησης
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Τίποτα να ζητηθεί
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',Η πραγματική ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη της πραγματικής ημερομηνίας λήξης
@@ -967,7 +973,7 @@
 DocType: Global Defaults,Current Fiscal Year,Τρέχουσα χρήση
 DocType: Global Defaults,Disable Rounded Total,Απενεργοποίηση στρογγυλοποίησης συνόλου
 DocType: Lead,Call,Κλήση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,Οι καταχωρήσεις δεν μπορεί να είναι κενές
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,Οι καταχωρήσεις δεν μπορεί να είναι κενές
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Διπλότυπη γραμμή {0} με το ίδιο {1}
 ,Trial Balance,Ισοζύγιο
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Ρύθμιση εργαζόμενοι
@@ -979,9 +985,9 @@
 DocType: Contact,User ID,ID χρήστη
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Προβολή καθολικού
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Η πιο παλιά
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
 DocType: Production Order,Manufacture against Sales Order,Παραγωγή κατά παραγγελία πώλησης
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Τρίτες χώρες
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,Ακαθάριστες αποδοχές
@@ -1011,7 +1017,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Δεν επιτρέπεται να επεξεργαστείτε τον παγωμένο λογαριασμό {0}
 DocType: Journal Entry,Get Outstanding Invoices,Βρες εκκρεμή τιμολόγια
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Η παραγγελία πώλησης {0} δεν είναι έγκυρη
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1024,13 +1030,13 @@
 DocType: Employee,Place of Issue,Τόπος έκδοσης
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Συμβόλαιο
 DocType: Email Digest,Add Quote,Προσθήκη Παράθεση
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Ο παράγοντας μετατροπής Μ.Μ. απαιτείται για τη Μ.Μ.: {0} στο είδος: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Ο παράγοντας μετατροπής Μ.Μ. απαιτείται για τη Μ.Μ.: {0} στο είδος: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Έμμεσες δαπάνες
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Γραμμή {0}: η ποσότητα είναι απαραίτητη
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Γεωργία
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,Τα προϊόντα ή οι υπηρεσίες σας
 DocType: Mode of Payment,Mode of Payment,Τρόπος πληρωμής
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Αυτή είναι μια κύρια ομάδα ειδών και δεν μπορεί να επεξεργαστεί.
 DocType: Journal Entry Account,Purchase Order,Παραγγελία αγοράς
 DocType: Warehouse,Warehouse Contact Info,Πληροφορίες επικοινωνίας για την αποθήκη
@@ -1039,8 +1045,8 @@
 DocType: Email Digest,Annual Income,ΕΤΗΣΙΟ εισοδημα
 DocType: Serial No,Serial No Details,Λεπτομέρειες σειριακού αρ.
 DocType: Purchase Invoice Item,Item Tax Rate,Φορολογικός συντελεστής είδους
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Το είδος {0} πρέπει να είναι είδος υπεργολαβίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Κεφάλαιο εξοπλισμών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ο κανόνας τιμολόγησης πρώτα επιλέγεται με βάση το πεδίο 'εφαρμογή στο', το οποίο μπορεί να είναι είδος, ομάδα ειδών ή εμπορικό σήμα"
@@ -1050,7 +1056,7 @@
 DocType: Appraisal Goal,Goal,Στόχος
 DocType: Sales Invoice Item,Edit Description,Επεξεργασία Περιγραφή
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Αναμενόμενη ημερομηνία τοκετού είναι μικρότερο από το προβλεπόμενο Ημερομηνία Έναρξης.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Για προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Για προμηθευτή
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Η ρύθμιση του τύπου λογαριασμού βοηθά στην επιλογή αυτού του λογαριασμού στις συναλλαγές.
 DocType: Purchase Invoice,Grand Total (Company Currency),Γενικό σύνολο (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Συνολική εξερχόμενη
@@ -1063,7 +1069,7 @@
 DocType: Journal Entry,Journal Entry,Λογιστική εγγραφή
 DocType: Workstation,Workstation Name,Όνομα σταθμού εργασίας
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Στείλτε ενημερωτικό άρθρο email:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,Αυτός είναι ο αριθμός της τελευταίας συναλλαγής που δημιουργήθηκε με αυτό το πρόθεμα
@@ -1095,7 +1101,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Ενημερωτικά δελτία για επαφές
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Οι λειτουργίες δεν μπορεί να είναι κενές.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Οι λειτουργίες δεν μπορεί να είναι κενές.
 ,Delivered Items To Be Billed,Είδη για χρέωση που έχουν παραδοθεί
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Η αποθήκη δεν μπορεί να αλλάξει για τον σειριακό αριθμό
 DocType: Authorization Rule,Average Discount,Μέση έκπτωση
@@ -1110,7 +1116,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Από {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Περιγραφή λειτουργίας
 DocType: Item,Will also apply to variants,Θα ισχύουν και για τις παραλλαγές
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Δεν μπορεί να αλλάξει ημερομηνία έναρξης και ημερομηνία λήξης φορολογικού έτους μετά την αποθήκευση του.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Δεν μπορεί να αλλάξει ημερομηνία έναρξης και ημερομηνία λήξης φορολογικού έτους μετά την αποθήκευση του.
 DocType: Quotation,Shopping Cart,Καλάθι αγορών
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Μέσος όρος ημερησίως εξερχομένων
 DocType: Pricing Rule,Campaign,Εκστρατεία
@@ -1121,7 +1127,8 @@
 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 +211,Stock Entries already created for Production Order ,Έχουν ήδη δημιουργηθεί καταχωρήσεις αποθέματος για την εντολή παραγωγής
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Έχουν ήδη δημιουργηθεί καταχωρήσεις αποθέματος για την εντολή παραγωγής
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Καθαρή Αλλαγή στο Παγίων
 DocType: Leave Control Panel,Leave blank if considered for all designations,Άφησε το κενό αν ισχύει για όλες τις ονομασίες
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Μέγιστο: {0}
@@ -1133,7 +1140,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Λογιστικό σχέδιο
 DocType: Material Request,Terms and Conditions Content,Περιεχόμενο όρων και προϋποθέσεων
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
 DocType: Employee,Owned,Ανήκουν
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Εξαρτάται από άδειας άνευ αποδοχών
@@ -1170,7 +1177,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Υποσυστήματα
 DocType: Shipping Rule Condition,To Value,ˆΈως αξία
 DocType: Supplier,Stock Manager,Διευθυντής Χρηματιστήριο
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Η αποθήκη προέλευσης είναι απαραίτητη για τη σειρά {0}
+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 +581,Packing Slip,Δελτίο συσκευασίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Ενοίκιο γραφείου
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Ρύθμιση στοιχείων SMS gateway
@@ -1178,10 +1185,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Δεν δημιουργήθηκαν διευθύνσεις
 DocType: Workstation Working Hour,Workstation Working Hour,Ώρες εργαασίας σταθμού εργασίας
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Αναλυτής
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το ποσό κε {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το ποσό κε {2}
 DocType: Item,Inventory,Απογραφή
 DocType: Features Setup,"To enable ""Point of Sale"" view",Για να ενεργοποιήσετε το &quot;Point of Sale&quot; προβολή
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Η πληρωμή δεν μπορεί να γίνει για άδειο καλάθι
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Η πληρωμή δεν μπορεί να γίνει για άδειο καλάθι
 DocType: Item,Sales Details,Λεπτομέρειες πωλήσεων
 DocType: Opportunity,With Items,Με Αντικείμενα
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Στην ποσότητα
@@ -1196,10 +1203,11 @@
 DocType: Cost Center,Parent Cost Center,Γονικό κέντρο κόστους
 DocType: Sales Invoice,Source,Πηγή
 DocType: Leave Type,Is Leave Without Pay,Είναι άδειας άνευ αποδοχών
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Δεν βρέθηκαν εγγραφές στον πίνακα πληρωμών
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Δεν βρέθηκαν εγγραφές στον πίνακα πληρωμών
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Ημερομηνία έναρξης για τη χρήση
 DocType: Employee External Work History,Total Experience,Συνολική εμπειρία
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Ταμειακές ροές από επενδυτικές
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Χρεώσεις μεταφοράς και προώθησης
 DocType: Material Request Item,Sales Order No,Αρ. παραγγελίας πώλησης
 DocType: Item Group,Item Group Name,Όνομα ομάδας ειδών
@@ -1207,12 +1215,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Μεταφορά υλικών για μεταποίηση
 DocType: Pricing Rule,For Price List,Για τιμοκατάλογο
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Αναζήτησης εκτελεστικού στελέχους
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Η τιμή αγοράς για το είδος: {0} δεν βρέθηκε, η οποία είναι απαραίτητη για την λογιστική εγγραφή (δαπάνη). Παρακαλώ να αναφέρετε την τιμή του είδους με βάση κάποιο τιμοκατάλογο αγοράς."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Η τιμή αγοράς για το είδος: {0} δεν βρέθηκε, η οποία είναι απαραίτητη για την λογιστική εγγραφή (δαπάνη). Παρακαλώ να αναφέρετε την τιμή του είδους με βάση κάποιο τιμοκατάλογο αγοράς."
 DocType: Maintenance Schedule,Schedules,Χρονοδιαγράμματα
 DocType: Purchase Invoice Item,Net Amount,Καθαρό Ποσό
 DocType: Purchase Order Item Supplied,BOM Detail No,Αρ. Λεπτομερειών Λ.Υ.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Πρόσθετες ποσό έκπτωσης (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Σφάλμα: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Σφάλμα: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Παρακαλώ να δημιουργήσετε νέο λογαριασμό από το λογιστικό σχέδιο.
 DocType: Maintenance Visit,Maintenance Visit,Επίσκεψη συντήρησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Πελάτης> ομάδα πελατών > περιοχή
@@ -1238,7 +1246,7 @@
 DocType: Sales Partner,Sales Partner Target,Στόχος συνεργάτη πωλήσεων
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Λογιστική καταχώριση για {0} μπορεί να γίνει μόνο στο νόμισμα: {1}
 DocType: Pricing Rule,Pricing Rule,Κανόνας τιμολόγησης
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Υλικό αίτηση για αγορά Παραγγελία
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Υλικό αίτηση για αγορά Παραγγελία
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Σειρά # {0}: επιστρεφόμενο στοιχείο {1} δεν υπάρχει σε {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Τραπεζικοί λογαριασμοί
 ,Bank Reconciliation Statement,Δήλωση συμφωνίας τραπεζικού λογαριασμού
@@ -1246,11 +1254,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Άνοιγμα Χρηματιστήριο Υπόλοιπο
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} Πρέπει να εμφανίζεται μόνο μία φορά
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Δεν επιτρέπεται να μεταφέρουμε περισσότερο {0} από {1} εναντίον παραγγελίας {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},Οι άδειες κατανεμήθηκαν επιτυχώς για {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Δεν βρέθηκαν είδη για συσκευασία
 DocType: Shipping Rule Condition,From Value,Από τιμή
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Η παραγόμενη ποσότητα είναι απαραίτητη
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Η παραγόμενη ποσότητα είναι απαραίτητη
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Τα ποσά που δεν αντικατοπτρίζονται στην τράπεζα
 DocType: Quality Inspection Reading,Reading 4,Μέτρηση 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Απαιτήσεις εις βάρος της εταιρείας.
@@ -1262,33 +1270,34 @@
 ,Material Requests for which Supplier Quotations are not created,Αιτήσεις υλικού για τις οποίες δεν έχουν δημιουργηθεί προσφορές προμηθευτή
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Η ημέρα (ες) για την οποία υποβάλλετε αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να ζητήσει άδεια.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Παρακολούθηση ειδών με barcode. Είναι δυνατή η εισαγωγή ειδών στο δελτίο αποστολής και στο τιμολόγιο πώλησης με σάρωση του barcode των ειδών.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Επισήμανση ως Δημοσιεύθηκε
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Επισήμανση ως Δημοσιεύθηκε
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Κάντε Προσφορά
 DocType: Dependent Task,Dependent Task,Εξαρτημένη Εργασία
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,Διακοπή υπενθυμίσεων γενεθλίων
 DocType: SMS Center,Receiver List,Λίστα παραλήπτη
 DocType: Payment Tool Detail,Payment Amount,Ποσό πληρωμής
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Ποσό που καταναλώθηκε
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Προβολή
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Προβολή
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Καθαρή Αλλαγή σε μετρητά
 DocType: Salary Structure Deduction,Salary Structure Deduction,Παρακρατήσεις στο μισθολόγιο
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {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 +185,Quantity must not be more than {0},Η ποσότητα δεν πρέπει να είναι μεγαλύτερη από {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Ηλικία (ημέρες)
 DocType: Quotation Item,Quotation Item,Είδος προσφοράς
 DocType: Account,Account Name,Όνομα λογαριασμού
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Από την ημερομηνία αυτή δεν μπορεί να είναι μεταγενέστερη από την έως ημερομηνία
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Από την ημερομηνία αυτή δεν μπορεί να είναι μεταγενέστερη από την έως ημερομηνία
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Ο σειριακός αριθμός {0} ποσότητα {1} δεν μπορεί να είναι ένα κλάσμα
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Κύρια εγγραφή τύπου προμηθευτή.
 DocType: Purchase Order Item,Supplier Part Number,Αριθμός εξαρτήματος του προμηθευτή
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Το ποσοστό μετατροπής δεν μπορεί να είναι 0 ή 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Το ποσοστό μετατροπής δεν μπορεί να είναι 0 ή 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,Το αποδεικτικό παραλαβής αγοράς {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Το αποδεικτικό παραλαβής αγοράς {0} δεν έχει υποβληθεί
 DocType: Company,Default Payable Account,Προεπιλεγμένος λογαριασμός πληρωτέων
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ρυθμίσεις για το online καλάθι αγορών, όπως οι κανόνες αποστολής, ο τιμοκατάλογος κλπ"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Χρεώθηκαν
@@ -1300,15 +1309,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Θέματα Μου
 DocType: BOM Item,BOM Item,Είδος Λ.Υ.
 DocType: Appraisal,For Employee,Για τον υπάλληλο
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Σειρά {0}: Προκαταβολή έναντι Προμηθευτής οφείλει να χρεώσει
 DocType: Company,Default Values,Προεπιλεγμένες Τιμές
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Γραμμή {0}:το ποσό πληρωμής δεν μπορεί να είναι αρνητικό
 DocType: Expense Claim,Total Amount Reimbursed,Συνολικού ποσού που αποδόθηκε
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Κατά το τιμολόγιο προμηθευτή {0} της {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Κατά το τιμολόγιο προμηθευτή {0} της {1}
 DocType: Customer,Default Price List,Προεπιλεγμένος τιμοκατάλογος
 DocType: Payment Reconciliation,Payments,Πληρωμές
 DocType: Budget Detail,Budget Allocated,Προϋπολογισμός που διατέθηκε
 DocType: Journal Entry,Entry Type,Τύπος εισόδου
 ,Customer Credit Balance,Υπόλοιπο πίστωσης πελάτη
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Καθαρή Αλλαγή πληρωτέων λογαριασμών
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Παρακαλούμε επιβεβαιώστε ταυτότητα ηλεκτρονικού ταχυδρομείου σας
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Για την έκπτωση με βάση πελάτη είναι απαραίτητο να επιλεγεί πελάτης
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Ενημέρωση ημερομηνιών πληρωμών τραπέζης μέσω ημερολογίου.
@@ -1329,7 +1340,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Ενεργοποίηση του καλαθιού αγορών
 DocType: Employee,Permanent Address,Μόνιμη διεύθυνση
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Το είδος {0} πρέπει να είναι μια υπηρεσία.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Καταβληθείσα προκαταβολή κατά {0} {1} δεν μπορεί να είναι μεγαλύτερο \ από Γενικό Σύνολο {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Παρακαλώ επιλέξτε κωδικό είδους
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Μείωση αφαίρεσης για άδεια άνευ αποδοχών (Α.Α.Α.)
@@ -1346,18 +1357,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Μία μονάδα ενός είδους
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Η παρτίδα αρχείων καταγραφής χρονολογίου {0} πρέπει να 'υποβληθεί'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Η παρτίδα αρχείων καταγραφής χρονολογίου {0} πρέπει να 'υποβληθεί'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Δημιούργησε λογιστική καταχώρηση για κάθε κίνηση αποθέματος
 DocType: Leave Allocation,Total Leaves Allocated,Σύνολο αδειών που διατέθηκε
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Αποθήκη απαιτείται κατά Row Όχι {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Αποθήκη απαιτείται κατά Row Όχι {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Παρακαλώ εισάγετε ένα έγκυρο οικονομικό έτος ημερομηνίες έναρξης και λήξης
 DocType: Employee,Date Of Retirement,Ημερομηνία συνταξιοδότησης
 DocType: Upload Attendance,Get Template,Βρες πρότυπο
 DocType: Address,Postal,Ταχυδρομικός
 DocType: Item,Weightage,Ζύγισμα
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Παρακαλώ επιλέξτε {0} πρώτα
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},κειμένου {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Παρακαλώ επιλέξτε {0} πρώτα
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},κειμένου {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Νέα Επικοινωνία
 DocType: Territory,Parent Territory,Έδαφος μητρική
 DocType: Quality Inspection Reading,Reading 2,Μέτρηση 2
 DocType: Stock Entry,Material Receipt,Παραλαβή υλικού
@@ -1365,7 +1377,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Ο τύπος συμβαλλομένου και ο συμβαλλόμενος είναι απαραίτητα για τον λογαριασμό εισπρακτέων / πληρωτέων {0}
 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 +210,Quantity required for Item {0} in row {1},Η ποσότητα για το είδος {0} στη γραμμή {1} είναι απαραίτητη.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},Η ποσότητα για το είδος {0} στη γραμμή {1} είναι απαραίτητη.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,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 ενημερώσεων
@@ -1382,15 +1394,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Πάρα πολλές στήλες. Εξάγετε την έκθεση για να την εκτυπώσετε χρησιμοποιώντας μια εφαρμογή λογιστικών φύλλων.
 DocType: Sales 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 +152,Main,Κύριο
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Κύριο
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Παραλλαγή
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ορίστε πρόθεμα για τη σειρά αρίθμησης για τις συναλλαγές σας
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Μια σταματημένη παραγγελία δεν μπορεί να ακυρωθεί. Συνεχίστε την προκειμένου να την ακυρώσετε.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
 DocType: SMS Center,Send To,Αποστολή προς
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Ποσό που διατέθηκε
@@ -1403,7 +1415,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Αποθήκη και αναφορά
 DocType: Supplier,Statutory info and other general information about your Supplier,Πληροφορίες καταστατικού και άλλες γενικές πληροφορίες σχετικά με τον προμηθευτή σας
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Διευθύνσεις
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Κατά την ημερολογιακή εγγραφή {0} δεν έχει καμία αταίριαστη {1} καταχώρηση
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Κατά την ημερολογιακή εγγραφή {0} δεν έχει καμία αταίριαστη {1} καταχώρηση
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Διπλότυπος σειριακός αριθμός για το είδος {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Μια συνθήκη για έναν κανόνα αποστολής
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Το στοιχείο δεν επιτρέπεται να έχει εντολή παραγωγής.
@@ -1412,10 +1424,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Πιστωτικές Ποσό σε Νόμισμα Λογαριασμού
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Χρόνος Καταγράφει για την κατασκευή.
 DocType: Item,Apply Warehouse-wise Reorder Level,Εφάρμοσε το επίπεδο αναδιάρθρωσης σε όλη την αποθήκη
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
 DocType: Authorization Control,Authorization Control,Έλεγχος εξουσιοδότησης
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Σειρά # {0}: Απορρίφθηκε Αποθήκη είναι υποχρεωτική κατά στοιχείο που έχει απορριφθεί {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Αρχείο καταγραφής χρονολογίου για εργασίες.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Πληρωμή
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Πληρωμή
 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},Αίτηση υλικού με μέγιστο {0} μπορεί να γίνει για το είδος {1} κατά την παραγγελία πώλησης {2}
 DocType: Employee,Salutation,Χαιρετισμός
@@ -1432,7 +1445,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Συνεργάτης
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Το είδος {0} δεν είναι είδος μίας σειράς
 DocType: SMS Center,Create Receiver List,Δημιουργία λίστας παραλήπτη
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Έληξε
 DocType: Packing Slip,To Package No.,Για τον αρ. συσκευασίας
 DocType: Warranty Claim,Issue Date,Ημερομηνία έκδοσης
 DocType: Activity Cost,Activity Cost,Δραστηριότητα Κόστους
@@ -1470,7 +1482,7 @@
 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 +65,Territory / Customer,Περιοχή / πελάτης
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,Π.Χ. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,Είναι είδος πώλησης
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Δέντρο ομάδων ειδών
@@ -1482,7 +1494,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} Δημιουργήθηκε
 DocType: Delivery Note Item,Against Sales Order,Κατά την παραγγελία πώλησης
 ,Serial No Status,Κατάσταση σειριακού αριθμού
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,"Ο πίνακας ειδών, δεν μπορεί να είναι κενός"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,"Ο πίνακας ειδών, δεν μπορεί να είναι κενός"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Γραμμή {0}: για να ρυθμίσετε {1} περιοδικότητα, η διαφορά μεταξύ της ημερομηνίας από και έως \ πρέπει να είναι μεγαλύτερη ή ίση με {2}"""
 DocType: Pricing Rule,Selling,Πώληση
@@ -1491,7 +1503,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Δασμοί και φόροι
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,Παρεχόμενα Ποσότητα
@@ -1506,7 +1518,7 @@
 DocType: Installation Note,Installation Time,Ώρα εγκατάστασης
 DocType: Sales Invoice,Accounting Details,Λογιστική Λεπτομέρειες
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Διαγράψτε όλες τις συναλλαγές για αυτή την Εταιρεία
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Γραμμή #{0}:Η λειτουργία {1} δεν έχει ολοκληρωθεί για τη {2} ποσότητα των τελικών προϊόντων στην εντολή παραγωγής # {3}. Σας Παρακαλώ να ενημερώσετε την κατάσταση λειτουργίας μέσω των χρονικών αρχείων καταγραφής
+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,Γραμμή #{0}:Η λειτουργία {1} δεν έχει ολοκληρωθεί για τη {2} ποσότητα των τελικών προϊόντων στην εντολή παραγωγής # {3}. Σας Παρακαλώ να ενημερώσετε την κατάσταση λειτουργίας μέσω των χρονικών αρχείων καταγραφής
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Επενδύσεις
 DocType: Issue,Resolution Details,Λεπτομέρειες επίλυσης
 DocType: Quality Inspection Reading,Acceptance Criteria,Κριτήρια αποδοχής
@@ -1522,7 +1534,7 @@
 DocType: Holiday List,Clear Table,Καθαρισμός πίνακα
 DocType: Features Setup,Brands,Εμπορικά σήματα
 DocType: C-Form Invoice Detail,Invoice No,Αρ. Τιμολογίου
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Από παραγγελία αγοράς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Από παραγγελία αγοράς
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,Κοστολόγηση Τιμή
 ,Customer Addresses And Contacts,Διευθύνσεις πελατών και των επαφών
@@ -1539,7 +1551,7 @@
 ,Maintenance Schedules,Χρονοδιαγράμματα συντήρησης
 ,Quotation Trends,Τάσεις προσφορών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Η ομάδα είδους δεν αναφέρεται στην κύρια εγγραφή είδους για το είδος {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
 DocType: Shipping Rule Condition,Shipping Amount,Κόστος αποστολής
 ,Pending Amount,Ποσό που εκκρεμεί
 DocType: Purchase Invoice Item,Conversion Factor,Συντελεστής μετατροπής
@@ -1556,12 +1568,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Δέντρο οικονομικών λογαριασμών.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Άφησε το κενό αν ισχύει για όλους τους τύπους των υπαλλήλων
 DocType: Landed Cost Voucher,Distribute Charges Based On,Επιμέρησε τα κόστη μεταφοράς σε όλα τα είδη.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Ο λογαριασμός {0} πρέπει να είναι του τύπου 'παγίων' καθώς το είδος {1} είναι ένα περιουσιακό στοιχείο
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Ο λογαριασμός {0} πρέπει να είναι του τύπου 'παγίων' καθώς το είδος {1} είναι ένα περιουσιακό στοιχείο
 DocType: HR Settings,HR Settings,Ρυθμίσεις ανθρωπίνου δυναμικού
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Η αξίωση δαπανών είναι εν αναμονή έγκρισης. Μόνο ο υπεύθυνος έγκρισης δαπανών να ενημερώσει την κατάστασή της.
 DocType: Purchase Invoice,Additional Discount Amount,Πρόσθετες ποσό έκπτωσης
 DocType: Leave Block List Allow,Leave Block List Allow,Επίτρεψε λίστα αποκλεισμού ημερών άδειας
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Αθλητισμός
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Πραγματικό σύνολο
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Μονάδα
@@ -1573,6 +1585,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} Είναι τώρα η προεπιλεγμένη χρήση. Παρακαλώ ανανεώστε το πρόγραμμα περιήγησής σας για να τεθεί σε ισχύ η αλλαγή.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Απαιτήσεις Εξόδων
 DocType: Issue,Support,Υποστήριξη
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Δείτε το καλάθι αγορών
 ,BOM Search,BOM Αναζήτηση
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Κλείσιμο (Άνοιγμα + Σύνολα)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Παρακαλώ ορίστε το νόμισμα στην εταιρεία
@@ -1584,13 +1597,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Ο συντελεστής μετατροπής Μ.Μ. είναι απαραίτητος στη γραμμή {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Η ημερομηνία εκκαθάρισης δεν μπορεί να είναι πριν από την ημερομηνία ελέγχου στη γραμμή {0}
 DocType: Salary Slip,Deduction,Κρατήση
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Είδους Τιμή προστεθεί {0} στην Τιμοκατάλογος {1}
 DocType: Address Template,Address Template,Πρότυπο διεύθυνσης
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Παρακαλώ εισάγετε το αναγνωριστικό Υπάλληλος αυτό το άτομο πωλήσεων
 DocType: Territory,Classification of Customers by region,Ταξινόμηση των πελατών ανά περιοχή
 DocType: Project,% Tasks Completed,% Εργασίες ολοκληρώθηκαν
 DocType: Project,Gross Margin,Μικτό Περιθώριο Κέρδους
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Παρακαλώ εισάγετε πρώτα το είδος παραγωγής
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,Απενεργοποιημένος χρήστης
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Απενεργοποιημένος χρήστης
 DocType: Opportunity,Quotation,Προσφορά
 DocType: Salary Slip,Total Deduction,Συνολική έκπτωση
 DocType: Quotation,Maintenance User,Χρήστης συντήρησης
@@ -1599,7 +1613,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
 DocType: Production Order Operation,Actual Operation Time,Πραγματικός χρόνος λειτουργίας
 DocType: Authorization Rule,Applicable To (User),Εφαρμοστέα σε (user)
 DocType: Purchase Taxes and Charges,Deduct,Αφαίρεσε
@@ -1609,12 +1623,12 @@
 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,Ποσότητα παρ. πώλησης
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Υπάρχουν καταχωρήσεις αποθέματος στην αποθήκη {0}, ως εκ τούτου δεν μπορείτε να εκχωρήσετε ξανά ή να τροποποιήσετε την αποθήκη"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Υπάρχουν καταχωρήσεις αποθέματος στην αποθήκη {0}, ως εκ τούτου δεν μπορείτε να εκχωρήσετε ξανά ή να τροποποιήσετε την αποθήκη"
 DocType: Appraisal,Calculate Total Score,Υπολογισμός συνολικής βαθμολογίας
 DocType: Supplier Quotation,Manufacturing Manager,Υπεύθυνος παραγωγής
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Ο σειριακός αριθμός {0} έχει εγγύηση μέχρι {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Χώρισε το δελτίο αποστολής σημείωση σε πακέτα.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Αποστολές
+apps/erpnext/erpnext/hooks.py +69,Shipments,Αποστολές
 DocType: Purchase Order Item,To be delivered to customer,Να παραδοθεί στον πελάτη
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Η κατάσταση του αρχείου καταγραφής χρονολογίου πρέπει να υποβληθεί.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Αύξων αριθμός {0} δεν ανήκουν σε καμία αποθήκη
@@ -1634,10 +1648,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Επιλέξτε εταιρία...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Άφησε το κενό αν ισχύει για όλα τα τμήματα
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Μορφές απασχόλησης ( μόνιμη, σύμβαση, πρακτική άσκηση κ.λ.π. )."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
 DocType: Currency Exchange,From Currency,Από το νόμισμα
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Παρακαλώ επιλέξτε χορηγούμενο ποσό, τύπο τιμολογίου και αριθμό τιμολογίου σε τουλάχιστον μία σειρά"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Η παραγγελία πώλησης για το είδος {0} είναι απαραίτητη
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Παρακαλώ επιλέξτε χορηγούμενο ποσό, τύπο τιμολογίου και αριθμό τιμολογίου σε τουλάχιστον μία σειρά"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Η παραγγελία πώλησης για το είδος {0} είναι απαραίτητη
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Τα ποσά που δεν αντικατοπτρίζονται στο σύστημα
 DocType: Purchase Invoice Item,Rate (Company Currency),Τιμή (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Άλλα
@@ -1653,7 +1667,7 @@
 DocType: Quality Inspection,In Process,Σε επεξεργασία
 DocType: Authorization Rule,Itemwise Discount,Έκπτωση ανά είδος
 DocType: Purchase Order Item,Reference Document Type,Αναφορά Τύπος εγγράφου
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} κατά την παραγγελία πώλησης {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} κατά την παραγγελία πώλησης {1}
 DocType: Account,Fixed Asset,Πάγιο
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Απογραφή συνέχειες
 DocType: Activity Type,Default Billing Rate,Επιτόκιο Υπερημερίας Τιμολόγησης
@@ -1663,7 +1677,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Πωλήσεις Τάξης να Πληρωμής
 DocType: Expense Claim Detail,Expense Claim Detail,Λεπτομέρειες αξίωσης δαπανών
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Τα αρχεία καταγραφής χρονολογίου δημιουργήθηκαν:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Παρακαλώ επιλέξτε σωστό λογαριασμό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Παρακαλώ επιλέξτε σωστό λογαριασμό
 DocType: Item,Weight UOM,Μονάδα μέτρησης βάρους
 DocType: Employee,Blood Group,Ομάδα αίματος
 DocType: Purchase Invoice Item,Page Break,Αλλαγή σελίδας
@@ -1694,10 +1708,10 @@
 DocType: Time Log,To Time,Έως ώρα
 DocType: Authorization Rule,Approving Role (above authorized value),Έγκριση Ρόλος (πάνω από εξουσιοδοτημένο αξία)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Για να προσθέσετε θυγατρικούς κόμβους, εξερευνήστε το δέντρο και κάντε κλικ στο κόμβο κάτω από τον οποίο θέλετε να προσθέσετε περισσότερους κόμβους."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Ο λογαριασμός πίστωσης πρέπει να είναι πληρωτέος λογαριασμός
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},Αναδρομή Λ.Υ.: {0} δεν μπορεί να είναι γονέας ή τέκνο της {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Ο λογαριασμός πίστωσης πρέπει να είναι πληρωτέος λογαριασμός
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},Αναδρομή Λ.Υ.: {0} δεν μπορεί να είναι γονέας ή τέκνο της {2}
 DocType: Production Order Operation,Completed Qty,Ολοκληρωμένη ποσότητα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Για {0}, μόνο χρεωστικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις πίστωσης"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","Για {0}, μόνο χρεωστικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις πίστωσης"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ο τιμοκατάλογος {0} είναι απενεργοποιημένος
 DocType: Manufacturing Settings,Allow Overtime,Επιτρέψτε Υπερωρίες
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} αύξοντες αριθμούς που απαιτούνται για τη θέση {1}. Έχετε προβλέπεται {2}.
@@ -1705,8 +1719,9 @@
 DocType: Item,Customer Item Codes,Θέση Πελάτη Κώδικες
 DocType: Opportunity,Lost Reason,Αιτιολογία απώλειας
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Δημιουργήστε καταχωρήσεις πληρωμή κατά παραγγελίες ή τιμολόγια.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Νέα Διεύθυνση
 DocType: Quality Inspection,Sample Size,Μέγεθος δείγματος
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Όλα τα είδη έχουν ήδη τιμολογηθεί
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,"Περαιτέρω κέντρα κόστους μπορεί να γίνει κάτω από ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
 DocType: Project,External,Εξωτερικός
@@ -1762,13 +1777,14 @@
 DocType: Rename Tool,Rename Tool,Εργαλείο μετονομασίας
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Ενημέρωση κόστους
 DocType: Item Reorder,Item Reorder,Αναδιάταξη είδους
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Μεταφορά υλικού
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Μεταφορά υλικού
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Καθορίστε τις λειτουργίες, το κόστος λειτουργίας και να δώστε ένα μοναδικό αριθμό λειτουργίας στις λειτουργίες σας."
 DocType: Purchase Invoice,Price List Currency,Νόμισμα τιμοκαταλόγου
 DocType: Naming Series,User must always select,Ο χρήστης πρέπει πάντα να επιλέγει
 DocType: Stock Settings,Allow Negative Stock,Επίτρεψε αρνητικό απόθεμα
 DocType: Installation Note,Installation Note,Σημείωση εγκατάστασης
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Προσθήκη φόρων
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Ταμειακές ροές από χρηματοδοτικές
 ,Financial Analytics,Χρηματοοικονομικές αναφορές
 DocType: Quality Inspection,Verified By,Πιστοποιημένο από
 DocType: Address,Subsidiary,Θυγατρική
@@ -1778,19 +1794,19 @@
 DocType: Process Payroll,Create Salary Slip,Δημιουργία βεβαίωσης αποδοχών
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Αναμενόμενο υπόλοιπο κατά τράπεζα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Πηγή χρηματοδότησης ( παθητικού )
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Η ποσότητα στη γραμμή {0} ( {1} ) πρέπει να είναι ίδια με την παραγόμενη ποσότητα {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Η ποσότητα στη γραμμή {0} ( {1} ) πρέπει να είναι ίδια με την παραγόμενη ποσότητα {2}
 DocType: Appraisal,Employee,Υπάλληλος
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Εισαγωγή e-mail από
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Πρόσκληση ως χρήστη
 DocType: Features Setup,After Sale Installations,Εγκαταστάσεις μετά την πώληση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} είναι πλήρως τιμολογημένο
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} είναι πλήρως τιμολογημένο
 DocType: Workstation Working Hour,End Time,Ώρα λήξης
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Πρότυποι όροι σύμβασης για πωλήσεις ή αγορές.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Ομαδοποίηση κατά αποδεικτικό
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Απαιτείται στις
 DocType: Sales Invoice,Mass Mailing,Μαζική αλληλογραφία
 DocType: Rename Tool,File to Rename,Αρχείο μετονομασίας
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Ο αριθμός παραγγελίας αγοράς για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Ο αριθμός παραγγελίας αγοράς για το είδος {0} είναι απαραίτητος
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Εμφάνιση Πληρωμές
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Η συγκεκριμμένη Λ.Υ. {0} δεν υπάρχει για το είδος {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Το χρονοδιάγραμμα συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
@@ -1800,6 +1816,7 @@
 DocType: Selling Settings,Sales Order Required,Η παραγγελία πώλησης είναι απαραίτητη
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Δημιουργία πελάτη
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,Λεπτομέρειες χρονοδιαγράμματος συντήρησης
 DocType: Quality Inspection Reading,Reading 9,Μέτρηση 9
@@ -1811,6 +1828,7 @@
 DocType: Warranty Claim,Raised By,Δημιουργήθηκε από
 DocType: Payment Tool,Payment Account,Λογαριασμός πληρωμών
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Καθαρή Αλλαγή σε εισπρακτέους λογαριασμούς
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Αντισταθμιστικά απενεργοποιημένα
 DocType: Quality Inspection Reading,Accepted,Αποδεκτό
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,Παρακαλώ βεβαιωθείτε ότι έχετε πραγματικά θέλετε να διαγράψετε όλες τις συναλλαγές για την εν λόγω εταιρεία. Τα δεδομένα της κύριας σας θα παραμείνει ως έχει. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.
@@ -1818,17 +1836,17 @@
 DocType: Payment Tool,Total Payment Amount,Συνολικό ποσό πληρωμής
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
 DocType: Newsletter,Test,Δοκιμή
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Δεδομένου ότι υπάρχουν χρηματιστηριακές συναλλαγές για αυτό το προϊόν, \ δεν μπορείτε να αλλάξετε τις τιμές των «Έχει Αύξων αριθμός», «Έχει Παρτίδα No», «Είναι αναντικατάστατο» και «Μέθοδος αποτίμησης»"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε τιμοκατάλογο, αν η λίστα υλικών αναφέρεται σε οποιουδήποτε είδος"
 DocType: Employee,Previous Work Experience,Προηγούμενη εργασιακή εμπειρία
 DocType: Stock Entry,For Quantity,Για Ποσότητα
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Παρακαλώ εισάγετε προγραμματισμένη ποσότητα για το είδος {0} στη γραμμή {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} Δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} Δεν έχει υποβληθεί
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Αιτήσεις για είδη
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Μια ξεχωριστή εντολή παραγωγής θα δημιουργηθεί για κάθε τελικό καλό είδος.
 DocType: Purchase Invoice,Terms and Conditions1,Όροι και προϋποθέσεις 1
@@ -1841,7 +1859,7 @@
 DocType: Authorization Rule,Authorized Value,Εξουσιοδοτημένος Αξία
 DocType: Contact,Enter department to which this Contact belongs,Εισάγετε το τμήμαστο οποίο ανήκει αυτή η επαφή
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Σύνολο απόντων
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Το είδος ή η αποθήκη για την γραμμή {0} δεν ταιριάζει στην αίτηση υλικού
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Το είδος ή η αποθήκη για την γραμμή {0} δεν ταιριάζει στην αίτηση υλικού
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Μονάδα μέτρησης
 DocType: Fiscal Year,Year End Date,Ημερομηνία λήξης έτους
 DocType: Task Depends On,Task Depends On,Εργασία Εξαρτάται από
@@ -1867,7 +1885,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Η ημερομηνία λήξης της σύμβασης πρέπει να είναι μεγαλύτερη από ό, τι ημερομηνία ενώνουμε"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Ένα τρίτο μέρος διανομέας / αντιπρόσωπος / πράκτορας με προμήθεια / affiliate / μεταπωλητής, ο οποίος πωλεί τα προϊόντα της εταιρείας για μια προμήθεια."
 DocType: Customer Group,Has Child Node,Έχει θυγατρικό κόμβο
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} κατά την παραγγελία αγορών {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} κατά την παραγγελία αγορών {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Εισάγετε στατικές παραμέτρους url εδώ (π.Χ. Αποστολέα = erpnext, όνομα = erpnext, password = 1234 κλπ.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} δεν είναι σε καμία ενεργή χρήση. Για περισσότερες πληροφορίες δείτε {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Αυτό είναι ένα παράδειγμα ιστοσελίδας που δημιουργείται αυτόματα από το erpnext
@@ -1915,7 +1933,7 @@
 10. Πρόσθεση ή Έκπτωση: Αν θέλετε να προσθέσετε ή να αφαιρέσετε τον φόρο."
 DocType: Purchase Receipt Item,Recd Quantity,Ποσότητα που παραλήφθηκε
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Δεν γίνεται να παραχθούν είδη {0} περισσότερα από την ποσότητα παραγγελίας πώλησης {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
 DocType: Payment Reconciliation,Bank / Cash Account,Λογαριασμός καταθέσεων σε τράπεζα / μετρητών
 DocType: Tax Rule,Billing City,Πόλη Τιμολόγησης
 DocType: Global Defaults,Hide Currency Symbol,Απόκρυψη συμβόλου νομίσματος
@@ -1947,6 +1965,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Έξοδα κοινής ωφέλειας
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Παραπάνω
 DocType: Buying Settings,Default Buying Price List,Προεπιλεγμένος τιμοκατάλογος αγορών
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.","Ορίστε προεπιλεγμένες τιμές όπως εταιρεία, νόμισμα, τρέχων οικονομικό έτος, κλπ."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Τύπος πληρωμής
@@ -1982,7 +2001,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Ανατρέξτε στην ενότητα κοστολόγησης την 'τιμή υλικών με βάση'
 DocType: Appraisal Goal,Key Responsibility Area,Βασικός τομέας ευθύνης
 DocType: Item Reorder,Material Request Type,Τύπος αίτησης υλικού
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Σειρά {0}: UOM Συντελεστής μετατροπής είναι υποχρεωτική
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Σειρά {0}: UOM Συντελεστής μετατροπής είναι υποχρεωτική
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Αναφορά
 DocType: Cost Center,Cost Center,Κέντρο κόστους
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Αποδεικτικό #
@@ -2005,7 +2024,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Όλες τις διευθύνσεις.
 DocType: Company,Stock Settings,Ρυθμίσεις αποθέματος
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Η συγχώνευση είναι δυνατή μόνο εάν οι ακόλουθες ιδιότητες ίδια στα δύο αρχεία. Είναι η Ομάδα, Τύπος Root, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Η συγχώνευση είναι δυνατή μόνο εάν οι ακόλουθες ιδιότητες ίδια στα δύο αρχεία. Είναι η Ομάδα, Τύπος Root, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Διαχειριστείτε το δέντρο ομάδας πελατών.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Νέο όνομα κέντρου κόστους
 DocType: Leave Control Panel,Leave Control Panel,Πίνακας ελέγχου άδειας
@@ -2025,8 +2044,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Λεπτομέρειες εργαλείου πληρωμής
 ,Sales Browser,Περιηγητής πωλήσεων
 DocType: Journal Entry,Total Credit,Συνολική πίστωση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Ένας άλλος {0} # {1} υπάρχει κατά την έναρξη αποθέματος {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Τοπικός
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Ένας άλλος {0} # {1} υπάρχει κατά την έναρξη αποθέματος {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,Χρεώστες
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Μεγάλο
@@ -2045,7 +2064,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Όλες οι συναλλαγές πωλήσεων μπορούν να σημανθούν κατά πολλαπλούς ** πωλητές ** έτσι ώστε να μπορείτε να ρυθμίσετε και να παρακολουθήσετε στόχους.
 ,S.O. No.,Αρ. Παρ. Πώλησης
 DocType: Production Order Operation,Make Time Log,Δημιούργησε αρχείο καταγραφής χρόνου
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Παρακαλούμε να ορίσετε την ποσότητα αναπαραγγελίας
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Παρακαλούμε να ορίσετε την ποσότητα αναπαραγγελίας
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Παρακαλώ δημιουργήστε πελάτη από επαφή {0}
 DocType: Price List,Applicable for Countries,Ισχύει για χώρες
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Υπολογιστές
@@ -2105,10 +2124,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast ένα στοιχείο πρέπει να αναγράφεται με αρνητική ποσότητα στο έγγραφο επιστροφής
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Δεν βρέθηκαν παρατηρήσεις
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Δεν βρέθηκαν παρατηρήσεις
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Εκπρόθεσμες
 DocType: Account,Stock Received But Not Billed,Το απόθεμα παρελήφθηκε αλλά δεν χρεώθηκε
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Ο λογαριασμός ρίζα πρέπει να είναι μια ομάδα
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Ο λογαριασμός ρίζα πρέπει να είναι μια ομάδα
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Μικτές αποδοχές + ληξιπρόθεσμο ποσό + ποσό εξαργύρωσης - συνολική μείωση
 DocType: Monthly Distribution,Distribution Name,Όνομα διανομής
 DocType: Features Setup,Sales and Purchase,Πωλήσεις και αγορές
@@ -2122,6 +2141,7 @@
 DocType: Journal Entry Account,Party Balance,Υπόλοιπο συμβαλλόμενου
 DocType: Sales Invoice Item,Time Log Batch,Παρτίδα αρχείων καταγραφής χρονολογίου
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Παρακαλώ επιλέξτε Εφαρμογή έκπτωση σε
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Εκκαθαριστικό μισθοδοσίας Δημιουργήθηκε
 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,Μεταφορά υλικού για την κατασκευή
@@ -2129,9 +2149,9 @@
 DocType: Purchase Invoice,Half-yearly,Εξαμηνιαία
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Η χρήση {0} δεν βρέθηκε.
 DocType: Bank Reconciliation,Get Relevant Entries,Βρες σχετικές καταχωρήσεις
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Λογιστική εγγραφή για απόθεμα
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Λογιστική εγγραφή για απόθεμα
 DocType: Sales Invoice,Sales Team1,Ομάδα πωλήσεων 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Το είδος {0} δεν υπάρχει
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Το είδος {0} δεν υπάρχει
 DocType: Sales Invoice,Customer Address,Διεύθυνση πελάτη
 DocType: Purchase Invoice,Apply Additional Discount On,Εφαρμόστε επιπλέον έκπτωση On
 DocType: Account,Root Type,Τύπος ρίζας
@@ -2140,15 +2160,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Εμφάνιση αυτής της παρουσίασης στην κορυφή της σελίδας
 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 +149,Target warehouse is mandatory for row {0},Η αποθήκη προορισμού είναι απαραίτητη για τη γραμμή {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Η αποθήκη προορισμού είναι απαραίτητη για τη γραμμή {0}
 DocType: Quality Inspection,Quality Inspection,Επιθεώρηση ποιότητας
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Νομικό πρόσωπο / θυγατρικές εταιρείες με ξεχωριστό λογιστικό σχέδιο που ανήκουν στον οργανισμό.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Τρόφιμα, ποτά και καπνός"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL or BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Μπορούν να πληρώνουν κατά unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Μπορούν να πληρώνουν κατά unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Το ποσοστό προμήθειας δεν μπορεί να υπερβαίνει το 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Ελάχιστη ποσότητα
 DocType: Stock Entry,Subcontract,Υπεργολαβία
@@ -2186,7 +2206,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Έλεγχος ποιότητας εισερχομένων
 DocType: Purchase Order Item,Returned Qty,Επέστρεψε Ποσότητα
 DocType: Employee,Exit,ˆΈξοδος
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Ο τύπος ρίζας είναι υποχρεωτικός
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Ο τύπος ρίζας είναι υποχρεωτικός
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Ο σειριακός αριθμός {0} δημιουργήθηκε
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Για την εξυπηρέτηση των πελατών, οι κωδικοί αυτοί μπορούν να χρησιμοποιηθούν σε μορφές εκτύπωσης, όπως τιμολόγια και δελτία παράδοσης"
 DocType: Employee,You can enter any date manually,Μπορείτε να εισάγετε οποιαδήποτε ημερομηνία με το χέρι
@@ -2194,8 +2214,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Δοκιμαστική περίοδος
 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 +110,Row {0}: Advance against Customer must be credit,Σειρά {0}: Προκαταβολή έναντι των πελατών πρέπει να είναι πιστωτικά
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Το είδος στο αποδεικτικό παραλαβής αγοράς έχει προμηθευτεί
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Πληρωμή
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Πληρωμή
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Έως ημερομηνία και ώρα
 DocType: SMS Settings,SMS Gateway URL,SMS gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs για τη διατήρηση της κατάστασης παράδοσης sms
@@ -2212,7 +2233,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Αναδιάταξη επιπέδου
 DocType: Attendance,Attendance Date,Ημερομηνία συμμετοχής
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Ανάλυση μισθού με βάση τις αποδοχές και τις παρακρατήσεις.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Ένας λογαριασμός με κόμβους παιδί δεν μπορεί να μετατραπεί σε καθολικό
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Ένας λογαριασμός με κόμβους παιδί δεν μπορεί να μετατραπεί σε καθολικό
 DocType: Address,Preferred Shipping Address,Προτιμώμενη διεύθυνση αποστολής
 DocType: Purchase Receipt Item,Accepted Warehouse,Έγκυρη Αποθήκη
 DocType: Bank Reconciliation Detail,Posting Date,Ημερομηνία αποστολής
@@ -2230,7 +2251,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Ο σειριακός αριθμός {0} δεν υπάρχει
 DocType: Pricing Rule,Discount Percentage,Ποσοστό έκπτωσης
 DocType: Payment Reconciliation Invoice,Invoice Number,Αριθμός τιμολογίου
-apps/erpnext/erpnext/hooks.py +54,Orders,Παραγγελίες
+apps/erpnext/erpnext/hooks.py +55,Orders,Παραγγελίες
 DocType: Leave Control Panel,Employee Type,Τύπος υπαλλήλου
 DocType: Employee Leave Approver,Leave Approver,Υπεύθυνος έγκρισης άδειας
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Υλικό το οποίο μεταφέρεται για την Κατασκευή
@@ -2242,7 +2263,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Των υλικών που χρεώθηκαν σε αυτήν την παραγγελία πώλησης
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Καταχώρηση κλεισίματος περιόδου
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Ένα κέντρο κόστους με υπάρχουσες συναλλαγές δεν μπορεί να μετατραπεί σε ομάδα
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Απόσβεση
+DocType: Account,Depreciation,Απόσβεση
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Προμηθευτής(-ές)
 DocType: Customer,Credit Limit,Πιστωτικό όριο
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Επιλέξτε τον τύπο της συναλλαγής
@@ -2267,11 +2288,12 @@
 DocType: Material Request,Requested For,Ζητήθηκαν για
 DocType: Quotation Item,Against Doctype,šΚατά τύπο εγγράφου
 DocType: Delivery Note,Track this Delivery Note against any Project,Παρακολουθήστε αυτό το δελτίο αποστολής σε οποιουδήποτε έργο
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Ο λογαριασμός ρίζας δεν μπορεί να διαγραφεί
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Καθαρές ταμειακές ροές από επενδυτικές
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Ο λογαριασμός ρίζας δεν μπορεί να διαγραφεί
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Προβολή καταχωρήσεων αποθέματος
 ,Is Primary Address,Είναι Πρωτοβάθμια Διεύθυνση
 DocType: Production Order,Work-in-Progress Warehouse,Αποθήκη εργασιών σε εξέλιξη
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Αναφορά # {0} της {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Αναφορά # {0} της {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Διαχειριστείτε Διευθύνσεις
 DocType: Pricing Rule,Item Code,Κωδικός είδους
 DocType: Production Planning Tool,Create Production Orders,Δημιουργία εντολών παραγωγής
@@ -2279,7 +2301,7 @@
 DocType: Journal Entry,User Remark,Παρατήρηση χρήστη
 DocType: Lead,Market Segment,Τομέας της αγοράς
 DocType: Employee Internal Work History,Employee Internal Work History,Ιστορικό εσωτερικών εργασιών υπαλλήλου
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Κλείσιμο (dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Κλείσιμο (dr)
 DocType: Contact,Passive,Αδρανής
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Ο σειριακός αριθμός {0} δεν υπάρχει στο απόθεμα
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Φορολογικό πρότυπο για συναλλαγές πώλησης.
@@ -2295,7 +2317,7 @@
 ,Billed Amount,Χρεωμένο ποσό
 DocType: Bank Reconciliation,Bank Reconciliation,Συμφωνία τραπεζικού λογαριασμού
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Λήψη ενημερώσεων
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,H αίτηση υλικού {0} έχει ακυρωθεί ή διακοπεί
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,H αίτηση υλικού {0} έχει ακυρωθεί ή διακοπεί
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Προσθέστε μερικά αρχεία του δείγματος
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Αφήστε Διαχείρισης
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Ομαδοποίηση κατά λογαριασμό
@@ -2304,14 +2326,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Η κύρια εγγραφή λογαριασμού υποχρεώσεων, στην οποία θα καταγραφούν τα κέρδη / ζημίες"
 DocType: Payment Tool,Against Vouchers,Κατά τα αποδεικτικά
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Γρήγορη βοήθεια
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Η αποθήκη προέλευση και αποθήκη προορισμός δεν μπορεί να είναι η ίδια για τη σειρά {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Η αποθήκη προέλευση και αποθήκη προορισμός δεν μπορεί να είναι η ίδια για τη σειρά {0}
 DocType: Features Setup,Sales Extras,Πρόσθετα πωλήσεων
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Ο προϋπολογισμός για τον λογαριασμό {1} για το κέντρο κόστους {2} θα ξεφύγει κατά {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Το πεδίο ""Από Ημερομηνία"" πρέπει να είναι μετά το πεδίο ""Έως Ημερομηνία"""
 ,Stock Projected Qty,Προβλεπόμενη ποσότητα αποθέματος
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
 DocType: Sales Order,Customer's Purchase Order,Εντολή Αγοράς του Πελάτη
 DocType: Warranty Claim,From Company,Από την εταιρεία
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Αξία ή ποσ
@@ -2321,9 +2343,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Η λίστα αποκλεισμού ημερών άδειας επετράπη
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Θα το χρησιμοποιήσετε για να συνδεθείτε
 DocType: Sales Partner,Retailer,Έμπορος λιανικής
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Πίστωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Πίστωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Όλοι οι τύποι προμηθευτή
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Ο κωδικός είδους είναι απαραίτητος γιατί το είδος δεν αριθμείται αυτόματα
+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 +93,Quotation {0} not of type {1},Η προσφορά {0} δεν είναι του τύπου {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Είδος χρονοδιαγράμματος συντήρησης
 DocType: Sales Order,%  Delivered,Παραδόθηκε%
@@ -2367,7 +2389,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Το μεικτό βάρος της συσκευασίας. Συνήθως καθαρό βάρος + βάρος υλικού συσκευασίας. (Για εκτύπωση)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Οι χρήστες με αυτό το ρόλο μπορούν να καθορίζουν δεσμευμένους λογαριασμούς και τη δημιουργία / τροποποίηση των λογιστικών εγγραφών δεσμευμένων λογαριασμών
 DocType: Serial No,Is Cancelled,Είναι ακυρωμένο
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Αποστολές μου
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Αποστολές μου
 DocType: Journal Entry,Bill Date,Ημερομηνία χρέωσης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Ακόμα κι αν υπάρχουν πολλαπλοί κανόνες τιμολόγησης με την υψηλότερη προτεραιότητα, στη συνέχεια οι εσωτερικές προτεραιότητες θα εφαρμοστούν:"
 DocType: Supplier,Supplier Details,Στοιχεία προμηθευτή
@@ -2388,10 +2410,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,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 +198,Purchase Order {0} is not submitted,Η παραγγελία αγοράς {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Η παραγγελία αγοράς {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Προβλεπόμενη
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Ο σειριακός αριθμός {0} δεν ανήκει στην αποθήκη {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Σημείωση : το σύστημα δεν θα ελέγχει για υπέρβαση ορίων παράδοσης και κράτησης για το είδος {0} καθώς η ποσότητα ή το ποσό είναι 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,Ημερομηνία έναρξης
 DocType: Journal Entry,Remark,Παρατήρηση
@@ -2404,9 +2426,9 @@
 DocType: Time Log,Batched for Billing,Ομαδοποιημένα για χρέωση
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Λογαριασμοί από τους προμηθευτές.
 DocType: POS Profile,Write Off Account,Διαγραφή λογαριασμού
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Ποσό έκπτωσης
 DocType: Purchase Invoice,Return Against Purchase Invoice,Επιστροφή Ενάντια Αγορά Τιμολόγιο
 DocType: Item,Warranty Period (in days),Περίοδος εγγύησης (σε ημέρες)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Καθαρές ροές από λειτουργικές δραστηριότητες
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,Π.Χ. Φπα
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Στοιχείο 4
 DocType: Journal Entry Account,Journal Entry Account,Λογαριασμός λογιστικής εγγραφής
@@ -2447,7 +2469,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Η ημερομηνία συνταξιοδότησης πρέπει να είναι μεταγενέστερη από την ημερομηνία πρόσληψης
 DocType: Sales Invoice,Against Income Account,Κατά τον λογαριασμό εσόδων
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Παραδόθηκαν
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,Πληροφορίες μεταφορέα
@@ -2475,10 +2497,10 @@
 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 +14,This is a root sales person and cannot be edited.,Αυτός είναι ένας κύριος πωλητής και δεν μπορεί να επεξεργαστεί.
 ,Stock Ledger,Καθολικό αποθέματος
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Τιμή: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Τιμή: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Παρακρατήσεις στη βεβαίωση αποδοχών
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Επιλέξτε πρώτα έναν κόμβο ομάδας.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Ο σκοπός πρέπει να είναι ένα από τα {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Ο σκοπός πρέπει να είναι ένα από τα {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Συμπληρώστε τη φόρμα και αποθηκεύστε
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Κατεβάστε μια έκθεση που περιέχει όλες τις πρώτες ύλες με την πιο πρόσφατη κατάσταση των αποθεμάτων τους
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Κοινότητα Φόρουμ
@@ -2516,7 +2538,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Κύρια εγγραφή εταιρείας (δεν είναι πελάτης ή προμηθευτής).
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Παρακαλώ εισάγετε 'αναμενόμενη ημερομηνία παράδοσης΄
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Τα δελτία παράδοσης {0} πρέπει να ακυρώνονται πριν από την ακύρωση της παραγγελίας πώλησης
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,Το άθροισμα από το καταβληθέν ποσό και το ποσό που διαγράφηκε δεν μπορεί να είναι μεγαλύτερο από το γενικό σύνολο
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},Σημείωση : δεν υπάρχει αρκετό υπόλοιπο άδειας για τον τύπο άδειας {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Σημείωση: εάν η πληρωμή δεν γίνεται κατά οποιαδήποτε αναφορά, δημιουργήστε την λογιστική εγγραφή χειροκίνητα."
@@ -2533,12 +2555,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' Είναι απενεργοποιημένος
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ορισμός ως Ανοικτό
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Αυτόματη αποστολή email στις επαφές για την υποβολή των συναλλαγών.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Γραμμή {0}: για να ρυθμίσετε {1} περιοδικότητα, η διαφορά μεταξύ της ημερομηνίας από και έως \ πρέπει να είναι μεγαλύτερη ή ίση με {2}"""
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Στοιχείο 3
 DocType: Purchase Order,Customer Contact Email,Πελατών Επικοινωνία Email
 DocType: Sales Team,Contribution (%),Συμβολή (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Σημείωση : η καταχώρηση πληρωμής δεν θα δημιουργηθεί γιατί δεν ορίστηκε λογαριασμός μετρητών ή τραπέζης
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Σημείωση : η καταχώρηση πληρωμής δεν θα δημιουργηθεί γιατί δεν ορίστηκε λογαριασμός μετρητών ή τραπέζης
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Αρμοδιότητες
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Πρότυπο
 DocType: Sales Person,Sales Person Name,Όνομα πωλητή
@@ -2549,20 +2571,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Πριν συμφιλίωση
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Η γραμμή φόρου είδους {0} πρέπει να έχει λογαριασμό τύπου φόρος ή έσοδα ή δαπάνη ή χρέωση
 DocType: Sales Order,Partly Billed,Μερικώς τιμολογημένος
 DocType: Item,Default BOM,Προεπιλεγμένη Λ.Υ.
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Παρακαλώ πληκτρολογήστε ξανά το όνομα της εταιρείας για να επιβεβαιώσετε
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Συνολικού ανεξόφλητου υπολοίπου
 DocType: Time Log Batch,Total Hours,Σύνολο ωρών
 DocType: Journal Entry,Printing Settings,Ρυθμίσεις εκτύπωσης
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Η συνολική χρέωση πρέπει να είναι ίση με τη συνολική πίστωση. Η διαφορά είναι {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Η συνολική χρέωση πρέπει να είναι ίση με τη συνολική πίστωση. Η διαφορά είναι {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Αυτοκίνητο
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Από το δελτίο αποστολής
 DocType: Time Log,From Time,Από ώρα
 DocType: Notification Control,Custom Message,Προσαρμοσμένο μήνυμα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Επενδυτική τραπεζική
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Ο λογαριασμός μετρητών/τραπέζης είναι απαραίτητος για την κατασκευή καταχωρήσεων πληρωμής
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Ο λογαριασμός μετρητών/τραπέζης είναι απαραίτητος για την κατασκευή καταχωρήσεων πληρωμής
 DocType: Purchase Invoice,Price List Exchange Rate,Ισοτιμία τιμοκαταλόγου
 DocType: Purchase Invoice Item,Rate,Τιμή
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Εκπαιδευόμενος
@@ -2580,9 +2602,10 @@
 			conflict by assigning priority. Price Rules: {0}","Πολλαπλοί κανόνας τιμής υπάρχουν με τα ίδια κριτήρια, παρακαλώ να επιλύσετε την διένεξη \ σύγκρουση με τον ορισμό προτεραιότητας. Κανόνες τιμής: {0}"""
 DocType: Account,Bank,Τράπεζα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Αερογραμμή
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Υλικό έκδοσης
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Υλικό έκδοσης
 DocType: Material Request Item,For Warehouse,Για αποθήκη
 DocType: Employee,Offer Date,Ημερομηνία προσφοράς
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Προσφορές
 DocType: Hub Settings,Access Token,Η πρόσβαση παραχωρήθηκε
 DocType: Sales Invoice Item,Serial No,Σειριακός αριθμός
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Παρακαλώ εισάγετε πρώτα λεπτομέρειες συντήρησης
@@ -2596,10 +2619,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Υπάρχουν περισσότερες ημέρες αργιών από ότι εργάσιμες ημέρες αυτό το μήνα.
 DocType: Product Bundle Item,Product Bundle Item,Προϊόν Bundle Προϊόν
 DocType: Sales Partner,Sales Partner Name,Όνομα συνεργάτη πωλήσεων
+DocType: Payment Reconciliation,Maximum Invoice Amount,Μέγιστο ποσό του τιμολογίου
 DocType: Purchase Invoice Item,Image View,Προβολή εικόνας
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,Αποτίμηση και σύνολο
@@ -2607,6 +2632,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Αυτό το στοιχείο είναι μια παραλλαγή του {0} (προτύπου). Τα χαρακτηριστικά θα αντιγραφούν  από το πρότυπο, εκτός αν έχει οριστεί «όχι αντιγραφή '"
 DocType: Account,Purchase User,Χρήστης αγορών
 DocType: Notification Control,Customize the Notification,Προσαρμόστε την ενημέρωση
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Ταμειακές ροές από εργασίες
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Το προεπιλεγμένο πρότυπο διεύθυνσης δεν μπορεί να διαγραφεί
 DocType: Sales Invoice,Shipping Rule,Κανόνας αποστολής
 DocType: Journal Entry,Print Heading,Εκτύπωση κεφαλίδας
@@ -2617,7 +2643,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Πρώτη ύλη
 DocType: Leave Application,Follow via Email,Ακολουθήστε μέσω email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Ποσό φόρου μετά ποσού έκπτωσης
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Υπάρχει θυγατρικός λογαριασμός για αυτόν το λογαριασμό. Δεν μπορείτε να διαγράψετε αυτόν το λογαριασμό.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Παρακαλώ επιλέξτε Ημερομηνία Δημοσίευσης πρώτη
@@ -2635,6 +2661,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Οι σειριακοί αριθμοί είναι απαραίτητοι για το είδος με σειρά {0}
 DocType: Journal Entry,Bank Entry,Καταχώρηση τράπεζας
 DocType: Authorization Rule,Applicable To (Designation),Εφαρμοστέα σε (ονομασία)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Προσθήκη στο καλάθι
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Ομαδοποίηση κατά
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Ενεργοποίηση / απενεργοποίηση νομισμάτων.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Ταχυδρομικές δαπάνες
@@ -2642,29 +2669,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Διασκέδαση & ψυχαγωγία
 DocType: Purchase Order,The date on which recurring order will be stop,Η ημερομηνία κατά την οποία η επαναλαμβανόμενη παραγγελία θα σταματήσει
 DocType: Quality Inspection,Item Serial No,Σειριακός αριθμός είδους
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} Πρέπει να μειωθεί κατά {1} ή θα πρέπει να αυξηθεί η ανοχή υπερχείλισης
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} Πρέπει να μειωθεί κατά {1} ή θα πρέπει να αυξηθεί η ανοχή υπερχείλισης
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Σύνολο παρόντων
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Ώρα
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Το είδος σειράς {0} δεν μπορεί να ενημερωθεί \ χρησιμοποιώντας συμφωνία αποθέματος"""
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Μεταφορά Υλικού Προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Μεταφορά Υλικού Προμηθευτή
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Δημιουργία προσφοράς
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Δεν επιτρέπεται να εγκρίνει φύλλα στο Block Ημερομηνίες
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Όλα αυτά τα είδη έχουν ήδη τιμολογηθεί
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Όλα αυτά τα είδη έχουν ήδη τιμολογηθεί
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Μπορεί να εγκριθεί από {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Όροι κανόνα αποστολής
 DocType: BOM Replace Tool,The new BOM after replacement,Η νέα Λ.Υ. μετά την αντικατάστασή
 DocType: Features Setup,Point of Sale,Point of sale
 DocType: Account,Tax,Φόρος
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Γραμμή {0}: {1} δεν είναι έγκυρο {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Από Bundle Προϊόν
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Από Bundle Προϊόν
 DocType: Production Planning Tool,Production Planning Tool,Εργαλείο σχεδιασμού παραγωγής
 DocType: Quality Inspection,Report Date,Ημερομηνία έκθεσης
 DocType: C-Form,Invoices,Τιμολόγια
 DocType: Job Opening,Job Title,Τίτλος εργασίας
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Παραλήπτες
 DocType: Features Setup,Item Groups in Details,Ομάδες ειδών στις λεπτομέρειες
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Ποσότητα Παρασκευή πρέπει να είναι μεγαλύτερη από 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Έναρξη Point-of-Sale (POS)
@@ -2672,8 +2698,9 @@
 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: Pricing Rule,Customer Group,Ομάδα πελατών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Ο λογαριασμός δαπανών είναι υποχρεωτικός για το είδος {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Ο λογαριασμός δαπανών είναι υποχρεωτικός για το είδος {0}
 DocType: Item,Website Description,Περιγραφή δικτυακού τόπου
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Καθαρή Μεταβολή Ιδίων Κεφαλαίων
 DocType: Serial No,AMC Expiry Date,Ε.Σ.Υ. Ημερομηνία λήξης
 ,Sales Register,Ταμείο πωλήσεων
 DocType: Quotation,Quotation Lost Reason,Λόγος απώλειας προσφοράς
@@ -2681,12 +2708,12 @@
 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 +108,Summary for this month and pending activities,Περίληψη για το μήνα αυτό και εν αναμονή δραστηριότητες
 DocType: Customer Group,Customer Group Name,Όνομα ομάδας πελατών
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,Γνωρίσματα
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Βρες είδη
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Βρες είδη
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Τελευταία ημερομηνία παραγγελίας
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Δημιούργησε τιμολόγιο έμμεσης εσωτερικής φορολογίας
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Ο Λογαριασμός {0} δεν ανήκει στην εταιρεία {1}
@@ -2702,7 +2729,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Τα στοιχεία με βάση το έργο δεν είναι διαθέσιμα στοιχεία για προσφορά
 DocType: Project,Expected End Date,Αναμενόμενη ημερομηνία λήξης
 DocType: Appraisal Template,Appraisal Template Title,Τίτλος προτύπου αξιολόγησης
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Εμπορικός
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Εμπορικός
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Μητρική Θέση {0} δεν πρέπει να είναι ένα αναντικατάστατο
 DocType: Cost Center,Distribution Id,ID διανομής
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Εκπληκτικές υπηρεσίες
@@ -2715,7 +2742,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Σχέση Χαρακτηριστικό {0} πρέπει να είναι εντός του εύρους από {1} σε {2} σε προσαυξήσεις των {3}
 DocType: Tax Rule,Sales,Πωλήσεις
 DocType: Stock Entry Detail,Basic Amount,Βασικό Ποσό
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
 DocType: Leave Allocation,Unused leaves,Αχρησιμοποίητα φύλλα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Προεπιλεγμένοι λογαριασμοί εισπρακτέων
@@ -2727,16 +2754,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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,Επαφή ΗΤΜΛ
 DocType: Landed Cost Voucher,Purchase Receipts,Αποδεικτικά παραλαβής αγορών
-DocType: Payment Reconciliation,Maximum Amount,Μέγιστο ποσό
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Πώς εφαρμόζεται ο κανόνας τιμολόγησης;
 DocType: Quality Inspection,Delivery Note No,Αρ. δελτίου αποστολής
 DocType: Company,Retail,Λιανική πώληση
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,O πελάτης {0} δεν υπάρχει
 DocType: Attendance,Absent,Απών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Πακέτο προϊόντων
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Σειρά {0}: Άκυρη αναφορά {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Πακέτο προϊόντων
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Σειρά {0}: Άκυρη αναφορά {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Αγοράστε φόροι και επιβαρύνσεις Πρότυπο
 DocType: Upload Attendance,Download Template,Κατεβάστε πρότυπο
 DocType: GL Entry,Remarks,Παρατηρήσεις
@@ -2763,17 +2790,19 @@
 ,Monthly Attendance Sheet,Μηνιαίο δελτίο συμμετοχής
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Δεν βρέθηκαν εγγραφές
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Tο κέντρο κόστους είναι υποχρεωτικό για το είδος {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Ο λογαριασμός {0} είναι ανενεργός
 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 +122,Please enter 'Is Subcontracted' as Yes or No,Παρακαλώ εισάγετε τιμή στο πεδίο 'υπεργολαβία' ναι ή όχι
 DocType: Sales Team,Contact No.,Αριθμός επαφής
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Ο τύπος λογαριασμού ""κέρδη και ζημίες"" {0} δεν επιτρέπετεαι στην αρχική καταχώρηση λογαριασμών"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Ο τύπος λογαριασμού ""Κέρδη και Ζημίες"" {0} δεν επιτρέπεται στην αρχική καταχώρηση λογαριασμών"
 DocType: Features Setup,Sales Discounts,Εκπτώσεις πωλήσεων
 DocType: Hub Settings,Seller Country,Χώρα πωλητή
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Δημοσιεύστε Αντικείμενα στην ιστοσελίδα
 DocType: Authorization Rule,Authorization Rule,Κανόνας εξουσιοδότησης
 DocType: Sales Invoice,Terms and Conditions Details,Λεπτομέρειες όρων και προϋποθέσεων
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Προδιαγραφές
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Φόρους επί των πωλήσεων και Χρεώσεις Πρότυπο
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ένδυση & αξεσουάρ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Αριθμός παραγγελίας
@@ -2795,7 +2824,7 @@
 DocType: Time Log,Billing Amount,Ποσό Χρέωσης
 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 +18,Applications for leave.,Αιτήσεις για χορήγηση άδειας.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να διαγραφεί
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να διαγραφεί
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Νομικές δαπάνες
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Η ημέρα του μήνα κατά την οποίο θα δημιουργηθεί η αυτοματοποιημένη παραγγελία, π.Χ. 05, 28 Κλπ"
 DocType: Sales Invoice,Posting Time,Ώρα αποστολής
@@ -2811,11 +2840,11 @@
 DocType: Maintenance Visit,Breakdown,Ανάλυση
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Ο λογαριασμός: {0} με το νόμισμα: {1} δεν μπορεί να επιλεγεί
 DocType: Bank Reconciliation Detail,Cheque Date,Ημερομηνία επιταγής
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Διαγράφηκε επιτυχώς όλες τις συναλλαγές που σχετίζονται με αυτή την εταιρεία!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Ως ημερομηνία για
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Επιτήρηση
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Η προεπιλεγμένη αποθήκη είναι απαραίτητη για αποθηκεύσιμα είδη.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Η προεπιλεγμένη αποθήκη είναι απαραίτητη για αποθηκεύσιμα είδη.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Πληρωμή του μισθού για τον μήνα {0} και έτος {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Αυτόματη ένθετο ποσοστό Τιμοκατάλογος αν λείπει
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Συνολικό καταβεβλημένο ποσό
@@ -2827,6 +2856,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Συνολικό Ποσό Χρέωσης (μέσω χρόνος Καταγράφει)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Πουλάμε αυτό το είδος
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ID προμηθευτή
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Ποσότητα θα πρέπει να είναι μεγαλύτερη από 0
 DocType: Journal Entry,Cash Entry,Καταχώρηση μετρητών
 DocType: Sales Partner,Contact Desc,Περιγραφή επαφής
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Τύπος των φύλλων, όπως τυπική, για λόγους υγείας κλπ."
@@ -2835,7 +2865,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Προσθέστε γραμμές για να θέσουν ετήσιους προϋπολογισμούς σε λογαριασμούς.
 DocType: Buying Settings,Default Supplier Type,Προεπιλεγμένος τύπος προμηθευτής
 DocType: Production Order,Total Operating Cost,Συνολικό κόστος λειτουργίας
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Σημείωση : το σημείο {0} εισήχθηκε πολλαπλές φορές
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Σημείωση : το σημείο {0} εισήχθηκε πολλαπλές φορές
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Όλες οι επαφές.
 DocType: Newsletter,Test Email Id,Δοκιμαστικό email ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Συντομογραφία εταιρείας
@@ -2860,7 +2890,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Όλες οι ομάδες πελατών
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Φόρος προτύπου είναι υποχρεωτική.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν υπάρχει
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν υπάρχει
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Τιμή τιμοκαταλόγου (νόμισμα της εταιρείας)
 DocType: Account,Temporary,Προσωρινός
 DocType: Address,Preferred Billing Address,Προτιμώμενη διεύθυνση χρέωσης
@@ -2878,8 +2908,8 @@
 ,Item-wise Price List Rate,Τιμή τιμοκαταλόγου ανά είδος
 DocType: Purchase Order Item,Supplier Quotation,Προσφορά προμηθευτή
 DocType: Quotation,In Words will be visible once you save the Quotation.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το πρόσημο.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} Είναι σταματημένο
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} Είναι σταματημένο
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
 DocType: Lead,Add to calendar on this date,Προσθήκη στο ημερολόγιο την ημερομηνία αυτή
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Κανόνες για την προσθήκη εξόδων αποστολής.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Ανερχόμενες εκδηλώσεις
@@ -2900,24 +2930,24 @@
 DocType: Customer,From Lead,Από επαφή
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Παραγγελίες ανοιχτές για παραγωγή.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Επιλέξτε οικονομικό έτος...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
 DocType: Hub Settings,Name Token,Name Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Πρότυπες πωλήσεις
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Τουλάχιστον μια αποθήκη είναι απαραίτητη
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,Αντικατάσταση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} κατά το τιμολόγιο πώλησης {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Παρακαλώ εισάγετε προεπιλεγμένη μονάδα μέτρησης
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} κατά το τιμολόγιο πώλησης {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Παρακαλώ εισάγετε προεπιλεγμένη μονάδα μέτρησης
 DocType: Purchase Invoice Item,Project Name,Όνομα έργου
 DocType: Supplier,Mention if non-standard receivable account,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμού
 DocType: Journal Entry Account,If Income or Expense,Εάν είναι έσοδα ή δαπάνη
 DocType: Features Setup,Item Batch Nos,Αρ. Παρτίδας είδους
 DocType: Stock Ledger Entry,Stock Value Difference,Διαφορά αξίας αποθέματος
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Ανθρώπινο Δυναμικό
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,Ανθρώπινο Δυναμικό
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Πληρωμή συμφωνίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Φορολογικές απαιτήσεις
 DocType: BOM Item,BOM No,Αρ. Λ.Υ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,Η λογιστική εγγραφή {0} δεν έχει λογαριασμό {1} ή έχει ήδη αντιπαραβληθεί με άλλο αποδεικτικό
 DocType: Item,Moving Average,Κινητός μέσος
 DocType: BOM Replace Tool,The BOM which will be replaced,Η Λ.Υ. που θα αντικατασταθεί
 DocType: Account,Debit,Χρέωση
@@ -2954,7 +2984,7 @@
 DocType: Stock Entry Detail,Additional Cost,Πρόσθετο κόστος
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Ημερομηνία λήξης για η χρήση
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Δεν μπορείτε να φιλτράρετε με βάση αρ. αποδεικτικού, αν είναι ομαδοποιημένες ανά αποδεικτικό"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
 DocType: Quality Inspection,Incoming,Εισερχόμενος
 DocType: BOM,Materials Required (Exploded),Υλικά που απαιτούνται (αναλυτικά)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Μείωση κερδών για άδεια άνευ αποδοχών (Α.Α.Α.)
@@ -2962,7 +2992,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Σειρά # {0}: Αύξων αριθμός {1} δεν ταιριάζει με το {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Περιστασιακή άδεια
 DocType: Batch,Batch ID,ID παρτίδας
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Σημείωση : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Σημείωση : {0}
 ,Delivery Note Trends,Τάσεις δελτίου αποστολής
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Περίληψη της Εβδομάδας
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} Το είδος στη γραμμή {1} πρέπει να είναι αγορασμένο ή από υπεργολαβία
@@ -2977,6 +3007,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Μέση τιμή αγοράς
 DocType: Task,Actual Time (in Hours),Πραγματικός χρόνος (σε ώρες)
 DocType: Employee,History In Company,Ιστορικό στην εταιρεία
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,Ενημερωτικά Δελτία
 DocType: Address,Shipping,Αποστολή
 DocType: Stock Ledger Entry,Stock Ledger Entry,Καθολική καταχώρηση αποθέματος
@@ -2996,7 +3027,6 @@
 DocType: Purchase Order,End date of current order's period,Ημερομηνία λήξης της περιόδου της τρέχουσας παραγγελίας
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Πραγματοποίηση προσφοράς Επιστολή
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Απόδοση
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή πρέπει να είναι ίδιο με το Πρότυπο
 DocType: Production Order Operation,Production Order Operation,Λειτουργία παραγγελίας παραγωγής
 DocType: Pricing Rule,Disable,Απενεργοποίηση
 DocType: Project Task,Pending Review,Εκκρεμής αναθεώρηση
@@ -3004,7 +3034,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID πελάτη
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"Σε καιρό πρέπει να είναι μεγαλύτερη από ό, τι από καιρό"
 DocType: Journal Entry Account,Exchange Rate,Ισοτιμία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Αποθήκη {0}:ο γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία {2}
 DocType: BOM,Last Purchase Rate,Τελευταία τιμή αγοράς
 DocType: Account,Asset,Περιουσιακό στοιχείο
@@ -3024,7 +3054,7 @@
 ,Available Stock for Packing Items,Διαθέσιμο απόθεμα για είδη συσκευασίας
 DocType: Item Variant,Item Variant,Παραλλαγή είδους
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Αυτό το πρότυπο διεύθυνσης ορίστηκε ως προεπιλογή, καθώς δεν υπάρχει άλλη προεπιλογή."
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Το υπόλοιπο του λογαριασμού είναι ήδη χρεωστικό, δεν μπορείτε να ορίσετε την επιλογή το υπόλοιπο πρέπει να είναι 'πιστωτικό'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Διαχείριση ποιότητας
 DocType: Production Planning Tool,Filter based on customer,Φιλτράρισμα με βάση τον πελάτη
 DocType: Payment Tool Detail,Against Voucher No,Κατά τον αρ. αποδεικτικού
@@ -3041,6 +3071,7 @@
 DocType: Opportunity,Next Contact,Επόμενο Επικοινωνία
 DocType: Employee,Employment Type,Τύπος απασχόλησης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Πάγια
+,Cash Flow,Κατάσταση Ταμειακών Ροών
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Περίοδος υποβολής των αιτήσεων δεν μπορεί να είναι σε δύο εγγραφές alocation
 DocType: Item Group,Default Expense Account,Προεπιλεγμένος λογαριασμός δαπανών
 DocType: Employee,Notice (days),Ειδοποίηση (ημέρες)
@@ -3072,13 +3103,12 @@
 DocType: Production Order,Warehouses,Αποθήκες
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Εκτύπωση και στάσιμο
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Κόμβος ομάδας
-DocType: Payment Reconciliation,Minimum Amount,Ελάχιστο ποσό
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Ενημέρωση τελικών ειδών
 DocType: Workstation,per hour,Ανά ώρα
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Ο λογαριασμός για την αποθήκη (διαρκής απογραφή) θα δημιουργηθεί στο πλαίσιο του παρόντος λογαριασμού.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Η αποθήκη δεν μπορεί να διαγραφεί, γιατί υφίσταται καταχώρηση στα καθολικά αποθέματα για την αποθήκη αυτή."
 DocType: Company,Distribution,Διανομή
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Πληρωμένο Ποσό
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Πληρωμένο Ποσό
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Υπεύθυνος έργου
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Αποστολή
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Η μέγιστη έκπτωση που επιτρέπεται για το είδος: {0} είναι {1}%
@@ -3102,7 +3132,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Στατιστικά στοιχεία υποστήριξης
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Η εταιρεία λείπει στις αποθήκες {0}
 DocType: POS Profile,Terms and Conditions,Όροι και προϋποθέσεις
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Η 'εώς ημερομηνία' πρέπει να είναι εντός της χρήσης. Υποθέτοντας 'έως ημερομηνία' = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Η 'εώς ημερομηνία' πρέπει να είναι εντός της χρήσης. Υποθέτοντας 'έως ημερομηνία' = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Εδώ μπορείτε να διατηρήσετε το ύψος, το βάρος, τις αλλεργίες, ιατροφαρμακευτική περίθαλψη, κλπ. Ανησυχίες"
 DocType: Leave Block List,Applies to Company,Ισχύει για την εταιρεία
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Δεν μπορεί να γίνει ακύρωση, διότι υπάρχει καταχώρηση αποθέματος {0}"
@@ -3116,11 +3146,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Παρακαλώ εισάγετε αποδεικτικά παραλαβής αγοράς
 DocType: Sales Invoice,Get Advances Received,Βρες προκαταβολές που εισπράχθηκαν
 DocType: Email Digest,Add/Remove Recipients,Προσθήκη / αφαίρεση παραληπτών
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},Η συναλλαγή δεν επιτρέπεται σε σταματημένες εντολές παραγωγής {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Ρύθμιση διακομιστή εισερχομένων για το email ID υποστήριξης. ( Π.Χ. Support@example.Com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Έλλειψη ποσότητας
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
 DocType: Salary Slip,Salary Slip,Βεβαίωση αποδοχών
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.","Δημιουργία δελτίων συσκευασίας για τα πακέτα που είναι να παραδοθούν. Χρησιμοποιείται για να ενημερώσει τον αριθμό πακέτου, το περιεχόμενο του πακέτου και το βάρος του."
@@ -3209,7 +3239,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Εγγραφές υπαλλήλων
 DocType: HR Settings,Payroll Settings,Ρυθμίσεις μισθοδοσίας
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Ταίριαξε μη συνδεδεμένα τιμολόγια και πληρωμές.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Παραγγέλνω
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Παραγγέλνω
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Η ρίζα δεν μπορεί να έχει γονικό κέντρο κόστους
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Επιλέξτε Μάρκα ...
 DocType: Sales Invoice,C-Form Applicable,Εφαρμόσιμο σε C-Form
@@ -3224,7 +3254,7 @@
 DocType: Appraisal,Start Date,Ημερομηνία έναρξης
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Κατανομή αδειών για μία περίοδο.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Κάντε κλικ εδώ για να επιβεβαιώσετε
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Ο λογαριασμός {0}: δεν μπορεί να οριστεί ως γονικός λογαριασμός του εαυτού του.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Ο λογαριασμός {0}: δεν μπορεί να οριστεί ως γονικός λογαριασμός του εαυτού του.
 DocType: Purchase Invoice Item,Price List Rate,Τιμή τιμοκαταλόγου
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Εμφάνισε 'διαθέσιμο' ή 'μη διαθέσιμο' με βάση το απόθεμα που είναιι διαθέσιμο στην αποθήκη αυτή.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Λίστα υλικών (Λ.Υ.)
@@ -3233,17 +3263,17 @@
 DocType: Project,Expected Start Date,Αναμενόμενη ημερομηνία έναρξης
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Αφαιρέστε το είδος εάν οι επιβαρύνσεις δεν ισχύουν για αυτό το είδος
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Π.Χ. SMSgateway.Com / api / send_SMS.Cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Λήψη
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Λήψη
 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: Employee Leave Approver,Employee Leave Approver,Υπεύθυνος έγκρισης αδειών υπαλλήλου
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} έχει προστεθεί με επιτυχία στην λίστα ενημερωτικών δελτίων μας.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Δεν μπορεί να δηλώθει ως απολεσθέν, επειδή έχει γίνει προσφορά."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Κύρια εγγραφή υπευθύνου αγορών
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Η εντολή παραγωγής {0} πρέπει να υποβληθεί
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Η εντολή παραγωγής {0} πρέπει να υποβληθεί
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Παρακαλώ επιλέξτε ημερομηνία έναρξης και ημερομηνία λήξης για το είδος {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Κύριες εκθέσεις
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Το πεδίο έως ημερομηνία δεν μπορεί να είναι προγενέστερο από το πεδίο από ημερομηνία
@@ -3261,7 +3291,7 @@
 DocType: Industry Type,Industry Type,Τύπος βιομηχανίας
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Κάτι πήγε στραβά!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Προσοχή: η αίτηση αδείας περιλαμβάνει τις εξής μπλοκαρισμένες ημερομηνίες
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Το τιμολόγιο πώλησης {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Το τιμολόγιο πώλησης {0} έχει ήδη υποβληθεί
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ημερομηνία ολοκλήρωσης
 DocType: Purchase Invoice Item,Amount (Company Currency),Ποσό (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Κύρια εγγραφή μονάδας (τμήματος) οργάνωσης.
@@ -3280,10 +3310,10 @@
 ,Serial No Service Contract Expiry,Λήξη σύμβασης παροχής υπηρεσιών για τον σειριακό αριθμό
 DocType: Item,Unit of Measure Conversion,Μονάδα μετατροπής Μέτρου
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Υπάλληλος που δεν μπορεί να αλλάξει
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Δεν μπορείτε να πιστώσετε και να χρεώσετε ταυτόχρονα τον ίδιο λογαριασμό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Δεν μπορείτε να πιστώσετε και να χρεώσετε ταυτόχρονα τον ίδιο λογαριασμό
 DocType: Naming Series,Help HTML,Βοήθεια ΗΤΜΛ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Το σύνολο βάρους πού έχει ανατεθεί έπρεπε να είναι 100 %. Είναι {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}
 DocType: Address,Name of person or organization that this address belongs to.,Όνομα προσώπου ή οργανισμού που ανήκει αυτή η διεύθυνση.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Οι προμηθευτές σας
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Δεν μπορεί να οριστεί ως απολεσθέν, καθώς έχει γίνει παραγγελία πώλησης."
@@ -3296,35 +3326,35 @@
 DocType: Employee,Date of Issue,Ημερομηνία έκδοσης
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Από {0} για {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Σειρά # {0}: Ορισμός Προμηθευτή για το στοιχείο {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,Ιστοσελίδα Εικόνα {0} επισυνάπτεται στη θέση {1} δεν μπορεί να βρεθεί
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Παρακαλώ ελέγξτε Πολλαπλών επιλογή νομίσματος για να επιτρέψει τους λογαριασμούς με άλλο νόμισμα
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Παρακαλώ ελέγξτε Πολλαπλών επιλογή νομίσματος για να επιτρέψει τους λογαριασμούς με άλλο νόμισμα
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Το είδος: {0} δεν υπάρχει στο σύστημα
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Δεν επιτρέπεται να ορίσετε παγωμένη αξία
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Δεν επιτρέπεται να ορίσετε παγωμένη αξία
 DocType: Payment Reconciliation,Get Unreconciled Entries,Βρες καταχωρήσεις χωρίς συμφωνία
+DocType: Payment Reconciliation,From Invoice Date,Από Ημερομηνία Τιμολογίου
 DocType: Cost Center,Budgets,Κατασκευή έκθεσης
-DocType: Employee,Emergency Contact Details,Είδη επικοινωνίας έκτακτης ανάγκης
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Τι κάνει;
 DocType: Delivery Note,To Warehouse,Προς αποθήκη
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Ο λογαριασμός {0} έχει εισαχθεί περισσότερες από μία φορά για τη χρήση {1}
 ,Average Commission Rate,Μέσος συντελεστής προμήθειας
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""έχει σειριακό αριθμό"" δεν μπορεί να είναι ""ναι"" για μη αποθηκεύσιμα είδη."
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""Έχει Σειριακό Αριθμό"" δεν μπορεί να είναι ""Ναι"" για μη αποθηκεύσιμα είδη."
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Η συμμετοχή δεν μπορεί να σημειωθεί για μελλοντικές ημερομηνίες
 DocType: Pricing Rule,Pricing Rule Help,Βοήθεια για τον κανόνα τιμολόγησης
 DocType: Purchase Taxes and Charges,Account Head,Κύρια εγγραφή λογαριασμού
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Ενημέρωση πρόσθετων δαπανών για τον υπολογισμό του κόστος μεταφοράς των ειδών
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Ηλεκτρικός
 DocType: Stock Entry,Total Value Difference (Out - In),Συνολική διαφορά αξίας (εξερχόμενη - εισερχόμενη)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Σειρά {0}: συναλλαγματικής ισοτιμίας είναι υποχρεωτική
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Σειρά {0}: συναλλαγματικής ισοτιμίας είναι υποχρεωτική
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Το ID χρήστη δεν έχει οριστεί για τον υπάλληλο {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Από αξίωση εγγύησης
 DocType: Stock Entry,Default Source Warehouse,Προεπιλεγμένη αποθήκη πηγής
 DocType: Item,Customer Code,Κωδικός πελάτη
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Υπενθύμιση γενεθλίων για {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Ημέρες από την τελευταία παραγγελία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,Ενεργητικό αποθέματος
@@ -3337,7 +3367,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Κλείσιμο του λογαριασμού {0} πρέπει να είναι τύπου Ευθύνης / Ίδια Κεφάλαια
 DocType: Authorization Rule,Based On,Με βάση την
 DocType: Sales Order Item,Ordered Qty,Παραγγελθείσα ποσότητα
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
 DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Περίοδος Από και χρονική περίοδος ημερομηνίες υποχρεωτική για τις επαναλαμβανόμενες {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Δραστηριότητες / εργασίες έργου
@@ -3345,7 +3375,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Γράψτε εφάπαξ ποσό (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
 DocType: Landed Cost Voucher,Landed Cost Voucher,Αποδεικτικό κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Παρακαλώ να ορίσετε {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Επανάληψη την ημέρα του μήνα
@@ -3374,12 +3404,12 @@
 DocType: Upload Attendance,Upload Attendance,Ανεβάστε παρουσίες
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM και Βιομηχανία Ποσότητα απαιτούνται
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Eύρος γήρανσης 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Ποσό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Ποσό
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Η Λ.Υ. αντικαταστάθηκε
 ,Sales Analytics,Ανάλυση πωλήσεων
 DocType: Manufacturing Settings,Manufacturing Settings,Ρυθμίσεις παραγωγής
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Ρύθμιση ηλεκτρονικού ταχυδρομείου
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Παρακαλώ εισάγετε προεπιλεγμένο νόμισμα στην κύρια εγγραφή της εταιρείας
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Παρακαλώ εισάγετε προεπιλεγμένο νόμισμα στην κύρια εγγραφή της εταιρείας
 DocType: Stock Entry Detail,Stock Entry Detail,Λεπτομέρειες καταχώρησης αποθέματος
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Καθημερινές υπενθυμίσεις
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Φορολογικές Κανόνας Συγκρούσεις με {0}
@@ -3405,13 +3435,13 @@
 DocType: Sales Order Item,Produced Quantity,Παραγόμενη ποσότητα
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Μηχανικός
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Συνελεύσεις Αναζήτηση Sub
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Ο κωδικός είδους απαιτείται στην γραμμή νο. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Ο κωδικός είδους απαιτείται στην γραμμή νο. {0}
 DocType: Sales Partner,Partner Type,Τύπος συνεργάτη
 DocType: Purchase Taxes and Charges,Actual,Πραγματικός
 DocType: Authorization Rule,Customerwise Discount,Έκπτωση με βάση πελάτη
 DocType: Purchase Invoice,Against Expense Account,Κατά τον λογαριασμό δαπανών
 DocType: Production Order,Production Order,Εντολή παραγωγής
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Η σημείωση εγκατάστασης {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Η σημείωση εγκατάστασης {0} έχει ήδη υποβληθεί
 DocType: Quotation Item,Against Docname,Κατά όνομα εγγράφου
 DocType: SMS Center,All Employee (Active),Όλοι οι υπάλληλοι (ενεργοί)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Δείτε τώρα
@@ -3423,15 +3453,15 @@
 DocType: Employee,Applicable Holiday List,Εφαρμοστέος κατάλογος διακοπών
 DocType: Employee,Cheque,Επιταγή
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Η σειρά ενημερώθηκε
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Ο τύπος έκθεσης είναι υποχρεωτικός
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Ο τύπος έκθεσης είναι υποχρεωτικός
 DocType: Item,Serial Number Series,Σειρά σειριακών αριθμών
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Η αποθήκη είναι απαραίτητη για το απόθεμα του είδους {0} στη γραμμή {1}
 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/public/js/setup_wizard.js +101,The First User: You,Ο πρώτος χρήστης : εσείς
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Η ημερομηνία έναρξης και η ημερομηνία λήξης της χρήσης έχουν ήδη τεθεί για τη χρήση {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Επιτυχής συμφωνία
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Η ημερομηνία έναρξης και η ημερομηνία λήξης της χρήσης έχουν ήδη τεθεί για τη χρήση {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Επιτυχής συμφωνία
 DocType: Production Order,Planned End Date,Προγραμματισμένη ημερομηνία λήξης
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Πού αποθηκεύονται τα είδη
 DocType: Tax Rule,Validity,Εγκυρότητα
@@ -3439,7 +3469,7 @@
 DocType: Attendance,Attendance,Συμμετοχή
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Η ημερομηνία αποστολής και ώρα αποστολής είναι απαραίτητες
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Η ημερομηνία αποστολής και ώρα αποστολής είναι απαραίτητες
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Φορολογικό πρότυπο για συναλλαγές αγοράς.
 ,Item Prices,Τιμές είδους
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε την παραγγελία αγοράς.
@@ -3448,15 +3478,15 @@
 DocType: Task,Review Date,Ημερομηνία αξιολόγησης
 DocType: Purchase Invoice,Advance Payments,Προκαταβολές
 DocType: Purchase Taxes and Charges,On Net Total,Στο καθαρό σύνολο
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Η αποθήκη προορισμού στη γραμμή {0} πρέπει να είναι η ίδια όπως στη εντολή παραγωγής
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Η αποθήκη προορισμού στη γραμμή {0} πρέπει να είναι η ίδια όπως στη εντολή παραγωγής
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Δεν έχετε άδεια να χρησιμοποιήσετε το εργαλείο πληρωμής
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,Οι διευθύνσεις email για επαναλαμβανόμενα %s δεν έχουν οριστεί
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Νόμισμα δεν μπορεί να αλλάξει μετά την πραγματοποίηση εγγραφών χρησιμοποιώντας κάποιο άλλο νόμισμα
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,Νόμισμα δεν μπορεί να αλλάξει μετά την πραγματοποίηση εγγραφών χρησιμοποιώντας κάποιο άλλο νόμισμα
 DocType: Company,Round Off Account,Στρογγυλεύουν Λογαριασμού
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Δαπάνες διοικήσεως
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Συμβουλή
 DocType: Customer Group,Parent Customer Group,Γονική ομάδα πελατών
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Αλλαγή
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Αλλαγή
 DocType: Purchase Invoice,Contact Email,Email επαφής
 DocType: Appraisal Goal,Score Earned,Αποτέλεσμα
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","Π.Χ. "" Η εταιρεία μου llc """
@@ -3466,13 +3496,13 @@
 DocType: Packing Slip,Gross Weight UOM,Μ.Μ. Μικτού βάρους
 DocType: Email Digest,Receivables / Payables,Απαιτήσεις / υποχρεώσεις
 DocType: Delivery Note Item,Against Sales Invoice,Κατά το τιμολόγιο πώλησης
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Λογαριασμός Πίστωσης
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Λογαριασμός Πίστωσης
 DocType: Landed Cost Item,Landed Cost Item,Είδος κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Προβολή μηδενικών τιμών
 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 +562,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
 DocType: Item,Default Warehouse,Προεπιλεγμένη αποθήκη
 DocType: Task,Actual End Date (via Time Logs),Πραγματική Ημερομηνία λήξης (μέσω χρόνος Καταγράφει)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά του λογαριασμού του Ομίλου {0}
@@ -3508,29 +3538,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Προγραμματίστε κούτσουρα χρόνο εκτός των ωρών εργασίας του σταθμού εργασίας.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} Έχει ήδη υποβληθεί
 ,Items To Be Requested,Είδη που θα ζητηθούν
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Βρες τελευταία τιμή αγοράς
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Τιμή χρέωσης ανάλογα με τον τύπο δραστηριότητας (ανά ώρα)
 DocType: Company,Company Info,Πληροφορίες εταιρείας
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Το email ID της εταιρείας δεν βρέθηκε, ως εκ τούτου, δεν αποστέλλονται μηνύματα ταχυδρομείου"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Εφαρμογή πόρων (ενεργητικό)
 DocType: Production Planning Tool,Filter based on item,Φιλτράρισμα με βάση το είδος
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Ο λογαριασμός Χρεωστικές
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Ο λογαριασμός Χρεωστικές
 DocType: Fiscal Year,Year Start Date,Ημερομηνία έναρξης έτους
 DocType: Attendance,Employee Name,Όνομα υπαλλήλου
 DocType: Sales Invoice,Rounded Total (Company Currency),Στρογγυλοποιημένο σύνολο (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Δεν μπορείτε να μετατρέψετε σε ομάδα, επειδή έχει επιλεγεί τύπος λογαριασμού"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Δεν μπορείτε να μετατρέψετε σε ομάδα, επειδή έχει επιλεγεί τύπος λογαριασμού"
 DocType: Purchase Common,Purchase Common,Purchase common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,Από ευκαιρία
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Παροχές σε εργαζομένους
 DocType: Sales Invoice,Is POS,Είναι POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
 DocType: Production Order,Manufactured Qty,Παραγόμενη ποσότητα
 DocType: Purchase Receipt Item,Accepted Quantity,Αποδεκτή ποσότητα
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} δεν υπάρχει
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Λογαριασμοί για πελάτες.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id έργου
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Σειρά Όχι {0}: Ποσό δεν μπορεί να είναι μεγαλύτερη από ό, τι εκκρεμές ποσό έναντι αιτημάτων εξόδων {1}. Εν αναμονή ποσό {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Σειρά Όχι {0}: Ποσό δεν μπορεί να είναι μεγαλύτερη από ό, τι εκκρεμές ποσό έναντι αιτημάτων εξόδων {1}. Εν αναμονή ποσό {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} συνδρομητές προστέθηκαν
 DocType: Maintenance Schedule,Schedule,Χρονοδιάγραμμα
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Ορίστε τον προϋπολογισμό γι &#39;αυτό το Κέντρο Κόστους. Για να ρυθμίσετε δράση του προϋπολογισμού, ανατρέξτε στην ενότητα &quot;Εταιρεία Λίστα&quot;"
@@ -3538,7 +3569,7 @@
 DocType: Quality Inspection Reading,Reading 3,Μέτρηση 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Τύπος αποδεικτικού
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
 DocType: Expense Claim,Approved,Εγκρίθηκε
 DocType: Pricing Rule,Price,Τιμή
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Υπάλληλος ελεύθερος για {0} πρέπει να οριστεί ως έχει φύγει
@@ -3552,7 +3583,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Λογιστικές ημερολογιακές εγγραφές.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Διαθέσιμο Ποσότητα σε από την αποθήκη
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Σειρά {0}: Πάρτι / λογαριασμός δεν ταιριάζει με {1} / {2} στο {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Για να δημιουργήσετε ένα λογαριασμό φόρων
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
 DocType: Account,Stock,Απόθεμα
@@ -3563,7 +3594,7 @@
 DocType: Employee,Contract End Date,Ημερομηνία λήξης συμβολαίου
 DocType: Sales Order,Track this Sales Order against any Project,Παρακολουθήστε αυτές τις πωλήσεις παραγγελίας σε οποιουδήποτε έργο
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Εμφάνισε παραγγελίες πώλησης (εκκρεμεί παράδοση) με βάση τα ανωτέρω κριτήρια
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Από προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Από προσφορά προμηθευτή
 DocType: Deduction Type,Deduction Type,Τύπος κράτησης
 DocType: Attendance,Half Day,Μισή ημέρα
 DocType: Pricing Rule,Min Qty,Ελάχιστη ποσότητα
@@ -3571,7 +3602,7 @@
 DocType: GL Entry,Transaction Date,Ημερομηνία συναλλαγής
 DocType: Production Plan Item,Planned Qty,Προγραμματισμένη ποσότητα
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Σύνολο φόρου
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Για Ποσότητα (Τεμ Κατασκευάζεται) είναι υποχρεωτικά
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Για Ποσότητα (Τεμ Κατασκευάζεται) είναι υποχρεωτικά
 DocType: Stock Entry,Default Target Warehouse,Προεπιλεγμένη αποθήκη προορισμού
 DocType: Purchase Invoice,Net Total (Company Currency),Καθαρό σύνολο (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Σειρά {0}: Τύπος Πάρτυ και το Κόμμα ισχύει μόνο κατά Εισπρακτέα / Πληρωτέα λογαριασμού
@@ -3625,9 +3656,9 @@
 DocType: Customer,Commission Rate,Ποσό προμήθειας
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Κάντε Παραλλαγή
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Αποκλεισμός αιτήσεων άδειας από το τμήμα
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Το καλάθι είναι άδειο
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Το καλάθι είναι άδειο
 DocType: Production Order,Actual Operating Cost,Πραγματικό κόστος λειτουργίας
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Δεν μπορεί να γίνει επεξεργασία στη ρίζα.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Δεν μπορεί να γίνει επεξεργασία στη ρίζα.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Το χορηγούμενο ποσό δεν μπορεί να είναι μεγαλύτερο από το συνολικό ποσό
 DocType: Manufacturing Settings,Allow Production on Holidays,Επίτρεψε παραγωγή σε αργίες
 DocType: Sales Order,Customer's Purchase Order Date,Ημερομηνία παραγγελίας αγοράς πελάτη
@@ -3638,11 +3669,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Σχεδιαστής
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Πρότυπο όρων και προϋποθέσεων
 DocType: Serial No,Delivery Details,Λεπτομέρειες παράδοσης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Αυτόματη δημιουργία Υλικό Αίτημα εάν η ποσότητα πέσει κάτω από αυτό το επίπεδο
 ,Item-wise Purchase Register,Ταμείο αγορών ανά είδος
 DocType: Batch,Expiry Date,Ημερομηνία λήξης
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Για να ορίσετε το επίπεδο αναπαραγγελίας, στοιχείο πρέπει να είναι ένα στοιχείο αγοράς ή κατασκευής του Είδους"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Για να ορίσετε το επίπεδο αναπαραγγελίας, στοιχείο πρέπει να είναι ένα στοιχείο αγοράς ή κατασκευής του Είδους"
 ,Supplier Addresses and Contacts,Διευθύνσεις προμηθευτή και επαφές
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Παρακαλώ επιλέξτε πρώτα την κατηγορία
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Κύρια εγγραφή έργου.
@@ -3650,7 +3681,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Μισή ημέρα)
 DocType: Supplier,Credit Days,Ημέρες πίστωσης
 DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Λήψη ειδών από Λ.Υ.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Bill Υλικών
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Σειρά {0}: Τύπος Πάρτυ και το Κόμμα απαιτείται για εισπρακτέοι / πληρωτέοι λογαριασμό {1}
@@ -3658,7 +3689,7 @@
 DocType: Employee,Reason for Leaving,Αιτιολογία αποχώρησης
 DocType: Expense Claim Detail,Sanctioned Amount,Ποσό κύρωσης
 DocType: GL Entry,Is Opening,Είναι άνοιγμα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Γραμμή {0} : μια χρεωστική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Γραμμή {0} : μια χρεωστική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
 DocType: Account,Cash,Μετρητά
 DocType: Employee,Short biography for website and other publications.,Σύντομη βιογραφία για την ιστοσελίδα και άλλες δημοσιεύσεις.
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index fdc11a2..c51cd64 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -7,7 +7,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productos de Consumo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, seleccione primero el tipo de entidad"
 DocType: Item,Customer Items,Artículos de clientes
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: Cuenta Padre {1} no puede ser una cuenta Mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: Cuenta Padre {1} no puede ser una cuenta Mayor
 DocType: Item,Publish Item to hub.erpnext.com,Publicar artículo en hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Notificaciones por correo electrónico
 DocType: Item,Default Unit of Measure,Unidad de Medida Predeterminada
@@ -17,7 +17,7 @@
 DocType: Employee,Rented,Alquilado
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Se requiere de divisas para Lista de precios {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Desde solicitud de material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Desde solicitud de material
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árbol
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
@@ -48,7 +48,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 . Para mantener el código de artículo del cliente y para efectuar búsquedas en ellos en función de ese código use esta opción
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mostrar variantes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Cantidad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Cantidad
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstamos (pasivos)
 DocType: Employee Education,Year of Passing,Año de Fallecimiento
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En inventario
@@ -58,16 +58,15 @@
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Crear un nuevo perfil de POS
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Cuidado de la Salud
 DocType: Purchase Invoice,Monthly,Mensual
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidad
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Dirección De Correo Electrónico
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Company,Abbr,Abreviatura
 DocType: Appraisal Goal,Score (0-5),Puntuación ( 0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,Vehículo No
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, seleccione la lista de precios"
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,"Por favor, seleccione la lista de precios"
 DocType: Production Order Operation,Work In Progress,Trabajos en Curso
 DocType: Employee,Holiday List,Lista de Feriados
 DocType: Time Log,Time Log,Hora de registro
@@ -88,13 +87,13 @@
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Apertura de un Trabajo .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidad
 DocType: Employee,Married,Casado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Abarrotes
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Hacer Entrada del Banco
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondos de Pensiones
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Almacén o Bodega es obligatorio si el tipo de cuenta es Almacén
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Almacén o Bodega es obligatorio si el tipo de cuenta es Almacén
 DocType: SMS Center,All Sales Person,Todos Ventas de Ventas
 DocType: Lead,Person Name,Nombre de la persona
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Marque si es una orden recurrente, desmarque si quiere detenerla o marcar 'Fecha final'"
@@ -114,15 +113,15 @@
 DocType: Lead,Interested,Interesado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiales (LdM)
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Desde {0} a {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Desde {0} a {1}
 DocType: Item,Copy From Item Group,Copiar de Grupo de Elementos
 DocType: Journal Entry,Opening Entry,Entrada de Apertura
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
 DocType: Lead,Product Enquiry,Petición de producto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Por favor, ingrese primero la compañía"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Por favor, seleccione primero la compañía"
 DocType: Employee Education,Under Graduate,Bajo Graduación
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Objetivo On
+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
 DocType: BOM,Total Cost,Coste total
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Actividad:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado
@@ -150,7 +149,7 @@
 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","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 +444,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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Se actualizará después de la factura de venta se considera enviada .
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos
@@ -166,7 +165,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Los detalles de las operaciones realizadas.
 DocType: Serial No,Maintenance Status,Estado del Mantenimiento
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Productos y precios
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},La fecha 'Desde' tiene que pertenecer al rango del año fiscal = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},La fecha 'Desde' tiene que pertenecer al rango del año fiscal = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Seleccione el empleado para el que está creando la Evaluación .
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centro de Costos {0} no pertenece a la empresa {1}
 DocType: Customer,Individual,Individual
@@ -205,6 +204,7 @@
 ,Contact Name,Nombre del Contacto
 DocType: Production Plan Item,SO Pending Qty,SO Pendiente Cantidad
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nómina para los criterios antes mencionados.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ninguna descripción definida
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Solicitudes de compra.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Sólo el Supervisor de Vacaciones seleccionado puede presentar esta solicitud de permiso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
@@ -216,7 +216,7 @@
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
 DocType: Payment Tool,Reference No,Referencia No.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,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/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Articulo de Reconciliación de Inventario
 DocType: Stock Entry,Sales Invoice No,Factura de Venta No
@@ -228,11 +228,11 @@
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Territorios
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,El producto {0} esta cancelado
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Relación
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Pedidos en firme de los clientes.
 DocType: Purchase Receipt Item,Rejected Quantity,Cantidad Rechazada
@@ -268,9 +268,9 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva solicitud de materiales
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Factura
 DocType: Sales Invoice Item,Delivery Note,Notas de Entrega
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuración de Impuestos
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configuración de Impuestos
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
 DocType: Workstation,Rent Cost,Renta Costo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Por favor seleccione el mes y el año
 DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Introduzca ID de correo electrónico separados por comas, la factura será enviada automáticamente en una fecha determinada"
@@ -283,10 +283,10 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base del cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en la Solicitud de Materiales , Albarán, Factura de Compra , Orden de Produccuón , Orden de Compra , Fecibo de Compra , Factura de Venta Pedidos de Venta , Inventario de Entrada, Control de Horas"
 DocType: Item Tax,Tax Rate,Tasa de Impuesto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Seleccione Producto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Seleccione Producto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","El Producto: {0} gestionado por lotes, no se puede conciliar usando\ Reconciliación de Stock, se debe usar Entrada de Stock"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir a 'Sin-Grupo'
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,El recibo de compra debe presentarse
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Listados de los lotes de los productos
@@ -354,7 +354,7 @@
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master de vacaciones .
 DocType: Material Request Item,Required Date,Fecha Requerida
 DocType: Delivery Note,Billing Address,Dirección de Facturación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Por favor, introduzca el código del producto."
 DocType: BOM,Costing,Costeo
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el importe del impuesto se considerará como ya incluido en el Monto  a Imprimir"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
@@ -384,7 +384,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productos Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
 DocType: Shipping Rule,Net Weight,Peso neto
 DocType: Employee,Emergency Phone,Teléfono de Emergencia
 ,Serial No Warranty Expiry,Número de orden de caducidad Garantía
@@ -401,14 +401,13 @@
 ,Gross Profit,Utilidad bruta
 DocType: Production Planning Tool,Material Requirement,Solicitud de Material
 DocType: Company,Delete Company Transactions,Eliminar Transacciones de la empresa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,El producto {0} no es un producto para la compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,El producto {0} no es un producto para la compra
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} es una dirección de correo electrónico inválida en 'Notificación\Email'
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Facturación Total este año:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
 DocType: Purchase Invoice,Supplier Invoice No,Factura del Proveedor No
 DocType: Territory,For reference,Por referencia
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Cierre (Cred)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Cierre (Cred)
 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: Job Applicant,Thread HTML,Tema HTML
@@ -422,7 +421,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribución Mensual** le ayuda a distribuir su presupuesto a través de meses si tiene periodos en su negocio.  Para distribuir un presupuesto utilizando esta distribución, establecer **Distribución Mensual** en el **Centro de Costos**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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.py +126,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 +20,Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanzas / Ejercicio contable.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Lo sentimos , Nos de serie no se puede fusionar"
@@ -430,7 +429,7 @@
 DocType: Project Task,Project Task,Tareas del proyecto
 ,Lead Id,Iniciativa ID
 DocType: C-Form Invoice Detail,Grand Total,Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,La fecha de inicio no puede ser mayor que la fecha final del año fiscal
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,La fecha de inicio no puede ser mayor que la fecha final del año fiscal
 DocType: Warranty Claim,Resolution,Resolución
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Cuenta por Pagar
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita los Clientes
@@ -451,7 +450,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,La orden de producción es obligatoria
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacción de Propuestas
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Error de stock negativo ( {6} ) para el producto {0} en Almacén {1} en {2} {3} en {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Error de stock negativo ( {6} ) para el producto {0} en Almacén {1} en {2} {3} en {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal de la compañía
 DocType: Packing Slip Item,DN Detail,Detalle DN
 DocType: Time Log,Billed,Facturado
@@ -471,14 +470,14 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas en base a Cliente, Categoría de cliente, Territorio, Proveedor, Tipo de Proveedor, Campaña, Socio de Ventas, etc"
 DocType: Employee,Passport Number,Número de pasaporte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Desde recibo de compra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Desde recibo de compra
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
 DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es)
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Basado en"" y ""Agrupar por"" no pueden ser el mismo"
 DocType: Sales Person,Sales Person Targets,Metas de Vendedor
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de Resolución
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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}"
 DocType: Selling Settings,Customer Naming By,Naming Cliente Por
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir al Grupo
 DocType: Activity Cost,Activity Type,Tipo de Actividad
@@ -489,7 +488,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicación
 DocType: Activity Cost,Projects User,Usuario de proyectos
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
 DocType: Company,Round Off Cost Center,Centro de costos por defecto (redondeo)
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de Mantenimiento {0} debe ser cancelado antes de cancelar la Orden de Ventas
 DocType: Material Request,Material Transfer,Transferencia de Material
@@ -510,13 +509,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para rastrear artículo en ventas y documentos de compra en base a sus nn serie. Esto se puede también utilizar para rastrear información sobre la garantía del producto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario Actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Almacén Rechazado es obligatorio contra Ítem rechazado
 DocType: Account,Expenses Included In Valuation,Gastos dentro de la valoración
 DocType: Employee,Provide email id registered in company,Proporcionar correo electrónico de identificación registrado en la compañía
 DocType: Hub Settings,Seller City,Ciudad del vendedor
 DocType: Email Digest,Next email will be sent on:,Siguiente correo electrónico será enviado el:
 DocType: Offer Letter Term,Offer Letter Term,Término de carta de oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elemento {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventario
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de Árbol
@@ -534,17 +532,17 @@
 DocType: Purchase Order,Supply Raw Materials,Suministro de Materias Primas
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Activo Corriente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} no es un producto de stock
 DocType: Mode of Payment Account,Default Account,Cuenta Predeterminada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Por favor seleccione el día libre de la semana
 DocType: Production Order Operation,Planned End Time,Tiempo de finalización planeado
 ,Sales Person Target Variance Item Group-Wise,Variación por Vendedor de Meta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Cuenta con una transacción existente no se puede convertir en el libro mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Cuenta con una transacción existente no se puede convertir en el libro mayor
 DocType: Delivery Note,Customer's Purchase Order No,Nº de Pedido de Compra del Cliente
 DocType: Employee,Cell Number,Número de movil
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,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/accounts/doctype/journal_entry/journal_entry.py +126,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/setup/setup_wizard/industry_type.py +25,Energy,Energía
 DocType: Opportunity,Opportunity From,Oportunidad De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nómina Mensual.
@@ -553,9 +551,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Los asientos contables se pueden hacer en contra de nodos hoja. No se permiten los comentarios en contra de los grupos.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Número de Recibo de Compra Requerido para el punto {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Número de Recibo de Compra Requerido para el punto {0}
 DocType: Item Attribute Value,Item Attribute Value,Atributos del producto
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campañas de Ventas.
 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.
@@ -620,7 +618,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Números
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor peso se mostraran arriba
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalle de Conciliación Bancaria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Mis facturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Mis facturas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Empleado no encontrado
 DocType: Purchase Order,Stopped,Detenido
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un vendedor
@@ -638,7 +636,7 @@
 apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Consultas de soporte de clientes .
 DocType: Bin,Moving Average Rate,Porcentaje de Promedio Movil
 DocType: Production Planning Tool,Select Items,Seleccione Artículos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
 DocType: Maintenance Visit,Completion Status,Estado de finalización
 DocType: Sales Invoice Item,Target Warehouse,Inventario Objetivo
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir hasta este porcentaje en la entrega y/o recepción
@@ -669,7 +667,7 @@
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Evaluación del Desempeño .
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del Proyecto
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punto de venta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
 DocType: Account,Balance must be,Balance debe ser
 DocType: Hub Settings,Publish Pricing,Publicar precios
 DocType: Notification Control,Expense Claim Rejected Message,Mensaje de reembolso de gastos rechazado
@@ -692,7 +690,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Configuración principal para el cambio de divisas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Por favor, seleccione primero el tipo de documento"
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Monto de Vacaciones Descansadas
@@ -710,17 +708,17 @@
 DocType: Supplier,Default Payable Accounts,Cuentas por Pagar por defecto
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empleado {0} no está activo o no existe
 DocType: Features Setup,Item Barcode,Código de barras del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,{0} variantes actualizadas del producto
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Address,Shop,Tienda
 DocType: Hub Settings,Sync Now,Sincronizar ahora
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Fila {0}: Crédito no puede vincularse con {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Fila {0}: Crédito no puede vincularse con {1}
 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 .
 DocType: Employee,Permanent Address Is,Dirección permanente es
 DocType: Production Order Operation,Operation completed for how many finished goods?,La operación se realizó para la cantidad de productos terminados?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,La Marca
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
 DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida
 DocType: Item,Is Purchase Item,Es una compra de productos
 DocType: Journal Entry Account,Purchase Invoice,Factura de Compra
@@ -730,7 +728,7 @@
 DocType: Payment Tool,Paid,Pagado
 DocType: Salary Slip,Total in words,Total en palabras
 DocType: Material Request Item,Lead Time Date,Fecha y Hora de la Iniciativa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Fila # {0}: Por favor, especifique No de Serie de artículos {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},"Fila # {0}: Por favor, especifique No de Serie de artículos {1}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Para 'Paquete de Productos' el Almacén, No. de Serie y No. de lote serán considerados desde el 'Packing List'. Si el Almacén y No. de lote son los mismos para todos los productos empaquetados, los valores podrán ser ingresados en la tabla principal del artículo, estos valores serán copiados al 'Packing List'"
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Envíos realizados a los clientes
 DocType: Purchase Invoice Item,Purchase Order Item,Articulos de la Orden de Compra
@@ -738,13 +736,13 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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 +626,Select Item for Transfer,Seleccionar elemento de Transferencia
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Select Item for Transfer,Seleccionar elemento de Transferencia
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta principal de banco donde los cheques fueron depositados.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista  en las transacciones
 DocType: Pricing Rule,Max Qty,Cantidad Máxima
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pago de Compra/Venta siempre debe estar marcado como anticipo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
 DocType: Process Payroll,Select Payroll Year and Month,Seleccione nómina Año y Mes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Ir al grupo apropiado, usualmente (Aplicación de Fondos> Activo Circulante> Cuentas Bancarias) y crear una nueva cuenta haciendo clic en Añadir hijo del tipo ""Banco"""
 DocType: Workstation,Electricity Cost,Coste de electricidad
@@ -758,7 +756,7 @@
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
 DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Adjunte su Fotografía
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Hacer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Hacer
 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 podría ser que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tipo de orden debe ser uno de {0}
@@ -780,7 +778,7 @@
 DocType: Delivery Note,Delivery To,Entregar a
 DocType: Production Planning Tool,Get Sales Orders,Recibe Órdenes de Venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no puede ser negativo
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Descuento
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Descuento
 DocType: Features Setup,Purchase Discounts,Descuentos sobre Compra
 DocType: Workstation,Wages,Salario
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Se actualiza sólo si Hora de registro es &quot;facturable&quot;
@@ -802,7 +800,7 @@
 DocType: Lead,Organization Name,Nombre de la Organización
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,El producto debe ser agregado utilizando el botón 'Obtener productos desde recibos de compra'
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Gastos de Ventas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Compra estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Compra estándar
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centros de coste por defecto
 DocType: Sales Partner,Implementation Partner,Socio de implementación
@@ -849,12 +847,11 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Este Grupo de Horas Registradas se ha facturado.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Crear Oportunidad
 DocType: Salary Slip,Leave Without Pay,Licencia sin Sueldo
-DocType: Supplier,Communications,Comunicaciones
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Error en la planificación de capacidad
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Ganancias
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para la fabricación
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Apertura de saldos contables
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para la fabricación
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Apertura de saldos contables
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nada que solicitar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Fecha de Inicio' no puede ser mayor que 'Fecha Final'
@@ -894,7 +891,7 @@
 DocType: Global Defaults,Current Fiscal Year,Año Fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo
 DocType: Lead,Call,Llamada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Entradas' no puede estar vacío
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'Entradas' no puede estar vacío
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
 ,Trial Balance,Balanza de Comprobación
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configuración de Empleados
@@ -905,9 +902,9 @@
 DocType: Contact,User ID,ID de usuario
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Mostrar libro mayor
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Fabricación contra Pedido de Ventas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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 artículo {0} no puede tener lotes
 ,Budget Variance Report,Variación de Presupuesto
 DocType: Salary Slip,Gross Pay,Pago bruto
@@ -934,7 +931,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Verifique Facturas Pendientes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Orden de Venta {0} no es válida
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeño
 DocType: Employee,Employee Number,Número del Empleado
 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}
@@ -946,7 +943,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Conseguido
 DocType: Employee,Place of Issue,Lugar de emisión
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contrato
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Egresos Indirectos
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
@@ -959,8 +956,8 @@
 DocType: Address,City/Town,Ciudad/Provincia
 DocType: Serial No,Serial No Details,Serial No Detalles
 DocType: Purchase Invoice Item,Item Tax Rate,Tasa de impuesto del producto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Maquinaria y Equipos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -969,7 +966,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},El estado de la orden de producción es {0}
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,La fecha prevista de entrega es menor que la fecha de inicio prevista.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Por proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Por proveedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ajuste del tipo de cuenta le ayuda en la selección de esta cuenta en las transacciones.
 DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Moneda Local)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente
@@ -982,7 +979,7 @@
 DocType: Journal Entry,Journal Entry,Asientos Contables
 DocType: Workstation,Workstation Name,Nombre de la Estación de Trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar Boletin:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,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 +430,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 Objetivo
 DocType: Salary Slip,Bank Account No.,Número de Cuenta Bancaria
 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
@@ -1010,7 +1007,7 @@
 DocType: Maintenance Schedule Item,No of Visits,No. de visitas
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Boletines para contactos, clientes potenciales ."
 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/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
 ,Delivered Items To Be Billed,Envios por facturar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie
 DocType: Authorization Rule,Average Discount,Descuento Promedio
@@ -1024,7 +1021,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Desde {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Descripción de la Operación
 DocType: Item,Will also apply to variants,También se aplicará a las variantes
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No se puede cambiar la 'Fecha de Inicio' y la 'Fecha Final' del año fiscal una vez que ha sido guardado.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No se puede cambiar la 'Fecha de Inicio' y la 'Fecha Final' del año fiscal una vez que ha sido guardado.
 DocType: Quotation,Shopping Cart,Cesta de la compra
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Promedio diario saliente
 DocType: Pricing Rule,Campaign,Campaña
@@ -1035,7 +1032,7 @@
 DocType: Sales Order Item,Planned Quantity,Cantidad Planificada
 DocType: Purchase Invoice Item,Item Tax Amount,Total de impuestos de los artículos
 DocType: Item,Maintain Stock,Mantener Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Imagenes de entradas ya creadas por Orden de Producción
+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: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerada para todas las designaciones
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la linea {0} no puede ser incluido en el precio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
@@ -1047,7 +1044,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan de cuentas
 DocType: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,No puede ser mayor que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Maintenance Visit,Unscheduled,No Programada
 DocType: Employee,Owned,Propiedad
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de ausencia sin pago
@@ -1080,7 +1077,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub-Ensamblajes
 DocType: Shipping Rule Condition,To Value,Para el valor
 DocType: Supplier,Stock Manager,Gerente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Almacén de origen es obligatoria para la fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Almacén de origen es obligatoria para la fila {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Lista de embalaje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Alquiler de Oficina
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configuración de pasarela SMS
@@ -1088,9 +1085,9 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No se ha añadido ninguna dirección todavía.
 DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estación de Trabajo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual al importe en Comprobante de Diario {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual al importe en Comprobante de Diario {2}
 DocType: Item,Inventory,inventario
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
 DocType: Item,Sales Details,Detalles de Ventas
 DocType: Opportunity,With Items,Con artículos
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Cantidad
@@ -1105,10 +1102,10 @@
 DocType: Cost Center,Parent Cost Center,Centro de Costo Principal
 DocType: Sales Invoice,Source,Referencia
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,No se encontraron registros en la tabla de pagos
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,No se encontraron registros en la tabla de pagos
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Inicio del ejercicio contable
 DocType: Employee External Work History,Total Experience,Experiencia Total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Cargos por transporte de mercancías y transito
 DocType: Material Request Item,Sales Order No,Orden de Venta No
 DocType: Item Group,Item Group Name,Nombre del grupo de artículos
@@ -1116,12 +1113,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferenca de Materiales para Fabricación
 DocType: Pricing Rule,For Price List,Por lista de precios
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Búsqueda de Ejecutivos
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","La tarifa de compra para el producto: {0} no se encuentra, este se requiere para reservar la entrada contable (gastos). Por favor, indique el precio del artículo en una 'lista de precios' de compra."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","La tarifa de compra para el producto: {0} no se encuentra, este se requiere para reservar la entrada contable (gastos). Por favor, indique el precio del artículo en una 'lista de precios' de compra."
 DocType: Maintenance Schedule,Schedules,Horarios
 DocType: Purchase Invoice Item,Net Amount,Importe Neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Moneda de la compañía)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Error: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Error: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el Plan General de Contabilidad."
 DocType: Maintenance Visit,Maintenance Visit,Visita de Mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Categoría de cliente> Territorio
@@ -1145,7 +1142,7 @@
 DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de producción de la orden de ventas (OV)
 DocType: Sales Partner,Sales Partner Target,Socio de Ventas Objetivo
 DocType: Pricing Rule,Pricing Rule,Reglas de Precios
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Requisición de materiales hacia la órden de compra
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Requisición de materiales hacia la órden de compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Cuentas bancarias
 ,Bank Reconciliation Statement,Extractos Bancarios
@@ -1153,11 +1150,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Saldo inicial de Stock
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} debe aparecer sólo una vez
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Desde Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Monto no reflejado en banco
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Peticiones para gastos de compañía
@@ -1170,28 +1167,28 @@
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para realizar un seguimiento de elementos mediante código de barras. Usted será capaz de entrar en los elementos de la nota de entrega y la factura de venta mediante el escaneo de código de barras del artículo.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Crear una cotización
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 linea {0} debe ser 1
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 linea {0} debe ser 1
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
 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.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños
 DocType: SMS Center,Receiver List,Lista de receptores
 DocType: Payment Tool Detail,Payment Amount,Pago recibido
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Cantidad Consumida
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Ver
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Ver
 DocType: Salary Structure Deduction,Salary Structure Deduction,Estructura Salarial Deducción
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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 +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de Artículos Emitidas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La cantidad no debe ser más de {0}
 DocType: Quotation Item,Quotation Item,Cotización del artículo
 DocType: Account,Account Name,Nombre de la Cuenta
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Número de orden {0} {1} cantidad no puede ser una fracción
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Configuración de las categorías 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 +92,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Fecha de despacho de vehículo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
 DocType: Company,Default Payable Account,Cuenta por Pagar por defecto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para la compra online, como las normas de envío, lista de precios, etc."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturado
@@ -1205,7 +1202,7 @@
 DocType: Company,Default Values,Valores Predeterminados
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Fila {0}: Cantidad de pago no puede ser negativo
 DocType: Expense Claim,Total Amount Reimbursed,Monto total reembolsado
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra Factura de Proveedor {0} con fecha{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Contra Factura de Proveedor {0} con fecha{1}
 DocType: Customer,Default Price List,Lista de precios Por defecto
 DocType: Payment Reconciliation,Payments,Pagos.
 DocType: Budget Detail,Budget Allocated,Presupuesto asignado
@@ -1241,16 +1238,16 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de Material utilizado para hacer esta Entrada de Inventario
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Números de serie únicos para cada producto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',El Registro de Horas {0} tiene que ser ' Enviado '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',El Registro de Horas {0} tiene que ser ' Enviado '
 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 Vacaciones Asignadas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
 DocType: Employee,Date Of Retirement,Fecha de la jubilación
 DocType: Upload Attendance,Get Template,Verificar Plantilla
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Coeficiente de Ponderación
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Por favor, seleccione primero {0}"
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,"Por favor, seleccione primero {0}"
 DocType: Territory,Parent Territory,Territorio Principal
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
 DocType: Stock Entry,Material Receipt,Recepción de Materiales
@@ -1258,7 +1255,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},El tipo de entidad es requerida para las cuentas de Cobrar/Pagar {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este artículo 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 +210,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la linea {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la linea {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Almacén {0} no se puede eliminar mientras exista cantidad de artículo {1}
 DocType: Quotation,Order Type,Tipo de Orden
 DocType: Purchase Invoice,Notification Email Address,Email para las notificaciones.
@@ -1273,15 +1270,15 @@
 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: Sales Invoice Item,Batch No,Lote No.
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de sus transacciones
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Orden detenida no puede ser cancelada . Continuar antes de Cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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
 DocType: Employee,Leave Encashed?,Vacaciones Descansadas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'Oportunidad de' es obligatorio
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Crear órden de Compra
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Crear órden de Compra
 DocType: SMS Center,Send To,Enviar a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Monto asignado
@@ -1294,7 +1291,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Almacén y Referencia
 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/shopping_cart/utils.py +47,Addresses,Direcciones
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serie No existe para la partida {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condición para una regla de envío
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,A este producto no se le permite tener orden de producción.
@@ -1302,7 +1299,7 @@
 DocType: Sales Order,To Deliver and Bill,Para Entregar y Bill
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Registros de tiempo para su fabricación.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Inventario para  Nivel de Reordemaniento
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
 DocType: Authorization Control,Authorization Control,Control de Autorización
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Registro de Tiempo para las Tareas.
 DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo actual
@@ -1319,7 +1316,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Asociado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,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
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
 DocType: Packing Slip,To Package No.,Al paquete No.
 DocType: Warranty Claim,Issue Date,Fecha de Emisión
 DocType: Activity Cost,Activity Cost,Costo de Actividad
@@ -1354,7 +1350,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcanzado
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Localidad / Cliente
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,por ejemplo 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a cantidad pendiente a facturar {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a cantidad pendiente a facturar {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En palabras serán visibles una vez que guarde la factura de venta.
 DocType: Item,Is Sales Item,Es un producto para venta
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árbol de Productos
@@ -1366,7 +1362,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creado
 DocType: Delivery Note Item,Against Sales Order,Contra la Orden de Venta
 ,Serial No Status,Número de orden Estado
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Tabla de artículos no puede estar en blanco
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Tabla de artículos no puede estar en blanco
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"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}"
@@ -1376,7 +1372,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 Artículos del Sitio Web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Derechos e Impuestos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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} registros de pago no se pueden filtrar por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabla de Artículo que se muestra en el Sitio Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Suministrado Cantidad
@@ -1391,7 +1387,7 @@
 DocType: Installation Note,Installation Time,Tiempo de instalación
 DocType: Sales Invoice,Accounting Details,detalles de la contabilidad
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta empresa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,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}: Operación {1} no se ha completado para {2} cantidad de productos terminados en orden de producción # {3}. Por favor, actualice el estado de funcionamiento a través de los registros de tiempo"
+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}: Operación {1} no se ha completado para {2} cantidad de productos terminados en orden de producción # {3}. Por favor, actualice el estado de funcionamiento a través de los registros de tiempo"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Inversiones
 DocType: Issue,Resolution Details,Detalles de la resolución
 DocType: Quality Inspection Reading,Acceptance Criteria,Criterios de Aceptación
@@ -1407,7 +1403,7 @@
 DocType: Holiday List,Clear Table,Borrar tabla
 DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,Factura No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Desde órden de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Desde órden de compra
 DocType: Activity Cost,Costing Rate,Costo calculado
 ,Customer Addresses And Contacts,Las direcciones de clientes y contactos
 DocType: Employee,Resignation Letter Date,Fecha de Carta de Renuncia
@@ -1423,7 +1419,7 @@
 ,Maintenance Schedules,Programas de Mantenimiento
 ,Quotation Trends,Tendencias de Cotización
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
 DocType: Shipping Rule Condition,Shipping Amount,Importe del envío
 ,Pending Amount,Monto Pendiente
 DocType: Purchase Invoice Item,Conversion Factor,Factor de Conversión
@@ -1438,12 +1434,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árbol de las cuentas financieras
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Cuenta {0} debe ser de tipo 'Activos Fijos' porque Artículo {1} es un Elemento de Activo Fijo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Cuenta {0} debe ser de tipo 'Activos Fijos' porque Artículo {1} es un Elemento de Activo Fijo
 DocType: HR Settings,HR Settings,Configuración de Recursos Humanos
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,El reembolso de gastos está pendiente de aprobación. Sólo el supervisor de gastos puede actualizar el estado.
 DocType: Purchase Invoice,Additional Discount Amount,Monto adicional de descuento
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,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 +225,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,deportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Unidad
@@ -1470,7 +1466,7 @@
 DocType: Project,% Tasks Completed,% Tareas Completadas
 DocType: Project,Gross Margin,Margen bruto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Por favor, ingrese primero el producto a fabricar"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,usuario deshabilitado
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuario deshabilitado
 DocType: Opportunity,Quotation,Cotización
 DocType: Salary Slip,Total Deduction,Deducción Total
 DocType: Quotation,Maintenance User,Mantenimiento por el Usuario
@@ -1488,12 +1484,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión."
 DocType: Expense Claim,Approver,Supervisor
 ,SO Qty,SO Cantidad
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén de {0}, por lo tanto, no se puede volver a asignar o modificar Almacén"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén de {0}, por lo tanto, no se puede volver a asignar o modificar Almacén"
 DocType: Appraisal,Calculate Total Score,Calcular Puntaje Total
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufactura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de orden {0} está en garantía hasta {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir nota de entrega en paquetes .
-apps/erpnext/erpnext/hooks.py +68,Shipments,Los envíos
+apps/erpnext/erpnext/hooks.py +69,Shipments,Los envíos
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,El Estado del Registro de Horas tiene que ser 'Enviado'.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Fila #
 DocType: Purchase Invoice,In Words (Company Currency),En palabras (Moneda Local)
@@ -1511,10 +1507,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Seleccione la compañía...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Dejar en blanco si se considera para todos los departamentos
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
 DocType: Currency Exchange,From Currency,Desde Moneda
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Monto no reflejado en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Moneda Local)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Otros
@@ -1528,7 +1524,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
 DocType: Quality Inspection,In Process,En proceso
 DocType: Authorization Rule,Itemwise Discount,Descuento de producto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contra orden de venta {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} contra orden de venta {1}
 DocType: Account,Fixed Asset,Activos Fijos
 DocType: Time Log Batch,Total Billing Amount,Monto total de facturación
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Cuenta por Cobrar
@@ -1564,10 +1560,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total Monto Facturado
 DocType: Time Log,To Time,Para Tiempo
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Para agregar registros secundarios , explorar el árbol y haga clic en el registro en el que desea agregar más registros."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,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}
 DocType: Production Order Operation,Completed Qty,Cant. Completada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,La lista de precios {0} está deshabilitada
 DocType: Manufacturing Settings,Allow Overtime,Permitir horas extras
 DocType: Stock Reconciliation Item,Current Valuation Rate,Tasa de valoración actual
@@ -1575,7 +1571,7 @@
 DocType: Opportunity,Lost Reason,Razón de la pérdida
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Crear entradas de pago contra órdenes o facturas.
 DocType: Quality Inspection,Sample Size,Tamaño de la muestra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Todos los artículos que ya se han facturado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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 'Desde el caso No.' válido"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +304,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."
 DocType: Project,External,Externo
@@ -1630,7 +1626,7 @@
 DocType: Rename Tool,Rename Tool,Herramienta para renombrar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualización de Costos
 DocType: Item Reorder,Item Reorder,Reordenar productos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transferencia de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifique la operación , el costo de operación y dar una operación única que no a sus operaciones."
 DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios
 DocType: Naming Series,User must always select,Usuario elegirá siempre
@@ -1646,18 +1642,18 @@
 DocType: Process Payroll,Create Salary Slip,Crear Nómina
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Importe pendiente de banco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la linea {0} ({1}) debe ser la misma que la cantidad producida {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la linea {0} ({1}) debe ser la misma que la cantidad producida {2}
 DocType: Appraisal,Employee,Empleado
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar correo electrónico de:
 DocType: Features Setup,After Sale Installations,Instalaciones post venta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} está totalmente facturado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} está totalmente facturado
 DocType: Workstation Working Hour,End Time,Hora de Finalización
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condiciones contractuales estándar para ventas y compras.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Agrupar por recibo
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerido Por
 DocType: Sales Invoice,Mass Mailing,Correo Masivo
 DocType: Rename Tool,File to Rename,Archivo a renombrar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,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: Notification Control,Expense Claim Approved,Reembolso de gastos aprobado
@@ -1683,15 +1679,15 @@
 DocType: Payment Tool,Total Payment Amount,Importe total a pagar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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}
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta de envío
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
 DocType: Newsletter,Test,Prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Existen transacciones de stock para este producto, \ usted no puede cambiar los valores de 'Tiene No. de serie', 'Tiene No. de lote', 'Es un producto en stock' y 'Método de valoración'"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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: 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 +157,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 +211,{0} {1} is not submitted,{0} {1} no esta presentado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} no esta presentado
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Listado de solicitudes de productos
 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.
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones 1
@@ -1703,7 +1699,7 @@
 DocType: Delivery Note,Transporter Name,Nombre del Transportista
 DocType: Contact,Enter department to which this Contact belongs,Introduzca departamento al que pertenece este Contacto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Ausente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,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/stock/doctype/stock_entry/stock_entry.py +735,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/config/stock.py +104,Unit of Measure,Unidad de Medida
 DocType: Fiscal Year,Year End Date,Año de Finalización
 DocType: Task Depends On,Task Depends On,Tarea Depende de
@@ -1727,7 +1723,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,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 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: Customer Group,Has Child Node,Tiene Nodo Niño
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL estáticas aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no se encuentra en el año fiscal activo. Para más detalles verifique {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
@@ -1775,7 +1771,7 @@
  10. Añadir o deducir: Si usted quiere añadir o deducir el impuesto."
 DocType: Purchase Receipt Item,Recd Quantity,Recd Cantidad
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de Banco / Efectivo
 DocType: Global Defaults,Hide Currency Symbol,Ocultar el símbolo de moneda
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
@@ -1859,7 +1855,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todas las direcciones.
 DocType: Company,Stock Settings,Ajustes de Inventarios
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Nombre de Nuevo Centro de Coste
 DocType: Leave Control Panel,Leave Control Panel,Salir del Panel de Control
@@ -1878,8 +1874,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Detalle de herramienta de pago
 ,Sales Browser,Navegador de Ventas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Local
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deudores
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
@@ -1953,7 +1949,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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,Requerido
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,No hay observaciones
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,No hay observaciones
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Atrasado
 DocType: Account,Stock Received But Not Billed,Inventario Recibido pero no facturados
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Pago bruto + Montos atrazados + Vacaciones - Total deducciones
@@ -1976,9 +1972,9 @@
 DocType: Purchase Invoice,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,El año fiscal {0} no se encuentra.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtener registros relevantes
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Asiento contable de inventario
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Asiento contable de inventario
 DocType: Sales Invoice,Sales Team1,Team1 Ventas
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,El elemento {0} no existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
 DocType: Account,Root Type,Tipo Root
@@ -1987,10 +1983,10 @@
 DocType: Item Group,Show this slideshow at the top of the page,Mostrar esta presentación de diapositivas en la parte superior de la página
 DocType: BOM,Item UOM,Unidad de Medida del Artículo
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos Después Cantidad de Descuento (Compañía moneda)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Almacenes de destino es obligatorio para la fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Almacenes de destino es obligatorio para la fila {0}
 DocType: Quality Inspection,Quality Inspection,Inspección de Calidad
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas y Tabaco"
@@ -2030,7 +2026,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nombre o Email es obligatorio
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspección de calidad entrante
 DocType: Employee,Exit,Salir
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Tipo Root es obligatorio
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Tipo Root es obligatorio
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Número de orden {0} creado
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para la comodidad de los clientes , estos códigos se pueden utilizar en formatos impresos como facturas y notas de entrega"
 DocType: Employee,You can enter any date manually,Puede introducir cualquier fecha manualmente
@@ -2039,7 +2035,7 @@
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las Cuentas de Detalle se permiten en una transacción
 DocType: Expense Claim,Expense Approver,Supervisor de Gastos
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de Compra del Artículo Adquirido
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagar
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Fecha y Hora
 DocType: SMS Settings,SMS Gateway URL,URL de pasarela SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
@@ -2055,7 +2051,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivel de Reabastecimiento
 DocType: Attendance,Attendance Date,Fecha de Asistencia
 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 +110,Account with child nodes cannot be converted to ledger,Cuenta con nodos hijos no se puede convertir a cuentas del libro mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Cuenta con nodos hijos no se puede convertir a cuentas del libro mayor
 DocType: Address,Preferred Shipping Address,Dirección de envío preferida
 DocType: Purchase Receipt Item,Accepted Warehouse,Almacén Aceptado
 DocType: Bank Reconciliation Detail,Posting Date,Fecha de contabilización
@@ -2072,7 +2068,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Número de orden {0} no existe
 DocType: Pricing Rule,Discount Percentage,Porcentaje de Descuento
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
-apps/erpnext/erpnext/hooks.py +54,Orders,Órdenes
+apps/erpnext/erpnext/hooks.py +55,Orders,Órdenes
 DocType: Leave Control Panel,Employee Type,Tipo de Empleado
 DocType: Employee Leave Approver,Leave Approver,Supervisor de Vacaciones
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un usuario con rol de ""Supervisor de gastos"""
@@ -2083,7 +2079,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% de materiales facturados contra la orden de venta
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Entradas de cierre de período
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centro de Costos de las transacciones existentes no se puede convertir al grupo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciación
+DocType: Account,Depreciation,Depreciación
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor (s)
 DocType: Customer,Credit Limit,Límite de Crédito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccione el tipo de transacción
@@ -2104,17 +2100,17 @@
 DocType: Material Request,Requested For,Solicitados para
 DocType: Quotation Item,Against Doctype,Contra Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir este albarán en contra de cualquier proyecto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Cuenta root no se puede borrar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Cuenta root no se puede borrar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar Imagenes de entradas
 DocType: Production Order,Work-in-Progress Warehouse,Almacén de Trabajos en Proceso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referencia # {0} de fecha {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 DocType: Pricing Rule,Item Code,Código del producto
 DocType: Production Planning Tool,Create Production Orders,Crear Órdenes de Producción
 DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles
 DocType: Journal Entry,User Remark,Observaciones
 DocType: Lead,Market Segment,Sector de Mercado
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de Trabajo Interno del Empleado
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Cierre (Deb)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Cierre (Deb)
 DocType: Contact,Passive,Pasivo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Número de orden {0} no está en stock
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
@@ -2129,7 +2125,7 @@
 ,Billed Amount,Importe Facturado
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliación Bancaria
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtener actualizaciones
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Solicitud de Material {0} cancelada o detenida
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Solicitud de Material {0} cancelada o detenida
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Agregar algunos registros de muestra
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Gestión de ausencias
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupar por cuenta
@@ -2138,14 +2134,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","El cuenta de Patrimonio , en el que será calculada la  Ganancia / Pérdida"
 DocType: Payment Tool,Against Vouchers,Contra Comprobantes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ayuda Rápida
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Fuente y el almacén de destino no pueden ser la misma para la fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Fuente y el almacén de destino no pueden ser la misma para la fila {0}
 DocType: Features Setup,Sales Extras,Extras Ventas
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},El presupuesto {0} para la cuenta {1} contra el centro de costos {2} es mayor por {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
 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'
 ,Stock Projected Qty,Cantidad de Inventario Proyectada
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
 DocType: Warranty Claim,From Company,Desde Compañía
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Cantidad
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Minute,Minuto
@@ -2155,7 +2151,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Lo utilizará para iniciar sesión
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos los proveedores
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +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/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Sales Order,%  Delivered,% Entregado
@@ -2196,7 +2192,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El peso bruto del paquete. Peso + embalaje Normalmente material neto . (para impresión)
 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: Serial No,Is Cancelled,CANCELADO
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mis envíos
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Mis envíos
 DocType: Journal Entry,Bill Date,Fecha de factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Incluso si hay varias reglas de precios con mayor prioridad, se aplican entonces siguientes prioridades internas:"
 DocType: Supplier,Supplier Details,Detalles del Proveedor
@@ -2217,10 +2213,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Llamadas
 DocType: Project,Total Costing Amount (via Time Logs),Monto total del cálculo del coste (a través de los registros de tiempo)
 DocType: Purchase Order Item Supplied,Stock UOM,Unidad de Media del Inventario
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,La órden de compra {0} no existe
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,La órden de compra {0} no existe
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Proyectado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Número de orden {0} no pertenece al Almacén {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
 DocType: Notification Control,Quotation Message,Cotización Mensaje
 DocType: Issue,Opening Date,Fecha de Apertura
 DocType: Journal Entry,Remark,Observación
@@ -2233,7 +2229,6 @@
 DocType: Time Log,Batched for Billing,Lotes para facturar
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Listado de facturas emitidas por los proveedores.
 DocType: POS Profile,Write Off Account,Cuenta de desajuste
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/public/js/setup_wizard.js +310,e.g. VAT,por ejemplo IVA
@@ -2274,7 +2269,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Fecha de la jubilación debe ser mayor que Fecha de acceso
 DocType: Sales Invoice,Against Income Account,Contra cuenta de ingresos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Entregado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribución Mensual Porcentual
 DocType: Territory,Territory Targets,Territorios Objetivos
 DocType: Delivery Note,Transporter Info,Información de Transportista
@@ -2302,7 +2297,7 @@
 ,Stock Ledger,Mayor de Inventarios
 DocType: Salary Slip Deduction,Salary Slip Deduction,Deducción En Planilla
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Seleccione un nodo de grupo primero.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propósito debe ser uno de {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Propósito debe ser uno de {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Llene el formulario y guárdelo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descargar un informe con todas las materias primas y su inventario actual
 DocType: Leave Application,Leave Balance Before Application,Vacaciones disponibles antes de la solicitud
@@ -2335,7 +2330,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuración general del sistema.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha estimada de llegada'"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,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"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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"
 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/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Si el pago no se hace en con una  referencia, deberá hacer entrada al diario manualmente."
@@ -2352,11 +2347,11 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a Contactos en transacciones SOMETER.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Fila {0}: Cantidad no esta disponible en almacén {1} del {2} {3}.  Disponible Cantidad: {4}, Transferir Cantidad: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Elemento 3
 DocType: Sales Team,Contribution (%),Contribución (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nombre del Vendedor
@@ -2367,19 +2362,19 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliación
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
-apps/erpnext/erpnext/stock/doctype/item/item.py +374,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 +383,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: Sales Order,Partly Billed,Parcialmente Facturado
 DocType: Item,Default BOM,Solicitud de Materiales por Defecto
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Monto Total Soprepasado
 DocType: Time Log Batch,Total Hours,Total de Horas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotor
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Desde nota de entrega
 DocType: Time Log,From Time,Desde fecha
 DocType: Notification Control,Custom Message,Mensaje personalizado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca de Inversión
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,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/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago
 DocType: Purchase Invoice,Price List Exchange Rate,Tipo de cambio para la lista de precios
 DocType: Purchase Invoice Item,Rate,Precio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interno
@@ -2398,7 +2393,7 @@
  conflicto mediante la asignación de prioridad. Reglas de Precio: {0}"
 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 +580,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Distribuir materiales
 DocType: Material Request Item,For Warehouse,Por almacén
 DocType: Employee,Offer Date,Fecha de Oferta
 DocType: Hub Settings,Access Token,Token de acceso
@@ -2433,7 +2428,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Materia Prima
 DocType: Leave Application,Follow via Email,Seguir a través de correo electronico
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impuestos Después Cantidad de Descuento
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Cuenta secundaria existe para esta cuenta. No es posible eliminar esta cuenta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,Child account exists for this account. You can not delete this account.,Cuenta secundaria existe para esta cuenta. No es posible eliminar esta cuenta.
 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
 apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
 DocType: Leave Control Panel,Carry Forward,Cargar
@@ -2449,6 +2444,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serie n Necesario para artículo serializado {0}
 DocType: Journal Entry,Bank Entry,Registro de banco
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Denominación )
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Añadir a la Cesta
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Gastos Postales
@@ -2456,17 +2452,17 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimiento y Ocio
 DocType: Purchase Order,The date on which recurring order will be stop,La fecha en que se detiene el pedido recurrente
 DocType: Quality Inspection,Item Serial No,Nº de Serie del producto
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Presente
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serializado artículo {0} no se puede actualizar utilizando \
  Stock Reconciliación"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferencia de material a proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Transferencia de material a proveedor
 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
 DocType: Lead,Lead Type,Tipo de Iniciativa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear Cotización
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Todos estos elementos ya fueron facturados
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Todos estos elementos ya fueron facturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Regla envío Condiciones
 DocType: BOM Replace Tool,The new BOM after replacement,La nueva Solicitud de Materiales después de la sustitución
@@ -2477,13 +2473,12 @@
 DocType: Quality Inspection,Report Date,Fecha del Informe
 DocType: C-Form,Invoices,Facturas
 DocType: Job Opening,Job Title,Título del trabajo
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatarios
 DocType: Features Setup,Item Groups in Details,Detalles de grupos del producto
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Iniciar terminal de punto de venta (POS)
 apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Informe de visita por llamada de mantenimiento .
 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: Pricing Rule,Customer Group,Categoría de cliente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
 DocType: Item,Website Description,Descripción del Sitio Web
 DocType: Serial No,AMC Expiry Date,AMC Fecha de caducidad
 ,Sales Register,Registros de Ventas
@@ -2491,12 +2486,12 @@
 DocType: Address,Plant,Planta
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hay nada que modificar.
 DocType: Customer Group,Customer Group Name,Nombre de la categoría de cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Atributos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obtener Artículos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Obtener Artículos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Fecha del último pedido
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Hacer Impuestos Especiales de la Factura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},La cuenta {0} no pertenece a la compañía {1}
@@ -2511,7 +2506,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización--
 DocType: Project,Expected End Date,Fecha de finalización prevista
 DocType: Appraisal Template,Appraisal Template Title,Titulo de la Plantilla deEvaluación
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Comercial
 DocType: Cost Center,Distribution Id,Id de Distribución
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Todos los productos o servicios.
@@ -2521,7 +2516,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serie es obligatorio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicios Financieros
 DocType: Tax Rule,Sales,Venta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cred
 DocType: Customer,Default Receivable Accounts,Cuentas por Cobrar Por Defecto
 DocType: Item Reorder,Transfer,Transferencia
@@ -2532,13 +2527,12 @@
 DocType: Naming Series,Setup Series,Serie de configuración
 DocType: Supplier,Contact HTML,HTML del Contacto
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de Compra
-DocType: Payment Reconciliation,Maximum Amount,Importe máximo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,¿Cómo se aplica la Regla Precios?
 DocType: Quality Inspection,Delivery Note No,No. de Nota de Entrega
 DocType: Company,Retail,venta al por menor
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,{0} no existe Cliente
 DocType: Attendance,Absent,Ausente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Conjunto/Paquete de productos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Conjunto/Paquete de productos
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantillas de Cargos e Impuestos
 DocType: Upload Attendance,Download Template,Descargar Plantilla
 DocType: GL Entry,Remarks,Observaciones
@@ -2574,6 +2568,7 @@
 DocType: Hub Settings,Seller Country,País del Vendedor
 DocType: Authorization Rule,Authorization Rule,Regla de Autorización
 DocType: Sales Invoice,Terms and Conditions Details,Detalle de Términos y Condiciones
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Especificaciones
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de Cargos e Impuestos sobre Ventas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de Orden
@@ -2594,7 +2589,7 @@
 DocType: Time Log,Billing Amount,Monto de facturación
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,La cantidad especificada es inválida para el elemento {0}. La cantidad debe ser mayor que 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Las solicitudes de licencia .
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Gastos Legales
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","El día del mes en el cual se generará la orden automática por ejemplo 05, 28, etc."
 DocType: Sales Invoice,Posting Time,Hora de contabilización
@@ -2609,10 +2604,10 @@
 DocType: Maintenance Visit,Breakdown,Desglose
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del Cheque
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: Cuenta Padre {1} no pertenece a la compañía: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: Cuenta Padre {1} no pertenece a la compañía: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} y {1} años
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importe total pagado
 ,Transferred Qty,Cantidad Transferida
@@ -2631,7 +2626,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Agregar lineas para establecer los presupuestos anuales de las cuentas.
 DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
 DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos los Contactos.
 DocType: Newsletter,Test Email Id,Prueba de Identificación del email
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abreviatura de la compañia
@@ -2653,7 +2648,7 @@
 ,Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Cuenta {0}: Cuenta Padre {1} no existe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,Cuenta {0}: Cuenta Padre {1} no existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Moneda Local)
 DocType: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Dirección de facturación preferida
@@ -2670,8 +2665,8 @@
 ,Item-wise Price List Rate,Detalle del Listado de Precios
 DocType: Purchase Order Item,Supplier Quotation,Cotizaciónes a Proveedores
 DocType: Quotation,In Words will be visible once you save the Quotation.,En palabras serán visibles una vez que guarde la cotización.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} esta detenido
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} esta detenido
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reglas para la adición de los gastos de envío .
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere Cliente
@@ -2688,23 +2683,23 @@
 DocType: Customer,From Lead,De la iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Las órdenes publicadas para la producción.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccione el año fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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 +455,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
 DocType: Hub Settings,Name Token,Nombre de Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Venta estándar
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,Fuera de Garantía
 DocType: BOM Replace Tool,Replace,Reemplazar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida predeterminada"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida predeterminada"
 DocType: Purchase Invoice Item,Project Name,Nombre del proyecto
 DocType: Journal Entry Account,If Income or Expense,Si es un ingreso o egreso
 DocType: Features Setup,Item Batch Nos,Números de lote del producto
 DocType: Stock Ledger Entry,Stock Value Difference,Diferencia de Valor de Inventario
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Recursos Humanos
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Activos por Impuestos
 DocType: BOM Item,BOM No,Lista de materiales (LdM) No.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Promedio Movil
 DocType: BOM Replace Tool,The BOM which will be replaced,La Solicitud de Materiales que será sustituida
 DocType: Account,Debit,Débito
@@ -2739,14 +2734,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),Procentaje (% )
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Fin del ejercicio contable
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"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 'nombre'"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Crear cotización de proveedor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Crear cotización de proveedor
 DocType: Quality Inspection,Incoming,Entrante
 DocType: BOM,Materials Required (Exploded),Materiales necesarios ( despiece )
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzca la Ganancia por Licencia sin Sueldo ( LWP )
 apps/erpnext/erpnext/public/js/setup_wizard.js +274,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional
 DocType: Batch,Batch ID,ID de lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Nota: {0}
 ,Delivery Note Trends,Tendencia de Notas de Entrega
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} debe ser un producto para compra o sub-contratado en la linea {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,La cuenta: {0} sólo puede ser actualizada a través de transacciones de inventario
@@ -2782,7 +2777,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID del cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Para Tiempo debe ser mayor que From Time
 DocType: Journal Entry Account,Exchange Rate,Tipo de Cambio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: Cuenta Padre{1} no pertenece a la empresa {2}
 DocType: BOM,Last Purchase Rate,Tasa de Cambio de la Última Compra
 DocType: Account,Asset,Activo
@@ -2802,7 +2797,7 @@
 ,Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje
 DocType: Item Variant,Item Variant,Variante del producto
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Al establecer esta plantilla de dirección por defecto ya que no hay otra manera predeterminada
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Gestión de la Calidad
 DocType: Production Planning Tool,Filter based on customer,Filtro basado en cliente
 DocType: Payment Tool Detail,Against Voucher No,Comprobante No.
@@ -2846,13 +2841,12 @@
 DocType: Production Order,Warehouses,Almacenes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Impresión y Papelería
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Agrupar por nota
-DocType: Payment Reconciliation,Minimum Amount,Importe mínimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Actualización de las Mercancías Terminadas
 DocType: Workstation,per hour,por horas
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Cuenta para el almacén ( Inventario Permanente ) se creará en esta Cuenta.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén.
 DocType: Company,Distribution,Distribución
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Total Pagado
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Total Pagado
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Proyectos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
@@ -2875,7 +2869,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitico de Soporte
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Compañía no se encuentra en los almacenes {0}
 DocType: POS Profile,Terms and Conditions,Términos y Condiciones
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},La fecha debe estar dentro del año fiscal. Asumiendo a la fecha = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},La fecha debe estar dentro del año fiscal. Asumiendo a la fecha = {0}
 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"
 DocType: Leave Block List,Applies to Company,Se aplica a la empresa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0}
@@ -2889,7 +2883,7 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Por favor, ingrese los recibos de compra"
 DocType: Sales Invoice,Get Advances Received,Obtener anticipos recibidos
 DocType: Email Digest,Add/Remove Recipients,Añadir / Quitar Destinatarios
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},Transacción no permitida contra Orden Producción Detenida {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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 como Predeterminado , haga clic en "" Establecer como Predeterminado """
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuración del servidor de correo entrante para el apoyo de id de correo electrónico. (ej. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Escasez Cantidad
@@ -2988,7 +2982,7 @@
 DocType: Appraisal,Start Date,Fecha de inicio
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Asignar las vacaciones para un período .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Haga clic aquí para verificar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como su cuenta Padre.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como su cuenta Padre.
 DocType: Purchase Invoice Item,Price List Rate,Tarifa de la lista de precios
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""en la acción "" o "" No disponible "", basada en stock disponible en este almacén."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Lista de Materiales (LdM)
@@ -3003,10 +2997,10 @@
 DocType: Workstation,Operating Costs,Costos Operativos
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de Vacaciones del Empleado
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha sido agregado con éxito a nuestra lista de Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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 +433,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/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la cotización ha sido hecha."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,La orden de producción {0} debe ser enviada
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,La orden de producción {0} debe ser enviada
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +136,Main Reports,Informes Generales
 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
@@ -3024,7 +3018,7 @@
 DocType: Industry Type,Industry Type,Tipo de Industria
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Algo salió mal!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fecha de  finalización
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Moneda Local)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unidad de Organización ( departamento) maestro.
@@ -3043,10 +3037,10 @@
 ,Serial No Service Contract Expiry,Número de orden de servicio Contrato de caducidad
 DocType: Item,Unit of Measure Conversion,Unidad de Conversión de la medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empleado no se puede cambiar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,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
 DocType: Naming Series,Help HTML,Ayuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nombre de la persona u organización a la que esta dirección pertenece.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Sus proveedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
@@ -3061,15 +3055,14 @@
 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.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado
 DocType: Payment Reconciliation,Get Unreconciled Entries,Verificar entradas no conciliadas
 DocType: Cost Center,Budgets,Presupuestos
-DocType: Employee,Emergency Contact Details,Detalles de Contacto de Emergencia
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,¿Qué hace?
 DocType: Delivery Note,To Warehouse,Para Almacén
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Cuenta {0} se ha introducido más de una vez para el año fiscal {1}
 ,Average Commission Rate,Tasa de Comisión Promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,"'Número de serie' no puede ser ""Sí"" para elementos que son de inventario"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,"'Número de serie' no puede ser ""Sí"" para elementos que son de inventario"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,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: Purchase Taxes and Charges,Account Head,Cuenta matriz
@@ -3126,12 +3119,12 @@
 DocType: Upload Attendance,Upload Attendance,Subir Asistencia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a fabricar.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rango de antigüedad 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Importe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Importe
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Lista de materiales (LdM) reemplazada
 ,Sales Analytics,Análisis de Ventas
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de Manufactura
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuración de Correo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,"Por favor, ingrese la moneda por defecto en la compañía principal"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,"Por favor, ingrese la moneda por defecto en la compañía principal"
 DocType: Stock Entry Detail,Stock Entry Detail,Detalle de la Entrada de Inventario
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,New Account Name,Nombre de nueva cuenta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coste materias primas suministradas
@@ -3151,13 +3144,13 @@
 DocType: Sales Order Item,Produced Quantity,Cantidad producida
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Asambleas Buscar Sub
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Código del producto requerido en la fila No. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Código del producto requerido en la fila No. {0}
 DocType: Sales Partner,Partner Type,Tipo de Socio
 DocType: Purchase Taxes and Charges,Actual,Actual
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descuento
 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 +263,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
 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
@@ -3169,22 +3162,22 @@
 DocType: Employee,Applicable Holiday List,Lista de Días Feriados Aplicable
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Actualizado
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Tipo de informe es obligatorio
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Tipo de informe es obligatorio
 DocType: Item,Serial Number Series,Número de Serie Serie
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el producto {0} en la linea {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Venta al por menor y al 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/public/js/setup_wizard.js +101,The First User: You,El primer usuario: Usted
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliado con éxito
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Reconciliado con éxito
 DocType: Production Order,Planned End Date,Fecha de finalización planeada
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Dónde se almacenarán los productos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Cantidad facturada
 DocType: Attendance,Attendance,Asistencia
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra.
 ,Item Prices,Precios de los Artículos
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,La cantidad en palabras será visible una vez que guarde la orden de compra.
@@ -3192,14 +3185,14 @@
 apps/erpnext/erpnext/config/stock.py +120,Price List master.,Configuracion de las listas de precios
 DocType: Task,Review Date,Fecha de Revisión
 DocType: Purchase Taxes and Charges,On Net Total,En Total Neto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Almacenes de destino de la linea {0} deben ser los mismos para la orden de producción
+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 linea {0} deben ser los mismos para la orden de producción
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,No tiene permiso para utilizar la herramienta de pagos
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Correo electrónico de notificación' no especificado para %s recurrentes
 DocType: Company,Round Off Account,Cuenta de redondeo por defecto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Gastos de Administración
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consuloría
 DocType: Customer Group,Parent Customer Group,Categoría de cliente principal
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Cambio
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Cambio
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","por ejemplo ""Mi Company LLC """
@@ -3244,6 +3237,7 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear bitácora de trabajo para las horas fuera de la estación.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ya ha sido presentado
 ,Items To Be Requested,Solicitud de Productos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Obtenga último precio de compra
 DocType: Company,Company Info,Información de la compañía
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Correo de la compañía no encontrado, por lo que el correo no ha sido enviado"
 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 )
@@ -3251,27 +3245,27 @@
 DocType: Fiscal Year,Year Start Date,Fecha de Inicio
 DocType: Attendance,Employee Name,Nombre del Empleado
 DocType: Sales Invoice,Rounded Total (Company Currency),Total redondeado (Moneda local)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'.
 DocType: Purchase Common,Purchase Common,Compra Común
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualizar.
 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 .
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Desde oportunidades
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de Empleados
 DocType: Sales Invoice,Is POS,Es POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la linea {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la linea {1}
 DocType: Production Order,Manufactured Qty,Cantidad Fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Listado de facturas emitidas a los clientes.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} suscriptores añadidos
 DocType: Maintenance Schedule,Schedule,Horario
 DocType: Account,Parent Account,Cuenta Primaria
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Centro de actividades
 DocType: GL Entry,Voucher Type,Tipo de comprobante
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Expense Claim,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
@@ -3292,14 +3286,14 @@
 DocType: Employee,Contract End Date,Fecha Fin de Contrato
 DocType: Sales Order,Track this Sales Order against any Project,Seguir este de órdenes de venta en contra de cualquier proyecto
 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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Desde cotización del proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Desde cotización del proveedor
 DocType: Deduction Type,Deduction Type,Tipo de Deducción
 DocType: Attendance,Half Day,Medio Día
 DocType: Pricing Rule,Min Qty,Cantidad Mínima
 DocType: GL Entry,Transaction Date,Fecha de Transacción
 DocType: Production Plan Item,Planned Qty,Cantidad Planificada
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Impuesto Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Por Cantidad (Cantidad fabricada) es obligatorio
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Por Cantidad (Cantidad fabricada) es obligatorio
 DocType: Stock Entry,Default Target Warehouse,Almacen de destino predeterminado
 DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Moneda Local)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: el tipo de entidad es aplicable únicamente contra las cuentas de cobrar/pagar
@@ -3350,7 +3344,7 @@
 DocType: Customer,Commission Rate,Comisión de ventas
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquee solicitud de ausencias por departamento.
 DocType: Production Order,Actual Operating Cost,Costo de operación actual
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root no se puede editar .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root no se puede editar .
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Monto asignado no puede superar el importe no ajustado
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir Producción en Vacaciones
 DocType: Sales Order,Customer's Purchase Order Date,Fecha de Pedido de Compra del Cliente
@@ -3361,7 +3355,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Diseñador
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantillas de Términos y Condiciones
 DocType: Serial No,Delivery Details,Detalles de la entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la linea {0} en la tabla Impuestos para el tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la linea {0} en la tabla Impuestos para el tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Crear automáticamente una 'Solicitud de materiales' si la cantidad es inferior a este nivel
 ,Item-wise Purchase Register,Detalle de Compras
 DocType: Batch,Expiry Date,Fecha de caducidad
@@ -3372,7 +3366,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de Crédito
 DocType: Leave Type,Is Carry Forward,Es llevar adelante
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Tiempo de Entrega en Días
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Lista de materiales (LdM)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: el tipo de entidad se requiere para las cuentas por cobrar/pagar {1}
@@ -3380,7 +3374,7 @@
 DocType: Employee,Reason for Leaving,Razones de Renuncia
 DocType: Expense Claim Detail,Sanctioned Amount,importe sancionado
 DocType: GL Entry,Is Opening,Es apertura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Fila {0}: Débito no puede vincularse con {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Cuenta {0} no existe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Fila {0}: Débito no puede vincularse con {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Cuenta {0} no existe
 DocType: Account,Cash,Efectivo
 DocType: Employee,Short biography for website and other publications.,Breve biografía de la página web y otras publicaciones.
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 8d2c99f..10e8534 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productos de consumo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, seleccione primero el tipo de entidad"
 DocType: Item,Customer Items,Partidas de deudores
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: de cuenta padre {1} no puede ser una cuenta de libro mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: de cuenta padre {1} no puede ser una cuenta de libro mayor
 DocType: Item,Publish Item to hub.erpnext.com,Publicar artículo en hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Notificaciones por correo electrónico
 DocType: Item,Default Unit of Measure,Unidad de Medida (UdM) predeterminada
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},La divisa/moneda es requerida para lista de precios {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción.
 DocType: Purchase Order,Customer Contact,Contacto del cliente
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Desde requisición de materiales
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Desde requisición de materiales
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,Árbol: {0}
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1 . Utilice esta opción para mantener el código del producto asignado por el cliente, de esta manera podrá encontrarlo en el buscador"
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mostrar variantes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Cantidad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Cantidad
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstamos (pasivos)
 DocType: Employee Education,Year of Passing,Año de graduación
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En inventario
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Asistencia médica
 DocType: Purchase Invoice,Monthly,Mensual
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Retraso en el pago (días)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodo
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Dirección de correo electrónico
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Año fiscal {0} es necesario
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Company,Abbr,Abreviatura
 DocType: Appraisal Goal,Score (0-5),Puntuación (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Línea {0}: {1} {2} no coincide con {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Línea {0}: {1} {2} no coincide con {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Línea # {0}:
 DocType: Delivery Note,Vehicle No,Vehículo No.
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, seleccione la lista de precios"
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,"Por favor, seleccione la lista de precios"
 DocType: Production Order Operation,Work In Progress,Trabajo en proceso
 DocType: Employee,Holiday List,Lista de festividades
 DocType: Time Log,Time Log,Gestión de tiempos
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Igual Company se introduce más de una vez
 DocType: Employee,Married,Casado
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},No está permitido para {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Abarrotes
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Crear entrada de banco
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondo de pensiones
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,El almacén es obligatorio si el tipo de cuenta es 'almacén'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,El almacén es obligatorio si el tipo de cuenta es 'almacén'
 DocType: SMS Center,All Sales Person,Todos los vendedores
 DocType: Lead,Person Name,Nombre de persona
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Marque si es una orden recurrente, desmarque si quiere detenerla o definir una fecha final"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Interesado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiales (LdM)
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Desde {0} a {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Desde {0} a {1}
 DocType: Item,Copy From Item Group,Copiar desde grupo
 DocType: Journal Entry,Opening Entry,Asiento de apertura
 DocType: Stock Entry,Additional Costs,Costes adicionales
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
 DocType: Lead,Product Enquiry,Petición de producto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Por favor, ingrese primero la compañía"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Por favor, seleccione primero la compañía"
 DocType: Employee Education,Under Graduate,Estudiante
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Objetivo en
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Objetivo en
 DocType: BOM,Total Cost,Coste total
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Actividad:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado
@@ -165,7 +165,7 @@
 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","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 +444,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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Se actualizará después de la factura de venta se considera validada.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Configuracion para módulo de recursos humanos (RRHH)
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detalles de las operaciones realizadas.
 DocType: Serial No,Maintenance Status,Estado del mantenimiento
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Productos y precios
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},La fecha 'Desde' tiene que pertenecer al rango del año fiscal = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},La fecha 'Desde' tiene que pertenecer al rango del año fiscal = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Seleccione el empleado para el que está creando la evaluación.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},El centro de Costos {0} no pertenece a la compañía {1}
 DocType: Customer,Individual,Individual
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Efectivo neto de Financiamiento
 DocType: Lead,Address & Contact,Dirección y Contacto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Añadir las hojas no utilizados de las asignaciones anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Nombre de contacto
 DocType: Production Plan Item,SO Pending Qty,Cant. de OV pendientes
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crear la nómina salarial con los criterios antes seleccionados.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ninguna descripción definida
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Solicitudes de compra.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
 DocType: Payment Tool,Reference No,Referencia No.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,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/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Elemento de reconciliación de inventarios
 DocType: Stock Entry,Sales Invoice No,Factura de venta No.
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,El producto {0} esta cancelado
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Requisición 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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Relación
 DocType: Shipping Rule,Worldwide Shipping,Envío al mundo entero
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Ordenes de clientes confirmadas.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Sugerencias.
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Establecer grupo de presupuestos en este territorio. también puede incluir las temporadas de distribución
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Por favor, ingrese el grupo de cuentas padres / principales para el almacén {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},El pago para {0} {1} no puede ser mayor que el pago pendiente {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},El pago para {0} {1} no puede ser mayor que el pago pendiente {2}
 DocType: Supplier,Address HTML,Dirección HTML
 DocType: Lead,Mobile No.,Número móvil
 DocType: Maintenance Schedule,Generate Schedule,Generar planificación
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Más reciente
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Máximo 5 caractéres
 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.
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Aprender
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Costo Actividad por Empleado
 DocType: Accounts Settings,Settings for Accounts,Ajustes de contabilidad
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrar las categoría de los socios de ventas
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Multi moneda
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de factura
 DocType: Sales Invoice Item,Delivery Note,Nota de entrega
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuración de Impuestos
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configuración de Impuestos
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumen para esta semana y actividades pendientes
 DocType: Workstation,Rent Cost,Costo de arrendamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Por favor seleccione el mes y el año
@@ -308,10 +311,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en la Solicitud de Materiales , Albarán, Factura de Compra , Orden de Produccuón , Orden de Compra , Fecibo de Compra , Factura de Venta Pedidos de Venta , Inventario de Entrada, Control de Horas"
 DocType: Item Tax,Tax Rate,Procentaje del impuesto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ya asignado para Empleado {1} para el período {2} a {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Seleccione producto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Seleccione producto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","El Producto: {0} gestionado por lotes, no se puede conciliar usando\ Reconciliación de Stock, se debe usar Entrada de Stock"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,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 +87,Row # {0}: Batch No must be same as {1} {2},Línea # {0}: El lote no puede ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir a 'Sin-Grupo'
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,El recibo de compra debe validarse
@@ -352,6 +355,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Médico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razón de pérdida
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},La estación de trabajo estará cerrada en las siguientes fechas según la lista de festividades: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunidades
 DocType: Employee,Single,Soltero
 DocType: Issue,Attachment,Adjunto
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,El presupuesto no se puede establecer para un grupo del centro de costos
@@ -381,13 +385,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,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 +563,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 +140,Holiday master.,Master de vacaciones .
 DocType: Material Request Item,Required Date,Fecha de solicitud
 DocType: Delivery Note,Billing Address,Dirección de facturación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Por favor, introduzca el código del producto."
 DocType: BOM,Costing,Presupuesto
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el valor del impuesto se considerará como ya incluido en el importe"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
@@ -420,7 +424,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productos cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Garantía de caducidad del numero de serie
@@ -439,15 +443,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,El producto {0} no es un producto para la compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,El producto {0} no es un producto para la compra
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} es una dirección de correo electrónico inválida en 'Email de notificación'
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Total facturado este año:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
 DocType: Purchase Invoice,Supplier Invoice No,Factura de proveedor No.
 DocType: Territory,For reference,Para referencia
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Cierre (Cred)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Cierre (Cred)
 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
 ,Pending Qty,Cantidad pendiente
@@ -462,7 +465,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribución Mensual** le ayuda a distribuir su presupuesto a través de meses si tiene periodos / temporadas en su negocio.  Para distribuir un presupuesto utilizando esta distribución, debe establecer **Distribución Mensual** en el **Centro de Costos**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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.py +126,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 +20,Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanzas / Ejercicio contable.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Lamentablemente, los numeros de serie no se puede fusionar"
@@ -470,9 +473,9 @@
 DocType: Project Task,Project Task,Tareas del proyecto
 ,Lead Id,ID de iniciativa
 DocType: C-Form Invoice Detail,Grand Total,Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,La fecha de inicio no puede ser mayor que la fecha final del año fiscal
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,La fecha de inicio no puede ser mayor que la fecha final del año fiscal
 DocType: Warranty Claim,Resolution,Resolución
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Entregado: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Entregado: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Cuenta por pagar
 DocType: Sales Order,Billing and Delivery Status,Estado de facturación y entrega
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes recurrentes
@@ -487,7 +490,7 @@
 DocType: Quotation,Quotation To,Cotización para
 DocType: Lead,Middle Income,Ingreso medio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Apertura (Cred)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Monto asignado no puede ser negativo
 DocType: Purchase Order Item,Billed Amt,Monto facturado
 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.
@@ -496,7 +499,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,La orden de producción es obligatoria
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacción de propuestas
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Error de stock negativo ( {6} ) para el producto {0} en Almacén {1} en {2} {3} en {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Error de stock negativo ( {6} ) para el producto {0} en Almacén {1} en {2} {3} en {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal de la compañía
 DocType: Packing Slip Item,DN Detail,Detalle DN
 DocType: Time Log,Billed,Facturado
@@ -515,16 +518,17 @@
 DocType: Activity Type,Default Costing Rate,Precio de costo predeterminado
 DocType: Maintenance Schedule,Maintenance Schedule,Calendario de mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas por cliente, categoría de cliente, territorio, proveedor, tipo de proveedor, campaña, socio de ventas, etc."
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Cambio neto en el Inventario
 DocType: Employee,Passport Number,Número de pasaporte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Desde recibo de compra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Este artículo se ha introducido varias veces.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Desde recibo de compra
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Este artículo se ha introducido varias veces.
 DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es)
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Basado en"" y ""Agrupar por"" no pueden ser el mismo"
 DocType: Sales Person,Sales Person Targets,Objetivos de ventas del vendedor
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de resolución
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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}"
 DocType: Selling Settings,Customer Naming By,Ordenar cliente por
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir a grupo
 DocType: Activity Cost,Activity Type,Tipo de Actividad
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicación
 DocType: Activity Cost,Projects User,Usuario de proyectos
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
 DocType: Company,Round Off Cost Center,Centro de costos por defecto (redondeo)
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,La visita de mantenimiento {0} debe ser cancelada antes de cancelar la orden de ventas
 DocType: Material Request,Material Transfer,Transferencia de material
@@ -557,13 +561,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para rastrear artículo en ventas y documentos de compra en base a sus nn serie. Esto se puede también utilizar para rastrear información sobre la garantía del producto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Almacén rechazado es obligatorio para el producto rechazado
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,La facturación total de este año
 DocType: Account,Expenses Included In Valuation,GASTOS DE VALORACIÓN
 DocType: Employee,Provide email id registered in company,Proporcione el correo electrónico registrado en la compañía
 DocType: Hub Settings,Seller City,Ciudad de vendedor
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elemento {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventarios
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de árbol
@@ -581,18 +585,18 @@
 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 +92,{0} is not a stock Item,{0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} no es un producto de stock
 DocType: Mode of Payment Account,Default Account,Cuenta predeterminada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,Por favor seleccione el día libre de la semana
 DocType: Production Order Operation,Planned End Time,Tiempo de finalización planeado
 ,Sales Person Target Variance Item Group-Wise,"Variación del objetivo de ventas, por grupo de vendedores"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Cuenta con una transacción existente no se puede convertir en el libro mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Cuenta con una transacción existente no se puede convertir en el libro mayor
 DocType: Delivery Note,Customer's Purchase Order No,Pedido de compra No.
 DocType: Employee,Cell Number,Número de movil
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Las solicitudes de material auto generada
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdído
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,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/accounts/doctype/journal_entry/journal_entry.py +126,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/setup/setup_wizard/industry_type.py +25,Energy,Energía
 DocType: Opportunity,Opportunity From,Oportunidad desde
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nómina mensual.
@@ -601,9 +605,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Los asientos contables se deben crear en las subcuentas. los asientos en 'grupos' de cuentas no están permitidos.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Se requiere el numero de recibo para el producto {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Se requiere el numero de recibo para el producto {0}
 DocType: Item Attribute Value,Item Attribute Value,Atributos del producto
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campañas de venta.
 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.
@@ -661,7 +665,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,No ha seleccionado una lista de precios
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Process Payroll,Send Email,Enviar correo electronico
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Sin permiso
 DocType: Company,Default Bank Account,Cuenta bancaria por defecto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar en base a terceros, seleccione el tipo de entidad"
@@ -669,7 +673,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos.
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor ponderación se mostraran arriba
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalle de conciliación bancaria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Mis facturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Mis facturas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Empleado no encontrado
 DocType: Purchase Order,Stopped,Detenido.
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un proveedor
@@ -679,6 +683,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ahora.
 ,Support Analytics,Soporte analítico
 DocType: Item,Website Warehouse,Almacén para el sitio web
+DocType: Payment Reconciliation,Minimum Invoice Amount,Volumen mínimo Factura
 DocType: Sales 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."
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Registros C -Form
@@ -688,7 +693,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Para habilitar las características de 'Punto de Venta'
 DocType: Bin,Moving Average Rate,Porcentaje de precio medio variable
 DocType: Production Planning Tool,Select Items,Seleccionar productos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra factura {1} de fecha {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} contra factura {1} de fecha {2}
 DocType: Maintenance Visit,Completion Status,Estado de finalización
 DocType: Sales Invoice Item,Target Warehouse,Inventario estimado
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir hasta este porcentaje en la entrega y/o recepción
@@ -700,7 +705,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
 DocType: Production Order,Item To Manufacture,Producto para manufactura
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} el estado es {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Orden de compra a pago
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Orden de compra a pago
 DocType: Sales Order Item,Projected Qty,Cantidad proyectada
 DocType: Sales Invoice,Payment Due Date,Fecha de pago
 DocType: Newsletter,Newsletter Manager,Administrador de boletínes
@@ -724,7 +729,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punto de venta (POS)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
 DocType: Account,Balance must be,El balance debe ser
 DocType: Hub Settings,Publish Pricing,Publicar precios
 DocType: Notification Control,Expense Claim Rejected Message,Mensaje de reembolso de gastos rechazado
@@ -747,7 +752,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Configuración principal para el cambio de divisas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Por favor, seleccione primero el tipo de documento"
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Importe de ausencias / vacaciones pagadas
@@ -765,17 +770,17 @@
 DocType: Supplier,Default Payable Accounts,Cuentas por pagar por defecto
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,El empleado {0} no está activo o no existe
 DocType: Features Setup,Item Barcode,Código de barras del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,{0} variantes actualizadas del producto
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Address,Shop,Tienda.
 DocType: Hub Settings,Sync Now,Sincronizar ahora.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Línea {0}: La entrada de crédito no puede vincularse con {1}
 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'
 DocType: Employee,Permanent Address Is,La dirección permanente es
 DocType: Production Order Operation,Operation completed for how many finished goods?,Se completo la operación para la cantidad de productos terminados?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,La marca
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
 DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida
 DocType: Item,Is Purchase Item,Es un producto para compra
 DocType: Journal Entry Account,Purchase Invoice,Factura de compra
@@ -787,7 +792,7 @@
 DocType: Salary Slip,Total in words,Total en palabras
 DocType: Material Request Item,Lead Time Date,Hora de la Iniciativa
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,es obligatorio. Posiblemente el registro de cambio de divisa no ha sido creado para
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Línea #{0}: Por favor, especifique el número de serie para el producto {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},"Línea #{0}: Por favor, especifique el número de serie para el producto {1}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Para 'Paquete de Productos' el Almacén, No. de Serie y No. de lote serán considerados desde el 'Packing List'. Si el Almacén y No. de lote son los mismos para todos los productos empaquetados, los valores podrán ser ingresados en la tabla principal del artículo, estos valores serán copiados al 'Packing List'"
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Envíos realizados a los clientes
 DocType: Purchase Invoice Item,Purchase Order Item,Producto de la orden de compra
@@ -796,14 +801,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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 +626,Select Item for Transfer,Seleccione el producto a transferir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar la lista de precios en las transacciones
 DocType: Pricing Rule,Max Qty,Cantidad máxima
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Línea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
 DocType: Process Payroll,Select Payroll Year and Month,"Seleccione la nómina, año y mes"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Ir al grupo apropiado, usualmente (Aplicación de Fondos> Activo Circulante> Cuentas Bancarias) y crear una nueva cuenta haciendo clic en Añadir hijo del tipo ""Banco"""
 DocType: Workstation,Electricity Cost,Costos de energía electrica
@@ -817,10 +823,10 @@
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
 DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Adjunte su fotografía
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Crear
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Crear
 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 +3,My Cart,Mi carrito
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mi carrito
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Cant. de apertura
@@ -839,10 +845,10 @@
 DocType: POS Profile,Cash/Bank Account,Cuenta de caja / banco
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Tabla de atributos es obligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,Tabla de atributos es obligatorio
 DocType: Production Planning Tool,Get Sales Orders,Obtener ordenes de venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no puede ser negativo
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Descuento
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Descuento
 DocType: Features Setup,Purchase Discounts,Descuento sobre compras
 DocType: Workstation,Wages,Salario
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Se actualizara solo si la gestión de tiempos puede facturarse
@@ -867,7 +873,7 @@
 DocType: Tax Rule,Shipping State,Estado de envío
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,El producto debe ser agregado utilizando el botón 'Obtener productos desde recibos de compra'
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Gastos de venta
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Compra estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Compra estándar
 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
@@ -909,6 +915,7 @@
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Reglas de envio para el carrito de compras
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',"Por favor, establece &quot;Aplicar descuento adicional en &#39;"
 ,Ordered Items To Be Billed,Ordenes por facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gama tiene que ser menor que en nuestra gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Seleccione la gestión de tiempos y valide para crear una nueva factura de ventas.
@@ -918,13 +925,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Este lote de gestión de tiempos ha sido facturado.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Crear oportunidad
 DocType: Salary Slip,Leave Without Pay,Permiso / licencia sin goce de salario (LSS)
-DocType: Supplier,Communications,Comunicaciones
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Error en la planificación de capacidad
 ,Trial Balance for Party,Balance de terceros
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Ganancias
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para el tipo de producción
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Apertura de saldos contables
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para el tipo de producción
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Apertura de saldos contables
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura de ventas anticipada
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nada que solicitar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Fecha de Inicio' no puede ser mayor que 'Fecha Final'
@@ -966,7 +972,7 @@
 DocType: Global Defaults,Current Fiscal Year,Año fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo
 DocType: Lead,Call,Llamada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,Las entradas no pueden estar vacías
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,Las entradas no pueden estar vacías
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Línea {0} duplicada con igual {1}
 ,Trial Balance,Balanza de comprobación
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configuración de empleados
@@ -978,9 +984,9 @@
 DocType: Contact,User ID,ID de usuario
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Mostrar libro mayor
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Manufacturar para pedido de ventas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -1010,7 +1016,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtener facturas pendientes de pago
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Orden de venta {0} no es válida
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1023,13 +1029,13 @@
 DocType: Employee,Place of Issue,Lugar de emisión.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contrato
 DocType: Email Digest,Add Quote,Añadir Cita
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Egresos indirectos
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Los productos o servicios
 DocType: Mode of Payment,Mode of Payment,Método de pago
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,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/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Este es un grupo principal y no se puede editar.
 DocType: Journal Entry Account,Purchase Order,Órden de compra (OC)
 DocType: Warehouse,Warehouse Contact Info,Información de contacto del almacén
@@ -1038,8 +1044,8 @@
 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/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,BIENES DE CAPITAL
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1049,7 +1055,7 @@
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 DocType: Sales Invoice Item,Edit Description,Editar descripción
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,La fecha prevista de entrega es menor que la fecha de inicio planeada.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,De proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,De proveedor
 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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente
@@ -1062,7 +1068,7 @@
 DocType: Journal Entry,Journal Entry,Asiento contable
 DocType: Workstation,Workstation Name,Nombre de la estación de trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar boletín:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,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 +430,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.,Número de cuenta bancaria
 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
@@ -1094,7 +1100,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Boletín de noticias para contactos y clientes potenciales.
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
 ,Delivered Items To Be Billed,Envios por facturar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie
 DocType: Authorization Rule,Average Discount,Descuento Promedio
@@ -1109,7 +1115,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Desde {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Descripción de la operación
 DocType: Item,Will also apply to variants,También se aplicará a las variantes
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No se puede cambiar la 'Fecha de Inicio' y la 'Fecha Final' del año fiscal una vez que ha sido guardado.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No se puede cambiar la 'Fecha de Inicio' y la 'Fecha Final' del año fiscal una vez que ha sido guardado.
 DocType: Quotation,Shopping Cart,Carrito de compras
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Promedio diario saliente
 DocType: Pricing Rule,Campaign,Campaña
@@ -1120,7 +1126,8 @@
 DocType: Sales Order Item,Planned Quantity,Cantidad planificada
 DocType: Purchase Invoice Item,Item Tax Amount,Total impuestos de producto
 DocType: Item,Maintain Stock,Mantener stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Las entradas de stock ya fueron creadas para el numero de producción
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Máximo: {0}
@@ -1132,7 +1139,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,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 Slip Deduction,Depends on Leave Without Pay,Depende de licencia sin goce de salario
@@ -1169,7 +1176,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub-Ensamblajes
 DocType: Shipping Rule Condition,To Value,Para el valor
 DocType: Supplier,Stock Manager,Gerente de almacén
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},El almacén de origen es obligatorio para la línea {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},El almacén de origen es obligatorio para la línea {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Lista de embalaje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ALQUILERES DE LOCAL
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configuración de pasarela SMS
@@ -1177,10 +1184,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,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
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Línea {0}: La cantidad asignada {1} debe ser menor o igual al importe en comprobante de diario {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Línea {0}: La cantidad asignada {1} debe ser menor o igual al importe en comprobante de diario {2}
 DocType: Item,Inventory,inventario
 DocType: Features Setup,"To enable ""Point of Sale"" view",Para habilitar la vista de 'Punto de Venta'
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
 DocType: Item,Sales Details,Detalles de ventas
 DocType: Opportunity,With Items,Con productos
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En cantidad
@@ -1195,10 +1202,11 @@
 DocType: Cost Center,Parent Cost Center,Centro de costos principal
 DocType: Sales Invoice,Source,Referencia
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,No se encontraron registros en la tabla de pagos
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,No se encontraron registros en la tabla de pagos
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Inicio del ejercicio contable
 DocType: Employee External Work History,Total Experience,Experiencia total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flujo de efectivo de inversión
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,CARGOS DE TRANSITO Y TRANSPORTE
 DocType: Material Request Item,Sales Order No,Orden de venta No.
 DocType: Item Group,Item Group Name,Nombre del grupo de productos
@@ -1206,12 +1214,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferir materiales para producción
 DocType: Pricing Rule,For Price List,Por lista de precios
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Búsqueda de ejecutivos
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","La tarifa de compra para el producto: {0} no se encuentra, este se requiere para reservar la entrada contable (gastos). Por favor, indique el precio del artículo en una 'lista de precios' de compra."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","La tarifa de compra para el producto: {0} no se encuentra, este se requiere para reservar la entrada contable (gastos). Por favor, indique el precio del artículo en una 'lista de precios' de compra."
 DocType: Maintenance Schedule,Schedules,Programas
 DocType: Purchase Invoice Item,Net Amount,Importe Neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Error: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Error: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el plan general de contabilidad."
 DocType: Maintenance Visit,Maintenance Visit,Visita de mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Categoría de cliente> Territorio
@@ -1237,7 +1245,7 @@
 DocType: Sales Partner,Sales Partner Target,Metas de socio de ventas
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},El asiento contable para {0} sólo puede hacerse con la divisa: {1}
 DocType: Pricing Rule,Pricing Rule,Regla de precios
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Requisición de materiales hacia órden de compra
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Requisición de materiales hacia órden de compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Línea # {0}: El artículo devuelto {1} no existe en {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bancos
 ,Bank Reconciliation Statement,Estados de conciliación bancarios
@@ -1245,11 +1253,11 @@
 ,POS,Punto de venta POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Saldo inicial de Stock
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} debe aparecer sólo una vez
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Desde Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,La cantidad a producir es obligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,La cantidad a producir es obligatoria
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Monto no reflejado en banco
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Peticiones para gastos de compañía
@@ -1261,33 +1269,34 @@
 ,Material Requests for which Supplier Quotations are not created,Requisición de materiales sin documento de cotización
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para realizar un seguimiento de elementos mediante código de barras. Usted será capaz de entrar en los elementos de la nota de entrega y la factura de venta mediante el escaneo de código de barras del artículo.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Marcar como Entregado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Marcar como Entregado
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Crear una cotización
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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.
 DocType: SMS Center,Receiver List,Lista de receptores
 DocType: Payment Tool Detail,Payment Amount,Importe pagado
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Monto consumido
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,Ver {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,Ver {0}
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Cambio Neto en Efectivo
 DocType: Salary Structure Deduction,Salary Structure Deduction,Deducciones de la estructura salarial
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de productos entregados
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La cantidad no debe ser más de {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Edad (días)
 DocType: Quotation Item,Quotation Item,Cotización del producto
 DocType: Account,Account Name,Nombre de la Cuenta
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,"Número de serie {0}, la cantidad {1} no puede ser una fracción"
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,El recibo de compra {0} no esta validado
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,El recibo de compra {0} no esta validado
 DocType: Company,Default Payable Account,Cuenta por pagar por defecto
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% Facturado
@@ -1299,15 +1308,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mis asuntos
 DocType: BOM Item,BOM Item,Lista de materiales (LdM) del producto
 DocType: Appraisal,For Employee,Por empleados
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Fila {0}: Avance contra el Proveedor debe debitar
 DocType: Company,Default Values,Valores predeterminados
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Línea {0}: El importe pagado no puede ser negativo
 DocType: Expense Claim,Total Amount Reimbursed,Monto total reembolsado
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra factura de proveedor {0} con fecha{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Contra factura de proveedor {0} con fecha{1}
 DocType: Customer,Default Price List,Lista de precios por defecto
 DocType: Payment Reconciliation,Payments,Pagos.
 DocType: Budget Detail,Budget Allocated,Presupuesto asignado
 DocType: Journal Entry,Entry Type,Tipo de entrada
 ,Customer Credit Balance,Saldo de clientes
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Cambio neto en cuentas por pagar
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Por favor, verifique su Email de identificación"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Se requiere un cliente para el descuento
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
@@ -1328,7 +1339,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Habilitar carrito de compras
 DocType: Employee,Permanent Address,Dirección permanente
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,El producto {0} debe ser un servicio
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",El anticipo pagado para {0} {1} no puede ser mayor que el total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Por favor, seleccione el código del producto"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducir deducción por licencia sin goce de salario (LSS)
@@ -1345,18 +1356,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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,Requisición de materiales usados para crear este movimiento de inventario
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Elemento de producto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',El lote de gestión de tiempos {0} debe estar validado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',El lote de gestión de tiempos {0} debe estar validado
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},El almacén es requerido en la línea # {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},El almacén es requerido en la línea # {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Por favor, introduzca Año válida Financiera fechas inicial y final"
 DocType: Employee,Date Of Retirement,Fecha de jubilación
 DocType: Upload Attendance,Get Template,Obtener plantilla
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Asignación
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Por favor, seleccione primero {0}."
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},texto {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,"Por favor, seleccione primero {0}."
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},texto {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nuevo contacto
 DocType: Territory,Parent Territory,Territorio principal
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
 DocType: Stock Entry,Material Receipt,Recepción de materiales
@@ -1364,7 +1376,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},El tipo de entidad y tercero/s son requeridos para las cuentas de cobrar/pagar {0}
 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 +210,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 +213,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 +85,Warehouse {0} can not be deleted as quantity exists for Item {1},El almacén {0} no se puede eliminar ya que existen elementos: {1}
 DocType: Quotation,Order Type,Tipo de orden
 DocType: Purchase Invoice,Notification Email Address,Email para las notificaciones.
@@ -1381,15 +1393,15 @@
 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: Sales Invoice Item,Batch No,Lote No.
 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"
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de las numeraciones en sus transacciones
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Una orden detenida no puede ser cancelada, debe continuarla antes de cancelar."
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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: Item,Variants,Variantes
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Crear órden de Compra
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Crear órden de Compra
 DocType: SMS Center,Send To,Enviar a.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1402,7 +1414,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Almacén y referencias
 DocType: Supplier,Statutory info and other general information about your Supplier,Información legal u otra información general acerca de su proveedor
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Direcciones
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,A este producto no se le permite tener orden de producción.
@@ -1411,10 +1423,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Importe acreditado con la divisa
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Gestión de tiempos para la producción.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar nivel de reabastecimiento para el almacen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser validada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,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/stock/doctype/purchase_receipt/purchase_receipt.py +102,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/config/projects.py +23,Time Log for tasks.,Gestión de tiempos para las tareas.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pago
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Pago
 DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo actual
 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},Máxima requisición de materiales {0} es posible para el producto {1} en las órdenes de venta {2}
 DocType: Employee,Salutation,Saludo.
@@ -1431,7 +1444,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Asociado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,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
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
 DocType: Packing Slip,To Package No.,Al paquete No.
 DocType: Warranty Claim,Issue Date,Fecha de emisión
 DocType: Activity Cost,Activity Cost,Costo de Actividad
@@ -1469,7 +1481,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcanzado
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Localidad / Cliente
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,por ejemplo 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Línea {0}: la cantidad asignada {1} debe ser menor o igual al importe pendiente de factura {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Línea {0}: la cantidad asignada {1} debe ser menor o igual al importe pendiente de factura {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En palabras serán visibles una vez que guarde la factura de venta.
 DocType: Item,Is Sales Item,Es un producto para venta
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árbol de productos
@@ -1481,7 +1493,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creado
 DocType: Delivery Note Item,Against Sales Order,Contra la orden de venta
 ,Serial No Status,Estado del número serie
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,La tabla de productos no puede estar en blanco
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,La tabla de productos no puede estar en blanco
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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}"
 DocType: Pricing Rule,Selling,Ventas
@@ -1490,7 +1502,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,IMPUESTOS Y ARANCELES
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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} registros de pago no se pueden filtrar 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
@@ -1505,7 +1517,7 @@
 DocType: Installation Note,Installation Time,Tiempo de instalación
 DocType: Sales Invoice,Accounting Details,Detalles de contabilidad
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta compañía
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Línea # {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"
+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,"Línea # {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"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,INVERSIONES
 DocType: Issue,Resolution Details,Detalles de la resolución
 DocType: Quality Inspection Reading,Acceptance Criteria,Criterios de Aceptación
@@ -1521,7 +1533,7 @@
 DocType: Holiday List,Clear Table,Borrar tabla
 DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,Factura No.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Desde órden de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Desde órden de compra
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deja no puede aplicarse / cancelada antes de {0}, como balance de la licencia ya ha sido remitido equipaje en el futuro registro de asignación de permiso {1}"
 DocType: Activity Cost,Costing Rate,Costo calculado
 ,Customer Addresses And Contacts,Direcciones de clientes y contactos
@@ -1538,7 +1550,7 @@
 ,Maintenance Schedules,Programas de mantenimiento
 ,Quotation Trends,Tendencias de cotizaciones
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,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
 ,Pending Amount,Monto pendiente
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversión
@@ -1555,12 +1567,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árbol de cuentas financieras
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Cuenta {0} debe ser de tipo 'Activos Fijos' porque Artículo {1} es un Elemento de Activo Fijo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Cuenta {0} debe ser de tipo 'Activos Fijos' porque Artículo {1} es un Elemento de Activo Fijo
 DocType: HR Settings,HR Settings,Configuración de recursos humanos (RRHH)
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,El reembolso de gastos estará pendiente de aprobación. Sólo el supervisor de gastos puede actualizar el estado.
 DocType: Purchase Invoice,Additional Discount Amount,Monto adicional de descuento
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,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 +225,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Deportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Unidad(es)
@@ -1572,6 +1584,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Reembolsos de gastos
 DocType: Issue,Support,Soporte
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Ver el carro
 ,BOM Search,Buscar listas de materiales (LdM)
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Cierre (Apertura + Totales)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique la divisa en la compañía"
@@ -1583,13 +1596,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},"La fecha de liquidación no puede ser inferior a la fecha de verificación, línea {0}"
 DocType: Salary Slip,Deduction,Deducción
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Artículo Precio agregó para {0} en Precio de lista {1}
 DocType: Address Template,Address Template,Plantillas de direcciones
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% Tareas completadas
 DocType: Project,Gross Margin,Margen bruto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Por favor, ingrese primero el producto a fabricar"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,usuario deshabilitado
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuario deshabilitado
 DocType: Opportunity,Quotation,Cotización
 DocType: Salary Slip,Total Deduction,Deducción Total
 DocType: Quotation,Maintenance User,Mantenimiento por usuario
@@ -1598,7 +1612,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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'. Los asientos contables y otras transacciones importantes se registran aquí.
 DocType: Opportunity,Customer / Lead Address,Dirección de cliente / oportunidad
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
 DocType: Production Order Operation,Actual Operation Time,Tiempo de operación actual
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario)
 DocType: Purchase Taxes and Charges,Deduct,Deducir
@@ -1608,12 +1622,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión."
 DocType: Expense Claim,Approver,Supervisor
 ,SO Qty,Cant. OV
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén {0}, por lo tanto, no se puede re-asignar o modificar el almacén"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén {0}, por lo tanto, no se puede re-asignar o modificar el almacén"
 DocType: Appraisal,Calculate Total Score,Calcular puntaje total
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de producción
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Dividir nota de entrega entre paquetes.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Envíos
+apps/erpnext/erpnext/hooks.py +69,Shipments,Envíos
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregado al cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,La gestión de tiempos debe estar validada.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,El número de serie {0} no pertenece a ningún almacén
@@ -1633,10 +1647,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
 DocType: Currency Exchange,From Currency,Desde moneda
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Orden de venta requerida para el producto {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Orden de venta requerida para el producto {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Monto no reflejado en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Divisa por defecto)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Otros
@@ -1652,7 +1666,7 @@
 DocType: Quality Inspection,In Process,En proceso
 DocType: Authorization Rule,Itemwise Discount,Descuento de producto
 DocType: Purchase Order Item,Reference Document Type,Referencia Tipo de documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} para orden de venta (OV) {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} para orden de venta (OV) {1}
 DocType: Account,Fixed Asset,Activo Fijo
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inventario Serializado
 DocType: Activity Type,Default Billing Rate,Monto de facturación predeterminada
@@ -1662,7 +1676,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Órdenes de venta a pagar
 DocType: Expense Claim Detail,Expense Claim Detail,Detalle de reembolso de gastos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Gestión de tiempos creados:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,"Por favor, seleccione la cuenta correcta"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,"Por favor, seleccione la cuenta correcta"
 DocType: Item,Weight UOM,Unidad de medida (UdM)
 DocType: Employee,Blood Group,Grupo sanguíneo
 DocType: Purchase Invoice Item,Page Break,Salto de página
@@ -1693,10 +1707,10 @@
 DocType: Time Log,To Time,Hasta hora
 DocType: Authorization Rule,Approving Role (above authorized value),Aprobar Rol (por encima del valor autorizado)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Para agregar sub-grupos, examine el árbol y haga clic en el registro donde desea agregar los sub-registros"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,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}
 DocType: Production Order Operation,Completed Qty,Cantidad completada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,La lista de precios {0} está deshabilitada
 DocType: Manufacturing Settings,Allow Overtime,Permitir horas extraordinarias
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Números de serie necesarios para el producto {1}. Usted ha proporcionado {2}.
@@ -1704,8 +1718,9 @@
 DocType: Item,Customer Item Codes,Código del producto asignado por el cliente
 DocType: Opportunity,Lost Reason,Razón de la pérdida
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Crear entradas de pago para las órdenes o facturas.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nueva direccion
 DocType: Quality Inspection,Sample Size,Tamaño de muestra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Todos los artículos que ya se han facturado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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."
 DocType: Project,External,Externo
@@ -1761,13 +1776,14 @@
 DocType: Rename Tool,Rename Tool,Herramienta para renombrar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualizar costos
 DocType: Item Reorder,Item Reorder,Reabastecer producto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transferencia de Material
 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"
 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
 DocType: Installation Note,Installation Note,Nota de instalación
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Agregar impuestos
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Flujo de caja de financiación
 ,Financial Analytics,Análisis financiero
 DocType: Quality Inspection,Verified By,Verificado por
 DocType: Address,Subsidiary,Subsidiaria
@@ -1777,19 +1793,19 @@
 DocType: Process Payroll,Create Salary Slip,Crear nómina salarial
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Importe previsto en banco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Origen de fondos (Pasivo)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la línea {0} ({1}) debe ser la misma que la cantidad producida {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la línea {0} ({1}) debe ser la misma que la cantidad producida {2}
 DocType: Appraisal,Employee,Empleado
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar correo electrónico de:
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Invitar como usuario
 DocType: Features Setup,After Sale Installations,Instalaciones post venta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} está totalmente facturado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} está totalmente facturado
 DocType: Workstation Working Hour,End Time,Hora de finalización
 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 +75,Group by Voucher,Agrupar por recibo
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Solicitado el
 DocType: Sales Invoice,Mass Mailing,Correo masivo
 DocType: Rename Tool,File to Rename,Archivo a renombrar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Se requiere el numero de orden para el producto {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Se requiere el numero de orden para el producto {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagos
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,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
@@ -1799,6 +1815,7 @@
 DocType: Selling Settings,Sales Order Required,Orden de venta requerida
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crear cliente
 DocType: Purchase Invoice,Credit To,Acreditar en
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Leads activos / Clientes
 DocType: Employee Education,Post Graduate,Postgrado
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalles del calendario de mantenimiento
 DocType: Quality Inspection Reading,Reading 9,Lectura 9
@@ -1810,6 +1827,7 @@
 DocType: Warranty Claim,Raised By,Propuesto por
 DocType: Payment Tool,Payment Account,Cuenta de pagos
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Cambio neto en las cuentas por cobrar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
 DocType: Quality Inspection Reading,Accepted,Aceptado
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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, asegúrese que realmente desea borrar todas las transacciones de esta compañía. Sus datos maestros permanecerán intactos. Esta acción no se puede deshacer."
@@ -1817,17 +1835,17 @@
 DocType: Payment Tool,Total Payment Amount,Importe total
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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}
 DocType: Shipping Rule,Shipping Rule Label,Etiqueta de regla de envío
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos del envío de la gota."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos del envío de la gota."
 DocType: Newsletter,Test,Prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Existen transacciones de stock para este producto, \ usted no puede cambiar los valores: 'Posee numero de serie', 'Posee numero de lote', 'Es un producto en stock' y 'Método de valoración'"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Asiento Rápida
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Asiento Rápida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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: 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 +157,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 +211,{0} {1} is not submitted,{0} {1} no ha sido validada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} no ha sido validada
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones
@@ -1840,7 +1858,7 @@
 DocType: Authorization Rule,Authorized Value,Valor Autorizado
 DocType: Contact,Enter department to which this Contact belongs,Introduzca departamento al que pertenece este contacto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Ausente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Artículo o almacén para la línea {0} no coincide con la requisición de materiales
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Artículo o almacén para la línea {0} no coincide con la requisición de materiales
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unidad de Medida (UdM)
 DocType: Fiscal Year,Year End Date,Año de finalización
 DocType: Task Depends On,Task Depends On,Tarea depende de
@@ -1866,7 +1884,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,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: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedores / comisionistas / afiliados / distribuidores que venden productos de empresas a cambio de una comisión.
 DocType: Customer Group,Has Child Node,Posee Sub-grupo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra la orden de compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} contra la orden de compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no se encuentra en el año fiscal activo. Para más detalles verifique {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado automáticamente por ERPNext
@@ -1914,7 +1932,7 @@
  10. Añadir o deducir: Si usted quiere añadir o deducir el impuesto."
 DocType: Purchase Receipt Item,Recd Quantity,Cantidad recibida
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de banco / efectivo
 DocType: Tax Rule,Billing City,Ciudad de facturación
 DocType: Global Defaults,Hide Currency Symbol,Ocultar el símbolo de moneda
@@ -1946,6 +1964,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Servicios públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Mayor
 DocType: Buying Settings,Default Buying Price List,Lista de precios por defecto
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Ningún empleado para los criterios anteriormente seleccionado o nómina ya creado
 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."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tipo de pago
@@ -1981,7 +2000,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte 'tasa de materiales en base de' en la sección de costos
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
 DocType: Item Reorder,Material Request Type,Tipo de requisición
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Línea {0}: El factor de conversión de (UdM) es obligatorio
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Referencia
 DocType: Cost Center,Cost Center,Centro de costos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprobante #
@@ -2004,7 +2023,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todas las direcciones.
 DocType: Company,Stock Settings,Configuración de inventarios
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Nombre del nuevo centro de costos
 DocType: Leave Control Panel,Leave Control Panel,Panel de control de ausencias
@@ -2024,8 +2043,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Detalle de herramienta de pago
 ,Sales Browser,Explorar ventas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: Existe otra {0} # {1} para la entrada de inventario {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: Existe otra {0} # {1} para la entrada de inventario {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),INVERSIONES Y PRESTAMOS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,DEUDORES VARIOS
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
@@ -2044,7 +2063,7 @@
 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.
 DocType: Production Order Operation,Make Time Log,Crear gestión de tiempos
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Por favor ajuste la cantidad de pedido
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Por favor ajuste la cantidad de pedido
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, crear el cliente desde iniciativa {0}"
 DocType: Price List,Applicable for Countries,Aplicable para los Países
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Equipo de computo
@@ -2104,10 +2123,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,No hay observaciones
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,No hay observaciones
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Atrasado
 DocType: Account,Stock Received But Not Billed,Inventario entrante no facturado
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Cuenta raíz debe ser un grupo
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Cuenta raíz debe ser un grupo
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Pago bruto + Montos atrazados + Vacaciones - Total deducciones
 DocType: Monthly Distribution,Distribution Name,Nombre de la distribución
 DocType: Features Setup,Sales and Purchase,Compras y ventas
@@ -2121,6 +2140,7 @@
 DocType: Journal Entry Account,Party Balance,Saldo de tercero/s
 DocType: Sales Invoice Item,Time Log Batch,Lote de gestión de tiempos
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Nómina de creación
 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: Stock Entry,Material Transfer for Manufacture,Trasferencia de material para producción
@@ -2128,9 +2148,9 @@
 DocType: Purchase Invoice,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,El año fiscal {0} no se encuentra.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtener registros relevantes
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Asiento contable de inventario
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Asiento contable de inventario
 DocType: Sales Invoice,Sales Team1,Equipo de ventas 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,El elemento {0} no existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
 DocType: Account,Root Type,Tipo de root
@@ -2139,15 +2159,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Mostrar esta presentación de diapositivas en la parte superior de la página
 DocType: BOM,Item UOM,Unidad de medida (UdM) del producto
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos después del descuento (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},El almacén de destino es obligatorio para la línea {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},El almacén de destino es obligatorio para la línea {0}
 DocType: Quality Inspection,Quality Inspection,Inspección de calidad
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,Account {0} is frozen,La cuenta {0} se encuentra 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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, bebidas y tabaco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivel de inventario mínimo
 DocType: Stock Entry,Subcontract,Sub-contrato
@@ -2185,7 +2205,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspección de calidad de productos entrantes
 DocType: Purchase Order Item,Returned Qty,Cantidad devuelta
 DocType: Employee,Exit,Salir
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,tipo de root es obligatorio
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,tipo de root es obligatorio
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Número de serie {0} creado
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para la comodidad de los clientes , estos códigos se pueden utilizar en formatos impresos como facturas y notas de entrega"
 DocType: Employee,You can enter any date manually,Puede introducir cualquier fecha manualmente
@@ -2193,8 +2213,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Período de prueba
 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 +110,Row {0}: Advance against Customer must be credit,Fila {0}: Avance contra el Cliente debe ser de crédito
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de compra del producto suministrado
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagar
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para fecha y hora
 DocType: SMS Settings,SMS Gateway URL,URL de pasarela SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
@@ -2211,7 +2232,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivel de reabastecimiento
 DocType: Attendance,Attendance Date,Fecha de Asistencia
 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 +110,Account with child nodes cannot be converted to ledger,Una cuenta que tiene sub-grupos no puede convertirse en libro mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Una cuenta que tiene sub-grupos no puede convertirse en libro mayor
 DocType: Address,Preferred Shipping Address,Dirección de envío preferida
 DocType: Purchase Receipt Item,Accepted Warehouse,Almacén Aceptado
 DocType: Bank Reconciliation Detail,Posting Date,Fecha de contabilización
@@ -2229,7 +2250,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,El número de serie {0} no existe
 DocType: Pricing Rule,Discount Percentage,Porcentaje de descuento
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
-apps/erpnext/erpnext/hooks.py +54,Orders,Órdenes
+apps/erpnext/erpnext/hooks.py +55,Orders,Órdenes
 DocType: Leave Control Panel,Employee Type,Tipo de empleado
 DocType: Employee Leave Approver,Leave Approver,Supervisor de ausencias
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para manufacturar
@@ -2241,7 +2262,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% de materiales facturados para esta orden de venta
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Asiento de cierre de período
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,DEPRECIACIONES
+DocType: Account,Depreciation,DEPRECIACIONES
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor(es)
 DocType: Customer,Credit Limit,Límite de crédito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccione el tipo de transacción.
@@ -2266,11 +2287,12 @@
 DocType: Material Request,Requested For,Solicitado por
 DocType: Quotation Item,Against Doctype,Contra 'DocType'
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir este albarán en contra de cualquier proyecto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,La cuenta root no se puede borrar
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Efectivo neto de inversión
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,La cuenta root no se puede borrar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar entradas de stock
 ,Is Primary Address,Es Dirección Primaria
 DocType: Production Order,Work-in-Progress Warehouse,Almacén de trabajos en proceso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referencia # {0} de fecha {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrar direcciones
 DocType: Pricing Rule,Item Code,Código del producto
 DocType: Production Planning Tool,Create Production Orders,Crear órdenes de producción
@@ -2278,7 +2300,7 @@
 DocType: Journal Entry,User Remark,Observaciones
 DocType: Lead,Market Segment,Sector de mercado
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de trabajo del empleado
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Cierre (Deb)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Cierre (Deb)
 DocType: Contact,Passive,Pasivo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,El número de serie {0} no se encuentra en stock
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta
@@ -2294,7 +2316,7 @@
 ,Billed Amount,Importe facturado
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliación bancaria
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtener actualizaciones
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Agregar algunos registros de muestra
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Gestión de ausencias
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupar por cuenta
@@ -2303,14 +2325,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","La cuenta de patrimonio, en la cual serán registradas las perdidas y/o ganancias"
 DocType: Payment Tool,Against Vouchers,Contra comprobantes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ayuda Rápida
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}"
 DocType: Features Setup,Sales Extras,Ventas extras
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},El presupuesto {0} para la cuenta {1} en el centro de costos {2} es mayor por {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
 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'
 ,Stock Projected Qty,Cantidad de inventario proyectado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
 DocType: Sales Order,Customer's Purchase Order,Ordenes de compra de clientes
 DocType: Warranty Claim,From Company,Desde Compañía
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Cantidad
@@ -2320,9 +2342,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Lista de 'bloqueo de vacaciones / permisos' permitida
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Lo utilizará para iniciar sesión
 DocType: Sales Partner,Retailer,Detallista
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,La cuenta de crédito debe pertenecer a las cuentas de balance
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Todos los proveedores
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +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/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},la cotización {0} no es del tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Sales Order,%  Delivered,% Entregado
@@ -2366,7 +2388,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El peso bruto del paquete. Peso + embalaje Normalmente material neto . (para impresión)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con este rol pueden establecer cuentas congeladas y crear / modificar los asientos contables para las mismas
 DocType: Serial No,Is Cancelled,CANCELADO
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mis envíos
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Mis envíos
 DocType: Journal Entry,Bill Date,Fecha de factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Incluso si hay varias reglas de precios con mayor prioridad, se aplican entonces siguientes prioridades internas:"
 DocType: Supplier,Supplier Details,Detalles del proveedor
@@ -2387,10 +2409,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Llamadas
 DocType: Project,Total Costing Amount (via Time Logs),Importe total calculado (a través de la gestión de tiempos)
 DocType: Purchase Order Item Supplied,Stock UOM,Unidad de media utilizada en el almacen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,La orden de compra {0} no se encuentra validada
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,La orden de compra {0} no se encuentra validada
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Proyectado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Número de serie {0} no pertenece al Almacén {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
 DocType: Notification Control,Quotation Message,Mensaje de cotización
 DocType: Issue,Opening Date,Fecha de apertura
 DocType: Journal Entry,Remark,Observación
@@ -2403,9 +2425,9 @@
 DocType: Time Log,Batched for Billing,Lotes para facturar
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Listado de facturas emitidas por los proveedores.
 DocType: POS Profile,Write Off Account,Cuenta de desajuste
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Efectivo neto de las operaciones
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,por ejemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Elemento 4
 DocType: Journal Entry Account,Journal Entry Account,Cuenta de asiento contable
@@ -2446,7 +2468,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,La fecha de jubilación debe ser mayor que la fecha de ingreso
 DocType: Sales Invoice,Against Income Account,Contra cuenta de ingresos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Entregado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Metas de territorios
 DocType: Delivery Note,Transporter Info,Información de Transportista
@@ -2474,10 +2496,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},El número de lote es obligatorio para el producto {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Este es el vendedor principal y no se puede editar.
 ,Stock Ledger,Mayor de Inventarios
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Calificación: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Calificación: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Deducciones en nómina
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Seleccione primero un nodo de grupo
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propósito debe ser uno de {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Propósito debe ser uno de {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Llene el formulario y guárdelo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descargar un informe con todas las materias primas y su inventario actual
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Foro de la comunidad
@@ -2515,7 +2537,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuración general del sistema.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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"
 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/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Si el pago no se hace en con una  referencia, deberá hacer entrada al diario manualmente."
@@ -2532,12 +2554,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Línea {0}: La cantidad no esta disponible en el almacén {1} del {2} {3}. Cantidad disponible: {4}, Transferir Cantidad: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Elemento 3
 DocType: Purchase Order,Customer Contact Email,Correo electrónico de contacto de cliente
 DocType: Sales Team,Contribution (%),Margen (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nombre de vendedor
@@ -2548,20 +2570,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliación
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,Lista de Materiales (LdM) por defecto
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Monto total pendiente
 DocType: Time Log Batch,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Ajustes de impresión
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotores
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Desde nota de entrega
 DocType: Time Log,From Time,Desde hora
 DocType: Notification Control,Custom Message,Mensaje personalizado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Inversión en la banca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,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/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago
 DocType: Purchase Invoice,Price List Exchange Rate,Tipo de cambio para la lista de precios
 DocType: Purchase Invoice Item,Rate,Precio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interno
@@ -2580,9 +2602,10 @@
  conflicto mediante la asignación de prioridad. Reglas de Precio: {0}"
 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 +580,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Distribuir materiales
 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,Citas
 DocType: Hub Settings,Access Token,Token de acceso
 DocType: Sales Invoice Item,Serial No,Número de serie
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Por favor ingrese primero los detalles del mantenimiento
@@ -2596,10 +2619,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Importe Máximo Factura
 DocType: Purchase Invoice Item,Image View,Vista de imagen
 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 +553,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para Variant &#39;{0}&#39; debe ser el mismo que en la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calculo basado en
 DocType: Delivery Note Item,From Warehouse,De Almacén
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y total
@@ -2607,6 +2632,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este producto es una variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que la opción 'No copiar' esté seleccionada
 DocType: Account,Purchase User,Usuario de compras
 DocType: Notification Control,Customize the Notification,Personalizar notificación
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Flujo de caja operativo
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,La plantilla de direcciones por defecto no puede ser eliminada
 DocType: Sales Invoice,Shipping Rule,Regla de envío
 DocType: Journal Entry,Print Heading,Imprimir encabezado
@@ -2617,7 +2643,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Materia prima
 DocType: Leave Application,Follow via Email,Seguir a través de correo electronico
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total impuestos después del descuento
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,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 +335,Please select Posting Date first,"Por favor, seleccione Fecha de contabilización primero"
@@ -2635,6 +2661,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Número de serie requerido para el producto serializado {0}
 DocType: Journal Entry,Bank Entry,Registro de banco
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Puesto)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Añadir a la Cesta
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Habilitar o deshabilitar el tipo de divisas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,GASTOS POSTALES
@@ -2642,29 +2669,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimiento y ocio
 DocType: Purchase Order,The date on which recurring order will be stop,Fecha en que el pedido recurrente es detenido
 DocType: Quality Inspection,Item Serial No,Nº de Serie del producto
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Presente
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",El producto serializado {0} no se puede actualizar / reconciliar stock
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferir material a proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Transferir material a proveedor
 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
 DocType: Lead,Lead Type,Tipo de iniciativa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear cotización
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Usted no está autorizado para aprobar las hojas de bloquear las fechas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Todos estos elementos ya fueron facturados
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Todos estos elementos ya fueron facturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Condiciones de regla envío
 DocType: BOM Replace Tool,The new BOM after replacement,Nueva lista de materiales después de la sustitución
 DocType: Features Setup,Point of Sale,Punto de Venta
 DocType: Account,Tax,Impuesto
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Línea {0}: {1} no es un {2} válido
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,De Bundle Producto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,De Bundle Producto
 DocType: Production Planning Tool,Production Planning Tool,Planificar producción
 DocType: Quality Inspection,Report Date,Fecha del reporte
 DocType: C-Form,Invoices,Facturas
 DocType: Job Opening,Job Title,Título del trabajo
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatarios
 DocType: Features Setup,Item Groups in Details,Detalles de grupos del producto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Iniciar terminal de punto de venta (POS)
@@ -2672,8 +2698,9 @@
 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: Pricing Rule,Customer Group,Categoría de cliente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
 DocType: Item,Website Description,Descripción del sitio web
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Cambio en el Patrimonio Neto
 DocType: Serial No,AMC Expiry Date,Fecha de caducidad de CMA (Contrato de Mantenimiento Anual)
 ,Sales Register,Registro de ventas
 DocType: Quotation,Quotation Lost Reason,Razón de la pérdida
@@ -2681,12 +2708,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hay nada que modificar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resumen para este mes y actividades pendientes
 DocType: Customer Group,Customer Group Name,Nombre de la categoría de cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Atributos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obtener artículos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Obtener artículos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Fecha del último pedido
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Crear una factura de 'impuestos especiales'
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},La cuenta {0} no pertenece a la compañía {1}
@@ -2702,7 +2729,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Los datos del proyecto no están disponibles para la cotización
 DocType: Project,Expected End Date,Fecha prevista de finalización
 DocType: Appraisal Template,Appraisal Template Title,Titulo de la plantilla de evaluación
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,El producto principal {0} no debe ser un artículo de stock
 DocType: Cost Center,Distribution Id,Id de Distribución
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes
@@ -2715,7 +2742,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor del atributo {0} debe estar dentro del rango de {1} a {2} en los incrementos de {3}
 DocType: Tax Rule,Sales,Ventas
 DocType: Stock Entry Detail,Basic Amount,Importe base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},El almacén es requerido para el stock del producto {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,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
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cred
 DocType: Customer,Default Receivable Accounts,Cuentas por cobrar predeterminadas
@@ -2727,16 +2754,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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,Para Factura Fecha
 DocType: Supplier,Contact HTML,HTML de Contacto
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de compra
-DocType: Payment Reconciliation,Maximum Amount,Importe máximo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,¿Cómo se aplica la regla precios?
 DocType: Quality Inspection,Delivery Note No,Nota de entrega No.
 DocType: Company,Retail,Ventas al por menor
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,El cliente {0} no existe
 DocType: Attendance,Absent,Ausente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Conjunto / paquete de productos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Fila {0}: Referencia no válida {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Conjunto / paquete de productos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Fila {0}: Referencia no válida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantilla de impuestos (compras)
 DocType: Upload Attendance,Download Template,Descargar plantilla
 DocType: GL Entry,Remarks,Observaciones
@@ -2763,7 +2790,7 @@
 ,Monthly Attendance Sheet,Hoja de ssistencia mensual
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,No se han encontraron registros
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 'Centro de Costos' es obligatorio para el producto {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Obtener elementos del paquete del producto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Obtener elementos del paquete del producto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Cuenta {0} está inactiva
 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
@@ -2772,8 +2799,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,El tipo de cuenta 'Pérdidas y ganancias' {0} no esta permitida para el asiento de apertura
 DocType: Features Setup,Sales Discounts,Descuentos sobre ventas
 DocType: Hub Settings,Seller Country,País de vendedor
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publicar artículos por página web
 DocType: Authorization Rule,Authorization Rule,Regla de Autorización
 DocType: Sales Invoice,Terms and Conditions Details,Detalle de términos y condiciones
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Especificaciones
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de impuestos (ventas)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de orden
@@ -2795,7 +2824,7 @@
 DocType: Time Log,Billing Amount,Monto de facturación
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,La cantidad especificada es inválida para el elemento {0}. La cantidad debe ser mayor que 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Solicitudes de ausencia.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,GASTOS LEGALES
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","El día del mes en el cual se generará la orden automática por ejemplo 05, 29, etc."
 DocType: Sales Invoice,Posting Time,Hora de contabilización
@@ -2811,11 +2840,11 @@
 DocType: Maintenance Visit,Breakdown,Desglose
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,La cuenta: {0} con la divisa: {1} no se puede seleccionar
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del cheque
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: desde cuenta padre {1} no pertenece a la compañía: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: desde cuenta padre {1} no pertenece a la compañía: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Todas las transacciones relacionadas con esta compañía han sido eliminadas correctamente.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,A la fecha
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} del año {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto inserto tasa Lista de Precios si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importe total pagado
@@ -2827,6 +2856,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/public/js/setup_wizard.js +383,We sell this Item,Vendemos este producto
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ID de Proveedor
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Cantidad debe ser mayor que 0
 DocType: Journal Entry,Cash Entry,Entrada de caja
 DocType: Sales Partner,Contact Desc,Desc. de Contacto
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Tipo de vacaciones como, enfermo, casual, etc."
@@ -2835,7 +2865,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Agregar las lineas para establecer los presupuestos anuales.
 DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
 DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos los Contactos.
 DocType: Newsletter,Test Email Id,Prueba de Email
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abreviatura de la compañia
@@ -2860,7 +2890,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. posiblemente el tipo de cambio no se ha creado para {1} en {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Plantilla de impuestos es obligatorio.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Cuenta {0}: desde cuenta padre {1} no existe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,Cuenta {0}: desde cuenta padre {1} no existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Divisa por defecto)
 DocType: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Dirección de facturación preferida
@@ -2878,8 +2908,8 @@
 ,Item-wise Price List Rate,Detalle del listado de precios
 DocType: Purchase Order Item,Supplier Quotation,Cotización de proveedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,'En palabras' serán visibles una vez que guarde la cotización.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} esta detenido
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} esta detenido
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reglas para añadir los gastos de envío.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Próximos eventos
@@ -2899,24 +2929,24 @@
 DocType: Customer,From Lead,Desde iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Las órdenes publicadas para la producción.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccione el año fiscal...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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 +455,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
 DocType: Hub Settings,Name Token,Nombre de Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Venta estándar
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,Fuera de garantía
 DocType: BOM Replace Tool,Replace,Reemplazar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra factura de ventas {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida (UdM) predeterminada"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} contra factura de ventas {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida (UdM) predeterminada"
 DocType: Purchase Invoice Item,Project Name,Nombre de proyecto
 DocType: Supplier,Mention if non-standard receivable account,Indique si utiliza una cuenta por cobrar distinta a la predeterminada
 DocType: Journal Entry Account,If Income or Expense,Indique si es un ingreso o egreso
 DocType: Features Setup,Item Batch Nos,Números de lote del producto
 DocType: Stock Ledger Entry,Stock Value Difference,Diferencia del valor de inventario
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Recursos Humanos
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Impuestos pagados
 DocType: BOM Item,BOM No,Lista de materiales (LdM) No.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Precio medio variable
 DocType: BOM Replace Tool,The BOM which will be replaced,La lista de materiales que será sustituida
 DocType: Account,Debit,Debe
@@ -2953,7 +2983,7 @@
 DocType: Stock Entry Detail,Additional Cost,Costo adicional
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Fin del ejercicio contable
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"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/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Crear cotización de proveedor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Crear cotización de proveedor
 DocType: Quality Inspection,Incoming,Entrante
 DocType: BOM,Materials Required (Exploded),Materiales necesarios (despiece)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzca la Ganancia por licencia sin goce de salario (LSS)
@@ -2961,7 +2991,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Línea # {0}: Número de serie {1} no coincide con {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional
 DocType: Batch,Batch ID,ID de lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Nota: {0}
 ,Delivery Note Trends,Evolución de las notas de entrega
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumen de la semana.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} debe ser 'un producto para compra' o sub-contratado en la línea {1}
@@ -2976,6 +3006,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Precio promedio de compra
 DocType: Task,Actual Time (in Hours),Tiempo actual (En horas)
 DocType: Employee,History In Company,Historia en la Compañia
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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 Solicitud de material {1} no puede ser superior a la cantidad solicitada {2} de artículo {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Boletín de noticias
 DocType: Address,Shipping,Envío.
 DocType: Stock Ledger Entry,Stock Ledger Entry,Entradas en el mayor de inventarios
@@ -2995,7 +3026,6 @@
 DocType: Purchase Order,End date of current order's period,Fecha de finalización del período de orden actual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Crear una carta de oferta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retornar
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,La unidad de medida (UdM) predeterminada para la variante debe ser la misma que la plantilla
 DocType: Production Order Operation,Production Order Operation,Operación en la orden de producción
 DocType: Pricing Rule,Disable,Desactivar
 DocType: Project Task,Pending Review,Pendiente de revisar
@@ -3003,7 +3033,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID del cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,'hasta hora' debe ser mayor que 'desde hora'
 DocType: Journal Entry Account,Exchange Rate,Tipo de cambio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: La cuenta padre {1} no pertenece a la empresa {2}
 DocType: BOM,Last Purchase Rate,Tasa de cambio de última compra
 DocType: Account,Asset,Activo
@@ -3023,7 +3053,7 @@
 ,Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje
 DocType: Item Variant,Item Variant,Variante del producto
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Establecer esta plantilla de dirección por defecto ya que no existe una predeterminada
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Gestión de calidad
 DocType: Production Planning Tool,Filter based on customer,Filtro basado en cliente
 DocType: Payment Tool Detail,Against Voucher No,Comprobante No.
@@ -3040,6 +3070,7 @@
 DocType: Opportunity,Next Contact,Siguiente contacto
 DocType: Employee,Employment Type,Tipo de empleo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ACTIVOS FIJOS
+,Cash Flow,Flujo de fondos
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Período de aplicación no puede ser a través de dos registros alocation
 DocType: Item Group,Default Expense Account,Cuenta de gastos por defecto
 DocType: Employee,Notice (days),Aviso (días)
@@ -3071,13 +3102,12 @@
 DocType: Production Order,Warehouses,Almacenes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,IMPRESIONES Y PAPELERÍA
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Agrupar por nota
-DocType: Payment Reconciliation,Minimum Amount,Importe mínimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Actualizar mercancía terminada
 DocType: Workstation,per hour,por hora
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Cuenta para el almacén ( Inventario Permanente ) se creará en esta Cuenta.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"El almacén no se puede eliminar, porque existen registros de inventario para el mismo."
 DocType: Company,Distribution,Distribución
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Total Pagado
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Total Pagado
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de proyectos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para el producto: {0} es {1}%
@@ -3101,7 +3131,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Soporte analítico
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Defina la compañía en los almacenes {0}
 DocType: POS Profile,Terms and Conditions,Términos y condiciones
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},La fecha debe estar dentro del año fiscal. Asumiendo a la fecha = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},La fecha debe estar dentro del año fiscal. Asumiendo a la fecha = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede ingresar la altura, el peso, alergias, problemas médicos, etc."
 DocType: Leave Block List,Applies to Company,Se aplica a la empresa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0}
@@ -3115,11 +3145,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Por favor, ingrese los recibos de compra"
 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 +425,Transaction not allowed against stopped Production Order {0},Transacción no permitida contra Orden Producción Detenida {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuración del servidor de correo entrante corporativo de soporte técnico. (ej. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Cantidad faltante
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,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 +577,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
 DocType: Salary Slip,Salary Slip,Nómina salarial
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Hasta la fecha' es requerido
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar etiquetas de embalaje, para los paquetes que serán entregados, usados para notificar el numero, contenido y peso del paquete,"
@@ -3208,7 +3238,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Registros de los empleados.
 DocType: HR Settings,Payroll Settings,Configuración de nómina
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Coincidir las facturas y pagos no vinculados.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Realizar pedido
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Realizar pedido
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,la tabla raíz no puede tener un centro de costes padre / principal
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Seleccione una marca ...
 DocType: Sales Invoice,C-Form Applicable,C -Forma Aplicable
@@ -3223,7 +3253,7 @@
 DocType: Appraisal,Start Date,Fecha de inicio
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Asignar las ausencias para un período.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Haga clic aquí para verificar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como padre / principal.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como padre / principal.
 DocType: Purchase Invoice Item,Price List Rate,Tarifa de la lista de precios
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Mostrar 'En stock' o 'No disponible' basado en el stock disponible del almacén.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Lista de Materiales (LdM)
@@ -3232,17 +3262,17 @@
 DocType: Project,Expected Start Date,Fecha prevista de inicio
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Eliminar el elemento si los cargos no son aplicables al mismo
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg . smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Recibir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Recibir
 DocType: Maintenance Visit,Fully Completed,Terminado completamente
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Completado
 DocType: Employee,Educational Qualification,Formación académica
 DocType: Workstation,Operating Costs,Costos operativos
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de ausencias de empleados
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha sido agregado con éxito a nuestro boletín de noticias
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque la cotización ha sido hecha."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,La orden de producción {0} debe ser validada
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,La orden de producción {0} debe ser validada
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +136,Main Reports,Informes Generales
 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
@@ -3260,7 +3290,7 @@
 DocType: Industry Type,Industry Type,Tipo de industria
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Algo salió mal!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Advertencia: La solicitud de ausencia contiene las siguientes fechas bloqueadas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,La factura {0} ya ha sido validada
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,La factura {0} ya ha sido validada
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fecha de  finalización
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Divisa por defecto)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unidades de la organización (listado de departamentos.
@@ -3279,10 +3309,10 @@
 ,Serial No Service Contract Expiry,Número de serie de expiracion del contrato de servicios
 DocType: Item,Unit of Measure Conversion,Conversión unidad de medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,El empleado no se puede cambiar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,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
 DocType: Naming Series,Help HTML,Ayuda 'HTML'
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nombre de la persona u organización a la que esta dirección pertenece.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Sus proveedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
@@ -3295,35 +3325,35 @@
 DocType: Employee,Date of Issue,Fecha de emisión.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Desde {0} hasta {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunto de Proveedores para el elemento {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Por favor, consulte la opción Multi moneda para permitir cuentas con otra divisa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,"Por favor, consulte la opción Multi moneda para permitir cuentas con otra divisa"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Usted no está autorizado para definir el 'valor congelado'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Usted no está autorizado para definir el 'valor congelado'
 DocType: Payment Reconciliation,Get Unreconciled Entries,Verificar entradas no conciliadas
+DocType: Payment Reconciliation,From Invoice Date,Desde Fecha de la factura
 DocType: Cost Center,Budgets,Presupuestos
-DocType: Employee,Emergency Contact Details,Detalles de contacto de emergencia
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,¿A qué se dedica?
 DocType: Delivery Note,To Warehouse,Para Almacén
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Cuenta {0} se ha introducido más de una vez para el año fiscal {1}
 ,Average Commission Rate,Tasa de comisión promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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/stock/doctype/item/item.py +356,'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/hr/doctype/attendance/attendance.py +34,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: Purchase Taxes and Charges,Account Head,Cuenta matriz
 apps/erpnext/erpnext/config/stock.py +79,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 +111,Electrical,Eléctrico
 DocType: Stock Entry,Total Value Difference (Out - In),Total diferencia  (Salidas - Entradas)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipo de cambio es obligatorio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipo de cambio es obligatorio
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID de usuario no establecido para el empleado {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Desde reclamo de garantía
 DocType: Stock Entry,Default Source Warehouse,Almacén de origen
 DocType: Item,Customer Code,Código de cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Días desde la última orden
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Inventarios
@@ -3336,7 +3366,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Cuenta {0} Clausura tiene que ser de Responsabilidad / Patrimonio
 DocType: Authorization Rule,Based On,Basado en
 DocType: Sales Order Item,Ordered Qty,Cantidad ordenada
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Artículo {0} está deshabilitado
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Artículo {0} está deshabilitado
 DocType: Stock Settings,Stock Frozen Upto,Inventario congelado hasta
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periodo Desde y Período Para fechas obligatorias para los recurrentes {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Actividad del proyecto / tarea.
@@ -3344,7 +3374,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Saldo de perdidas y ganancias (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprobante de costos de destino estimados
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Por favor, configure {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repetir un día al mes
@@ -3374,12 +3404,12 @@
 DocType: Upload Attendance,Upload Attendance,Subir asistencia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Importe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Importe
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Lista de materiales (LdM) reemplazada
 ,Sales Analytics,Análisis de ventas
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,"Por favor, ingrese la divisa por defecto en la compañía principal"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Recordatorios diarios
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflicto de impuestos con {0}
@@ -3405,13 +3435,13 @@
 DocType: Sales Order Item,Produced Quantity,Cantidad producida
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Buscar Sub-ensamblajes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Código del producto requerido en la línea: {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Código del producto requerido en la línea: {0}
 DocType: Sales Partner,Partner Type,Tipo de socio
 DocType: Purchase Taxes and Charges,Actual,Actual
 DocType: Authorization Rule,Customerwise Discount,Descuento de cliente
 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 +263,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha validado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha validado
 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
@@ -3423,15 +3453,15 @@
 DocType: Employee,Applicable Holiday List,Lista de días festivos
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Secuencia actualizada
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,El tipo de reporte es obligatorio
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,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/doctype/purchase_common/purchase_common.py +69,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/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/public/js/setup_wizard.js +101,The First User: You,El primer usuario: Usted
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliado exitosamente
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Reconciliado exitosamente
 DocType: Production Order,Planned End Date,Fecha de finalización planeada
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Dónde se almacenarán los productos
 DocType: Tax Rule,Validity,Validez
@@ -3439,7 +3469,7 @@
 DocType: Attendance,Attendance,Asistencia
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra
 ,Item Prices,Precios de los productos
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,La cantidad en palabras será visible una vez que guarde la orden de compra.
@@ -3448,15 +3478,15 @@
 DocType: Task,Review Date,Fecha de revisión
 DocType: Purchase Invoice,Advance Payments,Pagos adelantados
 DocType: Purchase Taxes and Charges,On Net Total,Sobre el total neto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,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
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,No tiene permiso para utilizar la herramienta de pagos
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Email de notificación' no especificado para %s recurrentes
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Cuenta de redondeo por defecto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,GASTOS DE ADMINISTRACIÓN
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consuloría
 DocType: Customer Group,Parent Customer Group,Categoría principal de cliente
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Cambio
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Cambio
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida.
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","por ejemplo ""Mi Compañia LLC"""
@@ -3466,13 +3496,13 @@
 DocType: Packing Slip,Gross Weight UOM,Peso bruto de la unidad de medida (UdM)
 DocType: Email Digest,Receivables / Payables,Por cobrar / Por pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Cuenta de crédito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Cuenta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Costos de destino estimados
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores en cero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del producto obtenido después de la fabricación / empaquetado desde las cantidades determinadas de materia prima
 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 +562,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
 DocType: Item,Default Warehouse,Almacén por defecto
 DocType: Task,Actual End Date (via Time Logs),Fecha de finalización (gestión de tiempos)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},El presupuesto no se puede asignar contra el grupo de cuentas {0}
@@ -3508,29 +3538,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear las horas adicionales en la estación de trabajo.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ya ha sido validada
 ,Items To Be Requested,Solicitud de Productos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Obtener último precio de compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Monto de facturación basado en el tipo de actividad (por hora)
 DocType: Company,Company Info,Información de la compañía
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Email de la compañía no encontrado, por lo que el correo no ha sido enviado"
 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)
 DocType: Production Planning Tool,Filter based on item,Filtro basado en producto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Cuenta de debito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Cuenta de debito
 DocType: Fiscal Year,Year Start Date,Fecha de inicio
 DocType: Attendance,Employee Name,Nombre de empleado
 DocType: Sales Invoice,Rounded Total (Company Currency),Total redondeado (Divisa por defecto)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'.
 DocType: Purchase Common,Purchase Common,Compra común
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualizar.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permitir a los usuarios crear solicitudes de ausencia en los siguientes días.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Desde oportunidades
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de empleados
 DocType: Sales Invoice,Is POS,Es POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Listado de facturas emitidas a los clientes.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} suscriptores añadidos
 DocType: Maintenance Schedule,Schedule,Programa
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Defina el presupuesto para este centro de costos, puede configurarlo en 'Listado de compañía'"
@@ -3538,7 +3569,7 @@
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Centro de actividades
 DocType: GL Entry,Voucher Type,Tipo de comprobante
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Expense Claim,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
@@ -3552,7 +3583,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entradas en el diario de contabilidad.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Cantidad a partir de Almacén
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Línea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Línea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para crear una cuenta de impuestos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
 DocType: Account,Stock,Almacén
@@ -3563,7 +3594,7 @@
 DocType: Employee,Contract End Date,Fecha de finalización de contrato
 DocType: Sales Order,Track this Sales Order against any Project,Monitorear esta órden de venta sobre cualquier proyecto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Obtener ordenes de venta (pendientes de entrega) basadas en los criterios anteriores
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Desde cotización de proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Desde cotización de proveedor
 DocType: Deduction Type,Deduction Type,Tipo de deducción
 DocType: Attendance,Half Day,Medio Día
 DocType: Pricing Rule,Min Qty,Cantidad mínima
@@ -3571,7 +3602,7 @@
 DocType: GL Entry,Transaction Date,Fecha de transacción
 DocType: Production Plan Item,Planned Qty,Cantidad planificada
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Impuesto Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Por cantidad (cantidad fabricada) es obligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Por cantidad (cantidad fabricada) es obligatoria
 DocType: Stock Entry,Default Target Warehouse,Almacen de destino predeterminado
 DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Divisa por defecto)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Línea {0}: el tipo de entidad es aplicable únicamente contra las cuentas de cobrar/pagar
@@ -3625,9 +3656,9 @@
 DocType: Customer,Commission Rate,Comisión de ventas
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Crear variante
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquear solicitudes de ausencias por departamento.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,El carrito esta vacío.
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,El carrito esta vacío.
 DocType: Production Order,Actual Operating Cost,Costo de operación actual
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Usuario root no se puede editar.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Usuario root no se puede editar.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Monto asignado no puede superar el importe no ajustado
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir producción en días festivos
 DocType: Sales Order,Customer's Purchase Order Date,Fecha de pedido de compra del cliente
@@ -3638,11 +3669,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Diseñador
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantillas de términos y condiciones
 DocType: Serial No,Delivery Details,Detalles de la entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Crear automáticamente una 'requisición de materiales' si la cantidad es inferior a este nivel
 ,Item-wise Purchase Register,Detalle de compras
 DocType: Batch,Expiry Date,Fecha de caducidad
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para establecer el nivel de reabastecimiento, el producto debe ser de 'compra' o un producto para fabricación"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para establecer el nivel de reabastecimiento, el producto debe ser de 'compra' o un producto para fabricación"
 ,Supplier Addresses and Contacts,Libreta de direcciones de proveedores
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Por favor, seleccione primero la categoría"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Listado de todos los proyectos.
@@ -3650,7 +3681,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de crédito
 DocType: Leave Type,Is Carry Forward,Es un traslado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Lista de materiales (LdM)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Línea {0}: el tipo de entidad se requiere para la cuenta por cobrar/pagar {1}
@@ -3658,7 +3689,7 @@
 DocType: Employee,Reason for Leaving,Razones de renuncia
 DocType: Expense Claim Detail,Sanctioned Amount,Monto sancionado
 DocType: GL Entry,Is Opening,De apertura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Línea {0}: La entrada de débito no puede vincularse con {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Cuenta {0} no existe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Línea {0}: La entrada de débito no puede vincularse con {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Cuenta {0} no existe
 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/fa.csv b/erpnext/translations/fa.csv
index 049c6fc..d5c9d02 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,محصولات قابل فروش
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,لطفا ابتدا حزب نوع را انتخاب کنید
 DocType: Item,Customer Items,آیتم های مشتری
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,حساب {0}: حساب مرجع {1} می تواند یک دفتر نمی
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,حساب {0}: حساب مرجع {1} می تواند یک دفتر نمی
 DocType: Item,Publish Item to hub.erpnext.com,مورد انتشار hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,ایمیل اخبار
 DocType: Item,Default Unit of Measure,واحد اندازه گیری پیش فرض
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,مشتریان تماس با
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,از درخواست مواد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,از درخواست مواد
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} درخت
 DocType: Job Applicant,Job Applicant,درخواستگر کار
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,نتایج بیشتری.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. برای حفظ مشتری کد عاقلانه مورد و به آنها جستجو بر اساس استفاده از کد خود را در این گزینه
 DocType: Mode of Payment Account,Mode of Payment Account,نحوه حساب پرداخت
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,نمایش انواع
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,مقدار
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,مقدار
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),وام (بدهی)
 DocType: Employee Education,Year of Passing,سال عبور
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,در انبار
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,بهداشت و درمان
 DocType: Purchase Invoice,Monthly,ماهیانه
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),تاخیر در پرداخت (روز)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,فاکتور
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,فاکتور
 DocType: Maintenance Schedule Item,Periodicity,تناوب
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,آدرس ایمیل
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,سال مالی {0} مورد نیاز است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
 DocType: Company,Abbr,مخفف
 DocType: Appraisal Goal,Score (0-5),امتیاز (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},ردیف {0}: {1} {2} با مطابقت ندارد {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},ردیف {0}: {1} {2} با مطابقت ندارد {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ردیف # {0}:
 DocType: Delivery Note,Vehicle No,خودرو بدون
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,لطفا لیست قیمت را انتخاب کنید
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,لطفا لیست قیمت را انتخاب کنید
 DocType: Production Order Operation,Work In Progress,کار در حال انجام
 DocType: Employee,Holiday List,فهرست تعطیلات
 DocType: Time Log,Time Log,زمان ورود
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,همان شرکت است وارد بیش از یک بار
 DocType: Employee,Married,متاهل
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},برای مجاز نیست {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
 DocType: Payment Reconciliation,Reconcile,وفق دادن
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,خواربار
 DocType: Quality Inspection Reading,Reading 1,خواندن 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,را بانک ورودی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صندوق های بازنشستگی
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,انبار اجباری است اگر نوع حساب انبار است
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,انبار اجباری است اگر نوع حساب انبار است
 DocType: SMS Center,All Sales Person,همه فرد از فروش
 DocType: Lead,Person Name,نام شخص
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",بررسی کنید که تکرار منظور، تیک برای جلوگیری از تکرار و یا قرار دادن پایان مناسب عضویت
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,علاقمند
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,صورت مواد
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,افتتاح
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},از {0} به {1}
+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,ورود افتتاح
 DocType: Stock Entry,Additional Costs,هزینه های اضافی
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,حساب با معامله موجود می تواند به گروه تبدیل نمی کند.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,حساب با معامله موجود می تواند به گروه تبدیل نمی کند.
 DocType: Lead,Product Enquiry,پرس و جو محصولات
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,لطفا ابتدا وارد شرکت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,هدف در
+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 +9,Activity Log:,گزارش فعالیت:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,مورد {0} در سیستم وجود ندارد و یا تمام شده است
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,مورد {0} باید مورد خرید است
 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 +444,Item {0} is not active or end of life has been reached,مورد {0} غیر فعال است و یا پایان زندگی رسیده است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,مورد {0} غیر فعال است و یا پایان زندگی رسیده است
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,به روز خواهد شد پس از فاکتور فروش ارائه شده است.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,تنظیمات برای ماژول HR
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,جزئیات عملیات انجام شده است.
 DocType: Serial No,Maintenance Status,وضعیت نگهداری
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,اقلام و قیمت گذاری
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},از تاریخ باید در سال مالی باشد. با فرض از تاریخ = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},از تاریخ باید در سال مالی باشد. با فرض از تاریخ = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,کارمند برای آنها ایجاد می کنید ارزیابی انتخاب کنید.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},هزینه مرکز {0} به شرکت تعلق ندارد {1}
 DocType: Customer,Individual,فردی
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,نقدی خالص از تامین مالی
 DocType: Lead,Address & Contact,آدرس و تلفن تماس
 DocType: Leave Allocation,Add unused leaves from previous allocations,اضافه کردن برگ های استفاده نشده از تخصیص قبلی
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},بعدی دوره ای {0} خواهد شد در ایجاد {1}
@@ -221,6 +222,7 @@
 ,Contact Name,تماس با نام
 DocType: Production Plan Item,SO Pending Qty,SO در انتظار تعداد
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ایجاد لغزش حقوق و دستمزد برای معیارهای ذکر شده در بالا.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,بدون شرح داده می شود
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,درخواست برای خرید.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,فقط تصویب مرخصی انتخاب می توانید از این مرخصی استفاده کنید
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,تسکین تاریخ باید بیشتر از تاریخ پیوستن شود
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,مشخصات مورد وب سایت
 DocType: Payment Tool,Reference No,مرجع بدون
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,ترک مسدود
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,سالیانه
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,مورد سهام آشتی
 DocType: Stock Entry,Sales Invoice No,فاکتور فروش بدون
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,نوع منبع
 DocType: Item,Publish in Hub,انتشار در توپی
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,مورد {0} لغو شود
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,مورد {0} لغو شود
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,درخواست مواد
 DocType: Bank Reconciliation,Update Clearance Date,به روز رسانی ترخیص کالا از تاریخ
 DocType: Item,Purchase Details,جزئیات خرید
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},مورد {0} در &#39;مواد اولیه عرضه شده جدول در سفارش خرید یافت نشد {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},مورد {0} در &#39;مواد اولیه عرضه شده جدول در سفارش خرید یافت نشد {1}
 DocType: Employee,Relation,ارتباط
 DocType: Shipping Rule,Worldwide Shipping,حمل و نقل در سراسر جهان
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,تایید سفارشات از مشتریان.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,پیشنهادات
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,مجموعه ای مورد بودجه گروه عاقلانه در این سرزمین. شما همچنین می توانید با تنظیم توزیع شامل فصلی.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},لطفا گروه حساب پدر و مادر برای انبار وارد {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},پرداخت در مقابل {0} {1} نمی تواند بیشتر از برجسته مقدار {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,تولید برنامه
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,آخرین
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,حداکثر 5 کاراکتر
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,اولین تصویب مرخصی در لیست خواهد شد به عنوان پیش فرض مرخصی تصویب مجموعه
+apps/erpnext/erpnext/config/desktop.py +73,Learn,فرا گرفتن
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,هزینه فعالیت به ازای هر کارمند
 DocType: Accounts Settings,Settings for Accounts,تنظیمات برای حساب
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,فروش شخص درخت را مدیریت کند.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,چند ارز
 DocType: Payment Reconciliation Invoice,Invoice Type,فاکتور نوع
 DocType: Sales Invoice Item,Delivery Note,رسید
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,راه اندازی مالیات
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,راه اندازی مالیات
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,ورود پرداخت اصلاح شده است پس از آن کشیده شده است. لطفا آن را دوباره بکشید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,خلاصه برای این هفته و فعالیت های انتظار
 DocType: Workstation,Rent Cost,اجاره هزینه
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,لطفا ماه و سال را انتخاب کنید
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",موجود در BOM، تحویل توجه داشته باشید، خرید فاکتور، سفارش تولید، سفارش خرید، رسید خرید، فاکتور فروش، سفارش فروش، انبار ورودی، برنامه زمانی
 DocType: Item Tax,Tax Rate,نرخ مالیات
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,انتخاب مورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,انتخاب مورد
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",مورد: {0} موفق دسته ای و زرنگ، نمی تواند با استفاده از \ سهام آشتی، به جای استفاده از بورس ورود آشتی
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,خرید فاکتور {0} در حال حاضر ارائه
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,خرید فاکتور {0} در حال حاضر ارائه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ردیف # {0}: دسته ای بدون باید همان باشد {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,تبدیل به غیر گروه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,رسید خرید باید ارائه شود
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,پزشکی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,دلیل برای از دست دادن
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,تک
 DocType: Issue,Attachment,دلبستگی
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,بودجه می تواند برای مرکز هزینه گروه تواند تنظیم شود
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,کارشناسی ارشد تعطیلات.
 DocType: Material Request Item,Required Date,تاریخ مورد نیاز
 DocType: Delivery Note,Billing Address,نشانی صورتحساب
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,لطفا کد مورد را وارد کنید.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,لطفا کد مورد را وارد کنید.
 DocType: BOM,Costing,هزینه یابی
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",در صورت انتخاب، میزان مالیات در نظر گرفته خواهد به عنوان در حال حاضر در چاپ نرخ / چاپ مقدار شامل
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,مجموع تعداد
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
 DocType: Shipping Rule,Net Weight,وزن خالص
 DocType: Employee,Emergency Phone,تلفن اضطراری
 ,Serial No Warranty Expiry,سریال بدون گارانتی انقضاء
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,افزایش نمی تواند 0
 DocType: Production Planning Tool,Material Requirement,مورد نیاز مواد
 DocType: Company,Delete Company Transactions,حذف معاملات شرکت
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,مورد {0} است خرید مورد
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,مورد {0} است خرید مورد
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} آدرس ایمیل نامعتبر در &#39;هشدار از طریق \ آدرس ایمیل&#39; است
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,حسابداری مجموع این سال:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,افزودن / ویرایش مالیات ها و هزینه ها
 DocType: Purchase Invoice,Supplier Invoice No,تامین کننده فاکتور بدون
 DocType: Territory,For reference,برای مرجع
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",نمی توانید حذف سریال نه {0}، آن را به عنوان در معاملات سهام مورد استفاده
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),بسته شدن (کروم)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),بسته شدن (کروم)
 DocType: Serial No,Warranty Period (Days),دوره گارانتی (روز)
 DocType: Installation Note Item,Installation Note Item,نصب و راه اندازی توجه داشته باشید مورد
 ,Pending Qty,انتظار تعداد
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",** توزیع ماهانه ** شما کمک می کند بودجه خود را توزیع در سراسر ماه اگر شما فصلی در کسب و کار شما. برای توزیع بودجه با استفاده از این توزیع، تنظیم این توزیع ماهانه ** ** ** در مرکز هزینه **
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,هیچ ثبتی یافت نشد در جدول فاکتور
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,هیچ ثبتی یافت نشد در جدول فاکتور
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,لطفا ابتدا شرکت و حزب نوع را انتخاب کنید
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,مالی سال / حسابداری.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",با عرض پوزش، سریال شماره نمی تواند با هم ادغام شدند
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,وظیفه پروژه
 ,Lead Id,کد شناسایی راهبر
 DocType: C-Form Invoice Detail,Grand Total,بزرگ ها
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,سال مالی تاریخ شروع نباید بیشتر از سال مالی پایان تاریخ
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,سال مالی تاریخ شروع نباید بیشتر از سال مالی پایان تاریخ
 DocType: Warranty Claim,Resolution,حل
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},تحویل: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},تحویل: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,قابل پرداخت حساب
 DocType: Sales Order,Billing and Delivery Status,صدور صورت حساب و وضعیت تحویل
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,مشتریان تکرار
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,نقل قول برای
 DocType: Lead,Middle Income,با درآمد متوسط
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),افتتاح (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,مقدار اختصاص داده شده نمی تونه منفی
 DocType: Purchase Order Item,Billed Amt,صورتحساب AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,انبار منطقی که در برابر نوشته های سهام ساخته شده است.
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,سفارش تولید الزامی است
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,نوشتن طرح های پیشنهادی
 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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},خطا بورس منفی ({6}) برای مورد {0} در انبار {1} در {2} {3} در {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},خطا بورس منفی ({6}) برای مورد {0} در انبار {1} در {2} {3} در {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,شرکت سال مالی
 DocType: Packing Slip Item,DN Detail,جزئیات DN
 DocType: Time Log,Billed,فاکتور شده
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,به طور پیش فرض هزینه یابی نرخ
 DocType: Maintenance Schedule,Maintenance Schedule,برنامه نگهداری و تعمیرات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",مشاهده قوانین سپس قیمت گذاری بر اساس مشتری، مشتری گروه، منطقه، تامین کننده، تامین کننده نوع، کمپین، فروش شریک و غیره فیلتر
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,تغییر خالص در پرسشنامه
 DocType: Employee,Passport Number,شماره پاسپورت
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,مدیر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,از رسید خرید
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,قلم دوم از اقلام مشابه وارد شده است چندین بار.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,از رسید خرید
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,قلم دوم از اقلام مشابه وارد شده است چندین بار.
 DocType: SMS Settings,Receiver Parameter,گیرنده پارامتر
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""بر اساس"" و ""گروه شده توسط"" نمی توانند همسان باشند"
 DocType: Sales Person,Sales Person Targets,اهداف فرد از فروش
 DocType: Production Order Operation,In minutes,در دقیقهی
 DocType: Issue,Resolution Date,قطعنامه عضویت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
 DocType: Selling Settings,Customer Naming By,نامگذاری مشتری توسط
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,تبدیل به گروه
 DocType: Activity Cost,Activity Type,نوع فعالیت
@@ -534,7 +538,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} در فاکتور جزییات جدول یافت نشد
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات مشاهده {0} باید قبل از لغو این سفارش فروش لغو
 DocType: Material Request,Material Transfer,انتقال مواد
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,بازار یابی
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,برای پیگیری آیتم در فروش و خرید اسناد بر اساس NOS سریال خود را. این هم می تواند برای پیگیری جزئیات ضمانت محصول استفاده می شود.
 DocType: Purchase Receipt Item Supplied,Current Stock,سهام کنونی
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,انبار را رد کرد مقابل آیتم regected الزامی است
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,صدور صورت حساب کل این سال
 DocType: Account,Expenses Included In Valuation,هزینه های موجود در ارزش گذاری
 DocType: Employee,Provide email id registered in company,ارائه ایمیل شناسه ثبت شده در شرکت
 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 +533,Item has variants.,فقره انواع.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,نوع درخت
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0} است مورد سهام نمی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} است مورد سهام نمی
 DocType: Mode of Payment Account,Default Account,به طور پیش فرض حساب
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,سرب باید مجموعه اگر فرصت است از سرب ساخته شده
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,لطفا روز مرخصی در هفته را انتخاب کنید
 DocType: Production Order Operation,Planned End Time,برنامه ریزی زمان پایان
 ,Sales Person Target Variance Item Group-Wise,فرد از فروش مورد هدف واریانس گروه حکیم
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,حساب با معامله های موجود را نمی توان تبدیل به لجر
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,حساب با معامله های موجود را نمی توان تبدیل به لجر
 DocType: Delivery Note,Customer's Purchase Order No,مشتری سفارش خرید بدون
 DocType: Employee,Cell Number,شماره همراه
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,درخواست مواد تولید خودکار
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,از دست رفته
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,شما می توانید کوپن در حال حاضر در &quot;علیه مجله ورودی&quot; ستون وارد کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"شما نمی توانید سند هزینه جاری را  در ستون""علیه مجله "" وارد کنید"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,انرژی
 DocType: Opportunity,Opportunity From,فرصت از
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,بیانیه حقوق ماهانه.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: از {0} از نوع {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ردیف {0}: عامل تبدیل الزامی است
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,مطالب حسابداری می تواند در مقابل برگ ساخته شده است. مطالب در برابر گروه امکان پذیر نیست.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
 DocType: Opportunity,Maintenance,نگهداری
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},تعداد رسید خرید مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},تعداد رسید خرید مورد نیاز برای مورد {0}
 DocType: Item Attribute Value,Item Attribute Value,مورد موجودیت مقدار
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,کمپین فروش.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,لیست قیمت انتخاب نشده
 DocType: Employee,Family Background,سابقه خانواده
 DocType: Process Payroll,Send Email,ارسال ایمیل
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,بدون اجازه
 DocType: Company,Default Bank Account,به طور پیش فرض حساب بانکی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",برای فیلتر کردن بر اساس حزب، حزب انتخاب نوع اول
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,شماره
 DocType: Item,Items with higher weightage will be shown higher,پاسخ همراه با بین وزنها بالاتر خواهد بود بالاتر نشان داده شده است
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,جزئیات مغایرت گیری بانک
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,فاکتورها من
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,فاکتورها من
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,بدون کارمند یافت
 DocType: Purchase Order,Stopped,متوقف
 DocType: Item,If subcontracted to a vendor,اگر به یک فروشنده واگذار شده
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,در حال حاضر ارسال
 ,Support Analytics,تجزیه و تحلیل ترافیک پشتیبانی
 DocType: Item,Website Warehouse,انبار وب سایت
+DocType: Payment Reconciliation,Minimum Invoice Amount,حداقل مبلغ فاکتور
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",روز از ماه که در آن خودکار صورتحساب خواهد شد به عنوان مثال 05، 28 و غیره تولید
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,امتیاز باید کمتر از یا برابر با 5 است
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,سوابق C-فرم
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",برای فعال کردن &quot;نقطه ای از فروش&quot; ویژگی های
 DocType: Bin,Moving Average Rate,میانگین متحرک نرخ
 DocType: Production Planning Tool,Select Items,انتخاب آیتم ها
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} در صورت حساب {1} تاریخ گذاری شده است به {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} در صورت حساب {1} تاریخ گذاری شده است به {2}
 DocType: Maintenance Visit,Completion Status,وضعیت تکمیل
 DocType: Sales Invoice Item,Target Warehouse,هدف انبار
 DocType: Item,Allow over delivery or receipt upto this percent,اجازه می دهد بیش از تحویل یا دریافت تا این درصد
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,به طور خودکار نگارش پیام در ارائه معاملات.
 DocType: Production Order,Item To Manufacture,آیتم را ساخت
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} وضعیت {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,سفارش خرید به پرداخت
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,سفارش خرید به پرداخت
 DocType: Sales Order Item,Projected Qty,پیش بینی تعداد
 DocType: Sales Invoice,Payment Due Date,پرداخت با توجه تاریخ
 DocType: Newsletter,Newsletter Manager,مدیر خبرنامه
@@ -704,7 +709,7 @@
 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 +304,Point-of-Sale,نقطه از فروش
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",مانده حساب در حال حاضر در اعتبار، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید&quot; را بعنوان &quot;اعتباری&quot;
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",مانده حساب در حال حاضر در اعتبار، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید&quot; را بعنوان &quot;اعتباری&quot;
 DocType: Account,Balance must be,موجودی باید
 DocType: Hub Settings,Publish Pricing,قیمت گذاری انتشار
 DocType: Notification Control,Expense Claim Rejected Message,پیام ادعای هزینه رد
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,نرخ ارز نرخ ارز استاد.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} باید فعال باشد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} باید فعال باشد
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,لطفا ابتدا نوع سند را انتخاب کنید
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,لغو مواد بازدید {0} قبل از لغو این نگهداری سایت
 DocType: Salary Slip,Leave Encashment Amount,ترک Encashment مقدار
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,به طور پیش فرض حسابهای پرداختنی
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,کارمند {0} غیر فعال است و یا وجود ندارد
 DocType: Features Setup,Item Barcode,بارکد مورد
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,مورد انواع {0} به روز شده
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,مورد انواع {0} به روز شده
 DocType: Quality Inspection Reading,Reading 6,خواندن 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,خرید فاکتور پیشرفته
 DocType: Address,Shop,فروشگاه
 DocType: Hub Settings,Sync Now,همگام سازی در حال حاضر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},ردیف {0}: ورود اعتباری را نمی توان با مرتبط {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},ردیف {0}: ورود اعتباری را نمی توان با مرتبط {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,به طور پیش فرض حساب بانک / نقدی به طور خودکار در POS فاکتور به روز شده در زمانی که این حالت انتخاب شده است.
 DocType: Employee,Permanent Address Is,آدرس دائمی است
 DocType: Production Order Operation,Operation completed for how many finished goods?,عملیات برای چند کالا به پایان رسید به پایان؟
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,نام تجاری
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,کمک هزینه برای بیش از {0} عبور برای مورد {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,کمک هزینه برای بیش از {0} عبور برای مورد {1}.
 DocType: Employee,Exit Interview Details,جزییات خروج مصاحبه
 DocType: Item,Is Purchase Item,آیا مورد خرید
 DocType: Journal Entry Account,Purchase Invoice,خرید فاکتور
@@ -766,8 +771,8 @@
 DocType: Payment Tool,Paid,پرداخت
 DocType: Salary Slip,Total in words,مجموع در کلمات
 DocType: Material Request Item,Lead Time Date,سرب زمان عضویت
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,الزامی است. شاید رکورد ارز برای ایجاد نشده است
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},ردیف # {0}: لطفا سریال مشخص نیست برای مورد {1}
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,شاید ثبت صرافی ایجاد نشده است.الزامی است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},ردیف # {0}: لطفا سریال مشخص نیست برای مورد {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.",برای آیتم های &#39;محصولات بسته نرم افزاری، انبار، سریال و بدون دسته بدون خواهد شد از&#39; بسته بندی فهرست جدول در نظر گرفته. اگر انبار و دسته ای بدون برای همه آیتم ها بسته بندی مورد هر &#39;محصولات بسته نرم افزاری &quot;هستند، این ارزش ها را می توان در جدول آیتم های اصلی وارد شده، ارزش خواهد شد کپی شده به&#39; بسته بندی فهرست جدول.
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,محموله به مشتریان.
 DocType: Purchase Invoice Item,Purchase Order Item,خرید سفارش مورد
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,واریانس
 ,Company Name,نام شرکت
 DocType: SMS Center,Total Message(s),پیام ها (بازدید کنندگان)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,انتخاب مورد انتقال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,انتخاب سر حساب بانکی است که چک نهشته شده است.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,کاربر مجاز به ویرایش لیست قیمت نرخ در معاملات
 DocType: Pricing Rule,Max Qty,حداکثر تعداد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,شیمیایی
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,همه موارد قبلا برای این سفارش تولید منتقل می شود.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,همه موارد قبلا برای این سفارش تولید منتقل می شود.
 DocType: Process Payroll,Select Payroll Year and Month,انتخاب سال و ماه حقوق و دستمزد
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",برو به گروه مناسب (معمولا استفاده از وجوه&gt; دارایی های نقد&gt; حساب های بانکی و ایجاد یک حساب جدید (با کلیک بر روی اضافه کردن کودکان) از نوع &quot;بانک&quot;
 DocType: Workstation,Electricity Cost,هزینه برق
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),همه سرب (باز)
 DocType: Purchase Invoice,Get Advances Paid,دریافت پیشرفت پرداخت
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,ضمیمه تصویر شما
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,ساخت
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,ساخت
 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 +3,My Cart,سبد من
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,سبد من
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,باز کردن تعداد
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,نقد / حساب بانکی
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
 DocType: Delivery Note,Delivery To,تحویل به
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,جدول ویژگی الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,جدول ویژگی الزامی است
 DocType: Production Planning Tool,Get Sales Orders,دریافت سفارشات فروش
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} نمی تواند منفی باشد
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,تخفیف
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,تخفیف
 DocType: Features Setup,Purchase Discounts,تخفیف خرید
 DocType: Workstation,Wages,مزد
 DocType: Time Log,Will be updated only if Time Log is 'Billable',به روز خواهد شد تنها اگر زمان ورود &quot;قابل پرداخت است
@@ -835,7 +841,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,انبار محفوظ در سفارش فروش / به پایان رسید کالا انبار
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,فروش مقدار
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,زمان ثبت
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,شما تصویب‌کننده هزینه برای این رکورد هستید. لطفاٌ 'وضعیت' را روزآمد و سپس ذخیره نمایید
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,شما تصویب‌کننده هزینه برای این پرونده هستید. لطفاٌ 'وضعیت' را بروزرسانی و سپس ذخیره نمایید
 DocType: Serial No,Creation Document No,ایجاد سند بدون
 DocType: Issue,Issue,موضوع
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,حساب با شرکت مطابقت ندارد
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,حمل و نقل دولت
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,مورد باید با استفاده از &#39;گرفتن اقلام از خرید رسید&#39; را فشار دهید اضافه شود
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,هزینه فروش
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,خرید استاندارد
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,خرید استاندارد
 DocType: GL Entry,Against,در برابر
 DocType: Item,Default Selling Cost Center,به طور پیش فرض مرکز فروش هزینه
 DocType: Sales Partner,Implementation Partner,شریک اجرای
@@ -867,7 +873,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},به {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,به روز شده از طریق زمان گزارش ها
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,میانگین سن
-DocType: Opportunity,Your sales person who will contact the customer in future,فرد از فروش خود را خواهد کرد که مشتری در آینده تماس
+DocType: Opportunity,Your sales person who will contact the customer in future,فروشنده شما در اینده تماسی با مشتری خواهد داشت
 apps/erpnext/erpnext/public/js/setup_wizard.js +344,List a few of your suppliers. They could be organizations or individuals.,لیست چند از تامین کنندگان خود را. آنها می تواند سازمان ها یا افراد.
 DocType: Company,Default Currency,به طور پیش فرض ارز
 DocType: Contact,Enter designation of this Contact,تعیین این تماس را وارد کنید
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,توزیع کننده
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,سبد خرید قانون حمل و نقل
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,سفارش تولید {0} باید قبل از لغو این سفارش فروش لغو
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',لطفا &#39;درخواست تخفیف اضافی بر روی&#39;
 ,Ordered Items To Be Billed,آیتم ها دستور داد تا صورتحساب
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,از محدوده است که به کمتر از به محدوده
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,زمان ثبت را انتخاب کرده و ثبت برای ایجاد یک فاکتور فروش جدید.
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,این زمان ورود دسته ای است صورتحساب شده است.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,ایجاد فرصت
 DocType: Salary Slip,Leave Without Pay,ترک کنی بدون اینکه پرداخت
-DocType: Supplier,Communications,ارتباطات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,ظرفیت خطا برنامه ریزی
 ,Trial Balance for Party,تعادل دادگاه برای حزب
 DocType: Lead,Consultant,مشاور
 DocType: Salary Slip,Earnings,درامد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,مورد به پایان رسید {0} باید برای ورود نوع ساخت وارد
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,باز کردن تعادل حسابداری
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,مورد به پایان رسید {0} باید برای ورود نوع ساخت وارد
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,باز کردن تعادل حسابداری
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاکتور فروش پیشرفته
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,هیچ چیز برای درخواست
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','تاریخ شروع واقعی' نمی تواند دیرتر از 'تاریخ پایان واقعی' باشد
@@ -927,7 +933,7 @@
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,پایگاه داده تامین کننده.
 DocType: Account,Balance Sheet,ترازنامه
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
-DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,فرد از فروش شما یادآوری در این تاریخ دریافت برای تماس با مشتری
+DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,فروشنده شما در این تاریخ برای تماس با مشتری یاداوری خواهد داشت
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,"Further accounts can be made under Groups, but entries can be made against non-Groups",حساب های بیشتر می تواند در زیر گروه ساخته شده، اما مطالب را می توان در برابر غیر گروه ساخته شده
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,مالیاتی و دیگر کسورات حقوق و دستمزد.
 DocType: Lead,Lead,راهبر
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,سال مالی جاری
 DocType: Global Defaults,Disable Rounded Total,غیر فعال کردن گرد مجموع
 DocType: Lead,Call,دعوت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;مطالب&#39; نمی تواند خالی باشد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&#39;مطالب&#39; نمی تواند خالی باشد
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},تکراری ردیف {0} را با همان {1}
 ,Trial Balance,آزمایش تعادل
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,راه اندازی کارکنان
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,ID کاربر
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,مشخصات لجر
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیمیترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
 DocType: Production Order,Manufacture against Sales Order,ساخت در برابر سفارش فروش
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,بقیه دنیا
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,پرداخت ناخالص
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},مجاز به ویرایش منجمد حساب {0}
 DocType: Journal Entry,Get Outstanding Invoices,دریافت فاکتورها برجسته
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,محل صدور
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,قرارداد
 DocType: Email Digest,Add Quote,اضافه کردن نقل قول
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM مورد نیاز برای UOM: {0} در مورد: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM مورد نیاز برای UOM: {0} در مورد: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,هزینه های غیر مستقیم
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ردیف {0}: تعداد الزامی است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,کشاورزی
-apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,محصولات و یا خدمات شما
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,محصولات  یا خدمات شما
 DocType: Mode of Payment,Mode of Payment,نحوه پرداخت
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,این یک گروه مورد ریشه است و نمی تواند ویرایش شود.
 DocType: Journal Entry Account,Purchase Order,سفارش خرید
 DocType: Warehouse,Warehouse Contact Info,انبار اطلاعات تماس
@@ -1018,8 +1024,8 @@
 DocType: Email Digest,Annual Income,درآمد سالانه
 DocType: Serial No,Serial No Details,سریال جزئیات
 DocType: Purchase Invoice Item,Item Tax Rate,مورد نرخ مالیات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,مورد {0} باید مورد-فرعی قرارداد است
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,تجهیزات سرمایه
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قانون قیمت گذاری شده است برای اولین بار بر اساس انتخاب &#39;درخواست در&#39; درست است که می تواند مورد، مورد گروه و یا تجاری.
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,هدف
 DocType: Sales Invoice Item,Edit Description,ویرایش توضیحات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,انتظار می رود تاریخ تحویل کمتر از برنامه ریزی شده تاریخ شروع است.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,منبع
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,منبع
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,تنظیم نوع حساب کمک می کند تا در انتخاب این حساب در معاملات.
 DocType: Purchase Invoice,Grand Total (Company Currency),جمع کل (شرکت ارز)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,خروجی ها
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,ورودی دفتر
 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 +427,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,این تعداد از آخرین معامله ایجاد شده با این پیشوند است
@@ -1057,7 +1063,7 @@
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,لطفا یک شرکت را انتخاب کنید
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,امتیاز مرخصی
 DocType: Purchase Invoice,Supplier Invoice Date,تامین کننده فاکتور عضویت
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,شما نیاز به فعال کردن سبد خرید
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,شما نیاز به فعال کردن سبد خرید هستید
 DocType: Appraisal Template Goal,Appraisal Template Goal,هدف ارزیابی الگو
 DocType: Salary Slip,Earning,سود
 DocType: Payment Tool,Party Account Currency,حزب حساب ارز
@@ -1069,12 +1075,12 @@
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,مجموع ارزش ترتیب
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,غذا
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,محدوده سالمندی 3
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,شما می توانید ورود به سیستم زمان تنها در برابر یک سفارش تولید ارائه را
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,شما میتوانید زمان ورود به سیستم را تنها در برابر سفارش ارایه شده تولید ایحاد کنید
 DocType: Maintenance Schedule Item,No of Visits,تعداد بازدید ها
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",خبرنامه به مخاطبین، منجر می شود.
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,عملیات نمی تواند خالی باشد.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,عملیات نمی تواند خالی باشد.
 ,Delivered Items To Be Billed,آیتم ها تحویل داده شده به صورتحساب می شود
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,انبار می توانید برای شماره سریال نمی تواند تغییر
 DocType: Authorization Rule,Average Discount,میانگین تخفیف
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},از {0} | {1} {2}
 DocType: BOM Operation,Operation Description,عملیات توضیحات
 DocType: Item,Will also apply to variants,همچنین به انواع اعمال می شود
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,آیا می توانم مالی سال تاریخ شروع و تاریخ پایان سال مالی تغییر نه یک بار سال مالی ذخیره شده است.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,آیا می توانم مالی سال تاریخ شروع و تاریخ پایان سال مالی تغییر نه یک بار سال مالی ذخیره شده است.
 DocType: Quotation,Shopping Cart,سبد خرید
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,الان متوسط روزانه خروجی
 DocType: Pricing Rule,Campaign,کمپین
@@ -1100,7 +1106,8 @@
 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 +211,Stock Entries already created for Production Order ,مطالب سهام در حال حاضر برای سفارش تولید ایجاد
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,مطالب سهام در حال حاضر برای سفارش تولید ایجاد
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,تغییر خالص دارائی های ثابت در
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالی بگذارید اگر برای همه در نظر گرفته نامگذاریهای
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,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 +182,Max: {0},حداکثر: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ساختار حسابها
 DocType: Material Request,Terms and Conditions Content,شرایط و ضوابط محتوا
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
 DocType: Maintenance Visit,Unscheduled,برنامه ریزی
 DocType: Employee,Owned,متعلق به
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,بستگی به مرخصی بدون حقوق
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,مجامع زیر
 DocType: Shipping Rule Condition,To Value,به ارزش
 DocType: Supplier,Stock Manager,سهام مدیر
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},انبار منبع برای ردیف الزامی است {0}
+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 +581,Packing Slip,بسته بندی لغزش
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,دفتر اجاره
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,تنظیمات دروازه راه اندازی SMS
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,بدون آدرس اضافه نشده است.
 DocType: Workstation Working Hour,Workstation Working Hour,ایستگاه های کاری کار یک ساعت
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,روانکاو
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از برابر می شود و یا به مقدار JV {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از برابر می شود و یا به مقدار JV {2}
 DocType: Item,Inventory,فهرست
 DocType: Features Setup,"To enable ""Point of Sale"" view",برای فعال کردن &quot;نقطه ای از فروش&quot; مشاهده
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,پرداخت می توانید برای سبد خرید خالی نمی شود ساخته شده
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,پرداخت می توانید برای سبد خرید خالی نمی شود ساخته شده
 DocType: Item,Sales Details,جزییات فروش
 DocType: Opportunity,With Items,با اقلام
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,در تعداد
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,مرکز هزینه پدر و مادر
 DocType: Sales Invoice,Source,منبع
 DocType: Leave Type,Is Leave Without Pay,آیا ترک کنی بدون اینکه پرداخت
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,هیچ ثبتی یافت نشد در جدول پرداخت
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,هیچ ثبتی یافت نشد در جدول پرداخت
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,مالی سال تاریخ شروع
 DocType: Employee External Work History,Total Experience,تجربه ها
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,بسته بندی لغزش (بازدید کنندگان) لغو
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,بسته بندی لغزش (بازدید کنندگان) لغو
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,جریان وجوه نقد از سرمایه گذاری
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,حمل و نقل و حمل و نقل اتهامات
 DocType: Material Request Item,Sales Order No,سفارش فروش بدون
 DocType: Item Group,Item Group Name,مورد نام گروه
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,انتقال مواد برای تولید
 DocType: Pricing Rule,For Price List,برای اطلاع از قیمت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,اجرایی جستجو
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",نرخ خرید برای آیتم: {0} یافت نشد، که لازم است به کتاب ثبت حسابداری (هزینه). لطفا قیمت مورد را با لیست قیمت خرید ذکر است.
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",نرخ خرید برای آیتم: {0} یافت نشد، که لازم است به کتاب ثبت حسابداری (هزینه). لطفا قیمت مورد را با لیست قیمت خرید ذکر است.
 DocType: Maintenance Schedule,Schedules,برنامه
 DocType: Purchase Invoice Item,Net Amount,مقدار خالص
 DocType: Purchase Order Item Supplied,BOM Detail No,جزئیات BOM بدون
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),تخفیف اضافی مبلغ (ارز شرکت)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},خطا: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},خطا: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,لطفا حساب جدید را از نمودار از حساب ایجاد کنید.
 DocType: Maintenance Visit,Maintenance Visit,نگهداری و تعمیرات مشاهده
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,مشتری&gt; مشتری گروه&gt; منطقه
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,فروش شریک هدف
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},ثبت حسابداری برای {0} تنها می تواند در ارز ساخته شده است: {1}
 DocType: Pricing Rule,Pricing Rule,قانون قیمت گذاری
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,درخواست مواد به خرید سفارش
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,درخواست مواد به خرید سفارش
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},ردیف # {0}: برگشتی مورد {1} در وجود دارد نمی {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,حساب های بانکی
 ,Bank Reconciliation Statement,صورتحساب مغایرت گیری بانک
@@ -1225,11 +1233,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,باز کردن تعادل سهام
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} باید تنها یک بار به نظر می رسد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},مجاز به tranfer تر {0} از {1} در برابر سفارش خرید {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},برگ با موفقیت برای اختصاص {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,هیچ آیتمی برای بسته
 DocType: Shipping Rule Condition,From Value,از ارزش
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,ساخت تعداد الزامی است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,ساخت تعداد الزامی است
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,مقدار به بانک منعکس نشده است
 DocType: Quality Inspection Reading,Reading 4,خواندن 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ادعای هزینه شرکت.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,درخواست مواد که نقل قول تامین کننده ایجاد نمی
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,روز (بازدید کنندگان) که در آن شما برای مرخصی استفاده از تعطیلات. شما نیاز به درخواست برای ترک نمی کند.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,برای پیگیری موارد با استفاده از بارکد. شما قادر به ورود به اقلام در توجه داشته باشید تحویل و فاکتور فروش توسط اسکن بارکد مورد خواهد بود.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,علامت گذاری به عنوان تحویل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,علامت گذاری به عنوان تحویل
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,را نقل قول
 DocType: Dependent Task,Dependent Task,وظیفه وابسته
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,توقف تولد یادآوری
 DocType: SMS Center,Receiver List,فهرست گیرنده
 DocType: Payment Tool Detail,Payment Amount,مبلغ پرداختی
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,مقدار مصرف
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} نمایش
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} نمایش
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,تغییر خالص در نقدی
 DocType: Salary Structure Deduction,Salary Structure Deduction,کسر ساختار حقوق و دستمزد
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {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 +185,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),سن (روز)
 DocType: Quotation Item,Quotation Item,مورد نقل قول
 DocType: Account,Account Name,نام حساب
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,از تاریخ نمی تواند بیشتر از به روز
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,از تاریخ نمی تواند بیشتر از به روز
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,سریال بدون {0} مقدار {1} می تواند یک بخش نمی
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,نوع منبع کارشناسی ارشد.
 DocType: Purchase Order Item,Supplier Part Number,تامین کننده شماره قسمت
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,نرخ تبدیل نمی تواند 0 یا 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,نرخ تبدیل نمی تواند 0 یا 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,رسید خرید {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,رسید خرید {0} است ارسال نشده
 DocType: Company,Default Payable Account,به طور پیش فرض پرداختنی حساب
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",تنظیمات برای سبد خرید آنلاین مانند قوانین حمل و نقل، لیست قیمت و غیره
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}٪ صورتحساب
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,مسائل مربوط به من
 DocType: BOM Item,BOM Item,مورد BOM
 DocType: Appraisal,For Employee,برای کارمند
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,ردیف {0}: پیشرفت در برابر کننده باید بدهی شود
 DocType: Company,Default Values,مقادیر پیش فرض
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,ردیف {0}: میزان پرداخت نمی تونه منفی
 DocType: Expense Claim,Total Amount Reimbursed,مقدار کل بازپرداخت
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},در برابر تامین کننده فاکتور {0} تاریخ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},در برابر تامین کننده فاکتور {0} تاریخ {1}
 DocType: Customer,Default Price List,به طور پیش فرض لیست قیمت
 DocType: Payment Reconciliation,Payments,پرداخت
 DocType: Budget Detail,Budget Allocated,بودجه اختصاص داده شده
 DocType: Journal Entry,Entry Type,نوع ورودی
 ,Customer Credit Balance,تعادل اعتباری مشتری
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,تغییر خالص در حساب های پرداختنی
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,لطفا شناسه ایمیل خود را تایید کنید
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',مشتری مورد نیاز برای &#39;تخفیف Customerwise&#39;
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,به روز رسانی تاریخ های پرداخت بانک با مجلات.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,فعال سبد خرید
 DocType: Employee,Permanent Address,آدرس دائمی
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,مورد {0} باید مورد خدمات باشد.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",پیشرفت در برابر {0} {1} نمی تواند بیشتر پرداخت می شود \ از جمع کل {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,لطفا کد مورد را انتخاب کنید
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),کاهش کسر برای مرخصی بدون حقوق (LWP)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,تنها واحد آیتم استفاده کنید.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',زمان ورود دسته ای {0} باید &#39;فرستاده&#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',زمان ورود دسته ای {0} باید &#39;فرستاده&#39;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,را حسابداری برای ورود به جنبش هر سهام
 DocType: Leave Allocation,Total Leaves Allocated,مجموع برگ اختصاص داده شده
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},انبار مورد نیاز در ردیف بدون {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},انبار مورد نیاز در ردیف بدون {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,لطفا معتبر مالی سال تاریخ شروع و پایان را وارد کنید
 DocType: Employee,Date Of Retirement,تاریخ بازنشستگی
 DocType: Upload Attendance,Get Template,دریافت قالب
 DocType: Address,Postal,پستی
 DocType: Item,Weightage,بین وزنها
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید.
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,لطفا {0} انتخاب کنید.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},متن {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,لطفا {0} انتخاب کنید.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},متن {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,تماس جدید
 DocType: Territory,Parent Territory,سرزمین پدر و مادر
 DocType: Quality Inspection Reading,Reading 2,خواندن 2
 DocType: Stock Entry,Material Receipt,دریافت مواد
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},حزب نوع و حزب دریافتنی / حساب پرداختنی مورد نیاز است {0}
 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 +210,Quantity required for Item {0} in row {1},تعداد در ردیف مورد نیاز برای مورد {0} {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},تعداد در ردیف مورد نیاز برای مورد {0} {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},انبار {0} نمی تواند حذف شود مقدار برای مورد وجود دارد {1}
 DocType: Quotation,Order Type,نوع سفارش
 DocType: Purchase Invoice,Notification Email Address,هشدار از طریق ایمیل
@@ -1361,15 +1373,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ستون های بسیاری. صادرات این گزارش و با استفاده از یک برنامه صفحه گسترده آن را چاپ.
 DocType: Sales 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 +152,Main,اصلی
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,اصلی
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,نوع دیگر
 DocType: Naming Series,Set prefix for numbering series on your transactions,تنظیم پیشوند برای شماره سری در معاملات خود را
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,منظور متوقف نمی تواند لغو شود. Unstop برای لغو.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,را سفارش خرید
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,را سفارش خرید
 DocType: SMS Center,Send To,فرستادن به
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
 DocType: Payment Reconciliation Payment,Allocated amount,مقدار اختصاص داده شده
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,انبار و مرجع
 DocType: Supplier,Statutory info and other general information about your Supplier,اطلاعات قانونی و دیگر اطلاعات کلی در مورد تامین کننده خود را
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,نشانی ها
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,علیه مجله ورودی {0} هیچ بی بدیل {1} ورود ندارد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,علیه مجله ورودی {0} هیچ بی بدیل {1} ورود ندارد
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},تکراری سریال بدون برای مورد وارد {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,یک شرط برای یک قانون ارسال کالا
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,مورد مجاز به سفارش تولید.
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,مقدار اعتبار در حساب ارز
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,سیاههها زمان برای تولید.
 DocType: Item,Apply Warehouse-wise Reorder Level,درخواست انبار و زرنگ ترتیب مجدد سطح
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} باید ارائه شود
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} باید ارائه شود
 DocType: Authorization Control,Authorization Control,کنترل مجوز
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ردیف # {0}: رد انبار در برابر رد مورد الزامی است {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,زمان ورود برای انجام وظایف.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,پرداخت
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,پرداخت
 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},درخواست مواد از حداکثر {0} را می توان برای مورد {1} در برابر سفارش فروش ساخته شده {2}
 DocType: Employee,Salutation,سلام
@@ -1406,12 +1419,11 @@
 DocType: Quality Inspection Reading,Reading 10,خواندن 10
 apps/erpnext/erpnext/public/js/setup_wizard.js +366,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",لیست محصولات و یا خدمات خود را که شما خرید و یا فروش. مطمئن شوید برای بررسی گروه مورد، واحد اندازه گیری و خواص دیگر زمانی که شما شروع می شود.
 DocType: Hub Settings,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/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,شما وارد آیتم های تکراری شده اید   لطفا تصحیح و دوباره سعی کنید.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,ارزش {0} برای صفت {1} در لیست مورد معتبر وجود ندارد مقادیر ویژگی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,وابسته
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,مورد {0} است مورد سریال نه
 DocType: SMS Center,Create Receiver List,ایجاد فهرست گیرنده
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,تمام شده
 DocType: Packing Slip,To Package No.,برای بسته بندی شماره
 DocType: Warranty Claim,Issue Date,تاریخ صدور
 DocType: Activity Cost,Activity Cost,هزینه فعالیت
@@ -1449,7 +1461,7 @@
 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 +65,Territory / Customer,منطقه / مشتریان
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,به عنوان مثال 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,آیا مورد فروش
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,مورد گروه درخت
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} ایجاد شد
 DocType: Delivery Note Item,Against Sales Order,علیه سفارش فروش
 ,Serial No Status,سریال نیست
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,جدول مورد نمیتواند خالی باشد
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,جدول مورد نمیتواند خالی باشد
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",ردیف {0}: برای تنظیم دوره تناوب {1}، تفاوت بین از و تا به امروز \ باید بزرگتر یا مساوی به صورت {2}
 DocType: Pricing Rule,Selling,فروش
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,وظایف و مالیات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,لطفا تاریخ مرجع وارد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,عرضه تعداد
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,زمان نصب و راه اندازی
 DocType: Sales Invoice,Accounting Details,جزئیات حسابداری
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,حذف تمام معاملات این شرکت
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ردیف # {0}: عملیات {1} برای {2} تعداد کالا به پایان رسید در تولید تکمیل مرتب # {3}. لطفا وضعیت عملیات به روز رسانی از طریق زمان گزارش ها
+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,ردیف # {0}: عملیات {1} برای {2} تعداد کالا به پایان رسید در تولید تکمیل مرتب # {3}. لطفا وضعیت عملیات به روز رسانی از طریق زمان گزارش ها
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,سرمایه گذاری
 DocType: Issue,Resolution Details,جزییات قطعنامه
 DocType: Quality Inspection Reading,Acceptance Criteria,ملاک پذیرش
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,جدول پاک کردن
 DocType: Features Setup,Brands,علامت های تجاری
 DocType: C-Form Invoice Detail,Invoice No,شماره فاکتور
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,از سفارش خرید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,از سفارش خرید
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,هزینه یابی نرخ
 ,Customer Addresses And Contacts,آدرس و اطلاعات تماس و ضوابط
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,برنامه های  نگهداری و تعمیرات
 ,Quotation Trends,روند نقل قول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},مورد گروه در مورد استاد برای آیتم ذکر نشده {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
 DocType: Shipping Rule Condition,Shipping Amount,مقدار حمل و نقل
 ,Pending Amount,در انتظار مقدار
 DocType: Purchase Invoice Item,Conversion Factor,عامل تبدیل
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,درخت حساب finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,خالی بگذارید اگر برای همه نوع کارمند در نظر گرفته
 DocType: Landed Cost Voucher,Distribute Charges Based On,توزیع اتهامات بر اساس
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,حساب {0} باید از نوع &#39;دارائی های ثابت&#39; به عنوان مورد {1} مورد دارایی است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,حساب {0} باید از نوع &#39;دارائی های ثابت&#39; به عنوان مورد {1} مورد دارایی است
 DocType: HR Settings,HR Settings,تنظیمات HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ادعای هزینه منتظر تأیید است. تنها تصویب هزینه می توانید وضعیت به روز رسانی.
 DocType: Purchase Invoice,Additional Discount Amount,تخفیف اضافی مبلغ
 DocType: Leave Block List Allow,Leave Block List Allow,ترک فهرست بلوک اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,مخفف نمیتواند خالی باشد یا فضای
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,مخفف نمیتواند خالی باشد یا فضای
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ورزشی
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,مجموع واقعی
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,واحد
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} در حال حاضر به طور پیش فرض سال مالی. لطفا مرورگر خود را برای تغییر تاثیر گذار تازه کردن.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ادعاهای هزینه
 DocType: Issue,Support,پشتیبانی
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,مشاهده سبد خرید
 ,BOM Search,BOM جستجو
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),بسته شدن (باز مجموع +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,لطفا ارز در شرکت مشخص
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},عامل UOM تبدیل در ردیف مورد نیاز است {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},تاریخ ترخیص کالا از نمی تواند قبل از تاریخ چک در ردیف شود {0}
 DocType: Salary Slip,Deduction,کسر
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},مورد قیمت های اضافه شده برای {0} در لیست قیمت {1}
 DocType: Address Template,Address Template,آدرس الگو
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,لطفا کارمند شناسه را وارد این فرد از فروش
 DocType: Territory,Classification of Customers by region,طبقه بندی مشتریان بر اساس منطقه
 DocType: Project,% Tasks Completed,٪ کارهای انجام شده
 DocType: Project,Gross Margin,حاشیه ناخالص
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,لطفا ابتدا وارد مورد تولید
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,کاربر غیر فعال
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,کاربر غیر فعال
 DocType: Opportunity,Quotation,نقل قول
 DocType: Salary Slip,Total Deduction,کسر مجموع
 DocType: Quotation,Maintenance User,کاربر نگهداری
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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,کسر کردن
@@ -1588,12 +1602,12 @@
 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,SO تعداد
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",نوشته های سهام در مقابل انبار وجود داشته باشد {0}، از این رو شما می توانید دوباره اختصاص و یا تغییر انبار
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",نوشته های سهام در مقابل انبار وجود داشته باشد {0}، از این رو شما می توانید دوباره اختصاص و یا تغییر انبار
 DocType: Appraisal,Calculate Total Score,محاسبه مجموع امتیاز
 DocType: Supplier Quotation,Manufacturing Manager,ساخت مدیر
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},سریال بدون {0} است تحت گارانتی تا {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,تقسیم توجه داشته باشید تحویل بسته بندی شده.
-apps/erpnext/erpnext/hooks.py +68,Shipments,محموله
+apps/erpnext/erpnext/hooks.py +69,Shipments,محموله
 DocType: Purchase Order Item,To be delivered to customer,به مشتری تحویل
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,زمان ورود وضعیت باید ارائه شود.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,سریال نه {0} به هیچ انبار تعلق ندارد
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,انتخاب شرکت ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,خالی بگذارید اگر برای همه گروه ها در نظر گرفته
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",انواع اشتغال (دائمی، قرارداد، و غیره کارآموز).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} برای مورد الزامی است {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} برای مورد الزامی است {1}
 DocType: Currency Exchange,From Currency,از ارز
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا مقدار اختصاص داده شده، نوع فاکتور و شماره فاکتور در حداقل یک سطر را انتخاب کنید
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},سفارش فروش مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا مقدار اختصاص داده شده، نوع فاکتور و شماره فاکتور در حداقل یک سطر را انتخاب کنید
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},سفارش فروش مورد نیاز برای مورد {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,مقدار در سیستم منعکس نشده است
 DocType: Purchase Invoice Item,Rate (Company Currency),نرخ (شرکت ارز)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,دیگران
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,در حال انجام
 DocType: Authorization Rule,Itemwise Discount,Itemwise تخفیف
 DocType: Purchase Order Item,Reference Document Type,مرجع نوع سند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} در برابر سفارش فروش {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} در برابر سفارش فروش {1}
 DocType: Account,Fixed Asset,دارائی های ثابت
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,پرسشنامه سریال
 DocType: Activity Type,Default Billing Rate,به طور پیش فرض نرخ صدور صورت حساب
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,سفارش فروش به پرداخت
 DocType: Expense Claim Detail,Expense Claim Detail,هزینه جزئیات درخواست
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,زمان ثبت ایجاد:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,لطفا به حساب صحیح را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,لطفا به حساب صحیح را انتخاب کنید
 DocType: Item,Weight UOM,وزن UOM
 DocType: Employee,Blood Group,گروه خونی
 DocType: Purchase Invoice Item,Page Break,شکست صفحه
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,به زمان
 DocType: Authorization Rule,Approving Role (above authorized value),تصویب نقش (بالاتر از ارزش مجاز)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",برای اضافه کردن گره فرزند، کشف درخت و کلیک بر روی گره که در آن شما می خواهید برای اضافه کردن گره.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,اعتبار به حساب باید یک حساب کاربری پرداختنی شود
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},بازگشت BOM: {0} می تواند پدر و مادر یا فرزند نمی {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,اعتبار به حساب باید یک حساب کاربری پرداختنی شود
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,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 +116,"For {0}, only debit accounts can be linked against another credit entry",برای {0}، تنها حساب های بانکی را می توان در برابر ورود اعتباری دیگر مرتبط
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry",برای {0}، تنها حساب های بانکی را می توان در برابر ورود اعتباری دیگر مرتبط
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,لیست قیمت {0} غیر فعال است
 DocType: Manufacturing Settings,Allow Overtime,اجازه اضافه کاری
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} شماره سریال مورد نیاز برای مورد {1}. شما فراهم کرده اید {2}.
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,کدهای مورد مشتری
 DocType: Opportunity,Lost Reason,از دست داده دلیل
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ایجاد مطالب پرداخت در برابر دستورات و یا فاکتورها.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,آدرس جدید
 DocType: Quality Inspection,Sample Size,اندازهی نمونه
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,همه موارد در حال حاضر صورتحساب شده است
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,مراکز هزینه به علاوه می تواند در زیر گروه ساخته شده اما مطالب را می توان در برابر غیر گروه ساخته شده
 DocType: Project,External,خارجی
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,ابزار تغییر نام
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,به روز رسانی هزینه
 DocType: Item Reorder,Item Reorder,مورد ترتیب مجدد
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,مواد انتقال
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,مواد انتقال
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",مشخص عملیات، هزینه های عملیاتی و به یک عملیات منحصر به فرد بدون به عملیات خود را.
 DocType: Purchase Invoice,Price List Currency,لیست قیمت ارز
 DocType: Naming Series,User must always select,کاربر همیشه باید انتخاب کنید
 DocType: Stock Settings,Allow Negative Stock,اجازه می دهد بورس منفی
 DocType: Installation Note,Installation Note,نصب و راه اندازی توجه داشته باشید
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,اضافه کردن مالیات
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,جریان وجوه نقد از تامین مالی
 ,Financial Analytics,تجزیه و تحلیل ترافیک مالی
 DocType: Quality Inspection,Verified By,تایید شده توسط
 DocType: Address,Subsidiary,فرعی
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,ایجاد لغزش حقوق
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,تعادل انتظار می رود به عنوان در هر بانکی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),منابع درآمد (بدهی)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},تعداد در ردیف {0} ({1}) باید همان مقدار تولید شود {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},تعداد در ردیف {0} ({1}) باید همان مقدار تولید شود {2}
 DocType: Appraisal,Employee,کارمند
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,واردات از ایمیل
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,دعوت به عنوان کاربر
 DocType: Features Setup,After Sale Installations,پس از نصب فروش
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} به طور کامل صورتحساب شده است
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} به طور کامل صورتحساب شده است
 DocType: Workstation Working Hour,End Time,پایان زمان
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,شرایط قرارداد استاندارد برای فروش و یا خرید.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,گروه های کوپن
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,مورد نیاز در
 DocType: Sales Invoice,Mass Mailing,پستی دسته جمعی
 DocType: Rename Tool,File to Rename,فایل برای تغییر نام
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},شماره سفارش Purchse مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},شماره سفارش Purchse مورد نیاز برای مورد {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,نمایش پرداخت
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},BOM تعیین {0} برای مورد وجود ندارد {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات برنامه {0} باید قبل از لغو این سفارش فروش لغو
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,سفارش فروش مورد نیاز
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ایجاد مشتری
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,جزئیات برنامه نگهداری و تعمیرات
 DocType: Quality Inspection Reading,Reading 9,خواندن 9
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,مطرح شده توسط
 DocType: Payment Tool,Payment Account,حساب پرداخت
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,تغییر خالص در حساب های دریافتنی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,جبرانی فعال
 DocType: Quality Inspection Reading,Accepted,پذیرفته
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,لطفا مطمئن شوید که شما واقعا می خواهید به حذف تمام معاملات این شرکت. اطلاعات کارشناسی ارشد خود را باقی خواهد ماند آن را به عنوان است. این عمل قابل بازگشت نیست.
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,مجموع مقدار پرداخت
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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 +204,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
 DocType: Newsletter,Test,تست
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",همانطور که معاملات سهام موجود برای این آیتم به، \ شما می توانید مقادیر تغییر نمی کند ندارد سریال &#39;،&#39; دارای دسته ای بدون &#39;،&#39; آیا مورد سهام &quot;و&quot; روش های ارزش گذاری &#39;
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,شما می توانید نرخ تغییر اگر BOM agianst هر مورد ذکر شده
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,اگر ذکر بی ا م در مقابل هر ایتمی باشد شما نمیتوانید نرخ را تغییر دهید
 DocType: Employee,Previous Work Experience,قبلی سابقه کار
 DocType: Stock Entry,For Quantity,برای کمیت
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},لطفا برنامه ریزی شده برای مورد تعداد {0} در ردیف وارد {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} ثبت نشده است
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} ثبت نشده است
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,درخواست ها برای اقلام است.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سفارش تولید جداگانه خواهد شد برای هر مورد خوب به پایان رسید ساخته شده است.
 DocType: Purchase Invoice,Terms and Conditions1,شرایط و Conditions1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,ارزش مجاز
 DocType: Contact,Enter department to which this Contact belongs,بخش وارد کنید که این تماس به آن تعلق
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,مجموع غایب
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,موردی یا انبار ردیف {0} مطابقت ندارد درخواست مواد
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,موردی یا انبار ردیف {0} مطابقت ندارد درخواست مواد
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,واحد اندازه گیری
 DocType: Fiscal Year,Year End Date,سال پایان تاریخ
 DocType: Task Depends On,Task Depends On,کار بستگی به
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,قرارداد تاریخ پایان باید از تاریخ پیوستن بیشتر
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,توزیع کننده شخص ثالث / فروشنده / نماینده کمیسیون / وابسته به / نمایندگی فروش که به فروش می رساند محصولات شرکت برای کمیسیون.
 DocType: Customer Group,Has Child Node,دارای گره فرزند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} در برابر سفارش خرید {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} در برابر سفارش خرید {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",پارامترهای URL شخص را اینجا وارد کنید (به عنوان مثال فرستنده = ERPNext، نام کاربری = ERPNext و رمز = 1234 و غیره)
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} در هر سال مالی فعال است. برای جزئیات بیشتر {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,این یک مثال وب سایت خودکار تولید شده از ERPNext
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,Recd تعداد
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},می تواند مورد دیگر {0} از مقدار سفارش فروش تولید نمی {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
 DocType: Payment Reconciliation,Bank / Cash Account,حساب بانک / نقدی
 DocType: Tax Rule,Billing City,صدور صورت حساب شهر
 DocType: Global Defaults,Hide Currency Symbol,مخفی ارز نماد
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,هزینه آب و برق
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-بالاتر از
 DocType: Buying Settings,Default Buying Price List,به طور پیش فرض لیست قیمت خرید
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.",تنظیم مقادیر پیش فرض مثل شرکت، ارز، سال مالی جاری، و غیره
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,نوع پرداخت
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",نگاه کنید به &quot;نرخ مواد بر اساس&quot; در هزینه یابی بخش
 DocType: Appraisal Goal,Key Responsibility Area,منطقه مسئولیت های کلیدی
 DocType: Item Reorder,Material Request Type,مواد نوع درخواست
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,ردیف {0}: UOM عامل تبدیل الزامی است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ردیف {0}: UOM عامل تبدیل الزامی است
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,کد عکس
 DocType: Cost Center,Cost Center,مرکز هزینه زا
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,کوپن #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,تمام آدرس.
 DocType: Company,Stock Settings,تنظیمات سهام
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",ادغام زمانی ممکن است که خواص زیر در هر دو پرونده می باشد. آیا گروه، نوع ریشه، شرکت
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",ادغام زمانی ممکن است که خواص زیر در هر دو پرونده می باشد. آیا گروه، نوع ریشه، شرکت
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,مدیریت مشتری گروه درخت.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,نام مرکز هزینه
 DocType: Leave Control Panel,Leave Control Panel,ترک کنترل پنل
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,جزئیات ابزار پرداخت
 ,Sales Browser,مرورگر فروش
 DocType: Journal Entry,Total Credit,مجموع اعتباری
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} در برابر ورود سهام وجود دارد {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,محلی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} در برابر ورود سهام وجود دارد {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,بدهکاران
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,بزرگ
@@ -2003,7 +2022,7 @@
 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 شماره
 DocType: Production Order Operation,Make Time Log,را زمان ورود
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,لطفا مقدار سفارش مجدد مجموعه
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,لطفا مقدار سفارش مجدد مجموعه
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},لطفا مشتری از سرب ایجاد {0}
 DocType: Price List,Applicable for Countries,قابل استفاده برای کشورهای
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,کامپیوتر
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,حداقل یک مورد باید با مقدار منفی در سند وارد بازگشت
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,بدون شرح
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,بدون شرح
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,سر رسیده
 DocType: Account,Stock Received But Not Billed,سهام دریافتی اما صورتحساب نه
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,حساب کاربری ریشه باید یک گروه باشد
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,حساب کاربری ریشه باید یک گروه باشد
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ناخالص پرداخت + تعویق وام مبلغ + Encashment مقدار - کسر مجموع
 DocType: Monthly Distribution,Distribution Name,نام توزیع
 DocType: Features Setup,Sales and Purchase,فروش و خرید
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,تعادل حزب
 DocType: Sales Invoice Item,Time Log Batch,زمان ورود دسته ای
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,لطفا درخواست تخفیف را انتخاب کنید
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,لغزش حقوق و دستمزد ایجاد
 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,انتقال مواد برای تولید
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,نیمه سال
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,سال مالی {0} یافت نشد.
 DocType: Bank Reconciliation,Get Relevant Entries,دریافت مطالب مرتبط
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,ثبت حسابداری برای انبار
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,ثبت حسابداری برای انبار
 DocType: Sales Invoice,Sales Team1,Team1 فروش
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,مورد {0} وجود ندارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,مورد {0} وجود ندارد
 DocType: Sales Invoice,Customer Address,آدرس مشتری
 DocType: Purchase Invoice,Apply Additional Discount On,درخواست تخفیف اضافی
 DocType: Account,Root Type,نوع ریشه
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,نمایش تصاویر به صورت خودکار در این بازگشت به بالای صفحه
 DocType: BOM,Item UOM,مورد UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),مبلغ مالیات پس از تخفیف مقدار (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},انبار هدف برای ردیف الزامی است {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},انبار هدف برای ردیف الزامی است {0}
 DocType: Quality Inspection,Quality Inspection,بازرسی کیفیت
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,بسیار کوچک
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,حساب {0} منجمد است
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,حقوقی نهاد / جانبی با نمودار جداگانه حساب متعلق به سازمان.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",مواد غذایی، آشامیدنی و دخانیات
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL یا BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},می توانید تنها پرداخت به را unbilled را {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},می توانید تنها پرداخت به را unbilled را {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,نرخ کمیسیون نمی تواند بیشتر از 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,حداقل سطح موجودی
 DocType: Stock Entry,Subcontract,مقاطعه کاری فرعی
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,بازرسی کیفیت ورودی.
 DocType: Purchase Order Item,Returned Qty,بازگشت تعداد
 DocType: Employee,Exit,خروج
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,نوع ریشه الزامی است
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,نوع ریشه الزامی است
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,سریال بدون {0} ایجاد
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",برای راحتی مشتریان، این کدها می توان در فرمت چاپ مانند فاکتورها و تحویل یادداشت استفاده می شود
 DocType: Employee,You can enter any date manually,شما می توانید هر روز دستی وارد کنید
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,دوره وابسته به التزام
 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 +110,Row {0}: Advance against Customer must be credit,ردیف {0}: پیشرفت در برابر مشتری باید اعتبار
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,مورد رسید خرید عرضه
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,پرداخت
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,پرداخت
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,به تاریخ ساعت
 DocType: SMS Settings,SMS Gateway URL,URL SMS دروازه
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,سیاهههای مربوط به حفظ وضعیت تحویل اس ام اس
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ترتیب مجدد سطح
 DocType: Attendance,Attendance Date,حضور و غیاب عضویت
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,فروپاشی حقوق و دستمزد بر اساس سود و کسر.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,حساب با گره فرزند را نمی توان تبدیل به لجر
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,حساب با گره فرزند را نمی توان تبدیل به لجر
 DocType: Address,Preferred Shipping Address,ترجیح آدرس حمل و نقل
 DocType: Purchase Receipt Item,Accepted Warehouse,انبار پذیرفته شده
 DocType: Bank Reconciliation Detail,Posting Date,تاریخ ارسال
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,سریال بدون {0} وجود ندارد
 DocType: Pricing Rule,Discount Percentage,درصد تخفیف
 DocType: Payment Reconciliation Invoice,Invoice Number,شماره فاکتور
-apps/erpnext/erpnext/hooks.py +54,Orders,سفارشات
+apps/erpnext/erpnext/hooks.py +55,Orders,سفارشات
 DocType: Leave Control Panel,Employee Type,نوع کارمند
 DocType: Employee Leave Approver,Leave Approver,ترک تصویب
 DocType: Manufacturing Settings,Material Transferred for Manufacture,مواد منتقل شده برای ساخت
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,درصد از مواد در برابر این سفارش فروش ثبت شده در صورتحساب
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,ورود اختتامیه دوره
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,مرکز هزینه با معاملات موجود می تواند به گروه تبدیل می شود
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,استهلاک
+DocType: Account,Depreciation,استهلاک
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),تامین کننده (بازدید کنندگان)
 DocType: Customer,Credit Limit,محدودیت اعتبار
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,انتخاب نوع معامله
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,درخواست برای
 DocType: Quotation Item,Against Doctype,علیه DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,پیگیری این تحویل توجه داشته باشید در مقابل هر پروژه
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,حساب کاربری ریشه نمی تواند حذف شود
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,نقدی خالص از سرمایه گذاری
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,حساب کاربری ریشه نمی تواند حذف شود
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,نمایش مطالب سهام
 ,Is Primary Address,آدرس اولیه است
 DocType: Production Order,Work-in-Progress Warehouse,کار در حال پیشرفت انبار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},مرجع # {0} تاریخ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},مرجع # {0} تاریخ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,مدیریت آدرس
 DocType: Pricing Rule,Item Code,کد مورد
 DocType: Production Planning Tool,Create Production Orders,ایجاد سفارشات تولید
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,نکته کاربری
 DocType: Lead,Market Segment,بخش بازار
 DocType: Employee Internal Work History,Employee Internal Work History,کارمند داخلی سابقه کار
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),بسته شدن (دکتر)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),بسته شدن (دکتر)
 DocType: Contact,Passive,غیر فعال
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,سریال بدون {0} در سهام
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,قالب های مالیاتی برای فروش معاملات.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,مقدار فاکتور شده
 DocType: Bank Reconciliation,Bank Reconciliation,مغایرت گیری بانک
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,دریافت به روز رسانی
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,درخواست مواد {0} است لغو و یا متوقف
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,درخواست مواد {0} است لغو و یا متوقف
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,اضافه کردن چند پرونده نمونه
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ترک مدیریت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,گروه های حساب
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",سر حساب تحت مسئولیت، که در آن سود / زیان رزرو خواهد شد
 DocType: Payment Tool,Against Vouchers,علیه کوپن
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,راهنما سریع
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},منبع و انبار هدف نمی تواند همین کار را برای ردیف {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},منبع و انبار هدف نمی تواند همین کار را برای ردیف {0}
 DocType: Features Setup,Sales Extras,فروش افزودنیهای پیشنهاد شده
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} بودجه برای حساب {1} در برابر مرکز هزینه {2} خواهد تجاوز {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',"""از تاریخ"" باید پس از ""تا تاریخ"" باشد"
 ,Stock Projected Qty,سهام بینی تعداد
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
 DocType: Sales Order,Customer's Purchase Order,سفارش خرید مشتری
 DocType: Warranty Claim,From Company,از شرکت
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ارزش و یا تعداد
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,ترک فهرست بلوک های مجاز
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,شما آن را برای ورود استفاده کنید
 DocType: Sales Partner,Retailer,خرده فروش
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,اعتباری به حساب باید یک حساب ترازنامه شود
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,اعتباری به حساب باید یک حساب ترازنامه شود
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,انواع تامین کننده
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,کد مورد الزامی است زیرا مورد به طور خودکار شماره نه
+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 +93,Quotation {0} not of type {1},نقل قول {0} نمی از نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,نگهداری و تعمیرات برنامه مورد
 DocType: Sales Order,%  Delivered,٪ تحویل شده
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),وزن ناخالص از بسته. معمولا وزن خالص + وزن مواد بسته بندی. (برای چاپ)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,کاربران با این نقش ها اجازه تنظیم حساب های یخ زده و ایجاد / تغییر نوشته های حسابداری در برابر حساب منجمد
 DocType: Serial No,Is Cancelled,آیا لغو
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,محموله های من
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,محموله های من
 DocType: Journal Entry,Bill Date,تاریخ صورتحساب
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",حتی اگر قوانین قیمت گذاری های متعدد را با بالاترین اولویت وجود دارد، سپس زیر اولویت های داخلی می شود:
 DocType: Supplier,Supplier Details,اطلاعات بیشتر تامین کننده
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,تماس
 DocType: Project,Total Costing Amount (via Time Logs),کل مقدار هزینه یابی (از طریق زمان سیاههها)
 DocType: Purchase Order Item Supplied,Stock UOM,سهام UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,خرید سفارش {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,خرید سفارش {0} است ارسال نشده
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,بینی
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},سریال بدون {0} به انبار تعلق ندارد {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,توجه: سیستم نمی خواهد بیش از چک زایمان و بیش از رزرو مورد {0} به عنوان مقدار و یا مقدار 0 است
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,افتتاح عضویت
 DocType: Journal Entry,Remark,اظهار
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,بسته بندی های کوچک برای صدور صورت حساب
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,لوایح مطرح شده توسط تولید کنندگان.
 DocType: POS Profile,Write Off Account,ارسال فعال حساب
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,مقدار تخفیف
 DocType: Purchase Invoice,Return Against Purchase Invoice,بازگشت علیه خرید فاکتور
 DocType: Item,Warranty Period (in days),دوره گارانتی (در روز)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,نقدی خالص عملیات
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,به عنوان مثال مالیات بر ارزش افزوده
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,(4 مورد)
 DocType: Journal Entry Account,Journal Entry Account,حساب ورودی دفتر روزنامه
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,تاریخ بازنشستگی باید از تاریخ پیوستن بیشتر
 DocType: Sales Invoice,Against Income Account,به حساب درآمد
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}٪ تحویل داده شد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,حمل و نقل اطلاعات
@@ -2421,10 +2443,10 @@
 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 +14,This is a root sales person and cannot be edited.,این فرد از فروش ریشه است و نمی تواند ویرایش شود.
 ,Stock Ledger,سهام لجر
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},نرخ: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},نرخ: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,حقوق و دستمزد کسر لغزش
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,اولین انتخاب یک گره گروه.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},هدف باید یکی از است {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},هدف باید یکی از است {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,فرم را پر کنید و آن را ذخیره کنید
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,دانلود گزارش حاوی تمام مواد خام با آخرین وضعیت موجودی خود را
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,انجمن
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,شرکت (و نه مشتری و یا تامین کننده) استاد.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',لطفا &quot;انتظار تاریخ تحویل را وارد
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,یادداشت تحویل {0} باید قبل از لغو این سفارش فروش لغو
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,مبلغ پرداخت شده + نوشتن کردن مقدار نمی تواند بیشتر از جمع کل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},نکته: تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",توجه: در صورت پرداخت در مقابل هر مرجع ساخته شده است، را مجله ورودی دستی.
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}'  غیر فعال است
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,تنظیم به عنوان گسترش
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ارسال ایمیل خودکار به تماس در معاملات ارائه.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}",ردیف {0}: تعداد در انبار avalable نمی {1} در {2} {3}. در دسترس تعداد: {4}، انتقال تعداد: {5}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3 مورد
 DocType: Purchase Order,Customer Contact Email,مشتریان تماس با ایمیل
 DocType: Sales Team,Contribution (%),سهم (٪)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,توجه: ورودی پرداخت خواهد از ایجاد شوند &quot;نقدی یا حساب بانکی &#39;مشخص نشده بود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,توجه: ورودی پرداخت خواهد از ایجاد شوند &quot;نقدی یا حساب بانکی &#39;مشخص نشده بود
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,مسئولیت
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,قالب
 DocType: Sales Person,Sales Person Name,فروش نام شخص
@@ -2495,24 +2517,24 @@
 DocType: Stock Reconciliation Item,Before reconciliation,قبل از آشتی
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ردیف مالیاتی مورد {0} باید حساب از نوع مالیات یا درآمد یا هزینه یا شارژ داشته
 DocType: Sales Order,Partly Billed,تا حدودی صورتحساب
 DocType: Item,Default BOM,به طور پیش فرض BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,لطفا دوباره نوع نام شرکت برای تایید
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,مجموع برجسته AMT
 DocType: Time Log Batch,Total Hours,جمع ساعت
 DocType: Journal Entry,Printing Settings,تنظیمات چاپ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},دبیت مجموع باید به مجموع اعتبار مساوی باشد. تفاوت در این است {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},دبیت مجموع باید به مجموع اعتبار مساوی باشد. تفاوت در این است {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,خودرو
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,از تحویل توجه داشته باشید
 DocType: Time Log,From Time,از زمان
 DocType: Notification Control,Custom Message,سفارشی پیام
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,بانکداری سرمایه گذاری
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,نقدی یا حساب بانکی برای ساخت پرداخت ورود الزامی است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,نقدی یا حساب بانکی برای ساخت پرداخت ورود الزامی است
 DocType: Purchase Invoice,Price List Exchange Rate,لیست قیمت نرخ ارز
 DocType: Purchase Invoice Item,Rate,نرخ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,انترن
-DocType: Newsletter,A Lead with this email id should exist,سرب با این ایمیل ID باید وجود داشته باشد
+DocType: Newsletter,A Lead with this email id should exist,یک نفر با این آدرس ایمیل موجود است
 DocType: Stock Entry,From BOM,از BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,پایه
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,معاملات سهام قبل از {0} منجمد
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}",قانون قیمت های متعدد را با معیارهای همان وجود دارد، لطفا \ درگیری با اختصاص اولویت حل و فصل. مشاهده قوانین قیمت: {0}
 DocType: Account,Bank,بانک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شرکت هواپیمایی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,مواد شماره
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,مواد شماره
 DocType: Material Request Item,For Warehouse,ذخیره سازی
 DocType: Employee,Offer Date,پیشنهاد عضویت
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,نقل قول
 DocType: Hub Settings,Access Token,نشانه دسترسی
 DocType: Sales Invoice Item,Serial No,شماره سریال
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,لطفا ابتدا Maintaince جزئیات را وارد کنید
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,می تعطیلات بیشتر از روز کاری در این ماه وجود دارد.
 DocType: Product Bundle Item,Product Bundle Item,محصولات بسته نرم افزاری مورد
 DocType: Sales Partner,Sales Partner Name,نام شریک فروش
+DocType: Payment Reconciliation,Maximum Invoice Amount,حداکثر مبلغ فاکتور
 DocType: Purchase Invoice Item,Image View,تصویر مشخصات
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,ارزش گذاری و مجموع
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,این مورد یک نوع از {0} (الگو) است. ویژگی خواهد شد بیش از قالب کپی مگر اینکه &#39;هیچ نسخه&#39; تنظیم شده است
 DocType: Account,Purchase User,خرید کاربر
 DocType: Notification Control,Customize the Notification,سفارشی اطلاع رسانی
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,جریان وجوه نقد از عملیات
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,به طور پیش فرض آدرس الگو نمی تواند حذف شود
 DocType: Sales Invoice,Shipping Rule,قانون حمل و نقل
 DocType: Journal Entry,Print Heading,چاپ سرنویس
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,مواد اولیه
 DocType: Leave Application,Follow via Email,از طریق ایمیل دنبال کنید
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,مبلغ مالیات پس از تخفیف مبلغ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,حساب کودک برای این حساب وجود دارد. شما می توانید این حساب را حذف کنید.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,لطفا در ارسال تاریخ را انتخاب کنید اول
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},سریال شماره سریال مورد نیاز برای مورد {0}
 DocType: Journal Entry,Bank Entry,بانک ورودی
 DocType: Authorization Rule,Applicable To (Designation),به (برای تعیین)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,اضافه کردن به سبد
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,گروه توسط
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,فعال / غیر فعال کردن ارز.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,هزینه پستی
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,سرگرمی و اوقات فراغت
 DocType: Purchase Order,The date on which recurring order will be stop,از تاریخ تکرار می شود منظور متوقف خواهد شد
 DocType: Quality Inspection,Item Serial No,مورد سریال بدون
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} باید توسط {1} و یا شما باید افزایش تحمل سرریز کاهش می یابد
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} باید توسط {1} و یا شما باید افزایش تحمل سرریز کاهش می یابد
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,در حال حاضر مجموع
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,ساعت
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",مورد سریال {0} می تواند \ با استفاده از بورس آشتی نمی شود به روز شده
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,انتقال مواد به تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,انتقال مواد به تامین کننده
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,ایجاد استعلام
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,شما مجاز به تصویب برگ در تاریخ بلوک
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,همه این موارد در حال حاضر صورتحساب شده است
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,شما مجاز به تایید برگ در تاریخ های مسدود شده نیستید
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,همه این موارد در حال حاضر صورتحساب شده است
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},می توان با تصویب {0}
 DocType: Shipping Rule,Shipping Rule Conditions,حمل و نقل قانون شرایط
 DocType: BOM Replace Tool,The new BOM after replacement,BOM جدید پس از تعویض
 DocType: Features Setup,Point of Sale,نقطه ای از فروش
 DocType: Account,Tax,مالیات
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},ردیف {0}: {1} است معتبر نیست {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,از بسته نرم افزاری محصولات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,از بسته نرم افزاری محصولات
 DocType: Production Planning Tool,Production Planning Tool,تولید ابزار برنامه ریزی
 DocType: Quality Inspection,Report Date,گزارش تخلف
 DocType: C-Form,Invoices,فاکتورها
 DocType: Job Opening,Job Title,عنوان شغلی
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} دریافت کنندگان
 DocType: Features Setup,Item Groups in Details,گروه مورد در جزئیات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,تعداد برای تولید باید بیشتر از 0 باشد.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),شروع نقطه از فروش (POS)
@@ -2618,8 +2644,9 @@
 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: Pricing Rule,Customer Group,مشتری گروه
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},حساب هزینه برای آیتم الزامی است {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},حساب هزینه برای آیتم الزامی است {0}
 DocType: Item,Website Description,وب سایت توضیحات
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,تغییر خالص در حقوق صاحبان سهام
 DocType: Serial No,AMC Expiry Date,AMC تاریخ انقضاء
 ,Sales Register,فروش ثبت نام
 DocType: Quotation,Quotation Lost Reason,نقل قول را فراموش کرده اید دلیل
@@ -2627,12 +2654,12 @@
 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 +108,Summary for this month and pending activities,خلاصه برای این ماه و فعالیت های انتظار
 DocType: Customer Group,Customer Group Name,نام مشتری گروه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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,ویژگی های
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,گرفتن اقلام
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,لطفا وارد حساب فعال
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,گرفتن اقلام
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,لطفا وارد حساب فعال
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,تاریخ و زمان آخرین چینش تاریخ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,را فاکتور مالیات کالاهای داخلی
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},حساب {0} می کند به شرکت تعلق نمی {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,اطلاعات پروژه و زرنگ در دسترس برای عین نمی
 DocType: Project,Expected End Date,انتظار می رود تاریخ پایان
 DocType: Appraisal Template,Appraisal Template Title,ارزیابی الگو عنوان
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,تجاری
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,تجاری
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,مورد پدر و مادر {0} نباید آیتم سهام
 DocType: Cost Center,Distribution Id,توزیع کد
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,خدمات عالی
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ارزش صفت {0} باید در طیف وسیعی از {1} به {2} در بازه {3}
 DocType: Tax Rule,Sales,فروش
 DocType: Stock Entry Detail,Basic Amount,مقدار اولیه
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
 DocType: Leave Allocation,Unused leaves,برگ استفاده نشده
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,کروم
 DocType: Customer,Default Receivable Accounts,پیش فرض حسابهای دریافتنی
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,رسید خرید
-DocType: Payment Reconciliation,Maximum Amount,حداکثر
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,چگونه قیمت گذاری قانون اعمال می شود؟
 DocType: Quality Inspection,Delivery Note No,تحویل توجه داشته باشید هیچ
 DocType: Company,Retail,خرده فروشی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,مشتری {0} وجود ندارد
 DocType: Attendance,Absent,غایب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,بسته نرم افزاری محصولات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},ردیف {0}: مرجع نامعتبر {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,بسته نرم افزاری محصولات
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},ردیف {0}: مرجع نامعتبر {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,خرید مالیات و هزینه الگو
 DocType: Upload Attendance,Download Template,دانلود الگو
 DocType: GL Entry,Remarks,سخنان
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,جدول ماهانه حضور و غیاب
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,موردی یافت
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مرکز هزینه برای مورد الزامی است {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,حساب {0} غیر فعال است
 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,حضور و غیاب حضور و غیاب از تاریخ و به روز الزامی است
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'سود و زیان' نوع حساب {0} در افتتاح ورودی مجاز نیست
 DocType: Features Setup,Sales Discounts,تخفیف فروش
 DocType: Hub Settings,Seller Country,فروشنده کشور
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,انتشار موارد در وب سایت
 DocType: Authorization Rule,Authorization Rule,قانون مجوز
 DocType: Sales Invoice,Terms and Conditions Details,قوانین و مقررات جزئیات
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,مشخصات
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,مالیات فروش و اتهامات الگو
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,پوشاک و لوازم جانبی
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,تعداد سفارش
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,مقدار حسابداری
 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 +18,Applications for leave.,برنامه های کاربردی برای مرخصی.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,حساب با معامله های موجود نمی تواند حذف شود
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,حساب با معامله های موجود نمی تواند حذف شود
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,هزینه های قانونی
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",روز از ماه که در آن منظور خواهد شد به عنوان مثال خودکار 05، 28 و غیره تولید
 DocType: Sales Invoice,Posting Time,مجوز های ارسال و زمان
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,تفکیک
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,حساب: {0} با ارز: {1} نمی تواند انتخاب شود
 DocType: Bank Reconciliation Detail,Cheque Date,چک تاریخ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},حساب {0}: حساب مرجع {1} به شرکت تعلق ندارد: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},حساب {0}: حساب مرجع {1} به شرکت تعلق ندارد: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,با موفقیت حذف تمام معاملات مربوط به این شرکت!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,همانطور که در تاریخ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,عفو مشروط
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,به طور پیش فرض انبار سهام مورد الزامی است.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,به طور پیش فرض انبار سهام مورد الزامی است.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},پرداخت حقوق و دستمزد برای ماه {0} و {1} سال
 DocType: Stock Settings,Auto insert Price List rate if missing,درج خودرو نرخ لیست قیمت اگر از دست رفته
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,کل مقدار پرداخت
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),کل مقدار حسابداری (از طریق زمان سیاههها)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,ما فروش این مورد
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,تامین کننده کد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,تعداد باید بیشتر از 0 باشد
 DocType: Journal Entry,Cash Entry,نقدی ورودی
 DocType: Sales Partner,Contact Desc,تماس با محصول،
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.",نوع برگ مانند گاه به گاه، بیمار و غیره
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,اضافه کردن ردیف به راه بودجه سالانه در حساب.
 DocType: Buying Settings,Default Supplier Type,به طور پیش فرض نوع تامین کننده
 DocType: Production Order,Total Operating Cost,مجموع هزینه های عملیاتی
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,توجه: مورد {0} وارد چندین بار
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,توجه: مورد {0} وارد چندین بار
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,همه اطلاعات تماس.
 DocType: Newsletter,Test Email Id,تست ایمیل کد
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,مخفف شرکت
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,همه گروه های مشتری
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,قالب مالیات اجباری است.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,حساب {0}: حساب مرجع {1} وجود ندارد
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,حساب {0}: حساب مرجع {1} وجود ندارد
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),لیست قیمت نرخ (شرکت ارز)
 DocType: Account,Temporary,موقت
 DocType: Address,Preferred Billing Address,ترجیح آدرس صورت حساب
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,مورد عاقلانه لیست قیمت نرخ
 DocType: Purchase Order Item,Supplier Quotation,نقل قول تامین کننده
 DocType: Quotation,In Words will be visible once you save the Quotation.,به عبارت قابل مشاهده خواهد بود هنگامی که شما نقل قول را نجات دهد.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} متوقف شده است
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} متوقف شده است
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
 DocType: Lead,Add to calendar on this date,افزودن به تقویم در این تاریخ
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,مشاهده قوانین برای اضافه کردن هزینه های حمل و نقل.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,رویدادهای نزدیک
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,از سرب
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,سفارشات برای تولید منتشر شد.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,انتخاب سال مالی ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
 DocType: Hub Settings,Name Token,نام رمز
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,فروش استاندارد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,حداقل یک انبار الزامی است
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,جایگزین کردن
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} در برابر فاکتور فروش {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,لطفا واحد به طور پیش فرض اندازه گیری وارد کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} در برابر فاکتور فروش {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,لطفا واحد به طور پیش فرض اندازه گیری وارد کنید
 DocType: Purchase Invoice Item,Project Name,نام پروژه
 DocType: Supplier,Mention if non-standard receivable account,ذکر است اگر حسابهای دریافتنی غیر استاندارد
 DocType: Journal Entry Account,If Income or Expense,اگر درآمد یا هزینه
 DocType: Features Setup,Item Batch Nos,دسته مورد شماره
 DocType: Stock Ledger Entry,Stock Value Difference,تفاوت ارزش سهام
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,منابع انسانی
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,منابع انسانی
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,آشتی پرداخت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,دارایی های مالیاتی
 DocType: BOM Item,BOM No,BOM بدون
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,مجله ورودی {0} می کند حساب کاربری ندارید {1} یا در حال حاضر همسان در برابر دیگر کوپن
 DocType: Item,Moving Average,میانگین متحرک
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM که جایگزین خواهد شد
 DocType: Account,Debit,بدهی
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,هزینه های اضافی
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,مالی سال پایان تاریخ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",می توانید بر روی کوپن نه فیلتر بر اساس، در صورتی که توسط کوپن گروه بندی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,را عین تامین کننده
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,را عین تامین کننده
 DocType: Quality Inspection,Incoming,وارد شونده
 DocType: BOM,Materials Required (Exploded),مواد مورد نیاز (منفجر شد)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),کاهش سود برای مرخصی بدون حقوق (LWP)
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},ردیف # {0}: سریال نه {1} با مطابقت ندارد {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,مرخصی گاه به گاه
 DocType: Batch,Batch ID,دسته ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},توجه: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},توجه: {0}
 ,Delivery Note Trends,روند تحویل توجه داشته باشید
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,خلاصه این هفته
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} باید مورد خریداری شده و یا زیر قرارداد را در ردیف شود {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,الان متوسط. نرخ خرید
 DocType: Task,Actual Time (in Hours),زمان واقعی (در ساعت)
 DocType: Employee,History In Company,تاریخچه در شرکت
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,خبرنامه
 DocType: Address,Shipping,حمل
 DocType: Stock Ledger Entry,Stock Ledger Entry,سهام لجر ورود
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,تاریخ پایان دوره منظور فعلی
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,را پیشنهاد نامه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,برگشت
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,واحد اندازه گیری پیش فرض برای متغیر باید همان الگو باشد
 DocType: Production Order Operation,Production Order Operation,ترتیب عملیات تولید
 DocType: Pricing Rule,Disable,از کار انداختن
 DocType: Project Task,Pending Review,در انتظار نقد و بررسی
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,شناسه مشتری
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,به زمان باید بیشتر از از زمان است
 DocType: Journal Entry Account,Exchange Rate,مظنهء ارز
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},انبار {0}: حساب مرجع {1} به شرکت bolong نمی {2}
 DocType: BOM,Last Purchase Rate,تاریخ و زمان آخرین نرخ خرید
 DocType: Account,Asset,دارایی
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,انبار موجود آیتم ها بسته بندی
 DocType: Item Variant,Item Variant,مورد نوع
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,تنظیم این آدرس الگو به عنوان پیش فرض به عنوان پیش فرض هیچ دیگر وجود دارد
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",مانده حساب در حال حاضر در بدهی، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید به عنوان&quot; اعتبار &quot;
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,مدیریت کیفیت
 DocType: Production Planning Tool,Filter based on customer,فیلتر بر اساس مشتری
 DocType: Payment Tool Detail,Against Voucher No,علیه کوپن بدون
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,بعد تماس
 DocType: Employee,Employment Type,نوع استخدام
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,دارایی های ثابت
+,Cash Flow,جریان وجوه نقد
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,دوره نرم افزار نمی تواند در سراسر دو رکورد alocation شود
 DocType: Item Group,Default Expense Account,حساب پیش فرض هزینه
 DocType: Employee,Notice (days),مقررات (روز)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,ساختمان و ذخیره سازی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,چاپ و ثابت
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,گره گروه
-DocType: Payment Reconciliation,Minimum Amount,حداقل مقدار
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,به روز رسانی به پایان رسید کالا
 DocType: Workstation,per hour,در ساعت
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,حساب برای انبار (موجودی ابدی) خواهد شد تحت این حساب ایجاد شده است.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,انبار نمی تواند حذف شود به عنوان ورودی سهام دفتر برای این انبار وجود دارد.
 DocType: Company,Distribution,توزیع
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,مبلغ پرداخت شده
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,مبلغ پرداخت شده
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,مدیر پروژه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,اعزام
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,حداکثر تخفیف را برای آیتم: {0} {1}٪ است
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics پشتیبانی
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},شرکت در انبارها از دست رفته {0}
 DocType: POS Profile,Terms and Conditions,شرایط و ضوابط
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},به روز باید در سال مالی باشد. با فرض به روز = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},به روز باید در سال مالی باشد. با فرض به روز = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",در اینجا شما می توانید قد، وزن، آلرژی ها، نگرانی های پزشکی و غیره حفظ
 DocType: Leave Block List,Applies to Company,امر به شرکت
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,نمی تواند به دلیل لغو ارائه سهام ورود {0} وجود دارد
@@ -3057,15 +3087,15 @@
 DocType: Sales Order Item,For Production,برای تولید
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,لطفا سفارش فروش در جدول فوق را وارد کنید
 DocType: Project Task,View Task,مشخصات کار
-apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,سال مالی شما آغاز می شود در
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,سال مالی شما آغاز می شود
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,لطفا رسید خرید وارد کنید
 DocType: Sales Invoice,Get Advances Received,دریافت پیشرفت های دریافتی
 DocType: Email Digest,Add/Remove Recipients,اضافه کردن / حذف دریافت کنندگان
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},معامله در برابر تولید متوقف مجاز ترتیب {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),راه اندازی سرور های دریافتی برای ایمیل پشتیبانی شناسه. (به عنوان مثال support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,کمبود تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
 DocType: Salary Slip,Salary Slip,لغزش حقوق و دستمزد
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.",تولید بسته بندی ورقه برای بسته تحویل داده می شود. مورد استفاده به اطلاع تعداد بسته، محتویات بسته و وزن آن است.
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,سوابق کارکنان.
 DocType: HR Settings,Payroll Settings,تنظیمات حقوق و دستمزد
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,مطابقت فاکتورها غیر مرتبط و پرداخت.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,محل سفارش
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,محل سفارش
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ریشه می تواند یک مرکز هزینه پدر و مادر ندارد
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,انتخاب نام تجاری ...
 DocType: Sales Invoice,C-Form Applicable,C-فرم قابل استفاده
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,تاریخ شروع
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,اختصاص برگ برای یک دوره.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,به منظور بررسی اینجا را کلیک کنید
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,حساب {0}: شما نمی توانید خود را به عنوان پدر و مادر اختصاص حساب
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,حساب {0}: شما نمی توانید خود را به عنوان پدر و مادر اختصاص حساب
 DocType: Purchase Invoice Item,Price List Rate,لیست قیمت نرخ
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",نمایش &quot;در انبار&quot; و یا &quot;نه در بورس&quot; بر اساس سهام موجود در این انبار.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),صورت مواد (BOM)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,انتظار می رود تاریخ شروع
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,حذف آیتم اگر از اتهامات عنوان شده و قابل انطباق با آن قلم نمی
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,به عنوان مثال. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,دريافت كردن
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,دريافت كردن
 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: Employee Leave Approver,Employee Leave Approver,کارمند مرخصی تصویب
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} با موفقیت به لیست خبرنامه اضافه شده است.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",نمی تواند به عنوان از دست رفته اعلام، به دلیل عبارت ساخته شده است.
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,خرید استاد مدیر
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,سفارش تولید {0} باید ارائه شود
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,سفارش تولید {0} باید ارائه شود
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},لطفا تاریخ شروع و پایان تاریخ برای مورد را انتخاب کنید {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,گزارشهای اصلی
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تا به امروز نمی تواند قبل از از تاریخ
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,نوع صنعت
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,مشکلی!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,هشدار: بگذارید برنامه شامل تاریخ های بلوک زیر
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,فاکتور فروش {0} در حال حاضر ارائه شده است
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,فاکتور فروش {0} در حال حاضر ارائه شده است
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,تاریخ تکمیل
 DocType: Purchase Invoice Item,Amount (Company Currency),مقدار (شرکت ارز)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,واحد سازمانی (گروه آموزشی) استاد.
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,سریال بدون خدمات قرارداد انقضاء
 DocType: Item,Unit of Measure Conversion,واحد تبدیل اندازه گیری
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,کارمند نمی تواند تغییر کند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,شما نمی توانید اعتباری و بدهی همان حساب در همان زمان
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,شما نمی توانید اعتباری و بدهی همان حساب در همان زمان
 DocType: Naming Series,Help HTML,راهنما HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},بین وزنها مجموع اختصاص داده باید 100٪ باشد. این {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},کمک هزینه برای بیش از {0} عبور برای مورد {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},کمک هزینه برای بیش از {0} عبور برای مورد {1}
 DocType: Address,Name of person or organization that this address belongs to.,نام و نام خانوادگی شخص و یا سازمانی که این آدرس متعلق به.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,تامین کنندگان شما
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,می توانید مجموعه ای نه به عنوان از دست داده تا سفارش فروش ساخته شده است.
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,تاریخ صدور
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: از {0} برای {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},ردیف # {0}: تنظیم کننده برای آیتم {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,وب سایت تصویر {0} متصل به مورد {1} را نمی توان یافت
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,لطفا گزینه ارز چند اجازه می دهد تا حساب با ارز دیگر را بررسی کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,لطفا گزینه ارز چند اجازه می دهد تا حساب با ارز دیگر را بررسی کنید
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,مورد: {0} در سیستم وجود ندارد
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,شما مجاز به تنظیم مقدار ثابت شده نیستید
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,شما مجاز به تنظیم مقدار ثابت شده نیستید
 DocType: Payment Reconciliation,Get Unreconciled Entries,دریافت Unreconciled مطالب
+DocType: Payment Reconciliation,From Invoice Date,از تاریخ فاکتور
 DocType: Cost Center,Budgets,بودجه
-DocType: Employee,Emergency Contact Details,جزییات تماس اضطراری
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,چه کاری انجام میدهد؟
 DocType: Delivery Note,To Warehouse,به انبار
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},حساب {0} است بیش از یک بار برای سال مالی وارد شده است {1}
 ,Average Commission Rate,متوسط نرخ کمیسیون
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,حضور و غیاب می تواند برای تاریخ های آینده باشد مشخص شده
 DocType: Pricing Rule,Pricing Rule Help,قانون قیمت گذاری راهنما
 DocType: Purchase Taxes and Charges,Account Head,سر حساب
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,به روز رسانی هزینه های اضافی برای محاسبه هزینه فرود آمد از اقلام
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,برق
 DocType: Stock Entry,Total Value Difference (Out - In),تفاوت ارزش ها (خارج - در)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,ردیف {0}: نرخ ارز الزامی است
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,ردیف {0}: نرخ ارز الزامی است
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID کاربر برای کارمند تنظیم نشده {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,از ادعای گارانتی
 DocType: Stock Entry,Default Source Warehouse,به طور پیش فرض منبع انبار
 DocType: Item,Customer Code,کد مشتری
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},یادآوری تاریخ تولد برای {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,روز پس از آخرین سفارش
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,دارایی های سهام
@@ -3271,7 +3301,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,با بستن حساب {0} باید از نوع مسئولیت / حقوق صاحبان سهام می باشد
 DocType: Authorization Rule,Based On,بر اساس
 DocType: Sales Order Item,Ordered Qty,دستور داد تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,مورد {0} غیر فعال است
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,مورد {0} غیر فعال است
 DocType: Stock Settings,Stock Frozen Upto,سهام منجمد تا حد
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},دوره و دوره به تاریخ برای تکرار اجباری {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,فعالیت پروژه / وظیفه.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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 باشد
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ارسال کردن مقدار (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
 DocType: Landed Cost Voucher,Landed Cost Voucher,فرود کوپن هزینه
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},لطفا {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تکرار در روز از ماه
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,بارگذاری حضور و غیاب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,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/accounts/doctype/journal_entry/journal_entry.js +446,Amount,مقدار
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,مقدار
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM جایگزین
 ,Sales Analytics,تجزیه و تحلیل ترافیک فروش
 DocType: Manufacturing Settings,Manufacturing Settings,تنظیمات ساخت
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,راه اندازی ایمیل
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,لطفا ارز به طور پیش فرض در شرکت استاد وارد
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,لطفا ارز به طور پیش فرض در شرکت استاد وارد
 DocType: Stock Entry Detail,Stock Entry Detail,جزئیات سهام ورود
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,یادآوری روزانه
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},درگیری قانون مالیاتی با {0}
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,مقدار زیاد تولید
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,مهندس
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,مجامع جستجو فرعی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},کد مورد نیاز در ردیف بدون {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},کد مورد نیاز در ردیف بدون {0}
 DocType: Sales Partner,Partner Type,نوع شریک
 DocType: Purchase Taxes and Charges,Actual,واقعی
 DocType: Authorization Rule,Customerwise Discount,Customerwise تخفیف
 DocType: Purchase Invoice,Against Expense Account,علیه صورتحساب
 DocType: Production Order,Production Order,سفارش تولید
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,نصب و راه اندازی {0} توجه داشته باشید در حال حاضر ارائه شده است
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,نصب و راه اندازی {0} توجه داشته باشید در حال حاضر ارائه شده است
 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,مشاهده در حال حاضر
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,فهرست تعطیلات قابل اجرا
 DocType: Employee,Cheque,چک
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,سری به روز رسانی
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,نوع گزارش الزامی است
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,نوع گزارش الزامی است
 DocType: Item,Serial Number Series,شماره سریال سری
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},انبار سهام مورد {0} در ردیف الزامی است {1}
 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/public/js/setup_wizard.js +101,The First User: You,اولین کاربر: شما
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},سال مالی تاریخ شروع و تاریخ پایان سال مالی در حال حاضر در سال مالی مجموعه {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,موفقیت آشتی
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},سال مالی تاریخ شروع و تاریخ پایان سال مالی در حال حاضر در سال مالی مجموعه {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,موفقیت آشتی
 DocType: Production Order,Planned End Date,برنامه ریزی پایان تاریخ
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,که در آن موارد ذخیره می شود.
 DocType: Tax Rule,Validity,اعتبار
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,حضور
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,تاریخ ارسال و زمان ارسال الزامی است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,تاریخ ارسال و زمان ارسال الزامی است
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,قالب های مالیاتی برای خرید معاملات.
 ,Item Prices,قیمت مورد
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,به عبارت قابل مشاهده خواهد بود هنگامی که شما سفارش خرید را نجات دهد.
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,بررسی تاریخ
 DocType: Purchase Invoice,Advance Payments,پیش پرداخت
 DocType: Purchase Taxes and Charges,On Net Total,در مجموع خالص
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,انبار هدف در ردیف {0} باید به همان ترتیب تولید می شود
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,انبار هدف در ردیف {0} باید به همان ترتیب تولید می شود
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,بدون اجازه به استفاده از ابزار پرداخت
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'هشدار از طریق آدرس ایمیل' برای دوره ی زمانی محدود %s مشخص نشده است
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,نرخ ارز می تواند پس از ساخت ورودی با استفاده از یک ارز دیگر، نمی توان تغییر داد
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,نرخ ارز می تواند پس از ساخت ورودی با استفاده از یک ارز دیگر، نمی توان تغییر داد
 DocType: Company,Round Off Account,دور کردن حساب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,هزینه های اداری
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,مشاور
 DocType: Customer Group,Parent Customer Group,مشتریان پدر و مادر گروه
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,تغییر
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,تغییر
 DocType: Purchase Invoice,Contact Email,تماس با ایمیل
 DocType: Appraisal Goal,Score Earned,امتیاز کسب
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",به عنوان مثال &quot;من شرکت LLC&quot;
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,وزن UOM
 DocType: Email Digest,Receivables / Payables,مطالبات / بدهی
 DocType: Delivery Note Item,Against Sales Invoice,علیه فاکتور فروش
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,حساب اعتباری
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,حساب اعتباری
 DocType: Landed Cost Item,Landed Cost Item,فرود از اقلام هزینه
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,نمایش صفر ارزش
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,تعداد آیتم به دست آمده پس از تولید / repacking از مقادیر داده شده از مواد خام
 DocType: Payment Reconciliation,Receivable / Payable Account,حساب دریافتنی / پرداختنی
 DocType: Delivery Note Item,Against Sales Order Item,علیه سفارش فروش مورد
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
 DocType: Item,Default Warehouse,به طور پیش فرض انبار
 DocType: Task,Actual End Date (via Time Logs),واقعی پایان تاریخ (از طریق زمان سیاههها)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},بودجه می تواند در برابر حساب گروه اختصاص {0}
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,برنامه ریزی سیاهههای مربوط به زمان در خارج از ساعات کاری ایستگاه کاری.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} در حال حاضر ارائه شده است
 ,Items To Be Requested,گزینه هایی که درخواست شده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,دریافت آخرین خرید نرخ
 DocType: Time Log,Billing Rate based on Activity Type (per hour),نرخ صدور صورت حساب بر اساس نوع فعالیت (در ساعت)
 DocType: Company,Company Info,اطلاعات شرکت
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent",شرکت پست الکترونیک ID یافت نشد، از این رو پست الکترونیکی فرستاده نمی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),استفاده از وجوه (دارایی)
 DocType: Production Planning Tool,Filter based on item,فیلتر در مورد بر اساس
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,حساب بانکی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,حساب بانکی
 DocType: Fiscal Year,Year Start Date,سال تاریخ شروع
 DocType: Attendance,Employee Name,نام کارمند
 DocType: Sales Invoice,Rounded Total (Company Currency),گرد مجموع (شرکت ارز)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,نمی توانید به گروه پنهانی به دلیل نوع کاربری انتخاب شده است.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,نمی توانید به گروه پنهانی به دلیل نوع کاربری انتخاب شده است.
 DocType: Purchase Common,Purchase Common,خرید مشترک
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,از فرصت
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,مزایای کارکنان
 DocType: Sales Invoice,Is POS,آیا POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
 DocType: Production Order,Manufactured Qty,تولید تعداد
 DocType: Purchase Receipt Item,Accepted Quantity,تعداد پذیرفته شده
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} وجود ندارد
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,لوایح مطرح شده به مشتریان.
 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 +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} مشترک افزوده شد
 DocType: Maintenance Schedule,Schedule,برنامه
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",تعریف بودجه برای این مرکز هزینه. برای تنظیم اقدام بودجه، نگاه کنید به &quot;فهرست شرکت&quot;
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,خواندن 3
 ,Hub,قطب
 DocType: GL Entry,Voucher Type,کوپن نوع
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
 DocType: Expense Claim,Approved,تایید
 DocType: Pricing Rule,Price,قیمت
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',کارمند رها در {0} باید تنظیم شود به عنوان چپ
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,مطالب مجله حسابداری.
 DocType: Delivery Note Item,Available Qty at From Warehouse,تعداد موجود در انبار از
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ردیف {0}: حزب / حساب با مطابقت ندارد {1} / {2} در {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,برای ایجاد یک حساب مالیاتی
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,لطفا هزینه حساب وارد کنید
 DocType: Account,Stock,موجودی
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,پایان دادن به قرارداد تاریخ
 DocType: Sales Order,Track this Sales Order against any Project,پیگیری این سفارش فروش در مقابل هر پروژه
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,سفارشات فروش کشش (در انتظار برای ارائه) بر اساس معیارهای فوق
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,از عبارت تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,از عبارت تامین کننده
 DocType: Deduction Type,Deduction Type,نوع کسر
 DocType: Attendance,Half Day,نیم روز
 DocType: Pricing Rule,Min Qty,حداقل تعداد
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,تاریخ تراکنش
 DocType: Production Plan Item,Planned Qty,برنامه ریزی تعداد
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,مالیات ها
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,برای کمیت (تعداد تولیدی) الزامی است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,برای کمیت (تعداد تولیدی) الزامی است
 DocType: Stock Entry,Default Target Warehouse,به طور پیش فرض هدف انبار
 DocType: Purchase Invoice,Net Total (Company Currency),مجموع خالص (شرکت ارز)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ردیف {0}: حزب نوع و حزب تنها در برابر دریافتنی / حساب پرداختنی قابل اجرا است
@@ -3553,15 +3584,15 @@
 DocType: Item Group,General Settings,تنظیمات عمومی
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,از پول و ارز را نمی توان همان
 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/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,شما باید فرم را قبل از ادامه  دادن ذخیره کنید
 DocType: Item Attribute,Numeric Values,مقادیر عددی
 apps/erpnext/erpnext/public/js/setup_wizard.js +262,Attach Logo,ضمیمه لوگو
 DocType: Customer,Commission Rate,کمیسیون نرخ
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,متغیر را
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,برنامه بلوک مرخصی توسط بخش.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,سبد خرید خالی است
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,سبد خرید خالی است
 DocType: Production Order,Actual Operating Cost,هزینه های عملیاتی واقعی
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,ریشه را نمیتوان ویرایش کرد.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,ریشه را نمیتوان ویرایش کرد.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,مقدار اختصاص داده شده نمی تواند بزرگتر از مقدار unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,اجازه تولید در تعطیلات
 DocType: Sales Order,Customer's Purchase Order Date,مشتری سفارش خرید عضویت
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,طراح
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,شرایط و ضوابط الگو
 DocType: Serial No,Delivery Details,جزئیات تحویل
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,به طور خودکار ایجاد درخواست مواد اگر مقدار می افتد در زیر این سطح
 ,Item-wise Purchase Register,مورد عاقلانه ثبت نام خرید
 DocType: Batch,Expiry Date,تاریخ انقضا
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item",برای تنظیم سطح دوباره سفارش دادن، مورد باید مورد خرید و یا مورد ساخت می باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item",برای تنظیم سطح دوباره سفارش دادن، مورد باید مورد خرید و یا مورد ساخت می باشد
 ,Supplier Addresses and Contacts,آدرس منبع و اطلاعات تماس
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,لطفا ابتدا دسته را انتخاب کنید
 apps/erpnext/erpnext/config/projects.py +18,Project master.,کارشناسی ارشد پروژه.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(نیم روز)
 DocType: Supplier,Credit Days,روز اعتباری
 DocType: Leave Type,Is Carry Forward,آیا حمل به جلو
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,گرفتن اقلام از BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,بیل از مواد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ردیف {0}: حزب نوع و حزب دریافتنی / حساب پرداختنی مورد نیاز است {1}
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,دلیلی برای ترک
 DocType: Expense Claim Detail,Sanctioned Amount,مقدار تحریم
 DocType: GL Entry,Is Opening,باز
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},ردیف {0}: بدهی ورود می تواند با پیوند داده نمی شود {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,حساب {0} وجود ندارد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},ردیف {0}: بدهی ورود می تواند با پیوند داده نمی شود {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,حساب {0} وجود ندارد
 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 36abaf0..1ac410a 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,kuluttajatavarat
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,valitse ensin osapuoli tyyppi
 DocType: Item,Customer Items,asiakkaan tuotteet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,tili {0}: emotili {1} ei voi tilikirja
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,tili {0}: emotili {1} ei voi tilikirja
 DocType: Item,Publish Item to hub.erpnext.com,Julkaise Tuote on hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,sähköposti-ilmoitukset
 DocType: Item,Default Unit of Measure,oletus mittayksikkö
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},valuuttahinnasto vaaditaan {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* lasketaan tapahtumassa
 DocType: Purchase Order,Customer Contact,Asiakaspalvelu Yhteystiedot
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,materiaalipyynnöstä
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,materiaalipyynnöstä
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} puu
 DocType: Job Applicant,Job Applicant,Työnhakija
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ei enempää tuloksia
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. käytä tätä vaihtoehtoa määritelläksesi hakukelpoisen asiakaskohtaisen tuotekoodin
 DocType: Mode of Payment Account,Mode of Payment Account,maksutilin tila
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,näytä mallivaihtoehdot
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Määrä
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Määrä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),lainat (vastattavat)
 DocType: Employee Education,Year of Passing,vuoden syöttö
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,varastossa
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,terveydenhuolto
 DocType: Purchase Invoice,Monthly,Kuukausittain
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Viivästyminen (päivää)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,lasku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,lasku
 DocType: Maintenance Schedule Item,Periodicity,jaksotus
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,sähköpostiosoite
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Verovuoden {0} vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,puolustus
 DocType: Company,Abbr,lyhenteet
 DocType: Appraisal Goal,Score (0-5),pisteet (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},rivi {0}: {1} {2} ei täsmää {3} kanssa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},rivi {0}: {1} {2} ei täsmää {3} kanssa
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Rivi # {0}:
 DocType: Delivery Note,Vehicle No,ajoneuvon nro
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Ole hyvä ja valitse hinnasto
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Ole hyvä ja valitse hinnasto
 DocType: Production Order Operation,Work In Progress,työnalla
 DocType: Employee,Holiday List,lomaluettelo
 DocType: Time Log,Time Log,aikaloki
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama yhtiö on merkitty enemmän kuin kerran
 DocType: Employee,Married,Naimisissa
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ei saa {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
 DocType: Payment Reconciliation,Reconcile,yhteensovitus
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,päivittäistavara
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,tee pankkikirjaus
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,eläkerahastot
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,varasto vaaditaan mikäli tilin tyyppi on varastotili
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,varasto vaaditaan mikäli tilin tyyppi on varastotili
 DocType: SMS Center,All Sales Person,kaikki myyjät
 DocType: Lead,Person Name,henkilönimi
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","täppää toistuva tilaus, lopettaaksesi toistumisen poista täppä tai aseta päätöspäivä"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,kiinnostunut
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,materiaalilasku
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Aukko
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},alkaen {0} on {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},alkaen {0} on {1}
 DocType: Item,Copy From Item Group,kopioi tuoteryhmästä
 DocType: Journal Entry,Opening Entry,avauskirjaus
 DocType: Stock Entry,Additional Costs,Lisäkustannukset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,tilin tapahtumaa ei voi muuntaa ryhmäksi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,tilin tapahtumaa ei voi muuntaa ryhmäksi
 DocType: Lead,Product Enquiry,tavara kysely
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Anna yritys ensin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Ole hyvä ja valitse Company ensin
 DocType: Employee Education,Under Graduate,valmistumisen alla
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,tavoitteeseen
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,tavoitteeseen
 DocType: BOM,Total Cost,kokonaiskustannukset
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,aktiivisuus loki:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,tuote {0} ei löydy tai se on vanhentunut
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,tuotteen {0} tulee olla ostotuote
 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"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,tuote {0} ei ole aktiivinen tai sen elinkaari loppu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,tuote {0} ei ole aktiivinen tai sen elinkaari loppu
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,päivitetään kun myyntilasku on lähetetty
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,henkilöstömoduulin asetukset
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,toteutetuneiden toimien lisätiedot
 DocType: Serial No,Maintenance Status,"huolto, tila"
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,tuotteet ja hinnoittelu
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},alkaen päivä tulee olla tilikaudella olettaen alkaen päivä = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},alkaen päivä tulee olla tilikaudella olettaen alkaen päivä = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"valitse työntekijä, jolle olet tekemässä arvioinnin"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},kustannuspaikka {0} ei kuulu yritykseen {1}
 DocType: Customer,Individual,yksilöllinen
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Anna Company
 DocType: Delivery Note Item,Against Sales Invoice Item,myyntilaskun kohdistus / tuote
 ,Production Orders in Progress,tuotannon tilaukset on käsittelyssä
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Nettokassavirta Rahoituksen
 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
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},seuraava toistuva {0} tehdään {1}:n
@@ -221,6 +222,7 @@
 ,Contact Name,"yhteystiedot, nimi"
 DocType: Production Plan Item,SO Pending Qty,odottavat myyntitilaukset yksikkömäärä
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,tee palkkalaskelma edellä mainittujen kriteerien mukaan
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,ei annettua kuvausta
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pyydä ostaa.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,vain valtuutettu käyttäjä voi hyväksyä tämän poistumissovelluksen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lievittää Date on oltava suurempi kuin päivämäärä Liittymisen
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,tuote verkkosivujen asetukset
 DocType: Payment Tool,Reference No,Viitenumero
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,poistuminen estetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Vuotuinen
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,"varaston täsmäytys, tuote"
 DocType: Stock Entry,Sales Invoice No,"myyntilasku, nro"
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,toimittaja tyyppi
 DocType: Item,Publish in Hub,Julkaista Hub
 ,Terretory,alue
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,tuote {0} on peruutettu
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,tuote {0} on peruutettu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,materiaalipyyntö
 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 +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},tuotetta {0} ei löydy 'raaka-aineet toimitettu' ostotilaus taulukko {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},tuotetta {0} ei löydy 'raaka-aineet toimitettu' ostotilaus taulukko {1}
 DocType: Employee,Relation,Suhde
 DocType: Shipping Rule,Worldwide Shipping,Maailmanlaajuinen Toimitus
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,asiakkailta vahvistetut tilaukset
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,ehdotuksia
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"tuoteryhmä työkalu, aseta budjetit tällä, voit tehdä kausiluonteisen budjetin asettamalla jaksotuksen"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},syötä emotiliryhmä varastolle {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksu vastaan {0} {1} ei voi olla suurempi kuin jäljellä {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksu vastaan {0} {1} ei voi olla suurempi kuin jäljellä {2}
 DocType: Supplier,Address HTML,osoite HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,muodosta aikataulu
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Viimeisin
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 merkkiä
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,luettelon ensimmäinen poistumis hyväksyjä on oletushyväksyjä
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Oppia
 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
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,hallitse myyjäpuuta
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Multi Valuutta
 DocType: Payment Reconciliation Invoice,Invoice Type,lasku tyyppi
 DocType: Sales Invoice Item,Delivery Note,lähete
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,verojen perusmääritykset
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,verojen perusmääritykset
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Yhteenveto tällä viikolla ja keskeneräisten toimien
 DocType: Workstation,Rent Cost,vuokrakustannukset
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Ole hyvä ja valitse kuukausi ja vuosi
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM on saatavana, lähetteessä, ostolaskussa, tuotannon tilauksessa, ostotilauksessa, ostokuitissa, myyntilaskussa, myyntilauksessa, varaston kirjauksessa ja aikataulukossa"
 DocType: Item Tax,Tax Rate,vero taso
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,valitse tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,valitse tuote
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","tuote: {0} hallinnoidaan eräkohtaisesti, eikä sitä voi päivittää käyttämällä varaston täsmäytystä, käytä varaston kirjausta"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,ostolasku {0} on lähetetty
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,ostolasku {0} on lähetetty
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Rivi # {0}: Erä on oltava sama kuin {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,muunna pois ryhmästä
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ostokuitti on lähetettävä
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Lääketieteellinen
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,häviön syy
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},työasema on suljettu seuraavina päivinä lomapäivien {0} mukaan
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mahdollisuudet
 DocType: Employee,Single,yksittäinen
 DocType: Issue,Attachment,Liite
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,budjettia ei voi määrittää kustannuspaikkaryhmälle
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,lomien valvonta
 DocType: Material Request Item,Required Date,pyydetty päivä
 DocType: Delivery Note,Billing Address,laskutusosoite
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,syötä tuotekoodi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,syötä tuotekoodi
 DocType: BOM,Costing,kustannuslaskenta
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",täpättäessä veron arvomäärää pidetään jo sisällettynä tulostetasoon / tulostemäärään
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,yksikkömäärä yhteensä
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,syötä varasto jonne materiaalipyyntö ohjataan
 DocType: Production Order,Additional Operating Cost,lisätoimintokustannukset
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kosmetiikka
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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,Netto
 DocType: Employee,Emergency Phone,hätänumero
 ,Serial No Warranty Expiry,sarjanumeron takuu on päättynyt
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,tuote {0} ei ole ostotuote
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,tuote {0} ei ole ostotuote
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} virheellinen osoite 'ilmoitukset \ sähköpostiosoite'
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,"laskutuksen kokomaismäärä, tämä vuosi"
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lisää / muokkaa veroja ja maksuja
 DocType: Purchase Invoice,Supplier Invoice No,toimittajan laskun nro
 DocType: Territory,For reference,viitteeseen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Voi poistaa Sarjanumero {0}, koska sitä käytetään varastotapahtumat"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),sulku (cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),sulku (cr)
 DocType: Serial No,Warranty Period (Days),takuuaika (päivää)
 DocType: Installation Note Item,Installation Note Item,asennus huomautus tuote
 ,Pending Qty,Odottaa Kpl
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**toimitusten kk jaksotus** auttaa jakamaan budjettia eri kuukausille, jos on kausivaihtelua. **toimitusten kk jaksotus** otetaan **kustannuspaikka** kohdassa."
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,tietuetta ei löydy laskutaulukosta
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,tietuetta ei löydy laskutaulukosta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,valitse ensin yritys ja osapuoli tyyppi
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,tili- / kirjanpitokausi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",sarjanumeroita ei voi yhdistää
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,Projekti Tehtävä
 ,Lead Id,vihje tunnus
 DocType: C-Form Invoice Detail,Grand Total,kokonaissumma
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,tilikauden aloituspäivä tule olla suurempi kuin tilikauden päättymispäivä
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,tilikauden aloituspäivä tule olla suurempi kuin tilikauden päättymispäivä
 DocType: Warranty Claim,Resolution,johtopäätös
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Toimitettu: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Toimitettu: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,maksettava tili
 DocType: Sales Order,Billing and Delivery Status,Laskutus ja Toiminnan tila
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Toista asiakkaat
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,tarjoukseen
 DocType: Lead,Middle Income,keskitason tulo
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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.,"Oletus mittayksikkö Tuote {0} ei voi muuttaa suoraan, koska olet jo tehnyt joitakin tapahtuma (s) toisen UOM. Sinun täytyy luoda uusi Tuote käyttää eri Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +711,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.,"Oletus mittayksikkö Tuote {0} ei voi muuttaa suoraan, koska olet jo tehnyt joitakin tapahtuma (s) toisen UOM. Sinun täytyy luoda uusi Tuote käyttää eri Default UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,kohdennettu arvomäärä ei voi olla negatiivinen
 DocType: Purchase Order Item,Billed Amt,"laskutettu, pankkipääte"
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"perustettu varasto, minne varastokirjaukset tehdään"
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,tuotannon tilaus vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Ehdotus Kirjoittaminen
 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 työntekijä tunnuksella
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},negatiivisen varaston virhe ({6}) tuotteelle {0} varasto {1}:ssa {2} {3}:lla {4} {5}:ssa
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},negatiivisen varaston virhe ({6}) tuotteelle {0} varasto {1}:ssa {2} {3}:lla {4} {5}:ssa
 DocType: Fiscal Year Company,Fiscal Year Company,yrityksen tilikausi
 DocType: Packing Slip Item,DN Detail,DN lisätiedot
 DocType: Time Log,Billed,Laskutetaan
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,Oletus Kustannuslaskenta Hinta
 DocType: Maintenance Schedule,Maintenance Schedule,huoltoaikataulu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","hinnoittelusääntöjen perusteet suodatetaan asiakkaan, asiakasryhmän, alueen, toimittajan, toimittaja tyypin, myyntikumppanin jne mukaan"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Nettomuutos Inventory
 DocType: Employee,Passport Number,passin numero
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,hallinta
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,ostokuitista
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,sama tuote on syötetty monta kertaa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,ostokuitista
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,sama tuote on syötetty monta kertaa
 DocType: SMS Settings,Receiver Parameter,vastaanottoparametri
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'perustaja' ja 'ryhmä' ei voi olla samat
 DocType: Sales Person,Sales Person Targets,myyjän tavoitteet
 DocType: Production Order Operation,In minutes,minuutteina
 DocType: Issue,Resolution Date,johtopäätös päivä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,Please set default Cash or Bank account in Mode of Payment {0},valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
 DocType: Selling Settings,Customer Naming By,asiakkaan nimennyt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,muunna ryhmäksi
 DocType: Activity Cost,Activity Type,aktiviteettimuoto
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Kustannustoiminta
 DocType: Activity Cost,Projects User,Projektit Käyttäjä
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,käytetty
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} ei löydy laskun lisätiedot taulukosta
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} ei löydy laskun lisätiedot taulukosta
 DocType: Company,Round Off Cost Center,pyöristys kustannuspaikka
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,huoltokäynti {0} on peruttava ennen myyntitilauksen perumista
 DocType: Material Request,Material Transfer,materiaalisiirto
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Markkinointi
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"jäljitä tuotteen myynti- ja ostotositteet sarjanumeron mukaan, tätä käytetään myös tavaran takuutietojen jäljitykseen"
 DocType: Purchase Receipt Item Supplied,Current Stock,nykyinen varasto
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Hylätty Warehouse on pakollista vastaan regected kohde
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Yhteensä laskutus tänä vuonna
 DocType: Account,Expenses Included In Valuation,"kulut, jotka sisältyy arvoon"
 DocType: Employee,Provide email id registered in company,tarkista sähköpostitunnuksen rekisteröinti yritykselle
 DocType: Hub Settings,Seller City,myyjä kaupunki
 DocType: Email Digest,Next email will be sent on:,Seuraava sähköpostiviesti lähetetään:
 DocType: Offer Letter Term,Offer Letter Term,Tarjoa Kirje Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,tuotteella on useampia malleja
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,tuotetta {0} ei löydy
 DocType: Bin,Stock Value,varastoarvo
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,tyyppipuu
@@ -580,18 +584,18 @@
 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 lähettäessä
 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 +92,{0} is not a stock Item,{0} ei ole varastotuote
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ei ole varastotuote
 DocType: Mode of Payment Account,Default Account,oletustili
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"vihje on annettava, jos tilaisuus on tehty vihjeestä"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Ole hyvä ja valitse viikoittain off päivä
 DocType: Production Order Operation,Planned End Time,Suunnitellut End Time
 ,Sales Person Target Variance Item Group-Wise,"tuoteryhmä työkalu, myyjä ja vaihtelu tavoite"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,tilin tapahtumaa ei voi muuttaa tilikirjaksi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,tilin tapahtumaa ei voi muuttaa tilikirjaksi
 DocType: Delivery Note,Customer's Purchase Order No,asiakkaan ostotilaus numero
 DocType: Employee,Cell Number,solunumero
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiaali pyynnöt Luotu
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Menetetty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,kyseistä tositetta ei voi kohdistaa 'päiväkirjakirjaus' sarakkeessa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,kyseistä tositetta ei voi kohdistaa 'päiväkirjakirjaus' sarakkeessa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,tilaisuuteen
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,kuukausipalkka tosite
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: valitse {0} tyypistä {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rivi {0}: Conversion Factor on pakollista
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,"kirjanpidon kirjaukset voidaan kodistaa jatkosidoksiin, kohdistus ryhmiin ei ole sallittu"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},ostokuitin numero vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},ostokuitin numero vaaditaan tuotteelle {0}
 DocType: Item Attribute Value,Item Attribute Value,"tuotetuntomerkki, arvo"
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,myynnin kampanjat
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Hinnasto ei valittu
 DocType: Employee,Family Background,taustaperhe
 DocType: Process Payroll,Send Email,lähetä sähköposti
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Varoitus: Virheellinen Liite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Varoitus: Virheellinen Liite {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ei oikeuksia
 DocType: Company,Default Bank Account,oletus pankkitili
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",valitse osapuoli tyyppi saadaksesi osapuolen mukaisen suodatuksen
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,tuotteet joilla on korkeampi painoarvo nätetään ylempänä
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,pankin täsmäytys lisätiedot
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,omat laskut
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,omat laskut
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Yksikään työntekijä ei löytynyt
 DocType: Purchase Order,Stopped,pysäytetty
 DocType: Item,If subcontracted to a vendor,alihankinta toimittajalle
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,lähetä nyt
 ,Support Analytics,tuki Analytics
 DocType: Item,Website Warehouse,verkkosivujen varasto
+DocType: Payment Reconciliation,Minimum Invoice Amount,Pienin Laskun summa
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-muoto tietue
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Jotta &quot;Point of Sale&quot; ominaisuuksia
 DocType: Bin,Moving Average Rate,liukuva keskiarvo taso
 DocType: Production Planning Tool,Select Items,valitse tuotteet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} päivätty {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} päivätty {2}
 DocType: Maintenance Visit,Completion Status,katselmus tila
 DocType: Sales Invoice Item,Target Warehouse,tavoite varasto
 DocType: Item,Allow over delivery or receipt upto this percent,Salli yli toimitus- tai kuitti lähetettävään tähän prosenttia
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,muodosta automaattinen viesti toiminnon lähetyksessä
 DocType: Production Order,Item To Manufacture,tuote valmistukseen
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} tila on {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ostotilaus to Payment
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ostotilaus to Payment
 DocType: Sales Order Item,Projected Qty,ennustettu yksikkömäärä
 DocType: Sales Invoice,Payment Due Date,maksun eräpäivä
 DocType: Newsletter,Newsletter Manager,uutiskirjehallinta
@@ -704,7 +709,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","tilin tase on jo kredit, syötetyn arvon tulee olla 'tasapainossa' eli 'debet'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","tilin tase on jo kredit, syötetyn arvon tulee olla 'tasapainossa' eli 'debet'"
 DocType: Account,Balance must be,taseen on oltava
 DocType: Hub Settings,Publish Pricing,Julkaise Hinnoittelu
 DocType: Notification Control,Expense Claim Rejected Message,kuluvaatimus hylätty viesti
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,valuuttataso valvonta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} tulee olla aktiivinen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} tulee olla aktiivinen
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,valitse ensin asiakirjan tyyppi
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,peruuta materiaalikäynti {0} ennen peruutat huoltokäynnin
 DocType: Salary Slip,Leave Encashment Amount,"perintä, arvomäärä"
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,oletus maksettava tilit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,työntekijä {0} ei ole aktiivinen tai ei ole olemassa
 DocType: Features Setup,Item Barcode,tuote viivakoodi
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,tuotemallit {0} päivitetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,tuotemallit {0} päivitetty
 DocType: Quality Inspection Reading,Reading 6,Lukeminen 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,"ostolasku, edistynyt"
 DocType: Address,Shop,osta
 DocType: Hub Settings,Sync Now,synkronoi nyt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},rivi {0}: kredit kirjausta ei voi kohdistaa {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},rivi {0}: kredit kirjausta ei voi kohdistaa {1}
 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"
 DocType: Employee,Permanent Address Is,pysyvä osoite on
 DocType: Production Order Operation,Operation completed for how many finished goods?,Toiminto suoritettu kuinka monta valmiit tavarat?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,brändi
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Avustus yli- {0} ristissä Kohta {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Avustus yli- {0} ristissä Kohta {1}.
 DocType: Employee,Exit Interview Details,poistu haastattelun lisätiedoista
 DocType: Item,Is Purchase Item,on ostotuote
 DocType: Journal Entry Account,Purchase Invoice,ostolasku
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,sanat yhteensä
 DocType: Material Request Item,Lead Time Date,"virtausaika, päiväys"
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,on pakollinen. Ehkä Valuutanvaihto tietuetta ei luotu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Rivi # {0}: Ilmoittakaa Sarjanumero alamomentin {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Rivi # {0}: Ilmoittakaa Sarjanumero alamomentin {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","tuotteet 'tavarakokonaisuudessa' varasto, sarjanumero ja eränumero pidetään olevan samasta 'pakkausluettelosta' taulukossa, mikäli sarja- ja eränumero on sama kaikille tuotteille tai 'tuotekokonaisuus' tuotteelle, (arvoja voi kirjata tuotteen päätaulukossa), arvot kopioidaan 'pakkausluettelo' taulukkoon"
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,toimitukset asiakkaille
 DocType: Purchase Invoice Item,Purchase Order Item,Ostotilaus Kohde
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,vaihtelu
 ,Company Name,Yrityksen nimi
 DocType: SMS Center,Total Message(s),viestit yhteensä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,talitse siirrettävä tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Select Item for Transfer,talitse siirrettävä tuote
+DocType: Purchase Invoice,Additional Discount Percentage,Muita alennusprosenttia
 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"
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,salli käyttäjän muokata hinnaston tasoa tapahtumissa
 DocType: Pricing Rule,Max Qty,max yksikkömäärä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,rivi {0}: maksu kohdistettuna myynti- / ostotilaukseen tulee aina merkitä ennakkomaksuksi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,kemiallinen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,kaikki tavarat on jo siirretty tuotantotilaukseen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,kaikki tavarat on jo siirretty tuotantotilaukseen
 DocType: Process Payroll,Select Payroll Year and Month,valitse palkkaluettelo vuosi ja kuukausi
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","siirry kyseiseen ryhmään (yleensä kohteessa rahastot> lyhytaikaiset vastaavat> pankkitilit ja tee uusi tili (valitsemalla lisää alasidos) ""pankki"""
 DocType: Workstation,Electricity Cost,sähkön kustannukset
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),kaikki vihjeet (avoimet)
 DocType: Purchase Invoice,Get Advances Paid,hae maksetut ennakot
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Liitä Picture
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Tehdä
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Tehdä
 DocType: Journal Entry,Total Amount in Words,sanat kokonaisarvomäärä
 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.,"tapahui virhe: todennäköinen syy on ettet ole tallentanut lomakketta, mikäli ongelma jatkuu ota yhteyttä sähköpostiin support@erpnext.com"
-apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Ostoskori
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Ostoskori
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},tilaus tyyppi tulee olla {0}:n
 DocType: Lead,Next Contact Date,seuraava yhteydenottopvä
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,avaus yksikkömäärä
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,kassa- / pankkitili
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Poistettu kohteita ei muutu määrän tai arvon.
 DocType: Delivery Note,Delivery To,toimitus (lle)
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Taito pöytä on pakollinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} ei voi olla negatiivinen
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,alennus
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,alennus
 DocType: Features Setup,Purchase Discounts,Osto Alennukset
 DocType: Workstation,Wages,Palkat
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"päivitetään, jos aikaloki on 'laskutettavaa'"
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,Lähettävällä valtiolla
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"tuote tulee lisätä ""hae kohteita ostokuitit"" painikella"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,myynnin kulut
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,perusostaminen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,perusostaminen
 DocType: GL Entry,Against,kohdistus
 DocType: Item,Default Selling Cost Center,myyntien oletuskustannuspaikka
 DocType: Sales Partner,Implementation Partner,sovelluskumppani
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,jakelija
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ostoskori toimitus sääntö
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,tuotannon tilaus {0} tulee peruuttaa ennen myyntitilauksen peruutusta
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Aseta &#39;Käytä lisäalennusta &quot;
 ,Ordered Items To Be Billed,tilatut laskutettavat tuotteet
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Vuodesta Range on oltava vähemmän kuin laitumelle
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,valitse aikaloki ja lähetä tehdäksesi uuden myyntilaskun
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,tämä aikaloki erä on laskutettu
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,tee tilaisuus
 DocType: Salary Slip,Leave Without Pay,"poistu, ilman palkkaa"
-DocType: Supplier,Communications,viestinnät
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,kapasiteetin suunnittelu virhe
 ,Trial Balance for Party,Koetase Party
 DocType: Lead,Consultant,konsultti
 DocType: Salary Slip,Earnings,ansiot
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,valmiit tuotteet {0} tulee vastaanottaa valmistus tyyppi kirjauksella
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,avaa kirjanpidon tase
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,valmiit tuotteet {0} tulee vastaanottaa valmistus tyyppi kirjauksella
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,avaa kirjanpidon tase
 DocType: Sales Invoice Advance,Sales Invoice Advance,"myyntilasku, ennakko"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Mitään pyytää
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','aloituspäivä' ei voi olla ennen 'päättymispäivää'
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,nykyinen tilikausi
 DocType: Global Defaults,Disable Rounded Total,poista 'pyöristys yhteensä' käytöstä
 DocType: Lead,Call,pyyntö
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'kirjaukset' ei voi olla tyhjä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'kirjaukset' ei voi olla tyhjä
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},monista rivi {0} sama kuin {1}
 ,Trial Balance,tasekokeilu
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,työntekijän perusmääritykset
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,käyttäjätunnus
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,näytä tilikirja
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,aikaisintaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"An Item Group exists with same name, please change the item name or rename the item group","samanniminen tuoteryhmä on jo olemassa, vaihda tuotteen nimeä tai nimeä tuoteryhmä uudelleen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +444,"An Item Group exists with same name, please change the item name or rename the item group","samanniminen tuoteryhmä on jo olemassa, vaihda tuotteen nimeä tai nimeä tuoteryhmä uudelleen"
 DocType: Production Order,Manufacture against Sales Order,valmistus kohdistus myyntitilaukseen
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,tuote {0} ei voi olla erä
 ,Budget Variance Report,budjettivaihtelu raportti
 DocType: Salary Slip,Gross Pay,bruttomaksu
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},jäädytettyä tiliä {0} ei voi muokata
 DocType: Journal Entry,Get Outstanding Invoices,hae odottavat laskut
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,myyntitilaus {0} ei ole kelvollinen
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",yhtiöitä ei voi yhdistää
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged",yhtiöitä ei voi yhdistää
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}"
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,aiheen alue
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,sopimus
 DocType: Email Digest,Add Quote,Lisää Lainaus
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM muuntokerroin vaaditaan UOM {0}:lle tuotteessa: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM muuntokerroin vaaditaan UOM {0}:lle tuotteessa: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,välilliset kulut
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,rivi {0}: yksikkömäärä vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Maatalous
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,Omat tavarat tai palvelut
 DocType: Mode of Payment,Mode of Payment,maksutapa
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,Website Kuva pitäisi olla julkinen tiedoston tai verkkosivuston URL-
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Kuva pitäisi olla julkinen tiedoston tai verkkosivuston URL-
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,tämä on kantatuoteryhmä eikä sitä voi muokata
 DocType: Journal Entry Account,Purchase Order,Ostotilaus
 DocType: Warehouse,Warehouse Contact Info,Varaston yhteystiedot
@@ -1018,8 +1024,8 @@
 DocType: Email Digest,Annual Income,Vuositulot
 DocType: Serial No,Serial No Details,sarjanumeron lisätiedot
 DocType: Purchase Invoice Item,Item Tax Rate,tuotteen verotaso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, vain kredit tili voidaan kohdistaa debet kirjaukseen"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","{0}, vain kredit tili voidaan kohdistaa debet kirjaukseen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,tuote {0} on alihankintatuote
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,käyttöomaisuuspääoma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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"
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,tavoite
 DocType: Sales Invoice Item,Edit Description,Muokkaa Kuvaus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,odotettu toimituspäivä on pienempi kuin suunniteltu aloituspäivä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,toimittajalle
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,toimittajalle
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,tilityypin asetukset auttaa valitsemaan oikean tilin tapahtumaan
 DocType: Purchase Invoice,Grand Total (Company Currency),kokonaissumma (yrityksen valuutta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,lähtevät yhteensä
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,päiväkirjakirjaus
 DocType: Workstation,Workstation Name,työaseman nimi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,tiedote:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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ä
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","uutiskirjeet yhteystiedoiksi, vihjeiksi"
 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}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Toimintoja ei voi jättää tyhjäksi.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Toimintoja ei voi jättää tyhjäksi.
 ,Delivered Items To Be Billed,"toimitettu, laskuttamat"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,sarjanumerolle ei voi muuttaa varastoa
 DocType: Authorization Rule,Average Discount,Keskimääräinen alennus
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},alkaen {0} | {1} {2}
 DocType: BOM Operation,Operation Description,toiminnon kuvaus
 DocType: Item,Will also apply to variants,sovelletaan myös muissa malleissa
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,tilikauden alkamis- tai päättymispäivää ei voi muuttaa sen jälkeen kun tilikausi tallennetaan
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,tilikauden alkamis- tai päättymispäivää ei voi muuttaa sen jälkeen kun tilikausi tallennetaan
 DocType: Quotation,Shopping Cart,ostoskori
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Lähtevä
 DocType: Pricing Rule,Campaign,Kampanja
@@ -1100,7 +1106,8 @@
 DocType: Sales Order Item,Planned Quantity,Suunnitellut Määrä
 DocType: Purchase Invoice Item,Item Tax Amount,tuotteen veroarvomäärä
 DocType: Item,Maintain Stock,huolla varastoa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,varaston kirjaukset on muodostettu tuotannon tilauksesta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,varaston kirjaukset on muodostettu tuotannon tilauksesta
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
 DocType: Maintenance Visit,Unscheduled,ei aikataulutettu
 DocType: Employee,Owned,Omistuksessa
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,riippuu poistumisesta ilman palkkaa
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,alikokoonpanot
 DocType: Shipping Rule Condition,To Value,arvoon
 DocType: Supplier,Stock Manager,varastohallinta
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},lähde varasto on pakollinen rivin {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},lähde varasto on pakollinen rivin {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,pakkauslappu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Toimisto Rent
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,tekstiviestin reititinmääritykset
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,osoitetta ei ole vielä lisätty
 DocType: Workstation Working Hour,Workstation Working Hour,työaseman työaika
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analyytikko
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},rivi {0}: kohdennettavan arvomäärä {1} on oltava suurempi tai yhtä suuri kuin tosite arvomäärä {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},rivi {0}: kohdennettavan arvomäärä {1} on oltava suurempi tai yhtä suuri kuin tosite arvomäärä {2}
 DocType: Item,Inventory,inventaario
 DocType: Features Setup,"To enable ""Point of Sale"" view",Jotta &quot;Point of Sale&quot; näkymä
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,maksua ei voi tehdä tyhjällä ostoskorilla
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,maksua ei voi tehdä tyhjällä ostoskorilla
 DocType: Item,Sales Details,myynnin lisätiedot
 DocType: Opportunity,With Items,tuotteilla
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,yksikkömääränä
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,pääkustannuspaikka
 DocType: Sales Invoice,Source,lähde
 DocType: Leave Type,Is Leave Without Pay,on poistunut ilman palkkaa
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,tietuetta ei löydy maksutaulukosta
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,tietuetta ei löydy maksutaulukosta
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,tilikauden aloituspäivä
 DocType: Employee External Work History,Total Experience,kustannukset yhteensä
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,pakkauslaput peruttu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,pakkauslaput peruttu
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Investointien rahavirta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,rahdin ja huolinnan maksut
 DocType: Material Request Item,Sales Order No,"myyntitilaus, numero"
 DocType: Item Group,Item Group Name,"tuoteryhmä, nimi"
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,materiaalisiirto tuotantoon
 DocType: Pricing Rule,For Price List,hinnastoon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,edistynyt haku
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ostoarvoa tuotteelle: {0} ei löydy joka vaaditaan (kulu) kirjanpidon kirjauksessa, määritä tuotehinta ostohinnastossa"
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ostoarvoa tuotteelle: {0} ei löydy joka vaaditaan (kulu) kirjanpidon kirjauksessa, määritä tuotehinta ostohinnastossa"
 DocType: Maintenance Schedule,Schedules,aikataulut
 DocType: Purchase Invoice Item,Net Amount,netto arvomäärä
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM yksittäisnumero
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),lisäalennuksen arvomäärä (yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},virhe: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},virhe: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"tee uusi tili, tilikartasta"
 DocType: Maintenance Visit,Maintenance Visit,"huolto, käynti"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,asiakas> asiakasryhmä> alue
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,myyntikumppani tavoite
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kirjaus {0} voidaan tehdä vain valuutassa: {1}
 DocType: Pricing Rule,Pricing Rule,Hinnoittelu Rule
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ostotilaus materiaalipyynnöstä
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ostotilaus materiaalipyynnöstä
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},rivi # {0}: palautettava tuote {1} ei löydy {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,pankkitilit
 ,Bank Reconciliation Statement,pankin täsmäytystosite
@@ -1225,11 +1233,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,avaa varastotase
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} saa esiintyä vain kerran
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},poistumiset kohdennettu {0}:n
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ei pakattavia tuotteita
 DocType: Shipping Rule Condition,From Value,arvosta
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Valmistus Määrä on pakollista
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Valmistus Määrä on pakollista
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,arvomäärät eivät heijastu pankkiin
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,yrityksen kuluvaatimukset
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,materiaalipyynnöt joita ei löydy toimittajan tarjouskyselyistä
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"seuraa tuotteita viivakoodia käyttämällä, löydät tuotteet lähetteeltä ja myyntilaskulta skannaamalla tuotteen viivakoodin"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Merkitse Toimitetaan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Merkitse Toimitetaan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,tee tarjous
 DocType: Dependent Task,Dependent Task,riippuvainen tehtävä
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},muuntokerroin oletus mittayksikkön tulee olla 1 rivillä {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,Conversion factor for default Unit of Measure must be 1 in row {0},muuntokerroin oletus mittayksikkön tulee olla 1 rivillä {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Leave of type {0} cannot be longer than {1},poistumis tyyppi {0} 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
 DocType: SMS Center,Receiver List,Vastaanotin List
 DocType: Payment Tool Detail,Payment Amount,maksun arvomäärä
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,käytetty arvomäärä
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} näytä
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} näytä
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Rahavarojen muutos
 DocType: Salary Structure Deduction,Salary Structure Deduction,"palkkarakenne, vähennys"
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,aiheen tuotteiden kustannukset
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Määrä saa olla enintään {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Ikä (päivää)
 DocType: Quotation Item,Quotation Item,tarjous tuote
 DocType: Account,Account Name,Tilin nimi
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,alkaen päivä ei voi olla suurempi kuin päättymispäivä
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,alkaen päivä ei voi olla suurempi kuin päättymispäivä
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,sarjanumero {0} yksikkömäärä {1} ei voi olla murto-osa
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,toimittajatyypin valvonta
 DocType: Purchase Order Item,Supplier Part Number,toimittajan osanumero
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,muuntotaso ei voi olla 0 tai 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,muuntotaso ei voi olla 0 tai 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} peruuntuu tai keskeytyy
 DocType: Accounts Settings,Credit Controller,kredit valvoja
 DocType: Delivery Note,Vehicle Dispatch Date,ajoneuvon toimituspäivä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,ostokuittia {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,ostokuittia {0} ei ole lähetetty
 DocType: Company,Default Payable Account,oletus maksettava tili
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","online-ostoskorin asetukset, kuten toimitustavat, hinnastot jne"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% laskutettu
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,omat aiheet
 DocType: BOM Item,BOM Item,BOM tuote
 DocType: Appraisal,For Employee,työntekijän
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Rivi {0}: Advance vastaan Toimittaja on veloittaa
 DocType: Company,Default Values,oletus arvot
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,rivi {0}: maksun arvomäärä ei voi olla negatiivinen
 DocType: Expense Claim,Total Amount Reimbursed,hyvityksen kokonaisarvomäärä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},toimittajan ostolaskun kohdistus {0} päiväys {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},toimittajan ostolaskun kohdistus {0} päiväys {1}
 DocType: Customer,Default Price List,oletus hinnasto
 DocType: Payment Reconciliation,Payments,maksut
 DocType: Budget Detail,Budget Allocated,"budjetti, kohdennettu"
 DocType: Journal Entry,Entry Type,Entry Tyyppi
 ,Customer Credit Balance,asiakas kredit tase
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Nettomuutos ostovelat
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Tarkista sähköpostisi id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',asiakkaalla tulee olla 'asiakaskohtainen alennus'
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,päivitä pankin maksupäivät päiväkirjojen kanssa
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,aktivoi ostoskori
 DocType: Employee,Permanent Address,pysyvä osoite
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,tuote {0} on palvelutuote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Maksettu ennakko vastaan {0} {1} ei voi olla suurempi \ kuin Grand Yhteensä {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,valitse tuotekoodi
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),pienennä vähennystä poistuttaessa ilman palkkaa (LWP)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","paino on mainittu, \ ssa mainitse  ""paino UOM"" myös"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,varaston kirjaus materiaalipyynnöstä
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,tuotteen yksittäisyksikkö
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',"aikalokin erä {0} pitää ""lähettää"""
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"aikalokin erä {0} pitää ""lähettää"""
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},varastolta vaaditaan rivi nro {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},varastolta vaaditaan rivi nro {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Anna kelvollinen tilivuoden alkamis- ja päättymispäivä
 DocType: Employee,Date Of Retirement,eläkkepäivä
 DocType: Upload Attendance,Get Template,hae mallipohja
 DocType: Address,Postal,Posti-
 DocType: Item,Weightage,painoarvo
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"saman niminen asiakasryhmä on jo olemassa, vaihda asiakkaan nimi tai nimeä asiakasryhmä uudelleen"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Ole hyvä ja valitse {0} ensin.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},teksti {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Ole hyvä ja valitse {0} ensin.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},teksti {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Uusi yhteystieto
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,materiaali kuitti
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},osapuolitili sekä osapuoli vaaditaansaatava / maksettava tilille {0}
 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 myyntitilaukseen yms
 DocType: Lead,Next Contact By,seuraava yhteydenottohlö
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},vaadittu tuotemäärä {0} rivillä {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},vaadittu tuotemäärä {0} rivillä {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},varastoa {0} ei voi poistaa silla siellä on tuotteita {1}
 DocType: Quotation,Order Type,tilaus tyyppi
 DocType: Purchase Invoice,Notification Email Address,sähköpostiosoite ilmoituksille
@@ -1361,15 +1373,15 @@
 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: Sales Invoice Item,Batch No,erän nro
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Salli useat Myyntitilaukset vastaan Asiakkaan Ostotilauksen
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Tärkein
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Tärkein
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,malli
 DocType: Naming Series,Set prefix for numbering series on your transactions,aseta sarjojen numeroinnin etuliite tapahtumiin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"pysäytettyä tilausta ei voi peruuttaa peruuttaa, käynnistä se jotta voit peruuttaa"
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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?,perintä?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,tilaisuuteen kenttä vaaditaan
 DocType: Item,Variants,mallit
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Tee Ostotilaus
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Tee Ostotilaus
 DocType: SMS Center,Send To,lähetä kenelle
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
 DocType: Payment Reconciliation Payment,Allocated amount,kohdennettu arvomäärä
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Varasto ja viite
 DocType: Supplier,Statutory info and other general information about your Supplier,toimittajan lakisääteiset- ja muut päätiedot
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,osoitteet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},monista tuotteelle kirjattu sarjanumero {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,edellyttää toimitustapaa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,tuotteella ei voi olla tuotannon tilausta
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Luoton määrä Account Valuutta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,aikaloki valmistukseen
 DocType: Item,Apply Warehouse-wise Reorder Level,käytä varasto työkalua uuden ostotilauksen suositusarvon määrittämiseen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} tulee lähettää
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} tulee lähettää
 DocType: Authorization Control,Authorization Control,Valtuutus Ohjaus
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,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/config/projects.py +23,Time Log for tasks.,aikaloki tehtävät
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Maksu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Maksu
 DocType: Production Order Operation,Actual Time and Cost,todellinen aika ja hinta
 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},materiaalipyyntö max {0} voidaan tehdä tuotteelle {1} kohdistettuna myyntitilaukseen {2}
 DocType: Employee,Salutation,titteli/tervehdys
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,kolleega
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,tuote {0} ei ole sarjoitettu tuote
 DocType: SMS Center,Create Receiver List,tee vastaanottajalista
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,vanhentunut
 DocType: Packing Slip,To Package No.,pakkausnumeroon
 DocType: Warranty Claim,Issue Date,aiheen päivä
 DocType: Activity Cost,Activity Cost,aktiviteettikustannukset
@@ -1449,7 +1461,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,saavutettu
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,alueella / asiakas
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,"esim, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},rivi {0}: kohdennettavan arvomäärän {1} on oltava pienempi tai yhtä suuri kuin odottava arvomäärä {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},rivi {0}: kohdennettavan arvomäärän {1} on oltava pienempi tai yhtä suuri kuin odottava arvomäärä {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"sanat näkyvät, kun tallennat myyntilaskun"
 DocType: Item,Is Sales Item,on myyntituote
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,tuoteryhmäpuu
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,tehnyt {0}
 DocType: Delivery Note Item,Against Sales Order,myyntitilauksen kohdistus
 ,Serial No Status,sarjanumero tila
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,tuote taulukko ei voi olla tyhjä
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,tuote taulukko ei voi olla tyhjä
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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}
 DocType: Pricing Rule,Selling,myynti
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,eräpäivä voi olla ennen lähetyspä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 +170,Duties and Taxes,tullit ja verot
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Anna Viiteajankohta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Anna Viiteajankohta
 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} maksukirjauksia ei voida suodattaa {1}:lla
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,verkkosivuilla näkyvien tuotteiden taulukko
 DocType: Purchase Order Item Supplied,Supplied Qty,yksikkömäärä toimitettu
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,asennus aika
 DocType: Sales Invoice,Accounting Details,Kirjanpito Lisätiedot
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,poista kaikki tapahtumat tältä yritykseltä
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"rivi # {0}: toiminto {1} ei ole valmis {2} valmiiden tuotteiden yksikkömäärä tuotantotilauksessa # {3}, päivitä toiminnon tila aikalokin kautta"
+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,"rivi # {0}: toiminto {1} ei ole valmis {2} valmiiden tuotteiden yksikkömäärä tuotantotilauksessa # {3}, päivitä toiminnon tila aikalokin kautta"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,sijoitukset
 DocType: Issue,Resolution Details,johtopäätös lisätiedot
 DocType: Quality Inspection Reading,Acceptance Criteria,hyväksymiskriteerit
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,tyhjennä taulukko
 DocType: Features Setup,Brands,brändit
 DocType: C-Form Invoice Detail,Invoice No,laskun nro
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,ostotilauksesta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,ostotilauksesta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Jätä ei voida soveltaa / peruuttaa ennen {0}, kun loman saldo on jo carry-välitti tulevaisuudessa loman jakamista ennätys {1}"
 DocType: Activity Cost,Costing Rate,"kustannuslaskenta, taso"
 ,Customer Addresses And Contacts,Asiakas osoitteet ja Yhteydet
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,huoltoaikataulut
 ,Quotation Trends,"tarjous, trendit"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
 DocType: Shipping Rule Condition,Shipping Amount,toimituskustannus arvomäärä
 ,Pending Amount,odottaa arvomäärä
 DocType: Purchase Invoice Item,Conversion Factor,muuntokerroin
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,tilipuu
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,tili {0} tulee olla 'pitkaikaiset vastaavat' tili sillä tuotella {1} on tasearvo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,tili {0} tulee olla 'pitkaikaiset vastaavat' tili sillä tuotella {1} on tasearvo
 DocType: HR Settings,HR Settings,henkilöstön asetukset
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,"kuluvaatimus odottaa hyväksyntää, vain kulujen hyväksyjä voi päivittää tilan"
 DocType: Purchase Invoice,Additional Discount Amount,lisäalennuksen arvomäärä
 DocType: Leave Block List Allow,Leave Block List Allow,"poistu estoluettelo, salli"
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,urheilu
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,"yhteensä, todellinen"
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,yksikkö
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} nyt on oletustilikausi. päivitä selain, jotta muutos tulee voimaan."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,kuluvaatimukset
 DocType: Issue,Support,tuki
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Katso ostoskoria
 ,BOM Search,BOM haku
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),sulku (avaus + summat)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,määritä yrityksen valuutta
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM muuntokerroin vaaditaan rivillä {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},tilityspäivä ei voi olla ennen tarkistuspäivää rivillä {0}
 DocType: Salary Slip,Deduction,vähennys
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Hinta lisätty {0} ja hinnasto {1}
 DocType: Address Template,Address Template,"osoite, mallipohja"
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% tehtävät valmis
 DocType: Project,Gross Margin,bruttokate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,syötä ensin tuotantotuote
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,käyttäjä poistettu käytöstä
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,käyttäjä poistettu käytöstä
 DocType: Opportunity,Quotation,tarjous
 DocType: Salary Slip,Total Deduction,vähennys yhteensä
 DocType: Quotation,Maintenance User,"huolto, käyttäjä"
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,tuote {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** kaikki tilikauden kirjanpitoon kirjatut tositteet ja päätapahtumat on jäljitetty **tilikausi**
 DocType: Opportunity,Customer / Lead Address,asiakas / vihje osoite
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Varoitus: Virheellinen SSL-varmenteen kiinnittymiseen {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Varoitus: Virheellinen SSL-varmenteen kiinnittymiseen {0}
 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ää
@@ -1588,12 +1602,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","seuraa myyntikampankoita, seuraa vihjeitä, -tarjouksia, myyntitilauksia ym mitataksesi kampanjaan sijoitetun pääoman tuoton"
 DocType: Expense Claim,Approver,hyväksyjä
 ,SO Qty,myyntitilaukset yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",varaston kirjauksia on kohdistettuna varastoon {0} joten uudelleenmääritys tai muokkaus ei onnistu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",varaston kirjauksia on kohdistettuna varastoon {0} joten uudelleenmääritys tai muokkaus ei onnistu
 DocType: Appraisal,Calculate Total Score,laske yhteispisteet
 DocType: Supplier Quotation,Manufacturing Manager,valmistuksenhallinta
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,jaa lähete pakkauksien kesken
-apps/erpnext/erpnext/hooks.py +68,Shipments,toimitukset
+apps/erpnext/erpnext/hooks.py +69,Shipments,toimitukset
 DocType: Purchase Order Item,To be delivered to customer,Toimitetaan asiakkaalle
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,aikalokin tila pitää lähettää
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Sarjanumero {0} ei kuulu mihinkään Warehouse
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +356,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
 DocType: Currency Exchange,From Currency,valuutasta
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","valitse kohdennettava arvomäärä, laskun tyyppi ja laskun numero vähintään yhdelle riville"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},myyntitilaus vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","valitse kohdennettava arvomäärä, laskun tyyppi ja laskun numero vähintään yhdelle riville"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},myyntitilaus vaaditaan tuotteelle {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,arvomäärät eivät heijastu järjestelmässä
 DocType: Purchase Invoice Item,Rate (Company Currency),taso (yrityksen valuutta)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Muut
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,prosessissa
 DocType: Authorization Rule,Itemwise Discount,"tuote työkalu, alennus"
 DocType: Purchase Order Item,Reference Document Type,Viite Asiakirjan tyyppi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} myyntitilausta vastaan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} myyntitilausta vastaan {1}
 DocType: Account,Fixed Asset,pitkaikaiset vastaavat
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialized Inventory
 DocType: Activity Type,Default Billing Rate,Oletus laskutustaksa
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,myyntitilauksesta maksuun
 DocType: Expense Claim Detail,Expense Claim Detail,kuluvaatimus lisätiedot
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,aikaloki on luotu:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Valitse oikea tili
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Valitse oikea tili
 DocType: Item,Weight UOM,paino UOM
 DocType: Employee,Blood Group,Veriryhmä
 DocType: Purchase Invoice Item,Page Break,Sivunvaihto
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,aikaan
 DocType: Authorization Rule,Approving Role (above authorized value),Hyväksymisestä Rooli (edellä valtuutettu arvo)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",tutki puita ja lisää alasidoksia klikkaamalla sidosta johon haluat lisätä sidoksia
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,kredit tilin tulee olla maksutili
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM palautus: {0} ei voi pää tai alasidos {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,kredit tilin tulee olla maksutili
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},BOM palautus: {0} ei voi pää tai alasidos {2}
 DocType: Production Order Operation,Completed Qty,valmiit yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, vain debet tili voidaan kohdistaa kredit kirjaukseen"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","{0}, vain debet tili voidaan kohdistaa kredit kirjaukseen"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,hinnasto {0} on poistettu käytöstä
 DocType: Manufacturing Settings,Allow Overtime,Salli Ylityöt
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sarjanumerot tarvitaan Tuote {1}. Olet antanut {2}.
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,asiakkaan tuotekoodit
 DocType: Opportunity,Lost Reason,hävitty syy
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,kohdista maksukirjaukset tilauksiin tai laskuihin
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Uusi osoite
 DocType: Quality Inspection,Sample Size,näytteen koko
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,kaikki tuotteet on jo laskutettu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,All items have already been invoiced,kaikki tuotteet 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/accounts/page/accounts_browser/accounts_browser.js +304,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ä"
 DocType: Project,External,ulkoinen
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,Nimeä Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,päivitä kustannukset
 DocType: Item Reorder,Item Reorder,tuote tiedostot
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,materiaalisiirto
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,materiaalisiirto
 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"
 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
 DocType: Installation Note,Installation Note,asennus huomautus
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,lisää veroja
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Rahoituksen rahavirta
 ,Financial Analytics,talousanalyysi
 DocType: Quality Inspection,Verified By,vahvistanut
 DocType: Address,Subsidiary,tytäryhtiö
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,tee palkkalaskelma
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,odotettu tase / pankki
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),rahoituksen lähde (vieras pääoma)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},määrä rivillä {0} ({1}) tulee olla sama kuin valmistettu määrä {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},määrä rivillä {0} ({1}) tulee olla sama kuin valmistettu määrä {2}
 DocType: Appraisal,Employee,työntekijä
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,tuo sähköposti mistä
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Kutsu Käyttäjä
 DocType: Features Setup,After Sale Installations,jälkimarkkinointi asennukset
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} on kokonaan laskutettu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} on kokonaan laskutettu
 DocType: Workstation Working Hour,End Time,ajan loppu
 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 +75,Group by Voucher,tositteen ryhmä
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,pyydetylle
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Rename Tool,File to Rename,uudelleennimettävä tiedosto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Näytä Maksut
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,huoltoaikataulu {0} on peruttava ennen myyntitilauksen perumista
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,myyntitilaus vaaditaan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,tee asiakas
 DocType: Purchase Invoice,Credit To,kredittiin
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktiivinen Mittajohdot / Asiakkaat
 DocType: Employee Education,Post Graduate,Jatko
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,huoltoaikataulu lisätiedot
 DocType: Quality Inspection Reading,Reading 9,Lukeminen 9
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,maksutili
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Nettomuutos Myyntireskontra
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,korvaava on pois
 DocType: Quality Inspection Reading,Accepted,hyväksytyt
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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"
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,maksujen kokonaisarvomäärä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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,toimitus sääntö etiketti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,raaka-aineet ei voi olla tyhjiä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,raaka-aineet ei voi olla tyhjiä
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
 DocType: Newsletter,Test,testi
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","tuotteella on varastotapahtumia \ ei voi muuttaa arvoja ""sarjanumero"", ""eränumero"", ""varastotuote"" ja ""arvomenetelmä"""
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Nopea Päiväkirjakirjaus
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Nopea Päiväkirjakirjaus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"tasoa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
 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 +157,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 +211,{0} {1} is not submitted,{0} {1} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} ei ole lähetetty
 apps/erpnext/erpnext/config/stock.py +18,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
 DocType: Purchase Invoice,Terms and Conditions1,ehdot ja säännöt 1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,Valtuutettu Arvo
 DocType: Contact,Enter department to which this Contact belongs,"syötä osasto, johon tämä yhteystieto kuuluu"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,"yhteensä, puuttua"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,tuote tai varastorivi {0} ei täsmää materiaalipyynnön kanssa
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,tuote tai varastorivi {0} ei täsmää materiaalipyynnön kanssa
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,mittayksikkö
 DocType: Fiscal Year,Year End Date,Vuoden lopetuspäivä
 DocType: Task Depends On,Task Depends On,tehtävä riippuu
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,sopimuksen päättymispäivä tulee olla liittymispäivän jälkeen
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"kolmas osapuoli kuten välittäjä / edustaja / agentti / jälleenmyyjä, joka myy tavaraa yrityksille provisiolla"
 DocType: Customer Group,Has Child Node,alasidoksessa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} ostotilausta vastaan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} ostotilausta vastaan {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","syötä staattiset url parametrit tähän (esim, lähettäjä = ERPNext, käyttäjätunnus = ERPNext, salasana = 1234 jne)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} ei ole millään aktiivisella tilikaudella, täppää {2} saadaksesi lisätietoja"
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"tämä on demo verkkosivu, joka on muodostettu automaattisesti ERPNext:ssä"
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,RECD Määrä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ei voi valmistaa suurempaa määrää tuotteita {0} kuin myyntitilauksen määrä {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
 DocType: Payment Reconciliation,Bank / Cash Account,pankki / kassa
 DocType: Tax Rule,Billing City,Laskutus Kaupunki
 DocType: Global Defaults,Hide Currency Symbol,piilota valuuttasymbooli
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,hyödykekulut
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-yli
 DocType: Buying Settings,Default Buying Price List,"oletus hinnasto, osto"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Yksikään työntekijä ei edellä valitut kriteerit TAI palkkakuitin jo luotu
 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"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,maksun tyyppi
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","katso ""materiaaleihin perustuva arvo"" kustannuslaskenta osiossa"
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastuu Area
 DocType: Item Reorder,Material Request Type,materiaalipyynnön tyyppi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Rivi {0}: UOM Muuntokerroin on pakollinen
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Viite
 DocType: Cost Center,Cost Center,kustannuspaikka
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,tosite #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},syötä arvot tarjouksesta {0} tarjoukseen {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,kaikki osoitteet
 DocType: Company,Stock Settings,varastoasetukset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","yhdistäminen on mahdollista vain, jos seuraavat arvot ovat samoja molemmissa tietueissa, kantatyyppi, ryhmä, viite, yritys"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","yhdistäminen on mahdollista vain, jos seuraavat arvot ovat samoja molemmissa tietueissa, kantatyyppi, ryhmä, viite, yritys"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,hallitse asiakasryhmäpuuta
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,uuden kustannuspaikan nimi
 DocType: Leave Control Panel,Leave Control Panel,"poistu, ohjauspaneeli"
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,maksutyökalu lisätiedot
 ,Sales Browser,myyntiselain
 DocType: Journal Entry,Total Credit,kredit yhteensä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},varoitus: toinen varaston kirjausksen kohdistus {0} # {1} on jo olemassa {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Paikallinen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},varoitus: toinen varaston kirjausksen kohdistus {0} # {1} on jo olemassa {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Paikallinen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),lainat ja ennakot (vastaavat)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,velalliset
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Suuri
@@ -2003,7 +2022,7 @@
 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
 DocType: Production Order Operation,Make Time Log,Tee Time Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Aseta tilausrajaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Aseta tilausrajaa
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},tee asiakasvihje {0}
 DocType: Price List,Applicable for Countries,Sovelletaan Maat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,tietokoneet
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Ei Huomautuksia
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Ei Huomautuksia
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Myöhässä
 DocType: Account,Stock Received But Not Billed,varasto vastaanotettu mutta ei laskutettu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root on ryhmä
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root on ryhmä
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,bruttomaksu + jäännösarvomäärä + perintä määrä - vähennys yhteensä
 DocType: Monthly Distribution,Distribution Name,"toimitus, nimi"
 DocType: Features Setup,Sales and Purchase,myynti ja osto
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,osatase
 DocType: Sales Invoice Item,Time Log Batch,aikaloki erä
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,valitse käytä alennusta
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Palkka Slip Luotu
 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: Stock Entry,Material Transfer for Manufacture,materiaalisiirto tuotantoon
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,puolivuosittain
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,tilikautta {0} ei löydy
 DocType: Bank Reconciliation,Get Relevant Entries,hae tarvittavat kirjaukset
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,kirjanpidon varaston kirjaus
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,kirjanpidon varaston kirjaus
 DocType: Sales Invoice,Sales Team1,myyntitiimi 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,tuotetta {0} ei ole olemassa
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,tuotetta {0} ei ole olemassa
 DocType: Sales Invoice,Customer Address,asiakkaan osoite
 DocType: Purchase Invoice,Apply Additional Discount On,käytä lisäalennusta
 DocType: Account,Root Type,kantatyyppi
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,näytä tämä diaesitys sivun yläreunassa
 DocType: BOM,Item UOM,tuote UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),veron arvomäärä alennusten jälkeen (yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},tavoite varasto on pakollinen rivin {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},tavoite varasto on pakollinen rivin {0}
 DocType: Quality Inspection,Quality Inspection,laatutarkistus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,erittäin pieni
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,varoitus: pyydetty materiaali yksikkömäärä on pienempi kuin vähimmäis ostotilausmäärä
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,varoitus: pyydetty materiaali yksikkömäärä on pienempi kuin vähimmäis ostotilausmäärä
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,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"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ruoka, juoma ja tupakka"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL tai BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Voi vain maksun vastaan laskuttamattomia {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Voi vain maksun vastaan laskuttamattomia {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,provisio taso ei voi olla suurempi kuin 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Pienin Inventory Level
 DocType: Stock Entry,Subcontract,alihankinta
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,"saapuva, laatuntarkistus"
 DocType: Purchase Order Item,Returned Qty,Palautetut Kpl
 DocType: Employee,Exit,poistu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,kantatyyppi vaaditaan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,kantatyyppi vaaditaan
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,sarjanumeron on luonut {0}
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",voit tulostaa nämä koodit tulostusmuodoissa asiakirjoihin kuten laskut ja lähetteet asiakkaiden työn helpottamiseksi
 DocType: Employee,You can enter any date manually,voit kirjoittaa minkä tahansa päivämäärän manuaalisesti
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Koeaika
 DocType: Customer Group,Only leaf nodes are allowed in transaction,vain jatkosidokset ovat sallittuja tapahtumassa
 DocType: Expense Claim,Expense Approver,kulujen hyväksyjä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +110,Row {0}: Advance against Customer must be credit,Rivi {0}: Advance vastaan asiakkaan on luotto
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,tuote ostokuitti toimitettu
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Maksaa
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Maksaa
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,aikajana
 DocType: SMS Settings,SMS Gateway URL,tekstiviesti reititin URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Lokit ylläpitämiseksi sms toimituksen tila
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Level
 DocType: Attendance,Attendance Date,"osallistuminen, päivä"
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,palkkaerittelyn kohdistetut ansiot ja vähennykset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,tilin alasidoksia ei voi muuttaa tilikirjaksi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,tilin alasidoksia ei voi muuttaa tilikirjaksi
 DocType: Address,Preferred Shipping Address,suositellut toimitusosottet
 DocType: Purchase Receipt Item,Accepted Warehouse,hyväksytyt varasto
 DocType: Bank Reconciliation Detail,Posting Date,Julkaisupäivä
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,sarjanumeroa {0} ei ole olemassa
 DocType: Pricing Rule,Discount Percentage,alennusprosentti
 DocType: Payment Reconciliation Invoice,Invoice Number,laskun numero
-apps/erpnext/erpnext/hooks.py +54,Orders,Tilaukset
+apps/erpnext/erpnext/hooks.py +55,Orders,Tilaukset
 DocType: Leave Control Panel,Employee Type,työntekijä tyyppi
 DocType: Employee Leave Approver,Leave Approver,poistumis hyväksyjä
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiaali Siirretty valmistus
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% materiaaleja laskutettu tätä myyntitilausta vastaan
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,kauden sulkukirjaus
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,olemassaolevien tapahtumien kustannuspaikkaa ei voi muuttaa ryhmäksi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,arvonalennus
+DocType: Account,Depreciation,arvonalennus
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),toimittaja/toimittajat
 DocType: Customer,Credit Limit,luottoraja
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,valitse tapahtuman tyyppi
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,Pyydetty For
 DocType: Quotation Item,Against Doctype,asiakirjan tyyppi kohdistus
 DocType: Delivery Note,Track this Delivery Note against any Project,seuraa tätä lähetettä kohdistettuna projektiin
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,kantaa ei voi poistaa
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Nettokassavirta Investointien
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,kantaa ei voi poistaa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,näytä varaston kirjaukset
 ,Is Primary Address,On Ensisijainen osoite
 DocType: Production Order,Work-in-Progress Warehouse,työnalla varasto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Viite # {0} päivätty {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Viite # {0} päivätty {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Hallitse Osoitteet
 DocType: Pricing Rule,Item Code,tuotekoodi
 DocType: Production Planning Tool,Create Production Orders,tee tuotannon tilaus
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,käyttäjä huomautus
 DocType: Lead,Market Segment,Market Segment
 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 +223,Closing (Dr),sulku (dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),sulku (dr)
 DocType: Contact,Passive,Passiivinen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,sarjanumero {0} ei varastossa
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,veromallipohja myyntitapahtumiin
@@ -2241,7 +2263,7 @@
 ,Billed Amount,laskutettu arvomäärä
 DocType: Bank Reconciliation,Bank Reconciliation,pankin täsmäytys
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,hae päivitykset
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,materiaalipyyntö {0} on peruttu tai keskeytetty
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,materiaalipyyntö {0} on peruttu tai keskeytetty
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Lisää muutama esimerkkitietue
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,poistumishallinto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,tilin ryhmä
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","vastattavat päätili, jonne voitto/tappio varataan"
 DocType: Payment Tool,Against Vouchers,kuitin kohdistus
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,pikaohjeet
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},lähde ja tavoite varasto eivät voi olla samat rivillä {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},lähde ja tavoite varasto eivät voi olla samat rivillä {0}
 DocType: Features Setup,Sales Extras,myynnin ekstrat
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} tilin budjetti {1} kustannuspaikkaa kohtaan {2} ylittyy {3}:lla
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","erotilin tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','aloituspäivä' tulee olla ennen 'päättymispäivää'
 ,Stock Projected Qty,ennustettu varaston yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
 DocType: Sales Order,Customer's Purchase Order,Asiakkaan Ostotilaus
 DocType: Warranty Claim,From Company,yrityksestä
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,arvo tai yksikkömäärä
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,"poistu estoluettelo, sallittu"
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Tulet käyttämään sitä sisäänkirjautumiseen
 DocType: Sales Partner,Retailer,Jälleenmyyjä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kiitos tilin on oltava Tase tili
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Kiitos tilin on oltava Tase tili
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,kaikki toimittajatyypit
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +46,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 +93,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
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"pakkauksen bruttopaino, yleensä tuotteen nettopaino + pakkausmateriaalin paino  (tulostukseen)"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"roolin käyttäjät ei voi jäädyttää tilejä, tai luoda / muokata kirjanpidon kirjauksia jäädytettyillä tileillä"
 DocType: Serial No,Is Cancelled,on peruutettu
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Omat lähetykset
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Omat lähetykset
 DocType: Journal Entry,Bill Date,Bill Date
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",vaikka useita hinnoittelusääntöjä on olemassa korkeimmalla prioriteetilla seuraavia sisäisiä prioriteettejä noudatetaan
 DocType: Supplier,Supplier Details,toimittajan lisätiedot
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,pyynnöt
 DocType: Project,Total Costing Amount (via Time Logs),kustannuslaskenta arvomäärä yhteensä (aikaloki)
 DocType: Purchase Order Item Supplied,Stock UOM,varasto UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,ostotilausta {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,ostotilausta {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,ennustus
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},sarjanumero {0} ei kuulu varastoon {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,huom: järjestelmä ei tarkista ylitoimitusta tai tuotteen ylivarausta {0} yksikkömääränä tai arvomäärän ollessa 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,huom: järjestelmä ei tarkista ylitoimitusta tai tuotteen ylivarausta {0} yksikkömääränä tai arvomäärän ollessa 0
 DocType: Notification Control,Quotation Message,"tarjous, viesti"
 DocType: Issue,Opening Date,Opening Date
 DocType: Journal Entry,Remark,Huomautus
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,Annosteltiin for Billing
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Laskut esille Toimittajat.
 DocType: POS Profile,Write Off Account,poistotili
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Liiketoiminnan nettorahavirta
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,"esim, alv"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,tuote 4
 DocType: Journal Entry Account,Journal Entry Account,päiväkirjakirjaus tili
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,eläkkepäivän on oltava suurempi kuin liittymispäivä
 DocType: Sales Invoice,Against Income Account,tulotilin kodistus
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% toimitettu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,tuote {0}: tilattu yksikkömäärä {1} ei voi olla pienempi kuin pienin tilaus yksikkömäärä {2} (määritellylle tuotteelle)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,tuote {0}: tilattu yksikkömäärä {1} ei voi olla pienempi kuin pienin tilaus yksikkömäärä {2} (määritellylle tuotteelle)
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,"toimitus kuukaudessa, prosenttiosuus"
 DocType: Territory,Territory Targets,aluetavoite
 DocType: Delivery Note,Transporter Info,kuljetuksen info
@@ -2421,10 +2443,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},eränumero on pakollinen tuotteelle {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,tämä on kantamyyjä eikä niitä voi muokata
 ,Stock Ledger,varaston tilikirja
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Hinta: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Hinta: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,"palkkalaskelma, vähennys"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,valitse ensin ryhmä sidos
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Tarkoitus on oltava yksi {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Tarkoitus on oltava yksi {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,täytä muoto ja tallenna se
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"lataa raportti, joka  sisältää kaikki raaka-aineet viimeisimmän varastotaseen mukaan"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Yhteisön Forum
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,yrityksen valvonta (ei asiakas tai toimittaja)
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Anna &quot;Expected Delivery Date&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,lähete {0} tulee perua ennen myyntilauksen perumista
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,maksettu arvomäärä + poistotilin summa ei voi olla suurempi kuin kokonaissumma
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,maksettu arvomäärä + poistotilin summa ei voi olla suurempi kuin kokonaissumma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ei sallittu eränumero tuotteelle {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},"huom, jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","huom: mikäli maksu suoritetaan ilman viitettä, tee päiväkirjakirjaus manuaalisesti"
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,"lähetä sähköpostia automaattisesti yhteyshenkilöille kun tapahtuman ""lähetys"" tehdään"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","rivi {0}: yksikkömäärä ei ole saatavana varastossa {1}:ssa {2} {3}:n, saatava yksikkömäärä: {4}, siirrä yksikkömäärä: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,tuote 3
 DocType: Purchase Order,Customer Contact Email,Asiakas Sähköpostiosoite
 DocType: Sales Team,Contribution (%),panostus (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Vastuut
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,mallipohja
 DocType: Sales Person,Sales Person Name,myyjän nimi
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,ennen täsmäytystä
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},(lle) {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),verot ja maksut lisätty (yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +374,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 +383,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
 DocType: Item,Default BOM,oletus BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,kirjoita yrityksen nimi uudelleen vahvistukseksi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,"odottaa, pankkipääte yhteensä"
 DocType: Time Log Batch,Total Hours,tunnit yhteensä
 DocType: Journal Entry,Printing Settings,Asetusten tulostaminen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},"debet yhteensä tulee olla sama kuin kredit yhteensä, ero on {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},"debet yhteensä tulee olla sama kuin kredit yhteensä, ero on {0}"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,lähetteestä
 DocType: Time Log,From Time,ajasta
 DocType: Notification Control,Custom Message,oma viesti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,sijoitukset pankki
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,kassa tai pankkitili vaaditaan maksujen kirjaukseen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,kassa tai pankkitili vaaditaan maksujen kirjaukseen
 DocType: Purchase Invoice,Price List Exchange Rate,hinnasto vaihtotaso
 DocType: Purchase Invoice Item,Rate,taso
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,harjoitella
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","useampi hintasääntö löytyy samoilla kriteereillä, selvitä \ konflikti antamalla prioriteett, hintasäännöt: {0}"
 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 +580,Issue Material,materiaali aihe
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,materiaali aihe
 DocType: Material Request Item,For Warehouse,varastoon
 DocType: Employee,Offer Date,Tarjous Date
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Lainaukset
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,sarjanumero
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,syötä ylläpidon lisätiedot ensin
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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,tavarakokonaisuus tuote
 DocType: Sales Partner,Sales Partner Name,myyntikumppani nimi
+DocType: Payment Reconciliation,Maximum Invoice Amount,Suurin Laskun summa
 DocType: Purchase Invoice Item,Image View,kuvanäkymä
 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 +553,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Oletus mittayksikkö Variant &quot;{0}&quot; on oltava sama kuin malli &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,"laske, perusteet"
 DocType: Delivery Note Item,From Warehouse,Varastosta
 DocType: Purchase Taxes and Charges,Valuation and Total,arvo ja summa
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"tämä on malli tuotteesta {0} (mallipohja), tuotteen tuntomerkit kopioidaan ellei 'älä kopioi' ole aktivoitu"
 DocType: Account,Purchase User,Osto Käyttäjä
 DocType: Notification Control,Customize the Notification,muokkaa ilmoitusta
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,LIIKETOIMINNAN RAHAVIRTA
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,"oletus osoite, mallipohjaa ei voi poistaa"
 DocType: Sales Invoice,Shipping Rule,toimitus sääntö
 DocType: Journal Entry,Print Heading,Tulosta Otsikko
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,raaka-aine
 DocType: Leave Application,Follow via Email,seuraa sähköpostitse
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,veron arvomäärä alennuksen jälkeen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,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 +335,Please select Posting Date first,Valitse julkaisupäivä ensimmäinen
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},sarjanumero edelyttää sarjoitettua tuotetta {0}
 DocType: Journal Entry,Bank Entry,pankkikirjaus
 DocType: Authorization Rule,Applicable To (Designation),sovellettavissa (nimi)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Lisää koriin
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ryhmän
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,"aktivoi / poista käytöstä, valuutat"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,postituskulut
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,edustus & vapaa-aika
 DocType: Purchase Order,The date on which recurring order will be stop,päivä jolloin toistuva tilaus lakkaa
 DocType: Quality Inspection,Item Serial No,tuote sarjanumero
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} on alennettava {1} tai määrittää suurempi virtaustoleranssiarvo
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} on alennettava {1} tai määrittää suurempi virtaustoleranssiarvo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,esillä yhteensä
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,tunti
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",sarjanumerollista tuottetta {0} ei voi päivittää varaston täsmäytyksellä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,materiaalisiirto toimittajalle
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,materiaalisiirto toimittajalle
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,tee tarjous
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Sinulla ei ole lupa hyväksyä lehdet Block Päivämäärät
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Kaikki nämä asiat on jo laskutettu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Kaikki nämä asiat on jo laskutettu
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},hyväksyjä on {0}
 DocType: Shipping Rule,Shipping Rule Conditions,toimitus sääntö ehdot
 DocType: BOM Replace Tool,The new BOM after replacement,uusi BOM korvauksen jälkeen
 DocType: Features Setup,Point of Sale,Point of Sale
 DocType: Account,Tax,vero
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rivi {0}: {1} ei ole kelvollinen {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Alkaen Tuote Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Alkaen Tuote Bundle
 DocType: Production Planning Tool,Production Planning Tool,Tuotannon suunnittelu Tool
 DocType: Quality Inspection,Report Date,raporttipäivä
 DocType: C-Form,Invoices,laskut
 DocType: Job Opening,Job Title,Työtehtävä
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} vastaanottajat
 DocType: Features Setup,Item Groups in Details,"tuoteryhmä, lisätiedot"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Määrä Valmistus on oltava suurempi kuin 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),aloita Point-of-Sale (POS)
@@ -2618,8 +2644,9 @@
 DocType: Stock Entry,Update Rate and Availability,Päivitysnopeus 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: Pricing Rule,Customer Group,asiakasryhmä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},kulutili on vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},kulutili on vaaditaan tuotteelle {0}
 DocType: Item,Website Description,verkkosivujen kuvaus
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Nettomuutos Equity
 DocType: Serial No,AMC Expiry Date,AMC Viimeinen käyttöpäivä
 ,Sales Register,myyntirekisteri
 DocType: Quotation,Quotation Lost Reason,"tarjous hävitty, syy"
@@ -2627,12 +2654,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ei muokattavaa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Yhteenveto tässä kuussa ja keskeneräisten toimien
 DocType: Customer Group,Customer Group Name,asiakasryhmän nimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,tuntomerkkejä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,hae tuotteet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,syötä poistotili
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,hae tuotteet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,syötä poistotili
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order Päivämäärä
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,tee poistolasku
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Tili {0} ei kuulu yritykselle {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,"projekti työkalu, tietoja ei ole saatavilla tarjousvaiheessa"
 DocType: Project,Expected End Date,odotettu päättymispäivä
 DocType: Appraisal Template,Appraisal Template Title,"arviointi, mallipohja otsikko"
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,kaupallinen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,kaupallinen
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Kohta {0} ei saa olla Kanta Tuote
 DocType: Cost Center,Distribution Id,"toimitus, tunnus"
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,hyvät palvelut
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vastinetta Taito {0} on oltava alueella {1} ja {2} vuonna välein {3}
 DocType: Tax Rule,Sales,myynti
 DocType: Stock Entry Detail,Basic Amount,Perusmäärät
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},varastolta vaaditaan varastotuotteelle {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},varastolta vaaditaan varastotuotteelle {0}
 DocType: Leave Allocation,Unused leaves,Käyttämättömät lehdet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,oletus saatava tilit
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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"
 DocType: Landed Cost Voucher,Purchase Receipts,Osto Kuitit
-DocType: Payment Reconciliation,Maximum Amount,enimmäis arvomäärä
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,miten hinnoittelu sääntöä käytetään
 DocType: Quality Inspection,Delivery Note No,lähetteen numero
 DocType: Company,Retail,Vähittäiskauppa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,asiakasta {0} ei ole olemassa
 DocType: Attendance,Absent,puuttua
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,tavarakokonaisuus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rivi {0}: Virheellinen viittaus {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,tavarakokonaisuus
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Rivi {0}: Virheellinen viittaus {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,oston verojen ja maksujen mallipohja
 DocType: Upload Attendance,Download Template,lataa mallipohja
 DocType: GL Entry,Remarks,Huomautuksia
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,kuukausittaiset osallistumistaulukot
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,tietuetta ei löydy
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kustannuspaikka on pakollinen tuotteelle {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Saamaan kohteita Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Saamaan kohteita Product Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,tili {0} ei ole aktiivinen
 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"
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'tuloslaskelma' tiliä {0} ei sallita avauskirjaukseen
 DocType: Features Setup,Sales Discounts,myynnin alennukset
 DocType: Hub Settings,Seller Country,myyjä maa
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Julkaise kohteet Website
 DocType: Authorization Rule,Authorization Rule,Valtuutus Rule
 DocType: Sales Invoice,Terms and Conditions Details,ehdot ja säännöt lisätiedot
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,tekniset tiedot
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,myynnin verojen ja maksujen mallipohja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,asut ja tarvikkeet
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,tilausten lukumäärä
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,laskutuksen arvomäärä
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,virheellinen yksikkömäärä on määritetty tuotteelle {0} se tulee olla suurempi kuin 0
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,poistumishakemukset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,tilin tapahtumaa ei voi poistaa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,tilin tapahtumaa ei voi poistaa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,juridiset kulut
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","kuukauden päivä jolloin automaattinen uusi tilaus muodostetaan, esim 05, 28 jne"
 DocType: Sales Invoice,Posting Time,Kirjoittamisen aika
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,hajoitus
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Tili: {0} kanssa valuutta: {1} ei voi valita
 DocType: Bank Reconciliation Detail,Cheque Date,takaus/shekki päivä
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},tili {0}: emotili {1} ei kuulu yritykselle: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},tili {0}: emotili {1} ei kuulu yritykselle: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,kaikki tähän yritykseen liittyvät tapahtumat on poistettu
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kuin Päivämäärä
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Koeaika
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,oletus Varasto vaaditaan varastotuotteelle
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,oletus Varasto vaaditaan varastotuotteelle
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},palkanmaksu kuukausi {0} vuosi {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Automaattinen käynnistys Hinnasto korolla, jos puuttuu"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,maksettu arvomäärä yhteensä
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),laskutuksen kokomaisarvomäärä (aikaloki)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,myymme tätä tuotetta
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,toimittaja tunnus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Määrä olisi oltava suurempi kuin 0
 DocType: Journal Entry,Cash Entry,kassakirjaus
 DocType: Sales Partner,Contact Desc,"yhteystiedot, kuvailu"
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","poistumissyy, kuten vapaa, sairas jne"
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,lisää rivejä tilien vuosibudjetin tekoon
 DocType: Buying Settings,Default Supplier Type,oletus toimittajatyyppi
 DocType: Production Order,Total Operating Cost,käyttökustannukset yhteensä
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,huom: tuote {0} kirjattu useampia kertoja
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,huom: tuote {0} kirjattu useampia kertoja
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,kaikki yhteystiedot
 DocType: Newsletter,Test Email Id,testi sähköposti
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,yrityksen lyhenne
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,kaikki asiakasryhmät
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Vero malli on pakollinen.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,tili {0}: emotili {1} ei ole olemassa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,tili {0}: emotili {1} ei ole olemassa
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),"hinnasto, taso (yrityksen valuutta)"
 DocType: Account,Temporary,väliaikainen
 DocType: Address,Preferred Billing Address,suositeltu laskutusosoite
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,"tuote työkalu, hinnasto taso"
 DocType: Purchase Order Item,Supplier Quotation,toimittajan tarjouskysely
 DocType: Quotation,In Words will be visible once you save the Quotation.,"sanat näkyvät, kun tallennat tarjouksen"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} on pysäytetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} on pysäytetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
 DocType: Lead,Add to calendar on this date,lisää kalenteriin (tämä päivä)
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,toimituskustannusten lisäys säännöt
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Tulevat tapahtumat
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,vihjeestä
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,tuotantoon luovutetut tilaukset
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,valitse tilikausi ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
 DocType: Hub Settings,Name Token,Name Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,perusmyynti
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Ainakin yksi varasto on pakollinen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Selling,perusmyynti
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Ainakin yksi varasto on pakollinen
 DocType: Serial No,Out of Warranty,Out of Takuu
 DocType: BOM Replace Tool,Replace,Korvata
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} myyntilaskua vastaan {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,syötä oletus mittayksikkö
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} myyntilaskua vastaan {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,syötä oletus mittayksikkö
 DocType: Purchase Invoice Item,Project Name,Hankkeen nimi
 DocType: Supplier,Mention if non-standard receivable account,Mainitse jos ei-standardi velalliset
 DocType: Journal Entry Account,If Income or Expense,mikäli tulot tai kulut
 DocType: Features Setup,Item Batch Nos,tuote erä nro
 DocType: Stock Ledger Entry,Stock Value Difference,"varastoarvo, ero"
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,henkilöstöresurssi
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,"vero, vastaavat"
 DocType: BOM Item,BOM No,BOM nro
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Liukuva keskiarvo
 DocType: BOM Replace Tool,The BOM which will be replaced,korvattava BOM
 DocType: Account,Debit,debet
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,Muita Kustannukset
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,tilikauden lopetuspäivä
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",ei voi suodattaa tositenumero pohjalta mikäli tosite on ryhmässä
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,tee toimittajan tarjouskysely
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,tee toimittajan tarjouskysely
 DocType: Quality Inspection,Incoming,saapuva
 DocType: BOM,Materials Required (Exploded),materiaalitarve (räjäytys)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),pienennä ansiota poistuttaessa ilman palkkaa (LWP)
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Rivi # {0}: Sarjanumero {1} ei vastaa {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,tavallinen poistuminen
 DocType: Batch,Batch ID,erän tunnus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Huomautus: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Huomautus: {0}
 ,Delivery Note Trends,lähete trendit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Viikon yhteenveto
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} on ostettu tai alihankintatuotteena rivillä {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,keskimääräinen ostamisen taso
 DocType: Task,Actual Time (in Hours),todellinen aika (tunneissa)
 DocType: Employee,History In Company,yrityksen historia
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Yhteensä Issue / siirto määrä {0} sisään Materiaali Haluan {1} ei voi olla suurempi kuin pyydetty määrä {2} alamomentin {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Uutiskirjeet
 DocType: Address,Shipping,toimitus
 DocType: Stock Ledger Entry,Stock Ledger Entry,varaston tilikirjakirjaus
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,nykyisen tilauskauden päättymispäivä
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Tee tarjous Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,paluu
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Oletus mittayksikkö Variant on oltava sama kuin malli
 DocType: Production Order Operation,Production Order Operation,tuotannon tilauksen toimenpiteet
 DocType: Pricing Rule,Disable,poista käytöstä
 DocType: Project Task,Pending Review,odottaa näkymä
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,asiakastunnus
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,aikaan on oltava suurempi kuin aloitusaika
 DocType: Journal Entry Account,Exchange Rate,valuutta taso
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,myyntitilausta {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,myyntitilausta {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Varasto {0}: Emotili {1} ei kuulu yritykselle {2}
 DocType: BOM,Last Purchase Rate,viimeisin ostotaso
 DocType: Account,Asset,vastaavat
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,pakattavat tuotteet saatavissa varastosta
 DocType: Item Variant,Item Variant,tuotemalli
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"tämä osoite mallipohjaa on asetettu oletukseksi, sillä muuta pohjaa ei ole valittu"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,määrähallinta
 DocType: Production Planning Tool,Filter based on customer,suodata asiakkaisiin perustuen
 DocType: Payment Tool Detail,Against Voucher No,kuitin nro kohdistus
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,Seuraava Yhteystiedot
 DocType: Employee,Employment Type,työsopimus tyyppi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,pitkaikaiset vastaavat
+,Cash Flow,Kassavirta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Hakuaika ei voi yli kaksi alocation kirjaa
 DocType: Item Group,Default Expense Account,oletus kulutili
 DocType: Employee,Notice (days),Ilmoitus (päivää)
@@ -3018,13 +3049,12 @@
 DocType: Production Order,Warehouses,varastot
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Tulosta ja Paikallaan
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,sidoksen ryhmä
-DocType: Payment Reconciliation,Minimum Amount,minimi arvomäärä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,päivitä valmiit tavarat
 DocType: Workstation,per hour,tunnissa
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,varaston (jatkuva inventaario) tehdään tälle tilille.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Varastoa ei voi poistaa, sillä kohdistettuja varaston tilikirjan kirjauksia on olemassa."
 DocType: Company,Distribution,toimitus
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,maksettu arvomäärä
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,maksettu arvomäärä
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,projektihallinta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,lähetys
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max alennus sallittua item: {0} on {1}%
@@ -3048,7 +3078,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,tuki Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},yritystä ei löydy varastoissa {0}
 DocType: POS Profile,Terms and Conditions,ehdot ja säännöt
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"päivä tulee olla tällä tilikaudella, oletettu lopetuspäivä = {0}"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},"päivä tulee olla tällä tilikaudella, oletettu lopetuspäivä = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","tässä voit ylläpitää terveystietoja, pituus, paino, allergiat, lääkkeet jne"
 DocType: Leave Block List,Applies to Company,koskee yritystä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"ei voi peruuttaa, sillä lähetetty varaston tosite {0} on jo olemassa"
@@ -3062,11 +3092,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Anna Osto Kuitit
 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 +425,Transaction not allowed against stopped Production Order {0},tapahtumat tuotannon tilaukseen {0} on estetty
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),määritä teknisen tuen sähköpostin saapuvan palvelimen asetukset (esim tekniikka@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,yksikkömäärä vähissä
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
 DocType: Salary Slip,Salary Slip,palkkalaskelma
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'päättymispäivä' vaaditaan
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","muodosta pakkausluetteloita toimitettaville pakkauksille, käytetään pakkausnumeron, -sisältö ja painon määritykseen"
@@ -3144,7 +3174,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,työntekijä tietue
 DocType: HR Settings,Payroll Settings,palkanlaskennan asetukset
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,täsmää linkittämättömät maksut ja laskut
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Tee tilaus
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Tee tilaus
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,kannalla ei voi olla pääkustannuspaikkaa
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Valitse Merkki ...
 DocType: Sales Invoice,C-Form Applicable,C-muotoa sovelletaan
@@ -3159,7 +3189,7 @@
 DocType: Appraisal,Start Date,aloituspäivä
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,kohdistaa poistumisen kaudelle
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,vahvistaaksesi klikkaa tästä
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,tili {0}: et voi nimetä tätä tiliä emotiliksi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,tili {0}: et voi nimetä tätä tiliä emotiliksi
 DocType: Purchase Invoice Item,Price List Rate,hinnasto taso
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","näytä tämän varaston saatavat ""varastossa"" tai ""ei varastossa"" perusteella"
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),osaluettelo (BOM)
@@ -3168,17 +3198,17 @@
 DocType: Project,Expected Start Date,odotettu aloituspäivä
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,poista tuote mikäli maksuja ei voi soveltaa siihen
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,"esim, smsgateway.com/api/send_sms.cgi"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Vastaanottaa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Vastaanottaa
 DocType: Maintenance Visit,Fully Completed,täysin valmis
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% valmis
 DocType: Employee,Educational Qualification,koulutusksen arviointi
 DocType: Workstation,Operating Costs,käyttökustannukset
 DocType: Employee Leave Approver,Employee Leave Approver,työntekijän poistumis hyväksyjä
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} on lisätty uutiskirje luetteloon.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},rivi {0}: uusi tilaus on jo kirjattu tähän varastoon {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},rivi {0}: uusi tilaus on jo kirjattu tähän varastoon {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","ei voida vahvistaa hävityksi, sillä tarjous on tehty"
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,"ostojenhallinta, valvonta"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,tuotannon tilaus {0} on lähetettävä
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,tuotannon tilaus {0} on lähetettävä
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +136,Main Reports,pääraportit
 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ää
@@ -3196,7 +3226,7 @@
 DocType: Industry Type,Industry Type,teollisuus tyyppi
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,jokin meni pieleen!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,varoitus: poistumissovellus sisältää seuraavat estopäivät
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,myyntilasku {0} on lähetetty
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,myyntilasku {0} on lähetetty
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,katselmus päivä
 DocType: Purchase Invoice Item,Amount (Company Currency),arvomäärä (yrityksen valuutta)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,"organisaatioyksikkö, osasto valvonta"
@@ -3215,10 +3245,10 @@
 ,Serial No Service Contract Expiry,palvelusopimuksen päättyminen sarjanumerolle
 DocType: Item,Unit of Measure Conversion,mittayksikön muunto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,työntekijää ei voi muuttaa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,kredit / debet kirjausta ei voi tehdä samalle tilille yhtäaikaa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,kredit / debet kirjausta ei voi tehdä samalle tilille yhtäaikaa
 DocType: Naming Series,Help HTML,"HTML, ohje"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},nimetty painoarvo yhteensä tulee olla 100% nyt se on {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Avustus yli- {0} ristissä Kohta {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Avustus yli- {0} ristissä Kohta {1}
 DocType: Address,Name of person or organization that this address belongs to.,henkilön- tai organisaation nimi kenelle tämä osoite kuuluu
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,omat toimittajat
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ei voi asettaa hävityksi sillä myyntitilaus on tehty
@@ -3231,35 +3261,35 @@
 DocType: Employee,Date of Issue,aiheen päivä
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: valitse {0} on {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,Website Kuva {0} kiinnitetty Tuote {1} ei löydy
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Kuva {0} kiinnitetty Tuote {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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Tarkista usean valuutan mahdollisuuden sallia tilejä muu valuutta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Tarkista usean valuutan mahdollisuuden sallia tilejä muu valuutta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,tuote: {0} ei ole järjestelmässä
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,sinulla ei ole oikeutta asettaa jäätymis arva
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,sinulla ei ole oikeutta asettaa jäätymis arva
 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
 DocType: Cost Center,Budgets,budjetit
-DocType: Employee,Emergency Contact Details,hätäyhteydenoton lisätiedot
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,mitä tämä tekee?
 DocType: Delivery Note,To Warehouse,varastoon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},"tilillä {0} on useampi, kuin yksi kirjaus tilikaudella {1}"
 ,Average Commission Rate,keskimääräinen provisio taso
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,'on sarjanumero' joka voi olla ainoastaan varastotuote
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,'on sarjanumero' joka voi olla ainoastaan varastotuote
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,osallistumisia ei voi merkitä tuleville päiville
 DocType: Pricing Rule,Pricing Rule Help,"hinnoittelusääntö, ohjeet"
 DocType: Purchase Taxes and Charges,Account Head,tilin otsikko
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,päivitä lisäkustannukset jotta tuotteisiin kohdistuneet kustannukset voidaan laskea
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,sähköinen
 DocType: Stock Entry,Total Value Difference (Out - In),arvoero (ulos-sisään) yhteensä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Rivi {0}: Vaihtokurssi on pakollinen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Rivi {0}: Vaihtokurssi on pakollinen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},käyttäjätunnusta ei asetettu työntekijälle {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,takuuvaatimukseen
 DocType: Stock Entry,Default Source Warehouse,oletus lähde varasto
 DocType: Item,Customer Code,asiakkaan koodi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Syntymäpäivämuistutus {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,päivää edellisestä tilauksesta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Pankkikortti tilille on kuitenkin taseen tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,Debit To account must be a Balance Sheet account,Pankkikortti tilille on kuitenkin taseen tili
 DocType: Buying Settings,Naming Series,nimeä sarjat
 DocType: Leave Block List,Leave Block List Name,"poistu estoluettelo, nimi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,"varasto, vastaavat"
@@ -3272,7 +3302,7 @@
 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
 DocType: Authorization Rule,Based On,perustuu
 DocType: Sales Order Item,Ordered Qty,tilattu yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Tuote {0} on poistettu käytöstä
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Tuote {0} on poistettu käytöstä
 DocType: Stock Settings,Stock Frozen Upto,varasto jäädytetty asti
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Ajanjaksona ja AIKA Voit päivämäärät pakollinen toistuvia {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Hanketoimintaa / tehtävä.
@@ -3280,7 +3310,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjoita Off Määrä (Yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta tilausrajaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta tilausrajaa
 DocType: Landed Cost Voucher,Landed Cost Voucher,"kohdistetut kustannukset, tosite"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Aseta {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Toista päivä Kuukausi
@@ -3309,12 +3339,12 @@
 DocType: Upload Attendance,Upload Attendance,lataa osallistuminen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ja valmistusmäärä tarvitaan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,vanhentumisen skaala 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,arvomäärä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,arvomäärä
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM korvattu
 ,Sales Analytics,myyntianalyysi
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,syötä oletusvaluutta yritys valvonnassa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,syötä oletusvaluutta yritys valvonnassa
 DocType: Stock Entry Detail,Stock Entry Detail,varaston kirjausen yksityiskohdat
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Päivittäinen Muistutukset
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Vero sääntö Ristiriidat {0}
@@ -3340,13 +3370,13 @@
 DocType: Sales Order Item,Produced Quantity,Tuotettu Määrä
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,insinööri
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,haku alikokoonpanot
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},tuotekoodi vaaditaan riville {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},tuotekoodi vaaditaan riville {0}
 DocType: Sales Partner,Partner Type,kumppani tyyppi
 DocType: Purchase Taxes and Charges,Actual,todellinen
 DocType: Authorization Rule,Customerwise Discount,asiakaskohtainen alennus
 DocType: Purchase Invoice,Against Expense Account,kulutilin kohdistus
 DocType: Production Order,Production Order,tuotannon tilaus
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,asennus huomautus {0} on jo lähetetty
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,asennus huomautus {0} on jo lähetetty
 DocType: Quotation Item,Against Docname,asiakirjan 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
@@ -3358,15 +3388,15 @@
 DocType: Employee,Applicable Holiday List,sovellettava lomalista
 DocType: Employee,Cheque,takaus/shekki
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,sarja päivitetty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,raportin tyyppi vaaditaan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,raportin tyyppi vaaditaan
 DocType: Item,Serial Number Series,sarjanumero sarjat
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},varasto vaaditaan varastotuotteelle {0} rivillä {1}
 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/public/js/setup_wizard.js +101,The First User: You,ensimmäinen käyttäjä: sinä
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,onnistuneesti täsmäytetty
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,onnistuneesti täsmäytetty
 DocType: Production Order,Planned End Date,Suunnitellut Päättymispäivä
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,missä tuotteet varastoidaan
 DocType: Tax Rule,Validity,Voimassaolo
@@ -3374,7 +3404,7 @@
 DocType: Attendance,Attendance,osallistuminen
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Lähettämistä päivämäärä ja lähettämistä aika on pakollista
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Lähettämistä päivämäärä ja lähettämistä aika on pakollista
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,veromallipohja ostotapahtumiin
 ,Item Prices,tuote hinnat
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"sanat näkyvät, kun tallennat ostotilauksen"
@@ -3383,15 +3413,15 @@
 DocType: Task,Review Date,Review Date
 DocType: Purchase Invoice,Advance Payments,Ennakkomaksut
 DocType: Purchase Taxes and Charges,On Net Total,netto yhteensä:ssä
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,tavoite varasto rivillä {0} on oltava yhtäsuuri kuin tuotannon tilaus
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,tavoite varasto rivillä {0} on oltava yhtäsuuri kuin tuotannon tilaus
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,ei valtuutusta käyttää maksutyökalua
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'sähköposti-ilmoituksille' ei ole määritelty jatkuvaa %
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Valuutta ei voi muuttaa tehtyään merkinnät jollakin toisella valuutta
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,Valuutta ei voi muuttaa tehtyään merkinnät jollakin toisella valuutta
 DocType: Company,Round Off Account,pyöristys tili
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,hallinnolliset kulut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,konsultointi
 DocType: Customer Group,Parent Customer Group,Parent Asiakasryhmä
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,muutos
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,muutos
 DocType: Purchase Invoice,Contact Email,"yhteystiedot, sähköposti"
 DocType: Appraisal Goal,Score Earned,ansaitut pisteet
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","esim, ""minunyritys LLC"""
@@ -3401,13 +3431,13 @@
 DocType: Packing Slip,Gross Weight UOM,bruttopaino UOM
 DocType: Email Digest,Receivables / Payables,saatavat / maksettavat
 DocType: Delivery Note Item,Against Sales Invoice,myyntilaskun kohdistus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Luottotili
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Luottotili
 DocType: Landed Cost Item,Landed Cost Item,"kohdistetut kustannukset, tuote"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,näytä nolla-arvot
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,tuotemääräarvio valmistuksen- / uudelleenpakkauksen jälkeen annetuista raaka-aineen määristä
 DocType: Payment Reconciliation,Receivable / Payable Account,saatava / maksettava tili
 DocType: Delivery Note Item,Against Sales Order Item,myyntitilauksen kohdistus / tuote
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
 DocType: Item,Default Warehouse,oletus varasto
 DocType: Task,Actual End Date (via Time Logs),todellinen päättymispäivä (aikalokin mukaan)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},budjettia ei voi nimetä ryhmätiliin {0}
@@ -3443,29 +3473,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Suunnittele aikaa lokit ulkopuolella Workstation työaikalain.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} on jo lähetetty
 ,Items To Be Requested,tuotteet joita on pyydettävä
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,hae viimeisin ostotaso
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Laskutus Hinta perustuu Toimintalaji (tunnissa)
 DocType: Company,Company Info,yrityksen tiedot
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent",sähköpostia ei lähetetty sillä yrityksen sähköpostitunnusta ei löytyny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),sovellus varat (vastaavat)
 DocType: Production Planning Tool,Filter based on item,suodata tuotteeseen perustuen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Luottotililtä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Luottotililtä
 DocType: Fiscal Year,Year Start Date,Vuoden aloituspäivä
 DocType: Attendance,Employee Name,työntekijän nimi
 DocType: Sales Invoice,Rounded Total (Company Currency),pyöristys yhteensä (yrityksen  valuutta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,ei voi kääntää ryhmiin sillä tilin tyyppi on valittu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,ei voi kääntää ryhmiin sillä tilin tyyppi on valittu
 DocType: Purchase Common,Purchase Common,Osto Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} on muutettu, päivitä"
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,estä käyttäjiä tekemästä poistumissovelluksia seuraavina päivinä
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,tilaisuudesta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,työntekijä etuudet
 DocType: Sales Invoice,Is POS,on POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},pakattujen määrä tulee olla kuin tuotteen {0} määrä rivillä {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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ä
 DocType: Purchase Receipt Item,Accepted Quantity,hyväksytyt määrä
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ei löydy
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Laskut nostetaan asiakkaille.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"rivi nro {0}: arvomäärä ei voi olla suurempi kuin odottava kuluvaatimus {1}, odottavien arvomäärä on {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"rivi nro {0}: arvomäärä ei voi olla suurempi kuin odottava kuluvaatimus {1}, odottavien arvomäärä on {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} luettelo lisätty
 DocType: Maintenance Schedule,Schedule,aikataulu
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Määritä budjetti tälle Kustannuspaikka. Asettaa budjetti toiminta, katso &quot;Yhtiö List&quot;"
@@ -3473,7 +3504,7 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,hubi
 DocType: GL Entry,Voucher Type,tosite tyyppi
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,hinnastoa ei löydy tai se on poistettu käytöstä
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,hinnastoa ei löydy tai se on poistettu käytöstä
 DocType: Expense Claim,Approved,hyväksytty
 DocType: Pricing Rule,Price,Hinta
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
@@ -3487,7 +3518,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,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 +226,Please select Employee Record first.,valitse työntekijä tietue ensin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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/accounts/doctype/journal_entry/journal_entry.py +191,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/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,voit luoda verotilin
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,syötä kulutili
 DocType: Account,Stock,varasto
@@ -3498,7 +3529,7 @@
 DocType: Employee,Contract End Date,sopimuksen päättymispäivä
 DocType: Sales Order,Track this Sales Order against any Project,seuraa tätä myyntitilausta projektissa
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,siillä myyntitilaukset (odottaa toimitusta) perustuen kriteereihin yllä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,toimittajan tarjouksesta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,toimittajan tarjouksesta
 DocType: Deduction Type,Deduction Type,vähennyksen tyyppi
 DocType: Attendance,Half Day,1/2 päivä
 DocType: Pricing Rule,Min Qty,min yksikkömäärä
@@ -3506,7 +3537,7 @@
 DocType: GL Entry,Transaction Date,tapahtuma päivä
 DocType: Production Plan Item,Planned Qty,suunniteltu yksikkömäärä
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,verot yhteensä
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,yksikkömäärään (valmistettu yksikkömäärä) vaaditaan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,yksikkömäärään (valmistettu yksikkömäärä) vaaditaan
 DocType: Stock Entry,Default Target Warehouse,oletus tavoite varasto
 DocType: Purchase Invoice,Net Total (Company Currency),netto yhteensä (yrityksen valuutta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,rivi {0}: osapuolityyppi ja osapuoli on kohdistettavissa saatava / maksettava tilille
@@ -3560,9 +3591,9 @@
 DocType: Customer,Commission Rate,provisio taso
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,estä poistumissovellukset osastoittain
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Ostoskori on tyhjä
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Ostoskori on tyhjä
 DocType: Production Order,Actual Operating Cost,todelliset toimintakustannukset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,kantaa ei voi muokata
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,kantaa ei voi muokata
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,kohdennettu arvomäärä ei voi olla suurempi kuin säätämätön arvomäärä
 DocType: Manufacturing Settings,Allow Production on Holidays,salli tuotanto lomapäivinä
 DocType: Sales Order,Customer's Purchase Order Date,asiakkaan ostotilaus päivä
@@ -3573,11 +3604,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,suunnittelija
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,ehdot ja säännöt mallipohja
 DocType: Serial No,Delivery Details,"toimitus, lisätiedot"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},kustannuspaikka tarvitsee rivin {0} verokannan {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},kustannuspaikka tarvitsee rivin {0} verokannan {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,tee materiaalipyyntö automaattisesti mikäli määrä laskee alle asetetun tason
 ,Item-wise Purchase Register,"tuote työkalu, ostorekisteri"
 DocType: Batch,Expiry Date,vanhenemis päivä
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Asettaa reorder tasolla, kohde on osto Tuote tai valmistus Tuote"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Asettaa reorder tasolla, kohde on osto Tuote tai valmistus Tuote"
 ,Supplier Addresses and Contacts,toimittajien osoitteet ja yhteystiedot
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ole hyvä ja valitse Luokka ensin
 apps/erpnext/erpnext/config/projects.py +18,Project master.,projekti valvonta
@@ -3585,7 +3616,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(1/2 päivä)
 DocType: Supplier,Credit Days,kredit päivää
 DocType: Leave Type,Is Carry Forward,siirretääkö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,hae tuotteita BOM:sta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,hae tuotteita BOM:sta
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,"virtausaika, päivää"
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,materiaalien lasku
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},rivi {0}: osapuolityyppi ja osapuoli vaaditaan saatava / maksettava tilille {1}
@@ -3593,7 +3624,7 @@
 DocType: Employee,Reason for Leaving,poistumisen syy
 DocType: Expense Claim Detail,Sanctioned Amount,sanktioitujen arvomäärä
 DocType: GL Entry,Is Opening,on avaus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},rivi {0}: debet kirjausta ei voi kohdistaa {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,tiliä {0} ei löydy
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},rivi {0}: debet kirjausta ei voi kohdistaa {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,tiliä {0} ei löydy
 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 9f1caa2..5b4389c 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -1,14 +1,14 @@
 DocType: Employee,Salary Mode,Mode de rémunération
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Sélectionnez une distribution mensuelle, si vous voulez suivre basée sur la saisonnalité."
 DocType: Employee,Divorced,Divorcé
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Attention: même élément a été saisi plusieurs fois.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Attention : le même élément a été saisi plusieurs fois.
 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,Autorisera à être ajouté à plusieurs reprises dans une transaction
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuler Matériau Visitez {0} avant d'annuler cette revendication de garantie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produits de consommation
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,S&#39;il vous plaît sélectionner partie Type premier
 DocType: Item,Customer Items,Articles de clients
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Compte {0}: Le Compte parent {1} ne peut pas être un grand livre
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Compte {0}: Le Compte parent {1} ne peut pas être un grand livre
 DocType: Item,Publish Item to hub.erpnext.com,Publier un item au hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Notifications par courriel
 DocType: Item,Default Unit of Measure,Unité de mesure par défaut
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Devise est nécessaire pour 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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,De Demande de Matériel
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,De Demande de Matériel
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Arbre
 DocType: Job Applicant,Job Applicant,Demandeur d&#39;emploi
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Plus de résultats.
@@ -38,7 +38,7 @@
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Chefs (ou groupes) contre lequel les entrées comptables sont faites et les soldes sont maintenus.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Participation pour les employés {0} est déjà marqué
 DocType: Manufacturing Settings,Default 10 mins,Par défaut 10 minutes
-DocType: Leave Type,Leave Type Name,Laisser Nom Type
+DocType: Leave Type,Leave Type Name,Nom du Type de Congé
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,prix règle
 DocType: Pricing Rule,Apply On,Pas autorisé à modifier compte gelé {0}
 DocType: Item Price,Multiple Item prices.,Prix des ouvrages multiples.
@@ -47,12 +47,12 @@
 DocType: Quality Inspection Reading,Parameter,Paramètre
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Date prévue de la fin ne peut être inférieure à Date de début prévue
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Taux doit être le même que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,New Leave Application,Nouvelle demande d&#39;autorisation
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,New Leave Application,Nouvelle Demande de Congés
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Projet de la Banque
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Utiliser cette option pour maintenir le code de référence du client et les rendre consultables en fonction de leur code.
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de compte de paiement
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Voir les variantes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Quantité
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Quantité
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Prêts ( passif)
 DocType: Employee Education,Year of Passing,Année de passage
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En Stock
@@ -63,24 +63,24 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,soins de santé
 DocType: Purchase Invoice,Monthly,Mensuel
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Retard de paiement (jours)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Facture
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Facture
 DocType: Maintenance Schedule Item,Periodicity,Périodicité
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adresse E-mail
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Exercice {0} est nécessaire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,défense
 DocType: Company,Abbr,Abréviation
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rangée {0}: {1} {2} ne correspond pas à {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Rangée {0}: {1} {2} ne correspond pas à {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,No du véhicule
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,S&#39;il vous plaît sélectionnez Liste des Prix
-DocType: Production Order Operation,Work In Progress,Work In Progress
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,S&#39;il vous plaît sélectionnez Liste des Prix
+DocType: Production Order Operation,Work In Progress,Travaux en cours
 DocType: Employee,Holiday List,Liste de vacances
-DocType: Time Log,Time Log,Temps Connexion
+DocType: Time Log,Time Log,Relevé de Temps/Timesheet
 apps/erpnext/erpnext/public/js/setup_wizard.js +292,Accountant,Comptable
-DocType: Cost Center,Stock User,Stock utilisateur
+DocType: Cost Center,Stock User,Intervenant/Chargé des Stocks
 DocType: Company,Phone No,N ° de téléphone
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Connexion des activités réalisées par les utilisateurs contre les tâches qui peuvent être utilisés pour le suivi du temps, de la facturation."
-apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},New {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Nouveau {0}: # {1}
 ,Sales Partners Commission,Partenaires Sales Commission
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,L'abbréviation ne peut pas avoir plus de 5 caractères
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Même Société a été inscrite plus d&#39;une fois
 DocType: Employee,Married,Marié
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Non autorisé pour {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},désactiver
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},désactiver
 DocType: Payment Reconciliation,Reconcile,réconcilier
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,épicerie
 DocType: Quality Inspection Reading,Reading 1,Lecture 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Assurez accès des banques
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Les fonds de pension
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Entrepôt est obligatoire si le type de compte est Entrepôt
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Entrepôt est obligatoire si le type de compte est Entrepôt
 DocType: SMS Center,All Sales Person,Tous les commerciaux
 DocType: Lead,Person Name,Nom Personne
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Vérifiez si l'ordre récurrent, décochez d'arrêter récurrents ou mettre bon Date de fin"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Intéressé
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,De la valeur doit être inférieure à la valeur à la ligne {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Ouverture
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Du {0} au {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Du {0} au {1}
 DocType: Item,Copy From Item Group,Copy From Group article
 DocType: Journal Entry,Opening Entry,Entrée ouverture
 DocType: Stock Entry,Additional Costs,Coûts additionels
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Un compte contenant une transaction ne peut pas être converti en groupe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Un compte contenant une transaction ne peut pas être converti en groupe
 DocType: Lead,Product Enquiry,Demande d&#39;information produit
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,S'il vous plaît entrez première entreprise
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,S'il vous plaît sélectionnez Société premier
-DocType: Employee Education,Under Graduate,Sous Graduate
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,cible sur
+DocType: Employee Education,Under Graduate,Non Diplômé
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,cible sur
 DocType: BOM,Total Cost,Coût total
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Journal d'activité:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Point {0} n'existe pas dans le système ou a expiré
@@ -165,14 +165,14 @@
 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élécharger le modèle, remplissez les données appropriées et joindre le fichier modifié.
  Toutes les dates et employé combinaison dans la période choisie viendra dans le modèle, avec des records de fréquentation existants"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,« À jour» est nécessaire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,« À jour» est nécessaire
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Sera mis à jour après la facture de vente est soumise.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","D'inclure la taxe dans la ligne {0} dans le prix de l'article , les impôts dans les lignes {1} doivent également être inclus"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Utilisateur {0} est désactivé
 DocType: SMS Center,SMS Center,Centre SMS
 DocType: BOM Replace Tool,New BOM,Nouvelle nomenclature
-apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs pour la facturation.
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Entrepôt requis pour stock Article {0}
+apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Regroupement de relevés de temps pour la facturation.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,La Newsletter a déjà été envoyée
 DocType: Lead,Request Type,Type de demande
 DocType: Leave Application,Reason,Raison
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Diffusion
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Les détails des opérations effectuées.
 DocType: Serial No,Maintenance Status,Statut d&#39;entretien
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Articles et Prix
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},De la date doit être dans l'exercice. En supposant Date d'= {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},De la date doit être dans l'exercice. En supposant Date d'= {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Sélectionnez l&#39;employé pour lequel vous créez l&#39;évaluation.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Numéro de commande requis pour objet {0}
 DocType: Customer,Individual,Individuel
@@ -197,16 +197,16 @@
 DocType: Purchase Taxes and Charges,Valuation,Évaluation
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Définir par défaut
 ,Purchase Order Trends,Bon de commande Tendances
-apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Allouer des feuilles de l&#39;année.
-DocType: Earning Type,Earning Type,Gagner Type d&#39;
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Allouer des congés pour l'année.
+DocType: Earning Type,Earning Type,Type de Revenus
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Planification de la capacité Désactiver et Gestion du Temps
 DocType: Bank Reconciliation,Bank Account,Compte bancaire
 DocType: Leave Type,Allow Negative Balance,Autoriser un solde négatif
 DocType: Selling Settings,Default Territory,Territoire défaut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Télévision
-DocType: Production Order Operation,Updated via 'Time Log',Mise à jour via 'Log Time'
+DocType: Production Order Operation,Updated via 'Time Log',Mis à jour via 'Log Time'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Compte {0} n'appartient pas à la société {1}
-DocType: Naming Series,Series List for this Transaction,Liste série pour cette transaction
+DocType: Naming Series,Series List for this Transaction,Liste des Séries pour cette transaction
 DocType: Sales Invoice,Is Opening Entry,Est l&#39;ouverture d&#39;entrée
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mentionner si créance non standard applicable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Warehouse est nécessaire avant Soumettre
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,S'il vous plaît entrer Société
 DocType: Delivery Note Item,Against Sales Invoice Item,Sur l'objet de la facture de vente
 ,Production Orders in Progress,Les commandes de produits en cours
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Encaisse nette de financement
 DocType: Lead,Address & Contact,Adresse et coordonnées
 DocType: Leave Allocation,Add unused leaves from previous allocations,Ajouter les feuilles inutilisées d&#39;attributions antérieures
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Suivant récurrent {0} sera créé sur {1}
@@ -222,10 +223,11 @@
 ,Contact Name,Contact Nom
 DocType: Production Plan Item,SO Pending Qty,SO attente Qté
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crée le bulletin de salaire pour les critères mentionnés ci-dessus.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Le jour (s ) sur lequel vous postulez pour congé sont les vacances . Vous n'avez pas besoin de demander l'autorisation .
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Demande d&#39;achat.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Seul le congé approbateur sélectionné peut soumettre cette demande de congé
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Vous n'êtes pas autorisé à ajouter ou mettre à jour les entrées avant {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,De feuilles par année
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Congés par Année
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,S&#39;il vous plaît mettre Naming série pour {0} via Configuration&gt; Paramètres&gt; Série Naming
 DocType: Time Log,Will be updated when batched.,Sera mis à jour lorsque lots.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ligne {0}: S'il vous plaît vérifier 'Est Avance' sur compte {1} si c'est une entrée avance.
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,Spécification Site élément
 DocType: Payment Tool,Reference No,No de référence
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Laisser Bloqué
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},dépenses
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},dépenses
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Annuel
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock réconciliation article
 DocType: Stock Entry,Sales Invoice No,Aucune facture de vente
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Type de fournisseur
 DocType: Item,Publish in Hub,Publier dans Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Nom de la campagne est nécessaire
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Nom de la campagne est nécessaire
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Demande de matériel
 DocType: Bank Reconciliation,Update Clearance Date,Mettre à jour Date de Garde
 DocType: Item,Purchase Details,Détails de l'achat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} introuvable dans 'matières premières Fournies' table dans la commande d'achat {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} introuvable dans 'matières premières Fournies' table dans la commande d'achat {1}
 DocType: Employee,Relation,Rapport
 DocType: Shipping Rule,Worldwide Shipping,Livraison internationale
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Confirmé commandes provenant de clients.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Suggestions
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Point du Groupe sages budgets sur ce territoire. Vous pouvez également inclure la saisonnalité en réglant la distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},S'il vous plaît entrer parent groupe compte pour l'entrepôt {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Paiement contre {0} {1} ne peut pas être supérieure à Encours {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Paiement contre {0} {1} ne peut pas être supérieure à Encours {2}
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,N° mobile.
 DocType: Maintenance Schedule,Generate Schedule,Générer annexe
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,dernier
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,5 caractères maximum
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Le premier congé approbateur dans la liste sera définie comme le congé approbateur de défaut
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Apprendre
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activité Coût par employé
 DocType: Accounts Settings,Settings for Accounts,Réglages pour les comptes
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Gérer les ventes personne Arbre .
@@ -283,36 +286,36 @@
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Référence circulaire erreur
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Dans Words (Exportation) sera visible une fois que vous enregistrez le bon de livraison.
 DocType: Lead,Industry,Industrie
-DocType: Employee,Job Profile,Profil d'emploi
-DocType: Newsletter,Newsletter,Bulletin
+DocType: Employee,Job Profile,Profil de poste
+DocType: Newsletter,Newsletter,Newsletter
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notification par courriel lors de la création de la demande de matériel automatique
 DocType: Journal Entry,Multi Currency,Multi-devise
 DocType: Payment Reconciliation Invoice,Invoice Type,Type de facture
 DocType: Sales Invoice Item,Delivery Note,Bon de livraison
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Mise en place d&#39;impôts
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Mise en place d&#39;impôts
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Paiement entrée a été modifié après que vous avez tiré il. Se il vous plaît tirez encore.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +105,Summary for this week and pending activities,Résumé pour cette semaine et les activités en suspens
 DocType: Workstation,Rent Cost,louer coût
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,S&#39;il vous plaît sélectionner le mois et l&#39;année
 DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Entrez Identifiant courriels séparé par des virgules, la facture sera envoyée automatiquement à la date particulière"
 DocType: Employee,Company Email,E-mail entreprise
 DocType: GL Entry,Debit Amount in Account Currency,Montant de débit en compte Devises
-DocType: Shipping Rule,Valid for Countries,Valable pour les pays
+DocType: Shipping Rule,Valid for Countries,Valable pour les Pays
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Tous les champs importation connexes comme monnaie , taux de conversion , total d'importation , importation grande etc totale sont disponibles en Achat réception , Devis fournisseur , Facture d'achat , bon de commande , etc"
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,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. Attributs d'élément seront copiés dans les variantes moins 'No Copy »est réglé
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Total de la commande Considéré
-apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",Vous devez enregistrer le formulaire avant de procéder
+apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Intitulé de Poste (par exemple Directeur Général, Directeur...)"
 apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,1 devise = [ ? ] Fraction
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Vitesse à laquelle la devise du client est converti en devise de base du client
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en nomenclature , bon de livraison , facture d'achat , ordre de production, bon de commande , bon de réception , la facture de vente , Sales Order , Stock entrée , des feuilles de temps"
 DocType: Item Tax,Tax Rate,Taux d&#39;imposition
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} déjà alloué pour les employés {1} pour la période {2} pour {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Sélectionner un élément
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Sélectionner un élément
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} discontinu, ne peut être conciliée utilisant \
  Stock réconciliation, utiliser à la place l'entrée en stock géré"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Voulez-vous vraiment de soumettre tout bulletin de salaire pour le mois {0} et {1} an
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Voulez-vous vraiment de soumettre tout bulletin de salaire pour le mois {0} et {1} an
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: N ° de lot doit être le même que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir en non-groupe
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Reçu d'achat doit être présentée
@@ -343,7 +346,7 @@
 DocType: Employee,Widowed,Veuf
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Articles à être demandés, qui sont &quot;Out of Stock&quot; compte tenu de tous les entrepôts basés sur quantité projetée et qté minimum"
 DocType: Workstation,Working Hours,Journée de travail
-DocType: Naming Series,Change the starting / current sequence number of an existing series.,Changer le numéro de séquence de démarrage / courant d&#39;une série existante.
+DocType: Naming Series,Change the starting / current sequence number of an existing series.,Changer le numéro initial/actuel d'une série existante.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si plusieurs règles de tarification continuent de prévaloir, les utilisateurs sont invités à définir manuellement la priorité à résoudre les conflits."
 ,Purchase Register,Achat S&#39;inscrire
 DocType: Landed Cost Item,Applicable Charges,Frais applicables
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Numéro de référence est obligatoire si vous avez entré date de référence
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Raison pour perdre
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation est fermé aux dates suivantes selon la liste de vacances: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Des opportunités
 DocType: Employee,Single,Unique
 DocType: Issue,Attachment,Pièce jointe
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget ne peut pas être réglé pour le centre de coûts du Groupe
@@ -378,22 +382,22 @@
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Parent Vieux
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personnaliser le texte d'introduction qui se déroule comme une partie de cet courriel. Chaque transaction a un texte séparé d'introduction.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Gestionnaire de Maître de vente
+DocType: Sales Taxes and Charges Template,Sales Master Manager,Directeur des Ventes
 apps/erpnext/erpnext/config/manufacturing.py +74,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,Sur envoyé
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionnée à plusieurs reprises dans le tableau Attributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionnée à plusieurs reprises dans le tableau Attributs
 DocType: HR Settings,Employee record is created using selected field. ,dossier de l&#39;employé est créé en utilisant champ sélectionné.
 DocType: Sales Order,Not Applicable,Non applicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Débit doit être égal à crédit . La différence est {0}
 DocType: Material Request Item,Required Date,Requis Date
 DocType: Delivery Note,Billing Address,Adresse de facturation
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,S'il vous plaît entrez le code d'article .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,S'il vous plaît entrez le code d'article .
 DocType: BOM,Costing,Costing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si elle est cochée, le montant de la taxe sera considéré comme déjà inclus dans le tarif Imprimer / Print Montant"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantité totale
 DocType: Employee,Health Concerns,Préoccupations pour la santé
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Non rémunéré
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Impayé
 DocType: Packing Slip,From Package No.,De Ensemble numéro
 DocType: Item Attribute,To Range,Se situer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titres et des dépôts
@@ -401,15 +405,15 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Nombre de feuilles alloués est obligatoire
 DocType: Job Opening,Description of a Job Opening,Description d'une ouverture d'emploi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Activités en suspens pour aujourd&#39;hui
-apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Record de fréquentation.
-DocType: Bank Reconciliation,Journal Entries,Journal Entries
+apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Listes de présence.
+DocType: Bank Reconciliation,Journal Entries,Entrées de Journal
 DocType: Sales Order Item,Used for Production Plan,Utilisé pour plan de production
 DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre les opérations (en min)
 DocType: Customer,Buyer of Goods and Services.,Lors de votre achat des biens et services.
 DocType: Journal Entry,Accounts Payable,Comptes à payer
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Ajouter abonnés
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" N'existe pas"
-DocType: Pricing Rule,Valid Upto,Jusqu&#39;à valide
+DocType: Pricing Rule,Valid Upto,Valide jusqu'à
 apps/erpnext/erpnext/public/js/setup_wizard.js +322,List a few of your customers. They could be organizations or individuals.,Énumérer quelques-unes de vos clients . Ils pourraient être des organisations ou des individus .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Choisissez votre langue
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Impossible de filtrer sur les compte , si regroupées par compte"
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,S'il vous plaît entrer Entrepôt à qui demande de matériel sera porté
 DocType: Production Order,Additional Operating Cost,Coût de fonctionnement supplémentaires
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,produits de beauté
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,N ° de série expiration de garantie
@@ -434,21 +438,20 @@
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taux auquel la monnaie Liste de prix est converti en devise de base entreprise
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Compte {0} n'appartient pas à la société : {1}
 DocType: Selling Settings,Default Customer Group,Groupe de clients par défaut
-DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si désactiver, &#39;arrondi totale «champ ne sera pas visible dans toute transaction"
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si coché, le champ ""Total arrondi"" ne sera pas visible et les montants ne seront pas arrondis."
 DocType: BOM,Operating Cost,Coût d&#39;exploitation
 ,Gross Profit,Bénéfice brut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Incrément ne peut pas être 0
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Supprimer Transactions Société
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Point {0} n'est pas acheter l'article
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Point {0} n'est pas acheter l'article
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} est une adresse de courriel invalide dans «L'adresse de notification courriel'
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Facturation totale de cette année:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ajouter / Modifier Taxes et Charges
 DocType: Purchase Invoice,Supplier Invoice No,Fournisseur facture n
 DocType: Territory,For reference,Pour référence
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Vous ne pouvez pas supprimer de série n {0}, tel qu&#39;il est utilisé dans les transactions d&#39;achat d&#39;actions"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Fermeture (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Fermeture (Cr)
 DocType: Serial No,Warranty Period (Days),Période de garantie (jours)
 DocType: Installation Note Item,Installation Note Item,Article Remarque Installation
 ,Pending Qty,En attente Quantité
@@ -456,7 +459,7 @@
 DocType: Company,Ignore,Ignorer
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS envoyé aux numéros suivants: {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Peut se référer ligne que si le type de charge est « Le précédent Montant de la ligne » ou « Précédent Row Total»
-DocType: Pricing Rule,Valid From,Aucun article avec Serial Non {0}
+DocType: Pricing Rule,Valid From,Valide à partir de
 DocType: Sales Invoice,Total Commission,Total de la Commission
 DocType: Pricing Rule,Sales Partner,Sales Partner
 DocType: Buying Settings,Purchase Receipt Required,Réception achat requis
@@ -465,17 +468,17 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Distribution mensuelle ** vous aide à distribuer votre budget à travers les mois si vous avez la saisonnalité dans votre entreprise.
 
  Pour distribuer un budget en utilisant cette distribution, réglez ce ** distribution mensuelle ** ** dans le centre de coûts **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Aucun documents trouvés dans le tableau de la facture
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Aucun enregistrement trouvé dans la table Facture
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,S'il vous plaît sélectionnez Société et partie Type premier
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Point {0} a été saisi plusieurs fois contre une même opération
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Désolé , série n ne peut pas être fusionné"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Assurez- Commande
 DocType: Project Task,Project Task,Groupe de Projet
 ,Lead Id,Id prospect
-DocType: C-Form Invoice Detail,Grand Total,Grand Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Exercice Date de début ne doit pas être supérieure à fin d'exercice Date de
+DocType: C-Form Invoice Detail,Grand Total,Total Général
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Exercice Date de début ne doit pas être supérieure à fin d'exercice Date de
 DocType: Warranty Claim,Resolution,Résolution
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Livré: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Livré: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Comptes créditeurs
 DocType: Sales Order,Billing and Delivery Status,Facturation et de livraison Statut
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Répéter les clients
@@ -490,7 +493,7 @@
 DocType: Quotation,Quotation To,Devis Pour
 DocType: Lead,Middle Income,Revenu intermédiaire
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Ouverture ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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é de mesure pour le point de défaut {0} ne peut pas être modifié directement parce que vous avez déjà fait une transaction (s) avec une autre unité de mesure. Vous aurez besoin de créer un nouveau poste d&#39;utiliser un défaut UOM différente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +711,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é de mesure pour le point de défaut {0} ne peut pas être modifié directement parce que vous avez déjà fait une transaction (s) avec une autre unité de mesure. Vous aurez besoin de créer un nouveau poste d&#39;utiliser un défaut UOM différente.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Le montant alloué ne peut être négatif
 DocType: Purchase Order Item,Billed Amt,Bec Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Entrepôt logique dans lequel les entrées en stocks sont faites.
@@ -499,7 +502,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordre de fabrication est obligatoire
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Rédaction de propositions
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un autre Sales Person {0} existe avec le même ID d&#39;employé
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Erreur inventaire négatif ({6}) pour item {0} dans l'entrepot {1} sur {2} {3} dans {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Erreur inventaire négatif ({6}) pour item {0} dans l'entrepot {1} sur {2} {3} dans {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Exercice Société
 DocType: Packing Slip Item,DN Detail,Détail DN
 DocType: Time Log,Billed,Facturé
@@ -518,16 +521,17 @@
 DocType: Activity Type,Default Costing Rate,Taux de défaut Costing
 DocType: Maintenance Schedule,Maintenance Schedule,Calendrier d&#39;entretien
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Ensuite, les règles de tarification sont filtrés sur la base de clientèle, par groupe de clients, Territoire, fournisseur, le type de fournisseur, campagne, etc Sales Partner"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Variation nette des stocks
 DocType: Employee,Passport Number,Numéro de passeport
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,directeur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,De ticket de caisse
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Même élément a été saisi plusieurs fois.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,De ticket de caisse
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Même élément a été saisi plusieurs fois.
 DocType: SMS Settings,Receiver Parameter,Paramètre récepteur
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basé sur' et 'Groupé par' ne peuvent pas être identiques
 DocType: Sales Person,Sales Person Targets,Personne objectifs de vente
 DocType: Production Order Operation,In minutes,En quelques minutes
 DocType: Issue,Resolution Date,Date de Résolution
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},Les frais de téléphone
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},Les frais de téléphone
 DocType: Selling Settings,Customer Naming By,Client de nommage par
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir au groupe
 DocType: Activity Cost,Activity Type,Type d&#39;activité
@@ -536,9 +540,9 @@
 DocType: Sales Invoice,Packing List,Packing List
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Achetez commandes faites aux fournisseurs.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,édition
-DocType: Activity Cost,Projects User,Projets utilisateur
+DocType: Activity Cost,Projects User,Utilisateur/Intervenant Projets
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consommé
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} introuvable pas dans les Détails de la facture
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} introuvable pas dans les Détails de la facture
 DocType: Company,Round Off Cost Center,Arrondir Centre de coûts
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Doublons {0} avec la même {1}
 DocType: Material Request,Material Transfer,De transfert de matériel
@@ -547,7 +551,7 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Taxes et frais de Landed Cost
 DocType: Production Order Operation,Actual Start Time,Heure de début réelle
 DocType: BOM Operation,Operation Time,Temps de fonctionnement
-DocType: Pricing Rule,Sales Manager,Directeur des ventes
+DocType: Pricing Rule,Sales Manager,Responsable Ventes
 DocType: Journal Entry,Write Off Amount,Ecrire Off Montant
 DocType: Journal Entry,Bill No,Numéro de la facture
 DocType: Purchase Invoice,Quarterly,Trimestriel
@@ -560,13 +564,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,commercialisation
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Pour suivre pièce documents de vente et d&#39;achat en fonction de leurs numéros de série. Ce n&#39;est peut également être utilisé pour suivre les détails de la garantie du produit.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock actuel
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Entrepôt rejeté est obligatoire contre l'article regected
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,La facturation totale de cette année
 DocType: Account,Expenses Included In Valuation,Frais inclus dans l&#39;évaluation
 DocType: Employee,Provide email id registered in company,Fournir id courriel enregistrée dans la société
 DocType: Hub Settings,Seller City,Vendeur Ville
-DocType: Email Digest,Next email will be sent on:,Email sera envoyé le:
+DocType: Email Digest,Next email will be sent on:,Le prochain Email sera envoyé le :
 DocType: Offer Letter Term,Offer Letter Term,Offrez Lettre terme
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Point a variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Point a variantes.
 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 de l&#39;action
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Type d' arbre
@@ -584,29 +588,29 @@
 DocType: Purchase Order,Supply Raw Materials,Raw Materials Supply
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La date à laquelle prochaine facture sera générée. Il est généré sur soumettre.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Actif à court terme
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} n'est pas un article de stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} n'est pas un article de stock
 DocType: Mode of Payment Account,Default Account,Compte par défaut
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Le prospect doit être réglée si l'occasion est créé à partir de ce prospect
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Laissez uniquement les applications ayant le statut « Approuvé » peut être soumis
 DocType: Production Order Operation,Planned End Time,Fin planifiée Temps
 ,Sales Person Target Variance Item Group-Wise,S'il vous plaît entrer un message avant de l'envoyer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Un compte contenant une transaction ne peut pas être converti en grand livre
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Un compte contenant une transaction ne peut pas être converti en grand livre
 DocType: Delivery Note,Customer's Purchase Order No,Bon de commande du client Non
 DocType: Employee,Cell Number,Nombre de cellules
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Demandes de matériel généré automatiquement
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perdu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Vous ne pouvez pas entrer coupon courant dans «Contre Journal Entry 'colonne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Vous ne pouvez pas entrer coupon courant dans «Contre Journal Entry 'colonne
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,énergie
 DocType: Opportunity,Opportunity From,De opportunité
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Fiche de salaire mensuel.
 DocType: Item Group,Website Specifications,Site Web Spécifications
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,nouveau compte
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Nouveau Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Du {0} de type {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ligne {0}: facteur de conversion est obligatoire
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Les écritures comptables ne peuvent être faites sur les nœuds feuilles. Les entrées dans les groupes ne sont pas autorisées.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Vous ne pouvez pas désactiver ou annuler BOM car il est lié à d'autres nomenclatures
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,Vous ne pouvez pas désactiver ou annuler BOM car il est lié à d'autres nomenclatures
 DocType: Opportunity,Maintenance,Entretien
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Numéro du bon de réception requis pour objet {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Numéro du bon de réception requis pour objet {0}
 DocType: Item Attribute Value,Item Attribute Value,Point Attribut Valeur
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campagnes de vente .
 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.
@@ -652,27 +656,27 @@
 DocType: Expense Claim,Project,Projet
 DocType: Quality Inspection Reading,Reading 7,Lecture 7
 DocType: Address,Personal,Personnel
-DocType: Expense Claim Detail,Expense Claim Type,Type de demande d&#39;indemnité
+DocType: Expense Claim Detail,Expense Claim Type,Type de Frais
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Les paramètres par défaut pour Panier
 apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal entrée {0} est lié contre l'ordonnance {1}, vérifier si elle doit être tiré comme l'avance dans la présente facture."
 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 +108,Office Maintenance Expenses,Date d'adhésion doit être supérieure à Date de naissance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,S'il vous plaît entrer article premier
 DocType: Account,Liability,responsabilité
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montant sanctionné ne peut pas être supérieure à la revendication Montant en ligne {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Le montant approuvé ne peut pas être supérieur au montant réclamé en ligne {0}.
 DocType: Company,Default Cost of Goods Sold Account,Par défaut Coût des marchandises vendues compte
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Barcode valide ou N ° de série
 DocType: Employee,Family Background,Antécédents familiaux
 DocType: Process Payroll,Send Email,Envoyer un E-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Attention: Pièce jointe non valide {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Attention: Pièce jointe non valide {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Aucune autorisation
-DocType: Company,Default Bank Account,Compte bancaire
+DocType: Company,Default Bank Account,Compte bancaire par défaut
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Pour filtrer sur la base du Parti, sélectionnez Parti premier type"
 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 Stock' ne peut pas être vérifié parce que les articles ne sont pas livrés par {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Transaction non autorisée contre arrêté l'ordre de fabrication {0}
 DocType: Item,Items with higher weightage will be shown higher,Articles avec weightage supérieur seront affichés supérieur
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Détail du rapprochement bancaire
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Mes factures
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Mes factures
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Aucun employé trouvé
 DocType: Purchase Order,Stopped,Arrêté
 DocType: Item,If subcontracted to a vendor,Si en sous-traitance à un fournisseur
@@ -682,6 +686,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Envoyer maintenant
 ,Support Analytics,Analyse du support
 DocType: Item,Website Warehouse,Entrepôt site web
+DocType: Payment Reconciliation,Minimum Invoice Amount,Le minimum de facturation
 DocType: Sales 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é par exemple 05, 28 etc"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Enregistrements C -Form
@@ -691,7 +696,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Pour activer &quot;Point de vente&quot; caractéristiques
 DocType: Bin,Moving Average Rate,Moving Prix moyen
 DocType: Production Planning Tool,Select Items,Sélectionner les objets
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contre le projet de loi en date du {1} {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} contre le projet de loi en date du {1} {2}
 DocType: Maintenance Visit,Completion Status,L&#39;état d&#39;achèvement
 DocType: Sales Invoice Item,Target Warehouse,Cible d&#39;entrepôt
 DocType: Item,Allow over delivery or receipt upto this percent,autoriser plus de livraison ou de réception jusqu'à ce pour cent
@@ -699,14 +704,14 @@
 DocType: Upload Attendance,Import Attendance,Importer Participation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Tous les groupes d'article
 DocType: Process Payroll,Activity Log,Journal d&#39;activité
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Bénéfice net / perte nette
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Bénéfice Net / Perte Nette
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Composer automatiquement un message sur la soumission de transactions .
 DocType: Production Order,Item To Manufacture,Point à la fabrication de
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statut est {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Achetez commande au paiement
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Achetez commande au paiement
 DocType: Sales Order Item,Projected Qty,Qté projeté
 DocType: Sales Invoice,Payment Due Date,Date d'échéance
-DocType: Newsletter,Newsletter Manager,Bulletin Gestionnaire
+DocType: Newsletter,Newsletter Manager,Responsable de l'infolettre
 apps/erpnext/erpnext/stock/doctype/item/item.js +246,Item Variant {0} already exists with same attributes,Point Variant {0} existe déjà avec les mêmes caractéristiques
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Ouverture&#39;
 DocType: Notification Control,Delivery Note Message,Note Message de livraison
@@ -727,10 +732,10 @@
 DocType: Sales Invoice Item,Stock Details,Stock Détails
 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 +304,Point-of-Sale,Point de vente
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Le solde du compte est déjà en crédit, vous n'êtes pas autorisé à mettre en 'Doit être en équilibre' comme 'débit'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Le solde du compte est déjà en crédit, vous n'êtes pas autorisé à mettre en 'Doit être en équilibre' comme 'débit'"
 DocType: Account,Balance must be,Solde doit être
 DocType: Hub Settings,Publish Pricing,Publier Prix
-DocType: Notification Control,Expense Claim Rejected Message,Demande d&#39;indemnité rejeté le message
+DocType: Notification Control,Expense Claim Rejected Message,Note de Frais Rejetée Message
 ,Available Qty,Quantité disponible
 DocType: Purchase Taxes and Charges,On Previous Row Total,Le total de la rangée précédente
 DocType: Salary Slip,Working Days,Jours ouvrables
@@ -739,8 +744,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Le nom de votre entreprise pour laquelle vous configurez ce système .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inclure les vacances en aucun totale. de jours de travail
 DocType: Job Applicant,Hold,Tenir
-DocType: Employee,Date of Joining,Date d&#39;adhésion
-DocType: Naming Series,Update Series,Update Series
+DocType: Employee,Date of Joining,Date d'Embauche
+DocType: Naming Series,Update Series,Mettre à jour les Séries
 DocType: Supplier Quotation,Is Subcontracted,Est en sous-traitance
 DocType: Item Attribute,Item Attribute Values,Point valeurs d'attribut
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Voir abonnés
@@ -748,9 +753,9 @@
 ,Received Items To Be Billed,Articles reçus à être facturé
 DocType: Employee,Ms,Mme
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Campagne . # # # #
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver slot Temps dans les prochaines {0} jours pour l&#39;opération {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver le Créneau de Temps dans les prochains {0} jours pour l'Opération {1}
 DocType: Production Order,Plan material for sub-assemblies,matériau de plan pour les sous-ensembles
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} doit être actif
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} doit être actif
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,S&#39;il vous plaît sélectionner le type de document premier
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,S'il vous plaît créer la structure des salaires pour les employés {0}
 DocType: Salary Slip,Leave Encashment Amount,Laisser Montant Encaissement
@@ -765,20 +770,20 @@
 DocType: Bank Reconciliation,Account Currency,Compte
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,S&#39;il vous plaît mentionner ronde Compte Off dans Société
 DocType: Purchase Receipt,Range,Gamme
-DocType: Supplier,Default Payable Accounts,Comptes créditeurs par défaut
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"Employé {0} n'est pas actif , ou n'existe pas"
+DocType: Supplier,Default Payable Accounts,Comptes de créances fournisseur par défaut
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"L'employé {0} n'est pas actif, ou n'existe pas"
 DocType: Features Setup,Item Barcode,Barcode article
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Point variantes {0} mis à jour
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Point variantes {0} mis à jour
 DocType: Quality Inspection Reading,Reading 6,Lecture 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Paiement à l&#39;avance Facture
 DocType: Address,Shop,Magasiner
 DocType: Hub Settings,Sync Now,Synchroniser maintenant
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrée de crédit ne peut pas être lié à un {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrée de crédit ne peut pas être lié à un {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Par défaut Banque / argent compte sera automatiquement mis à jour dans la facture POS lorsque ce mode est sélectionné.
 DocType: Employee,Permanent Address Is,Adresse permanente est
 DocType: Production Order Operation,Operation completed for how many finished goods?,Opération terminée pour combien de produits finis?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,La Marque
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Allocation pour les plus de {0} franchi pour objet {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Allocation pour les plus de {0} franchi pour objet {1}.
 DocType: Employee,Exit Interview Details,Quittez Détails Interview
 DocType: Item,Is Purchase Item,Est-Item
 DocType: Journal Entry Account,Purchase Invoice,Facture achat
@@ -790,7 +795,7 @@
 DocType: Salary Slip,Total in words,Total en mots
 DocType: Material Request Item,Lead Time Date,Délai Date Heure
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,est obligatoire. Peut-être que le taux de change n'est pas créé pour
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Ligne # {0}: S'il vous plaît spécifier Pas de série pour objet {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Ligne # {0}: S'il vous plaît spécifier Pas de série pour objet {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Pour les articles, de stockage, de série et de lot »Aucun produit Bundle &#39;Aucune sera considérée comme de la table&quot; Packing List&#39;. Si Entrepôt et Batch Non sont les mêmes pour tous les éléments d&#39;emballage pour un objet quelconque &#39;Bundle produit&#39;, ces valeurs peuvent être saisies dans le tableau principal de l&#39;article, les valeurs seront copiés sur &quot;Packing List &#39;table."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Les livraisons aux clients.
 DocType: Purchase Invoice Item,Purchase Order Item,Achat Passer commande
@@ -799,14 +804,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variance
 ,Company Name,Nom de l'entreprise
 DocType: SMS Center,Total Message(s),Comptes temporaires ( actif)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Sélectionner un élément de transfert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Select Item for Transfer,Sélectionner un élément de transfert
+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&#39;aide
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Sélectionnez tête compte de la banque où chèque a été déposé.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permettre à l&#39;utilisateur d&#39;éditer Prix List Noter dans les transactions
 DocType: Pricing Rule,Max Qty,Qté Max
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Paiement contre Ventes / bon de commande doit toujours être marqué comme avance
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,chimique
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Tous les éléments ont déjà été transférés pour cet ordre de production.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Tous les éléments ont déjà été transférés pour cet ordre de production.
 DocType: Process Payroll,Select Payroll Year and Month,Sélectionnez paie Année et mois
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Aller au groupe approprié (généralement l&#39;utilisation des fonds&gt; Actif à court terme&gt; Comptes bancaires et de créer un nouveau compte (en cliquant sur Ajouter un enfant) de type «Banque»
 DocType: Workstation,Electricity Cost,Coût de l'électricité
@@ -820,32 +826,32 @@
 DocType: SMS Center,All Lead (Open),Toutes les pistes (Ouvertes)
 DocType: Purchase Invoice,Get Advances Paid,Obtenez Avances et acomptes versés
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Joindre votre photo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Faire
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Faire
 DocType: Journal Entry,Total Amount in Words,Montant total en mots
 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 avait une erreur . Une raison probable pourrait être que vous n'avez pas enregistré le formulaire. S'il vous plaît contacter support@erpnext.com si le problème persiste .
-apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Mon panier
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mon panier
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},type d'ordre doit être l'un des {0}
-DocType: Lead,Next Contact Date,Date Contact Suivant
+DocType: Lead,Next Contact Date,Date du prochain contact
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantité d'ouverture
 DocType: Holiday List,Holiday List Name,Nom de la liste de vacances
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Options sur actions
-DocType: Journal Entry Account,Expense Claim,Demande d&#39;indemnité de
+DocType: Journal Entry Account,Expense Claim,Note de frais
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Quantité pour {0}
-DocType: Leave Application,Leave Application,Demande de congés
+DocType: Leave Application,Leave Application,Demande de Congés
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Absence outil de répartition
 DocType: Leave Block List,Leave Block List Dates,Laisser Dates de listes rouges d&#39;
 DocType: Company,If Monthly Budget Exceeded (for expense account),Si le budget mensuel dépassé (pour compte de dépenses)
-DocType: Workstation,Net Hour Rate,Taux net de Hour
+DocType: Workstation,Net Hour Rate,Taux Horaire Net
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost reçu d&#39;achat
-DocType: Company,Default Terms,Conditions défaut
+DocType: Company,Default Terms,Conditions contractuelles par défaut
 DocType: Packing Slip Item,Packing Slip Item,Emballage article Slip
 DocType: POS Profile,Cash/Bank Account,Trésorerie / Compte bancaire
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Les articles retirés avec aucun changement dans la quantité ou la valeur.
 DocType: Delivery Note,Delivery To,Livrer à
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Table attribut est obligatoire
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,Table attribut est obligatoire
 DocType: Production Planning Tool,Get Sales Orders,Obtenez des commandes clients
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne peut pas être négatif
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabais
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Rabais
 DocType: Features Setup,Purchase Discounts,Rabais sur l&#39;achat
 DocType: Workstation,Wages,Salaires
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Sera mis à jour que si le temps est Connexion &#39;facturable »
@@ -870,14 +876,14 @@
 DocType: Tax Rule,Shipping State,Etat de livraison
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'article doit être ajouté à l'aide 'obtenir des éléments de reçus d'achat de la touche
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Fournisseur numéro de livraison en double dans {0}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,achat standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,achat standard
 DocType: GL Entry,Against,Contre
 DocType: Item,Default Selling Cost Center,Coût des marchandises vendues
 DocType: Sales Partner,Implementation Partner,Partenaire de mise en œuvre
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} {1} est
 DocType: Opportunity,Contact Info,Information de contact
 apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Faire Stock entrées
-DocType: Packing Slip,Net Weight UOM,Emballage Poids Net
+DocType: Packing Slip,Net Weight UOM,Unité de mesure Poids Net
 DocType: Item,Default Supplier,Par défaut Fournisseur
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Surproduction Allocation Pourcentage
 DocType: Shipping Rule Condition,Shipping Rule Condition,Livraison Condition de règle
@@ -888,7 +894,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Devis reçus des fournisseurs.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},A {0} | {1} {2}
-DocType: Time Log Batch,updated via Time Logs,mise à jour via Time Logs
+DocType: Time Log Batch,updated via Time Logs,mis à jour via Time Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,âge moyen
 DocType: Opportunity,Your sales person who will contact the customer in future,Votre personne de ventes prendra contact avec le client dans le futur
 apps/erpnext/erpnext/public/js/setup_wizard.js +344,List a few of your suppliers. They could be organizations or individuals.,Énumérer quelques-unes de vos fournisseurs . Ils pourraient être des organisations ou des individus .
@@ -912,46 +918,46 @@
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Panier Livraison règle
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Tous les groupes de clients
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',S&#39;il vous plaît mettre «Appliquer réduction supplémentaire sur &#39;
 ,Ordered Items To Be Billed,Articles commandés à facturer
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gamme doit être inférieure à la gamme
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Sélectionnez registres de temps et de soumettre à créer une nouvelle facture de vente.
-DocType: Global Defaults,Global Defaults,Par défaut globaux
+DocType: Global Defaults,Global Defaults,Valeurs par défaut globales
 DocType: Salary Slip,Deductions,Déductions
 DocType: Purchase Invoice,Start date of current invoice's period,Date de début de la période de facturation en cours
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Connexion lot a été facturé.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,créer une opportunité
 DocType: Salary Slip,Leave Without Pay,Congé sans solde
-DocType: Supplier,Communications,communications
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacité erreur de planification
 ,Trial Balance for Party,Balance pour le Parti
 DocType: Lead,Consultant,Consultant
 DocType: Salary Slip,Earnings,Bénéfices
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Point Fini {0} doit être saisi pour le type de Fabrication entrée
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Solde d&#39;ouverture de comptabilité
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Point Fini {0} doit être saisi pour le type de Fabrication entrée
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Solde d&#39;ouverture de comptabilité
 DocType: Sales Invoice Advance,Sales Invoice Advance,Advance facture de vente
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Pas de requête à demander
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',« Date de Début réel » ne peut être supérieur à ' Date réelle de fin »
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,gestion
-apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Types d&#39;activités pour les feuilles de temps
+apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Types d'activités pour les relevés de temps.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Soit de débit ou de montant de crédit est nécessaire pour {0}
 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 enregistrez le bulletin de salaire.
+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 enregistrez le Bulletin de Salaire.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Bleu
 DocType: Purchase Invoice,Is Return,Est de retour
 DocType: Price List Country,Price List Country,Liste des Prix Pays
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,D'autres nœuds peuvent être créées que sous les nœuds de type 'Groupe'
 apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,S&#39;il vous plaît mettre Email ID
-DocType: Item,UOMs,UOM
-apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},BOM {0} numéro de série valide pour l'objet {1}
+DocType: Item,UOMs,Unités de mesure
+apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} numéro de série valide pour l'objet {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Code article ne peut pas être modifié pour le numéro de série
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS profil {0} déjà créé pour l&#39;utilisateur: {1} et {2} société
-DocType: Purchase Order Item,UOM Conversion Factor,Facteur de conversion Emballage
+DocType: Purchase Order Item,UOM Conversion Factor,Facteur de conversion Unité de mesure
 DocType: Stock Settings,Default Item Group,Groupe d&#39;éléments par défaut
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Base de données fournisseurs.
 DocType: Account,Balance Sheet,Bilan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centre de coûts pour l'objet avec le code d'objet '
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Votre personne de ventes recevera un rappel cette date pour contacter le client
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,"Further accounts can be made under Groups, but entries can be made against non-Groups","D&#39;autres comptes peuvent être faites dans les groupes, mais les entrées peuvent être faites contre les non-Groupes"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,"Further accounts can be made under Groups, but entries can be made against non-Groups","D'autres comptes individuels peuvent être faits dans les groupes, mais les écritures ne peuvent être faites que dans les comptes individuels"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,De l&#39;impôt et autres déductions salariales.
 DocType: Lead,Lead,Prospect
 DocType: Email Digest,Payables,Dettes
@@ -965,11 +971,11 @@
 DocType: Holiday,Holiday,Vacances
 DocType: Leave Control Panel,Leave blank if considered for all branches,Laisser vide si cela est jugé pour toutes les branches
 ,Daily Time Log Summary,Daily Time Sommaire du journal
-DocType: Payment Reconciliation,Unreconciled Payment Details,Non rapprochés détails de paiement
+DocType: Payment Reconciliation,Unreconciled Payment Details,Détail des paiements non rapprochés
 DocType: Global Defaults,Current Fiscal Year,Exercice en cours
-DocType: Global Defaults,Disable Rounded Total,Désactiver totale arrondie
+DocType: Global Defaults,Disable Rounded Total,Désactiver le Total arrondi
 DocType: Lead,Call,Appeler
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Les entrées' ne peuvent pas être vide
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'Les entrées' ne peuvent pas être vide
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Pièces de journal {0} sont non liée
 ,Trial Balance,Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Mise en place d&#39;employés
@@ -979,11 +985,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Travaux effectués
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,S&#39;il vous plaît spécifier au moins un attribut dans le tableau Attributs
 DocType: Contact,User ID,ID utilisateur
-apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Voir Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Voir Grand Livre
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,plus tôt
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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, changez le nom de l'article ou renommez le groupe d'article SVP"
+apps/erpnext/erpnext/stock/doctype/item/item.py +444,"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, changez le nom de l'article ou renommez le groupe d'article SVP"
 DocType: Production Order,Manufacture against Sales Order,Fabrication à l&#39;encontre des commandes clients
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,revenu indirect
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,Rest Of The World,revenu indirect
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Le Point {0} ne peut pas avoir lot
 ,Budget Variance Report,Rapport sur les écarts du budget
 DocType: Salary Slip,Gross Pay,Salaire brut
@@ -999,7 +1005,7 @@
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Maintenir le taux de même tout au long du cycle d&#39;achat
 DocType: Opportunity Item,Opportunity Item,Article occasion
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Ouverture temporaire
-,Employee Leave Balance,Congé employé Solde
+,Employee Leave Balance,Balance des jours de congés de l'employé
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Solde pour le compte {0} doit toujours être {1}
 DocType: Address,Address Type,Type d&#39;adresse
 DocType: Purchase Receipt,Rejected Warehouse,Entrepôt rejetée
@@ -1013,9 +1019,9 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Message totale (s )
 DocType: Journal Entry,Get Outstanding Invoices,Obtenez Factures en souffrance
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Company ( pas client ou fournisseur ) maître .
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Désolé , les entreprises ne peuvent pas être fusionnés"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Désolé , les entreprises ne peuvent pas être fusionnés"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Petit
-DocType: Employee,Employee Number,Numéro d&#39;employé
+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},Entrées avant {0} sont gelés
 ,Invoiced Amount (Exculsive Tax),Montant facturé ( impôt Exculsive )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Point 2
@@ -1026,13 +1032,13 @@
 DocType: Employee,Place of Issue,Lieu d&#39;émission
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,contrat
 DocType: Email Digest,Add Quote,Ajouter Citer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Facteur de coversion Emballage requis pour Emballage: {0} dans l'article: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Facteur de coversion Emballage requis pour Emballage: {0} dans l'article: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,N ° de série {0} créé
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ligne {0}: Quantité est obligatoire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,agriculture
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,Vos produits ou services
 DocType: Mode of Payment,Mode of Payment,Mode de paiement
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,Image de site Web devrait être un dossier public ou site web URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,L'image de site Web doit être un fichier public ou l'URL d'un site web
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ceci est un groupe d'élément de racine et ne peut être modifié .
 DocType: Journal Entry Account,Purchase Order,Bon de commande
 DocType: Warehouse,Warehouse Contact Info,Entrepôt Info Contact
@@ -1041,8 +1047,8 @@
 DocType: Email Digest,Annual Income,Revenu annuel
 DocType: Serial No,Serial No Details,Détails Pas de série
 DocType: Purchase Invoice Item,Item Tax Rate,Taux de la Taxe sur l'Article
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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 entrée de débit"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Livraison Remarque {0} n'est pas soumis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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 entrée de débit"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Livraison Remarque {0} n'est pas soumis
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Exercice Date de début
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipements de capitaux
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prix règle est d'abord sélectionné sur la base de «postuler en« champ, qui peut être l'article, groupe d'articles ou de marque."
@@ -1052,7 +1058,7 @@
 DocType: Appraisal Goal,Goal,Objectif
 DocType: Sales Invoice Item,Edit Description,Modifier la description
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Date de livraison prévue est moindre que prévue Date de début.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,pour fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,pour fournisseur
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Type de compte Configuration aide à sélectionner ce compte dans les transactions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total (Société Monnaie)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sortant total
@@ -1065,10 +1071,10 @@
 DocType: Journal Entry,Journal Entry,Journal d'écriture
 DocType: Workstation,Workstation Name,Nom de la station de travail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Envoyer Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ne appartient pas à l'article {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} does not belong to Item {1},BOM {0} ne appartient pas à l'article {1}
 DocType: Sales Partner,Target Distribution,Distribution cible
 DocType: Salary Slip,Bank Account No.,No. de compte bancaire
-DocType: Naming Series,This is the number of the last created transaction with this prefix,Il s&#39;agit du numéro de la dernière transaction créée par ce préfixe
+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
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},{0} {1} est l'état 'arrêté'
 DocType: Quality Inspection Reading,Reading 8,Lecture 8
 DocType: Sales Partner,Agent,Agent
@@ -1090,14 +1096,14 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,condition qui se coincide touvée
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Sur le Journal des entrées {0} est déjà ajusté par un autre bon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Ordre Valeur totale
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Alimentation
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Repas
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gamme de vieillissement 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Vous pouvez faire un journal de temps que contre une ordonnance de production soumis
-DocType: Maintenance Schedule Item,No of Visits,Pas de visites
+DocType: Maintenance Schedule Item,No of Visits,Nombre de Visites
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Bulletins aux contacts, prospects."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Devise de la clôture des comptes 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Opérations ne peuvent pas être laissés en blanc.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Opérations ne peuvent pas être laissés en blanc.
 ,Delivered Items To Be Billed,Les items livrés à être facturés
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Entrepôt ne peut être modifié pour le numéro de série
 DocType: Authorization Rule,Average Discount,Remise moyenne
@@ -1112,7 +1118,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Du {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Description de l&#39;opération
 DocType: Item,Will also apply to variants,Se appliquera également aux variantes
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Impossible de modifier les dates de début et de fin d'exercice une fois que l'exercice est enregistré.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Impossible de modifier les dates de début et de fin d'exercice une fois que l'exercice est enregistré.
 DocType: Quotation,Shopping Cart,Panier
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Jour moyen sortant
 DocType: Pricing Rule,Campaign,Campagne
@@ -1123,7 +1129,8 @@
 DocType: Sales Order Item,Planned Quantity,Quantité planifiée
 DocType: Purchase Invoice Item,Item Tax Amount,Montant de la Taxe sur l'Article
 DocType: Item,Maintain Stock,Maintenir Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Stock entrées déjà créés pour ordre de fabrication
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Stock entrées déjà créés pour ordre de fabrication
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Variation nette de l&#39;actif fixe
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laisser vide si cela est jugé pour toutes les désignations
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,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 l'article Noter
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
@@ -1135,11 +1142,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan comptable
 DocType: Material Request,Terms and Conditions Content,Termes et Conditions de contenu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne peut pas être supérieure à 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Point {0} n'est pas un stock Article
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Point {0} n'est pas un stock Article
 DocType: Maintenance Visit,Unscheduled,Non programmé
 DocType: Employee,Owned,Détenue
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Dépend de congé non payé
-DocType: Pricing Rule,"Higher the number, higher the priority","Plus le nombre, plus la priorité"
+DocType: Pricing Rule,"Higher the number, higher the priority","Plus le nombre est grand, plus la priorité est haute"
 ,Purchase Invoice Trends,Achat Tendances facture
 DocType: Employee,Better Prospects,De meilleures perspectives
 DocType: Appraisal,Goals,Objectifs
@@ -1150,15 +1157,15 @@
 ,Batch-Wise Balance History,Discontinu Histoire de la balance
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Liste de tâches à faire
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Apprenti
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Quantité négatif n'est pas autorisé
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Quantité négative n'est pas autorisée
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Impôt table récupérées par le maître de l'article comme une chaîne et stockée dans ce domaine en détail.
  Utilisé pour les impôts et frais"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Employé ne peut pas rendre compte à lui-même.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,L'employé ne peut pas rendre compte à lui-même.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si le compte est gelé , les entrées sont autorisés pour les utilisateurs restreints ."
 DocType: Email Digest,Bank Balance,Solde bancaire
 apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrée comptabilité pour {0}: {1} ne peut être faite en monnaie: {2}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,No active Salary Structure found for employee {0} and the month,Aucune structure salariale actif trouvé pour l&#39;employé {0} et le mois
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,No active Salary Structure found for employee {0} and the month,Aucune Structure Salariale actif trouvé pour l'employé {0} et le mois
 DocType: Job Opening,"Job profile, qualifications required etc.",Non authroized depuis {0} dépasse les limites
 DocType: Journal Entry Account,Account Balance,Solde du compte
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Règle d&#39;impôt pour les transactions.
@@ -1172,8 +1179,8 @@
 DocType: Stock Entry,Total Additional Costs,Total des coûts supplémentaires
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,sous assemblées
 DocType: Shipping Rule Condition,To Value,To Value
-DocType: Supplier,Stock Manager,Stock Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Entrepôt de Source est obligatoire pour la ligne {0}
+DocType: Supplier,Stock Manager,Responsable des Stocks
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Entrepôt de Source est obligatoire pour la ligne {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Bordereau
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,POS Global Setting {0} déjà créé pour la compagnie {1}
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,paramètres de la passerelle SMS de configuration
@@ -1181,14 +1188,14 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Aucune adresse encore ajouté.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation heures de travail
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analyste
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant JV {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant JV {2}
 DocType: Item,Inventory,Inventaire
 DocType: Features Setup,"To enable ""Point of Sale"" view",Pour activer &quot;Point de vente&quot; vue
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Le paiement ne peut être fait pour le chariot vide
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Le paiement ne peut être fait pour le chariot vide
 DocType: Item,Sales Details,Détails ventes
 DocType: Opportunity,With Items,Avec Articles
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qté
-DocType: Notification Control,Expense Claim Rejected,Demande d&#39;indemnité rejetée
+DocType: Notification Control,Expense Claim Rejected,Note de Frais Rejetée
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",La date à laquelle prochaine facture sera générée. Il est généré sur soumettre.
 DocType: Item Attribute,Item Attribute,Point Attribute
@@ -1199,10 +1206,11 @@
 DocType: Cost Center,Parent Cost Center,Centre de coûts Parent
 DocType: Sales Invoice,Source,Source
 DocType: Leave Type,Is Leave Without Pay,Est un congé non payé
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Aucun documents trouvés dans le tableau de paiement
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Aucun enregistrement trouvé dans la table Paiement
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Date de Début de l'exercice financier
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Point {0} doit être un élément de sous- traitance
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Point {0} doit être un élément de sous- traitance
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flux de trésorerie d&#39;investissement
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fret et d'envoi en sus
 DocType: Material Request Item,Sales Order No,Ordonnance n ° de vente
 DocType: Item Group,Item Group Name,Nom du groupe d&#39;article
@@ -1210,12 +1218,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Matériaux de transfert pour la fabrication
 DocType: Pricing Rule,For Price List,Annuler matériaux Visites {0} avant l'annulation de cette visite d'entretien
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","taux d'achat pour l'article: {0} introuvable, qui est nécessaire pour réserver l'entrée comptabilité (charges). S'il vous plaît mentionner le prix de l'article à une liste de prix d'achat."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","taux d'achat pour l'article: {0} introuvable, qui est nécessaire pour réserver l'entrée comptabilité (charges). S'il vous plaît mentionner le prix de l'article à une liste de prix d'achat."
 DocType: Maintenance Schedule,Schedules,Horaires
 DocType: Purchase Invoice Item,Net Amount,Montant Net
 DocType: Purchase Order Item Supplied,BOM Detail No,Numéro du détail BOM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montant de réduction supplémentaire (devise Société)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Erreur: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Erreur: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,S'il vous plaît créer un nouveau compte de plan comptable .
 DocType: Maintenance Visit,Maintenance Visit,Visite de maintenance
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Groupe de clientèle> Territoire
@@ -1225,7 +1233,7 @@
 DocType: Leave Block List,Block Holidays on important days.,Bloc Vacances sur les jours importants.
 ,Accounts Receivable Summary,Le résumé de comptes débiteurs
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,S'il vous plaît mettre champ ID de l'utilisateur dans un dossier de l'employé pour définir le rôle des employés
-DocType: UOM,UOM Name,Nom UDM
+DocType: UOM,UOM Name,Nom Unité de mesure
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Montant de la contribution
 DocType: Sales Invoice,Shipping Address,Adresse de livraison
 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.,Cet outil vous permet de mettre à jour ou de corriger la quantité et l'évaluation de stock dans le système. Il est généralement utilisé pour synchroniser les valeurs du système et ce qui existe réellement dans vos entrepôts.
@@ -1241,23 +1249,23 @@
 DocType: Sales Partner,Sales Partner Target,Cible Sales Partner
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrée de comptabilité pour {0} ne peut être effectué en monnaie: {1}
 DocType: Pricing Rule,Pricing Rule,Provision pour plus - livraison / facturation excessive franchi pour objet {0}
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Demande de Matériel à Bon de commande
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Demande de Matériel à Bon de commande
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: article retourné {1} ne existe pas dans {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Comptes bancaires
 ,Bank Reconciliation Statement,Énoncé de rapprochement bancaire
 DocType: Address,Lead Name,Nom du prospect
-,POS,POS
+,POS,Points de Ventes
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Ouverture Stock Solde
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} doit apparaître qu'une seule fois
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Non autorisé à tranférer plus que {0} {1} contre Purchase Order {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Forums
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Non autorisé à tranférer plus que {0} {1} contre Purchase Order {2}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,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'éléments pour emballer
 DocType: Shipping Rule Condition,From Value,De la valeur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Fabrication Quantité est obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Fabrication Quantité est obligatoire
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Les montants ne figurent pas dans la banque
 DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Les réclamations pour frais de la société.
-DocType: Company,Default Holiday List,Par défaut Liste vacances
+apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Notes de frais de la société
+DocType: Company,Default Holiday List,Liste de vacances par défaut
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Passif stock
 DocType: Purchase Receipt,Supplier Warehouse,Entrepôt Fournisseur
 DocType: Opportunity,Contact Mobile No,Contact No portable
@@ -1265,34 +1273,35 @@
 ,Material Requests for which Supplier Quotations are not created,Les demandes significatives dont les cotes des fournisseurs ne sont pas créés
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le jour (s) sur lequel vous postulez pour un congé sont des jours fériés. Vous ne devez pas demander l&#39;autorisation.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Pour suivre les éléments à l&#39;aide de code à barres. Vous serez en mesure d&#39;entrer dans les articles bon de livraison et la facture de vente par balayage de code à barres de l&#39;article.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Marquer comme Livré
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Marquer comme Livré
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Faire offre
 DocType: Dependent Task,Dependent Task,Tâche dépendante
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,Leave of type {0} cannot be longer than {1},Les entrées en stocks existent contre entrepôt {0} ne peut pas réaffecter ou modifier Maître Nom '
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Essayez opérations de X jours de la planification à l&#39;avance.
 DocType: HR Settings,Stop Birthday Reminders,Arrêter anniversaire rappels
 DocType: SMS Center,Receiver List,Liste des récepteurs
 DocType: Payment Tool Detail,Payment Amount,Montant du paiement
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantité consommée
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Voir
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Voir
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Variation nette des espèces
 DocType: Salary Structure Deduction,Salary Structure Deduction,Déduction structure salariale
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de mesure {0} a été saisi plus d'une fois dans facteur de conversion de table
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de mesure {0} a été saisi plus d'une fois dans la Table de facteur de Conversion
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Coût de documents publiés
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantité ne doit pas être plus de {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Âge (jours)
 DocType: Quotation Item,Quotation Item,Article de la soumission
 DocType: Account,Account Name,Nom du compte
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Date d'entrée ne peut pas être supérieur à ce jour
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Date d'entrée ne peut pas être supérieur à ce jour
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,N ° de série {0} {1} quantité ne peut pas être une fraction
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Solde de compte {0} doit toujours être {1}
 DocType: Purchase Order Item,Supplier Part Number,Numéro de pièce fournisseur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Le taux de conversion ne peut pas être égal à 0 ou 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Le taux de conversion ne peut pas être égal à 0 ou 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} est annulé ou arrêté
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Date de véhicule Dispatch
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Reçu d'achat {0} n'est pas soumis
-DocType: Company,Default Payable Account,Compte à payer par défaut
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Reçu d'achat {0} n'est pas soumis
+DocType: Company,Default Payable Account,Compte de créances fournisseur par défaut
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Réglages pour panier en ligne telles que les règles d'expédition, liste de prix, etc."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturé
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Quantité réservés
@@ -1303,22 +1312,24 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mes questions
 DocType: BOM Item,BOM Item,Article BOM
 DocType: Appraisal,For Employee,Pour les employés
-DocType: Company,Default Values,Les Valeurs Par Défaut
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Row {0}: Advance contre le fournisseur doit être débiter
+DocType: Company,Default Values,Valeurs Par Défaut
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Montant du paiement ne peut être négative
 DocType: Expense Claim,Total Amount Reimbursed,Montant total remboursé
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Sur le fournisseur de la facture {0} datée  {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Sur le fournisseur de la facture {0} datée  {1}
 DocType: Customer,Default Price List,Liste des prix défaut
 DocType: Payment Reconciliation,Payments,Paiements
 DocType: Budget Detail,Budget Allocated,Budget alloué
 DocType: Journal Entry,Entry Type,Type d&#39;entrée
 ,Customer Credit Balance,Solde de crédit à la clientèle
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Variation nette des comptes créditeurs
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,S'il vous plaît vérifier votre courriel id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Colonne inconnu : {0}
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Mise à jour bancaire dates de paiement des revues.
 DocType: Quotation,Term Details,Détails terme
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planification de la capacité pendant (jours)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Aucun des éléments ont tout changement dans la quantité ou la valeur.
-DocType: Warranty Claim,Warranty Claim,Demande de garantie
+DocType: Warranty Claim,Warranty Claim,Déclaration de garantie
 ,Lead Details,Détails du prospect
 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
@@ -1332,7 +1343,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Activer Panier
 DocType: Employee,Permanent Address,Adresse permanente
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Point {0} doit être un service Point .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Avance versée contre {0} {1} ne peut pas être supérieure \ que Total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Etes-vous sûr de vouloir unstop
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Réduire la déduction de congé sans solde (PLT)
@@ -1349,27 +1360,28 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné, \n S'il vous plaît mentionner ""Poids UOM« trop"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Demande de Matériel utilisé pour réaliser cette Stock Entrée
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Une seule unité d&#39;un élément.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Geler stocks Older Than [ jours]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Geler stocks Older Than [ jours]
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Faites une entrée comptabilité pour chaque mouvement du stock
 DocType: Leave Allocation,Total Leaves Allocated,Feuilles total alloué
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Entrepôt nécessaire au rang n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Entrepôt nécessaire au rang {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,S&#39;il vous plaît entrer valide financier Année Dates de début et de fin
-DocType: Employee,Date Of Retirement,Date de la retraite
+DocType: Employee,Date Of Retirement,Date de départ à la retraite
 DocType: Upload Attendance,Get Template,Obtenez modèle
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,BOM récursivité : {0} ne peut pas être le parent ou l'enfant de {2}
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,S'il vous plaît sélectionnez {0} en premier.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},texte {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,S'il vous plaît sélectionnez {0} en premier.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},texte {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nouveau contact
 DocType: Territory,Parent Territory,Territoire Parent
 DocType: Quality Inspection Reading,Reading 2,Lecture 2
 DocType: Stock Entry,Material Receipt,Réception matériau
 apps/erpnext/erpnext/public/js/setup_wizard.js +376,Products,Produits
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Type de Parti et le Parti est nécessaire pour recevoir / payer compte {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si cet article a variantes, alors il ne peut pas être sélectionné dans les ordres de vente, etc."
-DocType: Lead,Next Contact By,Suivant Par
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Quantité requise pour objet {0} à la ligne {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Entrepôt {0} ne peut pas être supprimé car il existe quantité pour objet {1}
+DocType: Lead,Next Contact By,Contact suivant par
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},Quantité requise pour objet {0} à la ligne {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Entrepôt {0} ne peut pas être supprimé car il existe une quantité pour l'objet {1}
 DocType: Quotation,Order Type,Type d&#39;ordre
 DocType: Purchase Invoice,Notification Email Address,Adresse courriel de notification
 DocType: Payment Tool,Find Invoices to Match,Trouver factures pour correspondre
@@ -1379,21 +1391,21 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Cible total
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,Panier est activé
 DocType: Job Applicant,Applicant for a Job,Candidat à un emploi
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Section de base
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Pas d'Ordre de Production créé
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +153,Salary Slip of employee {0} already created for this month,Entrepôt réservé requis pour l'article courant {0}
 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. Exporter le rapport et l'imprimer à l'aide d'un tableur.
 DocType: Sales Invoice Item,Batch No,Numéro du lot
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Autoriser plusieurs commandes clients contre bon de commande d&#39;un client
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
-DocType: Naming Series,Set prefix for numbering series on your transactions,Définir le préfixe de numérotation des séries sur vos transactions
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Compte des parents ne peut pas être un grand livre
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,Par défaut BOM ({0}) doit être actif pour ce produit ou de son modèle
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,Par défaut BOM ({0}) doit être actif pour ce produit ou de son modèle
 DocType: Employee,Leave Encashed?,Laisser encaissés?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunité champ est obligatoire
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Faites bon de commande
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Faites bon de commande
 DocType: SMS Center,Send To,Send To
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Il n'y a pas assez de solde de congés d'autorisation de type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Montant alloué
@@ -1403,10 +1415,10 @@
 DocType: Territory,Territory Name,Nom du territoire
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Les travaux en progrès entrepôt est nécessaire avant Soumettre
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Candidat à un emploi.
-DocType: Purchase Order Item,Warehouse and Reference,Entrepôt et référence
+DocType: Purchase Order Item,Warehouse and Reference,Entrepôt et Référence
 DocType: Supplier,Statutory info and other general information about your Supplier,Informations légales et autres informations générales au sujet de votre Fournisseur
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresses
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Sur le Journal des entrées {0} n'a pas d'entrée {1} non associée
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Sur le Journal des entrées {0} n'a pas d'entrée {1} non associée
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupliquer N ° de série entré pour objet {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Une condition pour une règle de livraison
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item est pas autorisé à avoir ordre de fabrication.
@@ -1415,10 +1427,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Montant de crédit en compte Devises
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Temps pour la fabrication des journaux.
 DocType: Item,Apply Warehouse-wise Reorder Level,Appliquer Warehouse-sage Réorganiser Niveau
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} doit être soumis
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} doit être soumis
 DocType: Authorization Control,Authorization Control,Contrôle d&#39;autorisation
-apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Le journal du temps pour les tâches.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Paiement
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Entrepôt Rejeté est obligatoire contre Item rejeté {1}
+apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Relevés de temps passés par tâches.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Paiement
 DocType: Production Order Operation,Actual Time and Cost,Temps réel et coût
 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},Demande de Matériel d'un maximum de {0} peut être faite pour objet {1} contre Commande {2}
 DocType: Employee,Salutation,Salutation
@@ -1430,15 +1443,14 @@
 DocType: Quality Inspection Reading,Reading 10,Lecture 10
 apps/erpnext/erpnext/public/js/setup_wizard.js +366,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Référencez vos produits ou services que vous achetez ou vendez.
 DocType: Hub Settings,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.,Vous avez entré les doublons . S'il vous plaît corriger et essayer à nouveau.
+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 . Merci de rectifier et essayer à nouveau.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valeur {0} pour l&#39;attribut {1} ne existe pas dans la liste des valeurs d&#39;attribut valide article
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,associé
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,"Société Email ID introuvable , donc postez pas envoyé"
 DocType: SMS Center,Create Receiver List,Créer une liste Receiver
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expiré
 DocType: Packing Slip,To Package No.,Pour Emballer n °
 DocType: Warranty Claim,Issue Date,Date d&#39;émission
-DocType: Activity Cost,Activity Cost,Le coût de l'activité
+DocType: Activity Cost,Activity Cost,Coût des Activités
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantité consommée
 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 package est une partie de cette livraison (Seuls les projets)
@@ -1473,7 +1485,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Atteint
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territoire / client
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,par exemple 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant de la facture exceptionnelle {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant de la facture exceptionnelle {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Dans les mots seront visibles une fois que vous enregistrez la facture de vente.
 DocType: Item,Is Sales Item,Est-Point de vente
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Point arborescence de groupe
@@ -1485,7 +1497,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} créé
 DocType: Delivery Note Item,Against Sales Order,Sur la commande
 ,Serial No Status,N ° de série Statut
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,La liste des Articles ne peut être vide
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,La liste des Articles ne peut être vide
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: Pour régler {1} périodicité, différence entre partir et à ce jour \
  doit être supérieur ou égal à {2}"
@@ -1495,7 +1507,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,La date d'échéance ne peut être antérieure Date de publication
 DocType: Website Item Group,Website Item Group,Groupe Article Site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Frais et taxes
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,S'il vous plaît entrer Date de référence
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,S'il vous plaît entrer Date de référence
 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} entrées de paiement ne peuvent pas être filtrées par {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tableau pour le point qui sera affiché dans le site Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Quantité fournie
@@ -1510,7 +1522,7 @@
 DocType: Installation Note,Installation Time,Temps d&#39;installation
 DocType: Sales Invoice,Accounting Details,Détails Comptabilité
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Supprimer toutes les transactions pour cette Société
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Ligne # {0}: Opération {1} ne est pas terminée pour {2} Quantité de produits finis en ordre de fabrication # {3}. S'il vous plaît mettre à jour l'état de fonctionnement via Time Logs
+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,Ligne # {0}: Opération {1} ne est pas terminée pour {2} Quantité de produits finis en ordre de fabrication # {3}. S'il vous plaît mettre à jour l'état de fonctionnement via Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Laisser Bill of Materials devrait être «oui» . Parce que un ou plusieurs nomenclatures actifs présents pour cet article
 DocType: Issue,Resolution Details,Détails de la résolution
 DocType: Quality Inspection Reading,Acceptance Criteria,Critères d&#39;acceptation
@@ -1526,7 +1538,7 @@
 DocType: Holiday List,Clear Table,Effacer le tableau
 DocType: Features Setup,Brands,Marques
 DocType: C-Form Invoice Detail,Invoice No,Aucune facture
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,De bon de commande
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,De bon de commande
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Congé ne peut être appliquée / annulée avant {0}, que l&#39;équilibre de congé a déjà été transmis report dans le futur enregistrement d&#39;allocation de congé {1}"
 DocType: Activity Cost,Costing Rate,Taux Costing
 ,Customer Addresses And Contacts,Adresses et contacts clients
@@ -1543,7 +1555,7 @@
 ,Maintenance Schedules,Programmes d&#39;entretien
 ,Quotation Trends,Soumission Tendances
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Le groupe d'articles ne sont pas mentionnés dans le maître de l'article pour l'article {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,Débit Pour compte doit être un compte à recevoir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Débit Pour compte doit être un compte à recevoir
 DocType: Shipping Rule Condition,Shipping Amount,Montant de livraison
 ,Pending Amount,Montant en attente
 DocType: Purchase Invoice Item,Conversion Factor,Facteur de conversion
@@ -1560,23 +1572,24 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Arborescence des comptes financiers.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Laisser vide si cela est jugé pour tous les types d&#39;employés
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuer accusations fondées sur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Le compte {0} doit être de type 'Actif ', l'objet {1} étant un article Actif"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Le compte {0} doit être de type 'Actif ', l'objet {1} étant un article Actif"
 DocType: HR Settings,HR Settings,Paramètrages RH
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Remboursement de frais est en attente d'approbation . Seulement l'approbateur des frais peut mettre à jour le statut .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,La note de frais est en attente d'approbation. Seul l'approbateur des frais peut mettre à jour le statut.
 DocType: Purchase Invoice,Additional Discount Amount,Montant de réduction supplémentaire
 DocType: Leave Block List Allow,Leave Block List Allow,Laisser Block List Autoriser
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abr ne peut être vide ou l&#39;espace
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abr ne peut être vide ou l&#39;espace
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportif
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totales réelles
-apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,unité
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total réel
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Unité
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,S&#39;il vous plaît préciser Company
 ,Customer Acquisition and Loyalty,Acquisition et fidélisation client
-DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Entrepôt où vous êtes maintenant le bilan des éléments rejetés
+DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Entrepôt où vous conservez le stock d'objets refusés
 apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Date de fin de la période comptable
 DocType: POS Profile,Price List,Liste des prix
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} est maintenant l'Année Fiscale par défaut. Rafraîchissez la page pour que les modifications soient prises en compte. Svp
-apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Remboursement des dépenses
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} est maintenant l'Année Fiscale par défaut. Rafraîchissez la page pour que les modifications soient prises en compte.
+apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Notes de Frais
 DocType: Issue,Support,Support
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Voir le panier
 ,BOM Search,BOM Recherche
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Fermeture (ouverture + totaux)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,S'il vous plaît spécifier la devise de Société
@@ -1584,17 +1597,18 @@
 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},Stock équilibre dans Batch {0} deviendra négative {1} pour le point {2} au Entrepôt {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",commercial
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Suite à des demandes importantes ont été soulevées automatiquement en fonction du niveau de re-commande de l&#39;article
-apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Compte {0} est invalide. Compte doit être {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Le compte {0} est invalide. La devise du compte doit être {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Point {0} a été saisi plusieurs fois avec la même description ou la date ou de l'entrepôt
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Chefs de lettre pour des modèles d'impression .
 DocType: Salary Slip,Deduction,Déduction
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Prix de l&#39;article ajouté pour {0} dans la liste Prix {1}
 DocType: Address Template,Address Template,Modèle d'adresse
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,S&#39;il vous plaît entrer Employee ID de cette personne de ventes
 DocType: Territory,Classification of Customers by region,Classification des clients par région
 DocType: Project,% Tasks Completed,% des tâches terminées
 DocType: Project,Gross Margin,Marge brute
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,S'il vous plaît entrer en production l'article premier
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,utilisateur désactivé
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utilisateur désactivé
 DocType: Opportunity,Quotation,Devis
 DocType: Salary Slip,Total Deduction,Déduction totale
 DocType: Quotation,Maintenance User,Maintenance utilisateur
@@ -1603,7 +1617,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Nouveau Stock UDM doit être différent de stock actuel Emballage
 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. Toutes les écritures comptables et autres transactions majeures sont suivis dans ** Exercice **.
 DocType: Opportunity,Customer / Lead Address,Adresse Client / Prospect
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Attention: certificat SSL non valide sur l&#39;attachement {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Attention: certificat SSL non valide sur la pièce jointe {0}
 DocType: Production Order Operation,Actual Operation Time,Temps Opérationnel Réel
 DocType: Authorization Rule,Applicable To (User),Applicable aux (Utilisateur)
 DocType: Purchase Taxes and Charges,Deduct,Déduire
@@ -1613,12 +1627,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Garder une trace des campagnes de vente. Gardez une trace de Leads, Citations, Sales Order etc de campagnes de mesurer le retour sur investissement."
 DocType: Expense Claim,Approver,Approbateur
 ,SO Qty,SO Quantité
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Les entrées en stocks existent contre entrepôt {0}, donc vous ne pouvez pas réaffecter ou modifier Entrepôt"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Les entrées en stocks existent contre entrepôt {0}, donc vous ne pouvez pas réaffecter ou modifier Entrepôt"
 DocType: Appraisal,Calculate Total Score,Calculer Score total
-DocType: Supplier Quotation,Manufacturing Manager,Responsable de la fabrication
+DocType: Supplier Quotation,Manufacturing Manager,Responsable Fabrication
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Compte {0} n'appartient pas à la Société {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Séparer le bon de livraison dans des packages.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Livraisons
+apps/erpnext/erpnext/hooks.py +69,Shipments,Livraisons
 DocType: Purchase Order Item,To be delivered to customer,Pour être livré à la clientèle
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Log Time Etat doit être soumis.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,N ° de série {0} ne fait pas partie de tout entrepôt
@@ -1627,21 +1641,21 @@
 DocType: Pricing Rule,Supplier,Fournisseur
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Nombre de mots
-DocType: Global Defaults,Default Company,Société défaut
+DocType: Global Defaults,Default Company,Société par défaut
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Frais ou différence compte est obligatoire pour objet {0} car il impacts valeur globale des actions
 apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Vous ne pouvez pas surfacturer pour objet {0} à la ligne {1} plus {2}. Pour permettre à la surfacturation, s'il vous plaît situé dans Réglages Stock"
 DocType: Employee,Bank Name,Nom de la banque
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Au-dessus
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Territoire cible Variance article Groupe Sage
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Utilisateur {0} est désactivé
 DocType: Leave Application,Total Leave Days,Total des jours de congé
 DocType: Email Digest,Note: Email will not be sent to disabled users,Remarque: Courriel ne sera pas envoyé aux utilisateurs handicapés
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Sélectionnez Société ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Laisser vide si cela est jugé pour tous les ministères
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",S'il vous plaît vous connecter à Upvote !
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} est obligatoire pour l'objet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} est obligatoire pour l'objet {1}
 DocType: Currency Exchange,From Currency,De Monnaie
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","S'il vous plaît sélectionnez Montant alloué, type de facture et numéro de facture dans atleast une rangée"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Commande requis pour objet {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","S'il vous plaît sélectionnez Montant alloué, type de facture et numéro de facture dans atleast une rangée"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Commande requis pour objet {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Les montants ne figurent pas dans le système
 DocType: Purchase Invoice Item,Rate (Company Currency),Taux (Monnaie de la société)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,autres
@@ -1651,13 +1665,13 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Point {0} a été saisi plusieurs fois avec la même description ou la date
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancaire
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"S'il vous plaît cliquer sur "" Générer annexe » pour obtenir le calendrier"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +300,New Cost Center,Nouveau centre de coût
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +300,New Cost Center,Nouveau Centre de Coût
 DocType: Bin,Ordered Quantity,Quantité commandée
 apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","par exemple "" Construire des outils pour les constructeurs """
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Remise (par Article)
 DocType: Purchase Order Item,Reference Document Type,Référence Type de document
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contre le bon de commande de vente {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} contre le bon de commande de vente {1}
 DocType: Account,Fixed Asset,Actifs immobilisés
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Stocks en série
 DocType: Activity Type,Default Billing Rate,Par défaut taux de facturation
@@ -1665,9 +1679,9 @@
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Compte à recevoir
 ,Stock Balance,Solde Stock
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Classement des ventes au paiement
-DocType: Expense Claim Detail,Expense Claim Detail,Détail remboursement des dépenses
+DocType: Expense Claim Detail,Expense Claim Detail,Détail Note de Frais
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs créé:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,S&#39;il vous plaît sélectionnez compte correct
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,S&#39;il vous plaît sélectionnez compte correct
 DocType: Item,Weight UOM,Poids Emballage
 DocType: Employee,Blood Group,Groupe sanguin
 DocType: Purchase Invoice Item,Page Break,Saut de page
@@ -1698,19 +1712,20 @@
 DocType: Time Log,To Time,To Time
 DocType: Authorization Rule,Approving Role (above authorized value),Approuver Rôle (valeur autorisée ci-dessus)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Pour ajouter des nœuds de l'enfant , explorer arborescence et cliquez sur le nœud sous lequel vous voulez ajouter d'autres nœuds ."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crédit du compte doit être un compte à payer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},S'il vous plaît entrer une adresse valide Id
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Crédit du compte doit être un compte à payer
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},S'il vous plaît entrer une adresse valide Id
 DocType: Production Order Operation,Completed Qty,Quantité complétée
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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 entrée de crédit"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"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 entrée de crédit"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Série {0} déjà utilisé dans {1}
 DocType: Manufacturing Settings,Allow Overtime,Autoriser heures supplémentaires
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numéros de série requis pour objet {1}. Vous avez fourni {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numéros de Série requis pour objet {1}. Vous avez fourni {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Valorisation Taux actuel
 DocType: Item,Customer Item Codes,Codes de référence du client
 DocType: Opportunity,Lost Reason,Raison perdu
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Créer des entrées de paiement contre commandes ou factures.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nouvelle adresse
 DocType: Quality Inspection,Sample Size,Taille de l&#39;échantillon
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Tous les articles ont déjà été facturés
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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.',S&#39;il vous plaît indiquer une valide »De Affaire n &#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,"D&#39;autres centres de coûts peuvent être réalisées dans les groupes, mais les entrées peuvent être faites contre les non-Groupes"
 DocType: Project,External,Externe
@@ -1748,31 +1763,32 @@
 DocType: Employee,Employment Details,Détails de l&#39;emploi
 DocType: Employee,New Workplace,Travail du Nouveau-
 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 +103,No Item with Barcode {0},Bon de commande {0} ' arrêté '
+apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Aucun Item avec le Code-Barre {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas n ° ne peut pas être 0
 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,"Si vous avez équipe de vente et Partenaires Vente (Channel Partners), ils peuvent être marqués et maintenir leur contribution à l&#39;activité commerciale"
 DocType: Item,Show a slideshow at the top of the page,Afficher un diaporama en haut de la page
 DocType: Item,"Allow in Sales Order of type ""Service""","Autoriser les bon de commandes de type ""Service"""
 apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Magasins
-DocType: Time Log,Projects Manager,Gestionnaire de projets
+DocType: Time Log,Projects Manager,Chef de Projet
 DocType: Serial No,Delivery Time,L'heure de la livraison
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Basé sur le vieillissement
 DocType: Item,End of Life,Fin de vie
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Quantité ne peut pas être une fraction dans la ligne {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Déplacement
 DocType: Leave Block List,Allow Users,Autoriser les utilisateurs
 DocType: Purchase Order,Customer Mobile No,Client Mobile Pas
 DocType: Sales Invoice,Recurring,Récurrent
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Suivre les revenus et dépenses de séparée verticales ou divisions produits.
 DocType: Rename Tool,Rename Tool,Outil de renommage
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,mise à jour des coûts
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Mettre à jour le coût
 DocType: Item Reorder,Item Reorder,Réorganiser article
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,transfert de matériel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,transfert de matériel
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Précisez les activités, le coût d'exploitation et de donner une opération unique, non à vos opérations ."
 DocType: Purchase Invoice,Price List Currency,Devise Prix
 DocType: Naming Series,User must always select,L&#39;utilisateur doit toujours sélectionner
 DocType: Stock Settings,Allow Negative Stock,Autoriser un stock négatif
 DocType: Installation Note,Installation Note,Note d&#39;installation
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Ajouter impôts
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Flux de trésorerie de financement
 ,Financial Analytics,Financial Analytics
 DocType: Quality Inspection,Verified By,Vérifié par
 DocType: Address,Subsidiary,Filiale
@@ -1782,28 +1798,29 @@
 DocType: Process Payroll,Create Salary Slip,Créer bulletin de salaire
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,L'équilibre attendu que par banque
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Source des fonds ( Passif )
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Entrepôt ne peut pas être supprimé car il existe entrée stock registre pour cet entrepôt .
-DocType: Appraisal,Employee,Employé
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Entrepôt ne peut pas être supprimé car il existe entrée stock registre pour cet entrepôt .
+DocType: Appraisal,Employee,Employés
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importer Email De
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Inviter en tant qu&#39;utilisateur
 DocType: Features Setup,After Sale Installations,Installations Après Vente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} est entièrement facturé
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} est entièrement facturé
 DocType: Workstation Working Hour,End Time,Heure de fin
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Date prévue d'achèvement ne peut pas être inférieure à projet Date de début
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Règles pour ajouter les frais d'envoi .
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Sur requis
 DocType: Sales Invoice,Mass Mailing,Mailing de masse
 DocType: Rename Tool,File to Rename,Fichier à Renommer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Numéro de commande requis pour objet {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Numéro de commande requis pour objet {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Afficher les paiements
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Divulgué BOM {0} ne existe pas pour objet {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programme de maintenance {0} doit être annulée avant d'annuler cette commande client
-DocType: Notification Control,Expense Claim Approved,Demande d&#39;indemnité Approuvé
+DocType: Notification Control,Expense Claim Approved,Note de Frais Approuvée
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,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 obligatoire
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,créer clientèle
 DocType: Purchase Invoice,Credit To,Crédit Pour
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Dérivations actives / clients
 DocType: Employee Education,Post Graduate,Message d&#39;études supérieures
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Détail calendrier d&#39;entretien
 DocType: Quality Inspection Reading,Reading 9,Lecture 9
@@ -1815,6 +1832,7 @@
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Compte de paiement
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Veuillez indiquer Société de procéder
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Variation nette des comptes débiteurs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,faire
 DocType: Quality Inspection Reading,Accepted,Accepté
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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&#39;il vous plaît faire sûr que vous voulez vraiment supprimer tous les transactions de cette société. Vos données de base restera tel qu&#39;il est. Cette action ne peut être annulée.
@@ -1822,17 +1840,17 @@
 DocType: Payment Tool,Total Payment Amount,Montant du paiement total
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne peut pas être supérieure à quanitity prévu ({2}) dans la commande de fabrication {3}
 DocType: Shipping Rule,Shipping Rule Label,Livraison règle étiquette
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient baisse élément de l&#39;expédition."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient baisse élément de l&#39;expédition."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Comme il ya des transactions sur actions existants pour cet article, \ vous ne pouvez pas modifier les valeurs de &#39;A Numéro de série &quot;,&quot; A lot Non »,« Est-Stock Item »et« Méthode d&#39;évaluation »"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Journal Entrée rapide
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Journal Entrée rapide
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si BOM mentionné agianst un article
 DocType: Employee,Previous Work Experience,L&#39;expérience de travail antérieure
 DocType: Stock Entry,For Quantity,Pour Quantité
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Vous ne pouvez pas sélectionner le type de charge comme « Sur la ligne précédente Montant » ou « Le précédent Row totale » pour l'évaluation . Vous ne pouvez sélectionner que l'option «Total» pour le montant de la ligne précédente ou total de la ligne précédente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} n'a pas été soumis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} n'a pas été soumis
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Gestion des demandes d'articles.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Pour la production séparée sera créée pour chaque article produit fini.
 DocType: Purchase Invoice,Terms and Conditions1,Termes et conditions1
@@ -1840,12 +1858,12 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,S'il vous plaît enregistrer le document avant de générer le calendrier d'entretien
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,État 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/config/crm.py +96,Newsletter Mailing List,Bulletin Liste de Diffusion
+apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Liste de Diffusion Newsletter
 DocType: Delivery Note,Transporter Name,Nom Transporteur
 DocType: Authorization Rule,Authorized Value,Valeur autorisée
 DocType: Contact,Enter department to which this Contact belongs,Entrez département auquel appartient ce contact
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Absent total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Une autre entrée de clôture de la période {0} a été faite après {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Une autre entrée de clôture de la période {0} a été faite après {1}
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unité de mesure
 DocType: Fiscal Year,Year End Date,Date de Fin de l'exercice
 DocType: Task Depends On,Task Depends On,Groupe dépend
@@ -1853,7 +1871,7 @@
 DocType: Salary Structure Earning,Salary Structure Earning,Structure salariale Gagner
 ,Completed Production Orders,Terminé les ordres de fabrication
 DocType: Operation,Default Workstation,Par défaut Workstation
-DocType: Notification Control,Expense Claim Approved Message,Demande d&#39;indemnité Approuvé message
+DocType: Notification Control,Expense Claim Approved Message,Note de Frais Approuvée message
 DocType: Email Digest,How frequently?,Quelle est la fréquence?
 DocType: Purchase Receipt,Get Current Stock,Obtenez Stock actuel
 apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Arbre de la Bill of Materials
@@ -1865,13 +1883,13 @@
 DocType: Purchase Invoice,Advances,Avances
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Approuver l'utilisateur ne peut pas être identique à l'utilisateur la règle est applicable aux
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taux de base (comme par Stock UDM)
-DocType: SMS Log,No of Requested SMS,Pas de SMS demandés
+DocType: SMS Log,No of Requested SMS,Nombre de SMS demandés
 DocType: Campaign,Campaign-.####,Campagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prochaines étapes
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Fin du contrat La date doit être supérieure à date d'adhésion
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,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: 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.
 DocType: Customer Group,Has Child Node,A Node enfant
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contre le bon de commande d'achat {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} contre le bon de commande d'achat {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Entrez les paramètres url statiques (par exemple ici sender = ERPNext, username = ERPNext, mot de passe = 1234 etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} dans aucun exercice actif. Pour plus de détails, consultez {2}."
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Par défaut Warehouse est obligatoire pour les stock Article .
@@ -1919,7 +1937,7 @@
  10. Ajouter ou déduire: Que vous voulez ajouter ou déduire la taxe."
 DocType: Purchase Receipt Item,Recd Quantity,Quantité recd
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},effondrement
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock entrée {0} est pas soumis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Stock entrée {0} est pas soumis
 DocType: Payment Reconciliation,Bank / Cash Account,Compte en Banque / trésorerie
 DocType: Tax Rule,Billing City,Facturation Ville
 DocType: Global Defaults,Hide Currency Symbol,Masquer le symbole monétaire
@@ -1941,7 +1959,7 @@
 DocType: Installation Note Item,Installed Qty,Qté installée
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-DocType: Salary Structure,Total Earning,Gains totale
+DocType: Salary Structure,Total Earning,Total Revenus
 DocType: Purchase Receipt,Time at which materials were received,Heure à laquelle les matériaux ont été reçues
 apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Mes adresses
 DocType: Stock Ledger Entry,Outgoing Rate,Taux sortant
@@ -1951,8 +1969,9 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Commande {0} n'est pas soumis
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-dessus
 DocType: Buying Settings,Default Buying Price List,Défaut d'achat Liste des Prix
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Aucun employé pour les critères ci-dessus sélectionnés ou fiche de salaire déjà créé
 DocType: Notification Control,Sales Order Message,Message de commande client
-apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Valeurs par défaut comme : societé , devise , année financière en cours , etc"
+apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Valeurs par défaut comme : Societé, Devise, Année financière en cours, etc..."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Type de paiement
 DocType: Process Payroll,Select Employees,Sélectionnez employés
 DocType: Bank Reconciliation,To Date,À ce jour
@@ -1986,35 +2005,35 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Voir «Taux de matériaux à base de« coûts dans la section
 DocType: Appraisal Goal,Key Responsibility Area,Section à responsabilité importante
 DocType: Item Reorder,Material Request Type,Type de demande de matériel
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Facteur de conversion UOM est obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Facteur de conversion UOM est obligatoire
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Réf
 DocType: Cost Center,Cost Center,Centre de coûts
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,bon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Bon #
 DocType: Notification Control,Purchase Order Message,Achat message Ordre
 DocType: Tax Rule,Shipping Country,Pays de livraison
-DocType: Upload Attendance,Upload HTML,Téléchargez HTML
+DocType: Upload Attendance,Upload HTML,Télécharger HTML
 apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Avance totale ({0}) contre l'ordonnance {1} ne peut pas être supérieure \
  que le Grand total ({2})"
 DocType: Employee,Relieving Date,Date de soulager
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prix règle est faite pour remplacer la liste des prix / définir le pourcentage de remise, sur la base de certains critères."
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Entrepôt ne peut être modifié via Stock Entrée / bon de livraison / reçu d'achat
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Entrepôt ne peut être modifié que via Stock Entrée / Bon de Livraison / Reçu d'Achat
 DocType: Employee Education,Class / Percentage,Classe / Pourcentage
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Responsable du marketing et des ventes
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Facteur de conversion UDM est nécessaire dans la ligne {0}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"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.","Se il est sélectionné Prix règle est faite pour «Prix», il écrasera Prix. Prix Prix de la règle est le prix définitif, donc pas de réduction supplémentaire devrait être appliqué. Ainsi, dans les transactions comme des commandes clients, bon de commande, etc., il sera récupéré dans le champ 'Prix', plutôt que champ 'Prix List Noter »."
-apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Piste mène par type d'industrie .
+apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Prospects clés par Type d'Industrie
 DocType: Item Supplier,Item Supplier,Fournisseur d&#39;article
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,S'il vous plaît entrez le code d'article pour obtenir n ° de lot
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},S'il vous plaît sélectionnez une valeur pour {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Toutes les adresses.
 DocType: Company,Stock Settings,Paramètres de stock
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusion est seulement possible si les propriétés suivantes sont les mêmes dans les deux dossiers. Est Groupe, type de racine, Société"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusion est seulement possible si les propriétés suivantes sont les mêmes dans les deux dossiers. Est Groupe, type de racine, Société"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gérer l'arborescence de groupe de clients .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Nouveau centre de coûts Nom
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Nom du Nouveau Centre de Coûts
 DocType: Leave Control Panel,Leave Control Panel,Laisser le Panneau de configuration
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Aucune valeur par défaut Adresse modèle trouvé. S'il vous plaît créer un nouveau à partir de Configuration> Presse et Branding> Adresse modèle.
-DocType: Appraisal,HR User,Utilisateur HR
+apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Aucune Modèle d'Adresse par défaut trouvé. S'il vous plaît créez un nouveau modèle à partir de Configuration> Impression et Branding> Modèle d'Adresse
+DocType: Appraisal,HR User,Chargé de Ressources Humaines
 DocType: Purchase Invoice,Taxes and Charges Deducted,Taxes et frais déduits
 apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Questions
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Le statut doit être l'un des {0}
@@ -2029,8 +2048,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Paiement outil Détail
 ,Sales Browser,Exceptionnelle pour {0} ne peut pas être inférieur à zéro ( {1} )
 DocType: Journal Entry,Total Credit,Crédit total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Attention: Un autre {0} {1} # existe contre l&#39;entrée en stock {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,arrondis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Attention: Un autre {0} {1} # existe contre l&#39;entrée en stock {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,arrondis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Prêts et avances ( actif)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Débiteurs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grand
@@ -2043,14 +2062,14 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spécifiez Taux de change pour convertir une monnaie en une autre
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Devis {0} est annulée
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Encours total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employé {0} a été en congé de {1} . Vous ne pouvez pas marquer la fréquentation .
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,L'employé {0} a été en congé le {1} . Vous ne pouvez pas marquer sa présence.
 DocType: Sales Partner,Targets,Cibles
 DocType: Price List,Price List Master,Liste des Prix Maître
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toutes les opérations de vente peuvent être assignées à plusieurs **Agent Commerciaux** de sorte que vous pouvez configurer et surveiller les cibles.
 ,S.O. No.,S.O. Non.
 DocType: Production Order Operation,Make Time Log,Prenez le temps Connexion
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,S&#39;il vous plaît définir la quantité de réapprovisionnement
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Prix / Rabais
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,S&#39;il vous plaît définir la quantité de réapprovisionnement
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Merci de créer un Client à partir du Prospect {0}
 DocType: Price List,Applicable for Countries,Applicable pour les pays
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Ordinateurs
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Il s'agit d'un groupe de clients de la racine et ne peut être modifié .
@@ -2086,7 +2105,7 @@
  1. Conditions d'expédition, le cas échéant.
  1. Façons de différends adressage, indemnisation, la responsabilité, etc. 
  1. Adresse et contact de votre société."
-DocType: Attendance,Leave Type,Laisser Type d&#39;
+DocType: Attendance,Leave Type,Type de Congé
 apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Dépenses / compte de la différence ({0}) doit être un compte «de résultat»
 DocType: Account,Accounts User,Comptes utilisateur
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Vérifiez si la facture récurrente, décochez-vous s&#39;arrête ou mis Date de fin correcte"
@@ -2109,10 +2128,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast un article doit être saisi avec quantité négative dans le document de retour
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Opération {0} plus longtemps que les heures de travail disponibles dans poste de travail {1}, briser l&#39;opération en plusieurs opérations"
 ,Requested,demandé
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Non Remarques
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Pas de remarques
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,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 +80,Root Account must be a group,Compte racine doit être un groupe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Compte racine doit être un groupe
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salaire brut + + Montant Montant échu Encaissement - Déduction totale
 DocType: Monthly Distribution,Distribution Name,Nom distribution
 DocType: Features Setup,Sales and Purchase,Vente et achat
@@ -2120,22 +2139,23 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Vitesse à laquelle la devise du client est converti en devise de base entreprise
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} a été désabonné avec succès de cette liste.
-DocType: Purchase Invoice Item,Net Rate (Company Currency),Taux net (Société devise)
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Taux Net (Devise Société)
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Gérer l'arboressence des territoirs.
 DocType: Journal Entry Account,Sales Invoice,Facture de vente
 DocType: Journal Entry Account,Party Balance,Solde Parti
-DocType: Sales Invoice Item,Time Log Batch,Temps connecter Batch
+DocType: Sales Invoice Item,Time Log Batch,Groupe de Relevés de Temps/Timesheets
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,S&#39;il vous plaît sélectionnez Appliquer Remise Sur
-DocType: Company,Default Receivable Account,Compte à recevoir par défaut
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Bulletin de salaire Créé
+DocType: Company,Default Receivable Account,Compte de créances clients par défaut
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Créer une entrée de la Banque pour le salaire total payé pour les critères ci-dessus sélectionnés
 DocType: Stock Entry,Material Transfer for Manufacture,Transfert de matériel pour Fabrication
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Pourcentage de réduction peut être appliquée contre une liste de prix ou pour toute liste de prix.
 DocType: Purchase Invoice,Half-yearly,Semestriel
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Exercice {0} introuvable.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtenez les entrées pertinentes
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Entrée comptable pour Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Entrée comptable pour Stock
 DocType: Sales Invoice,Sales Team1,Ventes Equipe1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Point {0} n'existe pas
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Point {0} n'existe pas
 DocType: Sales Invoice,Customer Address,Adresse du client
 DocType: Purchase Invoice,Apply Additional Discount On,Appliquer de remise supplémentaire sur
 DocType: Account,Root Type,Type de Racine
@@ -2144,15 +2164,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Voir ce diaporama en haut de la page
 DocType: BOM,Item UOM,Article Emballage
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Montant de la taxe Après Montant de la remise (Société devise)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Entrepôt de cible est obligatoire pour la ligne {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Entrepôt de cible est obligatoire pour la ligne {0}
 DocType: Quality Inspection,Quality Inspection,Inspection de la Qualité
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Très Petit
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Attention: Matériel requis Quantité est inférieure Quantité minimum à commander
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Attention : La Quantité de Matériel Requis est inférieure à la Quantité Minimum de Commande
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,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 tableau distinct des comptes appartenant à l'Organisation.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentation , boissons et tabac"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ou BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Ne peut effectuer le paiement contre non facturés {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Ne peut effectuer le paiement contre non facturés {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Taux de commission ne peut pas être supérieure à 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Niveau de Stock Minimal
 DocType: Stock Entry,Subcontract,Sous-traiter
@@ -2163,8 +2183,8 @@
 DocType: Item,Manufacturer Part Number,Numéro de pièce du fabricant
 DocType: Production Order Operation,Estimated Time and Cost,Durée et Coût estimatif
 DocType: Bin,Bin,Boîte
-DocType: SMS Log,No of Sent SMS,Pas de SMS envoyés
-DocType: Account,Company,Entreprise
+DocType: SMS Log,No of Sent SMS,Nombre de SMS envoyés
+DocType: Account,Company,Société
 DocType: Account,Expense Account,Compte de dépenses
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,logiciel
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Couleur
@@ -2185,21 +2205,22 @@
 DocType: C-Form,C-Form No,C-formulaire n °
 DocType: BOM,Exploded_items,Exploded_items
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,chercheur
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,{0} {1} n'est pas soumis
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,S'il vous plaît sauvegarder l'infolettre avant de l'envoyer
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nom ou Email est obligatoire
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Contrôle de la qualité entrant.
 DocType: Purchase Order Item,Returned Qty,Retourné Quantité
 DocType: Employee,Exit,Sortie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Type de Root est obligatoire
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Type de Root est obligatoire
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,aucune autorisation
 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&#39;impression comme les factures et les bons de livraison"
 DocType: Employee,You can enter any date manually,Vous pouvez entrer une date manuellement
 DocType: Sales Invoice,Advertisement,Publicité
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Période De Probation
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Seuls les noeuds feuilles sont autorisées dans une transaction
-DocType: Expense Claim,Expense Approver,Dépenses approbateur
+DocType: Expense Claim,Expense Approver,Approbateur des Frais
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +110,Row {0}: Advance against Customer must be credit,Row {0}: Advance contre le Client doit être crédit
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Article reçu d&#39;achat fournis
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Payer
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Payer
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Pour La date du
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs pour le maintien du statut de livraison de sms
@@ -2214,44 +2235,44 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Éditeurs de journaux
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Sélectionner exercice
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Réorganiser Niveau
-DocType: Attendance,Attendance Date,Date de Participation
+DocType: Attendance,Attendance Date,Date de Présence
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,rupture des salaires basée sur l&#39;obtention et la déduction.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Un compte avec des enfants ne peut pas être converti en grand livre
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Un compte avec des enfants ne peut pas être converti en grand livre
 DocType: Address,Preferred Shipping Address,Preferred Adresse de livraison
 DocType: Purchase Receipt Item,Accepted Warehouse,Entrepôt acceptable
 DocType: Bank Reconciliation Detail,Posting Date,Date de publication
 DocType: Item,Valuation Method,Méthode d&#39;évaluation
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},Impossible de trouver le taux de change pour {0} au {1}
+apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},Impossible de trouver le taux de change pour {0} à {1}
 DocType: Sales Invoice,Sales Team,Équipe des ventes
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,dupliquer entrée
 DocType: Serial No,Under Warranty,Sous garantie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Erreur]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Dans les mots seront visibles une fois que vous enregistrez le bon de commande.
-,Employee Birthday,Anniversaire des employés
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,capital de risque
+,Employee Birthday,Anniversaire de l'employé
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital Risque
 DocType: UOM,Must be Whole Number,Doit être un nombre entier
-DocType: Leave Control Panel,New Leaves Allocated (In Days),Feuilles de nouveaux alloués (en jours)
+DocType: Leave Control Panel,New Leaves Allocated (In Days),Nouvelle Attribution de Congés (en jours)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Maître d'adresses.
 DocType: Pricing Rule,Discount Percentage,Annuler Matériel Visiter {0} avant d'annuler ce numéro de client
 DocType: Payment Reconciliation Invoice,Invoice Number,Numéro de facture
-apps/erpnext/erpnext/hooks.py +54,Orders,Commandes
+apps/erpnext/erpnext/hooks.py +55,Orders,Commandes
 DocType: Leave Control Panel,Employee Type,Type de contrat
 DocType: Employee Leave Approver,Leave Approver,Approbateur d'absence
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Matériel transféré pour Fabrication
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un utilisateur avec le rôle ""Autorise les dépenses"""
 ,Issued Items Against Production Order,Articles émis contre un ordre de fabrication
-DocType: Pricing Rule,Purchase Manager,Directeur des achats
+DocType: Pricing Rule,Purchase Manager,Acheteur/Responsable Achats
 DocType: Payment Tool,Payment Tool,Paiement Outil
 DocType: Target Detail,Target Detail,Détail cible
 DocType: Sales Order,% of materials billed against this Sales Order,% De matières facturées sur cette ordre de vente
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Entrée de clôture de la période
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,S'il vous plaît entrer les détails de l' article
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Actifs d'impôt
+DocType: Account,Depreciation,Actifs d'impôt
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fournisseur (s)
 DocType: Customer,Credit Limit,Limite de crédit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Sélectionner le type de transaction
 DocType: GL Entry,Voucher No,No du bon
-DocType: Leave Allocation,Leave Allocation,Absence Allocation
+DocType: Leave Allocation,Leave Allocation,Attribution de Congés
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Les demandes matérielles {0} créés
 apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Modèle de termes ou d&#39;un contrat.
 DocType: Customer,Address and Contact,Adresse et contact
@@ -2271,19 +2292,20 @@
 DocType: Material Request,Requested For,Demandée pour
 DocType: Quotation Item,Against Doctype,Contre Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Suivre ce bon de livraison contre tout projet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Prix ou à prix réduits
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Encaisse nette d&#39;Investir
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Prix ou à prix réduits
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Voir les entrées en stocks
 ,Is Primary Address,Est-Adresse primaire
-DocType: Production Order,Work-in-Progress Warehouse,Entrepôt Work-in-Progress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Référence #{0} daté {1}
+DocType: Production Order,Work-in-Progress Warehouse,Travaux en cours Entrepôt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Référence #{0} daté {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gérer les adresses
 DocType: Pricing Rule,Item Code,Code de l&#39;article
 DocType: Production Planning Tool,Create Production Orders,Créer des ordres de fabrication
 DocType: Serial No,Warranty / AMC Details,Garantie / Détails AMC
 DocType: Journal Entry,User Remark,Remarque l&#39;utilisateur
 DocType: Lead,Market Segment,Segment de marché
-DocType: Employee Internal Work History,Employee Internal Work History,Antécédents de travail des employés internes
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Fermeture (Dr)
+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 +225,Closing (Dr),Fermeture (Dr)
 DocType: Contact,Passive,Passif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,N ° de série {0} pas en stock
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modèle de la taxe pour la vente de transactions .
@@ -2299,7 +2321,7 @@
 ,Billed Amount,Montant facturé
 DocType: Bank Reconciliation,Bank Reconciliation,Rapprochement bancaire
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Mises à jour
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Demande de Matériel {0} est annulé ou arrêté
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Demande de Matériel {0} est annulé ou arrêté
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Ajouter quelque exemple de dossier
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Gestion des congés
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Groupe par compte
@@ -2308,14 +2330,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Le compte tête sous la responsabilité , dans lequel Bénéfice / perte sera comptabilisée"
 DocType: Payment Tool,Against Vouchers,Contre Chèques
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Aide rapide
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Frais juridiques
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Frais juridiques
 DocType: Features Setup,Sales Extras,Extras ventes
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Le budget {0} pour le compte {1} va excéder le poste de coût {2} de {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte de différence doit être un compte de type actif / passif, puisque cette Stock réconciliation est une entrée d&#39;ouverture"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Vous ne pouvez pas reporter {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','La date due' doit être antérieure à la 'Date'
 ,Stock Projected Qty,Stock projeté Quantité
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},S'il vous plaît définir la valeur par défaut {0} dans Société {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},S'il vous plaît définir la valeur par défaut {0} dans Société {0}
 DocType: Sales Order,Customer's Purchase Order,Bon de commande du client
 DocType: Warranty Claim,From Company,De Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valeur ou Quantité
@@ -2325,9 +2347,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Laisser Block List admis
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Vous l'utiliserez pour vous identifier
 DocType: Sales Partner,Retailer,Détaillant
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Crédit du compte doit être un compte de bilan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Crédit du compte doit être un compte de bilan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tous les types de fournisseurs
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Code de l'article est obligatoire, car l'article n'est pas numéroté automatiquement"
+apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"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 +93,Quotation {0} not of type {1},La soumission {0} n'est pas un type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Article calendrier d&#39;entretien
 DocType: Sales Order,%  Delivered,Livré%
@@ -2351,17 +2373,17 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Message envoyé
 DocType: Production Plan Sales Order,SO Date,SO Date
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Taux auquel la monnaie Liste de prix est converti en devise de base du client
-DocType: Purchase Invoice Item,Net Amount (Company Currency),Montant net (Société devise)
+DocType: Purchase Invoice Item,Net Amount (Company Currency),Montant Net (Devise Société)
 DocType: BOM Operation,Hour Rate,Taux horraire
 DocType: Stock Settings,Item Naming By,Point de noms en
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,De offre
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Point Wise impôt Détail
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Une autre entrée de clôture de la période {0} a été faite après {1}
 DocType: Production Order,Material Transferred for Manufacturing,Matériel transféré pour la fabrication
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Le compte {0} ne existe pas
 DocType: Purchase Receipt Item,Purchase Order Item No,Achetez article ordonnance n
 DocType: Project,Project Type,Type de projet
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,annuel
-apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Coût de diverses activités
+apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Coût des différents types d'activités.
 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 boursières de plus que {0}
 DocType: Item,Inspection Required,Inspection obligatoire
 DocType: Purchase Invoice Item,PR Detail,Détail PR
@@ -2371,7 +2393,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Le poids brut du colis. Habituellement poids net + poids du matériau d&#39;emballage. (Pour l&#39;impression)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Les utilisateurs ayant ce rôle sont autorisés à fixer les comptes gelés et de créer / modifier des entrées comptables contre les comptes gelés
 DocType: Serial No,Is Cancelled,Est annulée
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mes envois
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Mes envois
 DocType: Journal Entry,Bill Date,Date de la facture
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Même s'il existe plusieurs règles de tarification avec la plus haute priorité, les priorités internes alors suivantes sont appliquées:"
 DocType: Supplier,Supplier Details,Détails de produit
@@ -2380,7 +2402,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Parent Site Web page
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Virement
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,S&#39;il vous plaît sélectionner compte bancaire
-DocType: Newsletter,Create and Send Newsletters,Créer et envoyer des newsletters
+DocType: Newsletter,Create and Send Newsletters,Créer et envoyer des infolettres
 DocType: Sales Order,Recurring Order,Ordre récurrent
 DocType: Company,Default Income Account,Compte d'exploitation
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Groupe de client / client
@@ -2392,10 +2414,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,appels
 DocType: Project,Total Costing Amount (via Time Logs),Montant total Costing (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UDM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,entrer une valeur
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,entrer une valeur
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Projection
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Les paramètres par défaut pour les transactions boursières .
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Remarque : Le système ne vérifie pas sur - livraison et la sur- réservation pour objet {0} que la quantité ou le montant est égal à 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Remarque : Le système ne vérifie pas sur - livraison et la sur- réservation pour objet {0} que la quantité ou le montant est égal à 0
 DocType: Notification Control,Quotation Message,Message du devis
 DocType: Issue,Opening Date,Date d&#39;ouverture
 DocType: Journal Entry,Remark,Remarque
@@ -2408,9 +2430,9 @@
 DocType: Time Log,Batched for Billing,Par lots pour la facturation
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Factures reçues des fournisseurs.
 DocType: POS Profile,Write Off Account,Ecrire Off compte
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,S'il vous plaît tirer des articles de livraison Note
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retour contre la facture d&#39;achat
 DocType: Item,Warranty Period (in days),Période de garantie (en jours)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Capacité d&#39;autofinancement
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,par exemple TVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Point 4
 DocType: Journal Entry Account,Journal Entry Account,Compte Entrée Journal
@@ -2429,29 +2451,29 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Bénéfice Brut%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Date de la clairance
-DocType: Newsletter,Newsletter List,Liste newsletter
+DocType: Newsletter,Newsletter List,Liste de Newsletter
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,Vérifiez si vous voulez envoyer le bulletin de salaire dans le courrier à chaque salarié lors de la soumission bulletin de salaire
 DocType: Lead,Address Desc,Adresse Desc
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Au moins un de la vente ou l'achat doit être sélectionné
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Lorsque les opérations de fabrication sont réalisées.
 DocType: Stock Entry Detail,Source Warehouse,Source d&#39;entrepôt
 DocType: Installation Note,Installation Date,Date d&#39;installation
-DocType: Employee,Confirmation Date,date de confirmation
+DocType: Employee,Confirmation Date,Date de confirmation
 DocType: C-Form,Total Invoiced Amount,Montant total facturé
-DocType: Account,Sales User,Ventes utilisateur
+DocType: Account,Sales User,Intervenant/Chargé de Ventes
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Quantité de minute ne peut être supérieure à Max Quantité
 DocType: Stock Entry,Customer or Supplier Details,Client ou fournisseur détails
-DocType: Lead,Lead Owner,Propriétaire du prospect
+DocType: Lead,Lead Owner,Responsable du prospect
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +257,Warehouse is required,Entrepôt est nécessaire
 DocType: Employee,Marital Status,État civil
 DocType: Stock Settings,Auto Material Request,Auto Demande de Matériel
 DocType: Time Log,Will be updated when billed.,Sera mis à jour lorsqu&#39;ils sont facturés.
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disponible lot Quantité à partir de l&#39;entrepôt
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Référence # {0} {1} du
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Date de la retraite doit être supérieure à date d'adhésion
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,La Date de Départ en retraite doit être supérieure à Date d'Embauche
 DocType: Sales Invoice,Against Income Account,Sur le compte des revenus
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Livré
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Point {0}: Quantité commandée {1} ne peut pas être inférieure à commande minimum qté {2} (défini au point).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Point {0}: Quantité commandée {1} ne peut pas être inférieure à commande minimum qté {2} (défini au point).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Répartition mensuelle Pourcentage
 DocType: Territory,Territory Targets,Les objectifs du Territoire
 DocType: Delivery Note,Transporter Info,Infos Transporteur
@@ -2460,7 +2482,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Journal Bon {0} n'a pas encore compte {1} .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titres pour les modèles d'impression par exemple Facture proforma.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,charges de type d&#39;évaluation ne peuvent pas marqué comme Inclusive
-DocType: POS Profile,Update Stock,Mise à jour Stock
+DocType: POS Profile,Update Stock,Mettre à jour le Stock
 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érents Emballage des articles mènera à incorrects (Total ) Valeur de poids . Assurez-vous que poids net de chaque article se trouve dans la même unité de mesure .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Taux BOM
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,POS- Cadre . #
@@ -2468,10 +2490,10 @@
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Enregistrement de toutes les communications de type de mail, téléphone, chat, visite, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,S&#39;il vous plaît mentionner Centre de coûts Round Off dans Société
 DocType: Purchase Invoice,Terms,termes
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +251,Create New,créer un nouveau
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +251,Create New,Créer un nouveau
 DocType: Buying Settings,Purchase Order Required,Bon de commande requis
 ,Item-wise Sales History,Historique des ventes (par Article)
-DocType: Expense Claim,Total Sanctioned Amount,Montant total sanctionné
+DocType: Expense Claim,Total Sanctioned Amount,Montant total validé
 ,Purchase Analytics,Les analyses des achats
 DocType: Sales Invoice Item,Delivery Note Item,Point de Livraison
 DocType: Expense Claim,Task,Tâche
@@ -2479,16 +2501,16 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Le numéro de lot est obligatoire pour objet {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Il s'agit d'une personne de ventes de racines et ne peut être modifié .
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Taux: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Taux: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Déduction bulletin de salaire
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Sélectionnez un noeud de premier groupe.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},L'objectif doit être l'un des {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},L'objectif doit être l'un des {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Remplissez le formulaire et l'enregistrer
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Télécharger un rapport contenant toutes les matières premières avec leur dernier état des stocks
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Communauté Forum
 DocType: Leave Application,Leave Balance Before Application,Laisser Solde Avant d&#39;application
 DocType: SMS Center,Send SMS,Envoyer un SMS
-DocType: Company,Default Letter Head,Par défaut Lettre Head
+DocType: Company,Default Letter Head,En-Tête de courrier par défaut
 DocType: Time Log,Billable,Facturable
 DocType: Account,Rate at which this tax is applied,Vitesse à laquelle cet impôt est appliqué
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Réorganiser Quantité
@@ -2500,7 +2522,7 @@
 DocType: Task,depends_on,dépend de
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Une occasion manquée
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Les champs d&#39;actualisation sera disponible en commande, reçu d&#39;achat, facture d&#39;achat"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +211,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom du nouveau compte. Note: S&#39;il vous plaît ne créez pas de comptes clients et fournisseurs
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +211,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom du nouveau compte. Note: S'il vous plaît ne créez pas de comptes Clients et Fournisseurs
 DocType: BOM Replace Tool,BOM Replace Tool,Outil Remplacer BOM
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modèles pays sage d'adresses par défaut
 DocType: Sales Order Item,Supplier delivers to Customer,Fournisseur fournit au client
@@ -2509,24 +2531,24 @@
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importer des données et de l&#39;Exportation
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Invalid Nom d'utilisateur Mot de passe ou de soutien . S'il vous plaît corriger et essayer à nouveau.
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Facture Date de publication
-DocType: Sales Invoice,Rounded Total,Totale arrondie
+DocType: Sales Invoice,Rounded Total,Total arrondi
 DocType: Product Bundle,List items that form the package.,Liste des articles qui composent le paquet.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Pourcentage allocation doit être égale à 100 %
 DocType: Serial No,Out of AMC,Sur AMC
 DocType: Purchase Order Item,Material Request Detail No,Détail Demande Support Aucun
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Assurez visite d'entretien
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,S'il vous plaît contacter à l'utilisateur qui ont Sales Master Chef {0} rôle
-DocType: Company,Default Cash Account,Compte caisse
+DocType: Company,Default Cash Account,Compte de trésorerie par défaut
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuration de l'entreprise
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',S'il vous plaît entrer « Date de livraison prévue '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Quantité en ligne {0} ( {1} ) doit être la même que la quantité fabriquée {2}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,Comptes provisoires ( passif)
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,Comptes provisoires ( passif)
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} n'est pas un numéro de lot valable pour l'objet {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},S'il vous plaît spécifier un ID de ligne valide pour {0} en ligne {1}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Remarque: Si le paiement ne est pas faite contre toute référence, assurez Journal entrée manuellement."
 DocType: Item,Supplier Items,Fournisseur Articles
 DocType: Opportunity,Opportunity Type,Type d&#39;opportunité
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,nouvelle entreprise
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Nouvelle Société
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Quantité de minute
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transactions ne peuvent être supprimés par le créateur de la Société
 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.,Nombre incorrect de General Ledger Entrées trouvées. Vous avez peut-être choisi le bon compte dans la transaction.
@@ -2537,13 +2559,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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 Ouvrir
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Envoyer des courriels automatiques aux contacts sur les transactions Soumission.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Quantité pas avalable dans l'entrepôt {1} sur {2} {3}.
  Disponible Quantité: {4}, transfert Quantité: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Point 3
 DocType: Purchase Order,Customer Contact Email,Client Contact Courriel
 DocType: Sales Team,Contribution (%),Contribution (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Casual congé
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Casual congé
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilités
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modèle
 DocType: Sales Person,Sales Person Name,Nom Sales Person
@@ -2554,20 +2576,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Avant la réconciliation
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},A {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Les impôts et les frais supplémentaires (Société Monnaie)
-apps/erpnext/erpnext/stock/doctype/item/item.py +374,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"La ligne ""Taxe sur l'Article"" {0} doit indiquer un compte de type Revenu ou Dépense ou Facturable"
+apps/erpnext/erpnext/stock/doctype/item/item.py +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"La ligne ""Taxe sur l'Article"" {0} doit indiquer un compte de type Revenu ou Dépense ou Facturable"
 DocType: Sales Order,Partly Billed,Présentée en partie
 DocType: Item,Default BOM,Nomenclature par défaut
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,S&#39;il vous plaît retaper nom de l&#39;entreprise pour confirmer
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Encours total Amt
 DocType: Time Log Batch,Total Hours,Total des heures
 DocType: Journal Entry,Printing Settings,Réglages d&#39;impression
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Débit total doit être égal au total du crédit .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Débit total doit être égal au total du crédit .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,automobile
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De bon de livraison
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Message personnalisé
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banques d'investissement
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,N ° de série {0} a déjà été reçu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,N ° de série {0} a déjà été reçu
 DocType: Purchase Invoice,Price List Exchange Rate,Taux de change Prix de liste
 DocType: Purchase Invoice Item,Rate,Taux
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,interne
@@ -2577,18 +2599,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,transactions d'actions avant {0} sont gelés
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"S'il vous plaît cliquer sur "" Générer annexe '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Pour la date doit être le même que Date d' autorisation pour une demi-journée
-apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","kg par exemple, l&#39;unité, n, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","Par exemple Kg, Unités, Nombres, Mètres"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Centre de coûts est nécessaire pour compte » de profits et pertes "" {0}"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,enregistrement précédent
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,La Date d'Embauche doit être supérieure à la Date de Naissance
 DocType: Salary Structure,Salary Structure,Grille des salaires
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple règle de prix existe avec les mêmes critères, s'il vous plaît résoudre \
  conflit en attribuant des priorités. Règles Prix: {0}"
 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 +580,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Pour Entrepôt
 DocType: Employee,Offer Date,Date de l'offre
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citations
 DocType: Hub Settings,Access Token,Jeton d'accès
 DocType: Sales Invoice Item,Serial No,N ° de série
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,S'il vous plaît entrer Maintaince Détails première
@@ -2602,10 +2625,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Compte de capital
 DocType: Product Bundle Item,Product Bundle Item,Produit Bundle Point
 DocType: Sales Partner,Sales Partner Name,Nom Sales Partner
+DocType: Payment Reconciliation,Maximum Invoice Amount,Montant maximal de la facture
 DocType: Purchase Invoice Item,Image View,Voir l&#39;image
 DocType: Issue,Opening Time,Ouverture Heure
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De et la date exigée
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valeurs mobilières et des bourses de marchandises
+apps/erpnext/erpnext/stock/doctype/item/item.py +553,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unité de mesure pour la variante par défaut &#39;{0}&#39; doit être la même que dans le modèle &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calculer en fonction
 DocType: Delivery Note Item,From Warehouse,De Entrepôt
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorisation et Total
@@ -2613,17 +2638,18 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Cet article est une variante de {0} (Template). Attributs seront copiés à partir du modèle à moins 'No Copy »est réglé
 DocType: Account,Purchase User,Achat utilisateur
 DocType: Notification Control,Customize the Notification,Personnaliser la notification
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Flux de trésorerie provenant des opérations
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Adresse par défaut modèle ne peut pas être supprimé
 DocType: Sales Invoice,Shipping Rule,Livraison règle
 DocType: Journal Entry,Print Heading,Imprimer Cap
-DocType: Quotation,Maintenance Manager,Responsable de l'entretien
+DocType: Quotation,Maintenance Manager,Responsable Maintenance
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total ne peut pas être zéro
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Jours depuis la dernière commande' doit être supérieur ou égale à zéro
 DocType: C-Form,Amended From,Modifié depuis
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Matières premières
 DocType: Leave Application,Follow via Email,Suivez par courriel
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Aucun article avec Barcode {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Les matières premières ne peut pas être le même que l'article principal
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,Child account exists for this account. You can not delete this account.,Les matières premières ne peut pas être le même que l'article principal
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Voulez-vous vraiment arrêter
 apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},services impressionnants
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,S&#39;il vous plaît sélectionnez Date de publication abord
@@ -2641,6 +2667,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Dupliquer entrée . S'il vous plaît vérifier une règle d'autorisation {0}
 DocType: Journal Entry,Bank Entry,Entrée de la Banque
 DocType: Authorization Rule,Applicable To (Designation),Applicable à (désignation)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Ajouter au panier
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Par groupe
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Activer / Désactiver la devise
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Frais postaux
@@ -2648,39 +2675,39 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,La date à laquelle commande récurrente sera arrêter
 DocType: Quality Inspection,Item Serial No,N° de série
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} doit être réduite par {1} ou vous devez augmenter la tolérance de dépassement
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} doit être réduite par {1} ou vous devez augmenter la tolérance de dépassement
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Présent total
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,heure
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Point sérialisé {0} ne peut pas être mis à jour en utilisant \
  Stock réconciliation"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transfert de matériel au fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Transfert de matériel au fournisseur
 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 numéro de série ne peuvent avoir d'entrepot. L'entrepot doit être établi par l'entré des stock ou le reçus d'achat
 DocType: Lead,Lead Type,Type de prospect
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,créer offre
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Vous n&#39;êtes pas autorisé à approuver les congés sur les dates de bloc
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Tous ces articles ont déjà été facturés
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Tous ces articles ont déjà été facturés
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Peut être approuvé par {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Règle expédition Conditions
 DocType: BOM Replace Tool,The new BOM after replacement,La nouvelle nomenclature après le remplacement
 DocType: Features Setup,Point of Sale,Point de vente
 DocType: Account,Tax,Impôt
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} ne est pas valide {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,De Bundle de produit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,De Bundle de produit
 DocType: Production Planning Tool,Production Planning Tool,Outil de planification de la production
 DocType: Quality Inspection,Report Date,Date du rapport
 DocType: C-Form,Invoices,Factures
 DocType: Job Opening,Job Title,Titre de l'emploi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} destinataire(s)
 DocType: Features Setup,Item Groups in Details,Groupes d&#39;articles en détails
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantité de Fabrication doit être supérieur à 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
-apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Visitez le rapport de l&#39;appel d&#39;entretien.
+apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Rapport de visite pour l'appel de maintenance
 DocType: Stock Entry,Update Rate and Availability,Mise à jour Coter et 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 de livrer plus sur la quantité commandée. Par exemple: Si vous avez commandé 100 unités. et votre allocation est de 10% alors que vous êtes autorisé à recevoir 110 unités.
 DocType: Pricing Rule,Customer Group,Groupe de clients
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Contre le projet de loi {0} {1} daté
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Contre le projet de loi {0} {1} daté
 DocType: Item,Website Description,Description du site Web
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Variation nette des capitaux propres
 DocType: Serial No,AMC Expiry Date,AMC Date d&#39;expiration
 ,Sales Register,Registre des ventes
 DocType: Quotation,Quotation Lost Reason,Soumission perdu la raison
@@ -2688,15 +2715,15 @@
 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/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Résumé pour ce mois et les activités en suspens
 DocType: Customer Group,Customer Group Name,Nom du groupe client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},S'il vous plaît supprimer ce Facture {0} de C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Please remove this Invoice {0} from C-Form {1},S'il vous plaît supprimer ce Facture {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,S&#39;il vous plaît sélectionnez Report si vous souhaitez également inclure le solde de l&#39;exercice précédent ne laisse à cet exercice
 DocType: GL Entry,Against Voucher Type,Sur le type de bon
 DocType: Item,Attributes,Attributs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obtenir les éléments
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,S'il vous plaît entrer amortissent compte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Obtenir les éléments
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,S'il vous plaît entrer amortissent compte
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Dernière date de commande
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Faire accise facture
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Le compte {0} ne appartient pas à la société {1}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Le compte {0} n'appartient pas à la société {1}
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Opération carte d&#39;identité pas réglé
 DocType: Production Order,Planned Start Date,Date de début prévue
@@ -2705,11 +2732,11 @@
 DocType: Leave Type,Is Encash,Est encaisser
 DocType: Purchase Invoice,Mobile No,N° mobile
 DocType: Payment Tool,Make Journal Entry,Assurez Journal Entrée
-DocType: Leave Allocation,New Leaves Allocated,Nouvelle Feuilles alloué
+DocType: Leave Allocation,New Leaves Allocated,Nouvelle Attribution de Congés
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,alloué avec succès
 DocType: Project,Expected End Date,Date de fin prévue
 DocType: Appraisal Template,Appraisal Template Title,Titre modèle d&#39;évaluation
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Reste du monde
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Reste du monde
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} ne doit pas être un élément de Stock
 DocType: Cost Center,Distribution Id,Id distribution
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Services impressionnants
@@ -2722,10 +2749,10 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valeur pour l&#39;attribut {0} doit être dans la gamme de {1} à {2} dans les incréments de {3}
 DocType: Tax Rule,Sales,Ventes
 DocType: Stock Entry Detail,Basic Amount,Montant de base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},{0} est obligatoire
-DocType: Leave Allocation,Unused leaves,Feuilles inutilisées
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},{0} est obligatoire
+DocType: Leave Allocation,Unused leaves,Congés non utilisés
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
-DocType: Customer,Default Receivable Accounts,Par défaut Débiteurs
+DocType: Customer,Default Receivable Accounts,Comptes de créances clients par défaut
 DocType: Tax Rule,Billing State,État de facturation
 DocType: Item Reorder,Transfer,Transférer
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch nomenclature éclatée ( y compris les sous -ensembles )
@@ -2733,17 +2760,17 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Date d&#39;échéance est obligatoire
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incrément pour attribut {0} ne peut pas être 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD De
-DocType: Naming Series,Setup Series,Série de configuration
+DocType: Naming Series,Setup Series,Configuration des Séries
+DocType: Payment Reconciliation,To Invoice Date,Pour Date de la facture
 DocType: Supplier,Contact HTML,Contact HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Achat reçus
-DocType: Payment Reconciliation,Maximum Amount,Montant maximal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Comment Prix règle est appliquée?
 DocType: Quality Inspection,Delivery Note No,Remarque Aucune livraison
 DocType: Company,Retail,Détail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Client {0} n'existe pas
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle de produit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: référence non valide {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle de produit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Row {0}: référence non valide {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Achetez Taxes et frais Template
 DocType: Upload Attendance,Download Template,Télécharger le modèle
 DocType: GL Entry,Remarks,Remarques
@@ -2756,7 +2783,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Au dessus
 DocType: Salary Slip,Earning & Deduction,Gains et déduction
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Compte {0} ne peut pas être un groupe
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer dans diverses opérations .
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer différentes écritures.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Négatif évaluation Taux n'est pas autorisé
 DocType: Holiday List,Weekly Off,Hebdomadaire Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pour exemple, 2012, 2012-13"
@@ -2770,7 +2797,7 @@
 ,Monthly Attendance Sheet,Feuille de présence mensuel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Aucun enregistrement trouvé
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de coûts est obligatoire pour objet {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Obtenir des éléments de Bundle de produit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Obtenir des éléments de Bundle de produit
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Le compte {0} est inactif
 DocType: GL Entry,Is Advance,Est-Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Participation Date de début et de présence à ce jour est obligatoire
@@ -2779,8 +2806,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Le compte {0} de type 'profit et pertes' n'est pas permis dans une ouverture d'entrée.
 DocType: Features Setup,Sales Discounts,Escomptes sur ventes
 DocType: Hub Settings,Seller Country,Vendeur Pays
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,De publier des éléments sur le Site
 DocType: Authorization Rule,Authorization Rule,Règle d&#39;autorisation
 DocType: Sales Invoice,Terms and Conditions Details,Termes et Conditions Détails
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,caractéristiques
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Taxes de vente et frais Template
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vêtements & Accessoires
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Nombre de l'ordre
@@ -2802,27 +2831,27 @@
 DocType: Time Log,Billing Amount,Montant de facturation
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantité spécifiée non valide pour l'élément {0} . Quantité doit être supérieur à 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Les demandes de congé.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Un compte contenant une transaction ne peut pas être supprimé
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Un compte contenant une transaction ne peut pas être supprimé
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Actifs stock
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Le jour du mois au cours duquel l'ordre automatique sera généré par exemple 05, 28 etc"
 DocType: Sales Invoice,Posting Time,Affichage Temps
 DocType: Sales Order,% Amount Billed,Montant Facturé%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Location de bureaux
 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&#39;utilisateur à sélectionner une série avant de l&#39;enregistrer. Il n&#39;y aura pas défaut si vous cochez cette.
-apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},non autorisé
+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.
+apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Aucun Item avec le Numéro de Série {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Notifications ouvertes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,{0} {1} a été modifié . S'il vous plaît rafraîchir .
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Revenu clientèle
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Code article nécessaire au rang n ° {0}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Frais de déplacement
 DocType: Maintenance Visit,Breakdown,Panne
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Compte: {0} avec la monnaie: {1} ne peut pas être sélectionné
 DocType: Bank Reconciliation Detail,Cheque Date,Date de chèques
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: le compte parent {1} n'appartient pas à l'entreprise: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: le compte parent {1} n'appartient pas à l'entreprise: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Supprimé avec succès toutes les transactions liées à cette société!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Comme le Date
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,probation
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,{0} {1} contre le projet de loi {2} du {3}
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,{0} {1} contre le projet de loi {2} du {3}
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Centre de coûts est nécessaire à la ligne {0} dans le tableau des impôts pour le type {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Insertion automatique de taux de la liste de prix si manquante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montant total payé
@@ -2834,6 +2863,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Montant total de la facturation (via Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Nous vendons cet article
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fournisseur Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Quantité doit être supérieure à 0
 DocType: Journal Entry,Cash Entry,Cash Prix d'entrée
 DocType: Sales Partner,Contact Desc,Contact Desc
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Type de feuilles comme occasionnel, etc malades"
@@ -2842,7 +2872,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Ajoutez des lignes pour établir des budgets annuels sur des comptes.
 DocType: Buying Settings,Default Supplier Type,Fournisseur Type par défaut
 DocType: Production Order,Total Operating Cost,Coût d&#39;exploitation total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Stock ne peut pas être mis à jour contre livraison Remarque {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Stock ne peut pas être mis à jour contre livraison Remarque {0}
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tous les contacts.
 DocType: Newsletter,Test Email Id,Id Test Email
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abréviation de l'entreprise
@@ -2861,13 +2891,13 @@
 apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Chariot
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Merci de votre intérêt pour vous abonnant à nos mises à jour
 ,Qty to Transfer,Qté à Transférer
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Soumission à prospects ou clients.
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Devis à Prospects ou Clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle autorisés à modifier stock congelé
 ,Territory Target Variance Item Group-Wise,Territoire cible Variance Item Group-Wise
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tous les groupes client
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être que l'échange monétaire n'est pas créé pour {1} et {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Modèle d&#39;impôt est obligatoire.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Compte {0}: Le Compte parent {1} n'existe pas
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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),Tarifs Taux (Société Monnaie)
 DocType: Account,Temporary,Temporaire
 DocType: Address,Preferred Billing Address,Préféré adresse de facturation
@@ -2885,16 +2915,16 @@
 ,Item-wise Price List Rate,Article sage Prix Tarif
 DocType: Purchase Order Item,Supplier Quotation,Estimation Fournisseur
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dans les mots seront visibles une fois que vous enregistrez le devis.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} est arrêté
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Le code barre {0} est déjà utilisé dans l'article {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} est arrêté
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Le code barre {0} est déjà utilisé dans l'article {1}
 DocType: Lead,Add to calendar on this date,Ajouter cette date au calendrier
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,S'il vous plaît entrer atleast une facture dans le tableau
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,évènements à venir
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Evénements à venir
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Approuver rôle ne peut pas être même que le rôle de l'État est applicable aux
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrée rapide
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} est obligatoire pour le retour
 DocType: Purchase Order,To Receive,A Recevoir
-apps/erpnext/erpnext/public/js/setup_wizard.js +284,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,user@example.com,utilisateur@exemple.com
 DocType: Email Digest,Income / Expense,Produits / charges
 DocType: Employee,Personal Email,Courriel personnel
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Variance totale
@@ -2907,30 +2937,30 @@
 DocType: Customer,From Lead,Du prospect
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Commandes validé pour la production.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Sélectionnez Exercice ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,Profil POS nécessaire pour faire POS Entrée
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,Profil POS nécessaire pour faire POS Entrée
 DocType: Hub Settings,Name Token,Nom du jeton
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,vente standard
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Au moins un entrepôt est obligatoire
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: BOM Replace Tool,Replace,Remplacer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contre la facture de vente {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Entrepôt de cible dans la ligne {0} doit être la même que la production de commande
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} contre la facture de vente {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Entrepôt de cible dans la ligne {0} doit être la même que la production de commande
 DocType: Purchase Invoice Item,Project Name,Nom du projet
 DocType: Supplier,Mention if non-standard receivable account,Mentionner si créance non standard
 DocType: Journal Entry Account,If Income or Expense,Si les produits ou charges
 DocType: Features Setup,Item Batch Nos,Nos lots d&#39;articles
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Différence
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Ressources Humaines
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,Ressources Humaines
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Rapprochement des paiements Paiement
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,avec les groupes
 DocType: BOM Item,BOM No,Numéro BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal entrée {0} n'a pas compte {1} ou déjà en correspondance avec une autre pièce justificative
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal entrée {0} n'a pas compte {1} ou déjà en correspondance avec une autre pièce justificative
 DocType: Item,Moving Average,Moyenne mobile
 DocType: BOM Replace Tool,The BOM which will be replaced,La nomenclature qui sera remplacé
 DocType: Account,Debit,Débit
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Les feuilles doivent être alloués par multiples de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Les congés doivent être alloués par multiples de 0,5"
 DocType: Production Order,Operation Cost,Coût de l'opération
-apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Téléchargez la présence d&#39;un fichier. Csv
+apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Télécharger les participations à partir d'un fichier .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Exceptionnelle Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fixer des objectifs élément de groupe-sage pour cette personne des ventes.
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Pour attribuer ce problème, utilisez le bouton &quot;Affecter&quot; dans la barre latérale."
@@ -2961,7 +2991,7 @@
 DocType: Stock Entry Detail,Additional Cost,Supplément
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Date de fin de l'exercice financier
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Impossible de filtrer sur la base Bon Non, si regroupés par Chèque"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Faire Fournisseur offre
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Faire Fournisseur offre
 DocType: Quality Inspection,Incoming,Nouveau
 DocType: BOM,Materials Required (Exploded),Matériel nécessaire (éclatée)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Réduire Gagner de congé sans solde (PLT)
@@ -2969,7 +2999,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: N ° de série {1} ne correspond pas à {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Règles d'application des prix et de ristournes .
 DocType: Batch,Batch ID,ID. du lot
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Compte avec des nœuds enfants ne peut pas être converti en livre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Compte avec des nœuds enfants ne peut pas être converti en livre
 ,Delivery Note Trends,Bordereau de livraison Tendances
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Résumé de la semaine
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} doit être un article ""Acheté"" ou ""Sous-traité"" à la ligne {1}"
@@ -2983,8 +3013,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,travail à la pièce
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Moy. Taux d'achat
 DocType: Task,Actual Time (in Hours),Temps réel (en heures)
-DocType: Employee,History In Company,Dans l&#39;histoire de l&#39;entreprise
-apps/erpnext/erpnext/config/crm.py +151,Newsletters,Bulletins
+DocType: Employee,History In Company,Ancienneté dans l'entreprise
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},La quantité totale émission / Transfert {0} dans Demande de Matériel {1} ne peut pas être supérieure à la quantité demandée {2} pour le point {3}
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletters
 DocType: Address,Shipping,Livraison
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
 DocType: Department,Leave Block List,Laisser Block List
@@ -3003,23 +3034,22 @@
 DocType: Purchase Order,End date of current order's period,Date de fin de la période de commande en cours
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Assurez Lettre d&#39;offre
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retour
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Unité de mesure pour la variante par défaut doit être la même comme modèle
 DocType: Production Order Operation,Production Order Operation,Production ordre d'opération
 DocType: Pricing Rule,Disable,"Groupe ajoutée, rafraîchissant ..."
 DocType: Project Task,Pending Review,Attente d&#39;examen
-DocType: Task,Total Expense Claim (via Expense Claim),Demande d&#39;indemnité totale (via remboursement de dépenses)
+DocType: Task,Total Expense Claim (via Expense Claim),Frais totaux (via Note de Frais)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Client Id
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Time doit être supérieur From Time
 DocType: Journal Entry Account,Exchange Rate,Taux de change
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Maximum {0} lignes autorisées
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Entrepôt {0}: compte de Parent {1} ne BOLONG à la société {2}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Maximum {0} lignes autorisées
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Entrepôt {0}: le Compte Parent {1} n'appartient pas à la société {2}
 DocType: BOM,Last Purchase Rate,Purchase Rate Dernière
 DocType: Account,Asset,atout
 DocType: Project Task,Task ID,Groupe ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","par exemple ""MC"""
 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 objet {0} a depuis variantes
 ,Sales Person-wise Transaction Summary,Sales Person-sage Résumé de la transaction
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,{0} n'est pas un courriel valide Identifiant
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,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,Se inscrire ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Les pourcentages de distribution mensuelle
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,L'élément sélectionné ne peut pas avoir lot
@@ -3031,12 +3061,12 @@
 ,Available Stock for Packing Items,Disponible en stock pour l&#39;emballage Articles
 DocType: Item Variant,Item Variant,Point Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"La définition de cette adresse modèle par défaut, car il n'ya pas d'autre défaut"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Le solde du compte est déjà en débit, vous n'êtes pas autorisé à définir 'Doit être en équilibre' comme 'Crédit'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Le solde du compte est déjà en débit, vous n'êtes pas autorisé à définir 'Doit être en équilibre' comme 'Crédit'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestion de la qualité
 DocType: Production Planning Tool,Filter based on customer,Filtre basé sur le client
 DocType: Payment Tool Detail,Against Voucher No,Sur le bon n°
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Point {0} est annulée
-DocType: Employee External Work History,Employee External Work History,Antécédents de travail des employés externe
+DocType: Employee External Work History,Employee External Work History,Antécédents professionnels de l'employé
 DocType: Tax Rule,Purchase,Achat
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Qté soldée
 DocType: Item Group,Parent Item Group,Groupe d&#39;éléments Parent
@@ -3045,9 +3075,10 @@
 apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Entrepôts.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Taux auquel la monnaie du fournisseur est converti en devise de base entreprise
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Timings conflits avec la ligne {1}
-DocType: Opportunity,Next Contact,Suivant Contactez
+DocType: Opportunity,Next Contact,Contact suivant
 DocType: Employee,Employment Type,Type d&#39;emploi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Facteur de conversion est requis
+,Cash Flow,Flux de trésorerie
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Période d&#39;application ne peut pas être sur deux dossiers de alocation
 DocType: Item Group,Default Expense Account,Compte de dépenses
 DocType: Employee,Notice (days),Avis ( jours )
@@ -3057,7 +3088,7 @@
 DocType: Account,Stock Adjustment,Stock ajustement
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe défaut Activité Coût pour le type d&#39;activité - {0}
 DocType: Production Order,Planned Operating Cost,Coût de fonctionnement prévues
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Nom
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nouveau {0} Nom
 apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},S'ilvous plaît trouver ci-joint {0} # {1}
 DocType: Job Applicant,Applicant Name,Nom du demandeur
 DocType: Authorization Rule,Customer / Item Name,Client / Nom d&#39;article
@@ -3079,13 +3110,12 @@
 DocType: Production Order,Warehouses,Entrepôts
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Appréciation {0} créé pour les employés {1} dans la plage de date donnée
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Noeud de groupe
-DocType: Payment Reconciliation,Minimum Amount,Montant minimum
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Marchandises mise à jour terminée
 DocType: Workstation,per hour,par heure
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Compte de l'entrepôt ( de l'inventaire permanent ) sera créé sous ce compte .
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Descendre : {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,L'Entrepôt ne peut pas être supprimé car une entrée existe dans le Grand Livre de Stocks pour cet Entrepôt.
 DocType: Company,Distribution,Répartition
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Montant payé
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Montant payé
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Chef de projet
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,envoi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Réduction de Max permis pour l'article: {0} {1} est%
@@ -3109,7 +3139,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analyse du support
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Société est manquant dans les entrepôts {0}
 DocType: POS Profile,Terms and Conditions,Termes et Conditions
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Pour la date doit être dans l'exercice. En supposant à ce jour = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Pour la date doit être dans l'exercice. En supposant à ce jour = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ici vous pouvez maintenir la hauteur, le poids, allergies, etc médicaux préoccupations"
 DocType: Leave Block List,Applies to Company,S&#39;applique à l&#39;entreprise
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Vous ne pouvez pas annuler car soumis Stock entrée {0} existe
@@ -3123,11 +3153,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Se il vous plaît entrer achat reçus
 DocType: Sales Invoice,Get Advances Received,Obtenez Avances et acomptes reçus
 DocType: Email Digest,Add/Remove Recipients,Ajouter / supprimer des destinataires
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},installation terminée
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,Transaction not allowed against stopped Production Order {0},installation terminée
 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 cette Année financière que par défaut , cliquez sur "" Définir par défaut """
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuration serveur entrant de soutien id courriel . (par exemple support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Qté non couverte
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Variante d&#39;objet {0} existe avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Variante d&#39;objet {0} existe avec les mêmes caractéristiques
 DocType: Salary Slip,Salary Slip,Fiche de paye
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'La date' est requise
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Générer bordereaux des paquets à livrer. Utilisé pour notifier numéro de colis, le contenu du paquet et son poids."
@@ -3137,7 +3167,7 @@
 DocType: Features Setup,Item Advanced,Article avancée
 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 l'une des opérations contrôlées sont «soumis», un courriel pop-up s'ouvre automatiquement pour envoyer un courrier électronique à l'associé ""Contact"" dans cette transaction, la transaction en pièce jointe. L'utilisateur peut ou ne peut pas envoyer courriel."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Paramètres globaux
-DocType: Employee Education,Employee Education,Formation des employés
+DocType: Employee Education,Employee Education,Formation de l'employé
 apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Il est nécessaire d&#39;aller chercher de l&#39;article Détails.
 DocType: Salary Slip,Net Pay,Salaire net
 DocType: Account,Account,Compte
@@ -3162,7 +3192,7 @@
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Dernière Montant de la commande
 DocType: Company,Warn,Avertir
 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,Fabrication utilisateur
+DocType: BOM,Manufacturing User,Intervenant/Chargé de Fabrication
 DocType: Purchase Order,Raw Materials Supplied,Des matières premières fournies
 DocType: Purchase Invoice,Recurring Print Format,Format d&#39;impression récurrent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Une autre structure salariale {0} est active pour les employés {0} . S'il vous plaît faire son statut « inactif » pour continuer.
@@ -3172,7 +3202,7 @@
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,But Visite d&#39;entretien
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,période
 ,General Ledger,Grand livre général
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Voir Leads
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Voir Prospects
 DocType: Item Attribute Value,Attribute Value,Attribut Valeur
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id doit être unique , existe déjà pour {0}"
 ,Itemwise Recommended Reorder Level,Seuil de renouvellement des commandes (par Article)
@@ -3213,16 +3243,16 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Champ {0} n'est pas sélectionnable.
 DocType: Stock Entry Detail,Actual Qty (at source/target),Quantité réelle (à la source / cible)
 DocType: Item Customer Detail,Ref Code,Code de référence de
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,Les dossiers des employés.
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,Dossiers des Employés.
 DocType: HR Settings,Payroll Settings,Paramètres de la paie
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Correspondre non liées factures et paiements.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Passer la commande
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Passer la commande
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Racine ne peut pas avoir un centre de coûts parent
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Sélectionnez une marque ...
 DocType: Sales Invoice,C-Form Applicable,C-Form applicable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Temps de fonctionnement doit être supérieure à 0 pour l&#39;opération {0}
 DocType: Supplier,Address and Contacts,Adresse et contacts
-DocType: UOM Conversion Detail,UOM Conversion Detail,Détail de conversion Emballage
+DocType: UOM Conversion Detail,UOM Conversion Detail,Détail de conversion Unité de mesure
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),"Merci de conserver le format de l'image web friendly, i.e. 900px par 100px"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ordre de production ne peut être soulevée contre un modèle d&#39;objet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Les frais sont mis à jour en Achat réception contre chaque article
@@ -3231,7 +3261,7 @@
 DocType: Appraisal,Start Date,Date de début
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Compte temporaire ( actif)
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Cliquez ici pour vérifier
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Compte {0}: Vous ne pouvez pas assigner un compte comme son propre parent
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Compte {0}: Vous ne pouvez pas assigner un compte comme son propre parent
 DocType: Purchase Invoice Item,Price List Rate,Prix Liste des Prix
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Voir &quot;En stock&quot; ou &quot;Pas en stock» basée sur le stock disponible dans cet entrepôt.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Nomenclature (BOM)
@@ -3240,17 +3270,17 @@
 DocType: Project,Expected Start Date,Date de début prévue
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Supprimer l'élément si des accusations ne est pas applicable à cet élément
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Par exemple. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Recevoir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Recevoir
 DocType: Maintenance Visit,Fully Completed,Entièrement complété
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% complète
 DocType: Employee,Educational Qualification,Qualification pour l&#39;éducation
 DocType: Workstation,Operating Costs,Coûts d'exploitation
-DocType: Employee Leave Approver,Employee Leave Approver,Congé employé approbateur
+DocType: Employee Leave Approver,Employee Leave Approver,Approbateur des Congés de l'employé
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} a été ajouté avec succès à notre liste de diffusion.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Une entrée Réorganiser existe déjà pour cet entrepôt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Une entrée Réorganiser existe déjà pour cet entrepôt {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Vous ne pouvez pas déclarer comme perdu , parce offre a été faite."
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Achat Maître Gestionnaire
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Ordre de fabrication {0} doit être soumis
+DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Directeur des Achats
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Ordre de fabrication {0} doit être soumis
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},S'il vous plaît sélectionnez Date de début et date de fin de l'article {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Rapports principaux
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,À ce jour ne peut pas être avant la date
@@ -3267,8 +3297,8 @@
 DocType: Account,Income,Revenu
 DocType: Industry Type,Industry Type,Secteur d&#39;activité
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Quelque chose a mal tourné !
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Attention: la demande d&#39;autorisation contient les dates de blocs suivants
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,BOM {0} n'est pas actif ou non soumis
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Attention : la demande d'absence contient les dates bloquées suivantes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,BOM {0} n'est pas actif ou non soumis
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Date d&#39;achèvement
 DocType: Purchase Invoice Item,Amount (Company Currency),Montant (Devise de la Société)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unité d'organisation (département) maître .
@@ -3278,20 +3308,20 @@
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,S'il vous plaît Mettre à jour les paramètres de SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Heure du journal {0} déjà facturée
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Les prêts non garantis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Prêts non garantis
 DocType: Cost Center,Cost Center Name,Coût Nom du centre
 DocType: Maintenance Schedule Detail,Scheduled Date,Date prévue
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Amt total payé
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Un message de plus de 160 caractères sera découpé en plusieurs mesage
 DocType: Purchase Receipt Item,Received and Accepted,Reçus et acceptés
 ,Serial No Service Contract Expiry,N ° de série expiration du contrat de service
-DocType: Item,Unit of Measure Conversion,Unité de conversion de Mesure
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Employé ne peut être modifié
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Vous ne pouvez pas crédit et de débit même compte en même temps
+DocType: Item,Unit of Measure Conversion,Conversion d'Unité de mesure
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,L'employé ne peut pas être modifié
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Vous ne pouvez pas crédit et de débit même compte en même temps
 DocType: Naming Series,Help HTML,Aide HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage totale attribuée devrait être de 100 % . Il est {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Allocation pour les plus de {0} croisés pour objet {1}
-DocType: Address,Name of person or organization that this address belongs to.,Nom de la personne ou de l&#39;organisation que cette adresse appartient.
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Allocation pour les plus de {0} croisés pour objet {1}
+DocType: Address,Name of person or organization that this address belongs to.,Nom de la personne ou de la société à qui cette adresse appartient.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,vos fournisseurs
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Impossible de définir aussi perdu que les ventes décret.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Une autre structure salariale {0} est actif pour l'employé {1}. S'il vous plaît faire son statut «inactif» pour continuer.
@@ -3303,36 +3333,36 @@
 DocType: Employee,Date of Issue,Date d&#39;émission
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Du {0} pour {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Réglez Fournisseur pour le point {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,Site Web image {0} attaché à Point {1} ne peut pas être trouvé
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Site Web image {0} attaché à Point {1} ne peut pas être trouvé
 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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,S&#39;il vous plaît vérifier l&#39;option multi-devises pour permettre comptes avec autre monnaie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,S&#39;il vous plaît vérifier l&#39;option multi-devises pour permettre comptes avec autre monnaie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} ne existe pas dans le système
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Vous n'êtes pas autorisé à mettre en valeur Frozen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Vous n'êtes pas autorisé à mettre en valeur Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obtenez non rapprochés entrées
+DocType: Payment Reconciliation,From Invoice Date,De Date de la facture
 DocType: Cost Center,Budgets,Budgets
-DocType: Employee,Emergency Contact Details,Détails de contact d&#39;urgence
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Que fait-elle ?
 DocType: Delivery Note,To Warehouse,Pour Entrepôt
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Le compte {0} a été renseigné plus d'une fois pour l'année fiscale {1}
 ,Average Commission Rate,Taux moyen de la commission
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 non-stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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 non-stock
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La participation ne peut pas être marqué pour les dates à venir
 DocType: Pricing Rule,Pricing Rule Help,Prix règle Aide
 DocType: Purchase Taxes and Charges,Account Head,Responsable du compte
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Mettre à jour les coûts supplémentaires pour calculer le coût au débarquement des articles
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,local
 DocType: Stock Entry,Total Value Difference (Out - In),Valeur totale Différence (Out - En)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Taux de change est obligatoire
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID utilisateur non défini pour les employés {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Row {0}: Taux de change est obligatoire
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID utilisateur non défini pour l'Employé {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De la revendication de garantie
 DocType: Stock Entry,Default Source Warehouse,Source d&#39;entrepôt par défaut
 DocType: Item,Customer Code,Code client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Rappel d'anniversaire pour {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Jours depuis la dernière commande
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Débit Pour compte doit être un compte de bilan
-DocType: Buying Settings,Naming Series,Nommer Série
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,Debit To account must be a Balance Sheet account,Débit Pour compte doit être un compte de bilan
+DocType: Buying Settings,Naming Series,Nommer Séries
 DocType: Leave Block List,Leave Block List Name,Laisser Nom de la liste de blocage
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,payable
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Statut du document de transition {0} {1}, n'est pas autorisé"
@@ -3344,7 +3374,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Fermeture compte {0} doit être de type passif / Equity
 DocType: Authorization Rule,Based On,Basé sur
 DocType: Sales Order Item,Ordered Qty,Quantité commandée
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Point {0} est désactivé
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Point {0} est désactivé
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Jusqu&#39;à
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Période De et période dates obligatoires pour récurrents {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activité de projet / tâche.
@@ -3352,7 +3382,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Achat doit être vérifiée, si pour Applicable est sélectionné comme {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,La remise doit être inférieure à 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Write Off Montant (Société devise)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Row # {0}: S&#39;il vous plaît définir la quantité de réapprovisionnement
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Row # {0}: S&#39;il vous plaît définir la quantité de réapprovisionnement
 DocType: Landed Cost Voucher,Landed Cost Voucher,Bon d'Landed Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},S'il vous plaît mettre {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Répétez le Jour du Mois
@@ -3374,7 +3404,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Le nom de la campagne est requis
 DocType: Maintenance Visit,Maintenance Date,Date de l&#39;entretien
 DocType: Purchase Receipt Item,Rejected Serial No,Rejeté N ° de série
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nouvelle Bulletin
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nouvelle Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},{0} budget pour compte {1} contre des centres de coûts {2} dépassera par {3}
 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.","Exemple:. ABCD ##### 
@@ -3382,12 +3412,12 @@
 DocType: Upload Attendance,Upload Attendance,Téléchargez Participation
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM et fabrication Quantité sont nécessaires
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gamme de vieillissement 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Montant
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Montant
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM remplacé
 ,Sales Analytics,Analytics Sales
 DocType: Manufacturing Settings,Manufacturing Settings,Paramètres de fabrication
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurer le courrier électronique
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,S'il vous plaît entrer devise par défaut en maître de compagnie
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,S'il vous plaît entrer devise par défaut en maître de compagnie
 DocType: Stock Entry Detail,Stock Entry Detail,Détail d&#39;entrée Stock
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Rappels quotidiens
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Règle fiscale Conflits avec {0}
@@ -3406,23 +3436,23 @@
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Les paramètres par défaut pour les opérations comptables .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Date prévu ne peut pas être avant Matériel Date de la demande
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Point {0} doit être un élément de ventes
-DocType: Naming Series,Update Series Number,Numéro de série mise à jour
-DocType: Account,Equity,Opération {0} est répété dans le tableau des opérations
+DocType: Naming Series,Update Series Number,Mettre à jour la Série
+DocType: Account,Equity,Capitaux propres
 DocType: Sales Order,Printing Details,Impression Détails
 DocType: Task,Closing Date,Date de clôture
 DocType: Sales Order Item,Produced Quantity,Quantité produite
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,ingénieur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Recherche de sous-ensembles
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Aucun résultat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Aucun résultat
 DocType: Sales Partner,Partner Type,Type de partenaire
 DocType: Purchase Taxes and Charges,Actual,Réel
 DocType: Authorization Rule,Customerwise Discount,Remise Customerwise
 DocType: Purchase Invoice,Against Expense Account,Sur le compte des dépenses
 DocType: Production Order,Production Order,Ordre de fabrication
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Les demandes matérielles {0} créé
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Les demandes matérielles {0} créé
 DocType: Quotation Item,Against Docname,Contre docName
 DocType: SMS Center,All Employee (Active),Tous les employés (Actif)
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,voir maintenant
+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électionnez la période pendant laquelle la facture sera générée automatiquement
 DocType: BOM,Raw Material Cost,Raw Material Coût
 DocType: Item,Re-Order Level,Re-commande de niveau
@@ -3430,16 +3460,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,À temps partiel
 DocType: Employee,Applicable Holiday List,Liste de vacances applicable
 DocType: Employee,Cheque,Chèque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Mise à jour de la série
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Bulletin de salaire de l'employé {0} déjà créé pour ce mois-ci
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Série mise à jour
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Bulletin de salaire de l'employé {0} déjà créé pour ce mois-ci
 DocType: Item,Serial Number Series,Série Série Nombre
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Facteur de conversion ne peut pas être dans les fractions
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,D&#39;abord répondu le
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Croix Listing des articles dans plusieurs groupes
 apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Le premier utilisateur: Vous
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Exercice Date de début et de fin d'exercice la date sont réglées dans l'année fiscale {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Réconcilié avec succès
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Exercice Date de début et de fin d'exercice la date sont réglées dans l'année fiscale {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Réconcilié avec succès
 DocType: Production Order,Planned End Date,Date de fin prévue
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Lorsque des éléments sont stockés.
 DocType: Tax Rule,Validity,Validité
@@ -3447,7 +3477,7 @@
 DocType: Attendance,Attendance,Présence
 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 ce n&#39;est pas cochée, la liste devra être ajouté à chaque département où il doit être appliqué."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Date d'affichage et l'affichage est obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Date d'affichage et l'affichage est obligatoire
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Modèle d'impôt pour l'achat d' opérations .
 ,Item Prices,Prix du lot
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Dans les mots seront visibles une fois que vous enregistrez le bon de commande.
@@ -3456,15 +3486,15 @@
 DocType: Task,Review Date,Date de revoir
 DocType: Purchase Invoice,Advance Payments,Paiements anticipés
 DocType: Purchase Taxes and Charges,On Net Total,Le total net
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Bon de commande {0} n'est pas soumis
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Pas de permission pour utiliser l'outil Paiement
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Bon de commande {0} n'est pas soumis
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Pas d'autorisation pour utiliser l'Outil Paiement
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,«notification adresse e-mail non spécifiés pour% s récurrents
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Devise ne peut être modifié après avoir fait des entrées en utilisant une autre monnaie
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,Devise ne peut être modifié après avoir fait des entrées en utilisant une autre monnaie
 DocType: Company,Round Off Account,Arrondir compte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Dépenses administratives
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,consultant
 DocType: Customer Group,Parent Customer Group,Groupe Client parent
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Changement
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Changement
 DocType: Purchase Invoice,Contact Email,Contact Courriel
 DocType: Appraisal Goal,Score Earned,Score gagné
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","par exemple "" Mon Company LLC """
@@ -3474,24 +3504,24 @@
 DocType: Packing Slip,Gross Weight UOM,Emballage Poids brut
 DocType: Email Digest,Receivables / Payables,Créances / dettes
 DocType: Delivery Note Item,Against Sales Invoice,Sur la facture de vente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Compte créditeur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Compte créditeur
 DocType: Landed Cost Item,Landed Cost Item,Article coût en magasin
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,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: Payment Reconciliation,Receivable / Payable Account,Compte à recevoir / payer
 DocType: Delivery Note Item,Against Sales Order Item,Sur l'objet de la commande
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},S&#39;il vous plaît spécifier Attribut Valeur pour l&#39;attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},S&#39;il vous plaît spécifier Attribut Valeur pour l&#39;attribut {0}
 DocType: Item,Default Warehouse,Entrepôt de défaut
 DocType: Task,Actual End Date (via Time Logs),Date réelle de fin (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget ne peut pas être attribué à l&#39;encontre du compte de groupe {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Le projet de loi n ° {0} déjà réservé dans la facture d'achat {1}
 DocType: Delivery Note,Print Without Amount,Imprimer Sans Montant
 apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Catégorie impôt ne peut pas être « évaluation » ou « évaluation et totale », comme tous les articles sont des articles hors stock"
-DocType: Issue,Support Team,Équipe de soutien
+DocType: Issue,Support Team,Équipe d'Assistance Technique
 DocType: Appraisal,Total Score (Out of 5),Score total (sur 5)
 DocType: Batch,Batch,Lot
 apps/erpnext/erpnext/stock/doctype/item/item.js +20,Balance,Balance
-DocType: Project,Total Expense Claim (via Expense Claims),Demande d&#39;indemnité totale (via Remboursement des dépenses)
+DocType: Project,Total Expense Claim (via Expense Claims),Frais totaux (via Notes de Frais)
 DocType: Journal Entry,Debit Note,Note de débit
 DocType: Stock Entry,As per Stock UOM,Selon Stock UDM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Pas expiré
@@ -3500,11 +3530,11 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Sales Person
 DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,Paramètre SMS
-DocType: Maintenance Schedule Item,Half Yearly,La moitié annuel
+DocType: Maintenance Schedule Item,Half Yearly,Semestriel
 DocType: Lead,Blog Subscriber,Abonné Blog
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Créer des règles pour restreindre les transactions fondées sur des valeurs .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si elle est cochée, aucune totale. des jours de travail comprennent vacances, ce qui réduira la valeur de salaire par jour"
-DocType: Purchase Invoice,Total Advance,Advance totale
+DocType: Purchase Invoice,Total Advance,Total avance
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Traitement de la paie
 DocType: Opportunity Item,Basic Rate,Taux de base
 DocType: GL Entry,Credit Amount,Le montant du crédit
@@ -3516,29 +3546,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planifiez les journaux de temps en dehors des heures de travail Workstation.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} a déjà été soumis
 ,Items To Be Requested,Articles à demander
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Obtenez Purchase Rate Dernière
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Taux de facturation basé sur le type d&#39;activité (par heure)
 DocType: Company,Company Info,Informations sur l'entreprise
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent",Remarque: Il n'est pas assez solde de congés d'autorisation de type {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),utilisation des fonds (Actifs)
 DocType: Production Planning Tool,Filter based on item,Filtre basé sur l'article
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Compte de débit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Compte de débit
 DocType: Fiscal Year,Year Start Date,Date de début Année
 DocType: Attendance,Employee Name,Nom de l&#39;employé
-DocType: Sales Invoice,Rounded Total (Company Currency),Totale arrondie (Société Monnaie)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Vous ne pouvez pas convertir au groupe parce que le type de compte est sélectionnée.
+DocType: Sales Invoice,Rounded Total (Company Currency),Total arrondi (Société devise)
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,Vous ne pouvez pas convertir au groupe parce que le type de compte est sélectionnée.
 DocType: Purchase Common,Purchase Common,Achat commun
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} a été modifié. S.V.P rafraîchir.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Empêcher les utilisateurs de faire des demandes d&#39;autorisation, les jours suivants."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,De Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Avantages du personnel
 DocType: Sales Invoice,Is POS,Est-POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Emballé quantité doit être égale à la quantité pour l'article {0} à la ligne {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Emballé quantité doit être égale à la quantité pour l'article {0} à la ligne {1}
 DocType: Production Order,Manufactured Qty,Quantité fabriquée
 DocType: Purchase Receipt Item,Accepted Quantity,Quantité acceptés
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne existe pas
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Factures émises aux clients.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Référence du projet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Non {0}: montant ne peut être supérieur à l&#39;attente Montant contre remboursement de frais {1}. Montant attente est {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Non {0}: montant ne peut être supérieur à l&#39;attente Montant contre remboursement de frais {1}. Montant attente est {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnés ajoutés
 DocType: Maintenance Schedule,Schedule,Calendrier
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Définir budget pour ce centre de coûts. Pour définir l&#39;action budgétaire, voir «Liste des entreprises»"
@@ -3546,7 +3577,7 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Moyeu
 DocType: GL Entry,Voucher Type,Type de Bon
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Liste de prix introuvable ou desactivé
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Liste de prix introuvable ou desactivé
 DocType: Expense Claim,Approved,Approuvé
 DocType: Pricing Rule,Price,Profil de l'organisation
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',S'il vous plaît entrer unité de mesure par défaut
@@ -3555,12 +3586,12 @@
 DocType: Employee,Education,éducation
 DocType: Selling Settings,Campaign Naming By,Campagne Naming par
 DocType: Employee,Current Address Is,Adresse actuelle
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +223,"Optional. Sets company's default currency, if not specified.","Optionnel. Définit la devise par défaut de l&#39;entreprise, si non spécifié."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +223,"Optional. Sets company's default currency, if not specified.",Optionnel. La devise par défausse la société sera définie si le champ est laissé vide.
 DocType: Address,Office,Bureau
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Les écritures comptables.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Quantité à partir de l&#39;entrepôt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,S&#39;il vous plaît sélectionnez dossier de l&#39;employé en premier.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Fête / compte ne correspond pas à {1} / {2} en {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Fête / compte ne correspond pas à {1} / {2} en {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Pour créer un compte d'impôt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,S&#39;il vous plaît entrer Compte de dépenses
 DocType: Account,Stock,Stock
@@ -3568,10 +3599,10 @@
 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 élément, puis la description, image, prix, taxes etc sera fixé à partir du modèle à moins explicitement spécifiée"
 DocType: Serial No,Purchase / Manufacture Details,Achat / Fabrication Détails
 apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Inventaire
-DocType: Employee,Contract End Date,Date de fin du contrat
+DocType: Employee,Contract End Date,Date de Fin de contrat
 DocType: Sales Order,Track this Sales Order against any Project,Suivre ce décret ventes contre tout projet
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tirez les ordres de vente (en attendant de livrer) sur la base des critères ci-dessus
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,De Fournisseur offre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,De Fournisseur offre
 DocType: Deduction Type,Deduction Type,Type de déduction
 DocType: Attendance,Half Day,Demi-journée
 DocType: Pricing Rule,Min Qty,Compte {0} est gelé
@@ -3579,15 +3610,15 @@
 DocType: GL Entry,Transaction Date,Date de la transaction
 DocType: Production Plan Item,Planned Qty,Quantité planifiée
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Tax
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Pour Quantité (Fabriqué Quantité) est obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Pour Quantité (Fabriqué Quantité) est obligatoire
 DocType: Stock Entry,Default Target Warehouse,Cible d&#39;entrepôt par défaut
-DocType: Purchase Invoice,Net Total (Company Currency),Total net (Société Monnaie)
+DocType: Purchase Invoice,Net Total (Company Currency),Total Net (Devise Société)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Type et le Parti est applicable uniquement contre débiteurs / Comptes fournisseurs
 DocType: Notification Control,Purchase Receipt Message,Achat message de réception
 DocType: Production Order,Actual Start Date,Date de début réelle
 DocType: Sales Order,% of materials delivered against this Sales Order,% De matériaux livrés sur cette ordre de vente
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Gestion des mouvements du stock.
-DocType: Newsletter List Subscriber,Newsletter List Subscriber,Bulletin Liste abonné
+DocType: Newsletter List Subscriber,Newsletter List Subscriber,Liste d'Abonnés à la Newsletter
 DocType: Hub Settings,Hub Settings,Paramètres de Hub
 DocType: Project,Gross Margin %,Marge brute%
 DocType: BOM,With Operations,Avec des opérations
@@ -3604,13 +3635,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Heure du journal n'est pas facturable
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Point {0} est un modèle, s&#39;il vous plaît sélectionnez l&#39;une de ses variantes"
 apps/erpnext/erpnext/public/js/setup_wizard.js +290,Purchaser,Acheteur
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Landed Cost correctement mis à jour
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salaire Net ne peut pas être négatif
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,S'il vous plaît entrer le contre Chèques manuellement
 DocType: SMS Settings,Static Parameters,Paramètres statiques
 DocType: Purchase Order,Advance Paid,Acompte payée
 DocType: Item,Item Tax,Taxe sur l'Article
 DocType: Expense Claim,Employees Email Id,Identifiants email des employés
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Le solde doit être
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Dette courante
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Envoyer un SMS en masse à vos contacts
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Prenons l&#39;impôt ou charge pour
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Quantité réelle est obligatoire
@@ -3633,9 +3664,9 @@
 DocType: Customer,Commission Rate,Taux de commission
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Assurez Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquer les demandes d&#39;autorisation par le ministère.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Le panier est vide
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Le panier est vide
 DocType: Production Order,Actual Operating Cost,Coût de fonctionnement réel
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Racine ne peut pas être modifié.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Racine ne peut pas être modifié.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Le montant alloué ne peut pas être plus grand que le montant non-ajusté
 DocType: Manufacturing Settings,Allow Production on Holidays,Autoriser la production pendant les vacances
 DocType: Sales Order,Customer's Purchase Order Date,Bon de commande de la date de clientèle
@@ -3646,27 +3677,27 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,créateur
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termes et Conditions modèle
 DocType: Serial No,Delivery Details,Détails de la livraison
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Livré de série n ° {0} ne peut pas être supprimé
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Livré de série n ° {0} ne peut pas être supprimé
 DocType: Item,Automatically create Material Request if quantity falls below this level,Créer automatiquement Demande de Matériel si la quantité tombe en dessous de ce niveau
 ,Item-wise Purchase Register,S&#39;enregistrer Achat point-sage
 DocType: Batch,Expiry Date,Date d&#39;expiration
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pour définir le niveau de réapprovisionnement, item doit être un objet d&#39;achat ou de fabrication de l&#39;article"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pour définir le niveau de réapprovisionnement, item doit être un objet d&#39;achat ou de fabrication de l&#39;article"
 ,Supplier Addresses and Contacts,Adresses des fournisseurs et contacts
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,S'il vous plaît sélectionnez d'abord Catégorie
-apps/erpnext/erpnext/config/projects.py +18,Project master.,Projet de master.
-DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne plus afficher n&#39;importe quel symbole comme $ etc à côté de devises.
+apps/erpnext/erpnext/config/projects.py +18,Project master.,Liste de projets.
+DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Ne plus afficher le symbole (tel que $, €...) à côté des montants."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Demi-journée)
 DocType: Supplier,Credit Days,Jours de crédit
 DocType: Leave Type,Is Carry Forward,Est-Report
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obtenir des éléments de nomenclature
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Obtenir des éléments de nomenclature
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Délai jours Temps
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Type et le Parti est nécessaire pour recevoir / payer compte {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Réf date
 DocType: Employee,Reason for Leaving,Raison du départ
-DocType: Expense Claim Detail,Sanctioned Amount,Montant sanctionné
+DocType: Expense Claim Detail,Sanctioned Amount,Montant approuvé
 DocType: GL Entry,Is Opening,Est l&#39;ouverture
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débit d'entrée ne peut pas être lié à un {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Compte {0} n'existe pas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débit d'entrée ne peut pas être lié à un {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Compte {0} n'existe pas
 DocType: Account,Cash,Espèces
 DocType: Employee,Short biography for website and other publications.,Courte biographie pour le site Web et d&#39;autres publications.
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
new file mode 100644
index 0000000..d30ba68
--- /dev/null
+++ b/erpnext/translations/gu.csv
@@ -0,0 +1,3629 @@
+DocType: Employee,Salary Mode,પગાર સ્થિતિ
+DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","તમે મોસમ પર આધારિત ટ્રૅક કરવા માંગો છો, તો માસિક વિતરણ પસંદ કરો."
+DocType: Employee,Divorced,છુટાછેડા લીધેલ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,ચેતવણી: જ વસ્તુ ઘણી વખત દાખલ કરવામાં આવી છે.
+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,કન્ઝ્યુમર પ્રોડક્ટ્સ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,પ્રથમ પક્ષ પ્રકાર પસંદ કરો
+DocType: Item,Customer Items,ગ્રાહક વસ્તુઓ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,એકાઉન્ટ {0}: પિતૃ એકાઉન્ટ {1} ખાતાવહી ન હોઈ શકે
+DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com વસ્તુ પ્રકાશિત
+apps/erpnext/erpnext/config/setup.py +93,Email Notifications,ઈમેઈલ સૂચનો
+DocType: Item,Default Unit of Measure,માપવા એકમ મૂળભૂત
+DocType: SMS Center,All Sales Partner Contact,બધા વેચાણ ભાગીદાર સંપર્ક
+DocType: Employee,Leave Approvers,સાક્ષી છોડો
+DocType: Sales Partner,Dealer,વિક્રેતા
+DocType: Employee,Rented,ભાડાનાં
+DocType: POS Profile,Applicable for User,વપરાશકર્તા માટે લાગુ પડે છે
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","અટકાવાયેલ ઉત્પાદન ઓર્ડર રદ કરી શકાતી નથી, રદ કરવા તે પ્રથમ Unstop"
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,ગ્રાહક સંપર્ક
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,સામગ્રી વિનંતી
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} વૃક્ષ
+DocType: Job Applicant,Job Applicant,જોબ અરજદાર
+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/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},વાસ્તવિક પ્રકાર કર પંક્તિ માં આઇટમ રેટ સમાવેશ કરવામાં નથી કરી શકો છો {0}
+DocType: C-Form,Customer,ગ્રાહક
+DocType: Purchase Receipt Item,Required By,દ્વારા જરૂરી
+DocType: Delivery Note,Return Against Delivery Note,ડ લવર નોંધ સામે પાછા ફરો
+DocType: Department,Department,વિભાગ
+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: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","ચલણ, રૂપાંતરણ દર, નિકાસ કુલ નિકાસ ગ્રાન્ડ કુલ વગેરે જેવી તમામ નિકાસ સંબંધિત ક્ષેત્રો બોલ પર કોઈ નોંધ, POS, અવતરણ, સેલ્સ ભરતિયું, વેચાણ ઓર્ડર વગેરે ઉપલબ્ધ છે"
+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 +177,Outstanding for {0} cannot be less than zero ({1}),ઉત્કૃષ્ટ {0} કરી શકાય નહીં શૂન્ય કરતાં ઓછી ({1})
+DocType: Manufacturing Settings,Default 10 mins,10 મિનિટ મૂળભૂત
+DocType: Leave Type,Leave Type Name,પ્રકાર છોડો નામ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,સિરીઝ સફળતાપૂર્વક અપડેટ
+DocType: Pricing Rule,Apply On,પર લાગુ પડે છે
+DocType: Item Price,Multiple Item prices.,મલ્ટીપલ વસ્તુ ભાવ.
+,Purchase Order Items To Be Received,ખરીદી ક્રમમાં વસ્તુઓ પ્રાપ્ત કરવા
+DocType: SMS Center,All Supplier Contact,બધા પુરવઠોકર્તા સંપર્ક
+DocType: Quality Inspection Reading,Parameter,પરિમાણ
+apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,અપેક્ષિત ઓવરને તારીખ અપેક્ષિત પ્રારંભ તારીખ કરતાં ઓછા ન હોઈ શકે
+apps/erpnext/erpnext/utilities/transaction_base.py +107,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 +206,New Leave Application,ન્યૂ છોડો અરજી
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,બેંક ડ્રાફ્ટ
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. ગ્રાહક મુજબના આઇટમ કોડ જાળવવા માટે અને તેમના કોડ ઉપયોગ આ વિકલ્પ પર આધારિત તેમને શોધી બનાવવા માટે
+DocType: Mode of Payment Account,Mode of Payment Account,ચુકવણી એકાઉન્ટ પ્રકાર
+apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,બતાવો ચલો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,જથ્થો
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),લોન્સ (જવાબદારીઓ)
+DocType: Employee Education,Year of Passing,પસાર વર્ષ
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ઉપલબ્ધ છે
+DocType: Designation,Designation,હોદ્દો
+DocType: Production Plan Item,Production Plan Item,ઉત્પાદન યોજના વસ્તુ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},વપરાશકર્તા {0} પહેલાથી જ કર્મચારી સોંપેલ છે {1}
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,નવા POS પ્રોફાઇલ બનાવો
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,સ્વાસ્થ્ય કાળજી
+DocType: Purchase Invoice,Monthly,માસિક
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ચુકવણી વિલંબ (દિવસ)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,ભરતિયું
+DocType: Maintenance Schedule Item,Periodicity,સમયગાળાના
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,ફિસ્કલ વર્ષ {0} જરૂરી છે
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,સંરક્ષણ
+DocType: Company,Abbr,સંક્ષિપ્ત
+DocType: Appraisal Goal,Score (0-5),સ્કોર (0-5)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},રો {0}: {1} {2} સાથે મેળ ખાતું નથી {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ROW # {0}:
+DocType: Delivery Note,Vehicle No,વાહન કોઈ
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,ભાવ યાદી પસંદ કરો
+DocType: Production Order Operation,Work In Progress,પ્રગતિમાં કામ
+DocType: Employee,Holiday List,રજા યાદી
+DocType: Time Log,Time Log,સમય લોગ
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,Accountant,એકાઉન્ટન્ટ
+DocType: Cost Center,Stock User,સ્ટોક વપરાશકર્તા
+DocType: Company,Phone No,ફોન કોઈ
+DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","પ્રવૃત્તિઓ લોગ, બિલિંગ સમય માટે ટ્રેકિંગ કરવા માટે વાપરી શકાય છે કે કાર્યો સામે વપરાશકર્તાઓ દ્વારા કરવામાં આવતી."
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},ન્યૂ {0}: # {1}
+,Sales Partners Commission,સેલ્સ પાર્ટનર્સ કમિશન
+apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,કરતાં વધુ 5 અક્ષરો છે નથી કરી શકો છો સંક્ષેપનો
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
+						exist with this Attribute.",ભાવ {0} {1} આઇટમ તરીકે ચલો \ દૂર કરી શકાતી નથી એટ્રીબ્યુટ આ લક્ષણ સાથે અસ્તિત્વ ધરાવે છે.
+apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,આ રુટ ખાતુ અને સંપાદિત કરી શકતા નથી.
+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: Bin,Quantity Requested for Purchase,જથ્થો ખરીદી માટે વિનંતી
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","બે કૉલમ, જૂના નામ માટે એક અને નવા નામ માટે એક સાથે CSV ફાઈલ જોડો"
+DocType: Packed Item,Parent Detail docname,પિતૃ વિગતવાર docname
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,Kg,કિલો ગ્રામ
+apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,નોકરી માટે ખોલીને.
+DocType: Item Attribute,Increment,વૃદ્ધિ
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,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: Employee,Married,પરણિત
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},માટે પરવાનગી નથી {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
+DocType: Payment Reconciliation,Reconcile,સમાધાન
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,કરિયાણા
+DocType: Quality Inspection Reading,Reading 1,1 વાંચન
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,બેન્ક પ્રવેશ કરો
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,પેન્શન ફંડ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,એકાઉન્ટ પ્રકાર વેરહાઉસ હોય તો વેરહાઉસ ફરજિયાત છે
+DocType: SMS Center,All Sales Person,બધા વેચાણ વ્યક્તિ
+DocType: Lead,Person Name,વ્યક્તિ નામ
+DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","તપાસો ક્રમમાં રિકરિંગ તો, રિકરિંગ રોકવા અથવા યોગ્ય સમાપ્તિ તારીખ મૂકી અનચેક"
+DocType: Sales Invoice Item,Sales Invoice Item,સેલ્સ ભરતિયું વસ્તુ
+DocType: Account,Credit,ક્રેડિટ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,કૃપા કરીને&gt; માનવ સંસાધન એચઆર સેટિંગ્સ સિસ્ટમ નામકરણ સુયોજિત કર્મચારીનું
+DocType: POS Profile,Write Off Cost Center,ખર્ચ કેન્દ્રને માંડવાળ
+DocType: Warehouse,Warehouse Detail,વેરહાઉસ વિગતવાર
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},ક્રેડિટ મર્યાદા ગ્રાહક માટે ઓળંગી કરવામાં આવી છે {0} {1} / {2}
+DocType: Tax Rule,Tax Type,ટેક્સ પ્રકાર
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},જો તમે પહેલાં પ્રવેશો ઉમેરવા અથવા અપડેટ કરવા માટે અધિકૃત નથી {0}
+DocType: Item,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,એસએમએસ લોગ
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,વિતરિત વસ્તુઓ કિંમત
+DocType: Quality Inspection,Get Specification Details,સ્પષ્ટીકરણ વિગતો મેળવવા
+DocType: Lead,Interested,રસ
+apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,સામગ્રી બિલ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,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,ખુલી એન્ટ્રી
+DocType: Stock Entry,Additional Costs,વધારાના ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,હાલની વ્યવહાર સાથે એકાઉન્ટ જૂથ રૂપાંતરિત કરી શકતા નથી.
+DocType: Lead,Product Enquiry,ઉત્પાદન ઇન્કવાયરી
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,પ્રથમ કંપની દાખલ કરો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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,કુલ ખર્ચ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,પ્રવૃત્તિ લોગ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,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 +4,Statement of Account,એકાઉન્ટ સ્ટેટમેન્ટ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ફાર્માસ્યુટિકલ્સ
+DocType: Expense Claim Detail,Claim Amount,દાવો રકમ
+DocType: Employee,Mr,શ્રીમાન
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,પુરવઠોકર્તા પ્રકાર / પુરવઠોકર્તા
+DocType: Naming Series,Prefix,પૂર્વગ
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Consumable,ઉપભોજ્ય
+DocType: Upload Attendance,Import Log,આયાત લોગ
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,મોકલો
+DocType: Sales Invoice Item,Delivered By Supplier,સપ્લાયર દ્વારા વિતરિત
+DocType: SMS Center,All Contact,તમામ સંપર્ક
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,વાર્ષિક પગાર
+DocType: Period Closing Voucher,Closing Fiscal Year,ફિસ્કલ વર્ષ બંધ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,સ્ટોક ખર્ચ
+DocType: Newsletter,Email Sent?,ઇમેઇલ મોકલ્યો છે?
+DocType: Journal Entry,Contra Entry,ઊલટું એન્ટ્રી
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,બતાવો સમય લોગ
+DocType: Journal Entry Account,Credit in Company Currency,કંપની કરન્સી ક્રેડિટ
+DocType: Delivery Note,Installation Status,સ્થાપન સ્થિતિ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty નકારેલું સ્વીકારાયું + વસ્તુ માટે પ્રાપ્ત જથ્થો માટે સમાન હોવો જોઈએ {0}
+DocType: Item,Supply Raw Materials for Purchase,પુરવઠા કાચો માલ ખરીદી માટે
+apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,વસ્તુ {0} ખરીદી વસ્તુ જ હોવી જોઈએ
+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 +447,Item {0} is not active or end of life has been reached,{0} વસ્તુ સક્રિય નથી અથવા જીવનનો અંત સુધી પહોંચી ગઇ હશે
+DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,સેલ્સ ભરતિયું રજૂ કરવામાં આવે છે પછી અપડેટ કરવામાં આવશે.
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,એચઆર મોડ્યુલ માટે સેટિંગ્સ
+DocType: SMS Center,SMS Center,એસએમએસ કેન્દ્ર
+DocType: BOM Replace Tool,New BOM,ન્યૂ BOM
+apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,બેચ બિલિંગ માટે સમય લોગ.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,ન્યૂઝલેટર પહેલેથી મોકલવામાં આવ્યો છે
+DocType: Lead,Request Type,વિનંતી પ્રકાર
+DocType: Leave Application,Reason,કારણ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,પ્રસારણ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,એક્ઝેક્યુશન
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,સિસ્ટમ વ્યવસ્થાપક બનશે પ્રથમ વપરાશકર્તા (જો તમે આ બદલી શકો છો).
+apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,કામગીરી વિગતો બહાર કરવામાં આવે છે.
+DocType: Serial No,Maintenance Status,જાળવણી સ્થિતિ
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,વસ્તુઓ અને પ્રાઇસીંગ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},તારીખ થી નાણાકીય વર્ષ અંદર પ્રયત્ન કરીશું. તારીખ થી એમ ધારી રહ્યા છીએ = {0}
+DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,તમે મૂલ્યાંકન બનાવી રહ્યા જેમને માટે કર્મચારી પસંદ કરો.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},કેન્દ્ર {0} કંપની ને અનુલક્ષતું નથી કિંમત {1}
+DocType: Customer,Individual,વ્યક્તિગત
+apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,જાળવણી મુલાકાત માટે યોજના.
+DocType: SMS Settings,Enter url parameter for message,સંદેશ માટે URL પેરામીટર દાખલ
+apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,ભાવો અને ડિસ્કાઉન્ટ લાગુ પાડવા માટે નિયમો.
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},સાથે આ સમય લોગ તકરાર {0} માટે {1} {2}
+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 +81,Installation date cannot be before delivery date for Item {0},સ્થાપન તારીખ વસ્તુ માટે બોલ તારીખ પહેલાં ન હોઈ શકે {0}
+DocType: Pricing Rule,Discount on Price List Rate (%),ભાવ યાદી દર પર ડિસ્કાઉન્ટ (%)
+DocType: Offer Letter,Select Terms and Conditions,પસંદ કરો નિયમો અને શરતો
+DocType: Production Planning Tool,Sales Orders,વેચાણ ઓર્ડર
+DocType: Purchase Taxes and Charges,Valuation,મૂલ્યાંકન
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,ડિફૉલ્ટ તરીકે સેટ કરો
+,Purchase Order Trends,ઓર્ડર પ્રવાહો ખરીદી
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,વર્ષ માટે પાંદડા ફાળવો.
+DocType: Earning Type,Earning Type,અર્નિંગ પ્રકાર
+DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,અક્ષમ કરો ક્ષમતા આયોજન અને સમય ટ્રેકિંગ
+DocType: Bank Reconciliation,Bank Account,બેંક એકાઉન્ટ
+DocType: Leave Type,Allow Negative Balance,નેગેટિવ બેલેન્સ માટે પરવાનગી આપે છે
+DocType: Selling Settings,Default Territory,મૂળભૂત પ્રદેશ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,દૂરદર્શન
+DocType: Production Order Operation,Updated via 'Time Log',&#39;સમય લોગ&#39; મારફતે સુધારાશે
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},એકાઉન્ટ {0} કંપની ને અનુલક્ષતું નથી {1}
+DocType: Naming Series,Series List for this Transaction,આ સોદા માટે સિરીઝ યાદી
+DocType: Sales Invoice,Is Opening Entry,એન્ટ્રી ખુલી છે
+DocType: Customer Group,Mention if non-standard receivable account applicable,ઉલ્લેખ બિન પ્રમાણભૂત મળવાપાત્ર એકાઉન્ટ લાગુ પડતું હોય તો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,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 +41,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 +37,Net Cash from Financing,નાણાકીય થી ચોખ્ખી રોકડ
+DocType: Lead,Address & Contact,સરનામું અને સંપર્ક
+DocType: Leave Allocation,Add unused leaves from previous allocations,અગાઉના ફાળવણી માંથી નહિં વપરાયેલ પાંદડા ઉમેરો
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},આગળ રીકરીંગ {0} પર બનાવવામાં આવશે {1}
+DocType: Newsletter List,Total Subscribers,કુલ ઉમેદવારો
+,Contact Name,સંપર્ક નામ
+DocType: Production Plan Item,SO Pending Qty,તેથી બાકી Qty
+DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ઉપર ઉલ્લેખ કર્યો માપદંડ માટે પગાર સ્લીપ બનાવે છે.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,આપવામાં કોઈ વર્ણન
+apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ખરીદી માટે વિનંતી.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,ફક્ત પસંદ કરેલ છોડો તાજનો આ છોડી અરજી સબમિટ કરી શકો છો
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,તારીખ રાહત જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,દર વર્ષે પાંદડાં
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ મારફતે&gt; નામકરણ સિરીઝ માટે સિરીઝ નામકરણ સુયોજિત કરો
+DocType: Time Log,Will be updated when batched.,બેચ જ્યારે અપડેટ કરવામાં આવશે.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,રો {0}: કૃપા કરીને તપાસો એકાઉન્ટ સામે &#39;અગાઉથી છે&#39; {1} આ એક અગાઉથી પ્રવેશ હોય તો.
+apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},{0} વેરહાઉસ કંપની ને અનુલક્ષતું નથી {1}
+DocType: Item Website Specification,Item Website Specification,વસ્તુ વેબસાઇટ સ્પષ્ટીકરણ
+DocType: Payment Tool,Reference No,સંદર્ભ કોઈ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,છોડો અવરોધિત
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,વાર્ષિક
+DocType: Stock Reconciliation Item,Stock Reconciliation Item,સ્ટોક રિકંસીલેશન વસ્તુ
+DocType: Stock Entry,Sales Invoice No,સેલ્સ ભરતિયું કોઈ
+DocType: Material Request Item,Min Order Qty,મીન ઓર્ડર Qty
+DocType: Lead,Do Not Contact,સંપર્ક કરો
+DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,બધા રિકરિંગ ઇન્વૉઇસેસ ટ્રેકિંગ માટે અનન્ય આઈડી. તેને સબમિટ પર પેદા થયેલ છે.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,સોફ્ટવેર ડેવલોપર
+DocType: Item,Minimum Order Qty,ન્યુનત્તમ ઓર્ડર Qty
+DocType: Pricing Rule,Supplier Type,પુરવઠોકર્તા પ્રકાર
+DocType: Item,Publish in Hub,હબ પ્રકાશિત
+,Terretory,Terretory
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,સામગ્રી વિનંતી
+DocType: Bank Reconciliation,Update Clearance Date,સુધારા ક્લિયરન્સ તારીખ
+DocType: Item,Purchase Details,ખરીદી વિગતો
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ખરીદી માટે &#39;કાચો માલ પાડેલ&#39; ટેબલ મળી નથી વસ્તુ {0} {1}
+DocType: Employee,Relation,સંબંધ
+DocType: Shipping Rule,Worldwide Shipping,વિશ્વભરમાં શીપીંગ
+apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ગ્રાહકો પાસેથી પુષ્ટિ ઓર્ડર.
+DocType: Purchase Receipt Item,Rejected Quantity,નકારેલું જથ્થો
+DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","ડ લવર નોંધ, અવતરણ, સેલ્સ ભરતિયું, સેલ્સ ઓર્ડર ઉપલબ્ધ ક્ષેત્ર"
+DocType: SMS Settings,SMS Sender Name,એસએમએસ પ્રેષકનું નામ
+DocType: Contact,Is Primary Contact,પ્રાથમિક સંપર્ક
+DocType: Notification Control,Notification Control,સૂચના નિયંત્રણ
+DocType: Lead,Suggestions,સૂચનો
+DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,આ પ્રદેશ પર સેટ વસ્તુ ગ્રુપ મુજબની બજેટ. પણ તમે વિતરણ સુયોજિત કરીને મોસમ સમાવેશ થાય છે.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},વેરહાઉસ માટે પિતૃ એકાઉન્ટ જૂથ દાખલ કરો {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,પ્રથમ ચાર્જ પ્રકાર પસંદ કરો
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,તાજેતરના
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,મેક્સ 5 અક્ષરો
+DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,યાદીમાં પ્રથમ છોડો તાજનો મૂળભૂત છોડો તાજનો તરીકે સેટ કરવામાં આવશે
+apps/erpnext/erpnext/config/desktop.py +73,Learn,જાણો
+apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,કર્મચારી દીઠ પ્રવૃત્તિ કિંમત
+DocType: Accounts Settings,Settings for Accounts,એકાઉન્ટ્સ માટે સુયોજનો
+apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,વેચાણ વ્યક્તિ વૃક્ષ મેનેજ કરો.
+DocType: Item,Synced With Hub,હબ સાથે સમન્વયિત
+apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,ખોટો પાસવર્ડ
+DocType: Item,Variant Of,ચલ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,વસ્તુ {0} સેવા આઇટમ જ હોવી જોઈએ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,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,બાહ્ય કામ ઇતિહાસ
+apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,ગોળ સંદર્ભ ભૂલ
+DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,તમે બોલ પર કોઈ નોંધ સેવ વાર શબ્દો (નિકાસ) દૃશ્યમાન થશે.
+DocType: Lead,Industry,ઉદ્યોગ
+DocType: Employee,Job Profile,જોબ પ્રોફાઇલ
+DocType: Newsletter,Newsletter,ન્યૂઝલેટર
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,આપોઆપ સામગ્રી વિનંતી બનાવટ પર ઇમેઇલ દ્વારા સૂચિત
+DocType: Journal Entry,Multi Currency,મલ્ટી કરન્સી
+DocType: Payment Reconciliation Invoice,Invoice Type,ભરતિયું પ્રકાર
+DocType: Sales Invoice Item,Delivery Note,ડિલીવરી નોંધ
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,કર સુયોજિત કરી રહ્યા છે
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,તમે તેને ખેંચી ચુકવણી પછી એન્ટ્રી સુધારાઈ ગયેલ છે. તેને ફરીથી ખેંચી કરો.
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} વસ્તુ ટેક્સ બે વખત દાખલ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,આ અઠવાડિયે અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
+DocType: Workstation,Rent Cost,ભાડું ખર્ચ
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,મહિનો અને વર્ષ પસંદ કરો
+DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","અલ્પવિરામ દ્વારા અલગ દાખલ ઇમેઇલ ને, ભરતિયું ચોક્કસ તારીખ પર આપોઆપ મોકલવામાં આવશે"
+DocType: Employee,Company Email,કંપની ઇમેઇલ
+DocType: GL Entry,Debit Amount in Account Currency,એકાઉન્ટ કરન્સી ડેબિટ રકમ
+DocType: Shipping Rule,Valid for Countries,દેશો માટે માન્ય
+DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","ચલણ, રૂપાંતરણ દર, આયાત કુલ આયાત ગ્રાન્ડ કુલ વગેરે જેવી તમામ આયાત સંબંધિત ક્ષેત્રો ખરીદી રસીદ, સપ્લાયર અવતરણ, ખરીદી ભરતિયું, ખરીદી ઓર્ડર વગેરે ઉપલબ્ધ છે"
+apps/erpnext/erpnext/stock/doctype/item/item.js +48,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/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,ગણવામાં કુલ ઓર્ડર
+apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",કર્મચારીનું હોદ્દો (દા.ત. સીઇઓ ડિરેક્ટર વગેરે).
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,દાખલ ક્ષેત્ર કિંમત &#39;ડે મહિનો પર પુનરાવર્તન&#39; કરો
+DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"ગ્રાહક કરન્સી ગ્રાહક આધાર ચલણ ફેરવાય છે, જે અંતે દર"
+DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, ડ લવર નોંધ, ખરીદી ભરતિયું, ઉત્પાદન ઓર્ડર, ખરીદી ઓર્ડર, ખરીદી રસીદ, સેલ્સ ભરતિયું, વેચાણ ઓર્ડર, સ્ટોક એન્ટ્રી, Timesheet ઉપલબ્ધ"
+DocType: Item Tax,Tax Rate,ટેક્સ રેટ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +631,Select Item,પસંદ કરો વસ્તુ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
+					Stock Reconciliation, instead use Stock Entry","વસ્તુ: {0} બેચ મુજબના, તેના બદલે ઉપયોગ સ્ટોક એન્ટ્રી \ સ્ટોક રિકંસીલેશન ઉપયોગ સમાધાન કરી શકતા નથી વ્યવસ્થાપિત"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,ભરતિયું {0} પહેલાથી જ રજૂ કરવામાં આવે છે ખરીદી
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ROW # {0}: બેચ કોઈ તરીકે જ હોવી જોઈએ {1} {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,બિન-ગ્રુપ માટે કન્વર્ટ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ખરીદી રસીદ સબમિટ હોવું જ જોઈએ
+apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,આઇટમ બેચ (ઘણો).
+DocType: C-Form Invoice Detail,Invoice Date,ભરતિયું તારીખ
+DocType: GL Entry,Debit Amount,ડેબિટ રકમ
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},માત્ર કંપની દીઠ 1 એકાઉન્ટ હોઈ શકે છે {0} {1}
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,તમારું ઈ મેઈલ સરનામું
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,જોડાણ જુઓ
+DocType: Purchase Order,% Received,% પ્રાપ્ત
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,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 +61,Serial No {0} does not belong to Delivery Note {1},સીરીયલ કોઈ {0} બોલ પર કોઈ નોંધ સંબંધ નથી {1}
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,વસ્તુ ગુણવત્તા નિરીક્ષણ પરિમાણ
+DocType: Leave Application,Leave Approver Name,તાજનો છોડો નામ
+,Schedule Date,સૂચિ તારીખ
+DocType: Packed Item,Packed Item,ભરેલા વસ્તુ
+apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,વ્યવહારો ખરીદવા માટે મૂળભૂત સુયોજનો.
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},પ્રવૃત્તિ કિંમત પ્રવૃત્તિ પ્રકાર સામે કર્મચારી {0} માટે અસ્તિત્વમાં છે - {1}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,ગ્રાહકો અને સપ્લાયર્સ માટે એકાઉન્ટ્સ બનાવી નથી કરો. તેઓ ગ્રાહક / સપ્લાયર સ્નાતકોત્તર સીધા બનાવવામાં આવે છે.
+DocType: Currency Exchange,Currency Exchange,કરન્સી એક્સચેન્જ
+DocType: Purchase Invoice Item,Item Name,વસ્તુ નામ
+DocType: Authorization Rule,Approving User  (above authorized value),(અધિકૃત કિંમત ઉપર) વપરાશકર્તા એપ્રૂવિંગ
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ક્રેડિટ બેલેન્સ
+DocType: Employee,Widowed,વિધવા
+DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",વસ્તુઓ અંદાજ Qty અને ન્યૂનતમ ક્રમ Qty પર આધારિત છે બધા વખારો વિચારણા જે &quot;સ્ટોક બહાર&quot; છે વિનંતી કરી
+DocType: Workstation,Working Hours,કામ નાં કલાકો
+DocType: Naming Series,Change the starting / current sequence number of an existing series.,હાલની શ્રેણી શરૂ / વર્તમાન ક્રમ નંબર બદલો.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","બહુવિધ કિંમતના નિયમોમાં જીતવું ચાલુ હોય, વપરાશકર્તાઓ તકરાર ઉકેલવા માટે જાતે અગ્રતા સુયોજિત કરવા માટે કહેવામાં આવે છે."
+,Purchase Register,ખરીદી રજીસ્ટર
+DocType: Landed Cost Item,Applicable Charges,લાગુ ખર્ચ
+DocType: Workstation,Consumable Cost,ઉપભોજ્ય કિંમત
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ભૂમિકા હોવી જ જોઈએ &#39;છોડી તાજનો&#39;
+DocType: Purchase Receipt,Vehicle Date,વાહન તારીખ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,મેડિકલ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ગુમાવી માટે કારણ
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,એક
+DocType: Issue,Attachment,જોડાણ
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,બજેટ ગ્રુપ ખર્ચ કેન્દ્રને માટે સેટ કરી શકાય છે
+DocType: Account,Cost of Goods Sold,માલની કિંમત વેચાઈ
+DocType: Purchase Invoice,Yearly,વાર્ષિક
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ખર્ચ કેન્દ્રને દાખલ કરો
+DocType: Journal Entry Account,Sales Order,વેચાણ ઓર્ડર
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,સરેરાશ. વેચાણ દર
+DocType: Purchase Order,Start date of current order's period,વર્તમાન ઓર્ડર માતાનો સમયગાળા તારીખ શરૂ
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},જથ્થો પંક્તિમાં અપૂર્ણાંક ન હોઈ શકે {0}
+DocType: Purchase Invoice Item,Quantity and Rate,જથ્થો અને દર
+DocType: Delivery Note,% Installed,% ઇન્સ્ટોલ
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,પ્રથમ કંપની નામ દાખલ કરો
+DocType: BOM,Item Desription,વસ્તુ desription
+DocType: Purchase Invoice,Supplier Name,પુરવઠોકર્તા નામ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,આ ERPNext માર્ગદર્શિકા વાંચવા
+DocType: Account,Is Group,Is ગ્રુપ
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,આપમેળે FIFO પર આધારિત અમે સીરીયલ સેટ
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ચેક પુરવઠોકર્તા ભરતિયું નંબર વિશિષ્ટતા
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;કેસ નંબર&#39; &#39;કેસ નંબર પ્રતિ&#39; કરતાં ઓછી ન હોઈ શકે
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,બિન નફો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,શરૂ કરી નથી
+DocType: Lead,Channel Partner,ચેનલ ભાગીદાર
+DocType: Account,Old Parent,ઓલ્ડ પિતૃ
+DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,કે ઇમેઇલ એક ભાગ તરીકે જાય છે કે પ્રારંભિક લખાણ કસ્ટમાઇઝ કરો. દરેક વ્યવહાર અલગ પ્રારંભિક લખાણ છે.
+DocType: Sales Taxes and Charges Template,Sales Master Manager,સેલ્સ માસ્ટર વ્યવસ્થાપક
+apps/erpnext/erpnext/config/manufacturing.py +74,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 +563,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 +140,Holiday master.,હોલિડે માસ્ટર.
+DocType: Material Request Item,Required Date,જરૂરી તારીખ
+DocType: Delivery Note,Billing Address,બિલિંગ સરનામું
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,વસ્તુ કોડ દાખલ કરો.
+DocType: BOM,Costing,પડતર
+DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","ચકાસાયેલ જો પહેલેથી પ્રિન્ટ દર છાપો / રકમ સમાવેશ થાય છે, કારણ કે કર રકમ ગણવામાં આવશે"
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,કુલ Qty
+DocType: Employee,Health Concerns,આરોગ્ય ચિંતા
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,અવેતન
+DocType: Packing Slip,From Package No.,પેકેજ નંબર પ્રતિ
+DocType: Item Attribute,To Range,શ્રેણી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,સિક્યોરિટીઝ અને થાપણો
+DocType: Features Setup,Imports,આયાત
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ફાળવવામાં કુલ પાંદડા ફરજિયાત છે
+DocType: Job Opening,Description of a Job Opening,એક જોબ ખુલી વર્ણન
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,આજે બાકી પ્રવૃત્તિઓ
+apps/erpnext/erpnext/config/hr.py +28,Attendance record.,હાજરીનો વિક્રમ છે.
+DocType: Bank Reconciliation,Journal Entries,જર્નલ પ્રવેશો
+DocType: Sales Order Item,Used for Production Plan,ઉત્પાદન યોજના માટે વપરાય છે
+DocType: Manufacturing Settings,Time Between Operations (in mins),(મિનિટ) ઓપરેશન્સ વચ્ચે સમય
+DocType: Customer,Buyer of Goods and Services.,સામાન અને સેવાઓ ખરીદનાર.
+DocType: Journal Entry,Accounts Payable,ચુકવવાપાત્ર ખાતાઓ
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,ઉમેદવારો ઉમેરો
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;અસ્તિત્વમાં નથી
+DocType: Pricing Rule,Valid Upto,માન્ય સુધી
+apps/erpnext/erpnext/public/js/setup_wizard.js +322,List a few of your customers. They could be organizations or individuals.,તમારા ગ્રાહકો થોડા યાદી આપે છે. તેઓ સંસ્થાઓ અથવા વ્યક્તિઓ હોઈ શકે છે.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,સીધી આવક
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","એકાઉન્ટ દ્વારા જૂથ, તો એકાઉન્ટ પર આધારિત ફિલ્ટર કરી શકો છો"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,વહીવટી અધિકારીશ્રી
+DocType: Payment Tool,Received Or Paid,પ્રાપ્ત અથવા પેઇડ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,કંપની પસંદ કરો
+DocType: Stock Entry,Difference Account,તફાવત એકાઉન્ટ
+apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,તેના આશ્રિત કાર્ય {0} બંધ નથી નજીક કાર્ય નથી કરી શકો છો.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +467,"To merge, following properties must be same for both items","મર્જ, નીચેના ગુણધર્મો બંને આઇટમ્સ માટે જ હોવી જોઈએ"
+DocType: Shipping Rule,Net Weight,કુલ વજન
+DocType: Employee,Emergency Phone,સંકટકાલીન ફોન
+,Serial No Warranty Expiry,સીરીયલ કોઈ વોરંટી સમાપ્તિ
+DocType: Sales Order,To Deliver,વિતરિત કરવા માટે
+DocType: Purchase Invoice Item,Item,વસ્તુ
+DocType: Journal Entry,Difference (Dr - Cr),તફાવત (ડૉ - સીઆર)
+DocType: Account,Profit and Loss,નફો અને નુકસાનનું
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,મેનેજિંગ Subcontracting
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,ફર્નિચર અને ફિક્સ્ચર
+DocType: Quotation,Rate at which Price list currency is converted to company's base currency,દર ભાવ યાદી ચલણ પર કંપનીના આધાર ચલણ ફેરવાય છે
+apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},{0} એકાઉન્ટ કંપની ને અનુલક્ષતું નથી: {1}
+DocType: Selling Settings,Default Customer Group,મૂળભૂત ગ્રાહક જૂથ
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","અક્ષમ કરો છો, &#39;ગોળાકાર કુલ&#39; ક્ષેત્ર કોઈપણ વ્યવહાર માં દૃશ્યમાન હશે નહિં"
+DocType: BOM,Operating Cost,સંચાલન ખર્ચ
+,Gross Profit,કુલ નફો
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,વૃદ્ધિ 0 ન હોઈ શકે
+DocType: Production Planning Tool,Material Requirement,સામગ્રી જરૂરિયાત
+DocType: Company,Delete Company Transactions,કંપની વ્યવહારો કાઢી નાખો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,વસ્તુ {0} ન ખરીદી છે વસ્તુ
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
+					Email Address'",{0} &#39;સૂચના \ ઇમેઇલ સરનામું&#39; એક અમાન્ય ઇમેઇલ સરનામું
+DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ સંપાદિત કરો કર અને ખર્ચ ઉમેરો
+DocType: Purchase Invoice,Supplier Invoice No,પુરવઠોકર્તા ભરતિયું કોઈ
+DocType: Territory,For reference,સંદર્ભ માટે
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","કાઢી શકતા નથી સીરીયલ કોઈ {0}, તે સ્ટોક વ્યવહારો તરીકે ઉપયોગ થાય છે"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),બંધ (સીઆર)
+DocType: Serial No,Warranty Period (Days),વોરંટી સમયગાળા (દિવસ)
+DocType: Installation Note Item,Installation Note Item,સ્થાપન નોંધ વસ્તુ
+,Pending Qty,બાકી Qty
+DocType: Job Applicant,Thread HTML,થ્રેડ HTML
+DocType: Company,Ignore,અવગણો
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},એસએમએસ નીચેના નંબરો પર મોકલવામાં: {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,પેટા કોન્ટ્રાક્ટ ખરીદી રસીદ માટે ફરજિયાત પુરવઠોકર્તા વેરહાઉસ
+DocType: Pricing Rule,Valid From,થી માન્ય
+DocType: Sales Invoice,Total Commission,કુલ કમિશન
+DocType: Pricing Rule,Sales Partner,વેચાણ ભાગીદાર
+DocType: Buying Settings,Purchase Receipt Required,ખરીદી રસીદ જરૂરી
+DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
+
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",** માસિક વિતરણ ** તમારા બિઝનેસ તમે મોસમ હોય તો તમે મહિના પર તમારા બજેટ વિતરિત કરે છે. ** આ વિતરણ મદદથી બજેટ વિતરણ ** કિંમત કેન્દ્રમાં ** આ ** માસિક વિતરણ સુયોજિત કરવા માટે
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,ભરતિયું ટેબલ માં શોધી કોઈ રેકોર્ડ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,પ્રથમ કંપની અને પાર્ટી પ્રકાર પસંદ કરો
+apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,નાણાકીય / હિસાબી વર્ષ.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","માફ કરશો, સીરીયલ અમે મર્જ કરી શકાતા નથી"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,વેચાણ ઓર્ડર બનાવો
+DocType: Project Task,Project Task,પ્રોજેક્ટ ટાસ્ક
+,Lead Id,લીડ આઈડી
+DocType: C-Form Invoice Detail,Grand Total,કુલ સરવાળો
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ફિસ્કલ વર્ષ શરૂ તારીખ ફિસ્કલ વર્ષ અંતે તારીખ કરતાં વધારે ન હોવી જોઈએ
+DocType: Warranty Claim,Resolution,ઠરાવ
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},આપ્યું હતું {0}
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,ચૂકવવાપાત્ર એકાઉન્ટ
+DocType: Sales Order,Billing and Delivery Status,બિલિંગ અને ડ લવર સ્થિતિ
+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/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,વેચાણ પરત
+DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,તમે ઉત્પાદન ઓર્ડર્સ બનાવવા માંગો છો કે જેમાંથી વેચાણ ઓર્ડર પસંદ કરો.
+DocType: Item,Delivered by Supplier (Drop Ship),સપ્લાયર દ્વારા વિતરિત (ડ્રૉપ જહાજ)
+apps/erpnext/erpnext/config/hr.py +120,Salary components.,પગાર ઘટકો.
+apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,સંભવિત ગ્રાહકો ડેટાબેઝ.
+DocType: Authorization Rule,Customer or Item,ગ્રાહક અથવા વસ્તુ
+apps/erpnext/erpnext/config/crm.py +17,Customer database.,ગ્રાહક ડેટાબેઝ.
+DocType: Quotation,Quotation To,માટે અવતરણ
+DocType: Lead,Middle Income,મધ્યમ આવક
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ખુલી (સીઆર)
+apps/erpnext/erpnext/stock/doctype/item/item.py +711,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 +195,Allocated amount can not be negative,ફાળવેલ રકમ નકારાત્મક ન હોઈ શકે
+DocType: Purchase Order Item,Billed Amt,ચાંચ એએમટી
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,"સ્ટોક પ્રવેશો કરવામાં આવે છે, જે સામે લોજિકલ વેરહાઉસ."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},સંદર્ભ કોઈ અને સંદર્ભ તારીખ માટે જરૂરી છે {0}
+DocType: Sales Invoice,Customer's Vendor,ગ્રાહક વેન્ડર
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ઉત્પાદન ઓર્ડર ફરજિયાત છે
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,દરખાસ્ત લેખન
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,અન્ય વેચાણ વ્યક્તિ {0} એ જ કર્મચારીનું ID સાથે અસ્તિત્વમાં
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},નકારાત્મક સ્ટોક ભૂલ ({6}) વસ્તુ માટે {0} વેરહાઉસ માં {1} પર {2} {3} માં {4} {5}
+DocType: Fiscal Year Company,Fiscal Year Company,ફિસ્કલ યર કંપની
+DocType: Packing Slip Item,DN Detail,DN વિગતવાર
+DocType: Time Log,Billed,ગણાવી
+DocType: Batch,Batch Description,બેચ વર્ણન
+DocType: Delivery Note,Time at which items were delivered from warehouse,"વસ્તુઓ વેરહાઉસ માંથી પહોંચાડવામાં આવી હતી, જે અંતે સમય"
+DocType: Sales Invoice,Sales Taxes and Charges,વેચાણ કર અને ખર્ચ
+DocType: Employee,Organization Profile,સંસ્થા પ્રોફાઇલ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,સેટઅપ ક્રમાંકન સિરીઝ&gt; સેટઅપ દ્વારા હાજરી સિરીઝ નંબર કરો
+DocType: Employee,Reason for Resignation,રાજીનામાની કારણ
+apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,કામગીરી appraisals માટે નમૂનો.
+DocType: Payment Reconciliation,Invoice/Journal Entry Details,ભરતિયું / જર્નલ પ્રવેશ વિગતો
+apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; નથી નાણાકીય વર્ષમાં {2}
+DocType: Buying Settings,Settings for Buying Module,મોડ્યુલ ખરીદવી માટે સેટિંગ્સ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,પ્રથમ ખરીદી રસીદ દાખલ કરો
+DocType: Buying Settings,Supplier Naming By,દ્વારા પુરવઠોકર્તા નામકરણ
+DocType: Activity Type,Default Costing Rate,મૂળભૂત પડતર દર
+DocType: Maintenance Schedule,Maintenance Schedule,જાળવણી સૂચિ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","પછી કિંમતના નિયમોમાં વગેરે ગ્રાહક, ગ્રાહક જૂથ, પ્રદેશ, સપ્લાયર, પુરવઠોકર્તા પ્રકાર, ઝુંબેશ, વેચાણ ભાગીદાર પર આધારિત બહાર ફિલ્ટર કરવામાં આવે છે"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,ઇન્વેન્ટરીમાં કુલ ફેરફાર
+DocType: Employee,Passport Number,પાસપોર્ટ નંબર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,વ્યવસ્થાપક
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,ખરીદી મળ્યાના
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,જ વસ્તુ ઘણી વખત દાખલ કરવામાં આવી છે.
+DocType: SMS Settings,Receiver Parameter,રીસીવર પરિમાણ
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,અને &#39;ગ્રુપ દ્વારા&#39; &#39;પર આધારિત&#39; જ ન હોઈ શકે
+DocType: Sales Person,Sales Person Targets,વેચાણ વ્યક્તિ લક્ષ્યાંક
+DocType: Production Order Operation,In minutes,મિનિટ
+DocType: Issue,Resolution Date,ઠરાવ તારીખ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
+DocType: Selling Settings,Customer Naming By,કરીને ગ્રાહક નામકરણ
+apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,ગ્રુપ કન્વર્ટ
+DocType: Activity Cost,Activity Type,પ્રવૃત્તિ પ્રકાર
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,વિતરિત રકમ
+DocType: Customer,Fixed Days,સ્થિર દિવસો
+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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,કમ્પોનન્ટ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,જાળવણી મુલાકાત લો {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
+DocType: Material Request,Material Transfer,માલ પરિવહન
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),ખુલી (DR)
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},પોસ્ટ ટાઇમસ્ટેમ્પ પછી જ હોવી જોઈએ {0}
+DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ઉતારેલ માલની કિંમત કર અને ખર્ચ
+DocType: Production Order Operation,Actual Start Time,વાસ્તવિક પ્રારંભ સમય
+DocType: BOM Operation,Operation Time,ઓપરેશન સમય
+DocType: Pricing Rule,Sales Manager,વેચાણ મેનેજર
+DocType: Journal Entry,Write Off Amount,રકમ માંડવાળ
+DocType: Journal Entry,Bill No,બિલ કોઈ
+DocType: Purchase Invoice,Quarterly,ત્રિમાસિક
+DocType: Selling Settings,Delivery Note Required,ડ લવર નોંધ જરૂરી
+DocType: Sales Order Item,Basic Rate (Company Currency),મૂળભૂત દર (કંપની ચલણ)
+DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush કાચો માલ પર આધારિત
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,આઇટમ વિગતો દાખલ કરો
+DocType: Purchase Receipt,Other Details,અન્ય વિગતો
+DocType: Account,Accounts,એકાઉન્ટ્સ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,માર્કેટિંગ
+DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,તેમના સીરીયલ અમે પર આધારિત વેચાણ અને ખરીદી દસ્તાવેજો વસ્તુ ટ્રેક કરવા માટે. આ પણ ઉત્પાદન વોરંટી વિગતો ટ્રૅક કરવા માટે ઉપયોગ કરી શકો છો છે.
+DocType: Purchase Receipt Item Supplied,Current Stock,વર્તમાન સ્ટોક
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,આ વર્ષે કુલ બિલિંગ
+DocType: Account,Expenses Included In Valuation,ખર્ચ વેલ્યુએશનમાં સમાવાયેલ
+DocType: Employee,Provide email id registered in company,કંપની રજીસ્ટર ઇમેઇલ ને પૂરી પાડો
+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 +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,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: Sales Invoice,Commission Rate (%),કમિશન દર (%)
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry",વાઉચર સામે પ્રકાર વેચાણ ઓર્ડર એક સેલ્સ ભરતિયું અથવા જર્નલ પ્રવેશ હોવા જ જોઈએ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,એરોસ્પેસ
+DocType: Journal Entry,Credit Card Entry,ક્રેડિટ કાર્ડ એન્ટ્રી
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,ટાસ્ક વિષય
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,ગૂડ્ઝ સપ્લાયરો પાસેથી પ્રાપ્ત થઈ છે.
+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 +93,{0} is not a stock Item,{0} સ્ટોક વસ્તુ નથી
+DocType: Mode of Payment Account,Default Account,મૂળભૂત એકાઉન્ટ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"તક લીડ બનાવવામાં આવે છે, તો લીડ સુયોજિત થવુ જ જોઇએ"
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,સાપ્તાહિક બોલ દિવસ પસંદ કરો
+DocType: Production Order Operation,Planned End Time,આયોજિત સમાપ્તિ સમય
+,Sales Person Target Variance Item Group-Wise,વેચાણ વ્યક્તિ લક્ષ્યાંક ફેરફાર વસ્તુ ગ્રુપ મુજબની
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,હાલની વ્યવહાર સાથે એકાઉન્ટ ખાતાવહી રૂપાંતરિત કરી શકતા નથી
+DocType: Delivery Note,Customer's Purchase Order No,ગ્રાહક ખરીદી ઓર્ડર કોઈ
+DocType: Employee,Cell Number,સેલ સંખ્યા
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ઓટો સામગ્રી અરજીઓ પેદા
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,લોસ્ટ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,તમે સ્તંભ &#39;જર્નલ પ્રવેશ સામે વર્તમાન વાઉચર દાખલ નહીં કરી શકો
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,એનર્જી
+DocType: Opportunity,Opportunity From,પ્રતિ તક
+apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,માસિક પગાર નિવેદન.
+DocType: Item Group,Website Specifications,વેબસાઇટ તરફથી
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,નવા એકાઉન્ટ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: પ્રતિ {0} પ્રકારની {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,રો {0}: રૂપાંતર ફેક્ટર ફરજિયાત છે
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,હિસાબી પ્રવેશો પર્ણ ગાંઠો સામે કરી શકાય છે. જૂથો સામે પ્રવેશો મંજૂરી નથી.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,"નિષ્ક્રિય અથવા તે અન્ય BOMs સાથે કડી થયેલ છે, કારણ કે BOM રદ કરી શકાતી નથી"
+DocType: Opportunity,Maintenance,જાળવણી
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},વસ્તુ માટે જરૂરી ખરીદી રસીદ નંબર {0}
+DocType: Item Attribute Value,Item Attribute Value,વસ્તુ કિંમત એટ્રીબ્યુટ
+apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,વેચાણ ઝુંબેશ.
+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
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+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.","બધા સેલ્સ વ્યવહારો પર લાગુ કરી શકાય છે કે જે પ્રમાણભૂત કર નમૂનો. આ નમૂનો વગેરે #### તમે બધા માટે પ્રમાણભૂત કર દર હશે અહીં વ્યાખ્યાયિત કર દર નોંધ &quot;હેન્ડલીંગ&quot;, કર માથા અને &quot;શીપીંગ&quot;, &quot;વીમો&quot; જેવા પણ અન્ય ખર્ચ / આવક હેડ યાદી સમાવી શકે છે ** વસ્તુઓ **. વિવિધ દર હોય ** ** કે વસ્તુઓ છે, તો તેઓ ** વસ્તુ કર ઉમેરાવી જ જોઈએ ** આ ** ** વસ્તુ માસ્ટર કોષ્ટક. #### સ્તંભોને વર્ણન 1. ગણતરી પ્રકાર: - આ (કે જે મૂળભૂત રકમ ની રકમ છે) ** નેટ કુલ ** પર હોઇ શકે છે. - ** અગાઉના પંક્તિ કુલ / રકમ ** પર (સંચિત કર અથવા ખર્ચ માટે). તમે આ વિકલ્પ પસંદ કરો, તો કર રકમ અથવા કુલ (કર કોષ્ટકમાં) અગાઉના પંક્તિ ટકાવારી તરીકે લાગુ કરવામાં આવશે. - ** ** વાસ્તવમાં (ઉલ્લેખ કર્યો છે). 2. એકાઉન્ટ હેડ: આ કર 3. ખર્ચ કેન્દ્રને નક્કી કરવામાં આવશે, જે હેઠળ એકાઉન્ટ ખાતાવહી: કર / ચાર્જ (શીપીંગ જેમ) એક આવક છે અથવા ખર્ચ તો તે ખર્ચ કેન્દ્રને સામે નક્કી કરવાની જરૂર છે. 4. વર્ણન: કર વર્ણન (કે ઇન્વૉઇસેસ / અવતરણ છાપવામાં આવશે). 5. દર: કર દર. 6. રકમ: ટેક્સની રકમ. 7. કુલ: આ બોલ પર સંચિત કુલ. 8. રો દાખલ કરો: પર આધારિત &quot;જો અગાઉના પંક્તિ કુલ&quot; તમે આ ગણતરી માટે આધાર (મૂળભૂત અગાઉના પંક્તિ છે) તરીકે લેવામાં આવશે જે પંક્તિ નંબર પસંદ કરી શકો છો. 9. મૂળભૂત દર માં સમાવેલ આ કર છે ?: તમે ચકાસી તો તે આ કર આઇટમ ટેબલ નીચે બતાવવામાં આવશે નહીં, પરંતુ તમારા મુખ્ય વસ્તુ કોષ્ટકમાં મૂળભૂત દર સમાવેશ કરવામાં આવશે. તમે ગ્રાહકો માટે એક ફ્લેટ (તમામ કરવેરા સહિત) ભાવ ભાવ આપી માંગો છો જ્યાં આ ઉપયોગી છે."
+DocType: Employee,Bank A/C No.,બેન્ક એ / સી નંબર
+DocType: Expense Claim,Project,પ્રોજેક્ટ
+DocType: Quality Inspection Reading,Reading 7,7 વાંચન
+DocType: Address,Personal,વ્યક્તિગત
+DocType: Expense Claim Detail,Expense Claim Type,ખર્ચ દાવાનો પ્રકાર
+DocType: Shopping Cart Settings,Default settings for Shopping Cart,શોપિંગ કાર્ટ માટે મૂળભૂત સુયોજનો
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","જર્નલ પ્રવેશ {0} તે આ ભરતિયું અગાઉથી તરીકે ખેંચી શકાય જોઈએ તો {1}, ચેક ઓર્ડર સામે કડી થયેલ છે."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,બાયોટેકનોલોજી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,ઓફિસ જાળવણી ખર્ચ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,પ્રથમ વસ્તુ દાખલ કરો
+DocType: Account,Liability,જવાબદારી
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,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 +262,Price List not selected,ભાવ યાદી પસંદ નહી
+DocType: Employee,Family Background,કૌટુંબિક પૃષ્ઠભૂમિ
+DocType: Process Payroll,Send Email,ઇમેઇલ મોકલો
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},ચેતવણી: અમાન્ય જોડાણ {0}
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,પરવાનગી નથી
+DocType: Company,Default Bank Account,મૂળભૂત બેન્ક એકાઉન્ટ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"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/public/js/setup_wizard.js +380,Nos,અમે
+DocType: Item,Items with higher weightage will be shown higher,ઉચ્ચ ભારાંક સાથે વસ્તુઓ વધારે બતાવવામાં આવશે
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,બેન્ક રિકંસીલેશન વિગતવાર
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,મારી ઇનવૉઇસેસ
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,કોઈ કર્મચારી મળી
+DocType: Purchase Order,Stopped,બંધ
+DocType: Item,If subcontracted to a vendor,એક વિક્રેતા subcontracted તો
+apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,શરૂ કરવા માટે BOM પસંદ કરો
+DocType: SMS Center,All Customer Contact,બધા ગ્રાહક સંપર્ક
+apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,CSV મારફતે સ્ટોક બેલેન્સ અપલોડ કરો.
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,હવે મોકલો
+,Support Analytics,આધાર ઍનલિટિક્સ
+DocType: Item,Website Warehouse,વેબસાઇટ વેરહાઉસ
+DocType: Payment Reconciliation,Minimum Invoice Amount,ન્યુનત્તમ ભરતિયું રકમ
+DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ઓટો ભરતિયું 05, 28 વગેરે દા.ત. પેદા થશે કે જેના પર મહિનાનો દિવસ"
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,કુલ સ્કોર 5 કરતાં ઓછી અથવા સમાન હોવા જ જોઈએ
+apps/erpnext/erpnext/config/accounts.py +169,C-Form records,સી-ફોર્મ રેકોર્ડ
+apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,ગ્રાહક અને સપ્લાયર
+DocType: Email Digest,Email Digest Settings,ઇમેઇલ ડાયજેસ્ટ સેટિંગ્સ
+apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,ગ્રાહકો પાસેથી આધાર પ્રશ્નો.
+DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;વેચાણ પોઇન્ટ&quot; લક્ષણો સક્રિય કરવા માટે
+DocType: Bin,Moving Average Rate,સરેરાશ દર ખસેડવું
+DocType: Production Planning Tool,Select Items,આઇટમ્સ પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} બિલ સામે {1} ના રોજ {2}
+DocType: Maintenance Visit,Completion Status,પૂર્ણ સ્થિતિ
+DocType: Sales Invoice Item,Target Warehouse,લક્ષ્યાંક વેરહાઉસ
+DocType: Item,Allow over delivery or receipt upto this percent,આ ટકા સુધી ડિલિવરી અથવા રસીદ પર પરવાનગી આપે છે
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,અપેક્ષિત બોલ તારીખ સેલ્સ ઓર્ડર તારીખ પહેલાં ન હોઈ શકે
+DocType: Upload Attendance,Import Attendance,આયાત એટેન્ડન્સ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,બધા આઇટમ જૂથો
+DocType: Process Payroll,Activity Log,પ્રવૃત્તિ લોગ
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,ચોખ્ખો નફો / નુકશાન
+apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,આપમેળે વ્યવહારો સબમિશન પર સંદેશ કંપોઝ.
+DocType: Production Order,Item To Manufacture,વસ્તુ ઉત્પાદન
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} સ્થિતિ {2} છે
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,ચુકવણી માટે ઓર્ડર ખરીદી
+DocType: Sales Order Item,Projected Qty,અંદાજિત Qty
+DocType: Sales Invoice,Payment Due Date,ચુકવણી કારણે તારીખ
+DocType: Newsletter,Newsletter Manager,ન્યૂઝલેટર વ્યવસ્થાપક
+apps/erpnext/erpnext/stock/doctype/item/item.js +246,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;ખુલી&#39;
+DocType: Notification Control,Delivery Note Message,ડ લવર નોંધ સંદેશ
+DocType: Expense Claim,Expenses,ખર્ચ
+DocType: Item Variant Attribute,Item Variant Attribute,વસ્તુ વેરિએન્ટ એટ્રીબ્યુટ
+,Purchase Receipt Trends,ખરીદી રસીદ પ્રવાહો
+DocType: Appraisal,Select template from which you want to get the Goals,તમે ગોલ વિચાર કરવા માંગો છો કે જેમાંથી નમૂનો પસંદ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,રિસર્ચ એન્ડ ડેવલપમેન્ટ
+,Amount to Bill,બિલ રકમ
+DocType: Company,Registration Details,નોંધણી વિગતો
+DocType: Item,Re-Order Qty,ફરીથી ઓર્ડર Qty
+DocType: Leave Block List Date,Leave Block List Date,બ્લોક યાદી તારીખ છોડી દો
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},મોકલવા માટે અનુસૂચિત {0}
+DocType: Pricing Rule,Price or Discount,ભાવ અથવા ડિસ્કાઉન્ટ
+DocType: Sales Team,Incentives,ઇનસેન્ટીવ્સ
+DocType: SMS Log,Requested Numbers,વિનંતી નંબર્સ
+apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,કામગીરી મૂલ્યાંકન.
+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 +304,Point-of-Sale,પોઇન્ટ ઓફ સેલ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","પહેલેથી ક્રેડિટ એકાઉન્ટ બેલેન્સ, તમે ડેબિટ &#39;તરીકે&#39; બેલેન્સ હોવું જોઈએ &#39;સુયોજિત કરવા માટે માન્ય નથી"
+DocType: Account,Balance must be,બેલેન્સ હોવા જ જોઈએ
+DocType: Hub Settings,Publish Pricing,પ્રાઇસીંગ પ્રકાશિત
+DocType: Notification Control,Expense Claim Rejected Message,ખર્ચ દાવો નકારી સંદેશ
+,Available Qty,ઉપલબ્ધ Qty
+DocType: Purchase Taxes and Charges,On Previous Row Total,Next અગાઉના આગળ રો કુલ પર
+DocType: Salary Slip,Working Days,કાર્યદિવસ
+DocType: Serial No,Incoming Rate,ઇનકમિંગ દર
+DocType: Packing Slip,Gross Weight,સરેરાશ વજન
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,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: Item Attribute,Item Attribute Values,વસ્તુ એટ્રીબ્યુટ મૂલ્યો
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,જુઓ ઉમેદવારો
+DocType: Purchase Invoice Item,Purchase Receipt,ખરીદી રસીદ
+,Received Items To Be Billed,પ્રાપ્ત વસ્તુઓ બિલ કરવા
+DocType: Employee,Ms,Ms
+apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,ચલણ વિનિમય દર માસ્ટર.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} સક્રિય હોવા જ જોઈએ
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,પ્રથમ દસ્તાવેજ પ્રકાર પસંદ કરો
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,આ જાળવણી મુલાકાત લો રદ રદ સામગ્રી મુલાકાત {0}
+DocType: Salary Slip,Leave Encashment Amount,એન્કેશમેન્ટ રકમ છોડો
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},સીરીયલ કોઈ {0} વસ્તુ ને અનુલક્ષતું નથી {1}
+DocType: Purchase Receipt Item Supplied,Required Qty,જરૂરી Qty
+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_ledger/stock_ledger.py +35,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 +131,Please mention Round Off Account in Company,કંપની રાઉન્ડ બંધ એકાઉન્ટ ઉલ્લેખ કરો
+DocType: Purchase Receipt,Range,રેંજ
+DocType: Supplier,Default Payable Accounts,મૂળભૂત ચૂકવવાપાત્ર હિસાબ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} કર્મચારીનું સક્રિય નથી અથવા અસ્તિત્વમાં નથી
+DocType: Features Setup,Item Barcode,વસ્તુ બારકોડ
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
+DocType: Quality Inspection Reading,Reading 6,6 વાંચન
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,ભરતિયું એડવાન્સ ખરીદી
+DocType: Address,Shop,દુકાન
+DocType: Hub Settings,Sync Now,હવે સમન્વય
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},રો {0}: ક્રેડિટ પ્રવેશ સાથે લિંક કરી શકતા નથી {1}
+DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,આ સ્થિતિમાં પસંદ થયેલ હોય ત્યારે ડિફૉલ્ટ બેન્ક / રોકડ એકાઉન્ટ આપોઆપ POS ભરતિયું અપડેટ કરવામાં આવશે.
+DocType: Employee,Permanent Address Is,કાયમી સરનામું
+DocType: Production Order Operation,Operation completed for how many finished goods?,ઓપરેશન કેટલા ફિનિશ્ડ ગૂડ્સ માટે પૂર્ણ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,આ બ્રાન્ડ
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0} વસ્તુ માટે ઓળંગી over- માટે ભથ્થું {1}.
+DocType: Employee,Exit Interview Details,બહાર નીકળો મુલાકાત વિગતો
+DocType: Item,Is Purchase Item,ખરીદી વસ્તુ છે
+DocType: Journal Entry Account,Purchase Invoice,ખરીદી ભરતિયું
+DocType: Stock Ledger Entry,Voucher Detail No,વાઉચર વિગતવાર કોઈ
+DocType: Stock Entry,Total Outgoing Value,કુલ આઉટગોઇંગ ભાવ
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,તારીખ અને છેલ્લી તારીખ ખોલીને એકસરખું જ રાજવૃત્તીય વર્ષ અંદર હોવો જોઈએ
+DocType: Lead,Request for Information,માહિતી માટે વિનંતી
+DocType: Payment Tool,Paid,ચૂકવેલ
+DocType: Salary Slip,Total in words,શબ્દોમાં કુલ
+DocType: Material Request Item,Lead Time Date,લીડ સમય તારીખ
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,ફરજિયાત છે. કદાચ ચલણ એક્સચેન્જ રેકોર્ડ માટે બનાવવામાં નથી
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},ROW # {0}: વસ્તુ માટે કોઈ સીરીયલ સ્પષ્ટ કરો {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","&#39;ઉત્પાદન બંડલ&#39; વસ્તુઓ, વેરહાઉસ, સીરીયલ કોઈ અને બેચ માટે કોઈ &#39;પેકિંગ યાદી&#39; ટેબલ પરથી ગણવામાં આવશે. વેરહાઉસ અને બેચ કોઈ કોઈ &#39;ઉત્પાદન બંડલ&#39; આઇટમ માટે બધા પેકિંગ વસ્તુઓ માટે જ છે, તો તે કિંમતો મુખ્ય વસ્તુ ટેબલ દાખલ કરી શકાય, મૂલ્યો મેજની યાદી પેકિંગ &#39;નકલ થશે."
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ગ્રાહકો માટે આવેલા શિપમેન્ટની.
+DocType: Purchase Invoice Item,Purchase Order Item,ઓર્ડર વસ્તુ ખરીદી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,પરોક્ષ આવક
+DocType: Payment Tool,Set Payment Amount = Outstanding Amount,સેટ ચુકવણી જથ્થો = બાકી રકમ
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,ફેરફાર
+,Company Name,કંપની નું નામ
+DocType: SMS Center,Total Message(s),કુલ સંદેશ (ઓ)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,ચેક જમા કરવામાં આવી હતી જ્યાં બેન્ક ઓફ પસંદ એકાઉન્ટ વડા.
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,વપરાશકર્તા વ્યવહારો ભાવ યાદી દર ફેરફાર કરવા માટે પરવાનગી આપે છે
+DocType: Pricing Rule,Max Qty,મેક્સ Qty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,કેમિકલ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,બધી વસ્તુઓ પહેલેથી જ આ ઉત્પાદન ઓર્ડર માટે તબદીલ કરવામાં આવી છે.
+DocType: Process Payroll,Select Payroll Year and Month,પગારપત્રક વર્ષ અને મહિનામાં પસંદ કરો
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",યોગ્ય ગ્રુપ (સામાન્ય ભંડોળનો ઉપયોગ&gt; વર્તમાન અસ્કયામતો&gt; બેન્ક એકાઉન્ટ્સ પર જાઓ અને પ્રકાર) બાળ ઉમેરો પર ક્લિક કરીને (એક નવું એકાઉન્ટ બનાવો &quot;બેન્ક&quot;
+DocType: Workstation,Electricity Cost,વીજળી ખર્ચ
+DocType: HR Settings,Don't send Employee Birthday Reminders,કર્મચારીનું જન્મદિવસ રિમાઇન્ડર્સ મોકલશો નહીં
+DocType: Opportunity,Walk In,ચાલવા
+DocType: Item,Inspection Criteria,નિરીક્ષણ માપદંડ
+apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finanial કિંમત કેન્દ્રો ખાસ ભેટ અને.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ટ્રાન્સફર
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,તમારો પત્ર વડા અને લોગો અપલોડ કરો. (જો તમે પછીથી તેમને ફેરફાર કરી શકો છો).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,વ્હાઇટ
+DocType: SMS Center,All Lead (Open),બધા સીસું (ઓપન)
+DocType: Purchase Invoice,Get Advances Paid,એડવાન્સિસ ચૂકવેલ મેળવો
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,તમારા ચિત્ર જોડો
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,બનાવો
+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 +150,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 +35,Opening Qty,Qty ખુલવાનો
+DocType: Holiday List,Holiday List Name,રજા યાદી નામ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,સ્ટોક ઓપ્શન્સ
+DocType: Journal Entry Account,Expense Claim,ખર્ચ દાવો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},માટે Qty {0}
+DocType: Leave Application,Leave Application,રજા અરજી
+apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ફાળવણી સાધન મૂકો
+DocType: Leave Block List,Leave Block List Dates,બ્લોક યાદી તારીખો છોડો
+DocType: Company,If Monthly Budget Exceeded (for expense account),માસિક બજેટ (ખર્ચ એકાઉન્ટ માટે) વધી જાય તો
+DocType: Workstation,Net Hour Rate,નેટ કલાક દર
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ઉતારેલ માલની કિંમત ખરીદી રસીદ
+DocType: Company,Default Terms,મૂળભૂત શરતો
+DocType: Packing Slip Item,Packing Slip Item,પેકિંગ કાપલી વસ્તુ
+DocType: POS Profile,Cash/Bank Account,કેશ / બેન્ક એકાઉન્ટ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,જથ્થો અથવા કિંમત કોઈ ફેરફાર સાથે દૂર વસ્તુઓ.
+DocType: Delivery Note,Delivery To,ડ લવર
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
+DocType: Production Planning Tool,Get Sales Orders,વેચાણ ઓર્ડર મેળવો
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} નકારાત્મક ન હોઈ શકે
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,ડિસ્કાઉન્ટ
+DocType: Features Setup,Purchase Discounts,ખરીદી ડિસ્કાઉન્ટ
+DocType: Workstation,Wages,વેતન
+DocType: Time Log,Will be updated only if Time Log is 'Billable',"સમય લોગ &#39;બિલ કરવા યોગ્ય-&#39; છે, તો માત્ર અપડેટ કરવામાં આવશે"
+DocType: Project,Internal,આંતરિક
+DocType: Task,Urgent,અર્જન્ટ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},ટેબલ પંક્તિ {0} માટે માન્ય રો ને સ્પષ્ટ કરો {1}
+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,ખરીદી રસીદ વસ્તુ
+DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,સેલ્સ ઓર્ડર / ફિનિશ્ડ ગૂડ્સ વેરહાઉસ માં અનામત વેરહાઉસ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,વેચાણ રકમ
+apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,સમય લોગ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,તમે આ રેકોર્ડ માટે ખર્ચ તાજનો છે. જો &#39;પરિસ્થિતિ&#39; અને સાચવો અપડેટ કરો
+DocType: Serial No,Creation Document No,બનાવટ દસ્તાવેજ કોઈ
+DocType: Issue,Issue,મુદ્દો
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,એકાઉન્ટ કંપની સાથે મેળ ખાતું નથી
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","વસ્તુ ચલો માટે શ્રેય. દા.ત. કદ, રંગ વગેરે"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP વેરહાઉસ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},સીરીયલ કોઈ {0} સુધી જાળવણી કરાર હેઠળ છે {1}
+DocType: BOM Operation,Operation,ઓપરેશન
+DocType: Lead,Organization Name,સંસ્થા નામ
+DocType: Tax Rule,Shipping State,શીપીંગ રાજ્ય
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,વસ્તુ બટન &#39;ખરીદી રસીદો થી વસ્તુઓ વિચાર&#39; નો ઉપયોગ ઉમેરાવી જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,સેલ્સ ખર્ચ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,સ્ટાન્ડર્ડ ખરીદી
+DocType: GL Entry,Against,સામે
+DocType: Item,Default Selling Cost Center,મૂળભૂત વેચાણ ખર્ચ કેન્દ્ર
+DocType: Sales Partner,Implementation Partner,અમલીકરણ જીવનસાથી
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},વેચાણ ઓર્ડર {0} છે {1}
+DocType: Opportunity,Contact Info,સંપર્ક માહિતી
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,સ્ટોક પ્રવેશો બનાવે
+DocType: Packing Slip,Net Weight UOM,નેટ વજન UOM
+DocType: Item,Default Supplier,મૂળભૂત પુરવઠોકર્તા
+DocType: Manufacturing Settings,Over Production Allowance Percentage,ઉત્પાદન ભથ્થું ટકાવારી પર
+DocType: Shipping Rule Condition,Shipping Rule Condition,શીપીંગ નિયમ કન્ડિશન
+DocType: Features Setup,Miscelleneous,Miscelleneous
+DocType: Holiday List,Get Weekly Off Dates,અઠવાડિક બંધ તારીખો મેળવો
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,સમાપ્તિ તારીખ પ્રારંભ તારીખ કરતાં ઓછા ન હોઈ શકે
+DocType: Sales Person,Select company name first.,પ્રથમ પસંદ કંપની નામ.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,ડૉ
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,સુવાકયો સપ્લાયરો પાસેથી પ્રાપ્ત થઈ છે.
+apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},માટે {0} | {1} {2}
+DocType: Time Log Batch,updated via Time Logs,સમય લોગ મારફતે સુધારાશે
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,સરેરાશ ઉંમર
+DocType: Opportunity,Your sales person who will contact the customer in future,ભવિષ્યમાં ગ્રાહક સંપર્ક કરશે જે તમારા વેચાણ વ્યક્તિ
+apps/erpnext/erpnext/public/js/setup_wizard.js +344,List a few of your suppliers. They could be organizations or individuals.,તમારા સપ્લાયર્સ થોડા યાદી આપે છે. તેઓ સંસ્થાઓ અથવા વ્યક્તિઓ હોઈ શકે છે.
+DocType: Company,Default Currency,મૂળભૂત ચલણ
+DocType: Contact,Enter designation of this Contact,આ સંપર્ક હોદ્દો દાખલ
+DocType: Expense Claim,From Employee,કર્મચારી
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ચેતવણી: સિસ્ટમ વસ્તુ માટે રકમ કારણ overbilling તપાસ કરશે નહીં {0} માં {1} શૂન્ય છે
+DocType: Journal Entry,Make Difference Entry,તફાવત પ્રવેશ કરો
+DocType: Upload Attendance,Attendance From Date,તારીખ થી એટેન્ડન્સ
+DocType: Appraisal Template Goal,Key Performance Area,કી બોનસ વિસ્તાર
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ટ્રાન્સપોર્ટેશન
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,અને વર્ષ:
+DocType: Email Digest,Annual Expense,વાિષર્ક ખચર્
+DocType: SMS Center,Total Characters,કુલ અક્ષરો
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},વસ્તુ માટે BOM ક્ષેત્રમાં BOM પસંદ કરો {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 +32,Contribution %,યોગદાન%
+DocType: Item,website page link,વેબસાઇટ પાનું લિંક
+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 +209,Production Order {0} must be cancelled before cancelling this Sales Order,ઉત્પાદન ઓર્ડર {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',સુયોજિત &#39;પર વધારાની ડિસ્કાઉન્ટ લાગુ&#39; કરો
+,Ordered Items To Be Billed,આદેશ આપ્યો વસ્તુઓ બિલ કરવા
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,રેન્જ ઓછી હોઈ શકે છે કરતાં શ્રેણી
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,સમય લોગ પસંદ કરો અને નવી વેચાણ ભરતિયું બનાવવા માટે સબમિટ કરો.
+DocType: Global Defaults,Global Defaults,વૈશ્વિક ડિફૉલ્ટ્સ
+DocType: Salary Slip,Deductions,કપાત
+DocType: Purchase Invoice,Start date of current invoice's period,વર્તમાન ભરતિયું માતાનો સમયગાળા તારીખ શરૂ
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,આ સમય લોગ બેચ વર્ણવવામાં આવ્યા છે.
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,તક બનાવવા
+DocType: Salary Slip,Leave Without Pay,પગાર વિના છોડો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,ક્ષમતા આયોજન ભૂલ
+,Trial Balance for Party,પાર્ટી માટે ટ્રાયલ બેલેન્સ
+DocType: Lead,Consultant,સલાહકાર
+DocType: Salary Slip,Earnings,કમાણી
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,સમાપ્ત વસ્તુ {0} ઉત્પાદન પ્રકાર પ્રવેશ માટે દાખલ કરવો જ પડશે
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ખુલવાનો હિસાબી બેલેન્સ
+DocType: Sales Invoice Advance,Sales Invoice Advance,સેલ્સ ભરતિયું એડવાન્સ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,કંઈ વિનંતી કરવા
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;વાસ્તવિક પ્રારંભ તારીખ&#39; &#39;વાસ્તવિક ઓવરને તારીખ&#39; કરતાં વધારે ન હોઈ શકે
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,મેનેજમેન્ટ
+apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,સમય શીટ્સ માટે પ્રવૃત્તિઓ પ્રકાર
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},ક્યાં ડેબિટ અથવા ક્રેડિટ રકમ માટે જરૂરી છે {0}
+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.,તમે પગાર કાપલી સેવ વાર (શબ્દોમાં) નેટ પે દૃશ્યમાન થશે.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,બ્લુ
+DocType: Purchase Invoice,Is Return,વળતર છે
+DocType: Price List Country,Price List Country,ભાવ યાદી દેશ
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,વધુ ગાંઠો માત્ર &#39;ગ્રુપ&#39; પ્રકાર ગાંઠો હેઠળ બનાવી શકાય છે
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,ઇમેઇલ ને સુયોજિત કરો
+DocType: Item,UOMs,UOMs
+apps/erpnext/erpnext/stock/utils.py +171,{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 +22,POS Profile {0} already created for user: {1} and company {2},POS પ્રોફાઇલ {0} પહેલાથી જ વપરાશકર્તા માટે બનાવેલ: {1} અને કંપની {2}
+DocType: Purchase Order Item,UOM Conversion Factor,UOM રૂપાંતર ફેક્ટર
+DocType: Stock Settings,Default Item Group,મૂળભૂત વસ્તુ ગ્રુપ
+apps/erpnext/erpnext/config/buying.py +13,Supplier database.,પુરવઠોકર્તા ડેટાબેઝ.
+DocType: Account,Balance Sheet,સરવૈયા
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
+DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,તમારા વેચાણ વ્યક્તિ ગ્રાહક સંપર્ક કરવા માટે આ તારીખ પર એક રીમાઇન્ડર મળશે
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,"Further accounts can be made under Groups, but entries can be made against non-Groups","વધુ એકાઉન્ટ્સ જૂથો હેઠળ કરી શકાય છે, પરંતુ પ્રવેશો બિન-જૂથો સામે કરી શકાય છે"
+apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,કરવેરા અને અન્ય પગાર કપાતો.
+DocType: Lead,Lead,લીડ
+DocType: Email Digest,Payables,ચૂકવણીના
+DocType: Account,Warehouse,વેરહાઉસ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,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,નેટ દર
+DocType: Purchase Invoice Item,Purchase Invoice Item,ભરતિયું આઇટમ ખરીદી
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,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
+DocType: Holiday,Holiday,હોલિડે
+DocType: Leave Control Panel,Leave blank if considered for all branches,બધી જ શાખાઓ માટે વિચારણા તો ખાલી છોડી દો
+,Daily Time Log Summary,દૈનિક સમય લોગ સારાંશ
+DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled ચુકવણી વિગતો
+DocType: Global Defaults,Current Fiscal Year,ચાલુ નાણાકીય વર્ષ
+DocType: Global Defaults,Disable Rounded Total,ગોળાકાર કુલ અક્ષમ કરો
+DocType: Lead,Call,કૉલ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&#39;એન્ટ્રીઝ&#39; ખાલી ન હોઈ શકે
+apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},સાથે નકલી પંક્તિ {0} જ {1}
+,Trial Balance,ટ્રાયલ બેલેન્સ
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,કર્મચારીઓ સુયોજિત કરી રહ્યા છે
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,ગ્રીડ &quot;
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,પ્રથમ ઉપસર્ગ પસંદ કરો
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,સંશોધન
+DocType: Maintenance Visit Purpose,Work Done,કામ કર્યું
+apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,લક્ષણો ટેબલ ઓછામાં ઓછા એક લક્ષણ સ્પષ્ટ કરો
+DocType: Contact,User ID,વપરાશકર્તા ID
+apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,જુઓ ખાતાવહી
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,જુનું
+apps/erpnext/erpnext/stock/doctype/item/item.py +444,"An Item Group exists with same name, please change the item name or rename the item group","એક વસ્તુ ગ્રુપ જ નામ સાથે હાજર, આઇટમ નામ બદલવા અથવા વસ્તુ જૂથ નામ બદલી કૃપા કરીને"
+DocType: Production Order,Manufacture against Sales Order,વેચાણ ઓર્ડર સામે ઉત્પાદન
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,ડિવિડન્ડ ચૂકવેલ
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,હિસાબી ખાતાવહી
+DocType: Stock Reconciliation,Difference Amount,તફાવત રકમ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,રાખેલી કમાણી
+DocType: BOM Item,Item Description,વસ્તુ વર્ણન
+DocType: Payment Tool,Payment Mode,ચુકવણી સ્થિતિ
+DocType: Purchase Invoice,Is Recurring,રીકરીંગ છે
+DocType: Purchase Order,Supplied Items,પૂરી પાડવામાં વસ્તુઓ
+DocType: Production Order,Qty To Manufacture,ઉત્પાદન Qty
+DocType: Buying Settings,Maintain same rate throughout purchase cycle,ખરીદી ચક્ર દરમ્યાન જ દર જાળવી
+DocType: Opportunity Item,Opportunity Item,તક વસ્તુ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,કામચલાઉ ખુલી
+,Employee Leave Balance,કર્મચારી રજા બેલેન્સ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},એકાઉન્ટ માટે બેલેન્સ {0} હંમેશા હોવી જ જોઈએ {1}
+DocType: Address,Address Type,સરનામું લખો
+DocType: Purchase Receipt,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/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,વસ્તુ {0} સેલ્સ વસ્તુ જ હોવી જોઈએ
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,માટે
+DocType: Item,Lead Time in days,દિવસોમાં લીડ સમય
+,Accounts Payable Summary,એકાઉન્ટ્સ ચૂકવવાપાત્ર સારાંશ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},સ્થિર એકાઉન્ટ સંપાદિત કરો કરવા માટે અધિકૃત ન {0}
+DocType: Journal Entry,Get Outstanding Invoices,બાકી ઇન્વૉઇસેસ મેળવો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,વેચાણ ઓર્ડર {0} માન્ય નથી
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
+,Invoiced Amount (Exculsive Tax),ભરતિયું રકમ (Exculsive ટેક્સ)
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,આઇટમ 2
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,એકાઉન્ટ વડા {0} બનાવવામાં
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,ગ્રીન
+DocType: Item,Auto re-order,ઓટો ફરી ઓર્ડર
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,કુલ પ્રાપ્ત
+DocType: Employee,Place of Issue,ઇશ્યૂ સ્થળ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,કરાર
+DocType: Email Digest,Add Quote,ભાવ ઉમેરો
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM માટે જરૂરી UOM coversion પરિબળ: {0} વસ્તુ: {1}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,પરોક્ષ ખર્ચ
+apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,રો {0}: Qty ફરજિયાત છે
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,કૃષિ
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,તમારી ઉત્પાદનો અથવા સેવાઓ
+DocType: Mode of Payment,Mode of Payment,ચૂકવણીની પદ્ધતિ
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,આ રુટ વસ્તુ જૂથ છે અને સંપાદિત કરી શકાતી નથી.
+DocType: Journal Entry Account,Purchase Order,ખરીદી ઓર્ડર
+DocType: Warehouse,Warehouse Contact Info,વેરહાઉસ સંપર્ક માહિતી
+DocType: Purchase Invoice,Recurring Type,રીકરીંગ પ્રકાર
+DocType: Address,City/Town,શહેર / નગર
+DocType: Email Digest,Annual Income,વાર્ષિક આવક
+DocType: Serial No,Serial No Details,સીરીયલ કોઈ વિગતો
+DocType: Purchase Invoice Item,Item Tax Rate,વસ્તુ ટેક્સ રેટ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","{0}, માત્ર ક્રેડિટ ખાતાઓ અન્ય ડેબિટ પ્રવેશ સામે લિંક કરી શકો છો"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,વસ્તુ {0} એ પેટા કોન્ટ્રાક્ટ વસ્તુ જ હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,કેપિટલ સાધનો
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","પ્રાઇસીંગ નિયમ પ્રથમ પર આધારિત પસંદ થયેલ વસ્તુ, આઇટમ ગ્રુપ અથવા બ્રાન્ડ બની શકે છે, જે ક્ષેત્ર &#39;પર લાગુ પડે છે."
+DocType: Hub Settings,Seller Website,વિક્રેતા વેબસાઇટ
+apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,વેચાણ ટીમ માટે કુલ ફાળવેલ ટકાવારી 100 પ્રયત્ન કરીશું
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},ઉત્પાદન ઓર્ડર સ્થિતિ છે {0}
+DocType: Appraisal Goal,Goal,ગોલ
+DocType: Sales Invoice Item,Edit Description,સંપાદિત કરો વર્ણન
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,અપેક્ષિત બોલ તારીખ આયોજિત પ્રારંભ તારીખ કરતાં ઓછા છે.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,સપ્લાયર માટે
+DocType: Account,Setting Account Type helps in selecting this Account in transactions.,એકાઉન્ટ પ્રકાર સેટિંગ વ્યવહારો આ એકાઉન્ટ પસંદ કરે છે.
+DocType: Purchase Invoice,Grand Total (Company Currency),કુલ સરવાળો (કંપની ચલણ)
+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 +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",માત્ર &quot;કિંમત&quot; 0 અથવા ખાલી કિંમત સાથે એક શીપીંગ નિયમ શરત હોઈ શકે છે
+DocType: Authorization Rule,Transaction,ટ્રાન્ઝેક્શન
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,નોંધ: આ ખર્ચ કેન્દ્ર એક જૂથ છે. જૂથો સામે હિસાબી પ્રવેશો બનાવી શકાતી નથી.
+DocType: Item,Website Item Groups,વેબસાઇટ વસ્તુ જૂથો
+DocType: Purchase Invoice,Total (Company Currency),કુલ (કંપની ચલણ)
+apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,{0} સીરીયલ નંબર એક કરતા વધુ વખત દાખલ
+DocType: Journal Entry,Journal Entry,જર્નલ પ્રવેશ
+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 +430,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,આ ઉપસર્ગ સાથે છેલ્લા બનાવવામાં વ્યવહાર સંખ્યા છે
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},વસ્તુ માટે જરૂરી મૂલ્યાંકન દર {0}
+DocType: Quality Inspection Reading,Reading 8,8 વાંચન
+DocType: Sales Partner,Agent,એજન્ટ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","કુલ {0} બધી વસ્તુઓ માટે તમે &#39;પર આધારિત સમાયોજિત વિતરિત&#39; બદલવા જોઈએ શકે છે, શૂન્ય છે"
+DocType: Purchase Invoice,Taxes and Charges Calculation,કર અને ખર્ચ ગણતરી
+DocType: BOM Operation,Workstation,વર્કસ્ટેશન
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,હાર્ડવેર
+DocType: Attendance,HR Manager,એચઆર મેનેજર
+apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,કંપની પસંદ કરો
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,પ્રિવિલેજ છોડો
+DocType: Purchase Invoice,Supplier Invoice Date,પુરવઠોકર્તા ભરતિયું તારીખ
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,તમે શોપિંગ કાર્ટ સક્રિય કરવાની જરૂર છે
+DocType: Appraisal Template Goal,Appraisal Template Goal,મૂલ્યાંકન ઢાંચો ગોલ
+DocType: Salary Slip,Earning,અર્નિંગ
+DocType: Payment Tool,Party Account Currency,પક્ષ એકાઉન્ટ કરન્સી
+,BOM Browser,BOM બ્રાઉઝર
+DocType: Purchase Taxes and Charges,Add or Deduct,ઉમેરો અથવા કપાત
+DocType: Company,If Yearly Budget Exceeded (for expense account),વાર્ષિક બજેટ (ખર્ચ એકાઉન્ટ માટે) વધી જાય તો
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,વચ્ચે ઑવરલેપ શરતો:
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,જર્નલ સામે એન્ટ્રી {0} પહેલેથી જ કેટલાક અન્ય વાઉચર સામે ગોઠવ્યો છે
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,કુલ ઓર્ડર ભાવ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,ફૂડ
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,એઇજીંગનો રેન્જ 3
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,તમે માત્ર એક રજૂ ઉત્પાદન આદેશ સામે સમય લોગ કરી શકો છો
+DocType: Maintenance Schedule Item,No of Visits,મુલાકાત કોઈ
+apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",સંપર્કો ન્યૂઝલેટર્સ દોરી જાય છે.
+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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,ઓપરેશન્સ ખાલી છોડી શકાશે નહીં.
+,Delivered Items To Be Billed,વિતરિત વસ્તુઓ બિલ કરવા
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,વેરહાઉસ સીરીયલ નંબર માટે બદલી શકાતું નથી
+DocType: Authorization Rule,Average Discount,સરેરાશ ડિસ્કાઉન્ટ
+DocType: Address,Utilities,ઉપયોગીતાઓ
+DocType: Purchase Invoice Item,Accounting,હિસાબી
+DocType: Features Setup,Features Setup,લક્ષણો સેટઅપ
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,જુઓ ઓફર લેટર
+DocType: Item,Is Service Item,સેવા વસ્તુ છે
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,એપ્લિકેશન સમયગાળાની બહાર રજા ફાળવણી સમય ન હોઈ શકે
+DocType: Activity Cost,Projects,પ્રોજેક્ટ્સ
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,ફિસ્કલ વર્ષ પસંદ કરો
+apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},પ્રતિ {0} | {1} {2}
+DocType: BOM Operation,Operation Description,ઓપરેશન વર્ણન
+DocType: Item,Will also apply to variants,પણ ચલો પર લાગુ થશે
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,નાણાકીય વર્ષ સેવ થઈ જાય ફિસ્કલ વર્ષ શરૂઆત તારીખ અને ફિસ્કલ વર્ષ અંતે તારીખ બદલી શકતા નથી.
+DocType: Quotation,Shopping Cart,શોપિંગ કાર્ટ
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,સરેરાશ દૈનિક આઉટગોઇંગ
+DocType: Pricing Rule,Campaign,ઝુંબેશ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',મંજૂરી પરિસ્થિતિ &#39;માન્ય&#39; અથવા &#39;નકારેલું&#39; હોવું જ જોઈએ
+DocType: Purchase Invoice,Contact Person,સંપર્ક વ્યક્તિ
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',&#39;અપેક્ષા પ્રારંભ તારીખ&#39; કરતાં વધારે &#39;અપેક્ષિત ઓવરને તારીખ&#39; ન હોઈ શકે
+DocType: Holiday List,Holidays,રજાઓ
+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 ,પહેલેથી જ ઉત્પાદન ઓર્ડર માટે બનાવવામાં સ્ટોક પ્રવેશો
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,સ્થિર એસેટ કુલ ફેરફાર
+DocType: Leave Control Panel,Leave blank if considered for all designations,બધા ડેઝીગ્નેશન્સ માટે વિચારણા તો ખાલી છોડી દો
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,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 +182,Max: {0},મહત્તમ: {0}
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,તારીખ સમય પ્રતિ
+DocType: Email Digest,For Company,કંપની માટે
+apps/erpnext/erpnext/config/support.py +38,Communication log.,કોમ્યુનિકેશન લોગ.
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,ખરીદી રકમ
+DocType: Sales Invoice,Shipping Address Name,શિપિંગ સરનામું નામ
+apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,એકાઉન્ટ્સ ઓફ ચાર્ટ
+DocType: Material Request,Terms and Conditions Content,નિયમો અને શરતો સામગ્રી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
+DocType: Maintenance Visit,Unscheduled,અનિશ્ચિત
+DocType: Employee,Owned,માલિકીની
+DocType: Salary Slip Deduction,Depends on Leave Without Pay,પગાર વિના રજા પર આધાર રાખે છે
+DocType: Pricing Rule,"Higher the number, higher the priority","ઉચ્ચ સંખ્યા, ઉચ્ચ અગ્રતા"
+,Purchase Invoice Trends,ભરતિયું પ્રવાહો ખરીદી
+DocType: Employee,Better Prospects,સારી સંભાવના
+DocType: Appraisal,Goals,લક્ષ્યાંક
+DocType: Warranty Claim,Warranty / AMC Status,વોરંટી / એએમસી સ્થિતિ
+,Accounts Browser,એકાઉન્ટ્સ બ્રાઉઝર
+DocType: GL Entry,GL Entry,ઓપનજીએલ એન્ટ્રી
+DocType: HR Settings,Employee Settings,કર્મચારીનું સેટિંગ્સ
+,Batch-Wise Balance History,બેચ વાઈસ બેલેન્સ ઇતિહાસ
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,યાદી કરવા માટે
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,એપ્રેન્ટિસ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,નકારાત્મક જથ્થો મંજૂરી નથી
+DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
+Used for Taxes and Charges",સ્ટ્રિંગ તરીકે વસ્તુ માસ્ટર પાસેથી મેળવ્યાં અને આ ક્ષેત્રમાં સંગ્રહિત કર વિગતવાર કોષ્ટક. કર અને ખર્ચ માટે વપરાય છે
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} માત્ર ચલણ કરી શકાય છે: {0} માટે એકાઉન્ટિંગ એન્ટ્રી {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,No active Salary Structure found for employee {0} and the month,કર્મચારી {0} અને મહિનાના માટે કોઈ સક્રિય પગાર માળખું
+DocType: Job Opening,"Job profile, qualifications required etc.","જોબ પ્રોફાઇલ, યોગ્યતાઓ જરૂરી વગેરે"
+DocType: Journal Entry Account,Account Balance,એકાઉન્ટ બેલેન્સ
+apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,વ્યવહારો માટે કરવેરા નિયમ.
+DocType: Rename Tool,Type of document to rename.,દસ્તાવેજ પ્રકાર નામ.
+apps/erpnext/erpnext/public/js/setup_wizard.js +384,We buy this Item,અમે આ આઇટમ ખરીદી
+DocType: Address,Billing,બિલિંગ
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),કુલ કર અને ખર્ચ (કંપની ચલણ)
+DocType: Shipping Rule,Shipping Account,શીપીંગ એકાઉન્ટ
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} પ્રાપ્તકર્તાઓને મોકલવા માટે અનુસૂચિત
+DocType: Quality Inspection,Readings,વાંચનો
+DocType: Stock Entry,Total Additional Costs,કુલ વધારાના ખર્ચ
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,પેટા એસેમ્બલીઝ
+DocType: Shipping Rule Condition,To Value,કિંમત
+DocType: Supplier,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 +581,Packing Slip,પેકિંગ કાપલી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ઓફિસ ભાડે
+apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,સેટઅપ એસએમએસ ગેટવે સેટિંગ્સ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,આયાત નિષ્ફળ!
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,કોઈ સરનામું હજુ સુધી ઉમેર્યું.
+DocType: Workstation Working Hour,Workstation Working Hour,વર્કસ્ટેશન કામ કલાક
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,એનાલિસ્ટ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},રો {0}: સોંપાયેલ રકમ {1} કરતાં ઓછી હોઈ શકે છે અથવા સંયુક્ત સાહસ રકમ બરાબર જ જોઈએ {2}
+DocType: Item,Inventory,ઈન્વેન્ટરી
+DocType: Features Setup,"To enable ""Point of Sale"" view",જુઓ &quot;વેચાણ પોઇન્ટ&quot; સક્રિય કરવા માટે
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,ચુકવણી ખાલી કાર્ટ માટે કરી શકાતું નથી
+DocType: Item,Sales Details,સેલ્સ વિગતો
+DocType: Opportunity,With Items,વસ્તુઓ સાથે
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty માં
+DocType: Notification Control,Expense Claim Rejected,ખર્ચ દાવો નકારી
+DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
+",આગળ ભરતિયું પેદા થશે કે જેના પર તારીખ. તેને સબમિટ પર પેદા થયેલ છે.
+DocType: Item Attribute,Item Attribute,વસ્તુ એટ્રીબ્યુટ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,સરકાર
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,વસ્તુ ચલો
+DocType: Company,Services,સેવાઓ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),કુલ ({0})
+DocType: Cost Center,Parent Cost Center,પિતૃ ખર્ચ કેન્દ્રને
+DocType: Sales Invoice,Source,સોર્સ
+DocType: Leave Type,Is Leave Without Pay,પગાર વિના છોડી દો
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,આ ચુકવણી ટેબલ માં શોધી કોઈ રેકોર્ડ
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,નાણાકીય વર્ષ શરૂ તારીખ
+DocType: Employee External Work History,Total Experience,કુલ અનુભવ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,રદ પેકિંગ કાપલી (ઓ)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,રોકાણ કેશ ફ્લો
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,નૂર અને ફોરવર્ડિંગ સમાયોજિત
+DocType: Material Request Item,Sales Order No,વેચાણ ઓર્ડર કોઈ
+DocType: Item Group,Item Group Name,વસ્તુ ગ્રુપ નામ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,લેવામાં
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,ઉત્પાદન માટે ટ્રાન્સફર સામગ્રી
+DocType: Pricing Rule,For Price List,ભાવ યાદી માટે
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,એક્ઝિક્યુટિવ સર્ચ
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","આઇટમ માટે ખરીદી દર: {0} મળી નથી, એકાઉન્ટિંગ પ્રવેશ (ખર્ચ) પુસ્તક માટે જરૂરી છે. ખરીદ કિંમત યાદી સામે વસ્તુ ભાવ ઉલ્લેખ કરો."
+DocType: Maintenance Schedule,Schedules,ફ્લાઈટ શેડ્યુલ
+DocType: Purchase Invoice Item,Net Amount,ચોખ્ખી રકમ
+DocType: Purchase Order Item Supplied,BOM Detail No,BOM વિગતવાર કોઈ
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),વધારાના ડિસ્કાઉન્ટ રકમ (કંપની ચલણ)
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},ભૂલ: {0}&gt; {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,એકાઉન્ટ્સ ચાર્ટ પરથી નવું એકાઉન્ટ ખોલાવવું કરો.
+DocType: Maintenance Visit,Maintenance Visit,જાળવણી મુલાકાત લો
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,વેરહાઉસ ખાતે ઉપલબ્ધ બેચ Qty
+DocType: Time Log Batch Detail,Time Log Batch Detail,સમય લોગ બેચ વિગતવાર
+DocType: Landed Cost Voucher,Landed Cost Help,ઉતારેલ માલની કિંમત મદદ
+DocType: Leave Block List,Block Holidays on important days.,મહત્વપૂર્ણ દિવસ પર બ્લોક રજાઓ.
+,Accounts Receivable Summary,એકાઉન્ટ્સ પ્રાપ્ત સારાંશ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,કર્મચારીનું ભૂમિકા સુયોજિત કરવા માટે એક કર્મચારી રેકોર્ડ વપરાશકર્તા ID ક્ષેત્ર સુયોજિત કરો
+DocType: UOM,UOM Name,UOM નામ
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,ફાળાની રકમ
+DocType: Sales Invoice,Shipping Address,પહોંચાડવાનું સરનામું
+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.,આ સાધન તમે અપડેટ અથવા સિસ્ટમ સ્ટોક જથ્થો અને મૂલ્યાંકન સુધારવા માટે મદદ કરે છે. તે સામાન્ય રીતે સિસ્ટમ મૂલ્યો અને શું ખરેખર તમારા વખારો માં અસ્તિત્વમાં સુમેળ કરવા માટે વપરાય છે.
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,તમે બોલ પર કોઈ નોંધ સેવ વાર શબ્દો દૃશ્યમાન થશે.
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,બ્રાન્ડ માસ્ટર.
+DocType: Sales Invoice Item,Brand Name,બ્રાન્ડ નામ
+DocType: Purchase Receipt,Transporter Details,ટ્રાન્સપોર્ટર વિગતો
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,Box,બોક્સ
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,સંસ્થા
+DocType: Monthly Distribution,Monthly Distribution,માસિક વિતરણ
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,રીસીવર સૂચિ ખાલી છે. રીસીવર યાદી બનાવવા કરો
+DocType: Production Plan Sales Order,Production Plan Sales Order,ઉત્પાદન યોજના વેચાણ ઓર્ડર
+DocType: Sales Partner,Sales Partner Target,વેચાણ ભાગીદાર લક્ષ્યાંક
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} માટે એકાઉન્ટિંગ એન્ટ્રી માત્ર ચલણ કરી શકાય છે: {1}
+DocType: Pricing Rule,Pricing Rule,પ્રાઇસીંગ નિયમ
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ઓર્ડર ખરીદી સામગ્રી વિનંતી
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},ROW # {0}: પરત વસ્તુ {1} નથી અસ્તિત્વમાં નથી {2} {3}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,બેન્ક એકાઉન્ટ્સ
+,Bank Reconciliation Statement,બેન્ક રિકંસીલેશન નિવેદન
+DocType: Address,Lead Name,લીડ નામ
+,POS,POS
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,ખુલવાનો સ્ટોક બેલેન્સ
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} માત્ર એક જ વાર દેખાય જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},માટે સફળતાપૂર્વક સોંપાયેલ પાંદડાઓ {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,કોઈ વસ્તુઓ પૅક કરવા માટે
+DocType: Shipping Rule Condition,From Value,ભાવ પ્રતિ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,ઉત્પાદન જથ્થો ફરજિયાત છે
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,બેંક માં અસરમાં આવતો નથી માત્રામાં
+DocType: Quality Inspection Reading,Reading 4,4 વાંચન
+apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,કંપની ખર્ચ માટે દાવા.
+DocType: Company,Default Holiday List,રજા યાદી મૂળભૂત
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,સ્ટોક જવાબદારીઓ
+DocType: Purchase Receipt,Supplier Warehouse,પુરવઠોકર્તા વેરહાઉસ
+DocType: Opportunity,Contact Mobile No,સંપર્ક મોબાઈલ નં
+DocType: Production Planning Tool,Select Sales Orders,વેચાણ ઓર્ડર પસંદ કરો
+,Material Requests for which Supplier Quotations are not created,"પુરવઠોકર્તા સુવાકયો બનાવવામાં આવે છે, જેના માટે સામગ્રી અરજીઓ"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,તમે રજા માટે અરજી છે કે જેના પર દિવસ (ઓ) રજાઓ છે. તમે રજા માટે અરજી જરૂર નથી.
+DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,બારકોડ મદદથી વસ્તુઓ ટ્રેક કરવા માટે. તમે વસ્તુ ના બારકોડ સ્કેન દ્વારા બોલ પર કોઈ નોંધ અને વેચાણ ભરતિયું વસ્તુઓ દાખલ કરવા માટે સમર્થ હશે.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,માર્ક વિતરિત તરીકે
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,અવતરણ બનાવો
+DocType: Dependent Task,Dependent Task,આશ્રિત ટાસ્ક
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,સ્ટોપ જન્મદિવસ રિમાઇન્ડર્સ
+DocType: SMS Center,Receiver List,રીસીવર યાદી
+DocType: Payment Tool Detail,Payment Amount,ચુકવણી રકમ
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,કમ્પોનન્ટ રકમ
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} જુઓ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,કેશ કુલ ફેરફાર
+DocType: Salary Structure Deduction,Salary Structure Deduction,પગાર માળખું કપાત
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,મેઝર {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 +185,Quantity must not be more than {0},જથ્થો કરતાં વધુ ન હોવું જોઈએ {0}
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),ઉંમર (દિવસ)
+DocType: Quotation Item,Quotation Item,અવતરણ વસ્તુ
+DocType: Account,Account Name,ખાતાનું નામ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,તારીખ તારીખ કરતાં વધારે ન હોઈ શકે થી
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,સીરીયલ કોઈ {0} જથ્થો {1} એક અપૂર્ણાંક ન હોઈ શકે
+apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,પુરવઠોકર્તા પ્રકાર માસ્ટર.
+DocType: Purchase Order Item,Supplier Part Number,પુરવઠોકર્તા ભાગ સંખ્યા
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,રૂપાંતરણ દર 0 અથવા 1 હોઇ શકે છે નથી કરી શકો છો
+apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +203,Purchase Receipt {0} is not submitted,ખરીદી રસીદ {0} અપર્ણ ન કરાય
+DocType: Company,Default Payable Account,મૂળભૂત ચૂકવવાપાત્ર એકાઉન્ટ
+apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","આવા શીપીંગ નિયમો, ભાવ યાદી વગેરે શોપિંગ કાર્ટ માટે સુયોજનો"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% ગણાવી
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,સુરક્ષિત Qty
+DocType: Party Account,Party Account,પક્ષ એકાઉન્ટ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,માનવ સંસાધન
+DocType: Lead,Upper Income,ઉચ્ચ આવક
+DocType: Journal Entry Account,Debit in Company Currency,કંપની કરન્સી ડેબિટ
+apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,મારા મુદ્દાઓ
+DocType: BOM Item,BOM Item,BOM વસ્તુ
+DocType: Appraisal,For Employee,કર્મચારી માટે
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,રો {0}: પુરવઠોકર્તા સામે એડવાન્સ ડેબિટ હોવું જ જોઈએ
+DocType: Company,Default Values,મૂળભૂત મૂલ્યો
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,રો {0}: ચુકવણી રકમ નકારાત્મક ન હોઈ શકે
+DocType: Expense Claim,Total Amount Reimbursed,કુલ રકમ reimbursed
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},પુરવઠોકર્તા સામે ભરતિયું {0} ના રોજ {1}
+DocType: Customer,Default Price List,ડિફૉલ્ટ ભાવ યાદી
+DocType: Payment Reconciliation,Payments,ચુકવણીઓ
+DocType: Budget Detail,Budget Allocated,બજેટ ફાળવવામાં
+DocType: Journal Entry,Entry Type,એન્ટ્રી પ્રકાર
+,Customer Credit Balance,ગ્રાહક ક્રેડિટ બેલેન્સ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,ચૂકવવાપાત્ર હિસાબ નેટ બદલો
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,તમારા ઇમેઇલ ને ચકાસો
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',&#39;Customerwise ડિસ્કાઉન્ટ&#39; માટે જરૂરી ગ્રાહક
+apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,જર્નલો સાથે બેંક ચુકવણી તારીખો અપડેટ કરો.
+DocType: Quotation,Term Details,શબ્દ વિગતો
+DocType: Manufacturing Settings,Capacity Planning For (Days),(દિવસ) માટે ક્ષમતા આયોજન
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,વસ્તુઓ કંઈ જથ્થો અથવા કિંમત કોઈ ફેરફાર હોય છે.
+DocType: Warranty Claim,Warranty Claim,વોરંટી દાવાની
+,Lead Details,લીડ વિગતો
+DocType: Purchase Invoice,End date of current invoice's period,વર્તમાન ભરતિયું માતાનો સમયગાળા ઓવરને અંતે તારીખ
+DocType: Pricing Rule,Applicable For,માટે લાગુ પડે છે
+DocType: Bank Reconciliation,From Date,તારીખ થી
+DocType: Shipping Rule Country,Shipping Rule Country,શીપીંગ નિયમ દેશ
+DocType: Maintenance Visit,Partially Completed,આંશિક રીતે પૂર્ણ
+DocType: Leave Type,Include holidays within leaves as leaves,પાંદડા તરીકે નહીં અંદર રજાઓ સમાવેશ થાય છે
+DocType: Sales Invoice,Packed Items,પેક વસ્તુઓ
+apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,સીરીયલ નંબર સામે વોરંટી દાવાની
+DocType: BOM Replace 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",તે વપરાય છે જ્યાં અન્ય તમામ BOMs ચોક્કસ BOM બદલો. તે જૂના BOM લિંક બદલો કિંમત સુધારા અને નવી BOM મુજબ &quot;BOM વિસ્ફોટ વસ્તુ&quot; ટેબલ પુનર્જીવિત કરશે
+DocType: Shopping Cart Settings,Enable Shopping Cart,શોપિંગ કાર્ટ સક્ષમ
+DocType: Employee,Permanent Address,કાયમી સરનામું
+apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,વસ્તુ {0} એ સેવા આઇટમ હોવા જ જોઈએ.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
+						than Grand Total {2}",કુલ સરવાળો કરતાં \ {0} {1} વધારે ન હોઈ શકે સામે ચૂકવણી એડવાન્સ {2}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,આઇટમ કોડ પસંદ કરો
+DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),પગાર વિના રજા માટે કપાત ઘટાડો (LWP)
+DocType: Territory,Territory Manager,પ્રદેશ વ્યવસ્થાપક
+DocType: Delivery Note Item,To Warehouse (Optional),વેરહાઉસ (વૈકલ્પિક)
+DocType: Sales Invoice,Paid Amount (Company Currency),ચૂકવેલ રકમ (કંપની ચલણ)
+DocType: Purchase Invoice,Additional Discount,વધારાના ડિસ્કાઉન્ટ
+DocType: Selling Settings,Selling Settings,સેટિંગ્સ વેચાણ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ઓનલાઇન હરાજી
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,થો અથવા મૂલ્યાંકન દર અથવા બંને ક્યાં સ્પષ્ટ કરો
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","કંપની, મહિનો અને ફિસ્કલ વર્ષ ફરજિયાત છે"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,માર્કેટિંગ ખર્ચ
+,Item Shortage Report,વસ્તુ અછત રિપોર્ટ
+apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,આઇટમ એક એકમ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',સમય લોગ બેચ {0} &#39;સબમિટ&#39; હોવું જ જોઈએ
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,દરેક સ્ટોક ચળવળ માટે એકાઉન્ટિંગ પ્રવેશ કરો
+DocType: Leave Allocation,Total Leaves Allocated,કુલ પાંદડા સોંપાયેલ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},રો કોઈ જરૂરી વેરહાઉસ {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,માન્ય નાણાકીય વર્ષ શરૂઆત અને અંતિમ તારીખ દાખલ કરો
+DocType: Employee,Date Of Retirement,નિવૃત્તિ તારીખ
+DocType: Upload Attendance,Get Template,નમૂના મેળવવા
+DocType: Address,Postal,ટપાલ
+DocType: Item,Weightage,ભારાંકન
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,એક ગ્રાહક જૂથ જ નામ સાથે હાજર ગ્રાહક નામ બદલી અથવા ગ્રાહક જૂથ નામ બદલી કૃપા કરીને
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,{0} પ્રથમ પસંદ કરો.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},લખાણ {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,ન્યૂ સંપર્ક
+DocType: Territory,Parent Territory,પિતૃ પ્રદેશ
+DocType: Quality Inspection Reading,Reading 2,2 વાંચન
+DocType: Stock Entry,Material Receipt,સામગ્રી રસીદ
+apps/erpnext/erpnext/public/js/setup_wizard.js +376,Products,પ્રોડક્ટ્સ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},પાર્ટી પ્રકાર અને પાર્ટી પ્રાપ્ત / ચૂકવવાપાત્ર એકાઉન્ટ માટે જરૂરી છે {0}
+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 +213,Quantity required for Item {0} in row {1},પંક્તિ માં વસ્તુ {0} માટે જરૂરી જથ્થો {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},જથ્થો વસ્તુ માટે અસ્તિત્વમાં તરીકે વેરહાઉસ {0} કાઢી શકાતી નથી {1}
+DocType: Quotation,Order Type,ઓર્ડર પ્રકાર
+DocType: Purchase Invoice,Notification Email Address,સૂચના ઇમેઇલ સરનામું
+DocType: Payment Tool,Find Invoices to Match,મેચ ઇનવૉઇસેસ શોધો
+,Item-wise Sales Register,વસ્તુ મુજબના સેલ્સ રજિસ્ટર
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",દા.ત. &quot;XYZ નેશનલ બેન્ક&quot;
+DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,મૂળભૂત દર માં સમાવેલ આ કર છે?
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,કુલ લક્ષ્યાંકના
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,શોપિંગ કાર્ટ સક્રિય થયેલ છે
+DocType: Job Applicant,Applicant for a Job,નોકરી માટે અરજી
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,બનાવવામાં કોઈ ઉત્પાદન ઓર્ડર્સ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +153,Salary Slip of employee {0} already created for this month,કર્મચારી પગાર કાપલી {0} પહેલાથી જ આ મહિના માટે બનાવવામાં
+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: Sales 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 +139,Main,મુખ્ય
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,વેરિએન્ટ
+DocType: Naming Series,Set prefix for numbering series on your transactions,તમારા વ્યવહારો પર શ્રેણી નંબર માટે સેટ ઉપસર્ગ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,બંધ ઓર્ડર રદ કરી શકાતી નથી. રદ કરવા Unstop.
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,ખરીદી ઓર્ડર બનાવો
+DocType: SMS Center,Send To,ને મોકલવું
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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,સ્ટોક રિકંસીલેશન
+DocType: Territory,Territory Name,પ્રદેશ નામ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,વર્ક ઈન પ્રોગ્રેસ વેરહાઉસ સબમિટ પહેલાં જરૂરી છે
+apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,નોકરી માટે અરજી.
+DocType: Purchase Order Item,Warehouse and Reference,વેરહાઉસ અને સંદર્ભ
+DocType: Supplier,Statutory info and other general information about your Supplier,તમારા સપ્લાયર વિશે વૈધાિનક માહિતી અને અન્ય સામાન્ય માહિતી
+apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,સરનામાંઓ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,જર્નલ સામે એન્ટ્રી {0} કોઈપણ મેળ ન ખાતી {1} પ્રવેશ નથી
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},સીરીયલ કોઈ વસ્તુ માટે દાખલ ડુપ્લિકેટ {0}
+DocType: Shipping Rule Condition,A condition for a Shipping Rule,એક શિપિંગ નિયમ માટે એક શરત
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,વસ્તુ ઉત્પાદન ઓર્ડર હોય મંજૂરી નથી.
+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/config/manufacturing.py +24,Time Logs for manufacturing.,ઉત્પાદન માટે સમય લોગ.
+DocType: Item,Apply Warehouse-wise Reorder Level,વેરહાઉસ મુજબના પુનઃક્રમાંકિત કરો સ્તર લાગુ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} સબમિટ હોવું જ જોઈએ
+DocType: Authorization Control,Authorization Control,અધિકૃતિ નિયંત્રણ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ROW # {0}: વેરહાઉસ નકારેલું ફગાવી વસ્તુ સામે ફરજિયાત છે {1}
+apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,કાર્યો માટે સમય લોગ.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,ચુકવણી
+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},મહત્તમ {0} ના સામગ્રી વિનંતી {1} વેચાણ ઓર્ડર સામે વસ્તુ માટે કરી શકાય છે {2}
+DocType: Employee,Salutation,નમસ્કાર
+DocType: Pricing Rule,Brand,બ્રાન્ડ
+DocType: Item,Will also apply for variants,પણ ચલો માટે લાગુ પડશે
+apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,વેચાણ સમયે બંડલ વસ્તુઓ.
+DocType: Sales Order Item,Actual Qty,વાસ્તવિક Qty
+DocType: Sales Invoice Item,References,સંદર્ભો
+DocType: Quality Inspection Reading,Reading 10,10 વાંચન
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","તમે ખરીદી અથવા વેચાણ કે તમારા ઉત્પાદનો અથવા સેવાઓ યાદી. તમે શરૂ કરો છો ત્યારે માપ અને અન્ય ગુણધર્મો આઇટમ ગ્રુપ, એકમ ચકાસવા માટે ખાતરી કરો."
+DocType: Hub Settings,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/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,ભાવ {0} લક્ષણ માટે {1} માન્ય વસ્તુ યાદી અસ્તિત્વમાં નથી એટ્રીબ્યુટ વેલ્યુઝ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,એસોસિયેટ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,{0} વસ્તુ એક શ્રેણીબદ્ધ વસ્તુ નથી
+DocType: SMS Center,Create Receiver List,રીસીવર યાદી બનાવો
+DocType: Packing Slip,To Package No.,નં પેકેજ
+DocType: Warranty Claim,Issue Date,મુદ્દા તારીખ
+DocType: Activity Cost,Activity Cost,પ્રવૃત્તિ કિંમત
+DocType: Purchase Receipt Item Supplied,Consumed Qty,કમ્પોનન્ટ 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),પેકેજ આ બોલ (ફક્ત ડ્રાફ્ટ) ના એક ભાગ છે કે જે સૂચવે
+DocType: Payment Tool,Make Payment Entry,ચુકવણી પ્રવેશ કરો
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,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/accounts/doctype/purchase_invoice/purchase_invoice.js +90,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,ડ લવર વેરહાઉસ
+DocType: Stock Settings,Allowance Percent,ભથ્થું ટકા
+DocType: SMS Settings,Message Parameter,સંદેશ પરિમાણ
+DocType: Serial No,Delivery Document No,ડ લવર દસ્તાવેજ કોઈ
+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 +37,"Selling must be checked, if Applicable For is selected as {0}","માટે લાગુ તરીકે પસંદ કરેલ છે તે વેચાણ, ચકાસાયેલ જ હોવું જોઈએ {0}"
+DocType: Purchase Order Item,Supplier Quotation Item,પુરવઠોકર્તા અવતરણ વસ્તુ
+DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,ઉત્પાદન ઓર્ડર સામે સમય લોગ બનાવટને નિષ્ક્રિય કરે. ઓપરેશન્સ ઉત્પાદન ઓર્ડર સામે ટ્રેક કરી નહિ
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,પગાર માળખું બનાવવા
+DocType: Item,Has Variants,ચલો છે
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,એક નવી વેચાણ ભરતિયું બનાવવા માટે &#39;વેચાણ ભરતિયું બનાવો&#39; બટન પર ક્લિક કરો.
+DocType: Monthly Distribution,Name of the Monthly Distribution,માસિક વિતરણ નામ
+DocType: Sales Person,Parent Sales Person,પિતૃ વેચાણ વ્યક્તિ
+apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,કંપની માસ્ટર અને વૈશ્વિક મૂળભૂતો મૂળભૂત ચલણ સ્પષ્ટ કરો
+DocType: Purchase Invoice,Recurring Invoice,રીકરીંગ ભરતિયું
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,પ્રોજેક્ટ વ્યવસ્થા
+DocType: Supplier,Supplier of Goods or Services.,સામાન કે સેવાઓ સપ્લાયર.
+DocType: Budget Detail,Fiscal Year,નાણાકીય વર્ષ
+DocType: Cost Center,Budget,બજેટ
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"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 +65,Territory / Customer,પ્રદેશ / ગ્રાહક
+apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,દા.ત. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,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: 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} વસ્તુ સીરીયલ અમે માટે સુયોજિત નથી. વસ્તુ માસ્ટર તપાસો
+DocType: Maintenance Visit,Maintenance Time,જાળવણી સમય
+,Amount to Deliver,જથ્થો પહોંચાડવા માટે
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,A Product or Service,ઉત્પાદન અથવા સેવા
+DocType: Naming Series,Current Value,વર્તમાન કિંમત
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} બનાવવામાં
+DocType: Delivery Note Item,Against Sales Order,સેલ્સ આદેશ સામે
+,Serial No Status,સીરીયલ કોઈ સ્થિતિ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,વસ્તુ ટેબલ ખાલી ન હોઈ શકે
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+						must be greater than or equal to {2}","રો {0}: સુયોજિત કરવા માટે {1} સમયગાળાના, અને તારીખ \ વચ્ચે તફાવત કરતાં વધારે અથવા સમાન હોવો જોઈએ {2}"
+DocType: Pricing Rule,Selling,વેચાણ
+DocType: Employee,Salary Information,પગાર માહિતી
+DocType: Sales Person,Name and Employee ID,નામ અને કર્મચારી ID
+apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,કર અને વેરામાંથી
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,પૂરી પાડવામાં Qty
+DocType: Material Request Item,Material Request Item,સામગ્રી વિનંતી વસ્તુ
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,વસ્તુ જૂથો વૃક્ષ.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,આ ચાર્જ પ્રકાર માટે વર્તમાન પંક્તિ નંબર એક કરતાં વધારે અથવા સમાન પંક્તિ નંબર નો સંદર્ભ લો નથી કરી શકો છો
+,Item-wise Purchase History,વસ્તુ મુજબના ખરીદ ઈતિહાસ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Red
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},સીરીયલ કોઈ વસ્તુ માટે ઉમેરવામાં મેળવે &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો {0}
+DocType: Account,Frozen,ફ્રોઝન
+,Open Production Orders,ઓપન ઉત્પાદન ઓર્ડર્સ
+DocType: Installation Note,Installation Time,સ્થાપન સમયે
+DocType: Sales Invoice,Accounting Details,હિસાબી વિગતો
+apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,આ કંપની માટે તમામ વ્યવહારો કાઢી નાખો
+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,ROW # {0}: ઓપરેશન {1} ઉત્પાદન સમાપ્ત માલ {2} Qty માટે પૂર્ણ નથી ઓર્ડર # {3}. સમય લોગ મારફતે કામગીરી સ્થિતિ અપડેટ કરો
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,રોકાણો
+DocType: Issue,Resolution Details,ઠરાવ વિગતો
+DocType: Quality Inspection Reading,Acceptance Criteria,સ્વીકૃતિ માપદંડ
+DocType: Item Attribute,Attribute Name,નામ લક્ષણ
+apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},વસ્તુ {0} માં વેચાણ અથવા સેવા વસ્તુ જ હોવી જોઈએ {1}
+DocType: Item Group,Show In Website,વેબસાઇટ બતાવો
+apps/erpnext/erpnext/public/js/setup_wizard.js +375,Group,ગ્રુપ
+DocType: Task,Expected Time (in hours),(કલાકોમાં) અપેક્ષિત સમય
+,Qty to Order,ઓર્ડર Qty
+DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","નીચેના દસ્તાવેજો બોલ પર કોઈ નોંધ, તક, સામગ્રી વિનંતી, વસ્તુ, ખરીદી ઓર્ડર, ખરીદી વાઉચર, ખરીદનાર રસીદ, અવતરણ, સેલ્સ ભરતિયું, ઉત્પાદન બંડલ, સેલ્સ ઓર્ડર, સીરીયલ કોઈ બ્રાન્ડ નામ ટ્રૅક કરવા માટે"
+apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,બધા કાર્યો ગેન્ટ ચાર્ટ.
+DocType: Appraisal,For Employee Name,કર્મચારીનું નામ માટે
+DocType: Holiday List,Clear Table,સાફ કોષ્ટક
+DocType: Features Setup,Brands,બ્રાન્ડ્સ
+DocType: C-Form Invoice Detail,Invoice No,ભરતિયું કોઈ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,ખરીદી ઓર્ડર
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,પડતર દર
+,Customer Addresses And Contacts,ગ્રાહક સરનામાં અને સંપર્કો
+DocType: Employee,Resignation Letter Date,રાજીનામું પત્ર તારીખ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,પ્રાઇસીંગ નિયમો વધુ જથ્થો પર આધારિત ફિલ્ટર કરવામાં આવે છે.
+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 +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ભૂમિકા &#39;ખર્ચ તાજનો&#39; હોવી જ જોઈએ
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,Pair,જોડી
+DocType: Bank Reconciliation Detail,Against Account,એકાઉન્ટ સામે
+DocType: Maintenance Schedule Detail,Actual Date,વાસ્તવિક તારીખ
+DocType: Item,Has Batch No,બેચ કોઈ છે
+DocType: Delivery Note,Excise Page Number,એક્સાઇઝ પાનાં ક્રમાંક
+DocType: Employee,Personal Details,અંગત વિગતો
+,Maintenance Schedules,જાળવણી શેડ્યુલ
+,Quotation Trends,અવતરણ પ્રવાહો
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},વસ્તુ ગ્રુપ આઇટમ માટે વસ્તુ માસ્ટર ઉલ્લેખ નથી {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
+DocType: Shipping Rule Condition,Shipping Amount,શીપીંગ રકમ
+,Pending Amount,બાકી રકમ
+DocType: Purchase Invoice Item,Conversion Factor,રૂપાંતર ફેક્ટર
+DocType: Purchase Order,Delivered,વિતરિત
+apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),નોકરી ઇમેઇલ ને માટે સેટઅપ ઇનકમ ગ સવર. (દા.ત. jobs@example.com)
+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 +88,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,પુરવઠોકર્તા-વાઈસ વેચાણ ઍનલિટિક્સ
+DocType: Address Template,This format is used if country specific format is not found,દેશમાં ચોક્કસ ફોર્મેટ ન મળી આવે છે તો આ ફોર્મેટનો ઉપયોગ થાય છે
+DocType: Production Order,Use Multi-Level BOM,મલ્ટી લેવલ BOM વાપરો
+DocType: Bank Reconciliation,Include Reconciled Entries,અનુરૂપ પ્રવેશ સમાવેશ થાય છે
+apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial એકાઉન્ટ્સ ખાસ ભેટ અને.
+DocType: Leave Control Panel,Leave blank if considered for all employee types,બધા કર્મચારી પ્રકારો માટે ગણવામાં તો ખાલી છોડી દો
+DocType: Landed Cost Voucher,Distribute Charges Based On,વિતરિત ખર્ચ પર આધારિત
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"વસ્તુ {1} અસેટ વસ્તુ છે, કારણ કે એકાઉન્ટ {0} &#39;સ્થિર એસેટ&#39; પ્રકાર હોવા જ જોઈએ"
+DocType: HR Settings,HR Settings,એચઆર સેટિંગ્સ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ખર્ચ દાવો મંજૂરી બાકી છે. માત્ર ખર્ચ તાજનો સ્થિતિ અપડેટ કરી શકો છો.
+DocType: Purchase Invoice,Additional Discount Amount,વધારાના ડિસ્કાઉન્ટ રકમ
+DocType: Leave Block List Allow,Leave Block List Allow,બ્લોક પરવાનગી સૂચિ છોડો
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,રમતો
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,વાસ્તવિક કુલ
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,એકમ
+apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,કંપની સ્પષ્ટ કરો
+,Customer Acquisition and Loyalty,ગ્રાહક સંપાદન અને વફાદારી
+DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,તમે નકારી વસ્તુઓ સ્ટોક જાળવણી કરવામાં આવે છે જ્યાં વેરહાઉસ
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,તમારી નાણાકીય વર્ષ પર સમાપ્ત થાય છે
+DocType: POS Profile,Price List,ભાવ યાદી
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} મૂળભૂત ફિસ્કલ વર્ષ હવે છે. ફેરફાર અસર લેવા માટે કે તમારા બ્રાઉઝરને તાજું કરો.
+apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ખર્ચ દાવાઓ
+DocType: Issue,Support,આધાર
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,જુઓ કાર્ટ
+,BOM Search,બોમ શોધ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),બંધ (+ કૂલ ઉદઘાટન)
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,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/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","વગેરે સીરીયલ અમે, POS જેવી બતાવો / છુપાવો લક્ષણો"
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,સામગ્રી અરજીઓ નીચેની આઇટમ ફરીથી ક્રમમાં સ્તર પર આધારિત આપોઆપ ઊભા કરવામાં આવ્યા છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},એકાઉન્ટ {0} અમાન્ય છે. એકાઉન્ટ કરન્સી હોવા જ જોઈએ {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM રૂપાંતર પરિબળ પંક્તિ જરૂરી છે {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},ક્લિયરન્સ તારીખ પંક્તિ ચેક તારીખ પહેલાં ન હોઈ શકે {0}
+DocType: Salary Slip,Deduction,કપાત
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},વસ્તુ ભાવ માટે ઉમેરવામાં {0} ભાવ યાદીમાં {1}
+DocType: Address Template,Address Template,સરનામું ઢાંચો
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,આ વેચાણ વ્યક્તિ કર્મચારી ID દાખલ કરો
+DocType: Territory,Classification of Customers by region,પ્રદેશ દ્વારા ગ્રાહકો વર્ગીકરણ
+DocType: Project,% Tasks Completed,% કાર્યો પૂર્ણ
+DocType: Project,Gross Margin,એકંદર માર્જીન
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,પ્રથમ પ્રોડક્શન વસ્તુ દાખલ કરો
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,અપંગ વપરાશકર્તા
+DocType: Opportunity,Quotation,અવતરણ
+DocType: Salary Slip,Total Deduction,કુલ કપાત
+DocType: Quotation,Maintenance User,જાળવણી વપરાશકર્તા
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,કિંમત સુધારાશે
+DocType: Employee,Date of Birth,જ્ન્મતારીખ
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +151,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 +170,Job Description,જોબ વર્ણન
+DocType: Purchase Order Item,Qty as per Stock UOM,સ્ટોક Qty UOM મુજબ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","સિવાય ખાસ અક્ષરો &quot;-&quot; &quot;.&quot; &quot;#&quot;, અને &quot;/&quot; શ્રેણી નામકરણ મંજૂરી નથી"
+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,તેથી Qty
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","સ્ટોક પ્રવેશો વેરહાઉસ સામે અસ્તિત્વમાં {0}, તેથી તમે ફરીથી સોંપી અથવા વેરહાઉસ ફેરફાર કરી શકતાં નથી"
+DocType: Appraisal,Calculate Total Score,કુલ સ્કોર ગણતરી
+DocType: Supplier Quotation,Manufacturing Manager,ઉત્પાદન વ્યવસ્થાપક
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},સીરીયલ કોઈ {0} સુધી વોરંટી હેઠળ છે {1}
+apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,પેકેજોમાં વિભાજિત બોલ પર કોઈ નોંધ.
+apps/erpnext/erpnext/hooks.py +69,Shipments,આવેલા શિપમેન્ટની
+DocType: Purchase Order Item,To be delivered to customer,ગ્રાહક પર વિતરિત કરવામાં
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,સમય લોગ સ્થિતિ સબમિટ હોવું જ જોઈએ.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,સીરીયલ કોઈ {0} કોઈપણ વેરહાઉસ સંબંધ નથી
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,ROW #
+DocType: Purchase Invoice,In Words (Company Currency),શબ્દો માં (કંપની ચલણ)
+DocType: Pricing Rule,Supplier,પુરવઠોકર્તા
+DocType: C-Form,Quarter,ક્વાર્ટર
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,લખેલા ન હોય તેવા ખર્ચ
+DocType: Global Defaults,Default Company,મૂળભૂત કંપની
+apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"ખર્ચ કે તફાવત એકાઉન્ટ વસ્તુ {0}, કે અસર સમગ્ર મૂલ્ય માટે ફરજિયાત છે"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","પંક્તિ માં વસ્તુ {0} માટે overbill નથી કરી શકો છો {1} કરતાં વધુ {2}. Overbilling, સ્ટોક સેટિંગ્સ સેટ કરો પરવાનગી આપવા માટે"
+DocType: Employee,Bank Name,બેન્ક નામ
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,વપરાશકર્તા {0} અક્ષમ છે
+DocType: Leave Application,Total Leave Days,કુલ છોડો દિવસો
+DocType: Email Digest,Note: Email will not be sent to disabled users,નોંધ: આ ઇમેઇલ નિષ્ક્રિય વપરાશકર્તાઓ માટે મોકલવામાં આવશે નહીં
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,કંપની પસંદ કરો ...
+DocType: Leave Control Panel,Leave blank if considered for all departments,તમામ વિભાગો માટે ગણવામાં તો ખાલી છોડી દો
+apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","રોજગાર પ્રકાર (કાયમી, કરાર, ઇન્ટર્ન વગેરે)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} વસ્તુ માટે ફરજિયાત છે {1}
+DocType: Currency Exchange,From Currency,ચલણ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ઓછામાં ઓછા એક પંક્તિ ફાળવવામાં રકમ, ભરતિયું પ્રકાર અને ભરતિયું નંબર પસંદ કરો"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},વસ્તુ માટે જરૂરી વેચાણની ઓર્ડર {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,સિસ્ટમમાં અસરમાં આવતો નથી માત્રામાં
+DocType: Purchase Invoice Item,Rate (Company Currency),દર (કંપની ચલણ)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,અન્ય
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,બંધબેસતા વસ્તુ શોધી શકાતો નથી. માટે {0} કેટલીક અન્ય કિંમત પસંદ કરો.
+DocType: POS Profile,Taxes and Charges,કર અને ખર્ચ
+DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",ઉત્પાદન અથવા ખરીદી વેચી અથવા સ્ટોક રાખવામાં આવે છે કે એક સેવા.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,પ્રથમ પંક્તિ માટે &#39;અગાઉના પંક્તિ કુલ પર&#39; &#39;અગાઉના પંક્તિ રકમ પર&#39; તરીકે ચાર્જ પ્રકાર પસંદ કરો અથવા નથી કરી શકો છો
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,બેન્કિંગ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,શેડ્યૂલ મેળવવા માટે &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +300,New Cost Center,ન્યૂ ખર્ચ કેન્દ્રને
+DocType: Bin,Ordered Quantity,આદેશ આપ્યો જથ્થો
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",દા.ત. &quot;બિલ્ડરો માટે સાધનો બનાવો&quot;
+DocType: Quality Inspection,In Process,પ્રક્રિયામાં
+DocType: Authorization Rule,Itemwise Discount,મુદ્દાવાર ડિસ્કાઉન્ટ
+DocType: Purchase Order Item,Reference Document Type,સંદર્ભ દસ્તાવેજ પ્રકારની
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} વેચાણ ઓર્ડર સામે {1}
+DocType: Account,Fixed Asset,સ્થિર એસેટ
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,શ્રેણીબદ્ધ ઈન્વેન્ટરી
+DocType: Activity Type,Default Billing Rate,મૂળભૂત બિલિંગ રેટ
+DocType: Time Log Batch,Total Billing Amount,કુલ બિલિંગ રકમ
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,પ્રાપ્ત એકાઉન્ટ
+,Stock Balance,સ્ટોક બેલેન્સ
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ચુકવણી માટે વેચાણ ઓર્ડર
+DocType: Expense Claim Detail,Expense Claim Detail,ખર્ચ દાવાની વિગત
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,સમય લોગ બનાવવામાં:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,યોગ્ય એકાઉન્ટ પસંદ કરો
+DocType: Item,Weight UOM,વજન UOM
+DocType: Employee,Blood Group,બ્લડ ગ્રુપ
+DocType: Purchase Invoice Item,Page Break,પૃષ્ઠ વિરામ
+DocType: Production Order Operation,Pending,બાકી
+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 +50,Office Equipments,ઓફિસ સાધનો
+DocType: Purchase Invoice Item,Qty,Qty
+DocType: Fiscal Year,Companies,કંપનીઓ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,ઇલેક્ટ્રોનિક્સ
+DocType: Stock Settings,Raise Material Request when stock reaches re-order level,સ્ટોક ફરીથી ક્રમમાં સ્તર સુધી પહોંચે છે ત્યારે સામગ્રી વિનંતી વધારો
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,જાળવણી સુનિશ્ચિત થી
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,આખો સમય
+DocType: Purchase Invoice,Contact Details,સંપર્ક વિગતો
+DocType: C-Form,Received Date,પ્રાપ્ત તારીખ
+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 +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,આ શીપીંગ નિયમ માટે એક દેશ ઉલ્લેખ કરો અથવા વિશ્વભરમાં શીપીંગ તપાસો
+DocType: Stock Entry,Total Incoming Value,કુલ ઇનકમિંગ ભાવ
+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,ગુણવત્તા મેનેજર
+DocType: Job Applicant,Job Opening,જૉબ ઑપનિંગ
+DocType: Payment Reconciliation,Payment Reconciliation,ચુકવણી રિકંસીલેશન
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,ઇનચાર્જ વ્યક્તિ નામ પસંદ કરો
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ટેકનોલોજી
+DocType: Offer Letter,Offer Letter,પત્ર ઓફર
+apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,સામગ્રી અરજીઓ (MRP) અને ઉત્પાદન ઓર્ડર્સ બનાવો.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,કુલ ભરતિયું એએમટી
+DocType: Time Log,To Time,સમય
+DocType: Authorization Rule,Approving Role (above authorized value),(અધિકૃત કિંમત ઉપર) ભૂમિકા એપ્રૂવિંગ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","બાળક ગાંઠો ઉમેરવા માટે, વૃક્ષ અન્વેષણ અને તમે વધુ ગાંઠો ઉમેરવા માંગો જે હેઠળ નોડ પર ક્લિક કરો."
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,એકાઉન્ટ ક્રેડિટ ચૂકવવાપાત્ર એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},BOM રિકર્ઝન: {0} ના માતાપિતા અથવા બાળકને ન હોઈ શકે {2}
+DocType: Production Order Operation,Completed Qty,પૂર્ણ Qty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","{0}, માત્ર ડેબિટ એકાઉન્ટ્સ બીજા ક્રેડિટ પ્રવેશ સામે લિંક કરી શકો છો"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,ભાવ યાદી {0} અક્ષમ છે
+DocType: Manufacturing Settings,Allow Overtime,અતિકાલિક માટે પરવાનગી આપે છે
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{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: Opportunity,Lost Reason,લોસ્ટ કારણ
+apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ઓર્ડર્સ અથવા ઇન્વૉઇસેસ સામે ચુકવણી પ્રવેશો બનાવો.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,નવું સરનામું
+DocType: Quality Inspection,Sample Size,સેમ્પલ કદ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,વધુ ખર્ચ કેન્દ્રો જૂથો હેઠળ કરી શકાય છે પરંતુ પ્રવેશો બિન-જૂથો સામે કરી શકાય છે
+DocType: Project,External,બાહ્ય
+DocType: Features Setup,Item Serial Nos,વસ્તુ સીરીયલ અમે
+apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,વપરાશકર્તાઓ અને પરવાનગીઓ
+DocType: Branch,Branch,શાખા
+apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,પ્રિન્ટર અને બ્રાંડિંગ
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,મહિના માટે મળ્યું નથી પગાર સ્લીપ:
+DocType: Bin,Actual Quantity,ખરેખર જ થો
+DocType: Shipping Rule,example: Next Day Shipping,ઉદાહરણ: આગામી દિવસે શિપિંગ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,મળી નથી સીરીયલ કોઈ {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +321,Your Customers,તમારા ગ્રાહકો
+DocType: Leave Block List Date,Block Date,બ્લોક તારીખ
+DocType: Sales Order,Not Delivered,બચાવી શક્યા
+,Bank Clearance Summary,બેન્ક ક્લિયરન્સ સારાંશ
+apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","બનાવો અને દૈનિક, સાપ્તાહિક અને માસિક ઇમેઇલ પચાવી મેનેજ કરો."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,વસ્તુ code&gt; વસ્તુ ગ્રુપ&gt; બ્રાન્ડ
+DocType: Appraisal Goal,Appraisal Goal,મૂલ્યાંકન ગોલ
+DocType: Time Log,Costing Amount,પડતર રકમ
+DocType: Process Payroll,Submit Salary Slip,પગાર સ્લિપ રજુ
+DocType: Salary Structure,Monthly Earning & Deduction,માસિક અર્નિંગ અને કપાત
+apps/erpnext/erpnext/controllers/selling_controller.py +157,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,પ્રેષકનું નામ
+DocType: POS Profile,[Select],[પસંદ કરો]
+DocType: SMS Log,Sent To,મોકલવામાં
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,સેલ્સ ભરતિયું બનાવો
+DocType: Company,For Reference Only.,સંદર્ભ માટે માત્ર.
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},અમાન્ય {0}: {1}
+DocType: Sales Invoice Advance,Advance Amount,એડવાન્સ રકમ
+DocType: Manufacturing Settings,Capacity Planning,ક્ષમતા આયોજન
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,જરૂરી છે &#39;તારીખ પ્રતિ&#39;
+DocType: Journal Entry,Reference Number,સંદર્ભ નંબર
+DocType: Employee,Employment Details,રોજગાર વિગતો
+DocType: Employee,New Workplace,ન્યૂ નોકરીના સ્થળે
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,બંધ કરો
+apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},બારકોડ કોઈ વસ્તુ {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,કેસ નંબર 0 ન હોઈ શકે
+DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,"તમે (ચેનલ પાર્ટનર્સ) વેચાણ ટીમ અને વેચાણ ભાગીદારો છે, તો તેઓ ટૅગ કર્યા છે અને વેચાણ પ્રવૃત્તિ તેમના યોગદાન જાળવી શકાય છે"
+DocType: Item,Show a slideshow at the top of the page,પાનાંની ટોચ પર એક સ્લાઇડ શો બતાવવા
+DocType: Item,"Allow in Sales Order of type ""Service""",પ્રકાર &quot;સેવા&quot; ના વેચાણ ઓર્ડર માટે પરવાનગી આપે છે
+apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,સ્ટોર્સ
+DocType: Time Log,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/setup/setup_wizard/install_fixtures.py +41,Travel,યાત્રા
+DocType: Leave Block List,Allow Users,વપરાશકર્તાઓ માટે પરવાનગી આપે છે
+DocType: Purchase Order,Customer Mobile No,ગ્રાહક મોબાઇલ કોઈ
+DocType: Sales Invoice,Recurring,રીકરીંગ
+DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,અલગ ઇન્કમ ટ્રૅક અને ઉત્પાદન ક્ષેત્રોમાં અથવા વિભાગો માટે ખર્ચ.
+DocType: Rename Tool,Rename Tool,સાધન નામ બદલો
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,સુધારો કિંમત
+DocType: Item Reorder,Item Reorder,વસ્તુ પુનઃક્રમાંકિત કરો
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,ટ્રાન્સફર સામગ્રી
+DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","કામગીરી, સંચાલન ખર્ચ સ્પષ્ટ અને તમારી કામગીરી કરવા માટે કોઈ એક અનન્ય ઓપરેશન આપે છે."
+DocType: Purchase Invoice,Price List Currency,ભાવ યાદી કરન્સી
+DocType: Naming Series,User must always select,વપરાશકર્તા હંમેશા પસંદ કરવી જ પડશે
+DocType: Stock Settings,Allow Negative Stock,નકારાત્મક સ્ટોક પરવાનગી આપે છે
+DocType: Installation Note,Installation Note,સ્થાપન નોંધ
+apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,કર ઉમેરો
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,નાણાકીય રોકડ પ્રવાહ
+,Financial Analytics,નાણાકીય ઍનલિટિક્સ
+DocType: Quality Inspection,Verified By,દ્વારા ચકાસવામાં
+DocType: Address,Subsidiary,સબસિડીયરી
+apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","હાલની વ્યવહારો છે, કારણ કે કંપની મૂળભૂત ચલણ બદલી શકાતું નથી. વ્યવહારો મૂળભૂત ચલણ બદલવાની રદ હોવું જ જોઈએ."
+DocType: Quality Inspection,Purchase Receipt No,ખરીદી રસીદ કોઈ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,બાનું
+DocType: Process Payroll,Create Salary Slip,પગાર કાપલી બનાવો
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,બેંક મુજબ અપેક્ષિત બેલેન્સ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ફંડ ઓફ સોર્સ (જવાબદારીઓ)
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},પંક્તિ માં જથ્થો {0} ({1}) ઉત્પાદન જથ્થો તરીકે જ હોવી જોઈએ {2}
+DocType: Appraisal,Employee,કર્મચારીનું
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,આયાત ઇમેઇલ
+apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,વપરાશકર્તા તરીકે આમંત્રણ આપો
+DocType: Features Setup,After Sale Installations,વેચાણ સ્થાપનો પછી
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} સંપૂર્ણપણે ગણાવી છે
+DocType: Workstation Working Hour,End Time,અંત સમય
+apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,સેલ્સ અથવા ખરીદી માટે નિયમ કરાર શરતો.
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,વાઉચર દ્વારા ગ્રુપ
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,જરૂરી પર
+DocType: Sales Invoice,Mass Mailing,સામૂહિક મેઈલિંગ
+DocType: Rename Tool,File to Rename,નામ ફાઇલ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},વસ્તુ માટે જરૂરી purchse ઓર્ડર નંબર {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,બતાવો ચુકવણીઓ
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},વસ્તુ માટે અસ્તિત્વમાં નથી સ્પષ્ટ BOM {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,જાળવણી સુનિશ્ચિત {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
+DocType: Notification Control,Expense Claim Approved,ખર્ચ દાવો મંજૂર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,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,વેચાણ ઓર્ડર જરૂરી
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ગ્રાહક બનાવવા
+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: Maintenance Schedule Detail,Maintenance Schedule Detail,જાળવણી સુનિશ્ચિત વિગતવાર
+DocType: Quality Inspection Reading,Reading 9,9 વાંચન
+DocType: Supplier,Is Frozen,સ્થિર છે
+DocType: Buying Settings,Buying Settings,ખરીદી સેટિંગ્સ
+DocType: Stock Entry Detail,BOM No. for a Finished Good Item,એક ફિનિશ્ડ કોઈ વસ્તુ માટે BOM નંબર
+DocType: Upload Attendance,Attendance To Date,તારીખ હાજરી
+apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),વેચાણ ઇમેઇલ ને માટે સેટઅપ ઇનકમ ગ સવર. (દા.ત. sales@example.com)
+DocType: Warranty Claim,Raised By,દ્વારા ઊભા
+DocType: Payment Tool,Payment Account,ચુકવણી એકાઉન્ટ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,આગળ વધવા માટે કંપની સ્પષ્ટ કરો
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,એકાઉન્ટ્સ પ્રાપ્ત નેટ બદલો
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,વળતર બંધ
+DocType: Quality Inspection Reading,Accepted,સ્વીકારાયું
+apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,શું તમે ખરેખર આ કંપની માટે તમામ વ્યવહારો કાઢી નાખવા માંગો છો તેની ખાતરી કરો. તે છે તમારા માસ્ટર ડેટા રહેશે. આ ક્રિયા પૂર્વવત્ કરી શકાતી નથી.
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},અમાન્ય સંદર્ભ {0} {1}
+DocType: Payment Tool,Total Payment Amount,કુલ ચુકવણી રકમ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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 +207,Raw Materials cannot be blank.,કાચો માલ ખાલી ન હોઈ શકે.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
+DocType: Newsletter,Test,ટેસ્ટ
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
+							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","હાલની સ્ટોક વ્યવહારો તમે ના કિંમતો બદલી શકતા નથી \ આ આઇટમ માટે ત્યાં હોય છે &#39;સીરિયલ કોઈ છે&#39;, &#39;બેચ છે કોઈ&#39;, &#39;સ્ટોક વસ્તુ છે&#39; અને &#39;મૂલ્યાંકન પદ્ધતિ&#39;"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ઝડપી જર્નલ પ્રવેશ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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 +157,Please enter Planned Qty for Item {0} at row {1},પંક્તિ પર વસ્તુ {0} માટે આયોજન Qty દાખલ કરો {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} અપર્ણ ન કરાય
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,આઇટમ્સ માટે વિનંતી કરે છે.
+DocType: Production Planning Tool,Separate production order will be created for each finished good item.,અલગ ઉત્પાદન ક્રમમાં દરેક સમાપ્ત સારી વસ્તુ માટે બનાવવામાં આવશે.
+DocType: Purchase Invoice,Terms and Conditions1,નિયમો અને Conditions1
+DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","આ તારીખ સુધી સ્થિર હિસાબી પ્રવેશ, કોઈએ / કરવા નીચે સ્પષ્ટ ભૂમિકા સિવાય પ્રવેશ સુધારી શકો છો."
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,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/config/crm.py +96,Newsletter Mailing List,ન્યૂઝલેટર મેઇલિંગ યાદી
+DocType: Delivery Note,Transporter Name,ટ્રાન્સપોર્ટર નામ
+DocType: Authorization Rule,Authorized Value,અધિકૃત ભાવ
+DocType: Contact,Enter department to which this Contact belongs,આ સંપર્ક અનુલક્ષે છે વિભાગ દાખલ
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,કુલ ગેરહાજર
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,પંક્તિ {0} સાથે મેળ ખાતું નથી સામગ્રી વિનંતી વસ્તુ અથવા વેરહાઉસ
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,માપવા એકમ
+DocType: Fiscal Year,Year End Date,વર્ષ અંતે તારીખ
+DocType: Task Depends On,Task Depends On,કાર્ય પર આધાર રાખે છે
+DocType: Lead,Opportunity,તક
+DocType: Salary Structure Earning,Salary Structure Earning,પગાર માળખું અર્નિંગ
+,Completed Production Orders,પૂર્ણ ઉત્પાદન ઓર્ડર્સ
+DocType: Operation,Default Workstation,મૂળભૂત વર્કસ્ટેશન
+DocType: Notification Control,Expense Claim Approved Message,ખર્ચ દાવો મંજૂર સંદેશ
+DocType: Email Digest,How frequently?,કેવી રીતે વારંવાર?
+DocType: Purchase Receipt,Get Current Stock,વર્તમાન સ્ટોક મેળવો
+apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,સામગ્રી બિલ વૃક્ષ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},જાળવણી શરૂઆત તારીખ સીરીયલ કોઈ ડ લવર તારીખ પહેલાં ન હોઈ શકે {0}
+DocType: Production Order,Actual End Date,વાસ્તવિક ઓવરને તારીખ
+DocType: Authorization Rule,Applicable To (Role),લાગુ કરવા માટે (ભૂમિકા)
+DocType: Stock Entry,Purpose,હેતુ
+DocType: Item,Will also apply for variants unless overrridden,Overrridden સિવાય પણ ચલો માટે લાગુ પડશે
+DocType: Purchase Invoice,Advances,એડવાન્સિસ
+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,વિનંતી એસએમએસ કોઈ
+DocType: Campaign,Campaign-.####,અભિયાન -. ####
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,આગળ કરવાનાં પગલાંઓ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,કરારનો અંત તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,એક કમિશન માટે કંપનીઓ ઉત્પાદનો વેચે છે તે તૃતીય પક્ષ ડિસ્ટ્રીબ્યુટર / વેપારી / કમિશન એજન્ટ / સંલગ્ન / પુનર્વિક્રેતા.
+DocType: Customer Group,Has Child Node,બાળક નોડ છે
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} ખરીદી ઓર્ડર સામે {1}
+DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","અહીં સ્થિર URL પેરામીટર્સ દાખલ કરો (ઉદા. પ્રેષક = ERPNext, વપરાશકર્તા નામ = ERPNext, પાસવર્ડ = 1234 વગેરે)"
+apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} નથી કોઈ સક્રિય નાણાકીય વર્ષમાં. વધુ વિગતો તપાસ માટે {2}.
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,આ એક ઉદાહરણ વેબસાઇટ ERPNext માંથી ઓટો પેદા થાય છે
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,એઇજીંગનો રેન્જ 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.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+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. 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.","બધા ખરીદી વ્યવહારો પર લાગુ કરી શકાય છે કે જે પ્રમાણભૂત કર નમૂનો. આ નમૂનો વગેરે #### તમે બધા ** આઇટમ્સ માટે પ્રમાણભૂત કર દર હશે અહીં વ્યાખ્યાયિત કર દર નોંધ &quot;હેન્ડલીંગ&quot;, કર માથા અને &quot;શીપીંગ&quot;, &quot;વીમો&quot; જેવા પણ અન્ય ખર્ચ હેડ યાદી સમાવી શકે છે * *. વિવિધ દર હોય ** ** કે વસ્તુઓ છે, તો તેઓ ** વસ્તુ કર ઉમેરાવી જ જોઈએ ** આ ** ** વસ્તુ માસ્ટર કોષ્ટક. #### સ્તંભોને વર્ણન 1. ગણતરી પ્રકાર: - આ (કે જે મૂળભૂત રકમ ની રકમ છે) ** નેટ કુલ ** પર હોઇ શકે છે. - ** અગાઉના પંક્તિ કુલ / રકમ ** પર (સંચિત કર અથવા ખર્ચ માટે). તમે આ વિકલ્પ પસંદ કરો, તો કર રકમ અથવા કુલ (કર કોષ્ટકમાં) અગાઉના પંક્તિ ટકાવારી તરીકે લાગુ કરવામાં આવશે. - ** ** વાસ્તવમાં (ઉલ્લેખ કર્યો છે). 2. એકાઉન્ટ હેડ: આ કર 3. ખર્ચ કેન્દ્રને નક્કી કરવામાં આવશે, જે હેઠળ એકાઉન્ટ ખાતાવહી: કર / ચાર્જ (શીપીંગ જેમ) એક આવક છે અથવા ખર્ચ તો તે ખર્ચ કેન્દ્રને સામે નક્કી કરવાની જરૂર છે. 4. વર્ણન: કર વર્ણન (કે ઇન્વૉઇસેસ / અવતરણ છાપવામાં આવશે). 5. દર: કર દર. 6. રકમ: ટેક્સની રકમ. 7. કુલ: આ બોલ પર સંચિત કુલ. 8. રો દાખલ કરો: પર આધારિત &quot;જો અગાઉના પંક્તિ કુલ&quot; તમે આ ગણતરી માટે આધાર (મૂળભૂત અગાઉના પંક્તિ છે) તરીકે લેવામાં આવશે જે પંક્તિ નંબર પસંદ કરી શકો છો. 9. કર અથવા ચાર્જ વિચાર કરો: કરવેરા / ચાર્જ મૂલ્યાંકન માટે જ છે (કુલ ભાગ ન હોય) અથવા માત્ર (આઇટમ કિંમત ઉમેરી શકતા નથી) કુલ માટે અથવા બંને માટે જો આ વિભાગમાં તમે સ્પષ્ટ કરી શકો છો. 10. ઉમેરો અથવા કપાત: જો તમે ઉમેરવા અથવા કર કપાત માંગો છો."
+DocType: Purchase Receipt Item,Recd Quantity,Recd જથ્થો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},સેલ્સ ક્રમ સાથે જથ્થો કરતાં વધુ આઇટમ {0} પેદા કરી શકતા નથી {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,સ્ટોક એન્ટ્રી {0} અપર્ણ ન કરાય
+DocType: Payment Reconciliation,Bank / Cash Account,બેન્ક / રોકડ એકાઉન્ટ
+DocType: Tax Rule,Billing City,બિલિંગ સિટી
+DocType: Global Defaults,Hide Currency Symbol,કરન્સી નિશાનીનો છુપાવો
+apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","દા.ત. બેન્ક, રોકડ, ક્રેડિટ કાર્ડ"
+DocType: Journal Entry,Credit Note,ઉધાર નોધ
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},પૂર્ણ Qty કરતાં વધુ ન હોઈ શકે {0} કામગીરી માટે {1}
+DocType: Features Setup,Quality,ગુણવત્તા
+DocType: Warranty Claim,Service Address,સેવા સરનામું
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,સ્ટોક સમાધાન માટે મેક્સ 100 પંક્તિઓ.
+DocType: Stock Entry,Manufacture,ઉત્પાદન
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,કૃપા કરીને બોલ પર કોઈ નોંધ પ્રથમ
+DocType: Purchase Invoice,Currency and Price List,કરન્સી અને ભાવ યાદી
+DocType: Opportunity,Customer / Lead Name,ગ્રાહક / લીડ નામ
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,ક્લિયરન્સ તારીખ ઉલ્લેખ નથી
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,ઉત્પાદન
+DocType: Item,Allow Production Order,પરવાનગી આપે છે ઉત્પાદન ઓર્ડર
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,રો {0}: પ્રારંભ તારીખ સમાપ્તિ તારીખ પહેલાં જ હોવી જોઈએ
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),કુલ (Qty)
+DocType: Installation Note Item,Installed Qty,ઇન્સ્ટોલ Qty
+DocType: Lead,Fax,ફેક્સ
+DocType: Purchase Taxes and Charges,Parenttype,Parenttype
+DocType: Salary Structure,Total Earning,કુલ અર્નિંગ
+DocType: Purchase Receipt,Time at which materials were received,"સામગ્રી પ્રાપ્ત કરવામાં આવી હતી, જે અંતે સમય"
+apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,મારા સરનામાંઓ
+DocType: Stock Ledger Entry,Outgoing Rate,આઉટગોઇંગ દર
+apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,સંસ્થા શાખા માસ્ટર.
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,અથવા
+DocType: Sales Order,Billing Status,બિલિંગ સ્થિતિ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ઉપયોગિતા ખર્ચ
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-ઉપર
+DocType: Buying Settings,Default Buying Price List,ડિફૉલ્ટ ખરીદી ભાવ યાદી
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.","વગેરે કંપની, કરન્સી, ચાલુ નાણાકીય વર્ષના, જેવા સેટ મૂળભૂત મૂલ્યો"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,ચુકવણી પ્રકાર
+DocType: Process Payroll,Select Employees,પસંદગીના કર્મચારીઓને
+DocType: Bank Reconciliation,To Date,આજ સુધી
+DocType: Opportunity,Potential Sales Deal,સંભવિત વેચાણની ડીલ
+DocType: Purchase Invoice,Total Taxes and Charges,કુલ કર અને ખર્ચ
+DocType: Employee,Emergency Contact,કટોકટી સંપર્ક
+DocType: Item,Quality Parameters,ગુણવત્તા પરિમાણો
+apps/erpnext/erpnext/stock/doctype/item/item.js +26,Ledger,ખાતાવહી
+DocType: Target Detail,Target  Amount,લક્ષ્યાંક રકમ
+DocType: Shopping Cart Settings,Shopping Cart Settings,શોપિંગ કાર્ટ સેટિંગ્સ
+DocType: Journal Entry,Accounting Entries,હિસાબી પ્રવેશો
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},એન્ટ્રી ડુપ્લિકેટ. કૃપા કરીને તપાસો અધિકૃતતા નિયમ {0}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},પહેલેથી જ કંપની માટે બનાવવામાં વૈશ્વિક POS પ્રોફાઇલ {0} {1}
+DocType: Purchase Order,Ref SQ,સંદર્ભ SQ
+apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,બધા BOMs વસ્તુ / BOM બદલો
+DocType: Purchase Order Item,Received Qty,પ્રાપ્ત Qty
+DocType: Stock Entry Detail,Serial No / Batch,સીરીયલ કોઈ / બેચ
+DocType: Product Bundle,Parent Item,પિતૃ વસ્તુ
+DocType: Account,Account Type,એકાઉન્ટ પ્રકાર
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,{0} હાથ ધરવા આગળ કરી શકાતી નથી પ્રકાર છોડો
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',જાળવણી સુનિશ્ચિત બધી વસ્તુઓ માટે પેદા નથી. &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
+,To Produce,પેદા કરવા માટે
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","પંક્તિ માટે {0} માં {1}. આઇટમ રેટ માં {2} સમાવેશ કરવા માટે, પંક્તિઓ {3} પણ સમાવેશ કરવો જ જોઈએ"
+DocType: Packing Slip,Identification of the package for the delivery (for print),વિતરણ માટે પેકેજ ઓળખ (પ્રિન્ટ માટે)
+DocType: Bin,Reserved Quantity,અનામત જથ્થો
+DocType: Landed Cost Voucher,Purchase Receipt Items,ખરીદી રસીદ વસ્તુઓ
+apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,જોઈએ એ પ્રમાણે લેખનું ફોર્મ
+DocType: Account,Income Account,આવક એકાઉન્ટ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,ડ લવર
+DocType: Stock Reconciliation Item,Current Qty,વર્તમાન Qty
+DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",જુઓ પડતર વિભાગ &quot;સામગ્રી પર આધારિત દર&quot;
+DocType: Appraisal Goal,Key Responsibility Area,કી જવાબદારી વિસ્તાર
+DocType: Item Reorder,Material Request Type,સામગ્રી વિનંતી પ્રકાર
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,રો {0}: UOM રૂપાંતર ફેક્ટર ફરજિયાત છે
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,સંદર્ભ
+DocType: Cost Center,Cost Center,ખર્ચ કેન્દ્રને
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,વાઉચર #
+DocType: Notification Control,Purchase Order Message,ઓર્ડર સંદેશ ખરીદી
+DocType: Tax Rule,Shipping Country,શીપીંગ દેશ
+DocType: Upload Attendance,Upload HTML,અપલોડ કરો HTML
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
+				than the Grand Total ({2})",કુલ એડવાન્સ ({0}) ઓર્ડર સામે {1} \ વધારે ન હોઈ શકે ગ્રાન્ડ કુલ કરતાં ({2})
+DocType: Employee,Relieving Date,રાહત તારીખ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"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 +92,Head of Marketing and Sales,માર્કેટિંગ અને સેલ્સ હેડ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,આય કર
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"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.","પસંદ પ્રાઇસીંગ નિયમ &#39;કિંમત&#39; માટે કરવામાં આવે છે, તો તે ભાવ યાદી પર ફરીથી લખી નાંખશે. પ્રાઇસીંગ નિયમ ભાવ અંતિમ ભાવ છે, તેથી કોઇ વધુ ડિસ્કાઉન્ટ લાગુ પાડવામાં આવવી જોઈએ. તેથી, વગેરે સેલ્સ ઓર્ડર, ખરીદી ઓર્ડર જેવા વ્યવહારો, તે બદલે &#39;ભાવ યાદી દર&#39; ક્ષેત્ર કરતાં &#39;રેટ ભૂલી નથી&#39; ફીલ્ડમાં મેળવ્યાં કરવામાં આવશે."
+apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,ટ્રેક ઉદ્યોગ પ્રકાર દ્વારા દોરી જાય છે.
+DocType: Item Supplier,Item Supplier,વસ્તુ પુરવઠોકર્તા
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},{0} quotation_to માટે નીચેની પસંદ કરો {1}
+apps/erpnext/erpnext/config/selling.py +33,All Addresses.,બધા સંબોધે છે.
+DocType: Company,Stock Settings,સ્ટોક સેટિંગ્સ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","નીચેના ગુણધર્મો બંને રેકોર્ડ જ છે, તો મર્જ જ શક્ય છે. ગ્રુપ root લખવું, કંપની છે"
+apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ગ્રાહક જૂથ વૃક્ષ મેનેજ કરો.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,ન્યૂ ખર્ચ કેન્દ્રને નામ
+DocType: Leave Control Panel,Leave Control Panel,નિયંત્રણ પેનલ છોડો
+apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,મૂળભૂત સરનામું ઢાંચો જોવા મળે છે. સેટઅપ&gt; પ્રિન્ટર અને બ્રાંડિંગ&gt; સરનામું નમૂનો એક નવું બનાવો.
+DocType: Appraisal,HR User,એચઆર વપરાશકર્તા
+DocType: Purchase Invoice,Taxes and Charges Deducted,કર અને ખર્ચ બાદ
+apps/erpnext/erpnext/shopping_cart/utils.py +46,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,સોદા બાદ વાસ્તવિક Qty
+,Pending SO Items For Purchase Request,ખરીદી વિનંતી તેથી વસ્તુઓ બાકી
+DocType: Supplier,Billing Currency,બિલિંગ કરન્સી
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,બહુ્ મોટુ
+,Profit and Loss Statement,નફો અને નુકસાનનું નિવેદન
+DocType: Bank Reconciliation Detail,Cheque Number,ચેક સંખ્યા
+DocType: Payment Tool Detail,Payment Tool Detail,ચુકવણી સાધન વિગતવાર
+,Sales Browser,સેલ્સ બ્રાઉઝર
+DocType: Journal Entry,Total Credit,કુલ ક્રેડિટ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},ચેતવણી: અન્ય {0} # {1} સ્ટોક પ્રવેશ સામે અસ્તિત્વમાં {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,ડેટર્સ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,મોટા
+DocType: C-Form Invoice Detail,Territory,પ્રદેશ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,જરૂરી મુલાકાત કોઈ ઉલ્લેખ કરો
+DocType: Purchase Order,Customer Address Display,ગ્રાહક સરનામું પ્રદર્શિત
+DocType: Stock Settings,Default Valuation Method,મૂળભૂત મૂલ્યાંકન પદ્ધતિ
+DocType: Production Order Operation,Planned Start Time,આયોજિત પ્રારંભ સમય
+apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,બંધ બેલેન્સ શીટ અને પુસ્તક નફો અથવા નુકસાન.
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,વિનિમય દર અન્ય એક ચલણ કન્વર્ટ કરવા માટે સ્પષ્ટ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,અવતરણ {0} રદ કરવામાં આવે છે
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,કુલ બાકી રકમ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,{0} કર્મચારી પર રજા પર હતો {1}. હાજરી માર્ક કરી શકતા નથી.
+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.,તેથી નંબર
+DocType: Production Order Operation,Make Time Log,સમય લોગ બનાવો
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},લીડ પ્રતિ ગ્રાહક બનાવવા કૃપા કરીને {0}
+DocType: Price List,Applicable for Countries,દેશો માટે લાગુ પડે છે
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,એન્જીનિયરિંગ
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,આ રુટ ગ્રાહક જૂથ છે અને સંપાદિત કરી શકાતી નથી.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,એકાઉન્ટ્સ તમારા ચાર્ટ સુયોજિત તમે એકાઉન્ટિંગ પ્રવેશો શરૂ કરો તે પહેલાં
+DocType: Purchase Invoice,Ignore Pricing Rule,પ્રાઇસીંગ નિયમ અવગણો
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,પગાર માળખું તારીખ પ્રતિ કર્મચારી જોડાયા તારીખ કરતાં ઓછા ન હોઈ શકે.
+DocType: Employee Education,Graduate,સ્નાતક
+DocType: Leave Block List,Block Days,બ્લોક દિવસો
+DocType: Journal Entry,Excise Entry,એક્સાઇઝ એન્ટ્રી
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},ચેતવણી: વેચાણ ઓર્ડર {0} પહેલાથી જ ગ્રાહક ખરીદી ઓર્ડર સામે અસ્તિત્વમાં {1}
+DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
+
+Examples:
+
+1. Validity of the offer.
+1. Payment Terms (In Advance, On Credit, part advance etc).
+1. What is extra (or payable by the Customer).
+1. Safety / usage warning.
+1. Warranty if any.
+1. Returns Policy.
+1. Terms of shipping, if applicable.
+1. Ways of addressing disputes, indemnity, liability, etc.
+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 +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ખર્ચ / તફાવત એકાઉન્ટ ({0}) એક &#39;નફો અથવા નુકસાન ખાતામાં હોવા જ જોઈએ
+DocType: Account,Accounts User,વપરાશકર્તા એકાઉન્ટ્સ
+DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","તપાસો ભરતિયું રિકરિંગ તો, રિકરિંગ રોકવા અથવા યોગ્ય સમાપ્તિ તારીખ મૂકી અનચેક"
+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),જો એક જ પ્રકારના એક કરતાં વધુ પેકેજ (પ્રિન્ટ માટે)
+DocType: C-Form Invoice Detail,Net Total,નેટ કુલ
+DocType: Bin,FCFS Rate,FCFS દર
+apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),બિલિંગ (સેલ્સ ભરતિયું)
+DocType: Payment Reconciliation Invoice,Outstanding Amount,બાકી રકમ
+DocType: Project Task,Working,કામ
+DocType: Stock Ledger Entry,Stock Queue (FIFO),સ્ટોક કતારમાં (FIFO)
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,સમય લોગ પસંદ કરો.
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} કંપની ને અનુલક્ષતું નથી {1}
+DocType: Account,Round Off,બોલ ધરપકડ
+,Requested Qty,વિનંતી Qty
+DocType: Tax Rule,Use for Shopping Cart,શોપિંગ કાર્ટ માટે વાપરો
+DocType: BOM Item,Scrap %,સ્ક્રેપ%
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"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 +103,Atleast one item should be entered with negative quantity in return document,ઓછામાં ઓછા એક વસ્તુ પાછી દસ્તાવેજ નકારાત્મક જથ્થો દાખલ કરવું જોઈએ
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +67,No Remarks,કોઈ ટિપ્પણી
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,મુદતવીતી
+DocType: Account,Stock Received But Not Billed,"સ્ટોક મળ્યો હતો, પણ રજુ કરવામાં આવ્યું ન"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,રુટ ખાતું એક જૂથ હોવા જ જોઈએ
+DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,કુલ પે + બાકીનો જથ્થો + + એન્કેશમેન્ટ રકમ - કુલ કપાત
+DocType: Monthly Distribution,Distribution Name,વિતરણ નામ
+DocType: Features Setup,Sales and Purchase,સેલ્સ અને પરચેઝ
+DocType: Supplier Quotation Item,Material Request No,સામગ્રી વિનંતી કોઈ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},વસ્તુ માટે જરૂરી ગુણવત્તા નિરીક્ષણ {0}
+DocType: Quotation,Rate at which customer's currency is converted to company's base currency,જે ગ્રાહક ચલણ પર દર કંપનીના આધાર ચલણ ફેરવાય છે
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} આ યાદી માંથી સફળતાપૂર્વક ઉમેદવારી દૂર કરવામાં આવી છે.
+DocType: Purchase Invoice Item,Net Rate (Company Currency),નેટ દર (કંપની ચલણ)
+apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,પ્રદેશ વૃક્ષ મેનેજ કરો.
+DocType: Journal Entry Account,Sales Invoice,સેલ્સ ભરતિયું
+DocType: Journal Entry Account,Party Balance,પાર્ટી બેલેન્સ
+DocType: Sales Invoice Item,Time Log Batch,સમય લોગ બેચ
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,ડિસ્કાઉન્ટ પર લાગુ પડે છે પસંદ કરો
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,પગાર કાપલી બનાવનાર
+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 +18,Discount Percentage can be applied either against a Price List or for all Price List.,ડિસ્કાઉન્ટ ટકાવારી ભાવ યાદી સામે અથવા બધું ભાવ યાદી માટે ક્યાં લાગુ પાડી શકાય છે.
+DocType: Purchase Invoice,Half-yearly,અર્ધ-વાર્ષિક
+apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,ફિસ્કલ વર્ષ {0} મળી નથી.
+DocType: Bank Reconciliation,Get Relevant Entries,સંબંધિત પ્રવેશો મળી
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,સ્ટોક માટે એકાઉન્ટિંગ એન્ટ્રી
+DocType: Sales Invoice,Sales Team1,સેલ્સ team1
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,વસ્તુ {0} અસ્તિત્વમાં નથી
+DocType: Sales Invoice,Customer Address,ગ્રાહક સરનામું
+DocType: Purchase Invoice,Apply Additional Discount On,વધારાના ડિસ્કાઉન્ટ પર લાગુ પડે છે
+DocType: Account,Root Type,Root લખવું
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},ROW # {0}: કરતાં વધુ પાછા ન કરી શકે {1} વસ્તુ માટે {2}
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,પ્લોટ
+DocType: Item Group,Show this slideshow at the top of the page,પાનાંની ટોચ પર આ સ્લાઇડશો બતાવો
+DocType: BOM,Item UOM,વસ્તુ 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: Quality Inspection,Quality Inspection,ગુણવત્તા નિરીક્ષણ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,વિશેષ નાના
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,એકાઉન્ટ {0} સ્થિર છે
+DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,સંસ્થા સાથે જોડાયેલા એકાઉન્ટ્સ એક અલગ ચાર્ટ સાથે કાનૂની એન્ટિટી / સબસિડીયરી.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ફૂડ, પીણું અને તમાકુ"
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,પોલ અથવા BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},માત્ર સામે ચુકવણી કરી શકો છો unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,કમિશન દર કરતા વધારે 100 ન હોઈ શકે
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,ન્યુનત્તમ ઈન્વેન્ટરી સ્તર
+DocType: Stock Entry,Subcontract,Subcontract
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,પ્રથમ {0} દાખલ કરો
+DocType: Production Planning Tool,Get Items From Sales Orders,વેચાણ ઓર્ડર વસ્તુઓ મેળવો
+DocType: Production Order Operation,Actual End Time,વાસ્તવિક ઓવરને સમય
+DocType: Production Planning Tool,Download Materials Required,સામગ્રી જરૂરી ડાઉનલોડ
+DocType: Item,Manufacturer Part Number,ઉત્પાદક ભાગ સંખ્યા
+DocType: Production Order Operation,Estimated Time and Cost,અંદાજિત સમય અને ખર્ચ
+DocType: Bin,Bin,બિન
+DocType: SMS Log,No of Sent SMS,એસએમએસ કોઈ
+DocType: Account,Company,કંપની
+DocType: Account,Expense Account,ખર્ચ એકાઉન્ટ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,સોફ્ટવેર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,કલર
+DocType: Maintenance Visit,Scheduled,અનુસૂચિત
+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; છે વસ્તુ પસંદ કરો અને કોઈ અન્ય ઉત્પાદન બંડલ છે, કૃપા કરીને"
+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 +281,Price List Currency not selected,ભાવ યાદી કરન્સી પસંદ નહી
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,વસ્તુ રો {0}: {1} ઉપર &#39;ખરીદી રસીદો&#39; ટેબલ અસ્તિત્વમાં નથી ખરીદી રસીદ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,સુધી
+DocType: Rename Tool,Rename Log,લોગ
+DocType: Installation Note Item,Against Document No,દસ્તાવેજ વિરુદ્ધમાં કોઇ
+apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,સેલ્સ પાર્ટનર્સ મેનેજ કરો.
+DocType: Quality Inspection,Inspection Type,નિરીક્ષણ પ્રકાર
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},પસંદ કરો {0}
+DocType: C-Form,C-Form No,સી-ફોર્મ નં
+DocType: BOM,Exploded_items,Exploded_items
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,સંશોધક
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,મોકલતા પહેલા ન્યૂઝલેટર સેવ કરો
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,નામ અથવા ઇમેઇલ ફરજિયાત છે
+apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,ઇનકમિંગ ગુણવત્તા નિરીક્ષણ.
+DocType: Purchase Order Item,Returned Qty,પરત Qty
+DocType: Employee,Exit,બહાર નીકળો
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root લખવું ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,{0} બનાવવામાં સીરીયલ કોઈ
+DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ગ્રાહકોની સુવિધા માટે, આ કોડ ઇન્વૉઇસેસ અને ડ લવર નોંધો જેવા પ્રિન્ટ બંધારણો ઉપયોગ કરી શકાય છે"
+DocType: Employee,You can enter any date manually,તમે જાતે કોઈપણ તારીખ દાખલ કરી શકો છો
+DocType: Sales Invoice,Advertisement,જાહેરખબર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,અજમાયશી સમય
+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 +110,Row {0}: Advance against Customer must be credit,રો {0}: ગ્રાહક સામે એડવાન્સ ક્રેડિટ હોવા જ જોઈએ
+DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ખરીદી રસીદ વસ્તુ પાડેલ
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,પે
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,તારીખ સમય માટે
+DocType: SMS Settings,SMS Gateway URL,એસએમએસ ગેટવે URL
+apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS વિતરણ સ્થિતિ જાળવવા માટે લોગ
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,બાકી પ્રવૃત્તિઓ
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,પુષ્ટિ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,તારીખ રાહત દાખલ કરો.
+apps/erpnext/erpnext/controllers/trends.py +137,Amt,એએમટી
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,માત્ર પરિસ્થિતિ &#39;માન્ય&#39; સબમિટ કરી શકો છો પૂરૂં છોડો
+apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,સરનામું શીર્ષક ફરજિયાત છે.
+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/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ફિસ્કલ વર્ષ પસંદ કરો
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,પુનઃક્રમાંકિત કરો સ્તર
+DocType: Attendance,Attendance Date,એટેન્ડન્સ તારીખ
+DocType: Salary Structure,Salary breakup based on Earning and Deduction.,આવક અને કપાત પર આધારિત પગાર ભાંગ્યા.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,બાળક ગાંઠો સાથે એકાઉન્ટ ખાતાવહી રૂપાંતરિત કરી શકતા નથી
+DocType: Address,Preferred Shipping Address,મનપસંદ શિપિંગ સરનામું
+DocType: Purchase Receipt Item,Accepted Warehouse,સ્વીકારાયું વેરહાઉસ
+DocType: Bank Reconciliation Detail,Posting Date,પોસ્ટ તારીખ
+DocType: Item,Valuation Method,મૂલ્યાંકન પદ્ધતિ
+apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},{0} માટે વિનિમય દર શોધવામાં અસમર્થ {1}
+DocType: Sales Invoice,Sales Team,સેલ્સ ટીમ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,નકલી નોંધણી
+DocType: Serial No,Under Warranty,વોરંટી હેઠળ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[ભૂલ]
+DocType: Sales Order,In Words will be visible once you save the Sales Order.,તમે વેચાણ ઓર્ડર સેવ વાર શબ્દો દૃશ્યમાન થશે.
+,Employee Birthday,કર્મચારીનું જન્મદિવસ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,વેન્ચર કેપિટલ
+DocType: UOM,Must be Whole Number,સમગ્ર નંબર હોવો જોઈએ
+DocType: Leave Control Panel,New Leaves Allocated (In Days),(દિવસોમાં) સોંપાયેલ નવા પાંદડા
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,સીરીયલ કોઈ {0} અસ્તિત્વમાં નથી
+DocType: Pricing Rule,Discount Percentage,ડિસ્કાઉન્ટ ટકાવારી
+DocType: Payment Reconciliation Invoice,Invoice Number,બીલ નંબર
+apps/erpnext/erpnext/hooks.py +55,Orders,ઓર્ડર્સ
+DocType: Leave Control Panel,Employee Type,કર્મચારીનું પ્રકાર
+DocType: Employee Leave Approver,Leave Approver,તાજનો છોડો
+DocType: Manufacturing Settings,Material Transferred for Manufacture,સામગ્રી ઉત્પાદન માટે તબદીલ
+DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;ખર્ચ તાજનો&quot; ભૂમિકા સાથે વપરાશકર્તા
+,Issued Items Against Production Order,ઉત્પાદન ઓર્ડર સામે જારી વસ્તુઓ
+DocType: Pricing Rule,Purchase Manager,ખરીદી વ્યવસ્થાપક
+DocType: Payment Tool,Payment Tool,ચુકવણી સાધન
+DocType: Target Detail,Target Detail,લક્ષ્યાંક વિગતવાર
+DocType: Sales Order,% of materials billed against this Sales Order,સામગ્રી% આ વેચાણ ઓર્ડર સામે બિલ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,પીરિયડ બંધ એન્ટ્રી
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,હાલની વ્યવહારો સાથે ખર્ચ કેન્દ્રને જૂથ રૂપાંતરિત કરી શકતા નથી
+DocType: Account,Depreciation,અવમૂલ્યન
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),પુરવઠોકર્તા (ઓ)
+DocType: Customer,Credit Limit,ક્રેડિટ મર્યાદા
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,વ્યવહાર પ્રકાર પસંદ કરો
+DocType: GL Entry,Voucher No,વાઉચર કોઈ
+DocType: Leave Allocation,Leave Allocation,ફાળવણી છોડો
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,બનાવવામાં સામગ્રી અરજીઓ {0}
+apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,શરતો અથવા કરારની ઢાંચો.
+DocType: Customer,Address and Contact,એડ્રેસ અને સંપર્ક
+DocType: Customer,Last Day of the Next Month,આગામી મહિને છેલ્લો દિવસ
+DocType: Employee,Feedback,પ્રતિસાદ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"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 +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),નોંધ: કારણે / સંદર્ભ તારીખ {0} દિવસ દ્વારા મંજૂરી ગ્રાહક ક્રેડિટ દિવસ કરતાં વધી જાય (ઓ)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,નાના કદ. સૂચિ
+DocType: Stock Settings,Freeze Stock Entries,ફ્રીઝ સ્ટોક પ્રવેશો
+DocType: Item,Reorder level based on Warehouse,વેરહાઉસ પર આધારિત પુનઃક્રમાંકિત કરો સ્તર
+DocType: Activity Cost,Billing Rate,બિલિંગ રેટ
+,Qty to Deliver,વિતરિત કરવા માટે Qty
+DocType: Monthly Distribution Percentage,Month,મહિનો
+,Stock Analytics,સ્ટોક ઍનલિટિક્સ
+DocType: Installation Note Item,Against Document Detail No,દસ્તાવેજ વિગતવાર સામે કોઈ
+DocType: Quality Inspection,Outgoing,આઉટગોઇંગ
+DocType: Material Request,Requested For,વિનંતી
+DocType: Quotation Item,Against Doctype,Doctype સામે
+DocType: Delivery Note,Track this Delivery Note against any Project,કોઈ પણ પ્રોજેક્ટ સામે આ બોલ પર કોઈ નોંધ ટ્રૅક
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,રોકાણ ચોખ્ખી રોકડ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,રુટ ખાતું કાઢી શકાતી નથી
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,બતાવો સ્ટોક પ્રવેશો
+,Is Primary Address,પ્રાથમિક સરનામું છે
+DocType: Production Order,Work-in-Progress Warehouse,વર્ક ઈન પ્રોગ્રેસ વેરહાઉસ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},સંદર્ભ # {0} ના રોજ {1}
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,સરનામાંઓ મેનેજ કરો
+DocType: Pricing Rule,Item Code,વસ્તુ કોડ
+DocType: Production Planning Tool,Create Production Orders,ઉત્પાદન ઓર્ડર્સ બનાવો
+DocType: Serial No,Warranty / AMC Details,વોરંટી / એએમસી વિગતો
+DocType: Journal Entry,User Remark,વપરાશકર્તા ટીકા
+DocType: Lead,Market Segment,માર્કેટ સેગમેન્ટ
+DocType: Employee Internal Work History,Employee Internal Work History,કર્મચારીનું આંતરિક કામ ઇતિહાસ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),બંધ (DR)
+DocType: Contact,Passive,નિષ્ક્રીય
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,નથી સ્ટોક સીરીયલ કોઈ {0}
+apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,વ્યવહારો વેચાણ માટે કરવેરા નમૂનો.
+DocType: Sales Invoice,Write Off Outstanding Amount,બાકી રકમ માંડવાળ
+DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","જો તમે આપોઆપ રિકરિંગ ઇનવૉઇસેસ જરૂર હોય તો તપાસો. કોઈપણ વેચાણ ભરતિયું સબમિટ કર્યા પછી, વિભાગ રીકરીંગ દૃશ્યમાન થશે."
+DocType: Account,Accounts Manager,એકાઉન્ટ્સ વ્યવસ્થાપક
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',સમય લોગ {0} &#39;સબમિટ&#39; હોવું જ જોઈએ
+DocType: Stock Settings,Default Stock UOM,મૂળભૂત સ્ટોક UOM
+DocType: Time Log,Costing Rate based on Activity Type (per hour),પ્રવૃત્તિ પ્રકાર ઉપર આધારિત દર પડતર (પ્રતિ કલાક)
+DocType: Production Planning Tool,Create Material Requests,સામગ્રી અરજીઓ બનાવો
+DocType: Employee Education,School/University,શાળા / યુનિવર્સિટી
+DocType: Sales Invoice Item,Available Qty at Warehouse,વેરહાઉસ ખાતે ઉપલબ્ધ Qty
+,Billed Amount,ગણાવી રકમ
+DocType: Bank Reconciliation,Bank Reconciliation,બેન્ક રિકંસીલેશન
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,સુધારાઓ મેળવો
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,સામગ્રી વિનંતી {0} રદ અથવા બંધ છે
+apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,થોડા નમૂના રેકોર્ડ ઉમેરો
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,મેનેજમેન્ટ છોડો
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,એકાઉન્ટ દ્વારા ગ્રુપ
+DocType: Sales Order,Fully Delivered,સંપૂર્ણપણે વિતરિત
+DocType: Lead,Lower Income,ઓછી આવક
+DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","નફો / નુકશાન નક્કી કરવામાં આવશે, જેમાં જવાબદારી હેઠળ એકાઉન્ટ વડા,"
+DocType: Payment Tool,Against Vouchers,વાઉચર સામે
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,ઝડપી મદદ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},સોર્સ અને ટાર્ગેટ વેરહાઉસ પંક્તિ માટે જ ન હોઈ શકે {0}
+DocType: Features Setup,Sales Extras,સેલ્સ એક્સ્ટ્રાઝ
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{2} ખર્ચ કેન્દ્રને સામે એકાઉન્ટ {1} માટે {0} બજેટ દ્વારા કરતાં વધી જશે {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',&#39;તારીખ પ્રતિ&#39; પછી &#39;તારીખ&#39; હોવા જ જોઈએ
+,Stock Projected Qty,સ્ટોક Qty અંદાજિત
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},સંબંધ નથી {0} ગ્રાહક પ્રોજેક્ટ {1}
+DocType: Sales Order,Customer's Purchase Order,ગ્રાહક ખરીદી ઓર્ડર
+DocType: Warranty Claim,From Company,કંપનીથી
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ભાવ અથવા Qty
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,Minute,મિનિટ
+DocType: Purchase Invoice,Purchase Taxes and Charges,કર અને ખર્ચ ખરીદી
+,Qty to Receive,પ્રાપ્ત Qty
+DocType: Leave Block List,Leave Block List Allowed,બ્લોક યાદી મંજૂર છોડો
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,તમે પ્રવેશ કરવા માટે તેનો ઉપયોગ કરશે
+DocType: Sales Partner,Retailer,છૂટક વિક્રેતા
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,એકાઉન્ટ ક્રેડિટ બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,બધા પુરવઠોકર્તા પ્રકાર
+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 +93,Quotation {0} not of type {1},અવતરણ {0} નથી પ્રકાર {1}
+DocType: Maintenance Schedule Item,Maintenance Schedule Item,જાળવણી સુનિશ્ચિત વસ્તુ
+DocType: Sales Order,%  Delivered,% વિતરિત
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,બેન્ક ઓવરડ્રાફટ એકાઉન્ટ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,પગાર કાપલી બનાવો
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,બ્રાઉઝ BOM
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,સુરક્ષીત લોન્સ
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,અદ્ભુત પ્રોડક્ટ્સ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,પ્રારંભિક સિલક ઈક્વિટી
+DocType: Appraisal,Appraisal,મૂલ્યાંકન
+apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,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 +164,Leave approver must be one of {0},એક હોવો જ જોઈએ સાક્ષી છોડો {0}
+DocType: Hub Settings,Seller Email,વિક્રેતા ઇમેઇલ
+DocType: Project,Total Purchase Cost (via Purchase Invoice),કુલ ખરીદ કિંમત (ખરીદી ભરતિયું મારફતે)
+DocType: Workstation Working Hour,Start Time,પ્રારંભ સમય
+DocType: Item Price,Bulk Import Help,બલ્ક આયાત કરવામાં મદદ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,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 +66,Unsubscribe from this Email Digest,આ ઇમેઇલ ડાયજેસ્ટ માંથી અનસબ્સ્ક્રાઇબ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,સંદેશ મોકલ્યો
+DocType: Production Plan Sales Order,SO Date,જેથી તે તારીખ
+DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,દર ભાવ યાદી ચલણ ગ્રાહક આધાર ચલણ ફેરવાય છે
+DocType: Purchase Invoice Item,Net Amount (Company Currency),ચોખ્ખી રકમ (કંપની ચલણ)
+DocType: BOM Operation,Hour Rate,કલાક દર
+DocType: Stock Settings,Item Naming By,આઇટમ દ્વારા નામકરણ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,અવતરણ પ્રતિ
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},અન્ય પીરિયડ બંધ એન્ટ્રી {0} પછી કરવામાં આવી છે {1}
+DocType: Production Order,Material Transferred for Manufacturing,સામગ્રી ઉત્પાદન માટે તબદીલ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,એકાઉન્ટ {0} નથી અસ્તિત્વમાં
+DocType: Purchase Receipt Item,Purchase Order Item No,ઓર્ડર વસ્તુ બોલ પર કોઈ ખરીદી
+DocType: Project,Project Type,પ્રોજેક્ટ પ્રકાર
+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 +38,Cost of various activities,વિવિધ પ્રવૃત્તિઓ કિંમત
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ન કરતાં જૂની સ્ટોક વ્યવહારો સુધારવા માટે મંજૂરી {0}
+DocType: Item,Inspection Required,નિરીક્ષણ જરૂરી
+DocType: Purchase Invoice Item,PR Detail,PR વિગતવાર
+DocType: Sales Order,Fully Billed,સંપૂર્ણપણે ગણાવી
+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 +119,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),પેકેજ ગ્રોસ વજન. સામાન્ય રીતે નેટ વજન + પેકેજિંગ સામગ્રી વજન. (પ્રિન્ટ માટે)
+DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,આ ભૂમિકા સાથેના વપરાશકર્તાઓ સ્થિર એકાઉન્ટ્સ સામે હિસાબી પ્રવેશો સ્થિર એકાઉન્ટ્સ સેટ અને બનાવવા / સુધારવા માટે માન્ય છે
+DocType: Serial No,Is Cancelled,રદ છે
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,મારા આવેલા શિપમેન્ટની
+DocType: Journal Entry,Bill Date,બિલ તારીખ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","સૌથી વધુ પ્રાધાન્ય સાથે બહુવિધ પ્રાઇસીંગ નિયમો હોય છે, પણ જો, તો પછી નીચેના આંતરિક પ્રાથમિકતાઓ લાગુ પડે છે:"
+DocType: Supplier,Supplier Details,પુરવઠોકર્તા વિગતો
+DocType: Expense Claim,Approval Status,મંજૂરી સ્થિતિ
+DocType: Hub Settings,Publish Items to Hub,હબ વસ્તુઓ પ્રકાશિત
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},કિંમત પંક્તિ માં કિંમત કરતાં ઓછી હોવી જોઈએ થી {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,વાયર ટ્રાન્સફર
+apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,બેન્ક એકાઉન્ટ પસંદ કરો
+DocType: Newsletter,Create and Send Newsletters,બનાવો અને મોકલો ન્યૂઝલેટર્સ
+DocType: Sales Order,Recurring Order,રીકરીંગ ઓર્ડર
+DocType: Company,Default Income Account,ડિફૉલ્ટ આવક એકાઉન્ટ
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ગ્રાહક જૂથ / ગ્રાહક
+DocType: Item Group,Check this if you want to show in website,"તમે વેબસાઇટ બતાવવા માંગો છો, તો આ તપાસો"
+,Welcome to ERPNext,ERPNext માટે આપનું સ્વાગત છે
+DocType: Payment Reconciliation Payment,Voucher Detail Number,વાઉચર વિગતવાર સંખ્યા
+apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,અવતરણ માટે લીડ
+DocType: Lead,From Customer,ગ્રાહક પાસેથી
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,કોલ્સ
+DocType: Project,Total Costing Amount (via Time Logs),કુલ પડતર રકમ (સમય લોગ મારફતે)
+DocType: Purchase Order Item Supplied,Stock UOM,સ્ટોક UOM
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,ઓર્ડર {0} અપર્ણ ન કરાય ખરીદી
+apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,અંદાજિત
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},સીરીયલ કોઈ {0} વેરહાઉસ ને અનુલક્ષતું નથી {1}
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,શરૂઆતના તારીખ
+DocType: Journal Entry,Remark,ટીકા
+DocType: Purchase Receipt Item,Rate and Amount,દર અને રકમ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,સેલ્સ ક્રમમાંથી
+DocType: Sales Order,Not Billed,રજુ કરવામાં આવ્યું ન
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,બંને વેરહાઉસ જ કંપની સંબંધ માટે જ જોઈએ
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,કોઈ સંપર્કો હજુ સુધી ઉમેર્યું.
+DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ઉતારેલ માલની કિંમત વાઉચર જથ્થો
+DocType: Time Log,Batched for Billing,બિલિંગ માટે બેચ કરેલ
+apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,સપ્લાયર્સ દ્વારા ઉઠાવવામાં બીલો.
+DocType: POS Profile,Write Off Account,એકાઉન્ટ માંડવાળ
+DocType: Purchase Invoice,Return Against Purchase Invoice,સામે ખરીદી ભરતિયું પાછા ફરો
+DocType: Item,Warranty Period (in days),(દિવસોમાં) વોરંટી સમયગાળા
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,ઓપરેશન્સ થી ચોખ્ખી રોકડ
+apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,દા.ત. વેટ
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,આઇટમ 4
+DocType: Journal Entry Account,Journal Entry Account,જર્નલ પ્રવેશ એકાઉન્ટ
+DocType: Shopping Cart Settings,Quotation Series,અવતરણ સિરીઝ
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","એક વસ્તુ જ નામ સાથે હાજર ({0}), આઇટમ જૂથ નામ બદલવા અથવા વસ્તુ નામ બદલી કૃપા કરીને"
+DocType: Sales Order Item,Sales Order Date,સેલ્સ ઓર્ડર તારીખ
+DocType: Sales Invoice Item,Delivered Qty,વિતરિત Qty
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,વેરહાઉસ {0}: કંપની ફરજિયાત છે
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",કર દર ઉલ્લેખ યોગ્ય ગ્રુપ (ફંડ&gt; વર્તમાન જવાબદારીઓ&gt; કર અને ફરજો સામાન્ય રીતે સ્ત્રોત પર જાઓ અને પ્રકાર &quot;કર&quot; ના) બાળ ઉમેરો પર ક્લિક કરીને (નવી એકાઉન્ટ બનાવો અને નથી.
+,Payment Period Based On Invoice Date,ભરતિયું તારીખ પર આધારિત ચુકવણી સમય
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},માટે ખૂટે કરન્સી વિનિમય દરો {0}
+DocType: Journal Entry,Stock Entry,સ્ટોક એન્ટ્રી
+DocType: Account,Payable,ચૂકવવાપાત્ર
+DocType: Salary Slip,Arrear Amount,બાકીનો રકમ
+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 +68,Gross Profit %,કુલ નફો %
+DocType: Appraisal Goal,Weightage (%),ભારાંકન (%)
+DocType: Bank Reconciliation Detail,Clearance Date,ક્લિયરન્સ તારીખ
+DocType: Newsletter,Newsletter List,ન્યૂઝલેટર યાદી
+DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,તમે પગાર સ્લીપ સબમિટ જ્યારે દરેક કર્મચારીને મેલ પગાર સ્લીપ મોકલવા માંગો છો તો તપાસો
+DocType: Lead,Address Desc,DESC સરનામું
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,વેચાણ અથવા ખરીદી ઓછામાં ઓછા એક પસંદ કરેલ હોવું જ જોઈએ
+apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,ઉત્પાદન કામગીરી જ્યાં ધરવામાં આવે છે.
+DocType: Stock Entry Detail,Source Warehouse,સોર્સ વેરહાઉસ
+DocType: Installation Note,Installation Date,સ્થાપન તારીખ
+DocType: Employee,Confirmation Date,સમર્થન તારીખ
+DocType: C-Form,Total Invoiced Amount,કુલ ભરતિયું રકમ
+DocType: Account,Sales User,સેલ્સ વપરાશકર્તા
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,મીન Qty મેક્સ Qty કરતાં વધારે ન હોઈ શકે
+DocType: Stock Entry,Customer or Supplier Details,ગ્રાહક અથવા સપ્લાયર વિગતો
+DocType: Lead,Lead Owner,અગ્ર માલિક
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +257,Warehouse is required,વેરહાઉસ જરૂરી છે
+DocType: Employee,Marital Status,વૈવાહિક સ્થિતિ
+DocType: Stock Settings,Auto Material Request,ઓટો સામગ્રી વિનંતી
+DocType: Time Log,Will be updated when billed.,બિલ જ્યારે અપડેટ કરવામાં આવશે.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,વેરહાઉસ માંથી ઉપલબ્ધ બેચ Qty
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,વર્તમાન BOM અને નવા BOM જ ન હોઈ શકે
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,નિવૃત્તિ તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
+DocType: Sales Invoice,Against Income Account,આવક એકાઉન્ટ સામે
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% વિતરિત
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,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,માસિક વિતરણ ટકાવારી
+DocType: Territory,Territory Targets,પ્રદેશ લક્ષ્યાંક
+DocType: Delivery Note,Transporter Info,ટ્રાન્સપોર્ટર માહિતી
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ઓર્ડર વસ્તુ પાડેલ ખરીદી
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,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/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,મૂલ્યાંકન પ્રકાર ખર્ચ વ્યાપક તરીકે ચિહ્નિત નથી કરી શકો છો
+DocType: POS Profile,Update Stock,સુધારા સ્ટોક
+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 દર
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,ડ લવર નોંધ વસ્તુઓ ખેંચી કરો
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,જર્નલ પ્રવેશો {0}-અન જોડાયેલા છે
+apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","પ્રકાર ઈમેઈલ, ફોન, ચેટ, મુલાકાત, વગેરે બધા સંચાર રેકોર્ડ"
+apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,કંપની રાઉન્ડ બંધ ખર્ચ કેન્દ્રને ઉલ્લેખ કરો
+DocType: Purchase Invoice,Terms,શરતો
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +251,Create New,ન્યૂ બનાવો
+DocType: Buying Settings,Purchase Order Required,ઓર્ડર જરૂરી ખરીદી
+,Item-wise Sales History,વસ્તુ મુજબના વેચાણનો ઇતિહાસ
+DocType: Expense Claim,Total Sanctioned Amount,કુલ મંજુર રકમ
+,Purchase Analytics,ખરીદી ઍનલિટિક્સ
+DocType: Sales Invoice Item,Delivery Note Item,ડ લવર નોંધ વસ્તુ
+DocType: Expense Claim,Task,ટાસ્ક
+DocType: Purchase Taxes and Charges,Reference Row #,સંદર્ભ 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/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,આ રુટ વેચાણ વ્યક્તિ છે અને સંપાદિત કરી શકાતી નથી.
+,Stock Ledger,સ્ટોક ખાતાવહી
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},દર: {0}
+DocType: Salary Slip Deduction,Salary Slip Deduction,પગાર કાપલી કપાત
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,પ્રથમ જૂથ નોડ પસંદ કરો.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},હેતુ એક જ હોવી જોઈએ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,આ ફોર્મ ભરો અને તેને સંગ્રહો
+DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,તેમની તાજેતરની ઈન્વેન્ટરી સ્થિતિ સાથે તમામ કાચામાલ સમાવતી અહેવાલ ડાઉનલોડ કરો
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,સમુદાય ફોરમ
+DocType: Leave Application,Leave Balance Before Application,એપ્લિકેશન પહેલાં બેલેન્સ છોડો
+DocType: SMS Center,Send SMS,એસએમએસ મોકલો
+DocType: Company,Default Letter Head,પત્ર હેડ મૂળભૂત
+DocType: Time Log,Billable,બિલયોગ્ય
+DocType: Account,Rate at which this tax is applied,"આ કર લાગુ પડે છે, જે અંતે દર"
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,પુનઃક્રમાંકિત કરો Qty
+DocType: Company,Stock Adjustment Account,સ્ટોક એડજસ્ટમેન્ટ એકાઉન્ટ
+DocType: Journal Entry,Write Off,માંડવાળ
+DocType: Time Log,Operation ID,ઓપરેશન ID ને
+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/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,તક ગુમાવી
+DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","ડિસ્કાઉન્ટ ક્ષેત્રો ખરીદી ઓર્ડર, ખરીદી રસીદ, ખરીદી ભરતિયું ઉપલબ્ધ થશે"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +211,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,નવા એકાઉન્ટ ના નામ. નોંધ: ગ્રાહકો અને સપ્લાયર્સ માટે એકાઉન્ટ્સ બનાવી નથી કરો
+DocType: BOM Replace Tool,BOM Replace Tool,BOM સાધન બદલો
+apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,દેશ મુજબની મૂળભૂત સરનામું નમૂનાઓ
+DocType: Sales Order Item,Supplier delivers to Customer,પુરવઠોકર્તા ગ્રાહક માટે પહોંચાડે છે
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,બતાવો કર બ્રેક અપ
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},કારણે / સંદર્ભ તારીખ પછી ન હોઈ શકે {0}
+apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,માહિતી આયાત અને નિકાસ
+DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',તમે ઉત્પાદન પ્રવૃત્તિમાં સમાવેશ છે. સક્રિય કરે છે વસ્તુ &#39;ઉત્પાદિત છે&#39;
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,ભરતિયું પોસ્ટ તારીખ
+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% સમાન હોવું જોઈએ
+DocType: Serial No,Out of AMC,એએમસીના આઉટ
+DocType: Purchase Order Item,Material Request Detail No,સામગ્રી વિનંતી વિગતવાર કોઈ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,જાળવણી મુલાકાત કરી
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,સેલ્સ માસ્ટર વ્યવસ્થાપક {0} ભૂમિકા છે જે વપરાશકર્તા માટે સંપર્ક કરો
+DocType: Company,Default Cash Account,ડિફૉલ્ટ કેશ એકાઉન્ટ
+apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,કંપની (નથી ગ્રાહક અથવા સપ્લાયર) માસ્ટર.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',&#39;અપેક્ષા બોલ તારીખ&#39; દાખલ કરો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ડ લવર નોંધો {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},નોંધ: છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","નોંધ: ચુકવણી કોઈપણ સંદર્ભ સામે કરવામાં ન આવે તો, જાતે જર્નલ પ્રવેશ કરો."
+DocType: Item,Supplier Items,પુરવઠોકર્તા વસ્તુઓ
+DocType: Opportunity,Opportunity Type,તક પ્રકાર
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,નવી કંપની
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},ખર્ચ કેન્દ્રને &#39;નફો અને નુકસાનનું&#39; માટે જરૂરી છે એકાઉન્ટ {0}
+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.,સામાન્ય ખાતાવહી પ્રવેશો ખોટો નંબર જોવા મળે છે. તમે વ્યવહાર એક ખોટા એકાઉન્ટમાં પસંદ કરેલ છે શકે છે.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,એક બેન્ક એકાઉન્ટ બનાવવા માટે
+DocType: Hub Settings,Publish Availability,ઉપલબ્ધતા પ્રકાશિત
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,જન્મ તારીખ આજે કરતાં વધારે ન હોઈ શકે.
+,Stock Ageing,સ્ટોક એઇજીંગનો
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} &#39;{1}&#39; અક્ષમ છે
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ઓપન તરીકે સેટ કરો
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,સબમિટ વ્યવહારો પર સંપર્કો આપોઆપ ઇમેઇલ્સ મોકલો.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+					Available Qty: {4}, Transfer Qty: {5}","રો {0}: Qty વેરહાઉસ Avalable નથી {1} પર {2} {3}. ઉપલબ્ધ Qty: {4}, Qty ટ્રાન્સફર: {5}"
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,આઇટમ 3
+DocType: Purchase Order,Customer Contact Email,ગ્રાહક સંપર્ક ઇમેઇલ
+DocType: Sales Team,Contribution (%),યોગદાન (%)
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,નોંધ: ચુકવણી એન્ટ્રી થી બનાવી શકાય નહીં &#39;કેશ અથવા બેન્ક એકાઉન્ટ&#39; સ્પષ્ટ કરેલ ન હતી
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,જવાબદારીઓ
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,ઢાંચો
+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/public/js/setup_wizard.js +273,Add Users,વપરાશકર્તાઓ ઉમેરો
+DocType: Pricing Rule,Item Group,વસ્તુ ગ્રુપ
+DocType: Task,Actual Start Date (via Time Logs),વાસ્તવિક પ્રારંભ તારીખ (સમય લોગ મારફતે)
+DocType: Stock Reconciliation Item,Before reconciliation,સમાધાન પહેલાં
+apps/erpnext/erpnext/support/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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,વસ્તુ ટેક્સ રો {0} પ્રકાર વેરો કે આવક અથવા ખર્ચ અથવા લેવાપાત્ર કારણે હોવી જ જોઈએ
+DocType: Sales Order,Partly Billed,આંશિક ગણાવી
+DocType: Item,Default BOM,મૂળભૂત BOM
+apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,ફરીથી લખો કંપની નામ ખાતરી કરવા માટે કરો
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,કુલ બાકી એએમટી
+DocType: Time Log Batch,Total Hours,કુલ કલાકો
+DocType: Journal Entry,Printing Settings,પ્રિન્ટિંગ સેટિંગ્સ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},કુલ ડેબિટ કુલ ક્રેડિટ માટે સમાન હોવો જોઈએ. તફાવત છે {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ઓટોમોટિવ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ડ લવર નોંધ
+DocType: Time Log,From Time,સમય
+DocType: Notification Control,Custom Message,કસ્ટમ સંદેશ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ઇન્વેસ્ટમેન્ટ બેન્કિંગ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,કેશ અથવા બેન્ક એકાઉન્ટ ચુકવણી પ્રવેશ બનાવવા માટે ફરજિયાત છે
+DocType: Purchase Invoice,Price List Exchange Rate,ભાવ યાદી એક્સચેન્જ રેટ
+DocType: Purchase Invoice Item,Rate,દર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,ઇન્ટર્ન
+DocType: Newsletter,A Lead with this email id should exist,આ ઇમેઇલ ID સાથે લીડ અસ્તિત્વ ધરાવતું હોવું જોઈએ
+DocType: Stock Entry,From BOM,BOM થી
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,મૂળભૂત
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} સ્થિર થાય તે પહેલા સ્ટોક વ્યવહારો
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,"તારીખ કરવા માટે, અડધા દિવસ રજા માટે તારીખ તરીકે જ હોવી જોઈએ"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","દા.ત. કિલો, એકમ, અમે, એમ"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,તમે સંદર્ભ તારીખ દાખલ જો સંદર્ભ કોઈ ફરજિયાત છે
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,જોડાયા જન્મ તારીખ તારીખ કરતાં મોટી હોવી જ જોઈએ
+DocType: Salary Structure,Salary Structure,પગાર માળખું
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
+			conflict by assigning priority. Price Rules: {0}","મલ્ટીપલ ભાવ નિયમ જ માપદંડ સાથે જ અસ્તિત્વમાં છે, અગ્રતા સોંપવા દ્વારા \ તકરાર ઉકેલવા વિનંતી. ભાવ નિયમો: {0}"
+DocType: Account,Bank,બેન્ક
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,એરલાઇન
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,ઇશ્યૂ સામગ્રી
+DocType: Material Request Item,For Warehouse,વેરહાઉસ માટે
+DocType: Employee,Offer Date,ઓફર તારીખ
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,સુવાકયો
+DocType: Hub Settings,Access Token,ઍક્સેસ ટોકન
+DocType: Sales Invoice Item,Serial No,સીરીયલ કોઈ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,પ્રથમ Maintaince વિગતો દાખલ કરો
+DocType: Item,Is Fixed Asset Item,સ્થિર એસેટ વસ્તુ છે
+DocType: Stock Entry,Including items for sub assemblies,પેટા વિધાનસભાઓ માટે વસ્તુઓ સહિત
+DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","તમે લાંબા પ્રિન્ટ બંધારણો હોય, તો આ લક્ષણ દરેક પૃષ્ઠ પર બધા હેડરો અને ફૂટર્સ સાથે અનેક પૃષ્ઠો પર છપાશે પાનું વિભાજિત કરવા માટે વાપરી શકાય છે"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,બધા પ્રદેશો
+DocType: Purchase Invoice,Items,વસ્તુઓ
+DocType: Fiscal Year,Year Name,વર્ષ નામ
+DocType: Process Payroll,Process Payroll,પ્રક્રિયા પેરોલ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,કામ દિવસો કરતાં વધુ રજાઓ આ મહિને છે.
+DocType: Product Bundle Item,Product Bundle Item,ઉત્પાદન બંડલ વસ્તુ
+DocType: Sales Partner,Sales Partner Name,વેચાણ ભાગીદાર નામ
+DocType: Payment Reconciliation,Maximum Invoice Amount,મહત્તમ ભરતિયું જથ્થા
+DocType: Purchase Invoice Item,Image View,છબી જુઓ
+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 +553,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: Purchase Taxes and Charges,Valuation and Total,મૂલ્યાંકન અને કુલ
+DocType: Tax Rule,Shipping City,શીપીંગ સિટી
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"આ વસ્તુ {0} (ટેમ્પલેટ) એક પ્રકાર છે. &#39;ના નકલ&#39; સુયોજિત થયેલ છે, જ્યાં સુધી લક્ષણો નમૂનો પર નકલ થશે"
+DocType: Account,Purchase User,ખરીદી વપરાશકર્તા
+DocType: Notification Control,Customize the Notification,સૂચન કસ્ટમાઇઝ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,કામગીરી માંથી રોકડ પ્રવાહ
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,મૂળભૂત સરનામું ઢાંચો કાઢી શકાતી નથી
+DocType: Sales Invoice,Shipping Rule,શીપીંગ નિયમ
+DocType: Journal Entry,Print Heading,પ્રિંટ મથાળું
+DocType: Quotation,Maintenance Manager,જાળવણી વ્યવસ્થાપક
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,કુલ શૂન્ય ન હોઈ શકે
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;છેલ્લું ઓર્ડર સુધીનાં દિવસો&#39; શૂન્ય કરતાં વધારે અથવા સમાન હોવો જોઈએ
+DocType: C-Form,Amended From,સુધારો
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,કાચો માલ
+DocType: Leave Application,Follow via Email,ઈમેઈલ મારફતે અનુસરો
+DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ડિસ્કાઉન્ટ રકમ બાદ કર જથ્થો
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},મૂળભૂત BOM વસ્તુ માટે અસ્તિત્વમાં {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,પ્રથમ પોસ્ટ તારીખ પસંદ કરો
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,તારીખ ઓપનિંગ તારીખ બંધ કરતા પહેલા પ્રયત્ન કરીશું
+DocType: Leave Control Panel,Carry Forward,આગળ લઈ
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,હાલની વ્યવહારો સાથે ખર્ચ કેન્દ્રને ખાતાવહી રૂપાંતરિત કરી શકતા નથી
+DocType: Department,Days for which Holidays are blocked for this department.,દિવસો કે જેના માટે રજાઓ આ વિભાગ માટે બ્લોક કરી દેવામાં આવે છે.
+,Produced,ઉત્પાદન
+DocType: Item,Item Code for Suppliers,સપ્લાયરો માટે વસ્તુ કોડ
+DocType: Issue,Raised By (Email),દ્વારા ઊભા (ઇમેઇલ)
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,જનરલ
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,લેટરહેડ જોડો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',શ્રેણી &#39;મૂલ્યાંકન&#39; અથવા &#39;મૂલ્યાંકન અને કુલ&#39; માટે છે જ્યારે કપાત કરી શકો છો
+apps/erpnext/erpnext/public/js/setup_wizard.js +302,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","તમારી કર હેડ યાદી (દા.ત. વેટ, કસ્ટમ્સ વગેરે; તેઓ અનન્ય નામો હોવી જોઈએ) અને તેમના પ્રમાણભૂત દરો. આ તમને સંપાદિત કરો અને વધુ પાછળથી ઉમેરી શકો છો કે જે સ્ટાન્ડર્ડ ટેમ્પલેટ, બનાવશે."
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},શ્રેણીબદ્ધ વસ્તુ માટે સીરીયલ અમે જરૂરી {0}
+DocType: Journal Entry,Bank Entry,બેન્ક એન્ટ્રી
+DocType: Authorization Rule,Applicable To (Designation),લાગુ કરો (હોદ્દો)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,સૂચી માં સામેલ કરો
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ગ્રુપ દ્વારા
+apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ અક્ષમ કરો કરન્સી સક્રિય કરો.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ટપાલ ખર્ચ
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),કુલ (એએમટી)
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,મનોરંજન &amp; ફુરસદની પ્રવૃત્તિઓ
+DocType: Purchase Order,The date on which recurring order will be stop,રિકરિંગ ક્રમમાં સ્ટોપ હશે કે જેના પર તારીખ
+DocType: Quality Inspection,Item Serial No,વસ્તુ સીરીયલ કોઈ
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} અથવા તમે વધારો કરીશું ઓવરફ્લો સહનશીલતા દ્વારા ઘટાડી શકાય જોઈએ
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,કુલ પ્રેઝન્ટ
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,કલાક
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
+					using Stock Reconciliation",શ્રેણીબદ્ધ વસ્તુ {0} સ્ટોક રિકંસીલેશન ઉપયોગ \ અપડેટ કરી શકાતું નથી
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,સપ્લાયર માલ પરિવહન
+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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,અવતરણ બનાવો
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,તમે બ્લોક તારીખો પર પાંદડા મંજૂર કરવા માટે અધિકૃત નથી
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,આ તમામ વસ્તુઓ પહેલેથી જ તેનું ભરતિયું કરાય છે
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},દ્વારા મંજૂર કરી શકાય {0}
+DocType: Shipping Rule,Shipping Rule Conditions,શીપીંગ નિયમ શરતો
+DocType: BOM Replace Tool,The new BOM after replacement,રિપ્લેસમેન્ટ પછી નવા BOM
+DocType: Features Setup,Point of Sale,વેચાણ પોઇન્ટ
+DocType: Account,Tax,ટેક્સ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},રો {0}: {1} માન્ય નથી {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,ઉત્પાદન બંડલ પ્રતિ
+DocType: Production Planning Tool,Production Planning Tool,ઉત્પાદન આયોજન સાધન
+DocType: Quality Inspection,Report Date,રિપોર્ટ તારીખ
+DocType: C-Form,Invoices,ઇનવૉઇસેસ
+DocType: Job Opening,Job Title,જોબ શીર્ષક
+DocType: Features Setup,Item Groups in Details,વિગતો વસ્તુ જૂથો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,ઉત્પાદન જથ્થો 0 કરતાં મોટી હોવી જ જોઈએ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),પ્રારંભ પોઇન્ટ ઓફ સેલ (POS)
+apps/erpnext/erpnext/config/support.py +28,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: Pricing Rule,Customer Group,ગ્રાહક જૂથ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},ખર્ચ હિસાબ આઇટમ માટે ફરજિયાત છે {0}
+DocType: Item,Website Description,વેબસાઇટ વર્ણન
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ઈક્વિટી કુલ ફેરફાર
+DocType: Serial No,AMC Expiry Date,એએમસી સમાપ્તિ તારીખ
+,Sales Register,સેલ્સ રજિસ્ટર
+DocType: Quotation,Quotation Lost Reason,અવતરણ લોસ્ટ કારણ
+DocType: Address,Plant,પ્લાન્ટ
+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 +108,Summary for this month and pending activities,આ મહિને અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
+DocType: Customer Group,Customer Group Name,ગ્રાહક જૂથ નામ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,લક્ષણો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,વસ્તુઓ વિચાર
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,એકાઉન્ટ માંડવાળ દાખલ કરો
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,છેલ્લે ઓર્ડર તારીખ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,એક્સાઇઝ ભરતિયું બનાવો
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},એકાઉન્ટ {0} કરે કંપની માટે અનુસરે છે નથી {1}
+DocType: C-Form,C-Form,સી-ફોર્મ
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ઓપરેશન ID ને સુયોજિત નથી
+DocType: Production Order,Planned Start Date,આયોજિત પ્રારંભ તારીખ
+DocType: Serial No,Creation Document Type,બનાવટ દસ્તાવેજ પ્રકારની
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,નાના કદ. ની મુલાકાત લો
+DocType: Leave Type,Is Encash,વેચીને રોકડાં નાણાં કરવાં છે
+DocType: Purchase Invoice,Mobile No,મોબાઈલ નં
+DocType: Payment Tool,Make Journal Entry,જર્નલ પ્રવેશ કરો
+DocType: Leave Allocation,New Leaves Allocated,નવા પાંદડા સોંપાયેલ
+apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,પ્રોજેક્ટ મુજબના માહિતી અવતરણ માટે ઉપલબ્ધ નથી
+DocType: Project,Expected End Date,અપેક્ષિત ઓવરને તારીખ
+DocType: Appraisal Template,Appraisal Template Title,મૂલ્યાંકન ઢાંચો શીર્ષક
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,કોમર્શિયલ
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,પિતૃ વસ્તુ {0} સ્ટોક વસ્તુ ન હોવું જોઈએ
+DocType: Cost Center,Distribution Id,વિતરણ આઈડી
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,ઓસમ સેવાઓ
+apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,બધા ઉત્પાદનો અથવા સેવાઓ.
+DocType: Purchase Invoice,Supplier Address,પુરવઠોકર્તા સરનામું
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty આઉટ
+apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,નિયમો વેચાણ માટે શીપીંગ જથ્થો ગણતરી માટે
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,સિરીઝ ફરજિયાત છે
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ફાઈનાન્સિયલ સર્વિસીસ
+apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} એટ્રીબ્યુટ માટે કિંમત શ્રેણી અંદર હોવું જ જોઈએ {1} માટે {2} ના ઇન્ક્રીમેન્ટ {3}
+DocType: Tax Rule,Sales,સેલ્સ
+DocType: Stock Entry Detail,Basic Amount,મૂળભૂત રકમ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
+DocType: Leave Allocation,Unused leaves,નહિં વપરાયેલ પાંદડા
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,લાખોમાં
+DocType: Customer,Default Receivable Accounts,એકાઉન્ટ્સ પ્રાપ્ત મૂળભૂત
+DocType: Tax Rule,Billing State,બિલિંગ રાજ્ય
+DocType: Item Reorder,Transfer,ટ્રાન્સફર
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
+DocType: Authorization Rule,Applicable To (Employee),લાગુ કરો (કર્મચારી)
+apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,કારણે તારીખ ફરજિયાત છે
+apps/erpnext/erpnext/controllers/item_variant.py +51,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
+DocType: Landed Cost Voucher,Purchase Receipts,ખરીદી રસીદો
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,કેવી રીતે પ્રાઇસીંગ નિયમ લાગુ પડે છે?
+DocType: Quality Inspection,Delivery Note No,ડ લવર નોંધ કોઈ
+DocType: Company,Retail,છૂટક
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,ગ્રાહક {0} અસ્તિત્વમાં નથી
+DocType: Attendance,Absent,ગેરહાજર
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,ઉત્પાદન બંડલ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},રો {0}: અમાન્ય સંદર્ભ {1}
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,કર અને ખર્ચ ઢાંચો ખરીદી
+DocType: Upload Attendance,Download Template,ડાઉનલોડ નમૂનો
+DocType: GL Entry,Remarks,રીમાર્કસ
+DocType: Purchase Order Item Supplied,Raw Material Item Code,કાચો સામગ્રી વસ્તુ કોડ
+DocType: Journal Entry,Write Off Based On,પર આધારિત માંડવાળ
+DocType: Features Setup,POS View,POS જુઓ
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,સીરીયલ નંબર માટે સ્થાપન રેકોર્ડ
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,એક સ્પષ્ટ કરો
+DocType: Offer Letter,Awaiting Response,પ્રતિભાવ પ્રતીક્ષામાં
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ઉપર
+DocType: Salary Slip,Earning & Deduction,અર્નિંગ અને કપાત
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,એકાઉન્ટ {0} ગ્રુપ ન હોઈ શકે
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,Optional. This setting will be used to filter in various transactions.,વૈકલ્પિક. આ ગોઠવણી વિવિધ વ્યવહારો ફિલ્ટર કરવા માટે ઉપયોગ કરવામાં આવશે.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,નકારાત્મક મૂલ્યાંકન દર મંજૂરી નથી
+DocType: Holiday List,Weekly Off,અઠવાડિક બંધ
+DocType: Fiscal Year,"For e.g. 2012, 2012-13","દા.ત. 2012, 2012-13 માટે"
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,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
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},કંપની મૂળભૂત કિંમત {0} સુયોજિત કરો {1}
+DocType: Serial No,Creation Time,રચના સમય
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,કુલ આવક
+DocType: Sales Invoice,Product Bundle Help,ઉત્પાદન બંડલ મદદ
+,Monthly Attendance Sheet,માસિક હાજરી શીટ
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,મળ્યું નથી રેકોર્ડ
+apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ખર્ચ કેન્દ્રને વસ્તુ માટે ફરજિયાત છે {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,ઉત્પાદન બંડલ થી વસ્તુઓ વિચાર
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,એકાઉન્ટ {0} નિષ્ક્રિય છે
+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 +122,Please enter 'Is Subcontracted' as Yes or No,હા અથવા ના હોય તરીકે &#39;subcontracted છે&#39; દાખલ કરો
+DocType: Sales Team,Contact No.,સંપર્ક નંબર
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,એન્ટ્રી ખુલવાનો મંજૂરી નથી &#39;નફો અને નુકસાનનું&#39; પ્રકાર એકાઉન્ટ {0}
+DocType: Features Setup,Sales Discounts,સેલ્સ ડિસ્કાઉન્ટ
+DocType: Hub Settings,Seller Country,વિક્રેતા દેશ
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,વેબસાઇટ પર આઇટમ્સ પ્રકાશિત
+DocType: Authorization Rule,Authorization Rule,અધિકૃતિ નિયમ
+DocType: Sales Invoice,Terms and Conditions Details,નિયમો અને શરતો વિગતો
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,તરફથી
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,વેચાણ કર અને ખર્ચ ઢાંચો
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,એપેરલ અને એસેસરીઝ
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.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,શીપીંગ જથ્થો ગણતરી કરવા માટે શરતો સ્પષ્ટ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,બાળ ઉમેરો
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ભૂમિકા ફ્રોઝન એકાઉન્ટ્સ &amp; સંપાદિત કરો ફ્રોઝન પ્રવેશો સેટ કરવાની મંજૂરી
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"તે બાળક ગાંઠો છે, કારણ કે ખાતાવહી ખર્ચ કેન્દ્ર કન્વર્ટ કરી શકતા નથી"
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,સીરીયલ #
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,સેલ્સ પર કમિશન
+DocType: Offer Letter Term,Value / Description,ભાવ / વર્ણન
+DocType: Tax Rule,Billing Country,બિલિંગ દેશ
+,Customers Not Buying Since Long Time,ગ્રાહકો લાંબા સમયથી ખરીદી નથી
+DocType: Production Order,Expected Delivery Date,અપેક્ષિત બોલ તારીખ
+apps/erpnext/erpnext/accounts/general_ledger.py +121,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 +93,Entertainment Expenses,મનોરંજન ખર્ચ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,આ વેચાણ ઓર્ડર રદ પહેલાં ભરતિયું {0} રદ થયેલ હોવું જ જોઈએ સેલ્સ
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,ઉંમર
+DocType: Time Log,Billing Amount,બિલિંગ રકમ
+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 +18,Applications for leave.,રજા માટે કાર્યક્રમો.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,હાલની વ્યવહાર સાથે એકાઉન્ટ કાઢી શકાતી નથી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,કાનૂની ખર્ચ
+DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ઓટો ક્રમમાં 05, 28 વગેરે દા.ત. પેદા થશે કે જેના પર મહિનાનો દિવસ"
+DocType: Sales Invoice,Posting Time,પોસ્ટિંગ સમય
+DocType: Sales Order,% Amount Billed,% રકમ ગણાવી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,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 +107,No Item with Serial No {0},સીરીયલ કોઈ સાથે કોઈ વસ્તુ {0}
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ઓપન સૂચનાઓ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,પ્રત્યક્ષ ખર્ચ
+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 +132,Travel Expenses,પ્રવાસ ખર્ચ
+DocType: Maintenance Visit,Breakdown,વિરામ
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,ખાતું: {0} ચલણ સાથે: {1} પસંદ કરી શકાતી નથી
+DocType: Bank Reconciliation Detail,Cheque Date,ચેક તારીખ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},એકાઉન્ટ {0}: પિતૃ એકાઉન્ટ {1} કંપની ને અનુલક્ષતું નથી: {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,સફળતાપૂર્વક આ કંપની સંબંધિત તમામ વ્યવહારો કાઢી!
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,તારીખના રોજ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,પ્રોબેશન
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,મૂળભૂત વેરહાઉસ સ્ટોક વસ્તુ માટે ફરજિયાત છે.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},મહિના માટે પગાર ચુકવણી {0} અને વર્ષ {1}
+DocType: Stock Settings,Auto insert Price List rate if missing,ઓટો સામેલ ભાવ યાદી દર ગુમ તો
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,કુલ ભરપાઈ રકમ
+,Transferred Qty,પરિવહન Qty
+apps/erpnext/erpnext/config/learn.py +11,Navigating,શોધખોળ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,આયોજન
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,સમય લોગ બેચ બનાવવા
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,જારી
+DocType: Project,Total Billing Amount (via Time Logs),કુલ બિલિંગ રકમ (સમય લોગ મારફતે)
+apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,અમે આ આઇટમ વેચાણ
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,પુરવઠોકર્તા આઈડી
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,જથ્થો 0 કરતાં મોટી હોવી જોઈએ
+DocType: Journal Entry,Cash Entry,કેશ એન્ટ્રી
+DocType: Sales Partner,Contact Desc,સંપર્ક DESC
+apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","કેઝ્યુઅલ જેવા પાંદડા પ્રકાર, માંદા વગેરે"
+DocType: Email Digest,Send regular summary reports via Email.,ઈમેઈલ મારફતે નિયમિત સારાંશ અહેવાલ મોકલો.
+DocType: Brand,Item Manager,વસ્તુ વ્યવસ્થાપક
+DocType: Cost Center,Add rows to set annual budgets on Accounts.,એકાઉન્ટ્સ વાર્ષિક બજેટ સુયોજિત કરવા માટે પંક્તિઓ ઉમેરો.
+DocType: Buying Settings,Default Supplier Type,મૂળભૂત પુરવઠોકર્તા પ્રકાર
+DocType: Production Order,Total Operating Cost,કુલ સંચાલન ખર્ચ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,નોંધ: વસ્તુ {0} ઘણી વખત દાખલ
+apps/erpnext/erpnext/config/crm.py +27,All Contacts.,બધા સંપર્કો.
+DocType: Newsletter,Test Email Id,પરીક્ષણ ઇમેઇલ આઈડી
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,કંપની સંક્ષેપનો
+DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,તમે ગુણવત્તા નિરીક્ષણ અનુસરો. ખરીદી રસીદ કોઈ વસ્તુ QA જરૂરી અને QA સક્રિય કરે છે
+DocType: GL Entry,Party Type,પાર્ટી પ્રકાર
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,કાચો માલ મુખ્ય વસ્તુ તરીકે જ ન હોઈ શકે
+DocType: Item Attribute Value,Abbreviation,સંક્ષેપનો
+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 +115,Salary template master.,પગાર નમૂનો માસ્ટર.
+DocType: Leave Type,Max Days Leave Allowed,મેક્સ દિવસો રજા આપવામાં
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,શોપિંગ કાર્ટ માટે સેટ ટેક્સ નિયમ
+DocType: Payment Tool,Set Matching Amounts,સેટ મેચિંગ માત્રામાં
+DocType: Purchase Invoice,Taxes and Charges Added,કર અને ખર્ચ ઉમેર્યું
+,Sales Funnel,વેચાણ નાળચું
+apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,સંક્ષેપનો ફરજિયાત છે
+apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,કાર્ટ
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,અમારી સુધારાઓ ઉમેદવારી નોંધાવવા માં તમારા રસ માટે આભાર
+,Qty to Transfer,પરિવહન માટે Qty
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,દોરી જાય છે અથવા ગ્રાહકો માટે ખર્ચ.
+DocType: Stock Settings,Role Allowed to edit frozen stock,ભૂમિકા સ્થિર સ્ટોક ફેરફાર કરવા માટે પરવાનગી
+,Territory Target Variance Item Group-Wise,પ્રદેશ લક્ષ્યાંક ફેરફાર વસ્તુ ગ્રુપ મુજબની
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,બધા ગ્રાહક જૂથો
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,ટેક્સ ઢાંચો ફરજિયાત છે.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,એકાઉન્ટ {0}: પિતૃ એકાઉન્ટ {1} અસ્તિત્વમાં નથી
+DocType: Purchase Invoice Item,Price List Rate (Company Currency),ભાવ યાદી દર (કંપની ચલણ)
+DocType: Account,Temporary,કામચલાઉ
+DocType: Address,Preferred Billing Address,મનપસંદ બિલિંગ સરનામું
+DocType: Monthly Distribution Percentage,Percentage Allocation,ટકાવારી ફાળવણી
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,સચિવ
+DocType: Serial No,Distinct unit of an Item,આઇટમ અલગ એકમ
+DocType: Pricing Rule,Buying,ખરીદી
+DocType: HR Settings,Employee Records to be created by,કર્મચારીનું રેકોર્ડ્સ દ્વારા બનાવી શકાય
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,આ સમય લોગ બેચ રદ કરવામાં આવી છે.
+,Reqd By Date,Reqd તારીખ દ્વારા
+DocType: Salary Slip Earning,Salary Slip Earning,પગાર કાપલી અર્નિંગ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,ક્રેડિટર્સ
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,ROW # {0}: સીરીયલ કોઈ ફરજિયાત છે
+DocType: Purchase Taxes and Charges,Item Wise Tax Detail,વસ્તુ વાઈસ ટેક્સ વિગતવાર
+,Item-wise Price List Rate,વસ્તુ મુજબના ભાવ યાદી દર
+DocType: Purchase Order Item,Supplier Quotation,પુરવઠોકર્તા અવતરણ
+DocType: Quotation,In Words will be visible once you save the Quotation.,તમે આ અવતરણ સેવ વાર શબ્દો દૃશ્યમાન થશે.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} બંધ છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},બારકોડ {0} પહેલાથી જ વસ્તુ ઉપયોગ {1}
+DocType: Lead,Add to calendar on this date,આ તારીખ પર કૅલેન્ડર ઉમેરો
+apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,શિપિંગ ખર્ચ ઉમેરવા માટે નિયમો.
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,આવનારી પ્રવૃત્તિઓ
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ગ્રાહક જરૂરી છે
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,ઝડપી એન્ટ્રી
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} રીટર્ન ફરજિયાત છે
+DocType: Purchase Order,To Receive,પ્રાપ્ત
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,user@example.com,user@example.com
+DocType: Email Digest,Income / Expense,આવક / ખર્ચ
+DocType: Employee,Personal Email,વ્યક્તિગત ઇમેઇલ
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,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,બ્રોકરેજ
+DocType: Address,Postal Code,પોસ્ટ કોડ
+DocType: Production Order Operation,"in Minutes
+Updated via 'Time Log'",મિનિટ &#39;સમય લોગ&#39; મારફતે સુધારાશે
+DocType: Customer,From Lead,લીડ પ્રતિ
+apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,ઓર્ડર્સ ઉત્પાદન માટે પ્રકાશિત થાય છે.
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ફિસ્કલ વર્ષ પસંદ કરો ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
+DocType: Hub Settings,Name Token,નામ ટોકન
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,બદલો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} સેલ્સ ભરતિયું સામે {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,માપવા એકમ મૂળભૂત દાખલ કરો
+DocType: Purchase Invoice Item,Project Name,પ્રોજેક્ટ નામ
+DocType: Supplier,Mention if non-standard receivable account,ઉલ્લેખ બિન પ્રમાણભૂત મળવાપાત્ર એકાઉન્ટ તો
+DocType: Journal Entry Account,If Income or Expense,આવક અથવા ખર્ચ તો
+DocType: Features Setup,Item Batch Nos,વસ્તુ બેચ અમે
+DocType: Stock Ledger Entry,Stock Value Difference,સ્ટોક વેલ્યુ તફાવત
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,માનવ સંસાધન
+DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ચુકવણી રિકંસીલેશન ચુકવણી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,ટેક્સ અસ્કયામતો
+DocType: BOM Item,BOM No,BOM કોઈ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,Journal Entry {0} does not have account {1} or already matched against other voucher,જર્નલ પ્રવેશ {0} {1} અથવા પહેલેથી જ અન્ય વાઉચર સામે મેળ ખાતી એકાઉન્ટ નથી
+DocType: Item,Moving Average,ખસેડવું સરેરાશ
+DocType: BOM Replace Tool,The BOM which will be replaced,બદલાયેલ હશે જે બોમ
+DocType: Account,Debit,ડેબિટ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,પાંદડા 0.5 ના ગુણાંકમાં ફાળવવામાં હોવું જ જોઈએ
+DocType: Production Order,Operation Cost,ઓપરેશન ખર્ચ
+apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,એક CSV ફાઈલ માંથી હાજરી અપલોડ કરો
+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: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","આ મુદ્દો સોંપવા માટે, સાઇડબારમાં &quot;સોંપી&quot; બટન વાપરો."
+DocType: Stock Settings,Freeze Stocks Older Than [Days],ફ્રીઝ સ્ટોક્સ કરતાં જૂની [ટ્રેડીંગ]
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"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.","બે અથવા વધુ કિંમતના નિયમોમાં ઉપર શરતો પર આધારિત જોવા મળે છે, પ્રાધાન્યતા લાગુ પડે છે. મૂળભૂત કિંમત શૂન્ય (ખાલી) છે, જ્યારે પ્રાધાન્યતા 20 0 વચ્ચે એક નંબર છે. ઉચ્ચ નંબર સમાન શરતો સાથે બહુવિધ પ્રાઇસીંગ નિયમો હોય છે, જો તે અગ્રતા લે છે એનો અર્થ એ થાય."
+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 +155,Types of Expense Claim.,ખર્ચ દાવા પ્રકાર.
+DocType: Item,Taxes,કર
+DocType: Project,Default Cost Center,મૂળભૂત ખર્ચ કેન્દ્રને
+DocType: Purchase Invoice,End Date,સમાપ્તિ તારીખ
+DocType: Employee,Internal Work History,આંતરિક કામ ઇતિહાસ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,પ્રાઇવેટ ઇક્વિટી
+DocType: Maintenance Visit,Customer Feedback,ગ્રાહક પ્રતિસાદ
+DocType: Account,Expense,ખર્ચ
+DocType: Sales Invoice,Exhibition,પ્રદર્શન
+DocType: Item Attribute,From Range,શ્રેણી
+apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,ત્યારથી તે અવગણવામાં વસ્તુ {0} સ્ટોક વસ્તુ નથી
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,વધુ પ્રક્રિયા માટે આ ઉત્પાદન ઓર્ડર સબમિટ કરો.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ચોક્કસ વ્યવહાર માં પ્રાઇસીંગ નિયમ લાગુ નથી, બધા લાગુ કિંમતના નિયમોમાં નિષ્ક્રિય થવી જોઈએ."
+DocType: Company,Domain,ડોમેન
+,Sales Order Trends,વેચાણ ઓર્ડર પ્રવાહો
+DocType: Employee,Held On,આયોજન પર
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ઉત્પાદન વસ્તુ
+,Employee Information,કર્મચારીનું માહિતી
+apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),દર (%)
+DocType: Stock Entry Detail,Additional Cost,વધારાના ખર્ચ
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,નાણાકીય વર્ષ સમાપ્તિ તારીખ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","વાઉચર કોઈ પર આધારિત ફિલ્ટર કરી શકો છો, વાઉચર દ્વારા જૂથ તો"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,પુરવઠોકર્તા અવતરણ બનાવો
+DocType: Quality Inspection,Incoming,ઇનકમિંગ
+DocType: BOM,Materials Required (Exploded),મટિરીયલ્સ (વિસ્ફોટ) જરૂરી
+DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),પગાર વિના રજા માટે અર્નિંગ ઘટાડો (LWP)
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,"Add users to your organization, other than yourself","જાતે કરતાં અન્ય, તમારી સંસ્થા માટે વપરાશકર્તાઓ ઉમેરો"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},ROW # {0}: સીરીયલ કોઈ {1} સાથે મેળ ખાતું નથી {2} {3}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,પરચુરણ રજા
+DocType: Batch,Batch ID,બેચ ID ને
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},નોંધ: {0}
+,Delivery Note Trends,ડ લવર નોંધ પ્રવાહો
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,આ અઠવાડિયાના સારાંશ
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} પંક્તિમાં ખરીદી અથવા પેટા કોન્ટ્રાક્ટ વસ્તુ જ હોવી જોઈએ {1}
+apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,ખાતું: {0} માત્ર સ્ટોક વ્યવહારો દ્વારા સુધારી શકાય છે
+DocType: GL Entry,Party,પાર્ટી
+DocType: Sales Order,Delivery Date,સોંપણી તારીખ
+DocType: Opportunity,Opportunity Date,તક તારીખ
+DocType: Purchase Receipt,Return Against Purchase Receipt,ખરીદી રસીદ સામે પાછા ફરો
+DocType: Purchase Order,To Bill,બિલ
+DocType: Material Request,% Ordered,% આદેશ આપ્યો
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,છૂટક કામ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,સરેરાશ. ખરીદી દર
+DocType: Task,Actual Time (in Hours),(કલાકોમાં) વાસ્તવિક સમય
+DocType: Employee,History In Company,કંપની ઇતિહાસ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,ન્યૂઝલેટર્સ
+DocType: Address,Shipping,વહાણ પરિવહન
+DocType: Stock Ledger Entry,Stock Ledger Entry,સ્ટોક ખાતાવહી એન્ટ્રી
+DocType: Department,Leave Block List,બ્લોક યાદી છોડો
+DocType: Customer,Tax ID,કરવેરા ID ને
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,{0} વસ્તુ સીરીયલ અમે માટે સુયોજિત નથી. કોલમ ખાલી હોવા જ જોઈએ
+DocType: Accounts Settings,Accounts Settings,સેટિંગ્સ એકાઉન્ટ્સ
+DocType: Customer,Sales Partner and Commission,વેચાણ ભાગીદાર અને કમિશન
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,પ્લાન્ટ અને મશીનરી
+DocType: Sales Partner,Partner's Website,જીવનસાથી વેબસાઈટ
+DocType: Opportunity,To Discuss,ચર્ચા કરવા માટે
+DocType: SMS Settings,SMS Settings,એસએમએસ સેટિંગ્સ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,કામચલાઉ ખાતાઓને
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,બ્લેક
+DocType: BOM Explosion Item,BOM Explosion Item,BOM વિસ્ફોટ વસ્તુ
+DocType: Account,Auditor,ઓડિટર
+DocType: Purchase Order,End date of current order's period,વર્તમાન ઓર્ડર માતાનો સમયગાળા ઓવરને અંતે તારીખ
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ઓફર લેટર બનાવો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,રીટર્ન
+DocType: Production Order Operation,Production Order Operation,ઉત્પાદન ઓર્ડર ઓપરેશન
+DocType: Pricing Rule,Disable,અક્ષમ કરો
+DocType: Project Task,Pending Review,બાકી સમીક્ષા
+DocType: Task,Total Expense Claim (via Expense Claim),(ખર્ચ દાવો મારફતે) કુલ ખર્ચ દાવો
+apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ગ્રાહક આઈડી
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,સમય સમય કરતાં મોટી હોવી જ જોઈએ કરવા માટે
+DocType: Journal Entry Account,Exchange Rate,વિનિમય દર
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},વેરહાઉસ {0}: પિતૃ એકાઉન્ટ {1} કંપની bolong નથી {2}
+DocType: BOM,Last Purchase Rate,છેલ્લા ખરીદી દર
+DocType: Account,Asset,એસેટ
+DocType: Project Task,Task ID,ટાસ્ક ID ને
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",દા.ત. &quot;MC&quot;
+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 +104,Warehouse {0} does not exist,વેરહાઉસ {0} અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext હબ માટે નોંધણી
+DocType: Monthly Distribution,Monthly Distribution Percentages,માસિક વિતરણ ટકાવારી
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,પસંદ કરેલ વસ્તુ બેચ હોઈ શકે નહિં
+DocType: Delivery Note,% of materials delivered against this Delivery Note,સામગ્રી% આ બોલ પર કોઈ નોંધ સામે વિતરિત
+DocType: Customer,Customer Details,ગ્રાહક વિગતો
+DocType: Employee,Reports to,અહેવાલો
+DocType: SMS Settings,Enter url parameter for receiver nos,રીસીવર અમે માટે URL પરિમાણ દાખલ
+DocType: Sales Invoice,Paid Amount,ચૂકવેલ રકમ
+,Available Stock for Packing Items,પેકિંગ આઇટમ્સ માટે ઉપલબ્ધ સ્ટોક
+DocType: Item Variant,Item Variant,વસ્તુ વેરિએન્ટ
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,અન્ય કોઈ મૂળભૂત છે કારણ કે ત્યાં મૂળભૂત તરીકે આ સરનામું ઢાંચો સુયોજિત કરી રહ્યા છે
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,ક્વોલિટી મેનેજમેન્ટ
+DocType: Production Planning Tool,Filter based on customer,ફિલ્ટર ગ્રાહક પર આધારિત
+DocType: Payment Tool Detail,Against Voucher No,વાઉચર વિરુદ્ધમાં કોઇ
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},વસ્તુ માટે જથ્થો દાખલ કરો {0}
+DocType: Employee External Work History,Employee External Work History,કર્મચારીનું બાહ્ય કામ ઇતિહાસ
+DocType: Tax Rule,Purchase,ખરીદી
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,બેલેન્સ Qty
+DocType: Item Group,Parent Item Group,પિતૃ વસ્તુ ગ્રુપ
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} માટે {1}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,કિંમત કેન્દ્રો
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,વખારો.
+DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,જે સપ્લાયર ચલણ પર દર કંપનીના આધાર ચલણ ફેરવાય છે
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},ROW # {0}: પંક્તિ સાથે સમય તકરાર {1}
+DocType: Opportunity,Next Contact,આગામી સંપર્ક
+DocType: Employee,Employment Type,રોજગાર પ્રકાર
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,"ચોક્કસ સંપતી, નક્કી કરેલી સંપતી"
+,Cash Flow,રોકડ પ્રવાહ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,એપ્લિકેશન સમયગાળા બે alocation રેકોર્ડ તરફ ન હોઈ શકે
+DocType: Item Group,Default Expense Account,મૂળભૂત ખર્ચ એકાઉન્ટ
+DocType: Employee,Notice (days),સૂચના (દિવસ)
+DocType: Tax Rule,Sales Tax Template,સેલ્સ ટેક્સ ઢાંચો
+DocType: Employee,Encashment Date,એન્કેશમેન્ટ તારીખ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry",વાઉચર સામે પ્રકારની ખરીદી ઓર્ડર ઓફ એક ખરીદી ભરતિયું અથવા જર્નલ પ્રવેશ હોવા જ જોઈએ
+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/selling/page/sales_browser/sales_browser.js +121,New {0} Name,ન્યૂ {0} નામ
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},શોધવા કૃપા કરીને જોડાયેલ {0} # {1}
+DocType: Job Applicant,Applicant Name,અરજદારનું નામ
+DocType: Authorization Rule,Customer / Item Name,ગ્રાહક / વસ્તુ નામ
+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**. 
+
+The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
+
+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","અન્ય ** વસ્તુ માં ** ** વસ્તુઓ ના એકંદર જૂથ **. ** તમે ચોક્કસ ** વસ્તુઓ સમાવાયા હોય તો આ એક પેકેજ માં ** ઉપયોગી છે અને તમે ભરેલા ** વસ્તુઓ સ્ટોક ** નથી અને એકંદર ** વસ્તુ જાળવી રાખે છે. પેકેજ ** ** વસ્તુ હશે &quot;ના&quot; અને &quot;હા&quot; કે &quot;સેલ્સ વસ્તુ છે&quot; તરીકે &quot;સ્ટોક વસ્તુ છે.&quot; ઉદાહરણ તરીકે: ગ્રાહક બંને ખરીદે તો તમે અલગ લેપટોપ અને Backpacks વેચાણ કરવામાં આવે છે અને જો ખાસ ભાવ હોય, તો પછી લેપટોપ + Backpack નવા ઉત્પાદન બંડલ વસ્તુ હશે. નોંધ: સામગ્રી BOM = બિલ"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},સીરીયલ કોઈ વસ્તુ માટે ફરજિયાત છે {0}
+DocType: Item Variant Attribute,Attribute,એટ્રીબ્યુટ
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,શ્રેણી / માંથી સ્પષ્ટ કરો
+DocType: Serial No,Under AMC,એએમસી હેઠળ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,વસ્તુ મૂલ્યાંકન દર ઉતર્યા ખર્ચ વાઉચર જથ્થો વિચારણા recalculated છે
+apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,વ્યવહારો વેચાણ માટે મૂળભૂત સુયોજનો.
+DocType: BOM Replace Tool,Current BOM,વર્તમાન BOM
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,સીરીયલ કોઈ ઉમેરો
+DocType: Production Order,Warehouses,વખારો
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,પ્રિન્ટ અને સ્થિર
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,ગ્રુપ નોડ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,સુધારા ફિનિશ્ડ ગૂડ્સ
+DocType: Workstation,per hour,કલાક દીઠ
+DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,વેરહાઉસ (પર્પેચ્યુઅલ ઈન્વેન્ટરી) માટે એકાઉન્ટ આ એકાઉન્ટ હેઠળ બનાવવામાં આવશે.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,સ્ટોક ખાતાવહી પ્રવેશ આ વેરહાઉસ માટે અસ્તિત્વમાં તરીકે વેરહાઉસ કાઢી શકાતી નથી.
+DocType: Company,Distribution,વિતરણ
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,રકમ ચૂકવવામાં
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,પ્રોજેક્ટ મેનેજર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,રવાનગી
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,આઇટમ માટે મંજૂરી મેક્સ ડિસ્કાઉન્ટ: {0} {1}% છે
+DocType: Account,Receivable,પ્રાપ્ત
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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.,સેટ ક્રેડિટ મર્યાદા કરતાં વધી કે વ્યવહારો સબમિટ કરવા માટે માન્ય છે તે ભૂમિકા.
+DocType: Sales Invoice,Supplier Reference,પુરવઠોકર્તા સંદર્ભ
+DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","ચકાસાયેલ હોય, તો પેટા વિધાનસભા આઇટમ્સ માટે BOM કાચી સામગ્રી મેળવવા માટે ધ્યાનમાં લેવામાં આવશે. નહિંતર, તમામ પેટા વિધાનસભા વસ્તુઓ કાચા માલ તરીકે ગણવામાં આવશે."
+DocType: Material Request,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,સાબુ સફાઈકારક
+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,આદેશ આપ્યો
+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,ભૂમિકા એપ્રૂવિંગ અથવા વપરાશકર્તા એપ્રૂવિંગ દાખલ કરો
+DocType: Journal Entry,Write Off Entry,એન્ટ્રી માંડવાળ
+DocType: BOM,Rate Of Materials Based On,દર સામગ્રી પર આધારિત
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,આધાર Analtyics
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},કંપની વખારો માં ગુમ થયેલ {0}
+DocType: POS Profile,Terms and Conditions,નિયમો અને શરત
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},"તારીખ કરવા માટે, નાણાકીય વર્ષ અંદર પ્રયત્ન કરીશું. = તારીખ ધારી રહ્યા છીએ {0}"
+DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","અહીં તમે વગેરે ઊંચાઇ, વજન, એલર્જી, તબીબી બાબતો જાળવી શકે છે"
+DocType: Leave Block List,Applies to Company,કંપની માટે લાગુ પડે છે
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,સબમિટ સ્ટોક એન્ટ્રી {0} અસ્તિત્વમાં છે કારણ કે રદ કરી શકાતી નથી
+DocType: Purchase Invoice,In Words,શબ્દો માં
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,આજે {0} &#39;જન્મદિવસ છે!
+DocType: Production Planning Tool,Material Request For Warehouse,વેરહાઉસ માટે સામગ્રી અરજી
+DocType: Sales Order Item,For Production,ઉત્પાદન માટે
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,ઉપર ટેબલ વેચાણ ઓર્ડર દાખલ કરો
+DocType: Project Task,View Task,જુઓ ટાસ્ક
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,તમારી નાણાકીય વર્ષ શરૂ થાય છે
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,ખરીદી રસીદો દાખલ કરો
+DocType: Sales Invoice,Get Advances Received,એડવાન્સિસ પ્રાપ્ત કરો
+DocType: Email Digest,Add/Remove Recipients,મેળવનારા ઉમેરો / દૂર કરો
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),આધાર ઇમેઇલ ID ને માટે સેટઅપ ઇનકમ ગ સવર. (દા.ત. support@example.com)
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,અછત Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
+DocType: Salary Slip,Salary Slip,પગાર કાપલી
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;તારીખ કરવા માટે&#39; જરૂરી છે
+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: BOM,Manage cost of operations,કામગીરી ખર્ચ મેનેજ કરો
+DocType: Features Setup,Item Advanced,વસ્તુ ઉન્નત
+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; માટે એક ઇમેઇલ મોકલવા માટે ખોલવામાં આવી હતી. વપરાશકર્તા શકે છે અથવા ઇમેઇલ મોકલી શકે છે."
+apps/erpnext/erpnext/config/setup.py +14,Global Settings,વૈશ્વિક સેટિંગ્સ
+DocType: Employee Education,Employee Education,કર્મચારીનું શિક્ષણ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,તે વસ્તુ વિગતો મેળવવા માટે જરૂરી છે.
+DocType: Salary Slip,Net Pay,નેટ પે
+DocType: Account,Account,એકાઉન્ટ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,સીરીયલ કોઈ {0} પહેલાથી જ પ્રાપ્ત કરવામાં આવ્યો છે
+,Requested Items To Be Transferred,વિનંતી વસ્તુઓ ટ્રાન્સફર કરી
+DocType: Purchase Invoice,Recurring Id,રીકરીંગ આઈડી
+DocType: Customer,Sales Team Details,સેલ્સ ટીમ વિગતો
+DocType: Expense Claim,Total Claimed Amount,કુલ દાવો રકમ
+apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,વેચાણ માટે સંભવિત તકો.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},અમાન્ય {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,માંદગી રજા
+DocType: Email Digest,Email Digest,ઇમેઇલ ડાયજેસ્ટ
+DocType: Delivery Note,Billing Address Name,બિલિંગ સરનામું નામ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ડિપાર્ટમેન્ટ સ્ટોર્સ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,સિસ્ટમ બેલેન્સ
+apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,નીચેના વખારો માટે કોઈ હિસાબ પ્રવેશો
+apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,પ્રથમ દસ્તાવેજ સાચવો.
+DocType: Account,Chargeable,લેવાપાત્ર
+DocType: Company,Change Abbreviation,બદલો સંક્ષેપનો
+DocType: Expense Claim Detail,Expense Date,ખર્ચ તારીખ
+DocType: Item,Max Discount (%),મેક્સ ડિસ્કાઉન્ટ (%)
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,છેલ્લે ઓર્ડર રકમ
+DocType: Company,Warn,ચેતવો
+DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","કોઈપણ અન્ય ટીકા, રેકોર્ડ જવા જોઈએ કે નોંધપાત્ર પ્રયાસ."
+DocType: BOM,Manufacturing User,ઉત્પાદન વપરાશકર્તા
+DocType: Purchase Order,Raw Materials Supplied,કાચો માલ પાડેલ
+DocType: Purchase Invoice,Recurring Print Format,રીકરીંગ પ્રિન્ટ ફોર્મેટ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,અપેક્ષિત બોલ તારીખ ખરીદી ઓર્ડર તારીખ પહેલાં ન હોઈ શકે
+DocType: Appraisal,Appraisal Template,મૂલ્યાંકન ઢાંચો
+DocType: Item Group,Item Classification,વસ્તુ વર્ગીકરણ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,બિઝનેસ ડેવલપમેન્ટ મેનેજર
+DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,જાળવણી મુલાકાત લો હેતુ
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,પીરિયડ
+,General Ledger,સામાન્ય ખાતાવહી
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,જુઓ તરફ દોરી જાય છે
+DocType: Item Attribute Value,Attribute Value,લક્ષણની કિંમત
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","ઇમેઇલ ID ને પહેલાથી જ અસ્તિત્વમાં છે, અનન્ય હોવો જોઈએ {0}"
+,Itemwise Recommended Reorder Level,મુદ્દાવાર પુનઃક્રમાંકિત કરો સ્તર ભલામણ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,પ્રથમ {0} પસંદ કરો
+DocType: Features Setup,To get Item Group in details table,વિગતો ટેબલ વસ્તુ જૂથ વિચાર
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,વસ્તુ બેચ {0} {1} સમયસીમા સમાપ્ત થઈ ગઈ છે.
+DocType: Sales Invoice,Commission,કમિશન
+DocType: Address Template,"<h4>Default Template</h4>
+<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
+<pre><code>{{ address_line1 }}&lt;br&gt;
+{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
+{{ city }}&lt;br&gt;
+{% if state %}{{ state }}&lt;br&gt;{% endif -%}
+{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
+{{ country }}&lt;br&gt;
+{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
+{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
+{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
+</code></pre>","<h4> ડિફૉલ્ટ નમૂનો </h4><p> ઉપયોગ <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> અને ઉપલબ્ધ હશે (જો કોઈ હોય તો કસ્ટમ ક્ષેત્રો સહિત) સરનામું તમામ ક્ષેત્રો </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
+DocType: Salary Slip Deduction,Default Amount,મૂળભૂત રકમ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,વેરહાઉસ સિસ્ટમમાં મળ્યા નથી
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,આ મહિનો સારાંશ
+DocType: Quality Inspection Reading,Quality Inspection Reading,ગુણવત્તા નિરીક્ષણ વાંચન
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`ફ્રીઝ સ્ટોક્સ જૂની Than`% d દિવસ કરતાં ઓછું હોવું જોઈએ.
+DocType: Tax Rule,Purchase Tax Template,ટેક્સ ઢાંચો ખરીદી
+,Project wise Stock Tracking,પ્રોજેક્ટ મુજબની સ્ટોક ટ્રેકિંગ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},જાળવણી સુનિશ્ચિત {0} સામે અસ્તિત્વમાં {0}
+DocType: Stock Entry Detail,Actual Qty (at source/target),(સ્રોત / લક્ષ્ય પર) વાસ્તવિક Qty
+DocType: Item Customer Detail,Ref Code,સંદર્ભ કોડ
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,કર્મચારીનું રેકોર્ડ.
+DocType: HR Settings,Payroll Settings,પગારપત્રક સેટિંગ્સ
+apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,બિન-કડી ઇનવૉઇસેસ અને ચૂકવણી મેળ ખાય છે.
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,ઓર્ડર કરો
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,રુટ પિતૃ ખર્ચ કેન્દ્રને હોઈ શકે નહિં
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,બ્રાન્ડ પસંદ કરો ...
+DocType: Sales Invoice,C-Form Applicable,સી-ફોર્મ લાગુ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},ઓપરેશન સમય ઓપરેશન કરતાં વધારે 0 હોવા જ જોઈએ {0}
+DocType: Supplier,Address and Contacts,એડ્રેસ અને સંપર્કો
+DocType: UOM Conversion Detail,UOM Conversion Detail,UOM રૂપાંતર વિગતવાર
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),100 પીએક્સ દ્વારા તે (ડબલ્યુ) વેબ મૈત્રી 900px રાખો (h)
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,ઉત્પાદન ઓર્ડર એક વસ્તુ ઢાંચો સામે ઊભા કરી શકાતી નથી
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,સમાયોજિત દરેક વસ્તુ સામે ખરીદી રસીદ અપડેટ કરવામાં આવે છે
+DocType: Payment Tool,Get Outstanding Vouchers,ઉત્કૃષ્ટ વાઉચર મેળવો
+DocType: Warranty Claim,Resolved By,દ્વારા ઉકેલાઈ
+DocType: Appraisal,Start Date,પ્રારંભ તારીખ
+apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,સમયગાળા માટે પાંદડા ફાળવો.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,ચકાસવા માટે અહીં ક્લિક કરો
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,એકાઉન્ટ {0}: તમે પિતૃ એકાઉન્ટ તરીકે પોતાને સોંપી શકો છો
+DocType: Purchase Invoice Item,Price List Rate,ભાવ યાદી દર
+DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",&quot;સ્ટોક&quot; અથવા આ વેરહાઉસ ઉપલબ્ધ સ્ટોક પર આધારિત &quot;નથી સ્ટોક&quot; શો.
+apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),સામગ્રી બિલ (BOM)
+DocType: Item,Average time taken by the supplier to deliver,સપ્લાયર દ્વારા લેવામાં સરેરાશ સમય પહોંચાડવા માટે
+DocType: Time Log,Hours,કલાક
+DocType: Project,Expected Start Date,અપેક્ષિત પ્રારંભ તારીખ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,ખર્ચ કે આઇટમ પર લાગુ નથી તો આઇટમ દૂર
+DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ઉદા. smsgateway.com/api/send_sms.cgi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,પ્રાપ્ત
+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: Employee Leave Approver,Employee Leave Approver,કર્મચારી રજા તાજનો
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} સફળતાપૂર્વક અમારા ન્યૂઝલેટર યાદીમાં ઉમેરવામાં આવ્યું છે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},રો {0}: એક પુનઃક્રમાંકિત કરો પ્રવેશ પહેલેથી જ આ વેરહાઉસ માટે અસ્તિત્વમાં {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","અવતરણ કરવામાં આવી છે, કારણ કે લોસ્ટ જાહેર કરી શકતા નથી."
+DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ખરીદી માસ્ટર વ્યવસ્થાપક
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,ઓર્ડર {0} સબમિટ હોવું જ જોઈએ ઉત્પાદન
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},વસ્તુ માટે શરૂઆત તારીખ અને સમાપ્તિ તારીખ પસંદ કરો {0}
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,મુખ્ય અહેવાલો
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,તારીખ કરવા માટે તારીખથી પહેલાં ન હોઈ શકે
+DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
+apps/erpnext/erpnext/stock/doctype/item/item.js +193,Add / Edit Prices,/ સંપાદિત કરો ભાવમાં ઉમેરો
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,કિંમત કેન્દ્રો ચાર્ટ
+,Requested Items To Be Ordered,વિનંતી વસ્તુઓ ઓર્ડર કરી
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +295,My Orders,મારા ઓર્ડર
+DocType: Price List,Price List Name,ભાવ યાદી નામ
+DocType: Time Log,For Manufacturing,ઉત્પાદન માટે
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,કૂલ
+DocType: BOM,Manufacturing,ઉત્પાદન
+,Ordered Items To Be Delivered,આદેશ આપ્યો વસ્તુઓ પહોંચાડી શકાય
+DocType: Account,Income,આવક
+DocType: Industry Type,Industry Type,ઉદ્યોગ પ્રકાર
+apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,કંઈક ખોટું થયું!
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,ચેતવણી: છોડો અરજીને પગલે બ્લોક તારીખો સમાવે
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,ભરતિયું {0} પહેલાથી જ સબમિટ કરવામાં આવી છે સેલ્સ
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,પૂર્ણાહુતિ તારીખ્
+DocType: Purchase Invoice Item,Amount (Company Currency),રકમ (કંપની ચલણ)
+apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,સંસ્થા યુનિટ (વિભાગ) માસ્ટર.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,માન્ય મોબાઇલ અમે દાખલ કરો
+DocType: Budget Detail,Budget Detail,બજેટ વિગતવાર
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,મોકલતા પહેલા સંદેશ દાખલ કરો
+apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,પોઇન્ટ ઓફ સેલ પ્રોફાઇલ
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,એસએમએસ સેટિંગ્સ અપડેટ કરો
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,પહેલેથી જ બિલ સમય લોગ {0}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,અસુરક્ષીત લોન્સ
+DocType: Cost Center,Cost Center Name,ખર્ચ કેન્દ્રને નામ
+DocType: Maintenance Schedule Detail,Scheduled Date,અનુસૂચિત તારીખ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,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,પ્રાપ્ત થઈ છે અને સ્વીકારાયું
+,Serial No Service Contract Expiry,સીરીયલ કોઈ સેવા કોન્ટ્રેક્ટ સમાપ્તિ
+DocType: Item,Unit of Measure Conversion,માપ રૂપાંતર એકમ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,કર્મચારીનું બદલી શકાતું નથી
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,તમે ક્રેડિટ અને તે જ સમયે એક જ ખાતામાં ડેબિટ શકતા નથી
+DocType: Naming Series,Help HTML,મદદ HTML
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},100% પ્રયત્ન કરીશું સોંપાયેલ કુલ વેઇટેજ. તે {0}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},{0} વસ્તુ માટે ઓળંગી over- માટે ભથ્થું {1}
+DocType: Address,Name of person or organization that this address belongs to.,આ સરનામા માટે અનુસરે છે કે વ્યક્તિ કે સંસ્થા નામ.
+apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,તમારા સપ્લાયર્સ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,વેચાણ ઓર્ડર કરવામાં આવે છે ગુમાવી સેટ કરી શકાતો નથી.
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,અન્ય પગાર માળખું {0} કર્મચારી માટે સક્રિય છે {1}. તેની પરિસ્થિતિ &#39;નિષ્ક્રિય&#39; આગળ વધવા માટે ખાતરી કરો.
+DocType: Purchase Invoice,Contact,સંપર્ક
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,પ્રતિ પ્રાપ્ત
+DocType: Features Setup,Exports,નિકાસ
+DocType: Lead,Converted,રૂપાંતરિત
+DocType: Item,Has Serial No,સીરીયલ કોઈ છે
+DocType: Employee,Date of Issue,ઇશ્યૂ તારીખ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: પ્રતિ {0} માટે {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},ROW # {0}: આઇટમ માટે સેટ પુરવઠોકર્તા {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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.,આ વેબસાઇટ પર બહુવિધ જૂથો આ આઇટમ યાદી.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,અન્ય ચલણ સાથે એકાઉન્ટ્સ માટે પરવાનગી આપે છે મલ્ટી કરન્સી વિકલ્પ તપાસો
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,વસ્તુ: {0} સિસ્ટમ અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,તમે ફ્રોઝન કિંમત સુયોજિત કરવા માટે અધિકૃત નથી
+DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled પ્રવેશો મળી
+DocType: Payment Reconciliation,From Invoice Date,ભરતિયું તારીખથી
+DocType: Cost Center,Budgets,બજેટ
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,તે શું કરે છે?
+DocType: Delivery Note,To Warehouse,વેરહાઉસ
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},એકાઉન્ટ {0} નાણાકીય વર્ષ માટે એક કરતા વધુ વખત દાખલ કરવામાં આવી છે {1}
+,Average Commission Rate,સરેરાશ કમિશન દર
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,&#39;હા&#39; હોઈ નોન-સ્ટોક આઇટમ માટે નથી કરી શકો છો &#39;સીરિયલ કોઈ છે&#39;
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,એટેન્ડન્સ ભવિષ્યમાં તારીખો માટે ચિહ્નિત કરી શકાતી નથી
+DocType: Pricing Rule,Pricing Rule Help,પ્રાઇસીંગ નિયમ મદદ
+DocType: Purchase Taxes and Charges,Account Head,એકાઉન્ટ હેડ
+apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,વસ્તુઓ ઉતરાણ ખર્ચ ગણતરી માટે વધારાના ખર્ચ અપડેટ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,ઇલેક્ટ્રિકલ
+DocType: Stock Entry,Total Value Difference (Out - In),કુલ મૂલ્ય તફાવત (બહાર - માં)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,રો {0}: વિનિમય દર ફરજિયાત છે
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},વપરાશકર્તા ID કર્મચારી માટે સેટ નથી {0}
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,વોરંટી દાવો માંથી
+DocType: Stock Entry,Default Source Warehouse,મૂળભૂત સોર્સ વેરહાઉસ
+DocType: Item,Customer Code,ગ્રાહક કોડ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},માટે જન્મદિવસ રીમાઇન્ડર {0}
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,છેલ્લે ઓર્ડર સુધીનાં દિવસો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,સ્ટોક અસ્કયામતો
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},તમે ખરેખર મહિને {0} અને વર્ષ માટે તમામ પગાર સ્લિપ રજુ કરવા માંગો છો {1}
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,આયાત ઉમેદવારો
+DocType: Target Detail,Target Qty,લક્ષ્યાંક Qty
+DocType: Attendance,Present,હાજર
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,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} બંધ પ્રકાર જવાબદારી / ઈક્વિટી હોવું જ જોઈએ
+DocType: Authorization Rule,Based On,પર આધારિત
+DocType: Sales Order Item,Ordered Qty,આદેશ આપ્યો Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
+DocType: Stock Settings,Stock Frozen Upto,સ્ટોક ફ્રોઝન સુધી
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},પ્રતિ અને સમય રિકરિંગ માટે ફરજિયાત તારીખો પીરિયડ {0}
+apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,પ્રોજેક્ટ પ્રવૃત્તિ / કાર્ય.
+apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,પગાર સ્લિપ બનાવો
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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 હોવી જ જોઈએ
+DocType: Purchase Invoice,Write Off Amount (Company Currency),રકમ માંડવાળ (કંપની ચલણ)
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,ROW # {0}: પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
+DocType: Landed Cost Voucher,Landed Cost Voucher,ઉતારેલ માલની કિંમત વાઉચર
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},સેટ કરો {0}
+DocType: Purchase Invoice,Repeat on Day of Month,મહિનાનો દિવસ પર પુનરાવર્તન
+DocType: Employee,Health Details,આરોગ્ય વિગતો
+DocType: Offer Letter,Offer Letter Terms,પત્ર શરતો ઓફર
+DocType: Features Setup,To track any installation or commissioning related work after sales,કોઈપણ સ્થાપન ટ્રેક અથવા વેચાણ પછી સંબંધિત કાર્ય શરૂઆત કરવા
+DocType: Project,Estimated Costing,અંદાજિત પડતર
+DocType: Purchase Invoice Advance,Journal Entry Detail No,જર્નલ પ્રવેશ વિગતવાર કોઈ
+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: Sales Invoice,Existing Customer,હાલની ગ્રાહક
+DocType: Email Digest,Receivables,Receivables
+DocType: Customer,Additional information regarding the customer.,ગ્રાહક સંબંધિત વધારાની માહિતી.
+DocType: Quality Inspection Reading,Reading 5,5 વાંચન
+DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","અલ્પવિરામ દ્વારા અલગ દાખલ ઇમેઇલ ને, ક્રમમાં ચોક્કસ તારીખ પર આપોઆપ મોકલવામાં આવશે"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,ઝુંબેશ નામ જરૂરી છે
+DocType: Maintenance Visit,Maintenance Date,જાળવણી તારીખ
+DocType: Purchase Receipt Item,Rejected Serial No,નકારેલું સીરીયલ કોઈ
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,નવી ન્યૂઝલેટર
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},વસ્તુ માટે અંતિમ તારીખ કરતાં ઓછી હોવી જોઈએ તારીખ શરૂ {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.","ઉદાહરણ:. શ્રેણી સુયોજિત છે અને સીરીયલ કોઈ વ્યવહારો માં ઉલ્લેખ નથી તો ABCD #####, તો પછી આપોઆપ સીરીયલ નંબર આ શ્રેણી પર આધારિત બનાવવામાં આવશે. તમે હંમેશા નિશ્ચિતપણે આ આઇટમ માટે સીરીયલ અમે ઉલ્લેખ કરવા માંગો છો. આ ખાલી છોડી દો."
+DocType: Upload Attendance,Upload Attendance,અપલોડ કરો એટેન્ડન્સ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,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/accounts/doctype/journal_entry/journal_entry.js +461,Amount,રકમ
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM બદલાઈ
+,Sales Analytics,વેચાણ ઍનલિટિક્સ
+DocType: Manufacturing Settings,Manufacturing Settings,ઉત્પાદન સેટિંગ્સ
+apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ઇમેઇલ સુયોજિત કરી રહ્યા છે
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,કંપની માસ્ટર મૂળભૂત ચલણ દાખલ કરો
+DocType: Stock Entry Detail,Stock Entry Detail,સ્ટોક એન્ટ્રી વિગતવાર
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,દૈનિક રીમાઇન્ડર્સ
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},સાથે કરવેરા નિયમ સંઘર્ષો {0}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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 +73,Customer Service,ગ્રાહક સેવા
+DocType: Item,Thumbnail,થંબનેલ
+DocType: Item Customer Detail,Item Customer Detail,વસ્તુ ગ્રાહક વિગતવાર
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,તમારા ઇમેઇલ ખાતરી
+apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,ઓફર ઉમેદવાર જોબ.
+DocType: Notification Control,Prompt for Email on Submission of,સુપરત ઇમેઇલ માટે પ્રોમ્પ્ટ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,કુલ ફાળવેલ પાંદડા સમયગાળામાં દિવસો કરતાં વધુ છે
+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 +107,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/stock/get_item_details.py +125,Item {0} must be a Sales Item,વસ્તુ {0} એક સેલ્સ વસ્તુ જ હોવી જોઈએ
+DocType: Naming Series,Update Series Number,સુધારા સિરીઝ સંખ્યા
+DocType: Account,Equity,ઈક્વિટી
+DocType: Sales Order,Printing Details,પ્રિન્ટિંગ વિગતો
+DocType: Task,Closing Date,છેલ્લી તારીખ
+DocType: Sales Order Item,Produced Quantity,ઉત્પાદન જથ્થો
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,ઇજનેર
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,શોધ પેટા એસેમ્બલીઝ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},વસ્તુ કોડ રો કોઈ જરૂરી {0}
+DocType: Sales Partner,Partner Type,જીવનસાથી પ્રકાર
+DocType: Purchase Taxes and Charges,Actual,વાસ્તવિક
+DocType: Authorization Rule,Customerwise Discount,Customerwise ડિસ્કાઉન્ટ
+DocType: Purchase Invoice,Against Expense Account,ખર્ચ એકાઉન્ટ સામે
+DocType: Production Order,Production Order,ઉત્પાદન ઓર્ડર
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,સ્થાપન નોંધ {0} પહેલાથી જ સબમિટ કરવામાં આવી છે
+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,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/setup/setup_wizard/install_fixtures.py +57,Part-time,ભાગ સમય
+DocType: Employee,Applicable Holiday List,લાગુ રજા યાદી
+DocType: Employee,Cheque,ચેક
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,સિરીઝ સુધારાશે
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,રિપોર્ટ પ્રકાર ફરજિયાત છે
+DocType: Item,Serial Number Series,સીરિયલ નંબર સિરીઝ
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},વેરહાઉસ પંક્તિ સ્ટોક વસ્તુ {0} માટે ફરજિયાત છે {1}
+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/public/js/setup_wizard.js +101,The First User: You,પ્રથમ વપરાશકર્તા: તમે
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ફિસ્કલ વર્ષ શરૂઆત તારીખ અને ફિસ્કલ વર્ષ અંતે તારીખ પહેલેથી નાણાકીય વર્ષમાં સુયોજિત છે {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,સફળતાપૂર્વક અનુરૂપ
+DocType: Production Order,Planned End Date,આયોજિત સમાપ્તિ તારીખ
+apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,વસ્તુઓ જ્યાં સંગ્રહાય છે.
+DocType: Tax Rule,Validity,માન્યતા
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ભરતિયું રકમ
+DocType: Attendance,Attendance,એટેન્ડન્સ
+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/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,તારીખ પોસ્ટ અને સમય પોસ્ટ ફરજિયાત છે
+apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,વ્યવહારો ખરીદી માટે કરવેરા નમૂનો.
+,Item Prices,વસ્તુ એની
+DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,તમે ખરીદી માટે સેવ વાર શબ્દો દૃશ્યમાન થશે.
+DocType: Period Closing Voucher,Period Closing Voucher,પીરિયડ બંધ વાઉચર
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,ભાવ યાદી માસ્ટર.
+DocType: Task,Review Date,સમીક્ષા તારીખ
+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} પંક્તિ માં લક્ષ્યાંક વેરહાઉસ ઉત્પાદન ઓર્ડર તરીકે જ હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,કોઈ પરવાનગી ચુકવણી સાધન વાપરવા માટે
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% S રિકરિંગ માટે સ્પષ્ટ નથી &#39;સૂચના ઇમેઇલ સરનામાંઓ&#39;
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,કરન્સી કેટલાક અન્ય ચલણ ઉપયોગ પ્રવેશો કર્યા પછી બદલી શકાતું નથી
+DocType: Company,Round Off Account,એકાઉન્ટ બંધ રાઉન્ડ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,વહીવટી ખર્ચ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,કન્સલ્ટિંગ
+DocType: Customer Group,Parent Customer Group,પિતૃ ગ્રાહક જૂથ
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,બદલો
+DocType: Purchase Invoice,Contact Email,સંપર્ક ઇમેઇલ
+DocType: Appraisal Goal,Score Earned,કુલ સ્કોર કમાવેલી
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",દા.ત. &quot;મારી કંપની LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,સૂચના સમયગાળા
+DocType: Bank Reconciliation Detail,Voucher ID,વાઉચર ID ને
+apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,આ રુટ પ્રદેશ છે અને સંપાદિત કરી શકાતી નથી.
+DocType: Packing Slip,Gross Weight UOM,એકંદર વજન UOM
+DocType: Email Digest,Receivables / Payables,Receivables / ચૂકવણીના
+DocType: Delivery Note Item,Against Sales Invoice,સેલ્સ ભરતિયું સામે
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,ક્રેડિટ એકાઉન્ટ
+DocType: Landed Cost Item,Landed Cost Item,ઉતારેલ માલની કિંમત વસ્તુ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,શૂન્ય કિંમતો બતાવો
+DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,આઇટમ જથ્થો કાચા માલના આપવામાં જથ્થામાં થી repacking / ઉત્પાદન પછી પ્રાપ્ત
+DocType: Payment Reconciliation,Receivable / Payable Account,પ્રાપ્ત / ચૂકવવાપાત્ર એકાઉન્ટ
+DocType: Delivery Note Item,Against Sales Order Item,વેચાણ ઓર્ડર વસ્તુ સામે
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
+DocType: Item,Default Warehouse,મૂળભૂત વેરહાઉસ
+DocType: Task,Actual End Date (via Time Logs),વાસ્તવિક ઓવરને તારીખ (સમય લોગ મારફતે)
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},બજેટ ગ્રુપ એકાઉન્ટ સામે અસાઇન કરી શકાતી નથી {0}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,પિતૃ ખર્ચ કેન્દ્રને દાખલ કરો
+DocType: Delivery Note,Print Without Amount,રકમ વિના છાપો
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,બધી વસ્તુઓ નોન-સ્ટોક વસ્તુઓ છે કર કેટેગરી &#39;મૂલ્યાંકન&#39; અથવા &#39;મૂલ્યાંકન અને કુલ&#39; ન હોઈ શકે
+DocType: Issue,Support Team,સપોર્ટ ટીમ
+DocType: Appraisal,Total Score (Out of 5),(5) કુલ સ્કોર
+DocType: Batch,Batch,બેચ
+apps/erpnext/erpnext/stock/doctype/item/item.js +20,Balance,બેલેન્સ
+DocType: Project,Total Expense Claim (via Expense Claims),કુલ ખર્ચ દાવો (ખર્ચ દાવાઓ મારફતે)
+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,સમાપ્ત ન થયેલા
+DocType: Journal Entry,Total Debit,કુલ ડેબિટ
+DocType: Manufacturing Settings,Default Finished Goods Warehouse,મૂળભૂત ફિનિશ્ડ ગૂડ્સ વેરહાઉસ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,વેચાણ વ્યક્તિ
+DocType: Sales Invoice,Cold Calling,શીત કોલિંગ
+DocType: SMS Parameter,SMS Parameter,એસએમએસ પરિમાણ
+DocType: Maintenance Schedule Item,Half Yearly,અર્ધ વાર્ષિક
+DocType: Lead,Blog Subscriber,બ્લોગ ઉપભોક્તા
+apps/erpnext/erpnext/config/setup.py +88,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,કુલ એડવાન્સ
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,પ્રોસેસીંગ પગારપત્રક
+DocType: Opportunity Item,Basic Rate,મૂળ દર
+DocType: GL Entry,Credit Amount,ક્રેડિટ રકમ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,લોસ્ટ તરીકે સેટ કરો
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ચુકવણી રસીદ નોંધ
+DocType: Customer,Credit Days Based On,ક્રેડિટ ટ્રેડીંગ પર આધારિત છે
+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/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} પહેલાથી જ સબમિટ કરવામાં આવી છે
+,Items To Be Requested,વસ્તુઓ વિનંતી કરવામાં
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,છેલ્લા ખરીદી દર વિચાર
+DocType: Time Log,Billing Rate based on Activity Type (per hour),પ્રવૃત્તિ પ્રકાર ઉપર આધારિત બિલિંગ દર (દર કલાકે)
+DocType: Company,Company Info,કંપની માહિતી
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","કંપની ઇમેઇલ ને મળી નથી, તેથી મોકલવામાં આવ્યો ન મેલ"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ફંડ (અસ્ક્યામત) અરજી
+DocType: Production Planning Tool,Filter based on item,ફિલ્ટર આઇટમ પર આધારિત
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,ઉધાર ખાતું
+DocType: Fiscal Year,Year Start Date,વર્ષે શરૂ તારીખ
+DocType: Attendance,Employee Name,કર્મચારીનું નામ
+DocType: Sales Invoice,Rounded Total (Company Currency),ગોળાકાર કુલ (કંપની ચલણ)
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"એકાઉન્ટ પ્રકાર પસંદ છે, કારણ કે ગ્રુપ અપ્રગટ કરી શકતા નથી."
+DocType: Purchase Common,Purchase Common,ખરીદી સામાન્ય
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,તકો પ્રતિ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,એમ્પ્લોયી બેનિફિટ્સ
+DocType: Sales Invoice,Is POS,POS છે
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},ભરેલા જથ્થો પંક્તિ માં વસ્તુ {0} માટે જથ્થો બરાબર હોવું જોઈએ {1}
+DocType: Production Order,Manufactured Qty,ઉત્પાદન Qty
+DocType: Purchase Receipt Item,Accepted Quantity,સ્વીકારાયું જથ્થો
+apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} નથી અસ્તિત્વમાં
+apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,ગ્રાહકો માટે ઊભા બીલો.
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,પ્રોજેક્ટ ID
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},રો કોઈ {0}: રકમ ખર્ચ દાવો {1} સામે રકમ બાકી કરતાં વધારે ન હોઈ શકે. બાકી રકમ છે {2}
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} ગ્રાહકો ઉમેર્યા
+DocType: Maintenance Schedule,Schedule,સૂચિ
+DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","આ ખર્ચ કેન્દ્ર માટે બજેટ વ્યાખ્યાયિત કરે છે. બજેટ ક્રિયા સુયોજિત કરવા માટે, જુઓ &quot;કંપની યાદી&quot;"
+DocType: Account,Parent Account,પિતૃ એકાઉન્ટ
+DocType: Quality Inspection Reading,Reading 3,3 વાંચન
+,Hub,હબ
+DocType: GL Entry,Voucher Type,વાઉચર પ્રકાર
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,ભાવ યાદી મળી અથવા અક્ષમ નથી
+DocType: Expense Claim,Approved,મંજૂર
+DocType: Pricing Rule,Price,ભાવ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',{0} સુયોજિત થયેલ હોવું જ જોઈએ પર રાહત કર્મચારી &#39;ડાબી&#39; તરીકે
+DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",પસંદ &quot;હા&quot; સીરીયલ કોઈ માસ્ટર માં જોઈ શકાય છે કે જે આ વસ્તુ દરેક એન્ટિટી માટે અનન્ય ઓળખ આપશે.
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,મૂલ્યાંકન {0} {1} આપેલ તારીખ શ્રેણી માં કર્મચારી માટે બનાવવામાં
+DocType: Employee,Education,શિક્ષણ
+DocType: Selling Settings,Campaign Naming By,દ્વારા ઝુંબેશ નામકરણ
+DocType: Employee,Current Address Is,વર્તમાન સરનામું
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +223,"Optional. Sets company's default currency, if not specified.","વૈકલ્પિક. સ્પષ્ટ થયેલ નહિં હોય, તો કંપની મૂળભૂત ચલણ સુયોજિત કરે છે."
+DocType: Address,Office,ઓફિસ
+apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,હિસાબી જર્નલ પ્રવેશો.
+DocType: Delivery Note Item,Available Qty at From Warehouse,વેરહાઉસ માંથી ઉપલબ્ધ Qty
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,પ્રથમ કર્મચારી રેકોર્ડ પસંદ કરો.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},રો {0}: પાર્ટી / એકાઉન્ટ સાથે મેળ ખાતું નથી {1} / {2} માં {3} {4}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,કરવેરા એકાઉન્ટ બનાવવા માટે
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ખર્ચ એકાઉન્ટ દાખલ કરો
+DocType: Account,Stock,સ્ટોક
+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,ખરીદી / ઉત્પાદન વિગતો
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,બેચ ઈન્વેન્ટરી
+DocType: Employee,Contract End Date,કોન્ટ્રેક્ટ સમાપ્તિ તારીખ
+DocType: Sales Order,Track this Sales Order against any Project,કોઈ પણ પ્રોજેક્ટ સામે આ વેચાણ ઓર્ડર ટ્રેક
+DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,પુલ વેચાણ ઓર્ડર ઉપર માપદંડ પર આધારિત (પહોંચાડવા માટે બાકી)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,પુરવઠોકર્તા અવતરણ પ્રતિ
+DocType: Deduction Type,Deduction Type,કપાત પ્રકાર
+DocType: Attendance,Half Day,અડધા દિવસ
+DocType: Pricing Rule,Min Qty,મીન Qty
+DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",બેચ અમે વેચાણ અને ખરીદી દસ્તાવેજો વસ્તુઓ ટ્રેક કરવા માટે. &quot;મનપસંદ ઉદ્યોગ: રસાયણો&quot;
+DocType: GL Entry,Transaction Date,ટ્રાન્ઝેક્શન તારીખ
+DocType: Production Plan Item,Planned Qty,આયોજિત Qty
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,કુલ કર
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,જથ્થો માટે (Qty ઉત્પાદિત થતા) ફરજિયાત છે
+DocType: Stock Entry,Default Target Warehouse,મૂળભૂત લક્ષ્ય વેરહાઉસ
+DocType: Purchase Invoice,Net Total (Company Currency),નેટ કુલ (કંપની ચલણ)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,રો {0}: પાર્ટી પ્રકાર અને પાર્ટી પ્રાપ્ત / ચૂકવવાપાત્ર એકાઉન્ટ સામે માત્ર લાગુ પડે છે
+DocType: Notification Control,Purchase Receipt Message,ખરીદી રસીદ સંદેશ
+DocType: Production Order,Actual Start Date,વાસ્તવિક પ્રારંભ તારીખ
+DocType: Sales Order,% of materials delivered against this Sales Order,સામગ્રી% આ વેચાણ ઓર્ડર સામે વિતરિત
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,રેકોર્ડ વસ્તુ ચળવળ.
+DocType: Newsletter List Subscriber,Newsletter List Subscriber,ન્યૂઝલેટર યાદી ઉપભોક્તા
+DocType: Hub Settings,Hub Settings,હબ સેટિંગ્સ
+DocType: Project,Gross Margin %,એકંદર માર્જીન%
+DocType: BOM,With Operations,કામગીરી સાથે
+apps/erpnext/erpnext/accounts/party.py +232,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}.
+,Monthly Salary Register,માસિક પગાર રજિસ્ટર
+DocType: Warranty Claim,If different than customer address,ગ્રાહક સરનામું કરતાં અલગ તો
+DocType: BOM Operation,BOM Operation,BOM ઓપરેશન
+DocType: Purchase Taxes and Charges,On Previous Row Amount,Next અગાઉના આગળ રો રકમ પર
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,ઓછામાં ઓછા એક પંક્તિ માં ચુકવણી રકમ દાખલ કરો
+DocType: POS Profile,POS Profile,POS પ્રોફાઇલ
+apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","સુયોજિત બજેટ, લક્ષ્યાંકો વગેરે માટે મોસમ"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,રો {0}: ચુકવણી રકમ બાકી રકમ કરતાં વધારે ન હોઈ શકે
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,અવેતન કુલ
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,સમય લોગ બિલયોગ્ય નથી
+apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} વસ્તુ એક નમૂનો છે, તેના ચલો એક પસંદ કરો"
+apps/erpnext/erpnext/public/js/setup_wizard.js +290,Purchaser,ખરીદનાર
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,નેટ પગાર નકારાત્મક ન હોઈ શકે
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,જાતે સામે વાઉચર દાખલ કરો
+DocType: SMS Settings,Static Parameters,સ્થિર પરિમાણો
+DocType: Purchase Order,Advance Paid,આગોતરી ચુકવણી
+DocType: Item,Item Tax,વસ્તુ ટેક્સ
+DocType: Expense Claim,Employees Email Id,કર્મચારીઓ ઇમેઇલ આઈડી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,વર્તમાન જવાબદારીઓ
+apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,સામૂહિક એસએમએસ તમારા સંપર્કો મોકલો
+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/setup/setup_wizard/install_fixtures.py +132,Credit Card,ક્રેડીટ કાર્ડ
+DocType: BOM,Item to be manufactured or repacked,વસ્તુ ઉત્પાદન અથવા repacked શકાય
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,સ્ટોક વ્યવહારો માટે મૂળભૂત સુયોજનો.
+DocType: Purchase Invoice,Next Date,આગામી તારીખ
+DocType: Employee Education,Major/Optional Subjects,મુખ્ય / વૈકલ્પિક વિષયો
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,કર અને ખર્ચ દાખલ કરો
+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 +19,From Currency and To Currency cannot be same,ચલણ અને ચલણ જ ન હોઈ શકે
+DocType: Stock Entry,Repack,RePack
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,તમને પ્રક્રિયા કરવા પહેલાં ફોર્મ સેવ જ જોઈએ
+DocType: Item Attribute,Numeric Values,આંકડાકીય મૂલ્યો
+apps/erpnext/erpnext/public/js/setup_wizard.js +262,Attach Logo,લોગો જોડો
+DocType: Customer,Commission Rate,કમિશન દર
+apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,વેરિએન્ટ બનાવો
+apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,વિભાગ દ્વારા બ્લોક છોડી કાર્યક્રમો.
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,કાર્ટ ખાલી છે
+DocType: Production Order,Actual Operating Cost,વાસ્તવિક ઓપરેટિંગ ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,રુટ ફેરફાર કરી શકતા નથી.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,ફાળવેલ રકમ unadusted રકમ કરતાં મોટો નથી કરી શકો છો
+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 +183,Capital Stock,કેપિટલ સ્ટોક
+DocType: Packing Slip,Package Weight Details,પેકેજ વજન વિગતો
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,CSV ફાઈલ પસંદ કરો
+DocType: Purchase Order,To Receive and Bill,પ્રાપ્ત અને બિલ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ડીઝાઈનર
+apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,નિયમો અને શરતો ઢાંચો
+DocType: Serial No,Delivery Details,ડ લવર વિગતો
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},પ્રકાર માટે ખર્ચ કેન્દ્રને પંક્તિ જરૂરી છે {0} કર ટેબલ {1}
+DocType: Item,Automatically create Material Request if quantity falls below this level,"જથ્થો આ સ્તરની નીચે પડે છે, તો આપમેળે સામગ્રી વિનંતી બનાવવા"
+,Item-wise Purchase Register,વસ્તુ મુજબના ખરીદી રજીસ્ટર
+DocType: Batch,Expiry Date,અંતિમ તારીખ
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","પુનઃક્રમાંકિત કરો સ્તર સુયોજિત કરવા માટે, આઇટમ ખરીદી વસ્તુ અથવા ઉત્પાદન વસ્તુ જ હોવી જોઈએ"
+,Supplier Addresses and Contacts,પુરવઠોકર્તા સરનામાંઓ અને સંપર્કો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,પ્રથમ શ્રેણી પસંદ કરો
+apps/erpnext/erpnext/config/projects.py +18,Project master.,પ્રોજેક્ટ માસ્ટર.
+DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,કરન્સી વગેરે $ જેવી કોઇ પ્રતીક આગામી બતાવશો નહીં.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(અડધા દિવસ)
+DocType: Supplier,Credit Days,ક્રેડિટ દિવસો
+DocType: Leave Type,Is Carry Forward,આગળ લઈ છે
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,સામગ્રી બિલ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,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 +102,Ref Date,સંદર્ભ તારીખ
+DocType: Employee,Reason for Leaving,છોડીને માટે કારણ
+DocType: Expense Claim Detail,Sanctioned Amount,મંજુર રકમ
+DocType: GL Entry,Is Opening,ખોલ્યા છે
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},રો {0}: ડેબિટ પ્રવેશ સાથે લિંક કરી શકતા નથી {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,એકાઉન્ટ {0} અસ્તિત્વમાં નથી
+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 924ecd7..5ef476f 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,מוצרים צריכה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,אנא בחר מפלגה סוג ראשון
 DocType: Item,Customer Items,פריטים לקוח
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,חשבון {0}: הורה חשבון {1} לא יכול להיות פנקס
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,חשבון {0}: הורה חשבון {1} לא יכול להיות פנקס
 DocType: Item,Publish Item to hub.erpnext.com,פרסם פריט לhub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,"הודעות דוא""ל"
 DocType: Item,Default Unit of Measure,ברירת מחדל של יחידת מדידה
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,צור קשר עם לקוחות
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,מבקשת חומר
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,מבקשת חומר
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} עץ
 DocType: Job Applicant,Job Applicant,עבודת מבקש
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,אין יותר תוצאות.
@@ -51,7 +51,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. כדי לשמור את קוד פריט החכם לקוחות ולגרום להם לחיפוש על סמך שימוש הקוד שלהם באפשרות זו
 DocType: Mode of Payment Account,Mode of Payment Account,מצב של חשבון תשלומים
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,גרסאות הצג
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,כמות
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,כמות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),הלוואות (התחייבויות)
 DocType: Employee Education,Year of Passing,שנה של פטירה
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,במלאי
@@ -62,16 +62,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,בריאות
 DocType: Purchase Invoice,Monthly,חודשי
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),עיכוב בתשלום (ימים)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,חשבונית
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,חשבונית
 DocType: Maintenance Schedule Item,Periodicity,תְקוּפָתִיוּת
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,"כתובת דוא""ל"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,שנת כספים {0} נדרש
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ביטחון
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ציון (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},שורת {0}: {1} {2} אינה תואמת עם {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},שורת {0}: {1} {2} אינה תואמת עם {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,# השורה {0}:
 DocType: Delivery Note,Vehicle No,רכב לא
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,אנא בחר מחירון
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,אנא בחר מחירון
 DocType: Production Order Operation,Work In Progress,עבודה בתהליך
 DocType: Employee,Holiday List,רשימת החג
 DocType: Time Log,Time Log,הזמן התחבר
@@ -95,13 +95,13 @@
 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: Employee,Married,נשוי
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
 DocType: Payment Reconciliation,Reconcile,ליישב
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,מכולת
 DocType: Quality Inspection Reading,Reading 1,קריאת 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,הפוך בנק כניסה
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,קרנות פנסיה
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,מחסן הוא חובה אם סוג החשבון הוא מחסן
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,מחסן הוא חובה אם סוג החשבון הוא מחסן
 DocType: SMS Center,All Sales Person,כל איש המכירות
 DocType: Lead,Person Name,שם אדם
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","בדקו אם חוזר כדי, בטלו להפסיק חוזר או לשים תאריך סיום הולם"
@@ -125,12 +125,12 @@
 DocType: Item,Copy From Item Group,העתק מ קבוצת פריט
 DocType: Journal Entry,Opening Entry,כניסת פתיחה
 DocType: Stock Entry,Additional Costs,עלויות נוספות
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,חשבון עם עסקה הקיימת לא ניתן להמיר לקבוצה.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,חשבון עם עסקה הקיימת לא ניתן להמיר לקבוצה.
 DocType: Lead,Product Enquiry,חקירה מוצר
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,אנא ראשון להיכנס החברה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,יעד ב
+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 +9,Activity Log:,יומן פעילות:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,פריט {0} אינו קיים במערכת או שפג תוקף
@@ -159,7 +159,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,פריט {0} חייב להיות פריט רכישה
 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 +444,Item {0} is not active or end of life has been reached,פריט {0} אינו פעיל או שהגיע הסוף של חיים
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,פריט {0} אינו פעיל או שהגיע הסוף של חיים
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,יעודכן לאחר חשבונית מכירות הוגשה.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,הגדרות עבור מודול HR
@@ -175,7 +175,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,פרטים של הפעולות שביצעו.
 DocType: Serial No,Maintenance Status,מצב תחזוקה
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,פריטים ותמחור
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},מתאריך צריך להיות בתוך שנת הכספים. בהנחת מתאריך = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},מתאריך צריך להיות בתוך שנת הכספים. בהנחת מתאריך = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,בחר את העובדים שעבורם אתה יוצר שמאות.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},עלות המרכז {0} אינו שייך לחברת {1}
 DocType: Customer,Individual,פרט
@@ -209,6 +209,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,מזומנים נטו ממימון
 DocType: Lead,Address & Contact,כתובת ולתקשר
 DocType: Leave Allocation,Add unused leaves from previous allocations,להוסיף עלים שאינם בשימוש מהקצאות קודמות
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},הבא חוזר {0} ייווצר על {1}
@@ -216,6 +217,7 @@
 ,Contact Name,שם איש קשר
 DocType: Production Plan Item,SO Pending Qty,SO המתנת כמות
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,יוצר תלוש משכורת לקריטריונים שהוזכרו לעיל.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,אין תיאור נתון
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,בקש לרכישה.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,רק המאשר Leave נבחר יכול להגיש בקשה זו החופשה
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,להקלה על התאריך חייבת להיות גדולה מ תאריך ההצטרפות
@@ -226,7 +228,7 @@
 DocType: Item Website Specification,Item Website Specification,מפרט אתר פריט
 DocType: Payment Tool,Reference No,אסמכתא
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,השאר חסימה
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,שנתי
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,פריט במלאי פיוס
 DocType: Stock Entry,Sales Invoice No,מכירות חשבונית לא
@@ -238,11 +240,11 @@
 DocType: Pricing Rule,Supplier Type,סוג ספק
 DocType: Item,Publish in Hub,פרסם בHub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,פריט {0} יבוטל
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,פריט {0} יבוטל
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,בקשת חומר
 DocType: Bank Reconciliation,Update Clearance Date,תאריך שחרור עדכון
 DocType: Item,Purchase Details,פרטי רכישה
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},פריט {0} לא נמצא בטבלה &quot;חומרי גלם מסופקת &#39;בהזמנת רכש {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},פריט {0} לא נמצא בטבלה &quot;חומרי גלם מסופקת &#39;בהזמנת רכש {1}
 DocType: Employee,Relation,ביחס
 DocType: Shipping Rule,Worldwide Shipping,משלוח ברחבי העולם
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,הזמנות אישרו מלקוחות.
@@ -254,7 +256,7 @@
 DocType: Lead,Suggestions,הצעות
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,תקציבי סט פריט קבוצה חכמה על טריטוריה זו. אתה יכול לכלול גם עונתיות על ידי הגדרת ההפצה.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},נא להזין את קבוצת חשבון הורה למחסן {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},תשלום כנגד {0} {1} לא יכול להיות גדול מהסכום מצטיין {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,צור לוח זמנים
@@ -263,6 +265,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,אחרון
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,מקסימום 5 תווים
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,המאשר החופשה הראשונה ברשימה תהיה לקבוע כברירת מחדל Leave המאשרת
+apps/erpnext/erpnext/config/desktop.py +73,Learn,לִלמוֹד
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,עלות פעילות לעובדים
 DocType: Accounts Settings,Settings for Accounts,הגדרות עבור חשבונות
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,ניהול מכירות אדם עץ.
@@ -282,9 +285,9 @@
 DocType: Journal Entry,Multi Currency,מטבע רב
 DocType: Payment Reconciliation Invoice,Invoice Type,סוג חשבונית
 DocType: Sales Invoice Item,Delivery Note,תעודת משלוח
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,הגדרת מסים
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,הגדרת מסים
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,כניסת תשלום השתנתה לאחר שמשכת אותו. אנא למשוך אותו שוב.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,סיכום השבוע הזה ופעילויות תלויות ועומדות
 DocType: Workstation,Rent Cost,עלות השכרה
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,אנא בחר חודש והשנה
@@ -301,10 +304,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","זמין בBOM, תעודת משלוח, חשבוניות רכש, ייצור להזמין, הזמנת רכש, קבלת רכישה, מכירות חשבונית, הזמנת מכירות, מלאי כניסה, גליון"
 DocType: Item Tax,Tax Rate,שיעור מס
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,פריט בחר
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,פריט בחר
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","פריט: {0} הצליח אצווה-חכם, לא ניתן ליישב באמצעות מניות \ פיוס, במקום להשתמש במלאי כניסה"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},# השורה {0}: אצווה לא חייב להיות זהה {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,המרת שאינה קבוצה
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,קבלת רכישה יש להגיש
@@ -344,6 +347,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,רפואי
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,סיבה לאיבוד
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},תחנת עבודה סגורה בתאריכים הבאים בהתאם לרשימת Holiday: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,הזדמנויות
 DocType: Employee,Single,אחת
 DocType: Issue,Attachment,קובץ מצורף
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,לא ניתן להגדיר תקציב עבור מרכז עלות הקבוצה
@@ -373,13 +377,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,אב חג.
 DocType: Material Request Item,Required Date,תאריך הנדרש
 DocType: Delivery Note,Billing Address,כתובת לחיוב
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,נא להזין את קוד פריט.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,נא להזין את קוד פריט.
 DocType: BOM,Costing,תמחיר
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","אם מסומן, את סכום המס ייחשב כפי שכבר כלול במחיר ההדפסה / סכום ההדפסה"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,"סה""כ כמות"
@@ -412,7 +416,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
 DocType: Shipping Rule,Net Weight,משקל נטו
 DocType: Employee,Emergency Phone,טל 'חירום
 ,Serial No Warranty Expiry,Serial No תפוגה אחריות
@@ -431,15 +435,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,תוספת לא יכולה להיות 0
 DocType: Production Planning Tool,Material Requirement,דרישת חומר
 DocType: Company,Delete Company Transactions,מחק עסקות חברה
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,פריט {0} לא לרכוש פריט
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,פריט {0} לא לרכוש פריט
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} היא כתובת דוא""ל לא חוקית ב'כתובת דוא""ל \ ההודעה '"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,"חיוב סה""כ שנה זו:"
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,להוסיף מסים / עריכה וחיובים
 DocType: Purchase Invoice,Supplier Invoice No,ספק חשבונית לא
 DocType: Territory,For reference,לעיון
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","לא יכול למחוק את מספר סידורי {0}, כפי שהוא משמש בעסקות מניות"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),סגירה (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),סגירה (Cr)
 DocType: Serial No,Warranty Period (Days),תקופת אחריות (ימים)
 DocType: Installation Note Item,Installation Note Item,פריט הערה התקנה
 ,Pending Qty,בהמתנה כמות
@@ -454,7 +457,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** בחתך חודשי ** עוזר לך להפיץ את התקציב שלך על פני חודשים אם יש לך עונתיות בעסק שלך. על חלוקת תקציב באמצעות חלוקה זו, שנקבע בחתך חודשי ** זה ** במרכז העלות ** **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,לא נמצא רשומות בטבלת החשבונית
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,לא נמצא רשומות בטבלת החשבונית
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,אנא בחר סוג החברה והמפלגה ראשון
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,כספי לשנה / חשבונאות.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","מצטער, לא ניתן למזג מס סידורי"
@@ -462,9 +465,9 @@
 DocType: Project Task,Project Task,פרויקט משימה
 ,Lead Id,זיהוי עופרת
 DocType: C-Form Invoice Detail,Grand Total,סך כולל
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,תאריך שנת כספים התחל לא צריך להיות גדול יותר מתאריך שנת הכספים End
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,תאריך שנת כספים התחל לא צריך להיות גדול יותר מתאריך שנת הכספים End
 DocType: Warranty Claim,Resolution,רזולוציה
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},נמסר: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},נמסר: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,חשבון לתשלום
 DocType: Sales Order,Billing and Delivery Status,סטטוס חיוב ומשלוח
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,חזרו על לקוחות
@@ -479,7 +482,7 @@
 DocType: Quotation,Quotation To,הצעת מחיר ל
 DocType: Lead,Middle Income,הכנסה התיכונה
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),פתיחה (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,סכום שהוקצה אינו יכול להיות שלילי
 DocType: Purchase Order Item,Billed Amt,Amt שחויב
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,מחסן לוגי שנגדו מרשמו רשומות מלאי
@@ -506,16 +509,17 @@
 DocType: Activity Type,Default Costing Rate,דרג תמחיר ברירת מחדל
 DocType: Maintenance Schedule,Maintenance Schedule,לוח זמנים תחזוקה
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","חוקים ואז תמחור מסוננים החוצה על בסיס לקוחות, קבוצת לקוחות, טריטוריה, ספק, סוג של ספק, המבצע, שותף מכירות וכו '"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,שינוי נטו במלאי
 DocType: Employee,Passport Number,דרכון מספר
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,מנהל
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,מיום קבלת רכישה
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,אותו פריט כבר נכנס מספר רב של פעמים.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,מיום קבלת רכישה
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,אותו פריט כבר נכנס מספר רב של פעמים.
 DocType: SMS Settings,Receiver Parameter,מקלט פרמטר
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""בהתבסס על 'ו' קבוצה על ידי 'אינו יכול להיות זהה"
 DocType: Sales Person,Sales Person Targets,מטרות איש מכירות
 DocType: Production Order Operation,In minutes,בדקות
 DocType: Issue,Resolution Date,תאריך החלטה
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
 DocType: Selling Settings,Customer Naming By,Naming הלקוח על ידי
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,להמיר לקבוצה
 DocType: Activity Cost,Activity Type,סוג הפעילות
@@ -526,7 +530,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} לא נמצא בטבלת פרטי החשבונית
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,בקרו תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
 DocType: Material Request,Material Transfer,העברת חומר
@@ -548,13 +552,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,שיווק
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,כדי לעקוב אחר פריט במכירות ובמסמכי רכישה מבוססת על nos הסידורי שלהם. זה גם יכול להשתמש כדי לעקוב אחר פרטי אחריות של המוצר.
 DocType: Purchase Receipt Item Supplied,Current Stock,המניה נוכחית
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,מחסן שנדחו הוא חובה נגד פריט regected
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,חיוב סה&quot;כ השנה
 DocType: Account,Expenses Included In Valuation,הוצאות שנכללו בהערכת שווי
 DocType: Employee,Provide email id registered in company,"לספק id הדוא""ל רשום בחברה"
 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 +533,Item has variants.,יש פריט גרסאות.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,סוג העץ
@@ -572,18 +576,18 @@
 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 +92,{0} is not a stock Item,{0} הוא לא פריט מניות
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} הוא לא פריט מניות
 DocType: Mode of Payment Account,Default Account,חשבון ברירת מחדל
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,עופרת יש להגדיר אם הזדמנות עשויה מעופרת
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,אנא בחר יום מנוחה שבועי
 DocType: Production Order Operation,Planned End Time,שעת סיום מתוכננת
 ,Sales Person Target Variance Item Group-Wise,פריט יעד שונות איש מכירות קבוצה-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,חשבון עם עסקה הקיימת לא ניתן להמיר לדג'ר
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,חשבון עם עסקה הקיימת לא ניתן להמיר לדג'ר
 DocType: Delivery Note,Customer's Purchase Order No,להזמין ללא הרכישה של הלקוח
 DocType: Employee,Cell Number,מספר סלולארי
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,בקשות אוטומטיות חומר שנוצרו
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,איבדתי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,אתה לא יכול להיכנס לשובר נוכחי ב'נגד תנועת יומן 'טור
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,אתה לא יכול להיכנס לשובר נוכחי ב'נגד תנועת יומן 'טור
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,אנרגיה
 DocType: Opportunity,Opportunity From,הזדמנות מ
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,הצהרת משכורת חודשית.
@@ -591,9 +595,9 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,חשבון חדש
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,שורת {0}: המרת פקטור הוא חובה
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,רישומים חשבונאיים יכולים להתבצע נגד צמתים עלה. ערכים נגד קבוצות אינם מורשים.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,לא יכול לבטל או לבטל BOM כפי שהוא מקושר עם עצי מוצר אחרים
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,לא יכול לבטל או לבטל BOM כפי שהוא מקושר עם עצי מוצר אחרים
 DocType: Opportunity,Maintenance,תחזוקה
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},מספר קבלת רכישה הנדרש לפריט {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},מספר קבלת רכישה הנדרש לפריט {0}
 DocType: Item Attribute Value,Item Attribute Value,פריט תכונה ערך
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,מבצעי מכירות.
 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.
@@ -632,7 +636,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,מחיר המחירון לא נבחר
 DocType: Employee,Family Background,רקע משפחתי
 DocType: Process Payroll,Send Email,שלח אי-מייל
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,אין אישור
 DocType: Company,Default Bank Account,חשבון בנק ברירת מחדל
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","כדי לסנן מבוסס על המפלגה, מפלגה בחר את הסוג ראשון"
@@ -640,7 +644,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,מס
 DocType: Item,Items with higher weightage will be shown higher,פריטים עם weightage גבוה יותר תוכלו לראות גבוהים יותר
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,פרט בנק פיוס
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,חשבוניות שלי
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,חשבוניות שלי
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,אף עובדים מצא
 DocType: Purchase Order,Stopped,נעצר
 DocType: Item,If subcontracted to a vendor,אם קבלן לספקים
@@ -650,6 +654,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,שלח עכשיו
 ,Support Analytics,Analytics תמיכה
 DocType: Item,Website Warehouse,מחסן אתר
+DocType: Payment Reconciliation,Minimum Invoice Amount,סכום חשבונית מינימום
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","היום בחודש שבו חשבונית אוטומטית תיווצר למשל 05, 28 וכו '"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ציון חייב להיות קטן או שווה ל 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,רשומות C-טופס
@@ -659,7 +664,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",כדי לאפשר &quot;נקודת המכירה&quot; תכונות
 DocType: Bin,Moving Average Rate,נע תעריף ממוצע
 DocType: Production Planning Tool,Select Items,פריטים בחרו
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} נגד ביל {1} יום {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} נגד ביל {1} יום {2}
 DocType: Maintenance Visit,Completion Status,סטטוס השלמה
 DocType: Sales Invoice Item,Target Warehouse,יעד מחסן
 DocType: Item,Allow over delivery or receipt upto this percent,לאפשר על משלוח או קבלת upto אחוזים זה
@@ -671,7 +676,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,באופן אוטומטי לחבר את ההודעה על הגשת עסקות.
 DocType: Production Order,Item To Manufacture,פריט לייצור
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} המצב הוא {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,הזמנת רכש לתשלום
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,הזמנת רכש לתשלום
 DocType: Sales Order Item,Projected Qty,כמות חזויה
 DocType: Sales Invoice,Payment Due Date,מועד תשלום
 DocType: Newsletter,Newsletter Manager,מנהל עלון
@@ -694,7 +699,7 @@
 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 +304,Point-of-Sale,נקודת מכירה
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","יתרת חשבון כבר בקרדיט, שאינך מורשה להגדרה 'יתרה חייבים להיות' כמו 'חיוב'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","יתרת חשבון כבר בקרדיט, שאינך מורשה להגדרה 'יתרה חייבים להיות' כמו 'חיוב'"
 DocType: Account,Balance must be,איזון חייב להיות
 DocType: Hub Settings,Publish Pricing,פרסם תמחור
 DocType: Notification Control,Expense Claim Rejected Message,הודעת תביעת הוצאות שנדחו
@@ -716,7 +721,7 @@
 DocType: Employee,Ms,גב '
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,שער חליפין של מטבע שני.
 DocType: Production Order,Plan material for sub-assemblies,חומר תכנית לתת מכלולים
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} חייב להיות פעיל
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} חייב להיות פעיל
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,אנא בחר את סוג המסמך ראשון
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ביקורי חומר לבטל {0} לפני ביטול תחזוקת הביקור הזה
 DocType: Salary Slip,Leave Encashment Amount,השאר encashment הסכום
@@ -734,17 +739,17 @@
 DocType: Supplier,Default Payable Accounts,חשבונות לתשלום ברירת מחדל
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,עובד {0} אינו פעיל או שאינו קיים
 DocType: Features Setup,Item Barcode,ברקוד פריט
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,פריט גרסאות {0} מעודכן
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,פריט גרסאות {0} מעודכן
 DocType: Quality Inspection Reading,Reading 6,קריאת 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,לרכוש חשבונית מראש
 DocType: Address,Shop,חנות
 DocType: Hub Settings,Sync Now,Sync עכשיו
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},שורת {0}: כניסת אשראי לא יכולה להיות מקושרת עם {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},שורת {0}: כניסת אשראי לא יכולה להיות מקושרת עם {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,חשבון בנק / מזומנים ברירת מחדל יהיה מעודכן באופן אוטומטי בקופת חשבונית כאשר מצב זה נבחר.
 DocType: Employee,Permanent Address Is,כתובת קבע
 DocType: Production Order Operation,Operation completed for how many finished goods?,מבצע הושלם לכמה מוצרים מוגמרים?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,המותג
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,הפרשה ליתר {0} חצה לפריט {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,הפרשה ליתר {0} חצה לפריט {1}.
 DocType: Employee,Exit Interview Details,פרטי ראיון יציאה
 DocType: Item,Is Purchase Item,האם פריט הרכישה
 DocType: Journal Entry Account,Purchase Invoice,רכישת חשבוניות
@@ -756,7 +761,7 @@
 DocType: Salary Slip,Total in words,"סה""כ במילים"
 DocType: Material Request Item,Lead Time Date,תאריך עופרת זמן
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,הוא חובה. אולי שיא המרה לא נוצר ל
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},# שורה {0}: נא לציין את מספר סידורי לפריט {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},# שורה {0}: נא לציין את מספר סידורי לפריט {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","לפריטים &#39;מוצרי Bundle&#39;, מחסן, מספר סידורי ויצוו לא ייחשב מהשולחן &quot;רשימת האריזה&quot;. אם מחסן ויצוו אין הם זהים עבור כל פריטי האריזה עבור כל הפריט &quot;מוצרים Bundle &#39;, ניתן להזין ערכים אלה בטבלת הפריט העיקרית, ערכים יועתקו ל&#39;אריזת רשימה&#39; שולחן."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,משלוחים ללקוחות.
 DocType: Purchase Invoice Item,Purchase Order Item,לרכוש פריט להזמין
@@ -765,14 +770,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,שונות
 ,Company Name,שם חברה
 DocType: SMS Center,Total Message(s),מסר כולל (ים)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,פריט בחר להעברה
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,ראש בחר חשבון של הבנק שבו הופקד שיק.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,לאפשר למשתמש לערוך מחירון שיעור בעסקות
 DocType: Pricing Rule,Max Qty,מקס כמות
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,כימיה
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,כל הפריטים כבר הועברו להזמנת ייצור זה.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,כל הפריטים כבר הועברו להזמנת ייצור זה.
 DocType: Process Payroll,Select Payroll Year and Month,בחר שכר שנה וחודש
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",עבור לקבוצה המתאימה (בדרך כלל יישום של קרנות&gt; נכסים שוטפים&gt; חשבונות בנק וליצור חשבון חדש (על ידי לחיצה על הוסף לילדים) מסוג &quot;בנק&quot;
 DocType: Workstation,Electricity Cost,עלות חשמל
@@ -786,10 +792,10 @@
 DocType: SMS Center,All Lead (Open),כל עופרת (הפתוח)
 DocType: Purchase Invoice,Get Advances Paid,קבלו תשלום מקדמות
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,צרף התמונה שלך
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,הפוך
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,הפוך
 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 +3,My Cart,סל הקניות שלי
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,סל הקניות שלי
 DocType: Lead,Next Contact Date,התאריך לתקשר הבא
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,פתיחת כמות
 DocType: Holiday List,Holiday List Name,שם רשימת החג
@@ -806,10 +812,10 @@
 DocType: POS Profile,Cash/Bank Account,מזומנים / חשבון בנק
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,פריטים הוסרו ללא שינוי בכמות או ערך.
 DocType: Delivery Note,Delivery To,משלוח ל
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,שולחן תכונה הוא חובה
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,שולחן תכונה הוא חובה
 DocType: Production Planning Tool,Get Sales Orders,קבל הזמנות ומכירות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} אינו יכול להיות שלילי
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,דיסקונט
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,דיסקונט
 DocType: Features Setup,Purchase Discounts,הנחות רכישה
 DocType: Workstation,Wages,שכר
 DocType: Time Log,Will be updated only if Time Log is 'Billable',יעודכן רק אם זמן הוא יומן &#39;חיוב&#39;
@@ -834,7 +840,7 @@
 DocType: Tax Rule,Shipping State,מדינת משלוח
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"פריט יש להוסיף באמצעות 'לקבל פריטים מרכישת קבלות ""כפתור"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,הוצאות מכירה
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,קנייה סטנדרטית
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,קנייה סטנדרטית
 DocType: GL Entry,Against,נגד
 DocType: Item,Default Selling Cost Center,מרכז עלות מכירת ברירת מחדל
 DocType: Sales Partner,Implementation Partner,שותף יישום
@@ -875,6 +881,7 @@
 DocType: Sales Partner,Distributor,מפיץ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,כלל משלוח סל קניות
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,ייצור להזמין {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',אנא הגדר &#39;החל הנחה נוספות ב&#39;
 ,Ordered Items To Be Billed,פריטים שהוזמנו להיות מחויב
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,מהטווח צריך להיות פחות מטווח
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,בחר יומני זמן ושלח ליצור חשבונית מכירות חדשה.
@@ -884,13 +891,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,אצווה זמן זה התחבר כבר מחויב.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,צור הזדמנות
 DocType: Salary Slip,Leave Without Pay,חופשה ללא תשלום
-DocType: Supplier,Communications,תקשורת
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,שגיאת תכנון קיבולת
 ,Trial Balance for Party,מאזן בוחן למפלגה
 DocType: Lead,Consultant,יועץ
 DocType: Salary Slip,Earnings,רווחים
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,פריט סיים {0} יש להזין לכניסת סוג הייצור
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,מאזן חשבונאי פתיחה
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,פריט סיים {0} יש להזין לכניסת סוג הייצור
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,מאזן חשבונאי פתיחה
 DocType: Sales Invoice Advance,Sales Invoice Advance,מכירות חשבונית מראש
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,שום דבר לא לבקש
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','תאריך התחלה בפועל' לא יכול להיות גדול מ 'תאריך סיום בפועל'
@@ -932,7 +938,7 @@
 DocType: Global Defaults,Current Fiscal Year,שנת כספים נוכחית
 DocType: Global Defaults,Disable Rounded Total,"להשבית מעוגל סה""כ"
 DocType: Lead,Call,שיחה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'הערכים' לא יכולים להיות ריקים
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'הערכים' לא יכולים להיות ריקים
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},שורה כפולה {0} עם אותו {1}
 ,Trial Balance,מאזן בוחן
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,הגדרת עובדים
@@ -944,9 +950,9 @@
 DocType: Contact,User ID,זיהוי משתמש
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,צפה לדג'ר
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,המוקדם
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
 DocType: Production Order,Manufacture against Sales Order,ייצור נגד להזמין מכירות
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,שאר העולם
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,חבילת גרוס
@@ -976,7 +982,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},אינך רשאי לערוך חשבון קפוא {0}
 DocType: Journal Entry,Get Outstanding Invoices,קבל חשבוניות מצטיינים
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -989,13 +995,13 @@
 DocType: Employee,Place of Issue,מקום ההנפקה
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,חוזה
 DocType: Email Digest,Add Quote,להוסיף ציטוט
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},גורם coversion של אוני 'מישגן נדרש לאונים' מישגן: {0} בפריט: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},גורם coversion של אוני 'מישגן נדרש לאונים' מישגן: {0} בפריט: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,הוצאות עקיפות
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,שורת {0}: הכמות היא חובה
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,חקלאות
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,המוצרים או השירותים שלך
 DocType: Mode of Payment,Mode of Payment,מצב של תשלום
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,מדובר בקבוצת פריט שורש ולא ניתן לערוך.
 DocType: Journal Entry Account,Purchase Order,הזמנת רכש
 DocType: Warehouse,Warehouse Contact Info,מחסן פרטים ליצירת קשר
@@ -1004,8 +1010,8 @@
 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 +113,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,ציוד הון
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","כלל תמחור נבחר ראשון המבוססת על 'החל ב'שדה, אשר יכול להיות פריט, קבוצת פריט או מותג."
@@ -1015,7 +1021,7 @@
 DocType: Appraisal Goal,Goal,מטרה
 DocType: Sales Invoice Item,Edit Description,עריכת תיאור
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,תאריך אספקה צפוי הוא פחותה ממועד המתוכנן התחל.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,לספקים
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,לספקים
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,הגדרת סוג החשבון מסייעת בבחירת חשבון זה בעסקות.
 DocType: Purchase Invoice,Grand Total (Company Currency),סך כולל (חברת מטבע)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,"יוצא סה""כ"
@@ -1028,7 +1034,7 @@
 DocType: Journal Entry,Journal Entry,יומן
 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 +427,BOM {0} does not belong to Item {1},BOM {0} אינו שייך לפריט {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,זהו המספר של העסקה יצרה האחרונה עם קידומת זו
@@ -1060,7 +1066,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","עלונים לאנשי קשר, מוביל."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,לא ניתן להשאיר את הפעילות ריקה.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,לא ניתן להשאיר את הפעילות ריקה.
 ,Delivered Items To Be Billed,פריטים נמסרו לחיוב
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,מחסן לא ניתן לשנות למס 'סידורי
 DocType: Authorization Rule,Average Discount,דיסקונט הממוצע
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,אנא בחר שנת כספים
 DocType: BOM Operation,Operation Description,תיאור מבצע
 DocType: Item,Will also apply to variants,יחול גם על גרסאות
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,לא ניתן לשנות את תאריך שנת הכספים התחלה ותאריך סיום שנת כספים אחת לשנת הכספים נשמרה.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,לא ניתן לשנות את תאריך שנת הכספים התחלה ותאריך סיום שנת כספים אחת לשנת הכספים נשמרה.
 DocType: Quotation,Shopping Cart,סל קניות
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,ממוצע יומי יוצא
 DocType: Pricing Rule,Campaign,קמפיין
@@ -1085,7 +1091,8 @@
 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 +211,Stock Entries already created for Production Order ,ערכי מניות כבר יצרו להפקה להזמין
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ערכי מניות כבר יצרו להפקה להזמין
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,שינוי נטו בנכסים קבועים
 DocType: Leave Control Panel,Leave blank if considered for all designations,שאר ריק אם תיחשב לכל הכינויים
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},מקס: {0}
@@ -1097,7 +1104,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,תרשים של חשבונות
 DocType: Material Request,Terms and Conditions Content,תוכן תנאים והגבלות
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,לא יכול להיות גדול מ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
 DocType: Maintenance Visit,Unscheduled,לא מתוכנן
 DocType: Employee,Owned,בבעלות
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,תלוי בחופשה ללא תשלום
@@ -1132,7 +1139,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,הרכבות תת
 DocType: Shipping Rule Condition,To Value,לערך
 DocType: Supplier,Stock Manager,מניית מנהל
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},מחסן המקור הוא חובה עבור שורת {0}
+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 +581,Packing Slip,Slip אריזה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,השכרת משרד
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,הגדרות שער SMS ההתקנה
@@ -1140,10 +1147,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,אין כתובת הוסיפה עדיין.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation עבודה שעה
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,אנליסט
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום JV {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום JV {2}
 DocType: Item,Inventory,מלאי
 DocType: Features Setup,"To enable ""Point of Sale"" view",כדי לאפשר &quot;נקודת מכירה&quot; תצוגה
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,תשלום לא יכול להתבצע על עגלה ריקה
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,תשלום לא יכול להתבצע על עגלה ריקה
 DocType: Item,Sales Details,פרטי מכירות
 DocType: Opportunity,With Items,עם פריטים
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,בכמות
@@ -1158,10 +1165,11 @@
 DocType: Cost Center,Parent Cost Center,מרכז עלות הורה
 DocType: Sales Invoice,Source,מקור
 DocType: Leave Type,Is Leave Without Pay,האם חופשה ללא תשלום
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,לא נמצא רשומות בטבלת התשלום
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,לא נמצא רשומות בטבלת התשלום
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,תאריך כספי לשנה שהתחל
 DocType: Employee External Work History,Total Experience,"ניסיון סה""כ"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Slip אריזה (ים) בוטל
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Slip אריזה (ים) בוטל
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,תזרים מזומנים מהשקעות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,הוצאות הובלה והשילוח
 DocType: Material Request Item,Sales Order No,להזמין ללא מכירות
 DocType: Item Group,Item Group Name,שם קבוצת פריט
@@ -1169,12 +1177,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,העברת חומרים לייצור
 DocType: Pricing Rule,For Price List,למחירון
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,חיפוש הנהלה
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","שער רכישה עבור פריט: {0} לא מצא, שנדרש להזמין כניסת חשבונאות (הוצאה). נא לציין פריט מחיר נגד מחירון קנייה."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","שער רכישה עבור פריט: {0} לא מצא, שנדרש להזמין כניסת חשבונאות (הוצאה). נא לציין פריט מחיר נגד מחירון קנייה."
 DocType: Maintenance Schedule,Schedules,לוחות זמנים
 DocType: Purchase Invoice Item,Net Amount,סכום נטו
 DocType: Purchase Order Item Supplied,BOM Detail No,פרט BOM לא
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),סכום הנחה נוסף (מטבע חברה)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},שגיאה: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},שגיאה: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,צור חשבון חדש מתרשים של חשבונות.
 DocType: Maintenance Visit,Maintenance Visit,תחזוקה בקר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,לקוחות> קבוצת לקוחות> טריטוריה
@@ -1200,17 +1208,17 @@
 DocType: Sales Partner,Sales Partner Target,מכירות פרטנר יעד
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},כניסה לחשבונאות {0} יכולה להתבצע רק במטבע: {1}
 DocType: Pricing Rule,Pricing Rule,כלל תמחור
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,בקשת חומר להזמנת רכש
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,בקשת חומר להזמנת רכש
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,חשבונות בנק
 ,Bank Reconciliation Statement,הצהרת בנק פיוס
 DocType: Address,Lead Name,שם עופרת
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,יתרת מלאי פתיחה
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} חייבים להופיע רק פעם אחת
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},אסור לי תשלומי העברה יותר {0} מ {1} נגד הזמנת רכש {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,Not allowed to tranfer more {0} than {1} against Purchase Order {2},אסור לי תשלומי העברה יותר {0} מ {1} נגד הזמנת רכש {2}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,אין פריטים לארוז
 DocType: Shipping Rule Condition,From Value,מערך
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,כמות ייצור היא תנאי הכרחית
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,כמות ייצור היא תנאי הכרחית
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,סכומים שלא באו לידי ביטוי בבנק
 DocType: Quality Inspection Reading,Reading 4,קריאת 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,תביעות לחשבון חברה.
@@ -1222,32 +1230,33 @@
 ,Material Requests for which Supplier Quotations are not created,בקשות מהותיות שלציטוטי ספק הם לא נוצרו
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,היום (ים) שבו אתה מתראיין לחופשת חגים. אתה לא צריך להגיש בקשה לחופשה.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,כדי לעקוב אחר פריטים באמצעות ברקוד. תוכל להיכנס לפריטים בתעודת משלוח וחשבונית מכירות על ידי סריקת הברקוד של פריט.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,סמן כנמסר
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,סמן כנמסר
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,הפוך הצעת מחיר
 DocType: Dependent Task,Dependent Task,משימה תלויה
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,נסה לתכנן פעולות לימי X מראש.
 DocType: HR Settings,Stop Birthday Reminders,Stop יום הולדת תזכורות
 DocType: SMS Center,Receiver List,מקלט רשימה
 DocType: Payment Tool Detail,Payment Amount,סכום תשלום
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,כמות הנצרכת
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} צפה
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} צפה
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,שינוי נטו במזומנים
 DocType: Salary Structure Deduction,Salary Structure Deduction,ניכוי שכר מבנה
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {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 +185,Quantity must not be more than {0},כמות לא חייבת להיות יותר מ {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),גיל (ימים)
 DocType: Quotation Item,Quotation Item,פריט ציטוט
 DocType: Account,Account Name,שם חשבון
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,מתאריך לא יכול להיות גדול יותר מאשר תאריך
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,מתאריך לא יכול להיות גדול יותר מאשר תאריך
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,לא {0} כמות סידורי {1} לא יכולה להיות חלק
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,סוג ספק אמן.
 DocType: Purchase Order Item,Supplier Part Number,"ספק מק""ט"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,שער המרה לא יכול להיות 0 או 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,שער המרה לא יכול להיות 0 או 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,קבלת רכישת {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,קבלת רכישת {0} לא תוגש
 DocType: Company,Default Payable Account,חשבון זכאים ברירת מחדל
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","הגדרות לעגלת קניות מקוונות כגון כללי משלוח, מחירון וכו '"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% שחויבו
@@ -1259,15 +1268,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,הנושאים שלי
 DocType: BOM Item,BOM Item,פריט BOM
 DocType: Appraisal,For Employee,לעובדים
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,שורת {0}: מראש נגד ספק יש לחייב
 DocType: Company,Default Values,ערכי ברירת מחדל
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,שורת {0}: סכום לתשלום לא יכול להיות שלילי
 DocType: Expense Claim,Total Amount Reimbursed,הסכום כולל החזר
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},נגד ספק חשבונית {0} יום {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},נגד ספק חשבונית {0} יום {1}
 DocType: Customer,Default Price List,מחיר מחירון ברירת מחדל
 DocType: Payment Reconciliation,Payments,תשלומים
 DocType: Budget Detail,Budget Allocated,תקציב שהוקצה
 DocType: Journal Entry,Entry Type,סוג הכניסה
 ,Customer Credit Balance,יתרת אשראי ללקוחות
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,שינוי נטו בחשבונות זכאים
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,אנא ודא id הדוא&quot;ל שלך
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',לקוחות הנדרשים עבור 'דיסקונט Customerwise'
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,עדכון מועדי תשלום בנק עם כתבי עת.
@@ -1288,7 +1299,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,אפשר סל קניות
 DocType: Employee,Permanent Address,כתובת קבועה
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,פריט {0} חייב להיות פריט שירות.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",מקדמה ששולם כנגד {0} {1} לא יכול להיות גדול \ מ גרנד סה&quot;כ {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,אנא בחר קוד פריט
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),להפחית ניכוי לחופשה ללא תשלום (LWP)
@@ -1305,18 +1316,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,יחידה אחת של פריט.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',זמן יומן אצווה {0} חייב להיות 'הוגש'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',זמן יומן אצווה {0} חייב להיות 'הוגש'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,הפוך חשבונאות כניסה לכל מנית תנועה
 DocType: Leave Allocation,Total Leaves Allocated,"סה""כ עלים מוקצבות"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},מחסן נדרש בשורה לא {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},מחסן נדרש בשורה לא {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,נא להזין פיננסית בתוקף השנה תאריכי ההתחלה וסיום
 DocType: Employee,Date Of Retirement,מועד הפרישה
 DocType: Upload Attendance,Get Template,קבל תבנית
 DocType: Address,Postal,דואר
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"קבוצת לקוחות קיימת עם אותו שם, בבקשה לשנות את שם הלקוח או לשנות את שם קבוצת הלקוחות"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,אנא בחר {0} הראשון.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},טקסט {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,אנא בחר {0} הראשון.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},טקסט {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,איש קשר חדש
 DocType: Territory,Parent Territory,טריטורית הורה
 DocType: Quality Inspection Reading,Reading 2,קריאת 2
 DocType: Stock Entry,Material Receipt,קבלת חומר
@@ -1324,7 +1336,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},מפלגת סוג והמפלגה נדרש לבקל / חשבון זכאים {0}
 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 +210,Quantity required for Item {0} in row {1},הכמות הנדרשת לפריט {0} בשורת {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},הכמות הנדרשת לפריט {0} בשורת {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},מחסן {0} לא ניתן למחוק ככמות קיימת עבור פריט {1}
 DocType: Quotation,Order Type,סוג להזמין
 DocType: Purchase Invoice,Notification Email Address,"כתובת דוא""ל להודעות"
@@ -1341,15 +1353,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,יותר מדי עמודות. לייצא את הדוח ולהדפיס אותו באמצעות יישום גיליון אלקטרוני.
 DocType: Sales 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 +152,Main,ראשי
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,ראשי
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,קידומת להגדיר למספור סדרה על העסקות שלך
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,לא ניתן לבטל הזמנה הפסיקה. מגופה כדי לבטל.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,הפוך הזמנת רכש
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,הפוך הזמנת רכש
 DocType: SMS Center,Send To,שלח אל
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
 DocType: Payment Reconciliation Payment,Allocated amount,סכום שהוקצה
@@ -1362,7 +1374,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,מחסן והפניה
 DocType: Supplier,Statutory info and other general information about your Supplier,מידע סטטוטורי ומידע כללי אחר על הספק שלך
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,כתובות
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,נגד תנועת היומן {0} אין {1} כניסה ללא תחרות
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,נגד תנועת היומן {0} אין {1} כניסה ללא תחרות
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},לשכפל מספר סידורי נכנס לפריט {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,תנאי עבור כלל משלוח
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,פריט אינו מותר לי הזמנת ייצור.
@@ -1371,10 +1383,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,סכום אשראי במטבע חשבון
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,יומני זמן לייצור.
 DocType: Item,Apply Warehouse-wise Reorder Level,החל המחסן-חכמה להזמנה חוזרת רמה
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} יש להגיש
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} יש להגיש
 DocType: Authorization Control,Authorization Control,אישור בקרה
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},# השורה {0}: נדחה מחסן הוא חובה נגד פריט דחה {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,זמן יומן למשימות.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,תשלום
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,תשלום
 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},בקשת חומר של מקסימום {0} יכולה להתבצע עבור פריט {1} נגד להזמין מכירות {2}
 DocType: Employee,Salutation,שְׁאֵילָה
@@ -1391,7 +1404,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,חבר
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,פריט {0} הוא לא פריט בהמשכים
 DocType: SMS Center,Create Receiver List,צור מקלט רשימה
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,פג תוקף
 DocType: Packing Slip,To Package No.,חבילת מס '
 DocType: Warranty Claim,Issue Date,תאריך הנפקה
 DocType: Activity Cost,Activity Cost,עלות פעילות
@@ -1429,7 +1441,7 @@
 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 +65,Territory / Customer,שטח / לקוחות
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,לדוגמא 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,האם פריט מכירות
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,פריט עץ הקבוצה
@@ -1441,14 +1453,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} נוצר
 DocType: Delivery Note Item,Against Sales Order,נגד להזמין מכירות
 ,Serial No Status,סטטוס מספר סידורי
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,שולחן פריט לא יכול להיות ריק
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,שולחן פריט לא יכול להיות ריק
 DocType: Pricing Rule,Selling,מכירה
 DocType: Employee,Salary Information,מידע משכורת
 DocType: Sales Person,Name and Employee ID,שם והעובדים ID
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,חובות ומסים
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,נא להזין את תאריך הפניה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,כמות שסופק
@@ -1477,7 +1489,7 @@
 DocType: Holiday List,Clear Table,לוח ברור
 DocType: Features Setup,Brands,מותגים
 DocType: C-Form Invoice Detail,Invoice No,חשבונית לא
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,מהזמנת הרכש
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,מהזמנת הרכש
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,דרג תמחיר
 ,Customer Addresses And Contacts,כתובות של לקוחות ואנשי קשר
@@ -1494,7 +1506,7 @@
 ,Maintenance Schedules,לוחות זמנים תחזוקה
 ,Quotation Trends,מגמות ציטוט
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},קבוצת פריט שלא צוינה באב פריט לפריט {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
 DocType: Shipping Rule Condition,Shipping Amount,סכום משלוח
 ,Pending Amount,סכום תלוי ועומד
 DocType: Purchase Invoice Item,Conversion Factor,המרת פקטור
@@ -1511,12 +1523,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,עץ של חשבונות finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,שאר ריק אם נחשב לכל סוגי העובדים
 DocType: Landed Cost Voucher,Distribute Charges Based On,חיובים להפיץ מבוסס על
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"חשבון {0} חייב להיות מסוג 'נכסים קבועים ""כפריט {1} הוא פריט רכוש"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"חשבון {0} חייב להיות מסוג 'נכסים קבועים ""כפריט {1} הוא פריט רכוש"
 DocType: HR Settings,HR Settings,הגדרות HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,תביעת חשבון ממתינה לאישור. רק המאשר ההוצאות יכול לעדכן את הסטטוס.
 DocType: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
 DocType: Leave Block List Allow,Leave Block List Allow,השאר בלוק רשימה אפשר
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ספורט
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,"סה""כ בפועל"
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,יחידה
@@ -1528,6 +1540,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} הוא כעת ברירת מחדל שנת כספים. רענן את הדפדפן שלך כדי שהשינוי ייכנס לתוקף.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,תביעות חשבון
 DocType: Issue,Support,תמיכה
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,צפה בסל
 ,BOM Search,חיפוש BOM
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),סגירה (פתיחת סיכומים +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,נא לציין את מטבע בחברה
@@ -1545,7 +1558,7 @@
 DocType: Project,% Tasks Completed,משימות שהושלמו%
 DocType: Project,Gross Margin,שיעור רווח גולמי
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,אנא ראשון להיכנס פריט הפקה
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,משתמשים נכים
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,משתמשים נכים
 DocType: Opportunity,Quotation,הצעת מחיר
 DocType: Salary Slip,Total Deduction,סך ניכוי
 DocType: Quotation,Maintenance User,משתמש תחזוקה
@@ -1554,7 +1567,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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,לנכות
@@ -1564,12 +1577,12 @@
 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,SO כמות
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ערכי מניות קיימים נגד מחסן {0}, ולכן אתה לא יכול להקצות מחדש או לשנות את המחסן"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ערכי מניות קיימים נגד מחסן {0}, ולכן אתה לא יכול להקצות מחדש או לשנות את המחסן"
 DocType: Appraisal,Calculate Total Score,חישוב ציון הכולל
 DocType: Supplier Quotation,Manufacturing Manager,ייצור מנהל
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},מספר סידורי {0} הוא תחת אחריות upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,תעודת משלוח פצל לחבילות.
-apps/erpnext/erpnext/hooks.py +68,Shipments,משלוחים
+apps/erpnext/erpnext/hooks.py +69,Shipments,משלוחים
 DocType: Purchase Order Item,To be delivered to customer,שיימסר ללקוח
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,סטטוס זמן יומן יש להגיש.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,מספר סידורי {0} אינו שייך לכל מחסן
@@ -1589,10 +1602,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,בחר חברה ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,שאר ריק אם תיחשב לכל המחלקות
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","סוגי התעסוקה (קבוע, חוזה, וכו 'מתמחה)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
 DocType: Currency Exchange,From Currency,ממטבע
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","אנא בחר סכום שהוקצה, סוג החשבונית וחשבונית מספר בatleast שורה אחת"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},להזמין מכירות הנדרשים לפריט {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","אנא בחר סכום שהוקצה, סוג החשבונית וחשבונית מספר בatleast שורה אחת"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},להזמין מכירות הנדרשים לפריט {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,סכומים שלא באו לידי ביטוי במערכת
 DocType: Purchase Invoice Item,Rate (Company Currency),שיעור (חברת מטבע)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,אחרים
@@ -1608,7 +1621,7 @@
 DocType: Quality Inspection,In Process,בתהליך
 DocType: Authorization Rule,Itemwise Discount,Itemwise דיסקונט
 DocType: Purchase Order Item,Reference Document Type,התייחסות סוג המסמך
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} נגד להזמין מכירות {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} נגד להזמין מכירות {1}
 DocType: Account,Fixed Asset,רכוש קבוע
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,מלאי בהמשכים
 DocType: Activity Type,Default Billing Rate,דרג חיוב ברירת מחדל
@@ -1618,7 +1631,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,להזמין מכירות לתשלום
 DocType: Expense Claim Detail,Expense Claim Detail,פרטי תביעת חשבון
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,זמן יומנים שנוצרו:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,אנא בחר חשבון נכון
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,אנא בחר חשבון נכון
 DocType: Item,Weight UOM,המשקל של אוני 'מישגן
 DocType: Employee,Blood Group,קבוצת דם
 DocType: Purchase Invoice Item,Page Break,מעבר עמוד
@@ -1649,10 +1662,10 @@
 DocType: Time Log,To Time,לעת
 DocType: Authorization Rule,Approving Role (above authorized value),אישור תפקיד (מעל הערך מורשה)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","כדי להוסיף צמתים ילד, לחקור עץ ולחץ על הצומת תחתיו ברצונך להוסיף עוד צמתים."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,אשראי לחשבון חייב להיות חשבון לתשלום
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},רקורסיה BOM: {0} אינה יכולה להיות הורה או ילד של {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,אשראי לחשבון חייב להיות חשבון לתשלום
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,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 +116,"For {0}, only debit accounts can be linked against another credit entry","עבור {0}, רק חשבונות החיוב יכולים להיות מקושרים נגד כניסת אשראי אחרת"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","עבור {0}, רק חשבונות החיוב יכולים להיות מקושרים נגד כניסת אשראי אחרת"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,מחיר המחירון {0} אינו זמין
 DocType: Manufacturing Settings,Allow Overtime,לאפשר שעות נוספות
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} מספרים סידוריים הנדרשים לפריט {1}. שסיפקת {2}.
@@ -1660,8 +1673,9 @@
 DocType: Item,Customer Item Codes,קודי פריט לקוחות
 DocType: Opportunity,Lost Reason,סיבה לאיבוד
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,צור ערכי תשלום כנגד הזמנות או חשבוניות.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,כתובת חדשה
 DocType: Quality Inspection,Sample Size,גודל מדגם
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,כל הפריטים כבר בחשבונית
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,מרכזי עלות נוספים יכולים להתבצע תחת קבוצות אבל ערכים יכולים להתבצע נגד לא-קבוצות
 DocType: Project,External,חיצוני
@@ -1717,13 +1731,14 @@
 DocType: Rename Tool,Rename Tool,שינוי שם כלי
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,עלות עדכון
 DocType: Item Reorder,Item Reorder,פריט סידור מחדש
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,העברת חומר
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,העברת חומר
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ציין את הפעולות, עלויות הפעלה ולתת מבצע ייחודי לא לפעולות שלך."
 DocType: Purchase Invoice,Price List Currency,מטבע מחירון
 DocType: Naming Series,User must always select,משתמש חייב תמיד לבחור
 DocType: Stock Settings,Allow Negative Stock,לאפשר Stock שלילי
 DocType: Installation Note,Installation Note,הערה התקנה
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,להוסיף מסים
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,תזרים מזומנים ממימון
 ,Financial Analytics,Analytics הפיננסי
 DocType: Quality Inspection,Verified By,מאומת על ידי
 DocType: Address,Subsidiary,חברת בת
@@ -1733,19 +1748,19 @@
 DocType: Process Payroll,Create Salary Slip,צור שכר Slip
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,מאזן צפוי לפי בנק
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),מקור הכספים (התחייבויות)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},כמות בשורת {0} ({1}) חייבת להיות זהה לכמות שיוצרה {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},כמות בשורת {0} ({1}) חייבת להיות זהה לכמות שיוצרה {2}
 DocType: Appraisal,Employee,עובד
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,דוא&quot;ל יבוא מ
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,הזמן כמשתמש
 DocType: Features Setup,After Sale Installations,לאחר התקנות מכירה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} מחויב באופן מלא
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} מחויב באופן מלא
 DocType: Workstation Working Hour,End Time,שעת סיום
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,תנאי חוזה סטנדרטי למכירות או רכש.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,קבוצה על ידי שובר
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,הנדרש על
 DocType: Sales Invoice,Mass Mailing,תפוצה המונית
 DocType: Rename Tool,File to Rename,קובץ לשינוי השם
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},מספר ההזמנה Purchse נדרש לפריט {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},מספר ההזמנה Purchse נדרש לפריט {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,תשלומי הצג
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},BOM צוין {0} אינו קיימת עבור פריט {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,לוח זמנים תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
@@ -1755,6 +1770,7 @@
 DocType: Selling Settings,Sales Order Required,סדר הנדרש מכירות
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,צור לקוח
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,פרט לוח זמנים תחזוקה
 DocType: Quality Inspection Reading,Reading 9,קריאת 9
@@ -1766,6 +1782,7 @@
 DocType: Warranty Claim,Raised By,הועלה על ידי
 DocType: Payment Tool,Payment Account,חשבון תשלומים
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,שינוי נטו בחשבונות חייבים
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Off המפצה
 DocType: Quality Inspection Reading,Accepted,קיבלתי
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,אנא ודא שאתה באמת רוצה למחוק את כל העסקות לחברה זו. נתוני אביך יישארו כפי שהוא. לא ניתן לבטל פעולה זו.
@@ -1773,17 +1790,17 @@
 DocType: Payment Tool,Total Payment Amount,"סכום תשלום סה""כ"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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 +204,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
 DocType: Newsletter,Test,מבחן
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","כמו שיש עסקות מלאי קיימות עבור פריט זה, \ אתה לא יכול לשנות את הערכים של &#39;יש מספר סידורי&#39;, &#39;יש אצווה לא&#39;, &#39;האם פריט במלאי &quot;ו-&quot; שיטת הערכה &quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,מהיר יומן
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,מהיר יומן
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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 +157,Please enter Planned Qty for Item {0} at row {1},נא להזין מתוכננת כמות לפריט {0} בשורת {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} לא יוגש
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} לא יוגש
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,בקשות לפריטים.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,הזמנת ייצור נפרדת תיווצר לכל פריט טוב מוגמר.
 DocType: Purchase Invoice,Terms and Conditions1,תנאים וConditions1
@@ -1796,7 +1813,7 @@
 DocType: Authorization Rule,Authorized Value,ערך מורשה
 DocType: Contact,Enter department to which this Contact belongs,הזן מחלקה שלקשר זה שייך
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,"סה""כ נעדר"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,פריט או מחסן לשורת {0} אינו תואם בקשת חומר
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,פריט או מחסן לשורת {0} אינו תואם בקשת חומר
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,יְחִידַת מִידָה
 DocType: Fiscal Year,Year End Date,תאריך סיום שנה
 DocType: Task Depends On,Task Depends On,המשימה תלויה ב
@@ -1822,7 +1839,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,תאריך סיום חוזה חייב להיות גדול מ תאריך ההצטרפות
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,/ סוחר / סוכן / שותפים / משווק עמלת מפיץ הצד שלישי שמוכר את המוצרים עבור חברות בועדה.
 DocType: Customer Group,Has Child Node,יש ילד צומת
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} נגד הזמנת רכש {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} נגד הזמנת רכש {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","הזן הפרמטרים url סטטי כאן (לדוגמא. שולח = ERPNext, שם משתמש = ERPNext, סיסמא = 1234 וכו ')"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} לא בכל שנת כספים פעילה. לפרטים נוספים לבדוק {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,זה אתר דוגמא שנוצר אוטומטית מERPNext
@@ -1850,7 +1867,7 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","תבנית מס סטנדרטית שיכול להיות מיושמת על כל עסקות הרכישה. תבנית זו יכולה להכיל רשימה של ראשי מס וגם ראשי חשבון אחרים כמו ""משלוח"", ""ביטוח"", ""טיפול ב"" וכו '#### הערה שיעור המס שאתה מגדיר כאן יהיה שיעור המס האחיד לכל פריטים ** * *. אם יש פריטים ** ** שיש לי שיעורים שונים, הם חייבים להיות הוסיפו במס הפריט ** ** שולחן ב** ** הפריט השני. #### תיאור של עמודות סוג חישוב 1.: - זה יכול להיות בסך הכל ** ** נטו (כלומר הסכום של סכום בסיסי). - ** בסך הכל / סכום השורה הקודמת ** (למסים או חיובים מצטברים). אם תבחר באפשרות זו, המס יחול כאחוז מהשורה הקודמת (בטבלת המס) הסכום כולל או. - ** ** בפועל (כאמור). 2. ראש חשבון: פנקס החשבון שתחתיו מס זה יהיה להזמין מרכז עלות 3.: אם המס / תשלום הוא הכנסה (כמו משלוח) או הוצאה שיש להזמין נגד מרכז עלות. 4. תיאור: תיאור של המס (שיודפס בחשבוניות / ציטוטים). 5. שיעור: שיעור מס. 6. סכום: סכום מס. 7. סך הכל: סך הכל מצטבר לנקודה זו. 8. הזן Row: אם המבוסס על ""שורה הקודמת סה""כ"" אתה יכול לבחור את מספר השורה שיילקח כבסיס לחישוב זה (ברירת מחדל היא השורה הקודמת). 9. קח מס או תשלום עבור: בחלק זה אתה יכול לציין אם המס / תשלום הוא רק עבור הערכת שווי (לא חלק מסך הכל) או רק לכולל (אינו מוסיף ערך לפריט) או לשניהם. 10. להוסיף או לנכות: בין אם ברצונך להוסיף או לנכות את המס."
 DocType: Purchase Receipt Item,Recd Quantity,כמות Recd
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},לא יכול לייצר יותר פריט {0} מאשר כמות להזמין מכירות {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
 DocType: Payment Reconciliation,Bank / Cash Account,חשבון בנק / מזומנים
 DocType: Tax Rule,Billing City,עיר חיוב
 DocType: Global Defaults,Hide Currency Symbol,הסתר סמל מטבע
@@ -1882,6 +1899,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,הוצאות שירות
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-מעל
 DocType: Buying Settings,Default Buying Price List,מחיר מחירון קניית ברירת מחדל
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.","ערכי ברירת מחדל שנקבעו כמו חברה, מטבע, שנת כספים הנוכחית, וכו '"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,סוג תשלום
@@ -1917,7 +1935,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","ראה ""שיעור חומרים הבוסס על"" בסעיף תמחיר"
 DocType: Appraisal Goal,Key Responsibility Area,פינת אחריות מפתח
 DocType: Item Reorder,Material Request Type,סוג בקשת חומר
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,שורת {0}: יחידת מידת המרת פקטור הוא חובה
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,שורת {0}: יחידת מידת המרת פקטור הוא חובה
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,"נ""צ"
 DocType: Cost Center,Cost Center,מרכז עלות
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,# שובר
@@ -1939,7 +1957,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},אנא בחר ערך עבור {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,כל הכתובות.
 DocType: Company,Stock Settings,הגדרות מניות
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","המיזוג אפשרי רק אם המאפיינים הבאים הם זהים בשני רשומות. האם קבוצה, סוג רוט, חברה"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","המיזוג אפשרי רק אם המאפיינים הבאים הם זהים בשני רשומות. האם קבוצה, סוג רוט, חברה"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ניהול קבוצת לקוחות עץ.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,שם מרכז העלות חדש
 DocType: Leave Control Panel,Leave Control Panel,השאר לוח הבקרה
@@ -1959,8 +1977,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,פרט כלי תשלום
 ,Sales Browser,דפדפן מכירות
 DocType: Journal Entry,Total Credit,"סה""כ אשראי"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},אזהרה: נוסף {0} # {1} קיימת נגד כניסת מניית {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,מקומי
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},אזהרה: נוסף {0} # {1} קיימת נגד כניסת מניית {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,חייבים
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,גדול
@@ -1978,7 +1996,7 @@
 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 מס '
 DocType: Production Order Operation,Make Time Log,הפוך זמן התחבר
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,אנא הגדר כמות הזמנה חוזרת
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,אנא הגדר כמות הזמנה חוזרת
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},אנא ליצור לקוחות מהעופרת {0}
 DocType: Price List,Applicable for Countries,ישים עבור מדינות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,מחשבים
@@ -2026,10 +2044,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,פריט אחד atleast יש להזין עם כמות שלילית במסמך התמורה
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,אין הערות
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,אין הערות
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,איחור
 DocType: Account,Stock Received But Not Billed,המניה התקבלה אבל לא חויבה
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,חשבון שורש חייב להיות קבוצה
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,חשבון שורש חייב להיות קבוצה
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,"סכום ברוטו + חבילת חוֹב הסכום + encashment - ניכוי סה""כ"
 DocType: Monthly Distribution,Distribution Name,שם הפצה
 DocType: Features Setup,Sales and Purchase,מכירות ורכש
@@ -2043,6 +2061,7 @@
 DocType: Journal Entry Account,Party Balance,מאזן המפלגה
 DocType: Sales Invoice Item,Time Log Batch,אצווה הזמן התחבר
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,אנא בחר החל דיסקונט ב
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,שכר סליפ נוצר
 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,העברת חומר לייצור
@@ -2050,9 +2069,9 @@
 DocType: Purchase Invoice,Half-yearly,חצי שנתי
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,שנת כספים {0} לא מצאה.
 DocType: Bank Reconciliation,Get Relevant Entries,קבל ערכים רלוונטיים
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,כניסה לחשבונאות במלאי
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,כניסה לחשבונאות במלאי
 DocType: Sales Invoice,Sales Team1,Team1 מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,פריט {0} אינו קיים
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,פריט {0} אינו קיים
 DocType: Sales Invoice,Customer Address,כתובת הלקוח
 DocType: Purchase Invoice,Apply Additional Discount On,החל נוסף דיסקונט ב
 DocType: Account,Root Type,סוג השורש
@@ -2061,15 +2080,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,הצג מצגת זו בחלק העליון של הדף
 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 +149,Target warehouse is mandatory for row {0},מחסן היעד הוא חובה עבור שורת {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},מחסן היעד הוא חובה עבור שורת {0}
 DocType: Quality Inspection,Quality Inspection,איכות פיקוח
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,קטן במיוחד
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,חשבון {0} הוא קפוא
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ישות / בת משפטית עם תרשים נפרד של חשבונות השייכים לארגון.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","מזון, משקאות וטבק"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL או BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},יכול רק לבצע את התשלום כנגד סרק {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},יכול רק לבצע את התשלום כנגד סרק {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,שיעור עמלה לא יכול להיות גדול מ -100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,רמת מלאי מינימאלית
 DocType: Stock Entry,Subcontract,בקבלנות משנה
@@ -2106,7 +2125,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,בדיקת איכות נכנסת.
 DocType: Purchase Order Item,Returned Qty,כמות חזר
 DocType: Employee,Exit,יציאה
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,סוג השורש הוא חובה
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,סוג השורש הוא חובה
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,מספר סידורי {0} נוצר
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","לנוחות לקוחות, ניתן להשתמש בקודים אלה בפורמטי הדפסה כמו הערות חשבוניות ומשלוח"
 DocType: Employee,You can enter any date manually,אתה יכול להיכנס לכל תאריך באופן ידני
@@ -2114,8 +2133,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,תקופת ניסיון
 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 +110,Row {0}: Advance against Customer must be credit,שורת {0}: מראש נגד הלקוח חייב להיות אשראי
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,פריט קבלת רכישה מסופק
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,שלם
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,שלם
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,לDatetime
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,יומנים לשמירה על סטטוס משלוח SMS
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,הזמנה חוזרת רמה
 DocType: Attendance,Attendance Date,תאריך נוכחות
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,פרידה שכר על בסיס צבירה וניכוי.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,חשבון עם בלוטות ילד לא יכול להיות מומר לדג'ר
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,חשבון עם בלוטות ילד לא יכול להיות מומר לדג'ר
 DocType: Address,Preferred Shipping Address,כתובת למשלוח מועדף
 DocType: Purchase Receipt Item,Accepted Warehouse,מחסן מקובל
 DocType: Bank Reconciliation Detail,Posting Date,תאריך פרסום
@@ -2149,7 +2169,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,מספר סידורי {0} אינו קיימות
 DocType: Pricing Rule,Discount Percentage,אחוז הנחה
 DocType: Payment Reconciliation Invoice,Invoice Number,מספר חשבונית
-apps/erpnext/erpnext/hooks.py +54,Orders,הזמנות
+apps/erpnext/erpnext/hooks.py +55,Orders,הזמנות
 DocType: Leave Control Panel,Employee Type,סוג העובד
 DocType: Employee Leave Approver,Leave Approver,השאר מאשר
 DocType: Manufacturing Settings,Material Transferred for Manufacture,חומר הועבר לייצור
@@ -2161,7 +2181,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% מחומרים מחויבים נגד הזמנת מכירה זה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,כניסת סגירת תקופה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,מרכז עלות בעסקות קיימות לא ניתן להמיר לקבוצה
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,פחת
+DocType: Account,Depreciation,פחת
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ספק (ים)
 DocType: Customer,Credit Limit,מגבלת אשראי
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,בחר סוג העסקה
@@ -2186,11 +2206,12 @@
 DocType: Material Request,Requested For,ביקש ל
 DocType: Quotation Item,Against Doctype,נגד Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,עקוב אחר תעודת משלוח זה נגד כל פרויקט
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,חשבון שורש לא ניתן למחוק
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,מזומנים נטו מהשקעות
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,חשבון שורש לא ניתן למחוק
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,ערכי Stock הצג
 ,Is Primary Address,האם כתובת ראשית
 DocType: Production Order,Work-in-Progress Warehouse,עבודה ב-התקדמות מחסן
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},# התייחסות {0} יום {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},# התייחסות {0} יום {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,ניהול כתובות
 DocType: Pricing Rule,Item Code,קוד פריט
 DocType: Production Planning Tool,Create Production Orders,צור הזמנות ייצור
@@ -2198,7 +2219,7 @@
 DocType: Journal Entry,User Remark,הערה משתמש
 DocType: Lead,Market Segment,פלח שוק
 DocType: Employee Internal Work History,Employee Internal Work History,העובד פנימי היסטוריה עבודה
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),"סגירה (ד""ר)"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),"סגירה (ד""ר)"
 DocType: Contact,Passive,פסיבי
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,מספר סידורי {0} לא במלאי
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,תבנית מס לעסקות מכירה.
@@ -2214,7 +2235,7 @@
 ,Billed Amount,סכום חיוב
 DocType: Bank Reconciliation,Bank Reconciliation,בנק פיוס
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,קבל עדכונים
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,בקשת חומר {0} בוטלה או נעצרה
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,בקשת חומר {0} בוטלה או נעצרה
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,הוסף כמה תקליטי מדגם
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,השאר ניהול
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,קבוצה על ידי חשבון
@@ -2223,14 +2244,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","ראש החשבון תחת אחריות, שבו רווח / הפסד יהיה להזמין"
 DocType: Payment Tool,Against Vouchers,נגד שוברים
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,עזרה מהירה
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},מקור ומחסן היעד אינו יכולים להיות זהים לשורה {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},מקור ומחסן היעד אינו יכולים להיות זהים לשורה {0}
 DocType: Features Setup,Sales Extras,תוספות מכירות
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} תקציב לחשבון {1} נגד מרכז עלות {2} יעלה על ידי {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',"""מתאריך"" חייב להיות לאחר 'עד תאריך'"
 ,Stock Projected Qty,המניה צפויה כמות
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
 DocType: Sales Order,Customer's Purchase Order,הלקוח הזמנת הרכש
 DocType: Warranty Claim,From Company,מחברה
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ערך או כמות
@@ -2240,9 +2261,9 @@
 DocType: Leave Block List,Leave Block List Allowed,השאר בלוק רשימת מחמד
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,תוכל להשתמש בו להתחברות
 DocType: Sales Partner,Retailer,הקמעונאית
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,אשראי לחשבון חייב להיות חשבון מאזן
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,אשראי לחשבון חייב להיות חשבון מאזן
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,כל סוגי הספק
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"קוד פריט חובה, כי הפריט לא ממוספר באופן אוטומטי"
+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 +93,Quotation {0} not of type {1},ציטוט {0} לא מסוג {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,פריט לוח זמנים תחזוקה
 DocType: Sales Order,%  Delivered,% נמסר
@@ -2285,7 +2306,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),המשקל הכולל של החבילה. בדרך כלל משקל נטו + משקל חומרי אריזה. (להדפסה)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,משתמשים עם תפקיד זה מותר להגדיר חשבונות קפוא וליצור / לשנות רישומים חשבונאיים נגד חשבונות מוקפאים
 DocType: Serial No,Is Cancelled,האם בוטל
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,המשלוחים שלי
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,המשלוחים שלי
 DocType: Journal Entry,Bill Date,תאריך ביל
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","גם אם יש כללי תמחור מרובים עם העדיפות הגבוהה ביותר, סדרי עדיפויות פנימיים אז להלן מיושמות:"
 DocType: Supplier,Supplier Details,פרטי ספק
@@ -2306,10 +2327,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,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 +198,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,צפוי
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},מספר סידורי {0} אינו שייך למחסן {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,הערה: מערכת לא תבדוק על-אספקה ועל-הזמנה לפריט {0} ככמות או כמות היא 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,תאריך פתיחה
 DocType: Journal Entry,Remark,הערה
@@ -2322,9 +2343,9 @@
 DocType: Time Log,Batched for Billing,לכלך לחיוב
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,הצעות חוק שהועלה על ידי ספקים.
 DocType: POS Profile,Write Off Account,לכתוב את החשבון
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,סכום הנחה
 DocType: Purchase Invoice,Return Against Purchase Invoice,חזור נגד רכישת חשבונית
 DocType: Item,Warranty Period (in days),תקופת אחריות (בימים)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,מזומנים נטו שנבעו מפעולות
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,"למשל מע""מ"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,פריט 4
 DocType: Journal Entry Account,Journal Entry Account,חשבון כניסת Journal
@@ -2364,7 +2385,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,מועד הפרישה חייב להיות גדול מ תאריך ההצטרפות
 DocType: Sales Invoice,Against Income Account,נגד חשבון הכנסות
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% נמסר
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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 מידע
@@ -2392,7 +2413,7 @@
 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 +14,This is a root sales person and cannot be edited.,זה איש מכירות שורש ולא ניתן לערוך.
 ,Stock Ledger,המניה דג'ר
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},שיעור: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},שיעור: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,ניכוי תלוש משכורת
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,בחר צומת קבוצה ראשונה.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,מלא את הטופס ולשמור אותו
@@ -2431,7 +2452,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,אדון חברה (לא לקוח או ספק).
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',נא להזין את 'תאריך אספקה צפויה של
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,תעודות משלוח {0} יש לבטל לפני ביטול הזמנת מכירות זה
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,הסכום ששולם + לכתוב את הסכום לא יכול להיות גדול יותר מסך כולל
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},הערה: אין איזון חופשה מספיק לחופשת סוג {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","הערה: אם תשלום לא נעשה נגד כל התייחסות, להפוך את תנועת היומן ידני."
@@ -2448,12 +2469,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' אינו זמין
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,קבע כלהרחיב
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,"שלח דוא""ל אוטומטית למגעים על עסקות הגשת."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","שורת {0}: כמות לא avalable במחסן {1} על {2} {3}. כמות זמינה: {4}, העבר את הכמות: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,פריט 3
 DocType: Purchase Order,Customer Contact Email,דוא&quot;ל ליצירת קשר של לקוחות
 DocType: Sales Team,Contribution (%),תרומה (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"הערה: כניסת תשלום לא יצרה מאז ""מזומן או חשבון הבנק 'לא צוין"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"הערה: כניסת תשלום לא יצרה מאז ""מזומן או חשבון הבנק 'לא צוין"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,אחריות
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,תבנית
 DocType: Sales Person,Sales Person Name,שם איש מכירות
@@ -2463,20 +2484,20 @@
 DocType: Task,Actual Start Date (via Time Logs),תאריך התחלה בפועל (באמצעות זמן יומנים)
 DocType: Stock Reconciliation Item,Before reconciliation,לפני הפיוס
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),מסים והיטלים נוסף (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,שורת מס פריט {0} חייבת להיות חשבון של מס סוג או הכנסה או הוצאה או לחיוב
 DocType: Sales Order,Partly Billed,בחלק שחויב
 DocType: Item,Default BOM,BOM ברירת המחדל
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,אנא שם חברה הקלד לאשר
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,"סה""כ מצטיין Amt"
 DocType: Time Log Batch,Total Hours,"סה""כ שעות"
 DocType: Journal Entry,Printing Settings,הגדרות הדפסה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},חיוב כולל חייב להיות שווה לסך אשראי. ההבדל הוא {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},חיוב כולל חייב להיות שווה לסך אשראי. ההבדל הוא {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,רכב
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,מתעודת משלוח
 DocType: Time Log,From Time,מזמן
 DocType: Notification Control,Custom Message,הודעה מותאמת אישית
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,בנקאות השקעות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,חשבון מזומן או בנק הוא חובה להכנת כניסת תשלום
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,חשבון מזומן או בנק הוא חובה להכנת כניסת תשלום
 DocType: Purchase Invoice,Price List Exchange Rate,מחיר מחירון שער חליפין
 DocType: Purchase Invoice Item,Rate,שיעור
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
@@ -2494,9 +2515,10 @@
 			conflict by assigning priority. Price Rules: {0}","כלל מחיר מרובה קיים באותם קריטריונים, אנא לפתור \ סכסוך על ידי הקצאת עדיפות. כללי מחיר: {0}"
 DocType: Account,Bank,בנק
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,חברת תעופה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,חומר נושא
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,חומר נושא
 DocType: Material Request Item,For Warehouse,למחסן
 DocType: Employee,Offer Date,תאריך הצעה
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ציטוטים
 DocType: Hub Settings,Access Token,גישת אסימון
 DocType: Sales Invoice Item,Serial No,מספר סידורי
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,נא להזין maintaince פרטים ראשון
@@ -2510,10 +2532,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,ישנם יותר מ חגי ימי עבודה בחודש זה.
 DocType: Product Bundle Item,Product Bundle Item,פריט Bundle מוצר
 DocType: Sales Partner,Sales Partner Name,שם שותף מכירות
+DocType: Payment Reconciliation,Maximum Invoice Amount,סכום חשבונית מרבי
 DocType: Purchase Invoice Item,Image View,צפה בתמונה
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,"הערכת שווי וסה""כ"
@@ -2521,6 +2545,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"פריט זה הנו נגזר של {0} (תבנית). תכונות תועתק על מהתבנית אלא אם כן ""לא העתק 'מוגדרת"
 DocType: Account,Purchase User,משתמש רכישה
 DocType: Notification Control,Customize the Notification,התאמה אישית של ההודעה
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,תזרים מזומנים מפעילות שוטף
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,תבנית כתובת ברירת מחדל לא ניתן למחוק
 DocType: Sales Invoice,Shipping Rule,כלל משלוח
 DocType: Journal Entry,Print Heading,כותרת הדפסה
@@ -2531,7 +2556,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,חומר גלם
 DocType: Leave Application,Follow via Email,"עקוב באמצעות דוא""ל"
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,סכום מס לאחר סכום הנחה
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,חשבון ילד קיים עבור חשבון זה. אתה לא יכול למחוק את החשבון הזה.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},אין ברירת מחדל BOM קיימת עבור פריט {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,אנא בחר תחילה תאריך פרסום
@@ -2549,6 +2574,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},מס 'סידורי הנדרש לפריט מספר סידורי {0}
 DocType: Journal Entry,Bank Entry,בנק כניסה
 DocType: Authorization Rule,Applicable To (Designation),כדי ישים (ייעוד)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,הוסף לסל
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,קבוצה על ידי
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,הפעלה / השבתה של מטבעות.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,הוצאות דואר
@@ -2556,29 +2582,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,בידור ופנאי
 DocType: Purchase Order,The date on which recurring order will be stop,המועד שבו על מנת חוזר יהיה לעצור
 DocType: Quality Inspection,Item Serial No,מספר סידורי פריט
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} חייב להיות מופחת על ידי {1} או שאתה צריך להגדיל את סובלנות הגלישה
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} חייב להיות מופחת על ידי {1} או שאתה צריך להגדיל את סובלנות הגלישה
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,"הווה סה""כ"
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,שעה
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",פריט בהמשכים {0} לא ניתן לעדכן \ באמצעות בורסת פיוס
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,העברת חומר לספקים
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,העברת חומר לספקים
 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,מספר סידורי חדש לא יכול להיות מחסן. מחסן חייב להיות מוגדר על ידי Stock כניסה או קבלת רכישה
 DocType: Lead,Lead Type,סוג עופרת
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,צור הצעת מחיר
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,אתה לא מורשה לאשר עלים בתאריכי הבלוק
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,כל הפריטים הללו כבר חשבונית
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,כל הפריטים הללו כבר חשבונית
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},יכול להיות מאושר על ידי {0}
 DocType: Shipping Rule,Shipping Rule Conditions,משלוח תנאי Rule
 DocType: BOM Replace Tool,The new BOM after replacement,BOM החדש לאחר החלפה
 DocType: Features Setup,Point of Sale,Point of Sale
 DocType: Account,Tax,מס
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},השורה {0}: {1} היא לא חוקית {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,מBundle המוצרים
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,מBundle המוצרים
 DocType: Production Planning Tool,Production Planning Tool,תכנון ייצור כלי
 DocType: Quality Inspection,Report Date,תאריך דוח
 DocType: C-Form,Invoices,חשבוניות
 DocType: Job Opening,Job Title,כותרת עבודה
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} מקבלי
 DocType: Features Setup,Item Groups in Details,קבוצות פריט בפרטים
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,כמות לייצור חייבת להיות גדולה מ 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),התחל Point-of-מכירה (POS)
@@ -2586,8 +2611,9 @@
 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: Pricing Rule,Customer Group,קבוצת לקוחות
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},חשבון הוצאות הוא חובה עבור פריט {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},חשבון הוצאות הוא חובה עבור פריט {0}
 DocType: Item,Website Description,תיאור אתר
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,שינוי נטו בהון עצמי
 DocType: Serial No,AMC Expiry Date,תאריך תפוגה AMC
 ,Sales Register,מכירות הרשמה
 DocType: Quotation,Quotation Lost Reason,סיבה אבודה ציטוט
@@ -2595,12 +2621,12 @@
 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 +108,Summary for this month and pending activities,סיכום לחודש זה ופעילויות תלויות ועומדות
 DocType: Customer Group,Customer Group Name,שם קבוצת הלקוחות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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,תכונות
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,קבל פריטים
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,נא להזין לכתוב את החשבון
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,קבל פריטים
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,נא להזין לכתוב את החשבון
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,התאריך אחרון סדר
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,הפוך בלו חשבונית
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},חשבון {0} אינו שייך לחברת {1}
@@ -2616,7 +2642,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,נתוני פרויקט-חכם אינם זמינים להצעת מחיר
 DocType: Project,Expected End Date,תאריך סיום צפוי
 DocType: Appraisal Template,Appraisal Template Title,הערכת תבנית כותרת
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,מסחרי
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,מסחרי
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,פריט הורה {0} לא חייב להיות פריט במלאי
 DocType: Cost Center,Distribution Id,הפצת זיהוי
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,שירותים מדהים
@@ -2629,7 +2655,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ערך תמורת תכונה {0} חייב להיות בטווח של {1} {2} במרווחים של {3}
 DocType: Tax Rule,Sales,מכירות
 DocType: Stock Entry Detail,Basic Amount,סכום בסיסי
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
 DocType: Leave Allocation,Unused leaves,עלים שאינם בשימוש
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,ברירת מחדל חשבונות חייבים
@@ -2641,16 +2667,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,תקבולי רכישה
-DocType: Payment Reconciliation,Maximum Amount,סכום מרבי
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,איך תמחור כלל מיושם?
 DocType: Quality Inspection,Delivery Note No,תעודת משלוח לא
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,לקוח {0} אינו קיים
 DocType: Attendance,Absent,נעדר
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle מוצר
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},שורת {0}: התייחסות לא חוקית {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle מוצר
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},שורת {0}: התייחסות לא חוקית {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,לרכוש תבנית מסים והיטלים
 DocType: Upload Attendance,Download Template,תבנית להורדה
 DocType: GL Entry,Remarks,הערות
@@ -2677,7 +2703,7 @@
 ,Monthly Attendance Sheet,גיליון נוכחות חודשי
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,לא נמצא רשומה
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: מרכז העלות הוא חובה עבור פריט {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,קבל פריטים מחבילת מוצרים
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,קבל פריטים מחבילת מוצרים
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,חשבון {0} אינו פעיל
 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,נוכחות מתאריך והנוכחות עד כה היא חובה
@@ -2686,8 +2712,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""רווח והפסד"" חשבון סוג {0} אסור בפתיחת כניסה"
 DocType: Features Setup,Sales Discounts,מבצעים מכירות
 DocType: Hub Settings,Seller Country,מדינה המוכרת
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,לפרסם פריטים באתר
 DocType: Authorization Rule,Authorization Rule,כלל אישור
 DocType: Sales Invoice,Terms and Conditions Details,פרטי תנאים והגבלות
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,מפרטים
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,מסים מכירות וחיובי תבנית
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ביגוד ואביזרים
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,מספר להזמין
@@ -2708,7 +2736,7 @@
 DocType: Time Log,Billing Amount,סכום חיוב
 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 +18,Applications for leave.,בקשות לחופשה.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,חשבון עם עסקה הקיימת לא ניתן למחוק
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,חשבון עם עסקה הקיימת לא ניתן למחוק
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,הוצאות משפטיות
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","היום בחודש שבו על מנת אוטומטי ייווצר למשל 05, 28 וכו '"
 DocType: Sales Invoice,Posting Time,זמן פרסום
@@ -2724,11 +2752,11 @@
 DocType: Maintenance Visit,Breakdown,התפלגות
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,חשבון: {0} עם מטבע: {1} לא ניתן לבחור
 DocType: Bank Reconciliation Detail,Cheque Date,תאריך המחאה
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},חשבון {0}: הורה חשבון {1} אינו שייך לחברה: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},חשבון {0}: הורה חשבון {1} אינו שייך לחברה: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,בהצלחה נמחק כל העסקות הקשורות לחברה זו!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,כבתאריך
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,מבחן
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,מחסן ברירת מחדל הוא חובה עבור פריט המניה.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,מחסן ברירת מחדל הוא חובה עבור פריט המניה.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},תשלום השכר עבור החודש {0} ושנה {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,הכנס אוטומטי שיעור מחירון אם חסר
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,"סכום ששולם סה""כ"
@@ -2740,6 +2768,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),סכום חיוב כולל (דרך זמן יומנים)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,אנחנו מוכרים פריט זה
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ספק זיהוי
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,כמות צריכה להיות גדולה מ 0
 DocType: Journal Entry,Cash Entry,כניסה במזומן
 DocType: Sales Partner,Contact Desc,לתקשר יורד
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","סוג של עלים כמו מזדמן, חולה וכו '"
@@ -2748,7 +2777,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,להוסיף שורות להגדיר תקציבים שנתי על חשבונות.
 DocType: Buying Settings,Default Supplier Type,סוג ספק ברירת מחדל
 DocType: Production Order,Total Operating Cost,"עלות הפעלה סה""כ"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,הערה: פריט {0} נכנסה מספר פעמים
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,הערה: פריט {0} נכנסה מספר פעמים
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,כל אנשי הקשר.
 DocType: Newsletter,Test Email Id,"דוא""ל מבחן זיהוי"
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,קיצור חברה
@@ -2773,7 +2802,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,בכל קבוצות הלקוחות
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,תבנית מס היא חובה.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,חשבון {0}: הורה חשבון {1} לא קיימת
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,חשבון {0}: הורה חשבון {1} לא קיימת
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),מחיר מחירון שיעור (חברת מטבע)
 DocType: Account,Temporary,זמני
 DocType: Address,Preferred Billing Address,כתובת חיוב מועדפת
@@ -2791,8 +2820,8 @@
 ,Item-wise Price List Rate,שערי רשימת פריט המחיר חכם
 DocType: Purchase Order Item,Supplier Quotation,הצעת מחיר של ספק
 DocType: Quotation,In Words will be visible once you save the Quotation.,במילים יהיו גלוי לאחר שתשמרו את הצעת המחיר.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} הוא הפסיק
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} הוא הפסיק
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
 DocType: Lead,Add to calendar on this date,הוסף ללוח שנה בתאריך זה
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,כללים להוספת עלויות משלוח.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,אירועים קרובים
@@ -2812,24 +2841,24 @@
 DocType: Customer,From Lead,מעופרת
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,הזמנות שוחררו לייצור.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,בחר שנת כספים ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
 DocType: Hub Settings,Name Token,שם אסימון
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,מכירה סטנדרטית
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast מחסן אחד הוא חובה
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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,מתוך אחריות
 DocType: BOM Replace Tool,Replace,החלף
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,נא להזין את ברירת מחדל של יחידת מדידה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,נא להזין את ברירת מחדל של יחידת מדידה
 DocType: Purchase Invoice Item,Project Name,שם פרויקט
 DocType: Supplier,Mention if non-standard receivable account,להזכיר אם חשבון חייבים שאינם סטנדרטי
 DocType: Journal Entry Account,If Income or Expense,אם הכנסה או הוצאה
 DocType: Features Setup,Item Batch Nos,אצווה פריט מס '
 DocType: Stock Ledger Entry,Stock Value Difference,הבדל ערך המניה
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,משאבי אנוש
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,משאבי אנוש
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,תשלום פיוס תשלום
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,נכסי מסים
 DocType: BOM Item,BOM No,BOM לא
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,היומן {0} אין חשבון {1} או שכבר מתאים נגד שובר אחר
 DocType: Item,Moving Average,ממוצע נע
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM אשר יוחלף
 DocType: Account,Debit,חיוב
@@ -2866,7 +2895,7 @@
 DocType: Stock Entry Detail,Additional Cost,עלות נוספת
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,תאריך הפיננסי סוף השנה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","לא לסנן מבוססים על השובר לא, אם מקובצים לפי שובר"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,הפוך הצעת מחיר של ספק
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,הפוך הצעת מחיר של ספק
 DocType: Quality Inspection,Incoming,נכנסים
 DocType: BOM,Materials Required (Exploded),חומרים דרושים (התפוצצו)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),להפחית צבירה לחופשה ללא תשלום (LWP)
@@ -2874,7 +2903,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},# השורה {0}: סידורי לא {1} אינו תואם עם {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,חופשה מזדמנת
 DocType: Batch,Batch ID,זיהוי אצווה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},הערה: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},הערה: {0}
 ,Delivery Note Trends,מגמות תעודת משלוח
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,סיכום זה של השבוע
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} חייב להיות פריט שנרכש או-חוזה Sub בשורת {1}
@@ -2889,6 +2918,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ממוצע. שיעור קנייה
 DocType: Task,Actual Time (in Hours),זמן בפועל (בשעות)
 DocType: Employee,History In Company,ההיסטוריה בחברה
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,ידיעונים
 DocType: Address,Shipping,משלוח
 DocType: Stock Ledger Entry,Stock Ledger Entry,מניית דג'ר כניסה
@@ -2908,7 +2938,6 @@
 DocType: Purchase Order,End date of current order's period,תאריך סיום של התקופה של הצו הנוכחי
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,הפוך מכתב הצעת
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,חזור
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,ברירת מחדל של יחידת מדידה ולריאנט חייבת להיות זהה לתבנית
 DocType: Production Order Operation,Production Order Operation,להזמין מבצע ייצור
 DocType: Pricing Rule,Disable,בטל
 DocType: Project Task,Pending Review,בהמתנה לבדיקה
@@ -2916,7 +2945,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,זהות לקוח
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,לזמן חייב להיות גדול מ מהזמן
 DocType: Journal Entry Account,Exchange Rate,שער חליפין
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},מחסן {0}: הורה חשבון {1} לא Bolong לחברת {2}
 DocType: BOM,Last Purchase Rate,שער רכישה אחרונה
 DocType: Account,Asset,נכס
@@ -2936,7 +2965,7 @@
 ,Available Stock for Packing Items,מלאי זמין לפריטי אריזה
 DocType: Item Variant,Item Variant,פריט Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,הגדרת תבנית כתובת זו כברירת מחדל כפי שאין ברירת מחדל אחרת
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","יתרת חשבון כבר בחיוב, שאינך מורשים להגדרה 'יתרה חייבים להיות' כמו 'אשראי'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,ניהול איכות
 DocType: Production Planning Tool,Filter based on customer,מסנן המבוסס על לקוחות
 DocType: Payment Tool Detail,Against Voucher No,נגד שובר לא
@@ -2952,6 +2981,7 @@
 DocType: Opportunity,Next Contact,לתקשר הבא
 DocType: Employee,Employment Type,סוג התעסוקה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,רכוש קבוע
+,Cash Flow,תזרים מזומנים
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,תקופת יישום לא יכולה להיות על פני שתי רשומות alocation
 DocType: Item Group,Default Expense Account,חשבון הוצאות ברירת המחדל
 DocType: Employee,Notice (days),הודעה (ימים)
@@ -2983,13 +3013,12 @@
 DocType: Production Order,Warehouses,מחסנים
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,הדפסה ונייחת
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,צומת קבוצה
-DocType: Payment Reconciliation,Minimum Amount,סכום מינימום
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,מוצרים מוגמרים עדכון
 DocType: Workstation,per hour,לשעה
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,חשבון למחסן (מלאי תמידי) ייווצר תחת חשבון זה.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,מחסן לא ניתן למחוק ככניסת פנקס המניות קיימת למחסן זה.
 DocType: Company,Distribution,הפצה
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,הסכום ששולם
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,הסכום ששולם
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,מנהל פרויקט
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,שדר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,הנחה מרבית המוותרת עבור פריט: {0} היא% {1}
@@ -3013,7 +3042,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics תמיכה
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},חברה חסרה במחסני {0}
 DocType: POS Profile,Terms and Conditions,תנאים והגבלות
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},לתאריך צריך להיות בתוך שנת הכספים. בהנחה לתאריך = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},לתאריך צריך להיות בתוך שנת הכספים. בהנחה לתאריך = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","כאן אתה יכול לשמור על גובה, משקל, אלרגיות, בעיות רפואיות וכו '"
 DocType: Leave Block List,Applies to Company,חל על חברה
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,לא יכול לבטל בגלל כניסת Stock הוגשה {0} קיימת
@@ -3027,11 +3056,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,נא להזין את קבלות רכישה
 DocType: Sales Invoice,Get Advances Received,קבלו התקבלו מקדמות
 DocType: Email Digest,Add/Remove Recipients,הוספה / הסרה של מקבלי
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},עסקה לא אפשרה נגד הפקה הפסיקה להזמין {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),"התקנת שרת הנכנס לid הדוא""ל של תמיכה. (למשל support@example.com)"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,מחסור כמות
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
 DocType: Salary Slip,Salary Slip,שכר Slip
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.","צור תלושי אריזה עבור חבילות שתימסר. נהג להודיע מספר חבילה, תוכן אריזה והמשקל שלה."
@@ -3109,7 +3138,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,רשומות עובדים.
 DocType: HR Settings,Payroll Settings,הגדרות שכר
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,התאם חשבוניות ותשלומים הלא צמוד.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,להזמין מקום
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,להזמין מקום
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,שורש לא יכול להיות מרכז עלות הורה
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,מותג בחר ...
 DocType: Sales Invoice,C-Form Applicable,C-טופס ישים
@@ -3124,7 +3153,7 @@
 DocType: Appraisal,Start Date,תאריך ההתחלה
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,להקצות עלים לתקופה.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,לחץ כאן כדי לאמת
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,חשבון {0}: לא ניתן להקצות את עצמו כחשבון אב
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,חשבון {0}: לא ניתן להקצות את עצמו כחשבון אב
 DocType: Purchase Invoice Item,Price List Rate,מחיר מחירון שערי
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","הצג ""במלאי"" או ""לא במלאי"", המבוסס על המלאי זמין במחסן זה."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),הצעת החוק של חומרים (BOM)
@@ -3133,17 +3162,17 @@
 DocType: Project,Expected Start Date,תאריך התחלה צפוי
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,הסר פריט אם חיובים אינם ישימים לפריט ש
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,לדוגמא. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,קבל
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,קבל
 DocType: Maintenance Visit,Fully Completed,הושלם במלואו
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,הכשרה חינוכית
 DocType: Workstation,Operating Costs,עלויות תפעול
 DocType: Employee Leave Approver,Employee Leave Approver,עובד חופשה מאשר
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} נוספו בהצלחה לרשימת הדיוור שלנו.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","לא יכול להכריז על שאבד כ, כי הצעת מחיר כבר עשתה."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,רכישת Master מנהל
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,ייצור להזמין {0} יש להגיש
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,ייצור להזמין {0} יש להגיש
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},אנא בחר תאריך התחלה ותאריך סיום לפריט {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,דוחות עיקריים
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,עד כה לא יכול להיות לפני מהמועד
@@ -3161,7 +3190,7 @@
 DocType: Industry Type,Industry Type,סוג התעשייה
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,משהו השתבש!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,אזהרה: יישום השאר מכיל תאריכי הבלוק הבאים
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,מכירות חשבונית {0} כבר הוגשה
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,מכירות חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,תאריך סיום
 DocType: Purchase Invoice Item,Amount (Company Currency),הסכום (חברת מטבע)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,יחידת ארגון הורים (מחלקה).
@@ -3180,10 +3209,10 @@
 ,Serial No Service Contract Expiry,שירות סידורי חוזה תפוגה
 DocType: Item,Unit of Measure Conversion,יחידה של המרת מדד
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,העובד אינו ניתן לשינוי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,אתה לא יכול אשראי וכרטיסי חיובו חשבון באותו הזמן
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,אתה לא יכול אשראי וכרטיסי חיובו חשבון באותו הזמן
 DocType: Naming Series,Help HTML,העזרה HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},"weightage סה""כ הוקצה צריך להיות 100%. זה {0}"
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},הפרשה ליתר {0} חצה לפריט {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},הפרשה ליתר {0} חצה לפריט {1}
 DocType: Address,Name of person or organization that this address belongs to.,שמו של אדם או ארגון שכתובת זו שייכת ל.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,הספקים שלך
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,לא ניתן להגדיר כאבודים כלהזמין מכירות נעשה.
@@ -3195,34 +3224,34 @@
 DocType: Item,Has Serial No,יש מספר סידורי
 DocType: Employee,Date of Issue,מועד ההנפקה
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},# השורה {0}: ספק הוגדר לפריט {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,לא ניתן למצוא תמונה באתר האינטרנט {0} המצורף לפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,אנא בדוק את אפשרות מטבע רב כדי לאפשר חשבונות עם מטבע אחר
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,אנא בדוק את אפשרות מטבע רב כדי לאפשר חשבונות עם מטבע אחר
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,פריט: {0} אינו קיים במערכת
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,אתה לא רשאי לקבוע ערך קפוא
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,אתה לא רשאי לקבוע ערך קפוא
 DocType: Payment Reconciliation,Get Unreconciled Entries,קבל ערכים לא מותאמים
+DocType: Payment Reconciliation,From Invoice Date,מתאריך החשבונית
 DocType: Cost Center,Budgets,תקציבים
-DocType: Employee,Emergency Contact Details,פרטי יצירת קשר חירום
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,מה זה עושה?
 DocType: Delivery Note,To Warehouse,למחסן
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},חשבון {0} כבר נכנס יותר מפעם אחת בשנת הכספים {1}
 ,Average Commission Rate,העמלה ממוצעת שערי
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,נוכחות לא יכולה להיות מסומנת עבור תאריכים עתידיים
 DocType: Pricing Rule,Pricing Rule Help,עזרה כלל תמחור
 DocType: Purchase Taxes and Charges,Account Head,חשבון ראש
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,עדכון עלויות נוספות לחישוב עלות נחתה של פריטים
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,חשמל
 DocType: Stock Entry,Total Value Difference (Out - In),הבדל ערך כולל (Out - ב)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,שורת {0}: שער החליפין הוא חובה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,שורת {0}: שער החליפין הוא חובה
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},זיהוי משתמש לא נקבע לעובדים {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,מתביעת אחריות
 DocType: Stock Entry,Default Source Warehouse,מחסן מקור ברירת מחדל
 DocType: Item,Customer Code,קוד לקוח
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,ימים מאז להזמין אחרון
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,נכסים במלאי
@@ -3235,7 +3264,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,סגירת חשבון {0} חייבת להיות אחריות / הון עצמי סוג
 DocType: Authorization Rule,Based On,המבוסס על
 DocType: Sales Order Item,Ordered Qty,כמות הורה
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,פריט {0} הוא נכים
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,פריט {0} הוא נכים
 DocType: Stock Settings,Stock Frozen Upto,המניה קפואה Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},תקופה ומתקופה לתאריכי חובה עבור חוזר {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,פעילות פרויקט / משימה.
@@ -3243,7 +3272,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),לכתוב את הסכום (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
 DocType: Landed Cost Voucher,Landed Cost Voucher,שובר עלות נחת
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},אנא הגדר {0}
 DocType: Purchase Invoice,Repeat on Day of Month,חזור על פעולה ביום בחודש
@@ -3272,12 +3301,12 @@
 DocType: Upload Attendance,Upload Attendance,נוכחות העלאה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,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/accounts/doctype/journal_entry/journal_entry.js +446,Amount,הסכום
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,הסכום
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM הוחלף
 ,Sales Analytics,Analytics מכירות
 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 +90,Please enter default currency in Company Master,נא להזין את ברירת מחדל של המטבע בחברה Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,תזכורות יומיות
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},ניגודים כלל מס עם {0}
@@ -3303,13 +3332,13 @@
 DocType: Sales Order Item,Produced Quantity,כמות מיוצרת
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,מהנדס
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,הרכבות תת חיפוש
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},קוד פריט נדרש בשורה לא {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},קוד פריט נדרש בשורה לא {0}
 DocType: Sales Partner,Partner Type,שם שותף
 DocType: Purchase Taxes and Charges,Actual,בפועל
 DocType: Authorization Rule,Customerwise Discount,Customerwise דיסקונט
 DocType: Purchase Invoice,Against Expense Account,נגד חשבון הוצאות
 DocType: Production Order,Production Order,הזמנת ייצור
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,הערה התקנת {0} כבר הוגשה
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,הערה התקנת {0} כבר הוגשה
 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,צפה עכשיו
@@ -3321,15 +3350,15 @@
 DocType: Employee,Applicable Holiday List,רשימת Holiday ישימה
 DocType: Employee,Cheque,המחאה
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,סדרת עדכון
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,סוג הדוח הוא חובה
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,סוג הדוח הוא חובה
 DocType: Item,Serial Number Series,סדרת מספר סידורי
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},המחסן הוא חובה עבור פריט המניה {0} בשורת {1}
 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/public/js/setup_wizard.js +101,The First User: You,המשתמש הראשון: אתה
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},שנת כספי תאריך ההתחלה ותאריך סיום שנת כספים כבר נקבעו בשנת הכספים {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,מפוייס בהצלחה
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},שנת כספי תאריך ההתחלה ותאריך סיום שנת כספים כבר נקבעו בשנת הכספים {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,מפוייס בהצלחה
 DocType: Production Order,Planned End Date,תאריך סיום מתוכנן
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,איפה פריטים מאוחסנים.
 DocType: Tax Rule,Validity,תוקף
@@ -3337,7 +3366,7 @@
 DocType: Attendance,Attendance,נוכחות
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,תאריך הפרסום ופרסום הזמן הוא חובה
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,תאריך הפרסום ופרסום הזמן הוא חובה
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,תבנית מס בעסקות קנייה.
 ,Item Prices,מחירי פריט
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,במילים יהיו גלוי לאחר שתשמרו את הזמנת הרכש.
@@ -3346,15 +3375,15 @@
 DocType: Task,Review Date,תאריך סקירה
 DocType: Purchase Invoice,Advance Payments,תשלומים מראש
 DocType: Purchase Taxes and Charges,On Net Total,בסך הכל נטו
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,מחסן יעד בשורת {0} חייב להיות זהה להזמנת ייצור
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,מחסן יעד בשורת {0} חייב להיות זהה להזמנת ייצור
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,אין רשות להשתמש בכלי תשלום
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""כתובות דוא""ל הודעה 'לא צוינו עבור חוזר% s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,מטבע לא ניתן לשנות לאחר ביצוע ערכים באמצעות כמה מטבע אחר
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,מטבע לא ניתן לשנות לאחר ביצוע ערכים באמצעות כמה מטבע אחר
 DocType: Company,Round Off Account,לעגל את החשבון
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,הוצאות הנהלה
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,ייעוץ
 DocType: Customer Group,Parent Customer Group,קבוצת לקוחות הורה
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,שינוי
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,שינוי
 DocType: Purchase Invoice,Contact Email,"דוא""ל ליצירת קשר"
 DocType: Appraisal Goal,Score Earned,הציון שנצבר
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","לדוגמא: ""החברה LLC שלי"""
@@ -3364,13 +3393,13 @@
 DocType: Packing Slip,Gross Weight UOM,משקלים של אוני 'מישגן
 DocType: Email Digest,Receivables / Payables,חייבים / זכאי
 DocType: Delivery Note Item,Against Sales Invoice,נגד חשבונית מכירות
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,חשבון אשראי
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,חשבון אשראי
 DocType: Landed Cost Item,Landed Cost Item,פריט עלות נחת
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,הצג אפס ערכים
 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 +562,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
 DocType: Item,Default Warehouse,מחסן ברירת מחדל
 DocType: Task,Actual End Date (via Time Logs),תאריך סיום בפועל (באמצעות זמן יומנים)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},תקציב לא ניתן להקצות נגד קבוצת חשבון {0}
@@ -3406,29 +3435,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,מתכנן יומני זמן מחוץ לשעתי עבודה תחנת עבודה.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} כבר הוגש
 ,Items To Be Requested,פריטים להידרש
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,קבל אחרון תעריף רכישה
 DocType: Time Log,Billing Rate based on Activity Type (per hour),דרג חיוב המבוסס על סוג הפעילות (לשעה)
 DocType: Company,Company Info,מידע על חברה
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","זיהוי חברת דוא""ל לא נמצא, ומכאן אלקטרוניים לא נשלח"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),יישום של קרנות (נכסים)
 DocType: Production Planning Tool,Filter based on item,מסנן המבוסס על פריט
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,חשבון חיוב
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,חשבון חיוב
 DocType: Fiscal Year,Year Start Date,תאריך התחלת שנה
 DocType: Attendance,Employee Name,שם עובד
 DocType: Sales Invoice,Rounded Total (Company Currency),"סה""כ מעוגל (חברת מטבע)"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,לא יכול סמוי לקבוצה בגלל סוג חשבון הנבחר.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,לא יכול סמוי לקבוצה בגלל סוג חשבון הנבחר.
 DocType: Purchase Common,Purchase Common,רכישה משותפת
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,מהזדמנות
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,הטבות לעובדים
 DocType: Sales Invoice,Is POS,האם קופה
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},כמות ארוזה חייבת להיות שווה לכמות פריט {0} בשורת {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},כמות ארוזה חייבת להיות שווה לכמות פריט {0} בשורת {1}
 DocType: Production Order,Manufactured Qty,כמות שיוצרה
 DocType: Purchase Receipt Item,Accepted Quantity,כמות מקובלת
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} לא קיים
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,הצעות חוק שהועלו ללקוחות.
 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 +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} מנויים הוסיפו
 DocType: Maintenance Schedule,Schedule,לוח זמנים
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","להגדיר תקציב עבור מרכז עלות זו. כדי להגדיר פעולת תקציב, ראה &quot;חברת רשימה&quot;"
@@ -3436,7 +3466,7 @@
 DocType: Quality Inspection Reading,Reading 3,רידינג 3
 ,Hub,רכזת
 DocType: GL Entry,Voucher Type,סוג שובר
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
 DocType: Expense Claim,Approved,אושר
 DocType: Pricing Rule,Price,מחיר
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',עובד הקלה על {0} חייב להיות מוגדרים כ'שמאל '
@@ -3460,7 +3490,7 @@
 DocType: Employee,Contract End Date,תאריך החוזה End
 DocType: Sales Order,Track this Sales Order against any Project,עקוב אחר הזמנת מכירות זה נגד כל פרויקט
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,הזמנות משיכה (תלויות ועומדות כדי לספק) המבוסס על הקריטריונים לעיל
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,מהצעת המחיר של ספק
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,מהצעת המחיר של ספק
 DocType: Deduction Type,Deduction Type,סוג הניכוי
 DocType: Attendance,Half Day,חצי יום
 DocType: Pricing Rule,Min Qty,דקות כמות
@@ -3468,7 +3498,7 @@
 DocType: GL Entry,Transaction Date,תאריך עסקה
 DocType: Production Plan Item,Planned Qty,מתוכננת כמות
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,"מס סה""כ"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,לכמות (מיוצר כמות) הוא חובה
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,לכמות (מיוצר כמות) הוא חובה
 DocType: Stock Entry,Default Target Warehouse,מחסן יעד ברירת מחדל
 DocType: Purchase Invoice,Net Total (Company Currency),"סה""כ נקי (חברת מטבע)"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,שורת {0}: מפלגת סוג והמפלגה הוא ישים רק נגד חייבים / חשבון לתשלום
@@ -3522,9 +3552,9 @@
 DocType: Customer,Commission Rate,הוועדה שערי
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,הפוך Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,יישומי חופשת בלוק על ידי מחלקה.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,עגלה ריקה
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,עגלה ריקה
 DocType: Production Order,Actual Operating Cost,עלות הפעלה בפועל
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,לא ניתן לערוך את השורש.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,לא ניתן לערוך את השורש.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,סכום שהוקצה לא יכול יותר מסכום unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,לאפשר ייצור בחגים
 DocType: Sales Order,Customer's Purchase Order Date,תאריך הזמנת הרכש של הלקוח
@@ -3535,11 +3565,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,מעצב
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,תבנית תנאים והגבלות
 DocType: Serial No,Delivery Details,פרטי משלוח
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,ליצור באופן אוטומטי בקשת חומר אם כמות נופלת מתחת לרמה זו
 ,Item-wise Purchase Register,הרשם רכישת פריט-חכם
 DocType: Batch,Expiry Date,תַאֲרִיך תְפוּגָה
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","כדי להגדיר רמת הזמנה חוזרת, פריט חייב להיות פריט רכישה או פריט ייצור"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","כדי להגדיר רמת הזמנה חוזרת, פריט חייב להיות פריט רכישה או פריט ייצור"
 ,Supplier Addresses and Contacts,כתובות ספק ומגעים
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,אנא בחר תחילה קטגוריה
 apps/erpnext/erpnext/config/projects.py +18,Project master.,אדון פרויקט.
@@ -3547,7 +3577,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(חצי יום)
 DocType: Supplier,Credit Days,ימי אשראי
 DocType: Leave Type,Is Carry Forward,האם להמשיך קדימה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,קבל פריטים מBOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,הצעת חוק של חומרים
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},שורת {0}: מפלגת סוג והמפלגה נדרשים לבקל / חשבון זכאים {1}
@@ -3555,7 +3585,7 @@
 DocType: Employee,Reason for Leaving,סיבה להשארה
 DocType: Expense Claim Detail,Sanctioned Amount,סכום גושפנקא
 DocType: GL Entry,Is Opening,האם פתיחה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},שורת {0}: כניסת חיוב לא יכולה להיות מקושרת עם {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,חשבון {0} אינו קיים
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},שורת {0}: כניסת חיוב לא יכולה להיות מקושרת עם {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,חשבון {0} אינו קיים
 DocType: Account,Cash,מזומנים
 DocType: Employee,Short biography for website and other publications.,ביוגרפיה קצרות באתר האינטרנט של ופרסומים אחרים.
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 925d29f..0ff4e6d 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,उपभोक्ता उत्पाद
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,पहले पार्टी के प्रकार का चयन करें
 DocType: Item,Customer Items,ग्राहक आइटम
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,खाते {0}: माता पिता के खाते {1} एक खाता नहीं हो सकता
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,खाते {0}: माता पिता के खाते {1} एक खाता नहीं हो सकता
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com करने के लिए आइटम प्रकाशित
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,ईमेल सूचनाएं
 DocType: Item,Default Unit of Measure,माप की मूलभूत इकाई
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,ग्राहक से संपर्क
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,सामग्री अनुरोध से
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,सामग्री अनुरोध से
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ट्री
 DocType: Job Applicant,Job Applicant,नौकरी आवेदक
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,कोई और अधिक परिणाम है।
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. इस विकल्प का उपयोग ग्राहक वार आइटम कोड को बनाए रखने और कोड के आधार पर विकल्प खोज के लिए करे
 DocType: Mode of Payment Account,Mode of Payment Account,भुगतान खाता का तरीका
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,दिखाएँ वेरिएंट
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,मात्रा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,मात्रा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ऋण (देनदारियों)
 DocType: Employee Education,Year of Passing,पासिंग का वर्ष
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,स्टॉक में
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,स्वास्थ्य देखभाल
 DocType: Purchase Invoice,Monthly,मासिक
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),भुगतान में देरी (दिन)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,बीजक
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,बीजक
 DocType: Maintenance Schedule Item,Periodicity,आवधिकता
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ईमेल पता
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,वित्त वर्ष {0} की आवश्यकता है
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,रक्षा
 DocType: Company,Abbr,संक्षिप्त
 DocType: Appraisal Goal,Score (0-5),कुल (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},पंक्ति {0}: {1} {2} के साथ मेल नहीं खाता {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},पंक्ति {0}: {1} {2} के साथ मेल नहीं खाता {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,पंक्ति # {0}:
 DocType: Delivery Note,Vehicle No,वाहन नहीं
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,मूल्य सूची का चयन करें
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,मूल्य सूची का चयन करें
 DocType: Production Order Operation,Work In Progress,अर्धनिर्मित उत्पादन
 DocType: Employee,Holiday List,अवकाश सूची
 DocType: Time Log,Time Log,समय प्रवेश
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,एक ही कंपनी के एक से अधिक बार दर्ज किया जाता है
 DocType: Employee,Married,विवाहित
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},अनुमति नहीं {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
 DocType: Payment Reconciliation,Reconcile,समाधान करना
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,किराना
 DocType: Quality Inspection Reading,Reading 1,1 पढ़ना
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,बैंक एंट्री बनाओ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,पेंशन फंड
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,खाता प्रकार गोदाम है अगर वेयरहाउस अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,खाता प्रकार गोदाम है अगर वेयरहाउस अनिवार्य है
 DocType: SMS Center,All Sales Person,सभी बिक्री व्यक्ति
 DocType: Lead,Person Name,व्यक्ति का नाम
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","जाँचें आदेश आवर्ती अगर, आवर्ती रोक या उचित समाप्ति तिथि डाल करने अचयनित"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,इच्छुक
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,सामग्री का बिल
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,प्रारंभिक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},से {0} को {1}
+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,एंट्री खुलने
 DocType: Stock Entry,Additional Costs,अतिरिक्त लागत
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,मौजूदा लेन - देन के साथ खाता समूह को नहीं बदला जा सकता .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,मौजूदा लेन - देन के साथ खाता समूह को नहीं बदला जा सकता .
 DocType: Lead,Product Enquiry,उत्पाद पूछताछ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,पहली कंपनी दाखिल करें
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,योजनापूर्ण
+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 +9,Activity Log:,गतिविधि प्रवेश करें :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,आइटम {0} सिस्टम में मौजूद नहीं है या समाप्त हो गई है
@@ -165,7 +165,7 @@
 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 +444,Item {0} is not active or end of life has been reached,आइटम {0} सक्रिय नहीं है या जीवन के अंत तक पहुँच गया है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,आइटम {0} सक्रिय नहीं है या जीवन के अंत तक पहुँच गया है
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,बिक्री चालान प्रस्तुत होने के बाद अद्यतन किया जाएगा.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,मानव संसाधन मॉड्यूल के लिए सेटिंग्स
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,आपरेशन के विवरण से बाहर किया।
 DocType: Serial No,Maintenance Status,रखरखाव स्थिति
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,आइटम और मूल्य निर्धारण
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},दिनांक से वित्तीय वर्ष के भीतर होना चाहिए. दिनांक से मान लिया जाये = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},दिनांक से वित्तीय वर्ष के भीतर होना चाहिए. दिनांक से मान लिया जाये = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,जिसे तुम पैदा कर रहे हैं मूल्यांकन करने के लिए कर्मचारी का चयन करें.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},लागत केंद्र {0} से संबंधित नहीं है कंपनी {1}
 DocType: Customer,Individual,व्यक्ति
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,फाइनेंसिंग से नेट नकद
 DocType: Lead,Address & Contact,पता और संपर्क
 DocType: Leave Allocation,Add unused leaves from previous allocations,पिछले आवंटन से अप्रयुक्त पत्ते जोड़ें
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},अगला आवर्ती {0} पर बनाया जाएगा {1}
@@ -222,6 +223,7 @@
 ,Contact Name,संपर्क का नाम
 DocType: Production Plan Item,SO Pending Qty,तो मात्रा लंबित
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,उपरोक्त मानदंडों के लिए वेतन पर्ची बनाता है.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,दिया का कोई विवरण नहीं
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,खरीद के लिए अनुरोध.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,केवल चयनित लीव अनुमोदक इस छुट्टी के लिए अर्जी प्रस्तुत कर सकते हैं
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,तिथि राहत शामिल होने की तिथि से अधिक होना चाहिए
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,आइटम वेबसाइट विशिष्टता
 DocType: Payment Tool,Reference No,संदर्भ संक्या
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,अवरुद्ध छोड़ दो
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेयर सुलह आइटम
 DocType: Stock Entry,Sales Invoice No,बिक्री चालान नहीं
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,प्रदायक प्रकार
 DocType: Item,Publish in Hub,हब में प्रकाशित
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,सामग्री अनुरोध
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन क्लीयरेंस तिथि
 DocType: Item,Purchase Details,खरीद विवरण
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},खरीद आदेश में &#39;कच्चे माल की आपूर्ति&#39; तालिका में नहीं मिला मद {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},खरीद आदेश में &#39;कच्चे माल की आपूर्ति&#39; तालिका में नहीं मिला मद {0} {1}
 DocType: Employee,Relation,संबंध
 DocType: Shipping Rule,Worldwide Shipping,दुनिया भर में शिपिंग
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ग्राहकों से आदेश की पुष्टि की है.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,सुझाव
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,इस क्षेत्र पर आइटम ग्रुप - वाईस बजट निर्धारित करें. तुम भी वितरण की स्थापना द्वारा मौसमी शामिल कर सकते हैं.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},गोदाम के लिए माता पिता के खाते समूह दर्ज करें {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},के खिलाफ भुगतान {0} {1} बकाया राशि से अधिक नहीं हो सकता {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,कार्यक्रम तय करें उत्पन्न
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,नवीनतम
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,अधिकतम 5 अक्षर
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूची में पहले छोड़ अनुमोदक डिफ़ॉल्ट छोड़ दो अनुमोदक के रूप में स्थापित किया जाएगा
+apps/erpnext/erpnext/config/desktop.py +73,Learn,सीखना
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,कर्मचारी प्रति गतिविधि लागत
 DocType: Accounts Settings,Settings for Accounts,खातों के लिए सेटिंग्स
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,बिक्री व्यक्ति पेड़ की व्यवस्था करें.
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,बहु मुद्रा
 DocType: Payment Reconciliation Invoice,Invoice Type,चालान का प्रकार
 DocType: Sales Invoice Item,Delivery Note,बिलटी
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,करों की स्थापना
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,करों की स्थापना
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,आप इसे खींचा बाद भुगतान एंट्री संशोधित किया गया है। इसे फिर से खींच कर दीजिये।
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,इस सप्ताह और लंबित गतिविधियों के लिए सारांश
 DocType: Workstation,Rent Cost,बाइक किराए मूल्य
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,माह और वर्ष का चयन करें
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","बीओएम , डिलिवरी नोट , खरीद चालान , उत्पादन का आदेश , खरीद आदेश , खरीद रसीद , बिक्री चालान , बिक्री आदेश , स्टॉक एंट्री , timesheet में उपलब्ध"
 DocType: Item Tax,Tax Rate,कर की दर
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,वस्तु चुनें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,वस्तु चुनें
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","आइटम: {0} बैच वार, बजाय का उपयोग स्टॉक एंट्री \
  स्टॉक सुलह का उपयोग कर समझौता नहीं किया जा सकता है कामयाब"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},पंक्ति # {0}: बैच नहीं के रूप में ही किया जाना चाहिए {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,गैर-समूह कन्वर्ट करने के लिए
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,खरीद रसीद प्रस्तुत किया जाना चाहिए
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,चिकित्सा
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,खोने के लिए कारण
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,एक
 DocType: Issue,Attachment,आसक्ति
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,बजट समूह लागत केंद्र के लिए सेट नहीं किया जा सकता है
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,अवकाश मास्टर .
 DocType: Material Request Item,Required Date,आवश्यक तिथि
 DocType: Delivery Note,Billing Address,बिलिंग पता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,मद कोड दर्ज करें.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,मद कोड दर्ज करें.
 DocType: BOM,Costing,लागत
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","अगर जाँच की है, कर की राशि के रूप में पहले से ही प्रिंट दर / प्रिंट राशि में शामिल माना जाएगा"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,कुल मात्रा
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
 DocType: Shipping Rule,Net Weight,निवल भार
 DocType: Employee,Emergency Phone,आपातकालीन फोन
 ,Serial No Warranty Expiry,धारावाहिक नहीं वारंटी समाप्ति
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,वेतन वृद्धि 0 नहीं किया जा सकता
 DocType: Production Planning Tool,Material Requirement,सामग्री की आवश्यकताएँ
 DocType: Company,Delete Company Transactions,कंपनी लेन-देन को हटाएं
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,आइटम {0} आइटम खरीद नहीं है
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,आइटम {0} आइटम खरीद नहीं है
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} 'अधिसूचना \
  ईमेल पता' में एक अवैध ईमेल पता है"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,कुल बिलिंग इस साल:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,कर और प्रभार जोड़ें / संपादित करें
 DocType: Purchase Invoice,Supplier Invoice No,प्रदायक चालान नहीं
 DocType: Territory,For reference,संदर्भ के लिए
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","नहीं हटा सकते सीरियल नहीं {0}, यह शेयर लेनदेन में इस्तेमाल किया जाता है के रूप में"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),समापन (सीआर)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),समापन (सीआर)
 DocType: Serial No,Warranty Period (Days),वारंटी अवधि (दिन)
 DocType: Installation Note Item,Installation Note Item,अधिष्ठापन नोट आइटम
 ,Pending Qty,विचाराधीन मात्रा
@@ -466,7 +469,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** मासिक वितरण ** आप अपने कारोबार में मौसमी है तो आप महीने भर में अपने बजट को वितरित मदद करता है।
 
 , इस वितरण का उपयोग कर एक बजट वितरित ** लागत केंद्र में ** इस ** मासिक वितरण सेट करने के लिए **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,चालान तालिका में कोई अभिलेख
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,चालान तालिका में कोई अभिलेख
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,पहले कंपनी और पार्टी के प्रकार का चयन करें
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,वित्तीय / लेखा वर्ष .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमा करें, सीरियल नं विलय हो नहीं सकता"
@@ -474,9 +477,9 @@
 DocType: Project Task,Project Task,परियोजना के कार्य
 ,Lead Id,लीड ईद
 DocType: C-Form Invoice Detail,Grand Total,महायोग
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,वित्तीय वर्ष प्रारंभ तिथि वित्तीय वर्ष के अंत तिथि से बड़ा नहीं होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,वित्तीय वर्ष प्रारंभ तिथि वित्तीय वर्ष के अंत तिथि से बड़ा नहीं होना चाहिए
 DocType: Warranty Claim,Resolution,संकल्प
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},वितरित: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},वितरित: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,देय खाता
 DocType: Sales Order,Billing and Delivery Status,बिलिंग और डिलिवरी स्थिति
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ग्राहकों को दोहराने
@@ -491,7 +494,7 @@
 DocType: Quotation,Quotation To,करने के लिए कोटेशन
 DocType: Lead,Middle Income,मध्य आय
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),उद्घाटन (सीआर )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,आवंटित राशि ऋणात्मक नहीं हो सकता
 DocType: Purchase Order Item,Billed Amt,बिल भेजा राशि
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,शेयर प्रविष्टियों बना रहे हैं जिसके खिलाफ एक तार्किक वेयरहाउस।
@@ -500,7 +503,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,उत्पादन का आदेश अनिवार्य है
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,प्रस्ताव लेखन
 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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},नकारात्मक स्टॉक त्रुटि ( {6} ) मद के लिए {0} गोदाम में {1} को {2} {3} में {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},नकारात्मक स्टॉक त्रुटि ( {6} ) मद के लिए {0} गोदाम में {1} को {2} {3} में {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,वित्त वर्ष कंपनी
 DocType: Packing Slip Item,DN Detail,डी.एन. विस्तार
 DocType: Time Log,Billed,का बिल
@@ -519,16 +522,17 @@
 DocType: Activity Type,Default Costing Rate,डिफ़ॉल्ट लागत दर
 DocType: Maintenance Schedule,Maintenance Schedule,रखरखाव अनुसूची
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","तो मूल्य निर्धारण नियमों ग्राहकों के आधार पर बाहर छान रहे हैं, ग्राहक समूह, क्षेत्र, प्रदायक, प्रदायक प्रकार, अभियान, बिक्री साथी आदि"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,सूची में शुद्ध परिवर्तन
 DocType: Employee,Passport Number,पासपोर्ट नंबर
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,मैनेजर
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,खरीद रसीद से
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,एक ही मद कई बार दर्ज किया गया है।
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,खरीद रसीद से
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,एक ही मद कई बार दर्ज किया गया है।
 DocType: SMS Settings,Receiver Parameter,रिसीवर पैरामीटर
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'पर आधारित ' और ' समूह द्वारा ' ही नहीं किया जा सकता है
 DocType: Sales Person,Sales Person Targets,बिक्री व्यक्ति लक्ष्य
 DocType: Production Order Operation,In minutes,मिनटों में
 DocType: Issue,Resolution Date,संकल्प तिथि
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
 DocType: Selling Settings,Customer Naming By,द्वारा नामकरण ग्राहक
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,समूह के साथ परिवर्तित
 DocType: Activity Cost,Activity Type,गतिविधि प्रकार
@@ -539,7 +543,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0} {1} चालान विवरण तालिका में नहीं मिला
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,रखरखाव भेंट {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 DocType: Material Request,Material Transfer,सामग्री स्थानांतरण
@@ -561,13 +565,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,विपणन
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,बिक्री और खरीद के दस्तावेजों के आधार पर उनके धारावाहिक नग में आइटम पर नज़र रखने के लिए. यह भी उत्पाद की वारंटी के विवरण को ट्रैक करने के लिए प्रयोग किया जाता है.
 DocType: Purchase Receipt Item Supplied,Current Stock,मौजूदा स्टॉक
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,अस्वीकृत वेयरहाउस regected मद के खिलाफ अनिवार्य है
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,इस साल कुल बिलिंग
 DocType: Account,Expenses Included In Valuation,व्यय मूल्यांकन में शामिल
 DocType: Employee,Provide email id registered in company,कंपनी में पंजीकृत ईमेल आईडी प्रदान
 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 +533,Item has variants.,आइटम वेरिएंट है।
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,पेड़ के प्रकार
@@ -585,18 +589,18 @@
 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 +92,{0} is not a stock Item,{0} भंडार वस्तु नहीं है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} भंडार वस्तु नहीं है
 DocType: Mode of Payment Account,Default Account,डिफ़ॉल्ट खाता
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"अवसर नेतृत्व से किया जाता है , तो लीड सेट किया जाना चाहिए"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,साप्ताहिक छुट्टी के दिन का चयन करें
 DocType: Production Order Operation,Planned End Time,नियोजित समाप्ति समय
 ,Sales Person Target Variance Item Group-Wise,बिक्री व्यक्ति लक्ष्य विचरण मद समूहवार
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,मौजूदा लेन - देन के साथ खाता लेजर को परिवर्तित नहीं किया जा सकता है
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,मौजूदा लेन - देन के साथ खाता लेजर को परिवर्तित नहीं किया जा सकता है
 DocType: Delivery Note,Customer's Purchase Order No,ग्राहक की खरीद आदेश नहीं
 DocType: Employee,Cell Number,सेल नंबर
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ऑटो सामग्री अनुरोध सृजित
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,खोया
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,आप स्तंभ 'जर्नल प्रवेश के खिलाफ' में मौजूदा वाउचर प्रवेश नहीं कर सकते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,आप स्तंभ 'जर्नल प्रवेश के खिलाफ' में मौजूदा वाउचर प्रवेश नहीं कर सकते
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,अवसर से
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,मासिक वेतन बयान.
@@ -605,9 +609,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: {0} प्रकार की {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,पंक्ति {0}: रूपांतरण कारक अनिवार्य है
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,लेखांकन प्रविष्टियों पत्ती नोड्स के खिलाफ किया जा सकता है। समूहों के खिलाफ प्रविष्टियों की अनुमति नहीं है।
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय या इसे अन्य BOMs के साथ जुड़ा हुआ है के रूप में बीओएम रद्द नहीं कर सकते
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय या इसे अन्य BOMs के साथ जुड़ा हुआ है के रूप में बीओएम रद्द नहीं कर सकते
 DocType: Opportunity,Maintenance,रखरखाव
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},आइटम के लिए आवश्यक खरीद रसीद संख्या {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},आइटम के लिए आवश्यक खरीद रसीद संख्या {0}
 DocType: Item Attribute Value,Item Attribute Value,आइटम विशेषता मान
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,बिक्री अभियान .
 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.
@@ -665,7 +669,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,मूल्य सूची चयनित नहीं
 DocType: Employee,Family Background,पारिवारिक पृष्ठभूमि
 DocType: Process Payroll,Send Email,ईमेल भेजें
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,अनुमति नहीं है
 DocType: Company,Default Bank Account,डिफ़ॉल्ट बैंक खाता
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","पार्टी के आधार पर फिल्टर करने के लिए, का चयन पार्टी पहले प्रकार"
@@ -673,7 +677,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,ओपन स्कूल
 DocType: Item,Items with higher weightage will be shown higher,उच्च वेटेज के साथ आइटम उच्च दिखाया जाएगा
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,बैंक सुलह विस्तार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,मेरा चालान
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,मेरा चालान
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,नहीं मिला कर्मचारी
 DocType: Purchase Order,Stopped,रोक
 DocType: Item,If subcontracted to a vendor,एक विक्रेता के लिए subcontracted हैं
@@ -683,6 +687,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,अब भेजें
 ,Support Analytics,समर्थन विश्लेषिकी
 DocType: Item,Website Warehouse,वेबसाइट वेअरहाउस
+DocType: Payment Reconciliation,Minimum Invoice Amount,न्यूनतम चालान राशि
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ऑटो चालान 05, 28 आदि जैसे उत्पन्न हो जाएगा, जिस पर इस महीने के दिन"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,स्कोर से कम या 5 के बराबर होना चाहिए
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,सी फार्म रिकॉर्ड
@@ -692,7 +697,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;बिक्री के प्वाइंट&quot; सुविधाओं को सक्षम करने के लिए
 DocType: Bin,Moving Average Rate,मूविंग औसत दर
 DocType: Production Planning Tool,Select Items,आइटम का चयन करें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} विधेयक के खिलाफ {1} दिनांक {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} विधेयक के खिलाफ {1} दिनांक {2}
 DocType: Maintenance Visit,Completion Status,समापन स्थिति
 DocType: Sales Invoice Item,Target Warehouse,लक्ष्य वेअरहाउस
 DocType: Item,Allow over delivery or receipt upto this percent,इस प्रतिशत तक प्रसव या रसीद से अधिक की अनुमति दें
@@ -704,7 +709,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,स्वचालित रूप से लेनदेन के प्रस्तुत करने पर संदेश लिखें .
 DocType: Production Order,Item To Manufacture,आइटम करने के लिए निर्माण
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} स्थिति {2} है
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,भुगतान करने के लिए क्रय आदेश
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,भुगतान करने के लिए क्रय आदेश
 DocType: Sales Order Item,Projected Qty,अनुमानित मात्रा
 DocType: Sales Invoice,Payment Due Date,भुगतान की नियत तिथि
 DocType: Newsletter,Newsletter Manager,न्यूज़लैटर प्रबंधक
@@ -728,7 +733,7 @@
 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 +304,Point-of-Sale,बिक्री केन्द्र
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","खाते की शेष राशि पहले से ही क्रेडिट में है, कृपया आप शेष राशि को डेबिट के रूप में ही रखें"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","खाते की शेष राशि पहले से ही क्रेडिट में है, कृपया आप शेष राशि को डेबिट के रूप में ही रखें"
 DocType: Account,Balance must be,बैलेंस होना चाहिए
 DocType: Hub Settings,Publish Pricing,मूल्य निर्धारण प्रकाशित करें
 DocType: Notification Control,Expense Claim Rejected Message,व्यय दावा संदेश अस्वीकृत
@@ -751,7 +756,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,मुद्रा विनिमय दर मास्टर .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,पहला दस्तावेज़ प्रकार का चयन करें
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,इस रखरखाव भेंट रद्द करने से पहले सामग्री का दौरा {0} रद्द
 DocType: Salary Slip,Leave Encashment Amount,नकदीकरण राशि छोड़ दो
@@ -769,17 +774,17 @@
 DocType: Supplier,Default Payable Accounts,डिफ़ॉल्ट लेखा देय
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नहीं है या मौजूद नहीं है
 DocType: Features Setup,Item Barcode,आइटम बारकोड
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
 DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चालान अग्रिम खरीद
 DocType: Address,Shop,दुकान
 DocType: Hub Settings,Sync Now,अभी सिंक करें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},पंक्ति {0}: क्रेडिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है एक {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},पंक्ति {0}: क्रेडिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है एक {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,डिफ़ॉल्ट खाता / बैंक कैश स्वतः स्थिति चालान में अद्यतन किया जाएगा जब इस मोड का चयन किया जाता है.
 DocType: Employee,Permanent Address Is,स्थायी पता है
 DocType: Production Order Operation,Operation completed for how many finished goods?,ऑपरेशन कितने तैयार माल के लिए पूरा?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ब्रांड
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,भत्ता खत्म-{0} मद के लिए पार कर लिए {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,भत्ता खत्म-{0} मद के लिए पार कर लिए {1}.
 DocType: Employee,Exit Interview Details,साक्षात्कार विवरण से बाहर निकलें
 DocType: Item,Is Purchase Item,खरीद आइटम है
 DocType: Journal Entry Account,Purchase Invoice,चालान खरीद
@@ -790,8 +795,8 @@
 DocType: Payment Tool,Paid,भुगतान किया
 DocType: Salary Slip,Total in words,शब्दों में कुल
 DocType: Material Request Item,Lead Time Date,लीड दिनांक और समय
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,अनिवार्य है। हो सकता है कि मुद्रा विनिमय रिकार्ड के लिए नहीं बनाई गई है
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: आइटम के लिए धारावाहिक नहीं निर्दिष्ट करें {1}
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,अनिवार्य है। हो सकता है कि मुद्रा विनिमय रिकार्ड नहीं बनाई गई है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: आइटम के लिए धारावाहिक नहीं निर्दिष्ट करें {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","&#39;उत्पाद बंडल&#39; आइटम, गोदाम, सीरियल कोई और बैच के लिए नहीं &#39;पैकिंग सूची&#39; मेज से विचार किया जाएगा। गोदाम और बैच कोई &#39;किसी भी उत्पाद बंडल&#39; आइटम के लिए सभी मदों की पैकिंग के लिए ही कर रहे हैं, तो उन मूल्यों को मुख्य मद तालिका में दर्ज किया जा सकता है, मूल्यों की मेज &#39;पैकिंग सूची&#39; में कॉपी किया जाएगा।"
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ग्राहकों के लिए लदान.
 DocType: Purchase Invoice Item,Purchase Order Item,खरीद आदेश आइटम
@@ -800,14 +805,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,झगड़ा
 ,Company Name,कंपनी का नाम
 DocType: SMS Center,Total Message(s),कुल संदेश (ओं )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,बैंक के खाते में जहां चेक जमा किया गया था सिर का चयन करें.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,उपयोगकर्ता लेनदेन में मूल्य सूची दर को संपादित करने की अनुमति दें
 DocType: Pricing Rule,Max Qty,अधिकतम मात्रा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,रासायनिक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,सभी आइटम को पहले से ही इस उत्पादन के आदेश के लिए स्थानांतरित कर दिया गया है।
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,सभी आइटम को पहले से ही इस उत्पादन के आदेश के लिए स्थानांतरित कर दिया गया है।
 DocType: Process Payroll,Select Payroll Year and Month,पेरोल वर्ष और महीने का चयन करें
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",उपयुक्त समूह (आम तौर पर फंड के लिए आवेदन&gt; वर्तमान एसेट्स&gt; बैंक खातों में जाओ और प्रकार की) चाइल्ड जोड़ने पर क्लिक करके (एक नया खाता बनाने के &quot;बैंक&quot;
 DocType: Workstation,Electricity Cost,बिजली की लागत
@@ -821,10 +827,10 @@
 DocType: SMS Center,All Lead (Open),सभी लीड (ओपन)
 DocType: Purchase Invoice,Get Advances Paid,भुगतान किए गए अग्रिम जाओ
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,आपका चित्र संलग्न
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,मेक
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,मेक
 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 +3,My Cart,मेरी गाड़ी
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,मेरी गाड़ी
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,खुलने मात्रा
@@ -843,10 +849,10 @@
 DocType: POS Profile,Cash/Bank Account,नकद / बैंक खाता
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,मात्रा या मूल्य में कोई परिवर्तन से हटाया आइटम नहीं है।
 DocType: Delivery Note,Delivery To,करने के लिए डिलिवरी
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,गुण तालिका अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,गुण तालिका अनिवार्य है
 DocType: Production Planning Tool,Get Sales Orders,विक्रय आदेश
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ऋणात्मक नहीं हो सकता
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,छूट
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,छूट
 DocType: Features Setup,Purchase Discounts,खरीद छूट
 DocType: Workstation,Wages,वेतन
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"समय लॉग इन &#39;बिल योग्य&#39; है, तो केवल अद्यतन किया जाएगा"
@@ -871,7 +877,7 @@
 DocType: Tax Rule,Shipping State,जहाजरानी राज्य
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,आइटम बटन 'खरीद प्राप्तियों से आइटम प्राप्त' का उपयोग कर जोड़ा जाना चाहिए
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,बिक्री व्यय
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,मानक खरीद
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,मानक खरीद
 DocType: GL Entry,Against,के खिलाफ
 DocType: Item,Default Selling Cost Center,डिफ़ॉल्ट बिक्री लागत केंद्र
 DocType: Sales Partner,Implementation Partner,कार्यान्वयन साथी
@@ -913,6 +919,7 @@
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,शॉपिंग कार्ट नौवहन नियम
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन का आदेश {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',सेट &#39;पर अतिरिक्त छूट लागू करें&#39; कृपया
 ,Ordered Items To Be Billed,हिसाब से बिलिंग किए आइटम
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,सीमा कम हो गया है से की तुलना में श्रृंखला के लिए
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,समय लॉग्स का चयन करें और एक नया बिक्री चालान बनाने के लिए भेजें.
@@ -922,13 +929,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,इस बार प्रवेश बैच बिल भेजा गया है.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,अवसर पैदा
 DocType: Salary Slip,Leave Without Pay,बिना वेतन छुट्टी
-DocType: Supplier,Communications,संचार
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,क्षमता योजना में त्रुटि
 ,Trial Balance for Party,पार्टी के लिए परीक्षण शेष
 DocType: Lead,Consultant,सलाहकार
 DocType: Salary Slip,Earnings,कमाई
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,तैयार आइटम {0} निर्माण प्रकार प्रविष्टि के लिए दर्ज होना चाहिए
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,खुलने का लेखा बैलेंस
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,तैयार आइटम {0} निर्माण प्रकार प्रविष्टि के लिए दर्ज होना चाहिए
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,खुलने का लेखा बैलेंस
 DocType: Sales Invoice Advance,Sales Invoice Advance,बिक्री चालान अग्रिम
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,अनुरोध करने के लिए कुछ भी नहीं
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' वास्तविक प्रारंभ दिनांक ' वास्तविक अंत तिथि ' से बड़ा नहीं हो सकता
@@ -970,7 +976,7 @@
 DocType: Global Defaults,Current Fiscal Year,चालू वित्त वर्ष
 DocType: Global Defaults,Disable Rounded Total,गोल कुल अक्षम
 DocType: Lead,Call,कॉल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' प्रविष्टियां ' खाली नहीं हो सकती
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,' प्रविष्टियां ' खाली नहीं हो सकती
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},डुप्लिकेट पंक्ति {0} के साथ एक ही {1}
 ,Trial Balance,शेष - परीक्षण
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,कर्मचारी की स्थापना
@@ -982,9 +988,9 @@
 DocType: Contact,User ID,प्रयोक्ता आईडी
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,देखें खाता बही
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,शीघ्रातिशीघ्र
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
 DocType: Production Order,Manufacture against Sales Order,बिक्री आदेश के खिलाफ निर्माण
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,शेष विश्व
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,सकल वेतन
@@ -1014,7 +1020,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},जमे खाता संपादित करने के लिए अधिकृत नहीं {0}
 DocType: Journal Entry,Get Outstanding Invoices,बकाया चालान
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,बिक्री आदेश {0} मान्य नहीं है
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1027,13 +1033,13 @@
 DocType: Employee,Place of Issue,जारी करने की जगह
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,अनुबंध
 DocType: Email Digest,Add Quote,उद्धरण जोड़ें
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM के लिए आवश्यक UOM coversion पहलू: {0} मद में: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM के लिए आवश्यक UOM coversion पहलू: {0} मद में: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,अप्रत्यक्ष व्यय
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,पंक्ति {0}: मात्रा अनिवार्य है
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषि
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,अपने उत्पादों या सेवाओं
 DocType: Mode of Payment,Mode of Payment,भुगतान की रीति
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,यह एक रूट आइटम समूह है और संपादित नहीं किया जा सकता है .
 DocType: Journal Entry Account,Purchase Order,आदेश खरीद
 DocType: Warehouse,Warehouse Contact Info,वेयरहाउस संपर्क जानकारी
@@ -1042,8 +1048,8 @@
 DocType: Email Digest,Annual Income,वार्षिक आय
 DocType: Serial No,Serial No Details,धारावाहिक नहीं विवरण
 DocType: Purchase Invoice Item,Item Tax Rate,आइटम कर की दर
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,आइटम {0} एक उप अनुबंधित आइटम होना चाहिए
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,राजधानी उपकरणों
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","मूल्य निर्धारण नियम पहला आइटम, आइटम समूह या ब्रांड हो सकता है, जो क्षेत्र 'पर लागू होते हैं' के आधार पर चुना जाता है."
@@ -1053,7 +1059,7 @@
 DocType: Appraisal Goal,Goal,लक्ष्य
 DocType: Sales Invoice Item,Edit Description,संपादित करें] वर्णन
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,उम्मीद की डिलीवरी की तिथि नियोजित प्रारंभ तिथि की तुलना में कम है।
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,सप्लायर के लिए
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,सप्लायर के लिए
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,की स्थापना खाता प्रकार के लेनदेन में इस खाते का चयन करने में मदद करता है.
 DocType: Purchase Invoice,Grand Total (Company Currency),महायोग (कंपनी मुद्रा)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,कुल निवर्तमान
@@ -1066,7 +1072,7 @@
 DocType: Journal Entry,Journal Entry,जर्नल प्रविष्टि
 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 +427,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,यह इस उपसर्ग के साथ पिछले बनाई गई लेन - देन की संख्या
@@ -1098,7 +1104,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","संपर्क करने के लिए समाचार पत्र, होता है."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,संचालन खाली नहीं छोड़ा जा सकता।
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,संचालन खाली नहीं छोड़ा जा सकता।
 ,Delivered Items To Be Billed,बिल के लिए दिया आइटम
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,वेयरहाउस सीरियल नंबर के लिए बदला नहीं जा सकता
 DocType: Authorization Rule,Average Discount,औसत छूट
@@ -1113,7 +1119,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},से {0} | {1} {2}
 DocType: BOM Operation,Operation Description,ऑपरेशन विवरण
 DocType: Item,Will also apply to variants,यह भी वेरिएंट के लिए लागू होगी
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,वित्तीय वर्ष प्रारंभ तिथि और वित्तीय वर्ष सहेजा जाता है एक बार वित्तीय वर्ष के अंत तिथि नहीं बदल सकते.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,वित्तीय वर्ष प्रारंभ तिथि और वित्तीय वर्ष सहेजा जाता है एक बार वित्तीय वर्ष के अंत तिथि नहीं बदल सकते.
 DocType: Quotation,Shopping Cart,खरीदारी की टोकरी
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,औसत दैनिक निवर्तमान
 DocType: Pricing Rule,Campaign,अभियान
@@ -1124,7 +1130,8 @@
 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 +211,Stock Entries already created for Production Order ,पहले से ही उत्पादन आदेश के लिए बनाया स्टॉक प्रविष्टियां
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,पहले से ही उत्पादन आदेश के लिए बनाया स्टॉक प्रविष्टियां
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,निश्चित परिसंपत्ति में शुद्ध परिवर्तन
 DocType: Leave Control Panel,Leave blank if considered for all designations,रिक्त छोड़ अगर सभी पदनाम के लिए विचार
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},मैक्स: {0}
@@ -1136,7 +1143,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,खातों का चार्ट
 DocType: Material Request,Terms and Conditions Content,नियम और शर्तें सामग्री
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 से अधिक नहीं हो सकता
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
 DocType: Maintenance Visit,Unscheduled,अनिर्धारित
 DocType: Employee,Owned,स्वामित्व
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,बिना वेतन छुट्टी पर निर्भर करता है
@@ -1174,7 +1181,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,उप असेंबलियों
 DocType: Shipping Rule Condition,To Value,मूल्य के लिए
 DocType: Supplier,Stock Manager,शेयर प्रबंधक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},स्रोत गोदाम पंक्ति के लिए अनिवार्य है {0}
+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 +581,Packing Slip,पर्ची पैकिंग
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,कार्यालय का किराया
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,सेटअप एसएमएस के प्रवेश द्वार सेटिंग्स
@@ -1182,10 +1189,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,कोई पता अभी तक जोड़ा।
 DocType: Workstation Working Hour,Workstation Working Hour,कार्य केंद्र घंटे काम
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,विश्लेषक
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},पंक्ति {0}: आवंटित राशि {1} से भी कम हो या जेवी राशि के बराबर होना चाहिए {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},पंक्ति {0}: आवंटित राशि {1} से भी कम हो या जेवी राशि के बराबर होना चाहिए {2}
 DocType: Item,Inventory,इनवेंटरी
 DocType: Features Setup,"To enable ""Point of Sale"" view",दृश्य &quot;बिक्री के प्वाइंट&quot; सक्षम करने के लिए
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,भुगतान खाली गाड़ी के लिए नहीं बनाया जा सकता
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,भुगतान खाली गाड़ी के लिए नहीं बनाया जा सकता
 DocType: Item,Sales Details,बिक्री विवरण
 DocType: Opportunity,With Items,आइटम के साथ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,मात्रा में
@@ -1200,10 +1207,11 @@
 DocType: Cost Center,Parent Cost Center,माता - पिता लागत केंद्र
 DocType: Sales Invoice,Source,स्रोत
 DocType: Leave Type,Is Leave Without Pay,बिना वेतन छुट्टी है
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,भुगतान तालिका में कोई अभिलेख
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,भुगतान तालिका में कोई अभिलेख
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,वित्तीय वर्ष प्रारंभ दिनांक
 DocType: Employee External Work History,Total Experience,कुल अनुभव
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,पैकिंग पर्ची (ओं ) को रद्द कर दिया
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,पैकिंग पर्ची (ओं ) को रद्द कर दिया
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,निवेश से कैश फ्लो
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,फ्रेट और अग्रेषण शुल्क
 DocType: Material Request Item,Sales Order No,बिक्री आदेश नहीं
 DocType: Item Group,Item Group Name,आइटम समूह का नाम
@@ -1211,12 +1219,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,निर्माण के लिए हस्तांतरण सामग्री
 DocType: Pricing Rule,For Price List,मूल्य सूची के लिए
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी खोज
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","आइटम के लिए खरीद दर: {0} नहीं मिला, लेखा प्रविष्टि (व्यय) बुक करने के लिए आवश्यक है। एक खरीद मूल्य सूची के खिलाफ मद कीमत का उल्लेख करें।"
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","आइटम के लिए खरीद दर: {0} नहीं मिला, लेखा प्रविष्टि (व्यय) बुक करने के लिए आवश्यक है। एक खरीद मूल्य सूची के खिलाफ मद कीमत का उल्लेख करें।"
 DocType: Maintenance Schedule,Schedules,अनुसूचियों
 DocType: Purchase Invoice Item,Net Amount,शुद्ध राशि
 DocType: Purchase Order Item Supplied,BOM Detail No,बीओएम विस्तार नहीं
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),अतिरिक्त छूट राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},त्रुटि: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},त्रुटि: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,खातों का चार्ट से नया खाता बनाने के लिए धन्यवाद.
 DocType: Maintenance Visit,Maintenance Visit,रखरखाव भेंट
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ग्राहक> ग्राहक समूह> टेरिटरी
@@ -1242,7 +1250,7 @@
 DocType: Sales Partner,Sales Partner Target,बिक्री साथी लक्ष्य
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} के लिए लेखा प्रविष्टि केवल मुद्रा में बनाया जा सकता है: {1}
 DocType: Pricing Rule,Pricing Rule,मूल्य निर्धारण नियम
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,क्रय आदेश के लिए सामग्री का अनुरोध
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,क्रय आदेश के लिए सामग्री का अनुरोध
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},पंक्ति # {0}: वापस आ मद {1} नहीं में मौजूद है {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,बैंक खातों
 ,Bank Reconciliation Statement,बैंक समाधान विवरण
@@ -1250,11 +1258,11 @@
 ,POS,पीओएस
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,खुलने का स्टॉक बैलेंस
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} केवल एक बार दिखाई देना चाहिए
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},अधिक tranfer करने के लिए अनुमति नहीं है {0} की तुलना में {1} खरीद आदेश के खिलाफ {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},पत्तियों के लिए सफलतापूर्वक आवंटित {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,पैक करने के लिए कोई आइटम नहीं
 DocType: Shipping Rule Condition,From Value,मूल्य से
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,विनिर्माण मात्रा अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,विनिर्माण मात्रा अनिवार्य है
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,बैंक में परिलक्षित नहीं मात्रा में
 DocType: Quality Inspection Reading,Reading 4,4 पढ़ना
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,कंपनी के खर्च के लिए दावा.
@@ -1266,33 +1274,34 @@
 ,Material Requests for which Supplier Quotations are not created,"प्रदायक कोटेशन नहीं बनाई गई हैं , जिसके लिए सामग्री अनुरोध"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"आप छुट्टी के लिए आवेदन कर रहे हैं, जिस पर दिन (एस) छुट्टियां हैं। आप छुट्टी के लिए लागू नहीं की जरूरत है।"
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,बारकोड का उपयोग करके आइटम्स ट्रैक. आप आइटम के बारकोड स्कैनिंग द्वारा डिलिवरी नोट और बिक्री चालान में आइटम दर्ज करने में सक्षम हो जाएगा.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,मार्क के रूप में दिया
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,मार्क के रूप में दिया
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,कोटेशन बनाओ
 DocType: Dependent Task,Dependent Task,आश्रित टास्क
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,बंद करो जन्मदिन अनुस्मारक
 DocType: SMS Center,Receiver List,रिसीवर सूची
 DocType: Payment Tool Detail,Payment Amount,भुगतान राशि
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,खपत राशि
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} देखें
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} देखें
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,नकद में शुद्ध परिवर्तन
 DocType: Salary Structure Deduction,Salary Structure Deduction,वेतन संरचना कटौती
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {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 +185,Quantity must not be more than {0},मात्रा से अधिक नहीं होना चाहिए {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),आयु (दिन)
 DocType: Quotation Item,Quotation Item,कोटेशन आइटम
 DocType: Account,Account Name,खाते का नाम
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,तिथि से आज तक से बड़ा नहीं हो सकता
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,तिथि से आज तक से बड़ा नहीं हो सकता
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,धारावाहिक नहीं {0} मात्रा {1} एक अंश नहीं हो सकता
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,प्रदायक प्रकार मास्टर .
 DocType: Purchase Order Item,Supplier Part Number,प्रदायक भाग संख्या
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 या 1 नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 या 1 नहीं किया जा सकता
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,खरीद रसीद {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,खरीद रसीद {0} प्रस्तुत नहीं किया गया है
 DocType: Company,Default Payable Account,डिफ़ॉल्ट देय खाता
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","ऐसे शिपिंग नियम, मूल्य सूची आदि के रूप में ऑनलाइन शॉपिंग कार्ट के लिए सेटिंग"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% बिल
@@ -1304,15 +1313,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,मेरे मुद्दों
 DocType: BOM Item,BOM Item,बीओएम आइटम
 DocType: Appraisal,For Employee,कर्मचारी के लिए
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,पंक्ति {0}: प्रदायक के खिलाफ अग्रिम डेबिट किया जाना चाहिए
 DocType: Company,Default Values,डिफ़ॉल्ट मान
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,पंक्ति {0}: भुगतान राशि नकारात्मक नहीं हो सकता
 DocType: Expense Claim,Total Amount Reimbursed,कुल राशि की प्रतिपूर्ति
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},प्रदायक के खिलाफ चालान {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},प्रदायक के खिलाफ चालान {0} दिनांक {1}
 DocType: Customer,Default Price List,डिफ़ॉल्ट मूल्य सूची
 DocType: Payment Reconciliation,Payments,भुगतान
 DocType: Budget Detail,Budget Allocated,बजट आवंटित
 DocType: Journal Entry,Entry Type,प्रविष्टि प्रकार
 ,Customer Credit Balance,ग्राहक क्रेडिट बैलेंस
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,देय खातों में शुद्ध परिवर्तन
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,अपना ईमेल आईडी सत्यापित करें
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',' Customerwise डिस्काउंट ' के लिए आवश्यक ग्राहक
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,अद्यतन बैंक भुगतान पत्रिकाओं के साथ तिथियाँ.
@@ -1333,7 +1344,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,शॉपिंग कार्ट सक्षम करें
 DocType: Employee,Permanent Address,स्थायी पता
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,आइटम {0} एक सेवा आइटम होना चाहिए .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",महायोग से \ {0} {1} अधिक से अधिक नहीं हो सकता है के खिलाफ अग्रिम भुगतान कर दिया {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,आइटम कोड का चयन करें
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),बिना वेतन छुट्टी के लिए कटौती में कमी (LWP)
@@ -1350,18 +1361,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,एक आइटम के एकल इकाई.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',समय लॉग बैच {0} ' प्रस्तुत ' होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',समय लॉग बैच {0} ' प्रस्तुत ' होना चाहिए
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,हर शेयर आंदोलन के लिए लेखा प्रविष्टि बनाओ
 DocType: Leave Allocation,Total Leaves Allocated,कुल पत्तियां आवंटित
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},रो नहीं पर आवश्यक गोदाम {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},रो नहीं पर आवश्यक गोदाम {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,वैध वित्तीय वर्ष आरंभ और समाप्ति तिथियाँ दर्ज करें
 DocType: Employee,Date Of Retirement,सेवानिवृत्ति की तारीख
 DocType: Upload Attendance,Get Template,टेम्पलेट जाओ
 DocType: Address,Postal,डाक का
 DocType: Item,Weightage,महत्व
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"ग्राहक समूह समान नाम के साथ पहले से मौजूद है, कृपया ग्राहक का नाम बदले या ग्राहक समूह का नाम बदले"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,पहला {0} का चयन करें.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},पाठ {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,पहला {0} का चयन करें.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},पाठ {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,नया संपर्क
 DocType: Territory,Parent Territory,माता - पिता टेरिटरी
 DocType: Quality Inspection Reading,Reading 2,2 पढ़ना
 DocType: Stock Entry,Material Receipt,सामग्री प्राप्ति
@@ -1369,7 +1381,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},पार्टी का प्रकार और पार्टी प्राप्य / देय खाते के लिए आवश्यक है {0}
 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 +210,Quantity required for Item {0} in row {1},आइटम के लिए आवश्यक मात्रा {0} पंक्ति में {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},आइटम के लिए आवश्यक मात्रा {0} पंक्ति में {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},मात्रा मद के लिए मौजूद वेयरहाउस {0} मिटाया नहीं जा सकता {1}
 DocType: Quotation,Order Type,आदेश प्रकार
 DocType: Purchase Invoice,Notification Email Address,सूचना ईमेल पता
@@ -1386,15 +1398,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बहुत अधिक कॉलम. रिपोर्ट निर्यात और एक स्प्रेडशीट अनुप्रयोग का उपयोग कर इसे मुद्रित.
 DocType: Sales 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 +152,Main,मुख्य
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,मुख्य
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,प्रकार
 DocType: Naming Series,Set prefix for numbering series on your transactions,अपने लेनदेन पर श्रृंखला नंबरिंग के लिए उपसर्ग सेट
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,रूका आदेश को रद्द नहीं किया जा सकता . रद्द करने के लिए आगे बढ़ाना .
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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: Item,Variants,वेरिएंट
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,बनाओ खरीद आदेश
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,बनाओ खरीद आदेश
 DocType: SMS Center,Send To,इन्हें भेजें
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
 DocType: Payment Reconciliation Payment,Allocated amount,आवंटित राशि
@@ -1407,7 +1419,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,गोदाम और संदर्भ
 DocType: Supplier,Statutory info and other general information about your Supplier,वैधानिक अपने सप्लायर के बारे में जानकारी और अन्य सामान्य जानकारी
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,पतों
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल के खिलाफ एंट्री {0} किसी भी बेजोड़ {1} प्रविष्टि नहीं है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल के खिलाफ एंट्री {0} किसी भी बेजोड़ {1} प्रविष्टि नहीं है
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},डुप्लीकेट सीरियल मद के लिए दर्ज किया गया {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,एक नौवहन नियम के लिए एक शर्त
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,आइटम उत्पादन का आदेश दिया है करने के लिए अनुमति नहीं है।
@@ -1416,10 +1428,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,खाते की मुद्रा में ऋण राशि
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,विनिर्माण के लिए टाइम लॉग करता है।
 DocType: Item,Apply Warehouse-wise Reorder Level,गोदाम के लिहाज से पुनःक्रमित स्तर पर लागू करें
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,बीओएम {0} प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,बीओएम {0} प्रस्तुत किया जाना चाहिए
 DocType: Authorization Control,Authorization Control,प्राधिकरण नियंत्रण
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},पंक्ति # {0}: मालगोदाम अस्वीकृत खारिज कर दिया मद के खिलाफ अनिवार्य है {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,कार्यों के लिए समय प्रवेश.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,भुगतान
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,भुगतान
 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},अधिकतम की सामग्री अनुरोध {0} मद के लिए {1} के खिलाफ किया जा सकता है बिक्री आदेश {2}
 DocType: Employee,Salutation,अभिवादन
@@ -1436,7 +1449,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,सहयोगी
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,आइटम {0} एक धारावाहिक आइटम नहीं है
 DocType: SMS Center,Create Receiver List,रिसीवर सूची बनाएँ
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,समय सीमा समाप्त
 DocType: Packing Slip,To Package No.,सं पैकेज
 DocType: Warranty Claim,Issue Date,जारी करने की तिथि
 DocType: Activity Cost,Activity Cost,गतिविधि लागत
@@ -1474,7 +1486,7 @@
 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 +65,Territory / Customer,टेरिटरी / ग्राहक
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,उदाहरणार्थ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,बिक्री आइटम है
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,आइटम समूह ट्री
@@ -1486,7 +1498,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} बनाया
 DocType: Delivery Note Item,Against Sales Order,बिक्री के आदेश के खिलाफ
 ,Serial No Status,धारावाहिक नहीं स्थिति
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,आइटम तालिका खाली नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,आइटम तालिका खाली नहीं हो सकता
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","पंक्ति {0}: सेट करने के लिए {1} अवधि, से और तारीख \
  करने के बीच अंतर करने के लिए अधिक से अधिक या बराबर होना चाहिए {2}"
@@ -1496,7 +1508,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,शुल्कों और करों
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,संदर्भ तिथि दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,आपूर्ति मात्रा
@@ -1511,7 +1523,7 @@
 DocType: Installation Note,Installation Time,अधिष्ठापन काल
 DocType: Sales Invoice,Accounting Details,लेखा विवरण
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,इस कंपनी के लिए सभी लेन-देन को हटाएं
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,पंक्ति # {0}: ऑपरेशन {1} उत्पादन में तैयार माल की {2} मात्रा के लिए पूरा नहीं है आदेश # {3}। टाइम लॉग्स के माध्यम से आपरेशन स्थिति अपडेट करें
+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,पंक्ति # {0}: ऑपरेशन {1} उत्पादन में तैयार माल की {2} मात्रा के लिए पूरा नहीं है आदेश # {3}। टाइम लॉग्स के माध्यम से आपरेशन स्थिति अपडेट करें
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,निवेश
 DocType: Issue,Resolution Details,संकल्प विवरण
 DocType: Quality Inspection Reading,Acceptance Criteria,स्वीकृति मापदंड
@@ -1527,7 +1539,7 @@
 DocType: Holiday List,Clear Table,स्पष्ट मेज
 DocType: Features Setup,Brands,ब्रांड
 DocType: C-Form Invoice Detail,Invoice No,कोई चालान
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,खरीद आदेश से
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,खरीद आदेश से
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,लागत दर
 ,Customer Addresses And Contacts,ग्राहक के पते और संपर्क
@@ -1544,7 +1556,7 @@
 ,Maintenance Schedules,रखरखाव अनुसूचियों
 ,Quotation Trends,कोटेशन रुझान
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},आइटम के लिए आइटम मास्टर में उल्लेख नहीं मद समूह {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
 DocType: Shipping Rule Condition,Shipping Amount,नौवहन राशि
 ,Pending Amount,लंबित राशि
 DocType: Purchase Invoice Item,Conversion Factor,परिवर्तनकारक तत्व
@@ -1561,12 +1573,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial खातों का पेड़ .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,रिक्त छोड़ दो अगर सभी कर्मचारी प्रकार के लिए विचार
 DocType: Landed Cost Voucher,Distribute Charges Based On,बांटो आरोपों पर आधारित
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,आइटम {1} एक एसेट आइटम के रूप में खाते {0} प्रकार की ' फिक्स्ड एसेट ' होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,आइटम {1} एक एसेट आइटम के रूप में खाते {0} प्रकार की ' फिक्स्ड एसेट ' होना चाहिए
 DocType: HR Settings,HR Settings,मानव संसाधन सेटिंग्स
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च का दावा अनुमोदन के लिए लंबित है . केवल खर्च अनुमोदक स्थिति अपडेट कर सकते हैं .
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त छूट राशि
 DocType: Leave Block List Allow,Leave Block List Allow,छोड़ दो ब्लॉक सूची की अनुमति दें
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,खेल
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,वास्तविक कुल
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,इकाई
@@ -1578,6 +1590,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} अब मूलभूत वित्त वर्ष है . परिवर्तन को प्रभावी बनाने के लिए अपने ब्राउज़र को ताज़ा करें.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,खर्चों के दावे
 DocType: Issue,Support,समर्थन
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,गाडी देंखे
 ,BOM Search,बीओएम खोज
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),समापन (+ योग खोलने)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,कंपनी में मुद्रा निर्दिष्ट करें
@@ -1589,13 +1602,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM रूपांतरण कारक पंक्ति में आवश्यक है {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},क्लीयरेंस तारीख पंक्ति में चेक की तारीख से पहले नहीं किया जा सकता {0}
 DocType: Salary Slip,Deduction,कटौती
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},मद कीमत के लिए जोड़ा {0} मूल्य सूची में {1}
 DocType: Address Template,Address Template,पता खाका
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,इस व्यक्ति की बिक्री के कर्मचारी आईडी दर्ज करें
 DocType: Territory,Classification of Customers by region,क्षेत्र द्वारा ग्राहकों का वर्गीकरण
 DocType: Project,% Tasks Completed,% कार्य संपन्न
 DocType: Project,Gross Margin,सकल मुनाफा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,पहली उत्पादन मद दर्ज करें
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,विकलांग उपयोगकर्ता
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,विकलांग उपयोगकर्ता
 DocType: Opportunity,Quotation,उद्धरण
 DocType: Salary Slip,Total Deduction,कुल कटौती
 DocType: Quotation,Maintenance User,रखरखाव उपयोगकर्ता
@@ -1604,7 +1618,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन टाइम
 DocType: Authorization Rule,Applicable To (User),के लिए लागू (उपयोगकर्ता)
 DocType: Purchase Taxes and Charges,Deduct,घटाना
@@ -1614,12 +1628,12 @@
 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,अतः मात्रा
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","शेयर प्रविष्टियों गोदाम के खिलाफ मौजूद {0}, इसलिए आप फिर से आवंटित करने या गोदाम को संशोधित नहीं कर सकते हैं"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","शेयर प्रविष्टियों गोदाम के खिलाफ मौजूद {0}, इसलिए आप फिर से आवंटित करने या गोदाम को संशोधित नहीं कर सकते हैं"
 DocType: Appraisal,Calculate Total Score,कुल स्कोर की गणना
 DocType: Supplier Quotation,Manufacturing Manager,विनिर्माण प्रबंधक
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},धारावाहिक नहीं {0} तक वारंटी के अंतर्गत है {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,संकुल में डिलिवरी नोट भाजित.
-apps/erpnext/erpnext/hooks.py +68,Shipments,लदान
+apps/erpnext/erpnext/hooks.py +69,Shipments,लदान
 DocType: Purchase Order Item,To be delivered to customer,ग्राहक के लिए दिया जाना
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,समय लॉग स्थिति प्रस्तुत किया जाना चाहिए.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,सीरियल नहीं {0} किसी भी गोदाम से संबंधित नहीं है
@@ -1639,10 +1653,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,कंपनी का चयन करें ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,रिक्त छोड़ अगर सभी विभागों के लिए विचार
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","रोजगार ( स्थायी , अनुबंध , प्रशिक्षु आदि ) के प्रकार."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
 DocType: Currency Exchange,From Currency,मुद्रा से
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","कम से कम एक पंक्ति में आवंटित राशि, प्रकार का चालान और चालान नंबर का चयन करें"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},आइटम के लिए आवश्यक बिक्री आदेश {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","कम से कम एक पंक्ति में आवंटित राशि, प्रकार का चालान और चालान नंबर का चयन करें"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},आइटम के लिए आवश्यक बिक्री आदेश {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,प्रणाली में परिलक्षित नहीं मात्रा में
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी मुद्रा)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,दूसरों
@@ -1658,7 +1672,7 @@
 DocType: Quality Inspection,In Process,इस प्रक्रिया में
 DocType: Authorization Rule,Itemwise Discount,Itemwise डिस्काउंट
 DocType: Purchase Order Item,Reference Document Type,संदर्भ दस्तावेज़ प्रकार
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} बिक्री आदेश के खिलाफ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} बिक्री आदेश के खिलाफ {1}
 DocType: Account,Fixed Asset,स्थायी परिसम्पत्ति
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,श्रृंखलाबद्ध इन्वेंटरी
 DocType: Activity Type,Default Billing Rate,डिफ़ॉल्ट बिलिंग दर
@@ -1668,7 +1682,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,भुगतान करने के लिए बिक्री आदेश
 DocType: Expense Claim Detail,Expense Claim Detail,व्यय दावा विवरण
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,टाइम लॉग्स बनाया:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,सही खाते का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,सही खाते का चयन करें
 DocType: Item,Weight UOM,वजन UOM
 DocType: Employee,Blood Group,रक्त वर्ग
 DocType: Purchase Invoice Item,Page Break,पृष्ठातर
@@ -1699,10 +1713,10 @@
 DocType: Time Log,To Time,समय के लिए
 DocType: Authorization Rule,Approving Role (above authorized value),(अधिकृत मूल्य से ऊपर) भूमिका का अनुमोदन
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","बच्चे नोड्स जोड़ने के लिए, पेड़ लगाने और आप अधिक नोड्स जोड़ना चाहते हैं जिसके तहत नोड पर क्लिक करें."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,खाते में जमा एक देय खाता होना चाहिए
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},बीओएम रिकर्शन : {0} माता पिता या के बच्चे नहीं हो सकता {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,खाते में जमा एक देय खाता होना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},बीओएम रिकर्शन : {0} माता पिता या के बच्चे नहीं हो सकता {2}
 DocType: Production Order Operation,Completed Qty,पूरी की मात्रा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, केवल डेबिट खातों एक और क्रेडिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","{0}, केवल डेबिट खातों एक और क्रेडिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,मूल्य सूची {0} अक्षम है
 DocType: Manufacturing Settings,Allow Overtime,ओवरटाइम की अनुमति दें
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} मद के लिए आवश्यक सीरियल नंबर {1}। आपके द्वारा दी गई {2}।
@@ -1710,8 +1724,9 @@
 DocType: Item,Customer Item Codes,ग्राहक आइटम संहिताओं
 DocType: Opportunity,Lost Reason,खोया कारण
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,आदेश या चालान के खिलाफ भुगतान प्रविष्टियों को बनाने।
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,नया पता
 DocType: Quality Inspection,Sample Size,नमूने का आकार
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,सभी आइटम पहले से चालान कर दिया गया है
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,इसके अलावा लागत केन्द्रों समूह के तहत बनाया जा सकता है लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है
 DocType: Project,External,बाहरी
@@ -1767,13 +1782,14 @@
 DocType: Rename Tool,Rename Tool,उपकरण का नाम बदलें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,अद्यतन लागत
 DocType: Item Reorder,Item Reorder,आइटम पुनः क्रमित करें
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,हस्तांतरण सामग्री
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,हस्तांतरण सामग्री
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","संचालन, परिचालन लागत निर्दिष्ट और अपने संचालन के लिए एक अनूठा आपरेशन नहीं दे ."
 DocType: Purchase Invoice,Price List Currency,मूल्य सूची मुद्रा
 DocType: Naming Series,User must always select,उपयोगकर्ता हमेशा का चयन करना होगा
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक स्टॉक की अनुमति दें
 DocType: Installation Note,Installation Note,स्थापना नोट
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,करों जोड़ें
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,फाइनेंसिंग से कैश फ्लो
 ,Financial Analytics,वित्तीय विश्लेषिकी
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित
 DocType: Address,Subsidiary,सहायक
@@ -1783,19 +1799,19 @@
 DocType: Process Payroll,Create Salary Slip,वेतनपर्ची बनाएँ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,बैंक के अनुसार अपेक्षित संतुलन
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),धन के स्रोत (देनदारियों)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},मात्रा पंक्ति में {0} ({1} ) के रूप में ही किया जाना चाहिए निर्मित मात्रा {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},मात्रा पंक्ति में {0} ({1} ) के रूप में ही किया जाना चाहिए निर्मित मात्रा {2}
 DocType: Appraisal,Employee,कर्मचारी
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,से आयात ईमेल
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,उपयोगकर्ता के रूप में आमंत्रित
 DocType: Features Setup,After Sale Installations,बिक्री के प्रतिष्ठान के बाद
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} पूरी तरह से बिल भेजा है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} पूरी तरह से बिल भेजा है
 DocType: Workstation Working Hour,End Time,अंतिम समय
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,बिक्री या खरीद के लिए मानक अनुबंध शर्तों .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,वाउचर द्वारा समूह
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,आवश्यक पर
 DocType: Sales Invoice,Mass Mailing,मास मेलिंग
 DocType: Rename Tool,File to Rename,नाम बदलने के लिए फ़ाइल
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse आदेश संख्या मद के लिए आवश्यक {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse आदेश संख्या मद के लिए आवश्यक {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,दिखाएँ भुगतान
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},आइटम के लिए मौजूद नहीं है निर्दिष्ट बीओएम {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,रखरखाव अनुसूची {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
@@ -1805,6 +1821,7 @@
 DocType: Selling Settings,Sales Order Required,बिक्री आदेश आवश्यक
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ग्राहक बनाएँ
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,रखरखाव अनुसूची विवरण
 DocType: Quality Inspection Reading,Reading 9,9 पढ़ना
@@ -1816,6 +1833,7 @@
 DocType: Warranty Claim,Raised By,द्वारा उठाए गए
 DocType: Payment Tool,Payment Account,भुगतान खाता
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,लेखा प्राप्य में शुद्ध परिवर्तन
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,प्रतिपूरक बंद
 DocType: Quality Inspection Reading,Accepted,स्वीकार किया
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,आप वास्तव में इस कंपनी के लिए सभी लेन-देन को हटाना चाहते हैं सुनिश्चित करें। यह है के रूप में आपका मास्टर डाटा रहेगा। इस क्रिया को पूर्ववत नहीं किया जा सकता।
@@ -1823,17 +1841,17 @@
 DocType: Payment Tool,Total Payment Amount,कुल भुगतान राशि
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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 +204,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
 DocType: Newsletter,Test,परीक्षण
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","मौजूदा स्टॉक लेनदेन आप के मूल्यों को बदल नहीं सकते \ इस मद के लिए वहाँ के रूप में &#39;सीरियल नहीं है&#39;, &#39;बैच है,&#39; नहीं &#39;शेयर मद है&#39; और &#39;मूल्यांकन पद्धति&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
 DocType: Employee,Previous Work Experience,पिछले कार्य अनुभव
 DocType: Stock Entry,For Quantity,मात्रा के लिए
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},आइटम के लिए योजना बनाई मात्रा दर्ज करें {0} पंक्ति में {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,आइटम के लिए अनुरोध.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,अलग उत्पादन का आदेश प्रत्येक समाप्त अच्छा आइटम के लिए बनाया जाएगा.
 DocType: Purchase Invoice,Terms and Conditions1,नियम और Conditions1
@@ -1846,7 +1864,7 @@
 DocType: Authorization Rule,Authorized Value,अधिकृत मूल्य
 DocType: Contact,Enter department to which this Contact belongs,विभाग को जो इस संपर्क के अंतर्गत आता दर्ज करें
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,कुल अनुपस्थित
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,पंक्ति के लिए आइटम या वेयरहाउस {0} सामग्री अनुरोध मेल नहीं खाता
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,पंक्ति के लिए आइटम या वेयरहाउस {0} सामग्री अनुरोध मेल नहीं खाता
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,माप की इकाई
 DocType: Fiscal Year,Year End Date,वर्षांत तिथि
 DocType: Task Depends On,Task Depends On,काम पर निर्भर करता है
@@ -1872,7 +1890,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,अनुबंध समाप्ति तिथि शामिल होने की तिथि से अधिक होना चाहिए
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,एक आयोग के लिए कंपनियों के उत्पादों को बेचता है एक तीसरे पक्ष जो वितरक / डीलर / कमीशन एजेंट / सहबद्ध / पुनर्विक्रेता।
 DocType: Customer Group,Has Child Node,बाल नोड है
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} खरीद आदेश के खिलाफ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} खरीद आदेश के खिलाफ {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","स्थैतिक यूआरएल यहाँ मानकों (Eg. प्रेषक = ERPNext, username = ERPNext, पासवर्ड = 1234 आदि) दर्ज करें"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} नहीं किसी भी सक्रिय वित्त वर्ष में। अधिक विवरण की जाँच के लिए {2}।
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,इस ERPNext से ऑटो उत्पन्न एक उदाहरण वेबसाइट है
@@ -1920,7 +1938,7 @@
  10। जोड़ें या घटा देते हैं: आप जोड़ सकते हैं या कर कटौती करना चाहते हैं।"
 DocType: Purchase Receipt Item,Recd Quantity,रिसी डी मात्रा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},अधिक आइटम उत्पादन नहीं कर सकते {0} से बिक्री आदेश मात्रा {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
 DocType: Payment Reconciliation,Bank / Cash Account,बैंक / रोकड़ लेखा
 DocType: Tax Rule,Billing City,बिलिंग शहर
 DocType: Global Defaults,Hide Currency Symbol,मुद्रा प्रतीक छुपाएँ
@@ -1952,6 +1970,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,उपयोगिता व्यय
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 से ऊपर
 DocType: Buying Settings,Default Buying Price List,डिफ़ॉल्ट खरीद मूल्य सूची
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.","आदि कंपनी , मुद्रा , चालू वित्त वर्ष , की तरह सेट डिफ़ॉल्ट मान"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,भुगतान के प्रकार
@@ -1987,7 +2006,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",धारा लागत में &quot;सामग्री के आधार पर दर&quot; देखें
 DocType: Appraisal Goal,Key Responsibility Area,कुंजी जिम्मेदारी क्षेत्र
 DocType: Item Reorder,Material Request Type,सामग्री अनुरोध प्रकार
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,पंक्ति {0}: UoM रूपांतरण कारक है अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,पंक्ति {0}: UoM रूपांतरण कारक है अनिवार्य है
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,संदर्भ .......................
 DocType: Cost Center,Cost Center,लागत केंद्र
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,वाउचर #
@@ -2010,7 +2029,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,सभी पते.
 DocType: Company,Stock Settings,स्टॉक सेटिंग्स
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","निम्नलिखित गुण दोनों रिकॉर्ड में वही कर रहे हैं अगर विलय ही संभव है। समूह, रूट प्रकार, कंपनी है"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","निम्नलिखित गुण दोनों रिकॉर्ड में वही कर रहे हैं अगर विलय ही संभव है। समूह, रूट प्रकार, कंपनी है"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ग्राहक समूह ट्री प्रबंधन .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,नए लागत केन्द्र का नाम
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण कक्ष छोड़ दो
@@ -2030,8 +2049,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,भुगतान टूल विस्तार
 ,Sales Browser,बिक्री ब्राउज़र
 DocType: Journal Entry,Total Credit,कुल क्रेडिट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: एक और {0} # {1} शेयर प्रविष्टि के खिलाफ मौजूद है {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,स्थानीय
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: एक और {0} # {1} शेयर प्रविष्टि के खिलाफ मौजूद है {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,देनदार
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,बड़ा
@@ -2050,7 +2069,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,आप सेट और लक्ष्यों की निगरानी कर सकते हैं ताकि सभी बिक्री लेनदेन कई ** बिक्री व्यक्तियों ** खिलाफ टैग किया जा सकता है।
 ,S.O. No.,बिक्री आदेश संख्या
 DocType: Production Order Operation,Make Time Log,समय लॉग बनाओ
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,पुनःक्रमित मात्रा सेट करें
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,पुनःक्रमित मात्रा सेट करें
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},लीड से ग्राहक बनाने कृपया {0}
 DocType: Price List,Applicable for Countries,देशों के लिए लागू
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,कंप्यूटर्स
@@ -2110,10 +2129,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,कम से कम एक आइटम वापसी दस्तावेज़ में नकारात्मक मात्रा के साथ दर्ज किया जाना चाहिए
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,कोई टिप्पणी
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,कोई टिप्पणी
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,अतिदेय
 DocType: Account,Stock Received But Not Billed,स्टॉक प्राप्त लेकिन बिल नहीं
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,रूट खाते एक समूह होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,रूट खाते एक समूह होना चाहिए
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,सकल वेतन + बकाया राशि + नकदीकरण राशि कुल कटौती
 DocType: Monthly Distribution,Distribution Name,वितरण नाम
 DocType: Features Setup,Sales and Purchase,बिक्री और खरीद
@@ -2127,6 +2146,7 @@
 DocType: Journal Entry Account,Party Balance,पार्टी बैलेंस
 DocType: Sales Invoice Item,Time Log Batch,समय प्रवेश बैच
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,डिस्काउंट पर लागू होते हैं का चयन करें
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,वेतन पर्ची बनाया
 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,निर्माण के लिए सामग्री हस्तांतरण
@@ -2134,9 +2154,9 @@
 DocType: Purchase Invoice,Half-yearly,आधे साल में एक बार
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,वित्त वर्ष {0} नहीं मिला।
 DocType: Bank Reconciliation,Get Relevant Entries,प्रासंगिक प्रविष्टियां प्राप्त करें
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,शेयर के लिए लेखा प्रविष्टि
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,शेयर के लिए लेखा प्रविष्टि
 DocType: Sales Invoice,Sales Team1,Team1 बिक्री
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,आइटम {0} मौजूद नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,आइटम {0} मौजूद नहीं है
 DocType: Sales Invoice,Customer Address,ग्राहक पता
 DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त छूट पर लागू होते हैं
 DocType: Account,Root Type,जड़ के प्रकार
@@ -2145,15 +2165,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,पृष्ठ के शीर्ष पर इस स्लाइड शो दिखाएँ
 DocType: BOM,Item UOM,आइटम UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),सबसे कम राशि के बाद टैक्स राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},लक्ष्य गोदाम पंक्ति के लिए अनिवार्य है {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},लक्ष्य गोदाम पंक्ति के लिए अनिवार्य है {0}
 DocType: Quality Inspection,Quality Inspection,गुणवत्ता निरीक्षण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,अतिरिक्त छोटा
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,खाते {0} जमे हुए है
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संगठन से संबंधित खातों की एक अलग चार्ट के साथ कानूनी इकाई / सहायक।
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","खाद्य , पेय और तंबाकू"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,पी एल या बी एस
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},केवल विरुद्ध भुगतान कर सकते हैं unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},केवल विरुद्ध भुगतान कर सकते हैं unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,आयोग दर 100 से अधिक नहीं हो सकता
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,न्यूनतम सूची स्तर
 DocType: Stock Entry,Subcontract,उपपट्टा
@@ -2191,7 +2211,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,इनकमिंग गुणवत्ता निरीक्षण.
 DocType: Purchase Order Item,Returned Qty,लौटे मात्रा
 DocType: Employee,Exit,निकास
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,रूट प्रकार अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,रूट प्रकार अनिवार्य है
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,धारावाहिक नहीं {0} बनाया
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",ग्राहकों की सुविधा के लिए इन कोड प्रिंट स्वरूपों में चालान और वितरण नोट की तरह इस्तेमाल किया जा सकता है
 DocType: Employee,You can enter any date manually,आप किसी भी तारीख को मैन्युअल रूप से दर्ज कर सकते हैं
@@ -2199,8 +2219,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,परिवीक्षाधीन अवधि
 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 +110,Row {0}: Advance against Customer must be credit,पंक्ति {0}: ग्राहक के खिलाफ अग्रिम ऋण होना चाहिए
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,खरीद रसीद आइटम की आपूर्ति
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,वेतन
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,वेतन
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime करने के लिए
 DocType: SMS Settings,SMS Gateway URL,एसएमएस गेटवे URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,एसएमएस वितरण की स्थिति बनाए रखने के लिए लॉग
@@ -2217,7 +2238,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,स्तर पुनः क्रमित करें
 DocType: Attendance,Attendance Date,उपस्थिति तिथि
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,वेतन गोलमाल अर्जन और कटौती पर आधारित है.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,बच्चे नोड्स के साथ खाता लेजर को परिवर्तित नहीं किया जा सकता है
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,बच्चे नोड्स के साथ खाता लेजर को परिवर्तित नहीं किया जा सकता है
 DocType: Address,Preferred Shipping Address,पसंदीदा शिपिंग पता
 DocType: Purchase Receipt Item,Accepted Warehouse,स्वीकार किए जाते हैं गोदाम
 DocType: Bank Reconciliation Detail,Posting Date,तिथि पोस्टिंग
@@ -2235,7 +2256,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,धारावाहिक नहीं {0} मौजूद नहीं है
 DocType: Pricing Rule,Discount Percentage,डिस्काउंट प्रतिशत
 DocType: Payment Reconciliation Invoice,Invoice Number,चालान क्रमांक
-apps/erpnext/erpnext/hooks.py +54,Orders,आदेश
+apps/erpnext/erpnext/hooks.py +55,Orders,आदेश
 DocType: Leave Control Panel,Employee Type,कर्मचारी प्रकार
 DocType: Employee Leave Approver,Leave Approver,अनुमोदक छोड़ दो
 DocType: Manufacturing Settings,Material Transferred for Manufacture,सामग्री निर्माण के लिए हस्तांतरित
@@ -2247,7 +2268,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% सामग्री को इस बिक्री आदेश के सहारे बिल किया गया है
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,अवधि समापन एंट्री
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,मौजूदा लेनदेन के साथ लागत केंद्र समूह परिवर्तित नहीं किया जा सकता है
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ह्रास
+DocType: Account,Depreciation,ह्रास
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),प्रदायक (ओं)
 DocType: Customer,Credit Limit,साख सीमा
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,लेन-देन प्रकार का चयन करें
@@ -2272,11 +2293,12 @@
 DocType: Material Request,Requested For,के लिए अनुरोध
 DocType: Quotation Item,Against Doctype,Doctype के खिलाफ
 DocType: Delivery Note,Track this Delivery Note against any Project,किसी भी परियोजना के खिलाफ इस डिलिवरी नोट हुए
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,रुट खाता हटाया नहीं जा सकता
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,निवेश से नेट नकद
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,रुट खाता हटाया नहीं जा सकता
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,दिखाएँ स्टॉक प्रविष्टियां
 ,Is Primary Address,प्राथमिक पता है
 DocType: Production Order,Work-in-Progress Warehouse,कार्य में प्रगति गोदाम
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,पतों का प्रबंधन
 DocType: Pricing Rule,Item Code,आइटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन के आदेश बनाएँ
@@ -2284,7 +2306,7 @@
 DocType: Journal Entry,User Remark,उपयोगकर्ता के टिप्पणी
 DocType: Lead,Market Segment,बाजार खंड
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी आंतरिक कार्य इतिहास
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),समापन (डॉ.)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),समापन (डॉ.)
 DocType: Contact,Passive,निष्क्रिय
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,धारावाहिक नहीं {0} नहीं स्टॉक में
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,लेनदेन को बेचने के लिए टैक्स टेम्पलेट .
@@ -2300,7 +2322,7 @@
 ,Billed Amount,बिल की राशि
 DocType: Bank Reconciliation,Bank Reconciliation,बैंक समाधान
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,अपडेट प्राप्त करे
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,सामग्री अनुरोध {0} को रद्द कर दिया है या बंद कर दिया गया है
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,सामग्री अनुरोध {0} को रद्द कर दिया है या बंद कर दिया गया है
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,कुछ नमूना रिकॉर्ड को जोड़ें
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,प्रबंधन छोड़ दो
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,खाता द्वारा समूह
@@ -2309,14 +2331,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","लाभ / हानि बुक किया जा जाएगा जिसमें दायित्व के तहत खाता सिर ,"
 DocType: Payment Tool,Against Vouchers,वाउचर के खिलाफ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,त्वरित मदद
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},स्रोत और लक्ष्य गोदाम पंक्ति के लिए समान नहीं हो सकता {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},स्रोत और लक्ष्य गोदाम पंक्ति के लिए समान नहीं हो सकता {0}
 DocType: Features Setup,Sales Extras,बिक्री अतिरिक्त
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} खाते के लिए बजट {1} लागत केंद्र के खिलाफ {2} {3} से अधिक होगा
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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','तिथि तक' 'तिथि से'  के बाद होनी चाहिए
 ,Stock Projected Qty,शेयर मात्रा अनुमानित
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
 DocType: Sales Order,Customer's Purchase Order,ग्राहक के क्रय आदेश
 DocType: Warranty Claim,From Company,कंपनी से
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,मूल्य या मात्रा
@@ -2326,9 +2348,9 @@
 DocType: Leave Block List,Leave Block List Allowed,छोड़ दो ब्लॉक सूची रख सकते है
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,यदि आप लॉग इन करने के लिए इसका इस्तेमाल करेंगे
 DocType: Sales Partner,Retailer,खुदरा
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,खाते में जमा एक बैलेंस शीट खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,खाते में जमा एक बैलेंस शीट खाता होना चाहिए
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,सभी आपूर्तिकर्ता के प्रकार
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,आइटम स्वचालित रूप से गिने नहीं है क्योंकि मद कोड अनिवार्य है
+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 +93,Quotation {0} not of type {1},कोटेशन {0} नहीं प्रकार की {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,रखरखाव अनुसूची आइटम
 DocType: Sales Order,%  Delivered,% वितरित
@@ -2372,7 +2394,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),पैकेज के कुल वजन. आमतौर पर शुद्ध + वजन पैकेजिंग सामग्री के वजन. (प्रिंट के लिए)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,इस भूमिका के साथ उपयोक्ता जमे हुए खातों के खिलाफ लेखांकन प्रविष्टियों को संशोधित / जमे हुए खातों सेट और बनाने के लिए अनुमति दी जाती है
 DocType: Serial No,Is Cancelled,क्या Cancelled
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,मेरा लदान
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,मेरा लदान
 DocType: Journal Entry,Bill Date,बिल की तारीख
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","सर्वोच्च प्राथमिकता के साथ कई मूल्य निर्धारण नियम हैं, भले ही उसके बाद निम्न आंतरिक प्राथमिकताओं लागू कर रहे हैं:"
 DocType: Supplier,Supplier Details,आपूर्तिकर्ता विवरण
@@ -2393,10 +2415,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,कॉल
 DocType: Project,Total Costing Amount (via Time Logs),कुल लागत राशि (टाइम लॉग्स के माध्यम से)
 DocType: Purchase Order Item Supplied,Stock UOM,स्टॉक UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,खरीद आदेश {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,खरीद आदेश {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,प्रक्षेपित
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},धारावाहिक नहीं {0} वेयरहाउस से संबंधित नहीं है {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,नोट : सिस्टम मद के लिए वितरण और अधिक से अधिक बुकिंग की जांच नहीं करेगा {0} मात्रा या राशि के रूप में 0 है
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,तिथि खुलने की
 DocType: Journal Entry,Remark,टिप्पणी
@@ -2409,9 +2431,9 @@
 DocType: Time Log,Batched for Billing,बिलिंग के लिए batched
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,विधेयकों आपूर्तिकर्ता द्वारा उठाए गए.
 DocType: POS Profile,Write Off Account,ऑफ खाता लिखें
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,छूट राशि
 DocType: Purchase Invoice,Return Against Purchase Invoice,के खिलाफ खरीद चालान लौटें
 DocType: Item,Warranty Period (in days),वारंटी अवधि (दिनों में)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,संचालन से नेट नकद
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,उदाहरणार्थ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,आइटम 4
 DocType: Journal Entry Account,Journal Entry Account,जर्नल प्रविष्टि खाता
@@ -2452,7 +2474,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,सेवानिवृत्ति की तिथि शामिल होने की तिथि से अधिक होना चाहिए
 DocType: Sales Invoice,Against Income Account,आय खाता के खिलाफ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% वितरित
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,ट्रांसपोर्टर जानकारी
@@ -2480,10 +2502,10 @@
 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 +14,This is a root sales person and cannot be edited.,यह एक रूट बिक्री व्यक्ति है और संपादित नहीं किया जा सकता है .
 ,Stock Ledger,स्टॉक लेजर
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},दर: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},दर: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,वेतनपर्ची कटौती
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,पहले एक समूह नोड का चयन करें।
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},उद्देश्य से एक होना चाहिए {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},उद्देश्य से एक होना चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,फार्म भरें और इसे बचाने के लिए
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,उनकी नवीनतम सूची की स्थिति के साथ सभी कच्चे माल युक्त रिपोर्ट डाउनलोड करें
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,सामुदायिक फोरम
@@ -2521,7 +2543,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,कंपनी ( नहीं ग्राहक या प्रदायक) मास्टर .
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',' उम्मीद की डिलीवरी तिथि ' दर्ज करें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिवरी नोट्स {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,भुगतान की गई राशि + राशि से लिखने के कुल योग से बड़ा नहीं हो सकता
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},नोट : छोड़ किस्म के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","नोट: भुगतान किसी भी संदर्भ के खिलाफ नहीं बनाया गया है, तो मैन्युअल रूप जर्नल प्रविष्टि बनाते हैं।"
@@ -2538,13 +2560,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' अक्षम किया गया है
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ओपन के रूप में सेट करें
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,भेजने से लेन-देन पर संपर्क करने के लिए स्वत: ईमेल भेजें।
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","पंक्ति {0}: मात्रा गोदाम में उपलब्ध नहीं {1} को {2} {3}।
  उपलब्ध मात्रा: {4}, मात्रा स्थानांतरण: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,आइटम 3
 DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
 DocType: Sales Team,Contribution (%),अंशदान (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,नोट : भुगतान एंट्री ' नकद या बैंक खाता' निर्दिष्ट नहीं किया गया था के बाद से नहीं बनाया जाएगा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,नोट : भुगतान एंट्री ' नकद या बैंक खाता' निर्दिष्ट नहीं किया गया था के बाद से नहीं बनाया जाएगा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,जिम्मेदारियों
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,टेम्पलेट
 DocType: Sales Person,Sales Person Name,बिक्री व्यक्ति का नाम
@@ -2555,20 +2577,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,सुलह से पहले
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आइटम कर पंक्ति {0} प्रकार टैक्स या आय या खर्च या प्रभार्य का खाता होना चाहिए
 DocType: Sales Order,Partly Billed,आंशिक रूप से बिल
 DocType: Item,Default BOM,Default बीओएम
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,फिर से लिखें कंपनी के नाम की पुष्टि के लिए कृपया
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,कुल बकाया राशि
 DocType: Time Log Batch,Total Hours,कुल घंटे
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्स
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},कुल डेबिट कुल क्रेडिट के बराबर होना चाहिए .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},कुल डेबिट कुल क्रेडिट के बराबर होना चाहिए .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,मोटर वाहन
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,डिलिवरी नोट से
 DocType: Time Log,From Time,समय से
 DocType: Notification Control,Custom Message,कस्टम संदेश
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,निवेश बैंकिंग
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,नकद या बैंक खाते को भुगतान के प्रवेश करने के लिए अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,नकद या बैंक खाते को भुगतान के प्रवेश करने के लिए अनिवार्य है
 DocType: Purchase Invoice,Price List Exchange Rate,मूल्य सूची विनिमय दर
 DocType: Purchase Invoice Item,Rate,दर
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,प्रशिक्षु
@@ -2587,9 +2609,10 @@
  संघर्ष का समाधान करें। मूल्य नियम: {0}"
 DocType: Account,Bank,बैंक
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाइन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,मुद्दा सामग्री
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,मुद्दा सामग्री
 DocType: Material Request Item,For Warehouse,गोदाम के लिए
 DocType: Employee,Offer Date,प्रस्ताव की तिथि
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,कोटेशन
 DocType: Hub Settings,Access Token,एक्सेस टोकन
 DocType: Sales Invoice Item,Serial No,नहीं सीरियल
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Maintaince विवरण दर्ज करें
@@ -2603,10 +2626,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,इस महीने के दिन काम की तुलना में अधिक छुट्टियां कर रहे हैं .
 DocType: Product Bundle Item,Product Bundle Item,उत्पाद बंडल आइटम
 DocType: Sales Partner,Sales Partner Name,बिक्री भागीदार नाम
+DocType: Payment Reconciliation,Maximum Invoice Amount,अधिकतम चालान राशि
 DocType: Purchase Invoice Item,Image View,छवि देखें
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन और कुल
@@ -2614,6 +2639,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"इस मद {0} (खाका) का एक संस्करण है। 'कोई प्रतिलिपि' सेट कर दिया जाता है, जब तक गुण टेम्पलेट से अधिक नकल की जाएगी"
 DocType: Account,Purchase User,क्रय उपयोगकर्ता
 DocType: Notification Control,Customize the Notification,अधिसूचना को मनपसंद
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,आपरेशन से नकद प्रवाह
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,डिफ़ॉल्ट पता खाका हटाया नहीं जा सकता
 DocType: Sales Invoice,Shipping Rule,नौवहन नियम
 DocType: Journal Entry,Print Heading,शीर्षक प्रिंट
@@ -2624,7 +2650,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,कच्चे माल
 DocType: Leave Application,Follow via Email,ईमेल के माध्यम से पालन करें
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,सबसे कम राशि के बाद टैक्स राशि
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,चाइल्ड खाता इस खाते के लिए मौजूद है. आप इस खाते को नष्ट नहीं कर सकते .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,पहली पोस्टिंग तिथि का चयन करें
@@ -2642,6 +2668,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},श्रृंखलाबद्ध मद के लिए सीरियल नं आवश्यक {0}
 DocType: Journal Entry,Bank Entry,बैंक एंट्री
 DocType: Authorization Rule,Applicable To (Designation),के लिए लागू (पद)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,कार्ट में जोड़ें
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,समूह द्वारा
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ निष्क्रिय मुद्राओं सक्षम करें.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,पोस्टल व्यय
@@ -2649,30 +2676,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,मनोरंजन और आराम
 DocType: Purchase Order,The date on which recurring order will be stop,"आवर्ती आदेश रोक दिया जाएगा, जिस पर तारीख"
 DocType: Quality Inspection,Item Serial No,आइटम कोई धारावाहिक
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} से कम किया जाना चाहिए या आप अतिप्रवाह सहिष्णुता में वृद्धि करनी चाहिए
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} से कम किया जाना चाहिए या आप अतिप्रवाह सहिष्णुता में वृद्धि करनी चाहिए
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,कुल वर्तमान
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,घंटा
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","धारावाहिक मद {0} शेयर सुलह का उपयोग कर \
  अद्यतन नहीं किया जा सकता है"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,प्रदायक के लिए सामग्री हस्तांतरण
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,प्रदायक के लिए सामग्री हस्तांतरण
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,कोटेशन बनाएँ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,आप ब्लॉक तारीखों पर पत्तियों को मंजूरी के लिए अधिकृत नहीं हैं
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,इन सभी मदों पहले से चालान कर दिया गया है
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,इन सभी मदों पहले से चालान कर दिया गया है
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} द्वारा अनुमोदित किया जा सकता
 DocType: Shipping Rule,Shipping Rule Conditions,नौवहन नियम शर्तें
 DocType: BOM Replace Tool,The new BOM after replacement,बदलने के बाद नए बीओएम
 DocType: Features Setup,Point of Sale,बिक्री के प्वाइंट
 DocType: Account,Tax,कर
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},पंक्ति {0}: {1} एक मान्य नहीं है {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,उत्पाद बंडल से
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,उत्पाद बंडल से
 DocType: Production Planning Tool,Production Planning Tool,उत्पादन योजना उपकरण
 DocType: Quality Inspection,Report Date,तिथि रिपोर्ट
 DocType: C-Form,Invoices,चालान
 DocType: Job Opening,Job Title,कार्य शीर्षक
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} प्राप्तकर्ता
 DocType: Features Setup,Item Groups in Details,विवरण में आइटम समूह
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,निर्माण करने के लिए मात्रा 0 से अधिक होना चाहिए।
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),प्रारंभ बिंदु का बिक्री (पीओएस)
@@ -2680,8 +2706,9 @@
 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: Pricing Rule,Customer Group,ग्राहक समूह
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},व्यय खाते आइटम के लिए अनिवार्य है {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},व्यय खाते आइटम के लिए अनिवार्य है {0}
 DocType: Item,Website Description,वेबसाइट विवरण
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,इक्विटी में शुद्ध परिवर्तन
 DocType: Serial No,AMC Expiry Date,एएमसी समाप्ति तिथि
 ,Sales Register,बिक्री रजिस्टर
 DocType: Quotation,Quotation Lost Reason,कोटेशन कारण खोया
@@ -2689,12 +2716,12 @@
 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 +108,Summary for this month and pending activities,इस महीने और लंबित गतिविधियों के लिए सारांश
 DocType: Customer Group,Customer Group Name,ग्राहक समूह का नाम
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,गुण
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,आइटम पाने के लिए
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,खाता बंद लिखने दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,आइटम पाने के लिए
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,खाता बंद लिखने दर्ज करें
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,पिछले आदेश की तिथि
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,उत्पाद शुल्क चालान बनाएं
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},खाता {0} करता है कंपनी के अंतर्गत आता नहीं {1}
@@ -2710,7 +2737,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,परियोजना के लिहाज से डेटा उद्धरण के लिए उपलब्ध नहीं है
 DocType: Project,Expected End Date,उम्मीद समाप्ति तिथि
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन टेम्पलेट शीर्षक
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,वाणिज्यिक
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,वाणिज्यिक
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,मूल आइटम {0} एक शेयर मद नहीं होना चाहिए
 DocType: Cost Center,Distribution Id,वितरण आईडी
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,बहुत बढ़िया सेवाएं
@@ -2723,7 +2750,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} विशेषता के लिए मान की सीमा के भीतर होना चाहिए {1} को {2} की वेतन वृद्धि में {3}
 DocType: Tax Rule,Sales,विक्रय
 DocType: Stock Entry Detail,Basic Amount,मूल राशि
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
 DocType: Leave Allocation,Unused leaves,अप्रयुक्त पत्ते
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,सीआर
 DocType: Customer,Default Receivable Accounts,प्राप्य लेखा चूक
@@ -2735,16 +2762,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,खरीद प्राप्तियां
-DocType: Payment Reconciliation,Maximum Amount,अधिकतम राशि
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,कैसे मूल्य निर्धारण नियम लागू किया जाता है?
 DocType: Quality Inspection,Delivery Note No,डिलिवरी नोट
 DocType: Company,Retail,खुदरा
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,ग्राहक {0} मौजूद नहीं है
 DocType: Attendance,Absent,अनुपस्थित
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,उत्पाद बंडल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},पंक्ति {0}: अमान्य संदर्भ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,उत्पाद बंडल
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},पंक्ति {0}: अमान्य संदर्भ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,करों और शुल्कों टेम्पलेट खरीद
 DocType: Upload Attendance,Download Template,टेम्पलेट डाउनलोड करें
 DocType: GL Entry,Remarks,टिप्पणियाँ
@@ -2771,7 +2798,7 @@
 ,Monthly Attendance Sheet,मासिक उपस्थिति पत्रक
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,कोई रिकॉर्ड पाया
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: लागत केंद्र मद के लिए अनिवार्य है {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,खाते {0} निष्क्रिय है
 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,तिथि करने के लिए तिथि और उपस्थिति से उपस्थिति अनिवार्य है
@@ -2780,8 +2807,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' लाभ और हानि ' प्रकार खाते {0} एंट्री खुलने में अनुमति नहीं
 DocType: Features Setup,Sales Discounts,बिक्री छूट
 DocType: Hub Settings,Seller Country,विक्रेता देश
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,वेबसाइट पर आइटम प्रकाशित करें
 DocType: Authorization Rule,Authorization Rule,प्राधिकरण नियम
 DocType: Sales Invoice,Terms and Conditions Details,नियमों और शर्तों के विवरण
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,निर्दिष्टीकरण
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,बिक्री करों और शुल्कों खाका
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,परिधान और सहायक उपकरण
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,आदेश की संख्या
@@ -2803,7 +2832,7 @@
 DocType: Time Log,Billing Amount,बिलिंग राशि
 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 +18,Applications for leave.,छुट्टी के लिए आवेदन.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,मौजूदा लेन - देन के साथ खाता हटाया नहीं जा सकता
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,मौजूदा लेन - देन के साथ खाता हटाया नहीं जा सकता
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,विधि व्यय
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ऑटो आदेश 05, 28 आदि जैसे उत्पन्न हो जाएगा, जिस पर इस महीने के दिन"
 DocType: Sales Invoice,Posting Time,बार पोस्टिंग
@@ -2819,11 +2848,11 @@
 DocType: Maintenance Visit,Breakdown,भंग
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,खाता: {0} मुद्रा के साथ: {1} चयनित नहीं किया जा सकता
 DocType: Bank Reconciliation Detail,Cheque Date,चेक तिथि
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: माता पिता के खाते {1} कंपनी से संबंधित नहीं है: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: माता पिता के खाते {1} कंपनी से संबंधित नहीं है: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,सफलतापूर्वक इस कंपनी से संबंधित सभी लेन-देन को नष्ट कर दिया!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,आज की तारीख में
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,परिवीक्षा
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,डिफ़ॉल्ट गोदाम स्टॉक मद के लिए अनिवार्य है .
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,डिफ़ॉल्ट गोदाम स्टॉक मद के लिए अनिवार्य है .
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},महीने के वेतन का भुगतान {0} और वर्ष {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ऑटो डालने मूल्य सूची दर लापता यदि
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,कुल भुगतान की गई राशि
@@ -2835,6 +2864,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),कुल बिलिंग राशि (टाइम लॉग्स के माध्यम से)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,हम इस आइटम बेचने
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,आपूर्तिकर्ता आईडी
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,मात्रा 0 से अधिक होना चाहिए
 DocType: Journal Entry,Cash Entry,कैश एंट्री
 DocType: Sales Partner,Contact Desc,संपर्क जानकारी
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","आकस्मिक, बीमार आदि की तरह पत्तियों के प्रकार"
@@ -2843,7 +2873,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,पंक्तियाँ जोड़ें लेखा पर वार्षिक बजट निर्धारित.
 DocType: Buying Settings,Default Supplier Type,डिफ़ॉल्ट प्रदायक प्रकार
 DocType: Production Order,Total Operating Cost,कुल परिचालन लागत
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,नोट : आइटम {0} कई बार प्रवेश किया
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,नोट : आइटम {0} कई बार प्रवेश किया
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,सभी संपर्क.
 DocType: Newsletter,Test Email Id,टेस्ट ईमेल आईडी
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,कंपनी संक्षिप्त
@@ -2868,7 +2898,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,सभी ग्राहक समूहों
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,टैक्स खाका अनिवार्य है।
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,खाते {0}: माता पिता के खाते {1} मौजूद नहीं है
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,खाते {0}: माता पिता के खाते {1} मौजूद नहीं है
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),मूल्य सूची दर (कंपनी मुद्रा)
 DocType: Account,Temporary,अस्थायी
 DocType: Address,Preferred Billing Address,पसंदीदा बिलिंग पता
@@ -2886,8 +2916,8 @@
 ,Item-wise Price List Rate,मद वार मूल्य सूची दर
 DocType: Purchase Order Item,Supplier Quotation,प्रदायक कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,शब्दों में दिखाई हो सकता है एक बार आप उद्धरण बचाने के लिए होगा.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} बंद कर दिया है
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} बंद कर दिया है
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
 DocType: Lead,Add to calendar on this date,इस तिथि पर कैलेंडर में जोड़ें
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,शिपिंग लागत को जोड़ने के लिए नियम.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,आगामी कार्यक्रम
@@ -2908,24 +2938,24 @@
 DocType: Customer,From Lead,लीड से
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,उत्पादन के लिए आदेश जारी किया.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,वित्तीय वर्ष का चयन करें ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
 DocType: Hub Settings,Name Token,नाम टोकन
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,मानक बेच
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,कम से कम एक गोदाम अनिवार्य है
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,बदलें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,उपाय की मूलभूत इकाई दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,उपाय की मूलभूत इकाई दर्ज करें
 DocType: Purchase Invoice Item,Project Name,इस परियोजना का नाम
 DocType: Supplier,Mention if non-standard receivable account,"मेंशन अमानक प्राप्य खाते है, तो"
 DocType: Journal Entry Account,If Income or Expense,यदि आय या व्यय
 DocType: Features Setup,Item Batch Nos,आइटम बैच Nos
 DocType: Stock Ledger Entry,Stock Value Difference,स्टॉक मूल्य अंतर
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,मानव संसाधन
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,मानव संसाधन
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,भुगतान सुलह भुगतान
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,कर संपत्ति
 DocType: BOM Item,BOM No,नहीं बीओएम
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रविष्टि {0} {1} या पहले से ही अन्य वाउचर के खिलाफ मिलान खाता नहीं है
 DocType: Item,Moving Average,चलायमान औसत
 DocType: BOM Replace Tool,The BOM which will be replaced,बीओएम जो प्रतिस्थापित किया जाएगा
 DocType: Account,Debit,नामे
@@ -2962,7 +2992,7 @@
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त लागत
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,वित्तीय वर्ष की समाप्ति तिथि
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","वाउचर के आधार पर फ़िल्टर नहीं कर सकते नहीं, वाउचर के आधार पर समूहीकृत अगर"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
 DocType: Quality Inspection,Incoming,आवक
 DocType: BOM,Materials Required (Exploded),माल आवश्यक (विस्फोट)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),वेतन (LWP) के बिना छुट्टी लिए कमाई कम करें
@@ -2970,7 +3000,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},पंक्ति # {0}: सीरियल नहीं {1} के साथ मेल नहीं खाता {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,आकस्मिक छुट्टी
 DocType: Batch,Batch ID,बैच आईडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},नोट : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},नोट : {0}
 ,Delivery Note Trends,डिलिवरी नोट रुझान
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,इस सप्ताह की सारांश
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} पंक्ति में एक खरीदे या उप अनुबंधित आइटम होना चाहिए {1}
@@ -2985,6 +3015,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,औसत। क्रय दर
 DocType: Task,Actual Time (in Hours),(घंटे में) वास्तविक समय
 DocType: Employee,History In Company,कंपनी में इतिहास
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,समाचारपत्रिकाएँ
 DocType: Address,Shipping,शिपिंग
 DocType: Stock Ledger Entry,Stock Ledger Entry,स्टॉक खाता प्रविष्टि
@@ -3004,7 +3035,6 @@
 DocType: Purchase Order,End date of current order's period,वर्तमान आदेश की अवधि की समाप्ति की तारीख
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,प्रस्ताव पत्र बनाओ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,वापसी
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,संस्करण के लिए उपाय की मूलभूत इकाई टेम्पलेट के रूप में ही किया जाना चाहिए
 DocType: Production Order Operation,Production Order Operation,उत्पादन का आदेश ऑपरेशन
 DocType: Pricing Rule,Disable,असमर्थ
 DocType: Project Task,Pending Review,समीक्षा के लिए लंबित
@@ -3012,7 +3042,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ग्राहक आईडी
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,समय समय से की तुलना में अधिक से अधिक होना चाहिए
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},वेयरहाउस {0}: माता पिता के खाते {1} कंपनी को Bolong नहीं है {2}
 DocType: BOM,Last Purchase Rate,पिछले खरीद दर
 DocType: Account,Asset,संपत्ति
@@ -3032,7 +3062,7 @@
 ,Available Stock for Packing Items,आइटम पैकिंग के लिए उपलब्ध स्टॉक
 DocType: Item Variant,Item Variant,आइटम संस्करण
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,कोई अन्य डिफ़ॉल्ट रूप में वहाँ डिफ़ॉल्ट के रूप में इस का पता खाका स्थापना
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","खाते की शेष राशि पहले से ही डेबिट में है, कृपया आप शेष राशि को क्रेडिट के रूप में ही रखें"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,गुणवत्ता प्रबंधन
 DocType: Production Planning Tool,Filter based on customer,ग्राहकों के आधार पर फ़िल्टर
 DocType: Payment Tool Detail,Against Voucher No,वाउचर नहीं अगेंस्ट
@@ -3049,6 +3079,7 @@
 DocType: Opportunity,Next Contact,अगले संपर्क
 DocType: Employee,Employment Type,रोजगार के प्रकार
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,स्थायी संपत्तियाँ
+,Cash Flow,नकदी प्रवाह
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,आवेदन की अवधि दो alocation अभिलेखों के पार नहीं किया जा सकता
 DocType: Item Group,Default Expense Account,डिफ़ॉल्ट व्यय खाते
 DocType: Employee,Notice (days),सूचना (दिन)
@@ -3080,13 +3111,12 @@
 DocType: Production Order,Warehouses,गोदामों
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,प्रिंट और स्टेशनरी
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,समूह नोड
-DocType: Payment Reconciliation,Minimum Amount,न्यूनतम राशि
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,अद्यतन तैयार माल
 DocType: Workstation,per hour,प्रति घंटा
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,गोदाम ( सदा सूची ) के लिए खाते में इस खाते के तहत बनाया जाएगा .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,शेयर खाता प्रविष्टि इस गोदाम के लिए मौजूद वेयरहाउस हटाया नहीं जा सकता .
 DocType: Company,Distribution,वितरण
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,राशि का भुगतान
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,राशि का भुगतान
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,परियोजना प्रबंधक
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,प्रेषण
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,अधिकतम छूट मद के लिए अनुमति दी: {0} {1}% है
@@ -3110,7 +3140,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,समर्थन Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},कंपनी के गोदामों में याद आ रही है {0}
 DocType: POS Profile,Terms and Conditions,नियम और शर्तें
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},तिथि वित्तीय वर्ष के भीतर होना चाहिए. तिथि करने के लिए मान लिया जाये = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},तिथि वित्तीय वर्ष के भीतर होना चाहिए. तिथि करने के लिए मान लिया जाये = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","यहाँ आप ऊंचाई, वजन, एलर्जी, चिकित्सा चिंताओं आदि बनाए रख सकते हैं"
 DocType: Leave Block List,Applies to Company,कंपनी के लिए लागू होता है
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"प्रस्तुत स्टॉक एंट्री {0} मौजूद है , क्योंकि रद्द नहीं कर सकते"
@@ -3124,11 +3154,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,खरीद रसीद दर्ज करें
 DocType: Sales Invoice,Get Advances Received,अग्रिम प्राप्त
 DocType: Email Digest,Add/Remove Recipients,प्राप्तकर्ता जोड़ें / निकालें
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},लेन - देन बंद कर दिया प्रोडक्शन आदेश के खिलाफ अनुमति नहीं {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),समर्थन ईमेल आईडी के लिए सेटअप आवक सर्वर . (जैसे support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,कमी मात्रा
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
 DocType: Salary Slip,Salary Slip,वेतनपर्ची
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.","संकुल वितरित किए जाने के लिए निकल जाता है पैकिंग उत्पन्न करता है। पैकेज संख्या, पैकेज सामग्री और अपने वजन को सूचित किया।"
@@ -3217,7 +3247,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,कर्मचारी रिकॉर्ड.
 DocType: HR Settings,Payroll Settings,पेरोल सेटिंग्स
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,गैर जुड़े चालान और भुगतान का मिलान.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,आदेश देना
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,आदेश देना
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,रूट एक माता पिता लागत केंद्र नहीं कर सकते
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,चुनें ब्रांड ...
 DocType: Sales Invoice,C-Form Applicable,लागू सी फार्म
@@ -3232,7 +3262,7 @@
 DocType: Appraisal,Start Date,प्रारंभ दिनांक
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,एक अवधि के लिए पत्तियों का आवंटन .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,सत्यापित करने के लिए यहां क्लिक करें
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,खाते {0}: तुम माता पिता के खाते के रूप में खुद को आवंटन नहीं कर सकते
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,खाते {0}: तुम माता पिता के खाते के रूप में खुद को आवंटन नहीं कर सकते
 DocType: Purchase Invoice Item,Price List Rate,मूल्य सूची दर
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",स्टॉक में दिखाएँ &quot;&quot; या &quot;नहीं&quot; स्टॉक में इस गोदाम में उपलब्ध स्टॉक के आधार पर.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),सामग्री के बिल (बीओएम)
@@ -3241,17 +3271,17 @@
 DocType: Project,Expected Start Date,उम्मीद प्रारंभ दिनांक
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,आरोप है कि आइटम के लिए लागू नहीं है अगर आइटम निकालें
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,उदा. एपीआई smsgateway.com / / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,प्राप्त
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,प्राप्त
 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: Employee Leave Approver,Employee Leave Approver,कर्मचारी छुट्टी अनुमोदक
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} सफलतापूर्वक हमारे न्यूज़लेटर की सूची में जोड़ा गया है।
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","खो के रूप में उद्धरण बना दिया गया है , क्योंकि घोषणा नहीं कर सकते हैं ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,क्रय मास्टर प्रबंधक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,उत्पादन का आदेश {0} प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,उत्पादन का आदेश {0} प्रस्तुत किया जाना चाहिए
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},प्रारंभ तिथि और आइटम के लिए अंतिम तिथि का चयन करें {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,मुख्य रिपोर्ट
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तिथि करने के लिए तिथि से पहले नहीं हो सकता
@@ -3269,7 +3299,7 @@
 DocType: Industry Type,Industry Type,उद्योग के प्रकार
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,कुछ गलत हो गया!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,चेतावनी: अवकाश आवेदन निम्न ब्लॉक दिनांक शामिल
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,बिक्री चालान {0} पहले से ही प्रस्तुत किया गया है
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,बिक्री चालान {0} पहले से ही प्रस्तुत किया गया है
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,पूरा करने की तिथि
 DocType: Purchase Invoice Item,Amount (Company Currency),राशि (कंपनी मुद्रा)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,संगठन इकाई ( विभाग ) मास्टर .
@@ -3288,10 +3318,10 @@
 ,Serial No Service Contract Expiry,धारावाहिक नहीं सेवा अनुबंध समाप्ति
 DocType: Item,Unit of Measure Conversion,उपाय रूपांतरण की इकाई
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,कर्मचारी बदला नहीं जा सकता
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,आप क्रेडिट और एक ही समय में एक ही खाते से डेबिट नहीं कर सकते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,आप क्रेडिट और एक ही समय में एक ही खाते से डेबिट नहीं कर सकते
 DocType: Naming Series,Help HTML,HTML मदद
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},कुल आवंटित वेटेज 100 % होना चाहिए . यह है {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},भत्ता खत्म-{0} मद के लिए पार कर लिए {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},भत्ता खत्म-{0} मद के लिए पार कर लिए {1}
 DocType: Address,Name of person or organization that this address belongs to.,कि इस पते पर संबधित व्यक्ति या संगठन का नाम.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,अपने आपूर्तिकर्ताओं
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,बिक्री आदेश किया जाता है के रूप में खो के रूप में सेट नहीं कर सकता .
@@ -3304,35 +3334,35 @@
 DocType: Employee,Date of Issue,जारी करने की तारीख
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: {0} के लिए {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},पंक्ति # {0}: आइटम के लिए सेट प्रदायक {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,मद {1} से जुड़ी वेबसाइट छवि {0} पाया नहीं जा सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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.,कई समूहों में वेबसाइट पर इस मद की सूची.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,अन्य मुद्रा के साथ खातों अनुमति देने के लिए बहु मुद्रा विकल्प की जाँच करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,अन्य मुद्रा के साथ खातों अनुमति देने के लिए बहु मुद्रा विकल्प की जाँच करें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,आइटम: {0} सिस्टम में मौजूद नहीं है
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,आप स्थिर मूल्य निर्धारित करने के लिए अधिकृत नहीं हैं
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,आप स्थिर मूल्य निर्धारित करने के लिए अधिकृत नहीं हैं
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled प्रविष्टियां प्राप्त करें
+DocType: Payment Reconciliation,From Invoice Date,चालान तिथि से
 DocType: Cost Center,Budgets,बजट
-DocType: Employee,Emergency Contact Details,आपातकालीन सम्पर्क करने का विवरण
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,यह क्या करता है?
 DocType: Delivery Note,To Warehouse,गोदाम के लिए
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},खाते {0} अधिक वित्तीय वर्ष के लिए एक बार से अधिक दर्ज किया गया है {1}
 ,Average Commission Rate,औसत कमीशन दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,उपस्थिति भविष्य तारीखों के लिए चिह्नित नहीं किया जा सकता
 DocType: Pricing Rule,Pricing Rule Help,मूल्य निर्धारण नियम मदद
 DocType: Purchase Taxes and Charges,Account Head,लेखाशीर्ष
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,मदों की उतरा लागत की गणना करने के लिए अतिरिक्त लागत अद्यतन
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,विद्युत
 DocType: Stock Entry,Total Value Difference (Out - In),कुल मूल्य का अंतर (आउट - में)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,पंक्ति {0}: विनिमय दर अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,पंक्ति {0}: विनिमय दर अनिवार्य है
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},यूजर आईडी कर्मचारी के लिए सेट नहीं {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,वारंटी दावे से
 DocType: Stock Entry,Default Source Warehouse,डिफ़ॉल्ट स्रोत वेअरहाउस
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},के लिए जन्मदिन अनुस्मारक {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,दिनों से पिछले आदेश
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,शेयर एसेट्स
@@ -3345,7 +3375,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,खाते {0} समापन प्रकार दायित्व / इक्विटी का होना चाहिए
 DocType: Authorization Rule,Based On,के आधार पर
 DocType: Sales Order Item,Ordered Qty,मात्रा का आदेश दिया
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,मद {0} अक्षम हो जाता है
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,मद {0} अक्षम हो जाता है
 DocType: Stock Settings,Stock Frozen Upto,स्टॉक तक जमे हुए
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},से और अवधि आवर्ती के लिए अनिवार्य तिथियाँ तक की अवधि के {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,परियोजना / कार्य कार्य.
@@ -3353,7 +3383,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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 होना चाहिए
 DocType: Purchase Invoice,Write Off Amount (Company Currency),राशि से लिखें (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
 DocType: Landed Cost Voucher,Landed Cost Voucher,उतरा लागत वाउचर
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},सेट करें {0}
 DocType: Purchase Invoice,Repeat on Day of Month,महीने का दिन पर दोहराएँ
@@ -3383,12 +3413,12 @@
 DocType: Upload Attendance,Upload Attendance,उपस्थिति अपलोड
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,बीओएम और विनिर्माण मात्रा की आवश्यकता होती है
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,बूढ़े रेंज 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,राशि
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,राशि
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,बीओएम प्रतिस्थापित
 ,Sales Analytics,बिक्री विश्लेषिकी
 DocType: Manufacturing Settings,Manufacturing Settings,विनिर्माण सेटिंग्स
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ईमेल स्थापना
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,कंपनी मास्टर में डिफ़ॉल्ट मुद्रा दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,कंपनी मास्टर में डिफ़ॉल्ट मुद्रा दर्ज करें
 DocType: Stock Entry Detail,Stock Entry Detail,शेयर एंट्री विस्तार
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,दैनिक अनुस्मारक
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},साथ टैक्स नियम संघर्ष {0}
@@ -3414,13 +3444,13 @@
 DocType: Sales Order Item,Produced Quantity,उत्पादित मात्रा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,इंजीनियर
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,खोज उप असेंबलियों
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},रो नहीं पर आवश्यक मद कोड {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},रो नहीं पर आवश्यक मद कोड {0}
 DocType: Sales Partner,Partner Type,साथी के प्रकार
 DocType: Purchase Taxes and Charges,Actual,वास्तविक
 DocType: Authorization Rule,Customerwise Discount,Customerwise डिस्काउंट
 DocType: Purchase Invoice,Against Expense Account,व्यय खाते के खिलाफ
 DocType: Production Order,Production Order,उत्पादन का आदेश
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,स्थापना नोट {0} पहले से ही प्रस्तुत किया गया है
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,स्थापना नोट {0} पहले से ही प्रस्तुत किया गया है
 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,अब देखें
@@ -3432,15 +3462,15 @@
 DocType: Employee,Applicable Holiday List,लागू अवकाश सूची
 DocType: Employee,Cheque,चैक
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,सीरीज नवीनीकृत
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,रिपोर्ट प्रकार अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,रिपोर्ट प्रकार अनिवार्य है
 DocType: Item,Serial Number Series,सीरियल नंबर सीरीज
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},गोदाम स्टॉक मद के लिए अनिवार्य है {0} पंक्ति में {1}
 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/public/js/setup_wizard.js +101,The First User: You,पहले उपयोगकर्ता : आप
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},वित्तीय वर्ष प्रारंभ तिथि और वित्तीय वर्ष के अंत तिथि पहले से ही वित्त वर्ष में स्थापित कर रहे हैं {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,सफलतापूर्वक राज़ी
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},वित्तीय वर्ष प्रारंभ तिथि और वित्तीय वर्ष के अंत तिथि पहले से ही वित्त वर्ष में स्थापित कर रहे हैं {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,सफलतापूर्वक राज़ी
 DocType: Production Order,Planned End Date,नियोजित समाप्ति तिथि
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,आइटम कहाँ संग्रहीत हैं.
 DocType: Tax Rule,Validity,वैधता
@@ -3448,7 +3478,7 @@
 DocType: Attendance,Attendance,उपस्थिति
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,पोस्ट दिनांक और पोस्टिंग समय अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,पोस्ट दिनांक और पोस्टिंग समय अनिवार्य है
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,लेनदेन खरीदने के लिए टैक्स टेम्पलेट .
 ,Item Prices,आइटम के मूल्य
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,शब्दों में दिखाई हो सकता है एक बार आप खरीद आदेश को बचाने के लिए होगा.
@@ -3457,15 +3487,15 @@
 DocType: Task,Review Date,तिथि की समीक्षा
 DocType: Purchase Invoice,Advance Payments,अग्रिम भुगतान
 DocType: Purchase Taxes and Charges,On Net Total,नेट कुल
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,पंक्ति में लक्ष्य गोदाम {0} के रूप में ही किया जाना चाहिए उत्पादन का आदेश
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,पंक्ति में लक्ष्य गोदाम {0} के रूप में ही किया जाना चाहिए उत्पादन का आदेश
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,कोई अनुमति नहीं भुगतान उपकरण का उपयोग करने के लिए
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% की आवर्ती के लिए निर्दिष्ट नहीं 'सूचना ईमेल पते'
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,मुद्रा कुछ अन्य मुद्रा का उपयोग प्रविष्टियों करने के बाद बदला नहीं जा सकता
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,मुद्रा कुछ अन्य मुद्रा का उपयोग प्रविष्टियों करने के बाद बदला नहीं जा सकता
 DocType: Company,Round Off Account,खाता बंद दौर
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,प्रशासन - व्यय
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,परामर्श
 DocType: Customer Group,Parent Customer Group,माता - पिता ग्राहक समूह
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,परिवर्तन
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,परिवर्तन
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
 DocType: Appraisal Goal,Score Earned,स्कोर अर्जित
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",उदाहरणार्थ
@@ -3475,13 +3505,13 @@
 DocType: Packing Slip,Gross Weight UOM,सकल वजन UOM
 DocType: Email Digest,Receivables / Payables,प्राप्तियों / देय
 DocType: Delivery Note Item,Against Sales Invoice,बिक्री चालान के खिलाफ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,क्रेडिट खाता
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,क्रेडिट खाता
 DocType: Landed Cost Item,Landed Cost Item,आयातित माल की लागत मद
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,शून्य मूल्यों को दिखाने
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,वस्तु की मात्रा विनिर्माण / कच्चे माल की दी गई मात्रा से repacking के बाद प्राप्त
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्य / देय खाता
 DocType: Delivery Note Item,Against Sales Order Item,बिक्री आदेश आइटम के खिलाफ
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
 DocType: Item,Default Warehouse,डिफ़ॉल्ट गोदाम
 DocType: Task,Actual End Date (via Time Logs),वास्तविक अंत की तारीख (टाइम लॉग्स के माध्यम से)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},बजट समूह खाते के खिलाफ नहीं सौंपा जा सकता {0}
@@ -3517,29 +3547,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,कार्य केंद्र के कार्य के घंटे के बाहर समय लॉग्स की योजना बनाएँ।
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} पहले से ही प्रस्तुत किया गया है
 ,Items To Be Requested,अनुरोध किया जा करने के लिए आइटम
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,पिछले खरीद दर
 DocType: Time Log,Billing Rate based on Activity Type (per hour),गतिविधि प्रकार के आधार पर बिलिंग दर (प्रति घंटा)
 DocType: Company,Company Info,कंपनी की जानकारी
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","कंपनी ईमेल आईडी नहीं मिला , इसलिए नहीं भेजा मेल"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),फंड के अनुप्रयोग ( संपत्ति)
 DocType: Production Planning Tool,Filter based on item,आइटम के आधार पर फ़िल्टर
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,डेबिट अकाउंट
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,डेबिट अकाउंट
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ दिनांक
 DocType: Attendance,Employee Name,कर्मचारी का नाम
 DocType: Sales Invoice,Rounded Total (Company Currency),गोल कुल (कंपनी मुद्रा)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"खाते का प्रकार चयन किया जाता है, क्योंकि समूह को गुप्त नहीं कर सकते।"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"खाते का प्रकार चयन किया जाता है, क्योंकि समूह को गुप्त नहीं कर सकते।"
 DocType: Purchase Common,Purchase Common,आम खरीद
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,मौके से
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी लाभ
 DocType: Sales Invoice,Is POS,स्थिति है
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
 DocType: Production Order,Manufactured Qty,निर्मित मात्रा
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकार किए जाते हैं मात्रा
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} करता नहीं मौजूद है
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,बिलों ग्राहकों के लिए उठाया.
 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 +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} ग्राहक जोड़े
 DocType: Maintenance Schedule,Schedule,अनुसूची
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","इस लागत केंद्र के लिए बजट को परिभाषित करें। बजट कार्रवाई निर्धारित करने के लिए, देखने के लिए &quot;कंपनी सूची&quot;"
@@ -3547,7 +3578,7 @@
 DocType: Quality Inspection Reading,Reading 3,3 पढ़ना
 ,Hub,हब
 DocType: GL Entry,Voucher Type,वाउचर प्रकार
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
 DocType: Expense Claim,Approved,अनुमोदित
 DocType: Pricing Rule,Price,कीमत
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',{0} को राहत मिली कर्मचारी 'वाम ' के रूप में स्थापित किया जाना चाहिए
@@ -3561,7 +3592,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,लेखा पत्रिका प्रविष्टियों.
 DocType: Delivery Note Item,Available Qty at From Warehouse,गोदाम से पर उपलब्ध मात्रा
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},पंक्ति {0}: पार्टी / खाते के साथ मैच नहीं करता है {1} / {2} में {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,एक टैक्स खाता बनाने के लिए
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,व्यय खाते में प्रवेश करें
 DocType: Account,Stock,स्टॉक
@@ -3572,7 +3603,7 @@
 DocType: Employee,Contract End Date,अनुबंध समाप्ति तिथि
 DocType: Sales Order,Track this Sales Order against any Project,किसी भी परियोजना के खिलाफ हुए इस बिक्री आदेश
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,उपरोक्त मानदंडों के आधार पर बिक्री के आदेश (वितरित करने के लिए लंबित) खींचो
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,प्रदायक से उद्धरण
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,प्रदायक से उद्धरण
 DocType: Deduction Type,Deduction Type,कटौती के प्रकार
 DocType: Attendance,Half Day,आधे दिन
 DocType: Pricing Rule,Min Qty,न्यूनतम मात्रा
@@ -3580,7 +3611,7 @@
 DocType: GL Entry,Transaction Date,लेनदेन की तारीख
 DocType: Production Plan Item,Planned Qty,नियोजित मात्रा
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,कुल कर
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,मात्रा के लिए (मात्रा निर्मित) अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,मात्रा के लिए (मात्रा निर्मित) अनिवार्य है
 DocType: Stock Entry,Default Target Warehouse,डिफ़ॉल्ट लक्ष्य वेअरहाउस
 DocType: Purchase Invoice,Net Total (Company Currency),नेट कुल (कंपनी मुद्रा)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,पंक्ति {0}: पार्टी के प्रकार और पार्टी प्राप्य / देय खाते के विरुद्ध ही लागू है
@@ -3634,9 +3665,9 @@
 DocType: Customer,Commission Rate,आयोग दर
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,संस्करण बनाओ
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,विभाग द्वारा आवेदन छोड़ मै.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,कार्ट खाली है
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,कार्ट खाली है
 DocType: Production Order,Actual Operating Cost,वास्तविक ऑपरेटिंग कॉस्ट
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,रूट संपादित नहीं किया जा सकता है .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,रूट संपादित नहीं किया जा सकता है .
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,आवंटित राशि unadusted राशि से अधिक नहीं हो सकता
 DocType: Manufacturing Settings,Allow Production on Holidays,छुट्टियों पर उत्पादन की अनुमति
 DocType: Sales Order,Customer's Purchase Order Date,ग्राहक की खरीद आदेश दिनांक
@@ -3647,11 +3678,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,डिज़ाइनर
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,नियमों और शर्तों टेम्पलेट
 DocType: Serial No,Delivery Details,वितरण विवरण
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,मात्रा इस स्तर से नीचे गिरता है तो स्वतः सामग्री अनुरोध बनाने
 ,Item-wise Purchase Register,आइटम के लिहाज से खरीद पंजीकृत करें
 DocType: Batch,Expiry Date,समाप्ति दिनांक
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनःक्रमित स्तर सेट करने के लिए, आइटम एक क्रय मद या विनिर्माण आइटम होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनःक्रमित स्तर सेट करने के लिए, आइटम एक क्रय मद या विनिर्माण आइटम होना चाहिए"
 ,Supplier Addresses and Contacts,प्रदायक पते और संपर्क
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,प्रथम श्रेणी का चयन करें
 apps/erpnext/erpnext/config/projects.py +18,Project master.,मास्टर परियोजना.
@@ -3659,7 +3690,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(आधा दिन)
 DocType: Supplier,Credit Days,क्रेडिट दिन
 DocType: Leave Type,Is Carry Forward,क्या आगे ले जाना
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,बीओएम से आइटम प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,सामग्री के बिल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},पंक्ति {0}: पार्टी के प्रकार और पार्टी प्राप्य / देय खाते के लिए आवश्यक है {1}
@@ -3667,7 +3698,7 @@
 DocType: Employee,Reason for Leaving,छोड़ने के लिए कारण
 DocType: Expense Claim Detail,Sanctioned Amount,स्वीकृत राशि
 DocType: GL Entry,Is Opening,है खोलने
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},पंक्ति {0}: डेबिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है एक {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,खाते {0} मौजूद नहीं है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},पंक्ति {0}: डेबिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है एक {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,खाते {0} मौजूद नहीं है
 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 86691a7..1b74790 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Odaberite Party Tip prvi
 DocType: Item,Customer Items,Korisnički Stavke
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Račun {0}: nadređeni račun {1} ne može biti glavna knjiga
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Račun {0}: nadređeni račun {1} ne može biti glavna knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavi stavka to hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mail obavijesti
 DocType: Item,Default Unit of Measure,Zadana mjerna jedinica
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potrebno za Cjenika {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bit će izračunata u transakciji.
 DocType: Purchase Order,Customer Contact,Kupac Kontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Od materijala zahtjev
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Od materijala zahtjev
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Posao podnositelj
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nema više rezultata.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Za održavanje kupaca mudar Šifra i kako bi ih pretraživati na temelju svog koda koristiti ovu opciju
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Pokaži varijante
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Količina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Zajmovi (pasiva)
 DocType: Employee Education,Year of Passing,Godina Prolazeći
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na lageru
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 DocType: Purchase Invoice,Monthly,Mjesečno
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Kašnjenje u plaćanju (dani)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Email adresa
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Kratica
 DocType: Appraisal Goal,Score (0-5),Ocjena (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Red {0}: {1} {2} ne odgovara {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Red {0}: {1} {2} ne odgovara {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Red # {0}:
 DocType: Delivery Note,Vehicle No,Ne vozila
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Molimo odaberite Cjenik
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Molimo odaberite Cjenik
 DocType: Production Order Operation,Work In Progress,Radovi u tijeku
 DocType: Employee,Holiday List,Turistička Popis
 DocType: Time Log,Time Log,Vrijeme Log
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista tvrtka je ušao više od jednom
 DocType: Employee,Married,Oženjen
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nije dopušteno {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 DocType: Payment Reconciliation,Reconcile,pomiriti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Provjerite banke unos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Mirovinski fondovi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Skladište je obavezno ako je Vrsta račun Skladište
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Skladište je obavezno ako je Vrsta račun Skladište
 DocType: SMS Center,All Sales Person,Svi prodavači
 DocType: Lead,Person Name,Osoba ime
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Provjerite je li se ponavlja red, isključite zaustaviti ponavljajući ili staviti ispravan datum završetka"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Zainteresiran
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Sastavnica
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvaranje
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Primjerak iz točke Group
 DocType: Journal Entry,Opening Entry,Otvaranje - ulaz
 DocType: Stock Entry,Additional Costs,Dodatni troškovi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Račun s postojećom transakcijom ne može se pretvoriti u grupu.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Račun s postojećom transakcijom ne može se pretvoriti u grupu.
 DocType: Lead,Product Enquiry,Upit
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Unesite tvrtka prva
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Odaberite tvrtka prvi
 DocType: Employee Education,Under Graduate,Pod diplomski
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target Na
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target Na
 DocType: BOM,Total Cost,Ukupan trošak
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dnevnik aktivnosti:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Proizvod {0} ne postoji u sustavu ili je istekao
@@ -165,7 +165,7 @@
 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","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 +444,Item {0} is not active or end of life has been reached,Proizvod {0} nije aktivan ili nije došao do kraja roka valjanosti
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Hoće li se obnavljaju nakon prodaje fakture je Prijavljen.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Postavke za HR modula
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Pojedinosti o operacijama koje se provode.
 DocType: Serial No,Maintenance Status,Status održavanja
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Stavke i cijene
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma trebao biti u fiskalnoj godini. Uz pretpostavku Od datuma = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma trebao biti u fiskalnoj godini. Uz pretpostavku Od datuma = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Odaberite zaposlenika za koga se stvara procjene.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Troška {0} ne pripada Tvrtka {1}
 DocType: Customer,Individual,Pojedinac
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Neto novčani tijek iz financijskih
 DocType: Lead,Address & Contact,Adresa i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorištenih lišće iz prethodnih dodjela
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Sljedeći ponavljajući {0} bit će izrađen na {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Kontakt ime
 DocType: Production Plan Item,SO Pending Qty,SO čekanju Kol
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Nema opisa
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zahtjev za kupnju.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice proizvoda
 DocType: Payment Tool,Reference No,Referentni broj
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Neodobreno odsustvo
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock pomirenje točka
 DocType: Stock Entry,Sales Invoice No,Prodajni račun br
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Item,Publish in Hub,Objavi na Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Proizvod {0} je otkazan
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Proizvod {0} je otkazan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Zahtjev za robom
 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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Odnos
 DocType: Shipping Rule,Worldwide Shipping,Dostava u svijetu
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potvrđene narudžbe kupaca.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Prijedlozi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Postavite proračun za grupu proizvoda na ovom području. Također možete uključiti sezonalnost postavljanjem distribucije.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Unesite nadređenu skupinu računa za skladište {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veća od preostali iznos {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veća od preostali iznos {2}
 DocType: Supplier,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel br.
 DocType: Maintenance Schedule,Generate Schedule,Generiranje Raspored
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Najnovije
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Maksimalno 5 znakova
 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
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Naučiti
 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
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Uredi raspodjelu prodavača.
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Više valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
 DocType: Sales Invoice Item,Delivery Note,Otpremnica
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Postavljanje Porezi
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Postavljanje Porezi
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +105,Summary for this week and pending activities,Sažetak za ovaj tjedan i tijeku aktivnosti
 DocType: Workstation,Rent Cost,Rent cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Molimo odaberite mjesec i godinu
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Dostupno u sastavnicama, otpremnicama, računu kupnje, nalogu za proizvodnju, narudžbi kupnje, primci, prodajnom računu, narudžbi kupca, ulaznog naloga i kontrolnoj kartici"
 DocType: Item Tax,Tax Rate,Porezna stopa
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Odaberite stavku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Odaberite stavku
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Stavka: {0} uspio turi, ne mogu se pomiriti pomoću \
  skladišta pomirenje, umjesto da koristite Stock unos"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Pretvori u ne-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kupnja Potvrda mora biti podnesen
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Liječnički
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog gubitka
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Radna stanica je zatvorena na sljedeće datume po Holiday Popis: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mogućnosti
 DocType: Employee,Single,Singl
 DocType: Issue,Attachment,Vezanost
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Proračun se ne može postaviti za grupe troška
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,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 +563,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 +140,Holiday master.,Majstor za odmor .
 DocType: Material Request Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Unesite kod artikal .
 DocType: BOM,Costing,Koštanje
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ako je označeno, iznos poreza će se smatrati već uključena u Print Rate / Ispis Iznos"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Ukupna količina
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Istek jamstva serijskog broja
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Proizvod {0} nije nabavni proizvod
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Proizvod {0} nije nabavni proizvod
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} je nevažeća e-mail adresu u ""Obavijest \
  e-mail adresa '"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Ukupno naplate ove godine:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi porez i pristojbe
 DocType: Purchase Invoice,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Zatvaranje (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Zatvaranje (Cr)
 DocType: Serial No,Warranty Period (Days),Jamstveni period (dani)
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 ,Pending Qty,U tijeku Kom
@@ -464,7 +467,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Mjesečna distribucija** vam pomaže u raspodjeli proračuna po mjesecima, ako imate sezonalnost u svom poslovanju. Kako bi distribuirali proračun pomoću ove distribucije, postavite **Mjesečna distribucija** u **Troškovnom centru**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nisu pronađeni zapisi u tablici računa
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +20,Please select Company and Party Type first,Odaberite Društvo i Zabava Tip prvi
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Financijska / obračunska godina.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
@@ -472,9 +475,9 @@
 DocType: Project Task,Project Task,Zadatak projekta
 ,Lead Id,Id potencijalnog kupca
 DocType: C-Form Invoice Detail,Grand Total,Ukupno za platiti
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskalna godina Start Date ne bi trebao biti veći od Fiskalna godina End Date
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskalna godina Start Date ne bi trebao biti veći od Fiskalna godina End Date
 DocType: Warranty Claim,Resolution,Rezolucija
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Isporučuje se: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Isporučuje se: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Obveze prema dobavljačima
 DocType: Sales Order,Billing and Delivery Status,Naplate i isporuke status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponoviti kupaca
@@ -489,7 +492,7 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 DocType: Purchase Order Item,Billed Amt,Naplaćeno Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logično Skladište protiv kojih su dionice unosi se.
@@ -498,7 +501,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Proizvodni nalog je obavezan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Pisanje prijedlog
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativni lager - greška ( {6} ) za proizvod {0} u skladištu {1} na {2} {3} u {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativni lager - greška ( {6} ) za proizvod {0} u skladištu {1} na {2} {3} u {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina - tvrtka
 DocType: Packing Slip Item,DN Detail,DN detalj
 DocType: Time Log,Billed,Naplaćeno
@@ -517,16 +520,17 @@
 DocType: Activity Type,Default Costing Rate,Zadana Obračun troškova stopa
 DocType: Maintenance Schedule,Maintenance Schedule,Raspored održavanja
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Cjenovna pravila filtriraju se na temelju kupca, grupe kupaca, regije, dobavljača, proizvođača, kampanje, prodajnog partnera i sl."
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Neto promjena u inventar
 DocType: Employee,Passport Number,Broj putovnice
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Upravitelj
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Od Račun kupnje
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Isti predmet je ušao više puta.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Od Račun kupnje
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Isti predmet je ušao više puta.
 DocType: SMS Settings,Receiver Parameter,Prijemnik parametra
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Temelji se na' i 'Grupiranje po' ne mogu biti isti
 DocType: Sales Person,Sales Person Targets,Prodajni plan prodavača
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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}
 DocType: Selling Settings,Customer Naming By,Imenovanje kupca prema
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Pretvori u Grupi
 DocType: Activity Cost,Activity Type,Tip aktivnosti
@@ -537,7 +541,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,objavljivanje
 DocType: Activity Cost,Projects User,Projekti za korisnike
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Konzumira
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
 DocType: Company,Round Off Cost Center,Zaokružiti troška
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 DocType: Material Request,Material Transfer,Transfer robe
@@ -559,13 +563,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Za praćenje stavke u prodaji i kupnji dokumenata na temelju njihovih serijskih br. To je također može koristiti za praćenje jamstvene podatke o proizvodu.
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutačno stanje skladišta
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Ukupno naplatu ove godine
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 DocType: Employee,Provide email id registered in company,Osigurati e id registriran u tvrtki
 DocType: Hub Settings,Seller City,Prodavač Grad
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Stavka ima varijante.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -583,18 +587,18 @@
 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 +92,{0} is not a stock Item,{0} nije skladišni proizvod
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nije skladišni proizvod
 DocType: Mode of Payment Account,Default Account,Zadani račun
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,Odaberite tjednik off dan
 DocType: Production Order Operation,Planned End Time,Planirani End Time
 ,Sales Person Target Variance Item Group-Wise,Pregled prometa po prodavaču i grupi proizvoda
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Račun s postojećom transakcijom ne može se pretvoriti u glavnu knjigu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Račun s postojećom transakcijom ne može se pretvoriti u glavnu knjigu
 DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
 DocType: Employee,Cell Number,Mobitel Broj
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto materijala Zahtjevi generiran
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,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/accounts/doctype/journal_entry/journal_entry.py +126,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/setup/setup_wizard/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mjesečna plaća izjava.
@@ -603,9 +607,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} od {1} tipa
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Računovodstvo Prijave se mogu podnijeti protiv lisnih čvorova. Prijave protiv grupe nije dopušteno.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
 DocType: Item Attribute Value,Item Attribute Value,Stavka Vrijednost atributa
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodajne kampanje.
 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.
@@ -663,7 +667,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Process Payroll,Send Email,Pošaljite e-poštu
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nemate dopuštenje
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Za filtriranje se temelji na stranke, odaberite stranka Upišite prvi"
@@ -671,7 +675,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Kom
 DocType: Item,Items with higher weightage will be shown higher,Stavke sa višim weightage će se prikazati više
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Moji Računi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Moji Računi
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nisu pronađeni zaposlenici
 DocType: Purchase Order,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podugovoren dobavljaču
@@ -681,6 +685,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošalji odmah
 ,Support Analytics,Analitike podrške
 DocType: Item,Website Warehouse,Skladište web stranice
+DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalni iznos fakture
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-obrazac zapisi
@@ -690,7 +695,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Da biste omogućili &quot;prodajno mjesto&quot; značajke
 DocType: Bin,Moving Average Rate,Stopa prosječne ponderirane cijene
 DocType: Production Planning Tool,Select Items,Odaberite proizvode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: Sales Invoice Item,Target Warehouse,Ciljana galerija
 DocType: Item,Allow over delivery or receipt upto this percent,Dopustite preko isporuka ili primitak upto ovim posto
@@ -702,7 +707,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatski napravi poruku pri podnošenju transakcije.
 DocType: Production Order,Item To Manufacture,Proizvod za proizvodnju
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Narudžbenica za plaćanje
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Narudžbenica za plaćanje
 DocType: Sales Order Item,Projected Qty,Predviđena količina
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Upravitelj
@@ -726,7 +731,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Prodajno mjesto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
 DocType: Account,Balance must be,Bilanca mora biti
 DocType: Hub Settings,Publish Pricing,Objavi Cijene
 DocType: Notification Control,Expense Claim Rejected Message,Rashodi Zahtjev odbijen poruku
@@ -749,7 +754,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Majstor valute .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} mora biti aktivna
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} mora biti aktivna
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Iznos naplaćenog odsustva
@@ -767,17 +772,17 @@
 DocType: Supplier,Default Payable Accounts,Zadane naplativo račune
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Features Setup,Item Barcode,Barkod proizvoda
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Kupnja fakture Predujam
 DocType: Address,Shop,Dućan
 DocType: Hub Settings,Sync Now,Sync Sada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Red {0}: Kredit unos ne može biti povezan s {1}
 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."
 DocType: Employee,Permanent Address Is,Stalna adresa je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacija završena za koliko gotovih proizvoda?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Dodatak za prekomjerno {0} prešao za točku {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Dodatak za prekomjerno {0} prešao za točku {1}.
 DocType: Employee,Exit Interview Details,Izlaz Intervju Detalji
 DocType: Item,Is Purchase Item,Je dobavljivi proizvod
 DocType: Journal Entry Account,Purchase Invoice,Kupnja fakture
@@ -789,7 +794,7 @@
 DocType: Salary Slip,Total in words,Ukupno je u riječima
 DocType: Material Request Item,Lead Time Date,Potencijalni kupac - datum
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,je obavezno. Možda Mjenjačnica zapis nije stvoren za
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Navedite rednim brojem predmeta za {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Navedite rednim brojem predmeta za {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Za &#39;proizvod Bundle&#39; predmeta, skladište, rednim i hrpa Ne smatrat će se iz &quot;Popis pakiranja &#39;stol. Ako Skladište i serije ne su isti za sve pakiranje predmeta za bilo &#39;proizvod Bundle&#39; točke, te vrijednosti može se unijeti u glavnoj točki stol, vrijednosti će se kopirati u &#39;pakiranje popis&#39; stol."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Isporuke kupcima.
 DocType: Purchase Invoice Item,Purchase Order Item,Narudžbenica predmet
@@ -798,14 +803,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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 +626,Select Item for Transfer,Odaberite stavke za prijenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Dopustite korisniku uređivanje cjenika u transakcijama
 DocType: Pricing Rule,Max Qty,Maksimalna količina
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Red {0}: Plaćanje protiv prodaje / narudžbenice treba uvijek biti označena kao unaprijed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,kemijski
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Svi predmeti su već prebačeni za ovu radnog naloga.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Svi predmeti su već prebačeni za ovu radnog naloga.
 DocType: Process Payroll,Select Payroll Year and Month,Odaberite Platne godina i mjesec
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Idi na odgovarajućoj skupini (obično Application fondova&gt; kratkotrajne imovine&gt; bankovne račune i stvoriti novi račun (klikom na Dodaj dijete) tipa &quot;Banka&quot;
 DocType: Workstation,Electricity Cost,Troškovi struje
@@ -819,10 +825,10 @@
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Učvrstite svoju sliku
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Napraviti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Napraviti
 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 +3,My Cart,Moja košarica
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Moja košarica
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Otvaranje Kol
@@ -841,10 +847,10 @@
 DocType: POS Profile,Cash/Bank Account,Novac / bankovni račun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Osobina stol je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} ne može biti negativna
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Popust
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Popust
 DocType: Features Setup,Purchase Discounts,Kupnja Popusti
 DocType: Workstation,Wages,Plaće
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Će se ažurirati samo ako vrijeme Log &#39;naplativo&#39;
@@ -869,7 +875,7 @@
 DocType: Tax Rule,Shipping State,Državna dostava
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodana pomoću 'se predmeti od kupnje primitaka' gumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodajni troškovi
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standardna kupnju
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standardna kupnju
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
@@ -911,6 +917,7 @@
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Dostava Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodni nalog {0} mora biti poništen prije nego se poništi ova prodajna narudžba
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Molimo postavite &quot;Primijeni dodatni popust na &#39;
 ,Ordered Items To Be Billed,Naručeni proizvodi za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od Raspon mora biti manji od u rasponu
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Odaberite vrijeme Evidencije i slanje stvoriti novi prodajni fakture.
@@ -920,13 +927,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ovo Batch Vrijeme Log je naplaćeno.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Kreiraj priliku
 DocType: Salary Slip,Leave Without Pay,Neplaćeno odsustvo
-DocType: Supplier,Communications,Mailovi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Kapacitet Greška planiranje
 ,Trial Balance for Party,Suđenje Stanje na stranku
 DocType: Lead,Consultant,Konzultant
 DocType: Salary Slip,Earnings,Zarada
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Gotovi Stavka {0} mora biti upisana za tip Proizvodnja upis
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Otvaranje Računovodstvo Stanje
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Gotovi Stavka {0} mora biti upisana za tip Proizvodnja upis
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otvaranje Računovodstvo Stanje
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ništa za zatražiti
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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
@@ -968,7 +974,7 @@
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Global Defaults,Disable Rounded Total,Ugasiti zaokruženi iznos
 DocType: Lead,Call,Poziv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Ulazi' ne može biti prazno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'Ulazi' ne može biti prazno
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Postavljanje zaposlenika
@@ -980,9 +986,9 @@
 DocType: Contact,User ID,Korisnički ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Pogledaj Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Proizvodnja protiv prodaje Reda
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -1012,7 +1018,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Niste ovlašteni za uređivanje zamrznutog računa {0}
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1025,13 +1031,13 @@
 DocType: Employee,Place of Issue,Mjesto izdavanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ugovor
 DocType: Email Digest,Add Quote,Dodaj ponudu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,Website Image should be a public file or website URL,Web slika bi trebala biti javna datoteke ili URL web stranice
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
 DocType: Journal Entry Account,Purchase Order,Narudžbenica
 DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
@@ -1040,8 +1046,8 @@
 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/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Kapitalni oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1051,7 +1057,7 @@
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekivani isporuke Datum manji od planiranog početka Datum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,za Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Postavljanje Vrsta računa pomaže u odabiru ovaj račun u prometu.
 DocType: Purchase Invoice,Grand Total (Company Currency),Sveukupno (valuta tvrtke)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Ukupno odlazni
@@ -1064,7 +1070,7 @@
 DocType: Journal Entry,Journal Entry,Temeljnica
 DocType: Workstation,Workstation Name,Ime Workstation
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pošta:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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
@@ -1096,7 +1102,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Bilteni za kontakte, potencijalne kupce."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operacije se ne može ostati prazno.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operacije se ne može ostati prazno.
 ,Delivered Items To Be Billed,Isporučeni proizvodi za naplatiti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
 DocType: Authorization Rule,Average Discount,Prosječni popust
@@ -1111,7 +1117,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operacija Opis
 DocType: Item,Will also apply to variants,Također će se primjenjivati na varijanti
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Ne možete promijeniti fiskalnu godinu datum početka i datum završetka fiskalne godine kada Fiskalna godina se sprema.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Ne možete promijeniti fiskalnu godinu datum početka i datum završetka fiskalne godine kada Fiskalna godina se sprema.
 DocType: Quotation,Shopping Cart,Košarica
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Prosječni dnevni izlaz
 DocType: Pricing Rule,Campaign,Kampanja
@@ -1122,7 +1128,8 @@
 DocType: Sales Order Item,Planned Quantity,Planirana količina
 DocType: Purchase Invoice Item,Item Tax Amount,Iznos poreza proizvoda
 DocType: Item,Maintain Stock,Upravljanje zalihama
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Stock Prijave su već stvorene za proizvodnju reda
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Maksimalno: {0}
@@ -1134,7 +1141,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontnog
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne može biti veće od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,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 Slip Deduction,Depends on Leave Without Pay,Ovisi o ostaviti bez platiti
@@ -1172,7 +1179,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,pod skupštine
 DocType: Shipping Rule Condition,To Value,Za vrijednost
 DocType: Supplier,Stock Manager,Stock Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Odreskom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Najam ureda
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Postavke SMS pristupnika
@@ -1180,10 +1187,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Adresa još nije dodana.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analitičar
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji ili jednak iznosu JV {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji ili jednak iznosu JV {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",Da biste omogućili &quot;Point of Sale&quot; pogled
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
 DocType: Item,Sales Details,Prodajni detalji
 DocType: Opportunity,With Items,S Stavke
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,u kol
@@ -1198,10 +1205,11 @@
 DocType: Cost Center,Parent Cost Center,Nadređeni troškovni centar
 DocType: Sales Invoice,Source,Izvor
 DocType: Leave Type,Is Leave Without Pay,Je Ostavite bez plaće
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nisu pronađeni zapisi u tablici plaćanja
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nisu pronađeni zapisi u tablici plaćanja
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Financijska godina - početni datum
 DocType: Employee External Work History,Total Experience,Ukupno Iskustvo
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Novčani tijek iz investicijskih
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Material Request Item,Sales Order No,Broj narudžbe kupca
 DocType: Item Group,Item Group Name,Proizvod - naziv grupe
@@ -1209,12 +1217,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Prijenos Materijali za izradu
 DocType: Pricing Rule,For Price List,Za Cjeniku
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kupnja stopa za stavke: {0} nije pronađena, koja je potrebna za rezervaciju knjiženje (trošak). Molimo spomenuti predmet cijenu od popisa za kupnju cijena."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kupnja stopa za stavke: {0} nije pronađena, koja je potrebna za rezervaciju knjiženje (trošak). Molimo spomenuti predmet cijenu od popisa za kupnju cijena."
 DocType: Maintenance Schedule,Schedules,Raspored
 DocType: Purchase Invoice Item,Net Amount,Neto Iznos
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (valuta Društvo)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Pogreška : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Pogreška : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Molimo stvoriti novi račun iz kontnog plana .
 DocType: Maintenance Visit,Maintenance Visit,Održavanje Posjetite
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kupac> Grupa kupaca> Regija
@@ -1240,7 +1248,7 @@
 DocType: Sales Partner,Sales Partner Target,Prodajni plan prodajnog partnera
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Računovodstvo Ulaz za {0} može biti samo u valuti: {1}
 DocType: Pricing Rule,Pricing Rule,Pravila cijena
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materijal Zahtjev za Narudžbenica
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materijal Zahtjev za Narudžbenica
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Red # {0}: Vraćeno Stavka {1} ne postoji u {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovni računi
 ,Bank Reconciliation Statement,Izjava banka pomirenja
@@ -1248,11 +1256,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Otvaranje kataloški bilanca
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} mora pojaviti samo jednom
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Proizvedena količina je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Proizvedena količina je obvezna
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Iznosi koji se ne ogleda u banci
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Potraživanja za tvrtke trošak.
@@ -1264,33 +1272,34 @@
 ,Material Requests for which Supplier Quotations are not created,Zahtjevi za robom za koje dobavljačeve ponude nisu stvorene
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Za praćenje stavki pomoću barkod. Vi ćete biti u mogućnosti da unesete stavke u otpremnici i prodaje Računa skeniranjem barkod stavke.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Označi kao Isporučeno
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Označi kao Isporučeno
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Napravite citat
 DocType: Dependent Task,Dependent Task,Ovisno zadatak
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Prijemnik Popis
 DocType: Payment Tool Detail,Payment Amount,Iznos za plaćanje
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Konzumira Iznos
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Pogledaj
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Pogledaj
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Neto promjena u gotovini
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plaća Struktura Odbitak
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Trošak izdanih stavki
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Količina ne smije biti veća od {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Starost (dani)
 DocType: Quotation Item,Quotation Item,Proizvod iz ponude
 DocType: Account,Account Name,Naziv računa
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serijski Ne {0} {1} količina ne može bitidio
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
 DocType: Company,Default Payable Account,Zadana Plaća račun
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% Naplaćeno
@@ -1302,15 +1311,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moji problemi
 DocType: BOM Item,BOM Item,BOM proizvod
 DocType: Appraisal,For Employee,Za zaposlenom
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Red {0}: Advance protiv Dobavljač mora teretiti
 DocType: Company,Default Values,Zadane vrijednosti
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Red {0}: Iznos uplate ne može biti negativna
 DocType: Expense Claim,Total Amount Reimbursed,Ukupno Iznos nadoknađeni
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Protiv dobavljača Račun {0} datira {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Protiv dobavljača Račun {0} datira {1}
 DocType: Customer,Default Price List,Zadani cjenik
 DocType: Payment Reconciliation,Payments,Plaćanja
 DocType: Budget Detail,Budget Allocated,Dodijeljeni proračun
 DocType: Journal Entry,Entry Type,Ulaz Tip
 ,Customer Credit Balance,Kupac saldo
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Neto promjena u obveze prema dobavljačima
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Molimo provjerite svoj e-id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kupac je potrebno za ' Customerwise Popust '
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
@@ -1331,7 +1342,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Omogućite Košarica
 DocType: Employee,Permanent Address,Stalna adresa
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Stavka {0} mora bitiusluga artikla .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Unaprijed plaćeni od {0} {1} ne može biti veća \ nego SVEUKUPNO {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Odaberite Šifra
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Smanjite odbitak za ostaviti bez plaća (lwp)
@@ -1348,18 +1359,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Jedna jedinica stavku.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',"Vrijeme Log Batch {0} mora biti "" Postavio '"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"Vrijeme Log Batch {0} mora biti "" Postavio '"
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Skladište potrebna u nizu br {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Skladište potrebna u nizu br {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Poštanski
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Postoji grupa kupaca sa istim imenom. Promijenite naziv kupca ili naziv grupe kupaca.
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Odaberite {0} na prvom mjestu.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Tekst {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Odaberite {0} na prvom mjestu.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},Tekst {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Novi Kontakt
 DocType: Territory,Parent Territory,Nadređena teritorija
 DocType: Quality Inspection Reading,Reading 2,Čitanje 2
 DocType: Stock Entry,Material Receipt,Potvrda primitka robe
@@ -1367,7 +1379,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Tip i stranka je potrebna za potraživanja / obveze prema dobavljačima račun {0}
 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 +210,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 +213,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 +85,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
@@ -1384,15 +1396,15 @@
 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: Sales Invoice Item,Batch No,Broj serije
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopusti višestruke prodajne naloge protiv kupca narudžbenice
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Glavni
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Glavni
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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: Item,Variants,Varijante
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Napravi narudžbu kupnje
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Napravi narudžbu kupnje
 DocType: SMS Center,Send To,Pošalji
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1405,7 +1417,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Skladište i reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Zakonska info i druge opće informacije o vašem Dobavljaču
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adrese
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Temeljnica {0} nema premca {1} unos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Temeljnica {0} nema premca {1} unos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,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 pravilu dostava
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Stavka ne smije imati proizvodni nalog.
@@ -1414,10 +1426,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Kreditna Iznos u valuti računa
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Vrijeme Trupci za proizvodnju.
 DocType: Item,Apply Warehouse-wise Reorder Level,Nanesite skladište mudar preuredili razine
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} mora biti podnesen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} mora biti podnesen
 DocType: Authorization Control,Authorization Control,Kontrola autorizacije
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,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/config/projects.py +23,Time Log for tasks.,Vrijeme Prijava za zadatke.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Uplata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Uplata
 DocType: Production Order Operation,Actual Time and Cost,Stvarnog vremena i troškova
 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},Zahtjev za robom od maksimalnih {0} može biti napravljen za proizvod {1} od narudžbe kupca {2}
 DocType: Employee,Salutation,Pozdrav
@@ -1434,7 +1447,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,pomoćnik
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Proizvod {0} nije serijalizirani proizvod
 DocType: SMS Center,Create Receiver List,Stvaranje Receiver popis
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Istekla
 DocType: Packing Slip,To Package No.,Za Paket br
 DocType: Warranty Claim,Issue Date,Datum izdavanja
 DocType: Activity Cost,Activity Cost,Aktivnost troškova
@@ -1472,7 +1484,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Ostvareno
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Teritorij / Kupac
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,na primjer 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji od ili jednak fakturirati preostali iznos {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji od ili jednak fakturirati preostali iznos {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,U riječi će biti vidljiv nakon što spremite prodaje fakture.
 DocType: Item,Is Sales Item,Je proizvod namijenjen prodaji
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Raspodjela grupa proizvoda
@@ -1484,7 +1496,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} stvorio
 DocType: Delivery Note Item,Against Sales Order,Protiv prodajnog naloga
 ,Serial No Status,Status serijskog broja
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Tablica ne može biti prazna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Tablica ne može biti prazna
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Red {0}: Za postavljanje {1} periodičnost, razlika između od a do danas \
  mora biti veći ili jednak {2}"
@@ -1494,7 +1506,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Carine i porezi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Unesite Referentni datum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Unesite Referentni datum
 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} unosa plaćanja ne može se filtrirati po {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tablica za proizvode koji će biti prikazani na web stranici
 DocType: Purchase Order Item Supplied,Supplied Qty,Isporučena količina
@@ -1509,7 +1521,7 @@
 DocType: Installation Note,Installation Time,Vrijeme instalacije
 DocType: Sales Invoice,Accounting Details,Računovodstvo Detalji
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Izbrišite sve transakcije za ovu Društvo
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Red # {0}: {1} Operacija nije završeno za {2} kom gotovih proizvoda u proizvodnji Naručite # {3}. Molimo ažurirati status rada preko Vrijeme Trupci
+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,Red # {0}: {1} Operacija nije završeno za {2} kom gotovih proizvoda u proizvodnji Naručite # {3}. Molimo ažurirati status rada preko Vrijeme Trupci
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investicije
 DocType: Issue,Resolution Details,Rezolucija o Brodu
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriterij prihvaćanja
@@ -1525,7 +1537,7 @@
 DocType: Holiday List,Clear Table,Jasno Tablica
 DocType: Features Setup,Brands,Brendovi
 DocType: C-Form Invoice Detail,Invoice No,Račun br
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Od narudžbenice
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Od narudžbenice
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može primijeniti / otkazan prije {0}, kao dopust ravnoteža je već ručne proslijeđena u buduće dodjele dopusta rekord {1}"
 DocType: Activity Cost,Costing Rate,Obračun troškova stopa
 ,Customer Addresses And Contacts,Kupčeve adrese i kontakti
@@ -1542,7 +1554,7 @@
 ,Maintenance Schedules,Održavanja rasporeda
 ,Quotation Trends,Trend ponuda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,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
 ,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
@@ -1559,12 +1571,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Drvo finanial račune .
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Račun {0} mora biti tipa 'Nepokretne imovine' kao što je proizvod {1} imovina proizvoda
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Račun {0} mora biti tipa 'Nepokretne imovine' kao što je proizvod {1} imovina proizvoda
 DocType: HR Settings,HR Settings,HR postavke
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Rashodi Tužba se čeka odobrenje . SamoRashodi Odobritelj može ažurirati status .
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Iznos
 DocType: Leave Block List Allow,Leave Block List Allow,Odobrenje popisa neodobrenih odsustava
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ne može biti prazno ili prostora
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr ne može biti prazno ili prostora
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Ukupno Stvarni
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,jedinica
@@ -1576,6 +1588,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Rashodi Potraživanja
 DocType: Issue,Support,Podrška
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Pregled košarice
 ,BOM Search,BOM Pretraživanje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zatvaranje (Otvaranje + iznosi)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Navedite valutu u Društvu
@@ -1587,13 +1600,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM pretvorbe je potrebno u redu {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Datum rasprodaja ne može biti prije datuma check u redu {0}
 DocType: Salary Slip,Deduction,Odbitak
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Stavka Cijena dodani za {0} u Cjeniku {1}
 DocType: Address Template,Address Template,Predložak adrese
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% Odrađeni zadaci
 DocType: Project,Gross Margin,Bruto marža
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,onemogućen korisnika
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,onemogućen korisnika
 DocType: Opportunity,Quotation,Ponuda
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 DocType: Quotation,Maintenance User,Korisnik održavanja
@@ -1602,7 +1616,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
 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
@@ -1612,12 +1626,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pratite podatke o prodajnim kampanjama. Vodite zapise o potencijalima, ponudama, narudžbama itd kako bi ste procijenili povrat ulaganje ROI."
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock unosa postoje protiv skladište {0}, stoga ne možete ponovno dodijeliti ili mijenjati skladište"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock unosa postoje protiv skladište {0}, stoga ne možete ponovno dodijeliti ili mijenjati skladište"
 DocType: Appraisal,Calculate Total Score,Izračunajte ukupni rezultat
 DocType: Supplier Quotation,Manufacturing Manager,Upravitelj proizvodnje
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Split otpremnici u paketima.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Pošiljke
+apps/erpnext/erpnext/hooks.py +69,Shipments,Pošiljke
 DocType: Purchase Order Item,To be delivered to customer,Da biste se dostaviti kupcu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Vrijeme Log Status moraju biti dostavljeni.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada bilo Skladište
@@ -1637,10 +1651,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +356,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
 DocType: Currency Exchange,From Currency,Od novca
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Odaberite Dodijeljeni iznos, Vrsta računa i broj računa u atleast jednom redu"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Odaberite Dodijeljeni iznos, Vrsta računa i broj računa u atleast jednom redu"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Iznosi koji se ne ogleda u sustav
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Ostali
@@ -1656,7 +1670,7 @@
 DocType: Quality Inspection,In Process,U procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise popust
 DocType: Purchase Order Item,Reference Document Type,Referentna Tip dokumenta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} protiv prodajni nalog {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} protiv prodajni nalog {1}
 DocType: Account,Fixed Asset,Dugotrajna imovina
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serijaliziranom Inventar
 DocType: Activity Type,Default Billing Rate,Zadana naplate stopa
@@ -1666,7 +1680,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Prodajnog naloga za plaćanje
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Vrijeme Evidencije stvorio:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Molimo odaberite ispravnu račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Molimo odaberite ispravnu račun
 DocType: Item,Weight UOM,Težina UOM
 DocType: Employee,Blood Group,Krvna grupa
 DocType: Purchase Invoice Item,Page Break,Prijelom stranice
@@ -1697,10 +1711,10 @@
 DocType: Time Log,To Time,Za vrijeme
 DocType: Authorization Rule,Approving Role (above authorized value),Odobravanje ulogu (iznad ovlaštenog vrijednosti)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Da biste dodali djece čvorova , istražiti stablo i kliknite na čvoru pod kojima želite dodati više čvorova ."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit računa mora biti naplativo račun
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Kredit računa mora biti naplativo račun
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
 DocType: Production Order Operation,Completed Qty,Završen Kol
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Cjenik {0} je onemogućen
 DocType: Manufacturing Settings,Allow Overtime,Dopusti Prekovremeni
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za Artikl {1}. Ti su dali {2}.
@@ -1708,8 +1722,9 @@
 DocType: Item,Customer Item Codes,Kupac Stavka Kodovi
 DocType: Opportunity,Lost Reason,Razlog gubitka
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Stvaranje unosa plaćanja protiv narudžbe ili fakture.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nova adresa
 DocType: Quality Inspection,Sample Size,Veličina uzorka
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Svi proizvodi su već fakturirani
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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"
 DocType: Project,External,Vanjski
@@ -1765,13 +1780,14 @@
 DocType: Rename Tool,Rename Tool,Preimenovanje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba proizvoda
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Prijenos materijala
 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 ."
 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
 DocType: Installation Note,Installation Note,Napomena instalacije
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Dodaj poreze
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Novčani tijek iz financijskih
 ,Financial Analytics,Financijska analitika
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 DocType: Address,Subsidiary,Podružnica
@@ -1781,19 +1797,19 @@
 DocType: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Očekivani Stanje na banke
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Izvor sredstava ( pasiva)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redku {0} ({1}) mora biti ista kao proizvedena količina {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redku {0} ({1}) mora biti ista kao proizvedena količina {2}
 DocType: Appraisal,Employee,Zaposlenik
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Uvoz e od
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Pozovi kao korisnik
 DocType: Features Setup,After Sale Installations,Nakon prodaje postrojenja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} je naplaćen u cijelosti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} je naplaćen u cijelosti
 DocType: Workstation Working Hour,End Time,Kraj vremena
 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 +75,Group by Voucher,Grupa po jamcu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Sales Invoice,Mass Mailing,Grupno slanje mailova
 DocType: Rename Tool,File to Rename,Datoteka za Preimenovanje
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Broj kupovne narudžbe potrebno za proizvod {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Broj kupovne narudžbe potrebno za proizvod {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Pokaži Plaćanja
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,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
@@ -1803,6 +1819,7 @@
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Kreiraj kupca
 DocType: Purchase Invoice,Credit To,Kreditne Da
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktivne ponude / kupce
 DocType: Employee Education,Post Graduate,Post diplomski
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalji rasporeda održavanja
 DocType: Quality Inspection Reading,Reading 9,Čitanje 9
@@ -1814,6 +1831,7 @@
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Tool,Payment Account,Račun za plaćanje
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Neto promjena u potraživanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
 DocType: Quality Inspection Reading,Accepted,Prihvaćeno
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.
@@ -1821,17 +1839,17 @@
 DocType: Payment Tool,Total Payment Amount,Ukupna plaćanja Iznos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Ne može se ažurirati zaliha, fakture sadrži drop shipping stavke."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kao što već postoje dionice transakcija za tu stavku, \ ne možete mijenjati vrijednosti &#39;Je rednim&#39;, &#39;Je batch Ne&#39;, &#39;Je kataloški Stavka &quot;i&quot; Vrednovanje metoda&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Brzo Temeljnica
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Brzo Temeljnica
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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: 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 +157,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 +211,{0} {1} is not submitted,{0} {1} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} nije podnesen
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
@@ -1844,7 +1862,7 @@
 DocType: Authorization Rule,Authorized Value,Ovlašteni vrijednost
 DocType: Contact,Enter department to which this Contact belongs,Unesite odjel na koji se ovaj Kontakt pripada
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Ukupno Odsutni
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Proizvod ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Proizvod ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Jedinica mjere
 DocType: Fiscal Year,Year End Date,Završni datum godine
 DocType: Task Depends On,Task Depends On,Zadatak ovisi o
@@ -1870,7 +1888,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Treća strana distributer / trgovac / trgovački zastupnik / affiliate / prodavača koji prodaje tvrtki koje proizvode za proviziju.
 DocType: Customer Group,Has Child Node,Je li čvor dijete
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} u odnosu na narudžbu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} u odnosu na narudžbu {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Unesite statičke parametre URL ovdje (npr. pošiljatelj = ERPNext, username = ERPNext, lozinkom = 1234 itd.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nije bilo aktivne fiskalne godine. Za provjeru više detalja {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
@@ -1918,7 +1936,7 @@
  10. Dodavanje ili oduzimamo: Bilo da želite dodati ili oduzeti porez."
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 DocType: Tax Rule,Billing City,Naplata Grad
 DocType: Global Defaults,Hide Currency Symbol,Sakrij simbol valute
@@ -1950,6 +1968,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,komunalna Troškovi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Iznad
 DocType: Buying Settings,Default Buying Price List,Zadani cjenik kupnje
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Niti jedan zaposlenik za prethodno izabrane kriterije ili plaća klizanja već stvorili
 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."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Vrsta plaćanja
@@ -1985,7 +2004,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Pogledajte &quot;stopa materijali na temelju troškova&quot; u odjeljak
 DocType: Appraisal Goal,Key Responsibility Area,Zona ključnih odgovornosti
 DocType: Item Reorder,Material Request Type,Tip zahtjeva za robom
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Red {0}: UOM pretvorbe faktor je obavezno
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref.
 DocType: Cost Center,Cost Center,Troška
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,bon #
@@ -2008,7 +2027,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Postavke skladišta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeća svojstva su isti u obje evidencije. Je Grupa, korijen Vrsta, Društvo"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeća svojstva su isti u obje evidencije. Je Grupa, korijen Vrsta, Društvo"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Uredi hijerarhiju grupe kupaca.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Novi naziv troškovnog centra
 DocType: Leave Control Panel,Leave Control Panel,Upravljačka ploča odsustava
@@ -2028,8 +2047,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Alat Plaćanje Detail
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} # {1} postoji protiv ulaska dionicama {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} # {1} postoji protiv ulaska dionicama {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Zajmovi i predujmovi (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Veliki
@@ -2048,7 +2067,7 @@
 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.
 DocType: Production Order Operation,Make Time Log,Napravi vrijeme prijave
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Molimo postavite naručivanja količinu
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Molimo postavite naručivanja količinu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
 DocType: Price List,Applicable for Countries,Primjenjivo za zemlje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Računala
@@ -2108,10 +2127,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Nema primjedbi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Nema primjedbi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Prezadužen
 DocType: Account,Stock Received But Not Billed,Stock primljeni Ali ne Naplaćeno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Korijen računa mora biti grupa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Korijen računa mora biti grupa
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plaće + + zaostatak Iznos Iznos Encashment - Ukupno Odbitak
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
 DocType: Features Setup,Sales and Purchase,Prodaje i kupnje
@@ -2125,6 +2144,7 @@
 DocType: Journal Entry Account,Party Balance,Bilanca stranke
 DocType: Sales Invoice Item,Time Log Batch,Vrijeme Log Hrpa
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Odaberite Primijeni popusta na
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Plaća proklizavanja Stvoren
 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: Stock Entry,Material Transfer for Manufacture,Prijenos materijala za izradu
@@ -2132,9 +2152,9 @@
 DocType: Purchase Invoice,Half-yearly,Polugodišnje
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskalna godina {0} nije pronađen.
 DocType: Bank Reconciliation,Get Relevant Entries,Kreiraj relevantne ulaze
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Knjiženje na skladištu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Knjiženje na skladištu
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Proizvod {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Proizvod {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
 DocType: Account,Root Type,korijen Tip
@@ -2143,15 +2163,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Prikaži ovaj slideshow na vrhu stranice
 DocType: BOM,Item UOM,Mjerna jedinica proizvoda
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Porezna Iznos Nakon Popust Iznos (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
 DocType: Quality Inspection,Quality Inspection,Provjera kvalitete
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Dodatni Mali
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ili BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Može napraviti samo plaćanje protiv Nenaplaćena {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Može napraviti samo plaćanje protiv Nenaplaćena {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalna zaliha Razina
 DocType: Stock Entry,Subcontract,Podugovor
@@ -2189,7 +2209,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Dolazni kvalitete inspekcije.
 DocType: Purchase Order Item,Returned Qty,Vraćeno Kom
 DocType: Employee,Exit,Izlaz
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Korijen Tip je obvezno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Korijen Tip je obvezno
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijski Ne {0} stvorio
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
 DocType: Employee,You can enter any date manually,Možete ručno unijeti bilo koji datum
@@ -2197,8 +2217,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Probni
 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 +110,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Kupac mora biti kreditna
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kupnja Prijem artikla Isporuka
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Platiti
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Platiti
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Za datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Trupci za održavanje statusa isporuke sms
@@ -2215,7 +2236,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Poredaj Razina
 DocType: Attendance,Attendance Date,Gledatelja Datum
 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 +110,Account with child nodes cannot be converted to ledger,Račun sa podređenim čvorom ne može se pretvoriti u glavnu knjigu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Račun sa podređenim čvorom ne može se pretvoriti u glavnu knjigu
 DocType: Address,Preferred Shipping Address,Željena Dostava Adresa
 DocType: Purchase Receipt Item,Accepted Warehouse,Prihvaćeno skladište
 DocType: Bank Reconciliation Detail,Posting Date,Datum objave
@@ -2233,7 +2254,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serijski Ne {0} ne postoji
 DocType: Pricing Rule,Discount Percentage,Postotak popusta
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
-apps/erpnext/erpnext/hooks.py +54,Orders,Narudžbe
+apps/erpnext/erpnext/hooks.py +55,Orders,Narudžbe
 DocType: Leave Control Panel,Employee Type,Zaposlenik Tip
 DocType: Employee Leave Approver,Leave Approver,Osoba ovlaštena za odobrenje odsustva
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materijal prenose Proizvodnja
@@ -2245,7 +2266,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% robe od ove narudžbe je naplaćeno
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Zatvaranje razdoblja Stupanje
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija
+DocType: Account,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
 DocType: Customer,Credit Limit,Kreditni limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Odaberite tip transakcije
@@ -2270,11 +2291,12 @@
 DocType: Material Request,Requested For,Traženi Za
 DocType: Quotation Item,Against Doctype,Protiv DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Prati ovu napomenu isporuke protiv bilo Projekta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Korijen račun ne može biti izbrisan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Neto novac od investicijskih
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Korijen račun ne može biti izbrisan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Pokaži ulaz robe
 ,Is Primary Address,Je Osnovna adresa
 DocType: Production Order,Work-in-Progress Warehouse,Rad u tijeku Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} od {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Upravljanje adrese
 DocType: Pricing Rule,Item Code,Šifra proizvoda
 DocType: Production Planning Tool,Create Production Orders,Napravi proizvodni nalog
@@ -2282,7 +2304,7 @@
 DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposlenikova interna radna povijest
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Zatvaranje (DR)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Zatvaranje (DR)
 DocType: Contact,Passive,Pasiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijski broj {0} nije na skladištu
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Porezni predložak za prodajne transakcije.
@@ -2298,7 +2320,7 @@
 ,Billed Amount,Naplaćeni iznos
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Nabavite ažuriranja
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Zahtjev za robom {0} je otkazan ili zaustavljen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Zahtjev za robom {0} je otkazan ili zaustavljen
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Dodaj nekoliko uzorak zapisa
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Ostavite upravljanje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa po računu
@@ -2307,14 +2329,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Glava računa pod odgovornosti , u kojoj dobit / gubitak će biti rezerviran"
 DocType: Payment Tool,Against Vouchers,Protiv bonovi
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Brza pomoć
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Prodajni dodaci
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} od troška {2} premašit će po {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
 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'
 ,Stock Projected Qty,Stanje skladišta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
 DocType: Sales Order,Customer's Purchase Order,Kupca narudžbenice
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,"Vrijednost, ili Kol"
@@ -2324,9 +2346,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Odobreni popis neodobrenih odsustava
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Koristit ćete ga za prijavu
 DocType: Sales Partner,Retailer,Prodavač na malo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit na računu mora biti bilanca račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Sve vrste dobavljača
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +46,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 +93,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
@@ -2370,7 +2392,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + ambalaža težina. (Za tisak)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
 DocType: Serial No,Is Cancelled,Je otkazan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje pošiljke
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Moje pošiljke
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Čak i ako postoji više Cijene pravila s najvišim prioritetom, onda sljedeći interni prioriteti primjenjuje se:"
 DocType: Supplier,Supplier Details,Dobavljač Detalji
@@ -2391,10 +2413,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Pozivi
 DocType: Project,Total Costing Amount (via Time Logs),Ukupno Obračun troškova Iznos (preko Vrijeme Trupci)
 DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Predviđeno
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
 DocType: Notification Control,Quotation Message,Ponuda - poruka
 DocType: Issue,Opening Date,Datum otvaranja
 DocType: Journal Entry,Remark,Primjedba
@@ -2407,9 +2429,9 @@
 DocType: Time Log,Batched for Billing,Izmiješane za naplatu
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Mjenice podigao dobavljače.
 DocType: POS Profile,Write Off Account,Napišite Off račun
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Neto novčani tijek iz operacije
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,na primjer PDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Stavka 4
 DocType: Journal Entry Account,Journal Entry Account,Temeljnica račun
@@ -2450,7 +2472,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Isporučeno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Prodajni plan prema teritoriju
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2478,10 +2500,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch broj je obvezna za točku {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To jekorijen prodavač i ne može se mijenjati .
 ,Stock Ledger,Glavna knjiga
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Ocijenite: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Ocijenite: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plaća proklizavanja Odbitak
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Odaberite grupu čvor na prvom mjestu.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Svrha mora biti jedna od {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Svrha mora biti jedna od {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Ispunite obrazac i spremite ga
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Preuzmite izvješće koje sadrži sve sirovine sa svojim najnovijim statusom inventara
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum
@@ -2519,7 +2541,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za točku {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Napomena: Ukoliko uplata nije izvršena protiv bilo referencu, provjerite Temeljnica ručno."
@@ -2536,13 +2558,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski u imenik na podnošenje transakcija.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Red {0}: Količina ne stavi na raspolaganje u skladištu {1} na {2} {3}.
  Dostupno Količina: {4}, prijenos Kol: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Stavka 3
 DocType: Purchase Order,Customer Contact Email,Kupac Kontakt e
 DocType: Sales Team,Contribution (%),Doprinos (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Predložak
 DocType: Sales Person,Sales Person Name,Ime prodajne osobe
@@ -2553,20 +2575,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Prije pomirenja
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,Zadani BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Ponovno upišite naziv tvrtke za potvrdu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Ukupni Amt
 DocType: Time Log Batch,Total Hours,Ukupno vrijeme
 DocType: Journal Entry,Printing Settings,Ispis Postavke
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilska industrija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od otpremnici
 DocType: Time Log,From Time,S vremena
 DocType: Notification Control,Custom Message,Prilagođena poruka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,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/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
 DocType: Purchase Invoice,Price List Exchange Rate,Cjenik tečajna
 DocType: Purchase Invoice Item,Rate,VPC
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,stažista
@@ -2585,9 +2607,10 @@
  dodjeljivanjem prioriteta. Cijena Pravila: {0}"
 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 +580,Issue Material,Izdavanje materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Izdavanje materijala
 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
 DocType: Hub Settings,Access Token,Pristup token
 DocType: Sales Invoice Item,Serial No,Serijski br
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Unesite prva Maintaince Detalji
@@ -2601,10 +2624,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalna Iznos dostavnice
 DocType: Purchase Invoice Item,Image View,Prikaz slike
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
@@ -2612,6 +2637,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ova točka je varijanta {0} (predložak). Značajke će biti kopirana iz predloška, osim ako je postavljen 'Ne Kopiraj'"
 DocType: Account,Purchase User,Kupnja Korisnik
 DocType: Notification Control,Customize the Notification,Prilagodi obavijest
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Novčani tijek iz redovnog poslovanja
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
 DocType: Sales Invoice,Shipping Rule,Dostava Pravilo
 DocType: Journal Entry,Print Heading,Ispis naslova
@@ -2622,7 +2648,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,sirovine
 DocType: Leave Application,Follow via Email,Slijedite putem e-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Molimo odaberite datum knjiženja prvo
@@ -2640,6 +2666,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serijski Nos potrebna za serijaliziranom točke {0}
 DocType: Journal Entry,Bank Entry,Bank Stupanje
 DocType: Authorization Rule,Applicable To (Designation),Odnosi se na (Oznaka)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Dodaj u košaricu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupa Do
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Omogućiti / onemogućiti valute .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštanski troškovi
@@ -2647,30 +2674,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Purchase Order,The date on which recurring order will be stop,Datum na koji se ponavlja kako će biti zaustaviti
 DocType: Quality Inspection,Item Serial No,Serijski broj proizvoda
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati overflow toleranciju
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati overflow toleranciju
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Ukupno Present
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Sat
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serijaliziranom Stavka {0} nije moguće ažurirati pomoću \
  Stock pomirenja"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Prebaci Materijal Dobavljaču
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Prebaci Materijal Dobavljaču
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Napravi ponudu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće o skupnom Datumi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Svi ovi proizvodi su već fakturirani
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Svi ovi proizvodi su već fakturirani
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Može biti odobren od strane {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Dostava Koje uvjete
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM nakon zamjene
 DocType: Features Setup,Point of Sale,Point of Sale
 DocType: Account,Tax,Porez
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Red {0}: {1} nije valjana {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Od Bundle proizvoda
 DocType: Production Planning Tool,Production Planning Tool,Planiranje proizvodnje alat
 DocType: Quality Inspection,Report Date,Prijavi Datum
 DocType: C-Form,Invoices,Računi
 DocType: Job Opening,Job Title,Titula
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Primatelji
 DocType: Features Setup,Item Groups in Details,Grupe proizvoda detaljno
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Početak Point-of-Sale (POS)
@@ -2678,8 +2704,9 @@
 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: Pricing Rule,Customer Group,Grupa kupaca
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: Item,Website Description,Opis web stranice
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Neto promjena u kapitalu
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
 ,Sales Register,Prodaja Registracija
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
@@ -2687,12 +2714,12 @@
 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/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Sažetak za ovaj mjesec i tijeku aktivnosti
 DocType: Customer Group,Customer Group Name,Naziv grupe kupaca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Značajke
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Kreiraj proizvode
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Unesite otpis račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Kreiraj proizvode
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Zadnje narudžbe Datum
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Provjerite trošarinske fakturu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Račun {0} ne pripada društvu {1}
@@ -2708,7 +2735,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt - mudar podaci nisu dostupni za ponudu
 DocType: Project,Expected End Date,Očekivani Datum završetka
 DocType: Appraisal Template,Appraisal Template Title,Procjena Predložak Naslov
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,trgovački
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,trgovački
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti kataloški predmeta
 DocType: Cost Center,Distribution Id,ID distribucije
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super usluge
@@ -2721,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vrijednost za Osobina {0} mora biti u rasponu od {1} {2} u koracima od {3}
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default receivable račune
@@ -2733,16 +2760,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Kupnja Primici
-DocType: Payment Reconciliation,Maximum Amount,Maksimalni iznos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kako se primjenjuje pravilo cijena?
 DocType: Quality Inspection,Delivery Note No,Otpremnica br
 DocType: Company,Retail,Maloprodaja
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Korisnik {0} ne postoji
 DocType: Attendance,Absent,Odsutan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Snop proizvoda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Red {0}: Pogrešna referentni {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Snop proizvoda
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Red {0}: Pogrešna referentni {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupnja poreze i pristojbe predloška
 DocType: Upload Attendance,Download Template,Preuzmite predložak
 DocType: GL Entry,Remarks,Primjedbe
@@ -2769,7 +2796,7 @@
 ,Monthly Attendance Sheet,Mjesečna lista posjećenosti
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nije pronađen zapis
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Mjesto troška je ovezno za stavku {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Račun {0} nije aktivan
 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
@@ -2778,8 +2805,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Račun dobiti i gubitka' tip računa {0} nije dopušten u otvorenom ulazu
 DocType: Features Setup,Sales Discounts,Prodajni popusti
 DocType: Hub Settings,Seller Country,Prodavač Država
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Objavi stavke na web stranici
 DocType: Authorization Rule,Authorization Rule,Pravilo autorizacije
 DocType: Sales Invoice,Terms and Conditions Details,Uvjeti Detalji
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,tehnički podaci
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodaja Porezi i pristojbe Predložak
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Broj narudžbe
@@ -2801,7 +2830,7 @@
 DocType: Time Log,Billing Amount,Naplata Iznos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Navedena je pogrešna količina za proizvod {0}. Količina treba biti veći od 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Prijave za odmor.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Račun s postojećom transakcijom ne može se izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Račun s postojećom transakcijom ne može se izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Pravni troškovi
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Dan u mjesecu na koji auto kako bi se ostvarila npr 05, 28 itd"
 DocType: Sales Invoice,Posting Time,Objavljivanje Vrijeme
@@ -2817,11 +2846,11 @@
 DocType: Maintenance Visit,Breakdown,Slom
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutom: {1} ne može se odabrati
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: nadređeni račun {1} ne pripada tvrtki: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: nadređeni račun {1} ne pripada tvrtki: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Uspješno izbrisati sve transakcije vezane uz ovu tvrtku!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kao i na datum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probni rad
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto umetak Cjenik stopa ako nedostaje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Ukupno uplaćeni iznos
@@ -2833,6 +2862,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Ukupno naplate Iznos (preko Vrijeme Trupci)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Prodajemo ovaj proizvod
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id Dobavljač
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Količina bi trebala biti veća od 0
 DocType: Journal Entry,Cash Entry,Novac Stupanje
 DocType: Sales Partner,Contact Desc,Kontakt ukratko
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Tip lišća poput casual, bolovanja i sl."
@@ -2841,7 +2871,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Dodaj redak za izračun godišnjeg proračuna.
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
 DocType: Production Order,Total Operating Cost,Ukupni trošak
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Napomena : Proizvod {0} je upisan više puta
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Napomena : Proizvod {0} je upisan više puta
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Svi kontakti.
 DocType: Newsletter,Test Email Id,Test E-mail ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Kratica Društvo
@@ -2866,7 +2896,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Porez Predložak je obavezno.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Račun {0}: nadređeni račun {1} ne postoji
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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),Cjenik stopa (Društvo valuta)
 DocType: Account,Temporary,Privremen
 DocType: Address,Preferred Billing Address,Željena adresa za naplatu
@@ -2884,8 +2914,8 @@
 ,Item-wise Price List Rate,Item-wise cjenik
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zaustavljen
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} je zaustavljen
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
 DocType: Lead,Add to calendar on this date,Dodaj u kalendar na ovaj datum
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravila za dodavanje troškova prijevoza.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Nadolazeći događaji
@@ -2906,24 +2936,24 @@
 DocType: Customer,From Lead,Od Olovo
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
 DocType: Hub Settings,Name Token,Naziv tokena
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standardna prodaja
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Replace Tool,Replace,Zamijeniti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} u odnosu na prodajnom računu {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} u odnosu na prodajnom računu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
 DocType: Purchase Invoice Item,Project Name,Naziv projekta
 DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
 DocType: Features Setup,Item Batch Nos,Broj serije proizvoda
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Vrijednost razlika
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Ljudski Resursi
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,porezna imovina
 DocType: BOM Item,BOM No,BOM br.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Prosječna ponderirana cijena
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM koji će biti zamijenjen
 DocType: Account,Debit,Zaduženje
@@ -2960,7 +2990,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Financijska godina - zadnji datum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Napravi ponudu dobavljaču
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Napravi ponudu dobavljaču
 DocType: Quality Inspection,Incoming,Dolazni
 DocType: BOM,Materials Required (Exploded),Potrebna roba
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Smanjenje plaća za ostaviti bez plaće (lwp)
@@ -2968,7 +2998,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Red # {0}: Serijski br {1} ne odgovara {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual dopust
 DocType: Batch,Batch ID,ID serije
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Napomena: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Napomena: {0}
 ,Delivery Note Trends,Trend otpremnica
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ovaj tjedan Sažetak
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora bitikupljen ili pod-ugovori stavka u nizu {1}
@@ -2983,6 +3013,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,AVG. Kupnja stopa
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Ukupna Pitanje / Prijenos količine {0} u materijalu Zahtjev {1} ne može biti veća od tražene količine {2} za točku {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletteri
 DocType: Address,Shipping,Utovar
 DocType: Stock Ledger Entry,Stock Ledger Entry,Upis u glavnu knjigu
@@ -3002,7 +3033,6 @@
 DocType: Purchase Order,End date of current order's period,Datum završetka razdoblja tekuće narudžbe
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Ponudu Pismo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Povratak
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Zadana mjerna jedinica za inačicom mora biti ista kao predložak
 DocType: Production Order Operation,Production Order Operation,Proizvodni nalog Rad
 DocType: Pricing Rule,Disable,Ugasiti
 DocType: Project Task,Pending Review,U tijeku pregled
@@ -3010,7 +3040,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Korisnički ID
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Za vrijeme mora biti veći od od vremena
 DocType: Journal Entry Account,Exchange Rate,Tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladište {0}: Nadređeni račun {1} ne pripada tvrtki {2}
 DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
 DocType: Account,Asset,Asset
@@ -3030,7 +3060,7 @@
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Upravljanje kvalitetom
 DocType: Production Planning Tool,Filter based on customer,Filtriranje prema kupcima
 DocType: Payment Tool Detail,Against Voucher No,Protiv Voucher br
@@ -3047,6 +3077,7 @@
 DocType: Opportunity,Next Contact,Sljedeći Kontakt
 DocType: Employee,Employment Type,Zapošljavanje Tip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dugotrajne imovine
+,Cash Flow,Protok novca
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Razdoblje zahtjev ne može biti preko dva alocation zapisa
 DocType: Item Group,Default Expense Account,Zadani račun rashoda
 DocType: Employee,Notice (days),Obavijest (dani)
@@ -3078,13 +3109,12 @@
 DocType: Production Order,Warehouses,Skladišta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Ispis i stacionarnih
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
-DocType: Payment Reconciliation,Minimum Amount,Minimalni iznos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Update gotovih proizvoda
 DocType: Workstation,per hour,na sat
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Račun za skladište ( neprestani inventar) stvorit će se na temelju ovog računa .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Skladište se ne može izbrisati dok postoje upisi u glavnu knjigu za ovo skladište.
 DocType: Company,Distribution,Distribucija
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Plaćeni iznos
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Plaćeni iznos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksimalni dopušteni popust za proizvod: {0} je {1}%
@@ -3108,7 +3138,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitike podrške
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Tvrtka je nestalo u skladištima {0}
 DocType: POS Profile,Terms and Conditions,Odredbe i uvjeti
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Za datum mora biti unutar fiskalne godine. Pod pretpostavkom da bi datum = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Za datum mora biti unutar fiskalne godine. Pod pretpostavkom da bi datum = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ovdje možete održavati visina, težina, alergije, medicinske brige itd."
 DocType: Leave Block List,Applies to Company,Odnosi se na Društvo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Ne može se otkazati, jer skladišni ulaz {0} postoji"
@@ -3122,11 +3152,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Unesite Kupnja primici
 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 +425,Transaction not allowed against stopped Production Order {0},Transakcija nije dopuštena protiv zaustavljena proizvodnja Reda {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Postavke dolaznog servera za e-mail podrške (npr. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatak Kom
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Do datuma ' je potrebno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Izradi pakiranje gaćice za pakete biti isporučena. Koristi se za obavijesti paket broj, sadržaj paketa i njegovu težinu."
@@ -3215,7 +3245,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Evidencija zaposlenih.
 DocType: HR Settings,Payroll Settings,Postavke plaće
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Naručiti
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Naručiti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Korijen ne mogu imati središte troškova roditelj
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Odaberite brand ...
 DocType: Sales Invoice,C-Form Applicable,Primjenjivi C-obrazac
@@ -3230,7 +3260,7 @@
 DocType: Appraisal,Start Date,Datum početka
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Dodijeliti lišće za razdoblje .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Kliknite ovdje da biste potvrdili
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Račun {0}: Ne možeš ga dodijeliti kao nadređeni račun
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Račun {0}: Ne možeš ga dodijeliti kao nadređeni račun
 DocType: Purchase Invoice Item,Price List Rate,Cjenik Stopa
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Pokaži ""raspoloživo"" ili ""nije raspoloživo"" na temelju trentnog stanja na skladištu."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Sastavnice (BOM)
@@ -3239,17 +3269,17 @@
 DocType: Project,Expected Start Date,Očekivani datum početka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Uklanjanje stavke ako troškovi se ne odnosi na tu stavku
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr.. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Primite
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Primite
 DocType: Maintenance Visit,Fully Completed,Potpuno Završeni
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Cijela
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} je uspješno dodana na popis Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Ne može se proglasiti izgubljenim, jer je ponuda napravljena."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kupnja Master Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +136,Main Reports,Glavno izvješće
 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
@@ -3267,7 +3297,7 @@
 DocType: Industry Type,Industry Type,Industrija Tip
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Nešto je pošlo po krivu!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Završetak Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Iznos (valuta tvrtke)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
@@ -3286,10 +3316,10 @@
 ,Serial No Service Contract Expiry,Istek ugovora za serijski broj usluge
 DocType: Item,Unit of Measure Conversion,Mjerna jedinica pretvorbe
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaposlenik ne može se mijenjati
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ne možete istovremeno kreditirati i debitirati isti račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Ne možete istovremeno kreditirati i debitirati isti račun
 DocType: Naming Series,Help HTML,HTML pomoć
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
 DocType: Address,Name of person or organization that this address belongs to.,Ime osobe ili organizacije kojoj ova adresa pripada.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Vaši dobavljači
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
@@ -3302,35 +3332,35 @@
 DocType: Employee,Date of Issue,Datum izdavanja
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} od {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Red # {0}: Postavite dobavljač za stavke {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite više valuta mogućnost dopustiti račune s druge valute
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite više valuta mogućnost dopustiti račune s druge valute
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Stavka: {0} ne postoji u sustavu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje zamrznute vrijednosti
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje zamrznute vrijednosti
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
+DocType: Payment Reconciliation,From Invoice Date,Iz dostavnice Datum
 DocType: Cost Center,Budgets,Proračuni
-DocType: Employee,Emergency Contact Details,Kontaktni podaci hitne službe
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Što učiniti ?
 DocType: Delivery Note,To Warehouse,Za skladište
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Račun {0} je unešen više od jednom za fiskalnu godinu {1}
 ,Average Commission Rate,Prosječna provizija
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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/hr/doctype/attendance/attendance.py +34,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ć
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje računa
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Ažuriranje dodatne troškove za izračun sletio trošak stavke
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Električna
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost razlika (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Red {0}: tečaj je obavezno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Red {0}: tečaj je obavezno
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Korisnik ID nije postavljen za zaposlenika {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od jamstvenog zahtjeva
 DocType: Stock Entry,Default Source Warehouse,Zadano izvorno skladište
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dana od posljednje narudžbe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
@@ -3343,7 +3373,7 @@
 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
 DocType: Authorization Rule,Based On,Na temelju
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Stavka {0} je onemogućen
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Stavka {0} je onemogućen
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Razdoblje od razdoblja do datuma obvezna za ponavljajućih {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt aktivnost / zadatak.
@@ -3351,7 +3381,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Kupnja treba 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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis iznos (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Nalog zavisnog troška
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Molimo postavite {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan u mjesecu
@@ -3381,12 +3411,12 @@
 DocType: Upload Attendance,Upload Attendance,Upload Attendance
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina potrebne su
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Raspon 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Iznos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Iznos
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM zamijenjeno
 ,Sales Analytics,Prodajna analitika
 DocType: Manufacturing Settings,Manufacturing Settings,Postavke proizvodnje
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Postavljanje e-poštu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Unesite zadanu valutu u tvrtki Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Dnevne Podsjetnici
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Porezni Pravilo Sukobi s {0}
@@ -3412,13 +3442,13 @@
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,inženjer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Traži Sub skupštine
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Kod proizvoda je potreban u redu broj {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Kod proizvoda je potreban u redu broj {0}
 DocType: Sales Partner,Partner Type,Tip partnera
 DocType: Purchase Taxes and Charges,Actual,Stvaran
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 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 +263,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
 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
@@ -3430,15 +3460,15 @@
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
 DocType: Employee,Cheque,Ček
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija ažurirana
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Vrsta izvješća je obvezno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Vrsta izvješća je obvezno
 DocType: Item,Serial Number Series,Serijski broj serije
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,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/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/public/js/setup_wizard.js +101,The First User: You,Prvo Korisnik : Vi
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Uspješno Pomirio
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Uspješno Pomirio
 DocType: Production Order,Planned End Date,Planirani datum završetka
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Gdje predmeti su pohranjeni.
 DocType: Tax Rule,Validity,Valjanost
@@ -3446,7 +3476,7 @@
 DocType: Attendance,Attendance,Pohađanje
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Porezna Predložak za kupnju transakcije .
 ,Item Prices,Cijene proizvoda
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,U riječi će biti vidljiv nakon što spremite narudžbenice.
@@ -3455,15 +3485,15 @@
 DocType: Task,Review Date,Recenzija Datum
 DocType: Purchase Invoice,Advance Payments,Avansima
 DocType: Purchase Taxes and Charges,On Net Total,VPC
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target skladište u redu {0} mora biti ista kao Production Order
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nemate dopuštenje za korištenje platnih alata
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Obavijest E-mail adrese' nije navedena za ponavljajuće %s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Zaokružiti račun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni troškovi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,savjetodavni
 DocType: Customer Group,Parent Customer Group,Nadređena grupa kupaca
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Promjena
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Promjena
 DocType: Purchase Invoice,Contact Email,Kontakt email
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
@@ -3473,13 +3503,13 @@
 DocType: Packing Slip,Gross Weight UOM,Bruto težina UOM
 DocType: Email Digest,Receivables / Payables,Potraživanja / obveze
 DocType: Delivery Note Item,Against Sales Invoice,Protiv prodaje fakture
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Kreditni račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Stavka zavisnih troškova
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Pokaži nulte vrijednosti
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina proizvoda dobivena nakon proizvodnje / pakiranja od navedene količine sirovina
 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 +562,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 DocType: Task,Actual End Date (via Time Logs),Stvarni datum završetka (preko Vrijeme Trupci)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Proračun se ne može dodijeliti protiv grupe nalog {0}
@@ -3515,29 +3545,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planirajte vrijeme za rezanje izvan radne stanice radnog vremena.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} je već poslan
 ,Items To Be Requested,Potraživani proizvodi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Naplate stopa temelji se na vrsti aktivnosti (po satu)
 DocType: Company,Company Info,Podaci o tvrtki
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Tvrtka E-mail ID nije pronađen , pa se ne mail poslan"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 DocType: Production Planning Tool,Filter based on item,Filtriranje prema proizvodima
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Duguje račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Duguje račun
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
 DocType: Attendance,Employee Name,Ime zaposlenika
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaobljeni Ukupno (Društvo valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,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/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,Ne može se tajno u grupu jer je izabrana vrsta računa.
 DocType: Purchase Common,Purchase Common,Kupnja Zajednička
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} je izmijenjen. Osvježi stranicu.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Prestani korisnike od izrade ostaviti aplikacija na sljedećim danima.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,od Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} Ne radi postoji
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Mjenice podignuta na kupce.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,Dodao {0} pretplatnika
 DocType: Maintenance Schedule,Schedule,Raspored
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Odredite proračun za ovu troška. Za postavljanje proračuna akcije, pogledajte &quot;Lista poduzeća&quot;"
@@ -3545,7 +3576,7 @@
 DocType: Quality Inspection Reading,Reading 3,Čitanje 3
 ,Hub,Središte
 DocType: GL Entry,Voucher Type,Bon Tip
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cjenik nije pronađena ili onemogućena
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Cjenik nije pronađena ili onemogućena
 DocType: Expense Claim,Approved,Odobren
 DocType: Pricing Rule,Price,Cijena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
@@ -3559,7 +3590,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Knjigovodstvene temeljnice
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina u iz skladišta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: stranka / računa ne odgovara {1} / {2} u {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: stranka / računa ne odgovara {1} / {2} u {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Za stvaranje porezno
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Lager
@@ -3570,7 +3601,7 @@
 DocType: Employee,Contract End Date,Ugovor Datum završetka
 DocType: Sales Order,Track this Sales Order against any Project,Prati ovu prodajni nalog protiv bilo Projekta
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Povucite prodajne naloge (na čekanju za isporuku) na temelju navedenih kriterija
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Od dobavljača kotaciju
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Od dobavljača kotaciju
 DocType: Deduction Type,Deduction Type,Tip odbitka
 DocType: Attendance,Half Day,Pola dana
 DocType: Pricing Rule,Min Qty,Min kol
@@ -3578,7 +3609,7 @@
 DocType: GL Entry,Transaction Date,Transakcija Datum
 DocType: Production Plan Item,Planned Qty,Planirani Kol
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Ukupno porez
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Kol) je obavezno
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Kol) je obavezno
 DocType: Stock Entry,Default Target Warehouse,Centralno skladište
 DocType: Purchase Invoice,Net Total (Company Currency),Ukupno neto (valuta tvrtke)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Stranka Tip i stranka je primjenjiv samo protiv potraživanja / obveze prema dobavljačima račun
@@ -3632,9 +3663,9 @@
 DocType: Customer,Commission Rate,Komisija Stopa
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Napravite varijanta
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Košarica je prazna
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košarica je prazna
 DocType: Production Order,Actual Operating Cost,Stvarni operativni trošak
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Korijen ne može se mijenjati .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Korijen ne može se mijenjati .
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Dodijeljeni iznos ne može veći od iznosa unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Dopustite proizvodnje na odmor
 DocType: Sales Order,Customer's Purchase Order Date,Kupca narudžbenice Datum
@@ -3645,11 +3676,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Uvjeti i odredbe - šprance
 DocType: Serial No,Delivery Details,Detalji isporuke
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatsko stvaranje materijala zahtjev ako količina padne ispod te razine
 ,Item-wise Purchase Register,Stavka-mudar Kupnja Registracija
 DocType: Batch,Expiry Date,Datum isteka
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Za postavljanje razine naručivanja točka mora biti Kupnja predmeta ili proizvodnja predmeta
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Za postavljanje razine naručivanja točka mora biti Kupnja predmeta ili proizvodnja predmeta
 ,Supplier Addresses and Contacts,Supplier Adrese i kontakti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Molimo odaberite kategoriju prvi
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt majstor.
@@ -3657,7 +3688,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Stranka Tip i stranka je potrebno za potraživanja / obveze prema dobavljačima račun {1}
@@ -3665,7 +3696,7 @@
 DocType: Employee,Reason for Leaving,Razlog za odlazak
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: GL Entry,Is Opening,Je Otvaranje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Red {0}: debitne unos ne može biti povezan s {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Račun {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Red {0}: debitne unos ne može biti povezan s {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Račun {0} ne postoji
 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 51282e6..68d58cd 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Kérjük, válasszon párt Type első"
 DocType: Item,Customer Items,Vásárlói elemek
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Account {0}: Parent véve {1} nem lehet a főkönyvi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Account {0}: Parent véve {1} nem lehet a főkönyvi
 DocType: Item,Publish Item to hub.erpnext.com,Közzé tétel hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Email értesítések
 DocType: Item,Default Unit of Measure,Alapértelmezett mértékegység
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Árfolyam szükséges árlista {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* A tranzakcióban lesz kiszámolva.
 DocType: Purchase Order,Customer Contact,Ügyfélkapcsolati
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Az anyagi kérése
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Az anyagi kérése
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Fa
 DocType: Job Applicant,Job Applicant,Állásra pályázó
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nincs több eredményt.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Ahhoz, hogy a megrendelő bölcs cikk-kód és kereshetővé tételéhez alapján kód Ezzel az opcióval"
 DocType: Mode of Payment Account,Mode of Payment Account,Mód Fizetési számla
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mutasd változatok
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Mennyiség
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Mennyiség
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Hitelekkel (kötelezettségek)
 DocType: Employee Education,Year of Passing,Év Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Raktáron
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Egészségügyi ellátás
 DocType: Purchase Invoice,Monthly,Havi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Fizetési késedelem (nap)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Számla
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Számla
 DocType: Maintenance Schedule Item,Periodicity,Időszakosság
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Email cím
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,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
 DocType: Company,Abbr,Röv.
 DocType: Appraisal Goal,Score (0-5),Pontszám (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nem egyezik a {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nem egyezik a {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Jármű No
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Kérjük, válasszon árjegyzéke"
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,"Kérjük, válasszon árjegyzéke"
 DocType: Production Order Operation,Work In Progress,Dolgozunk rajta
 DocType: Employee,Holiday List,Szabadnapok listája
 DocType: Time Log,Time Log,Időnapló
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ugyanez a vállalat szerepel többször
 DocType: Employee,Married,Házas
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nem engedélyezett {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Stock nem lehet frissíteni ellen szállítólevél {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Stock nem lehet frissíteni ellen szállítólevél {0}
 DocType: Payment Reconciliation,Reconcile,Összeegyeztetni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Élelmiszerbolt
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Tedd Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Nyugdíjpénztárak
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Warehouse kötelező, ha figyelembe típus Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,"Warehouse kötelező, ha figyelembe típus Warehouse"
 DocType: SMS Center,All Sales Person,Minden értékesítő
 DocType: Lead,Person Name,Személy Név
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Ellenőrizze, hogy a visszatérő érdekében, törölje megállítani visszatérő vagy tegye megfelelő End Date"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Érdekelt
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Anyagjegyzék
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Nyílás
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Re {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Re {0} {1}
 DocType: Item,Copy From Item Group,Másolás jogcím-csoport
 DocType: Journal Entry,Opening Entry,Kezdő tétel
 DocType: Stock Entry,Additional Costs,További költségek
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Véve a meglévő ügylet nem konvertálható csoportot.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Véve a meglévő ügylet nem konvertálható csoportot.
 DocType: Lead,Product Enquiry,Termék Érdeklődés
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Kérjük, adja cég első"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Kérjük, válasszon Társaság első"
 DocType: Employee Education,Under Graduate,Under Graduate
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Cél On
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Cél On
 DocType: BOM,Total Cost,Összköltség
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Tevékenység lista
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,"Elem {0} nem létezik a rendszerben, vagy lejárt"
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Elem {0} kell a vásárlást tétel
 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 megfelelő adatokat és csatolja a módosított fájlt. Minden időpontot és a munkavállalói kombináció a kiválasztott időszakban jön a sablon, a meglévő jelenléti ívek"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,"Elem {0} nem aktív, vagy az elhasználódott elérte"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,"Elem {0} nem aktív, vagy az elhasználódott elérte"
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Után felülvizsgálják Sales számla benyújtásának.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hogy tartalmazzák az adót a sorban {0} tétel mértéke, az adók sorokban {1} is fel kell venni"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Beállításait HR modul
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Részletek az elvégzett műveleteket.
 DocType: Serial No,Maintenance Status,Karbantartás állapota
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Tételek és árak
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Dátum belül kell pénzügyi évben. Feltételezve A Date = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Dátum belül kell pénzügyi évben. Feltételezve A Date = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Válassza ki a munkavállaló, akit alkotsz az értékelésre."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Költséghely {0} nem tartozik Company {1}
 DocType: Customer,Individual,Magánszemély
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,"Kérjük, adja Társaság"
 DocType: Delivery Note Item,Against Sales Invoice Item,Ellen Értékesítési számlák Elem
 ,Production Orders in Progress,Folyamatban lévő gyártási rendelések
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Nettó származó pénzeszközök
 DocType: Lead,Address & Contact,Cím és Kapcsolattartó
 DocType: Leave Allocation,Add unused leaves from previous allocations,Add fel nem használt leveleket a korábbi juttatások
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Next Ismétlődő {0} jön létre {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Kapcsolattartó neve
 DocType: Production Plan Item,SO Pending Qty,SO Folyamatban Mennyiség
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Bérlap létrehozása a fenti kritériumok alapján.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Nem megadott leírás
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Kérheti a vásárlást.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Csak a kijelölt Leave Jóváhagyó nyújthatják be ez a szabadság Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,"Tehermentesítő dátuma nagyobbnak kell lennie, mint Csatlakozás dátuma"
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Az anyag weboldala
 DocType: Payment Tool,Reference No,Hivatkozási szám
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Hagyja Blokkolt
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Elem {0} elérte az élettartama végét {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},Elem {0} elérte az élettartama végét {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Éves
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Megbékélés Elem
 DocType: Stock Entry,Sales Invoice No,Értékesítési számlák No
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Beszállító típusa
 DocType: Item,Publish in Hub,Közzéteszi Hub
 ,Terretory,Terület
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,{0} elem törölve
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,{0} elem törölve
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Anyagigénylés
 DocType: Bank Reconciliation,Update Clearance Date,Frissítés Végső dátum
 DocType: Item,Purchase Details,Vásárlási adatok
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Elem {0} nem található &quot;szállított alapanyagok&quot; táblázat Megrendelés {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Elem {0} nem található &quot;szállított alapanyagok&quot; táblázat Megrendelés {1}
 DocType: Employee,Relation,Kapcsolat
 DocType: Shipping Rule,Worldwide Shipping,Világszerte Szállítási
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Visszaigazolt megrendelések ügyfelektől.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Javaslatok
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set tétel Group-bölcs költségvetés azon a területen. Akkor is a szezonalitás beállításával Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Kérjük, adja szülő fiókcsoportot raktári {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Fizetési ellen {0} {1} nem lehet nagyobb, mint kint levő összeg {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Fizetési ellen {0} {1} nem lehet nagyobb, mint kint levő összeg {2}"
 DocType: Supplier,Address HTML,HTML Cím
 DocType: Lead,Mobile No.,Mobiltelefon
 DocType: Maintenance Schedule,Generate Schedule,Ütemezés generálása
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Legutolsó
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max. 5 karakter
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Az első Leave Jóváhagyó a lista lesz-e az alapértelmezett Leave Jóváhagyó
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Tanul
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activity Egy alkalmazottra jutó
 DocType: Accounts Settings,Settings for Accounts,Beállításait Accounts
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Kezelje Sales Person fa.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Több pénznem
 DocType: Payment Reconciliation Invoice,Invoice Type,Számla típusa
 DocType: Sales Invoice Item,Delivery Note,Szállítólevél
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Beállítása Adók
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Beállítása Adók
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Fizetési Entry módosításra került, miután húzta. Kérjük, húzza meg újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} belépett kétszer tétel adó
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} belépett kétszer tétel adó
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Összefoglaló erre a hétre és a folyamatban lévő tevékenységek
 DocType: Workstation,Rent Cost,Bérleti díj
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Kérjük, válasszon hónapot és évet"
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Elérhető a BOM, szállítólevél, beszerzési számla, gyártási utasítás, megrendelés, vásárlási nyugta, Értékesítési számlák, Vevői rendelés, Stock Entry, Időnyilvántartó"
 DocType: Item Tax,Tax Rate,Adókulcs
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} már elkülönített Employee {1} időszakra {2} {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Elem kiválasztása
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Elem kiválasztása
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Cikk: {0} sikerült szakaszos, nem lehet összeegyeztetni a \ Stock Megbékélés helyett használja Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Vásárlást igazoló számlát {0} már benyújtott
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Vásárlást igazoló számlát {0} már benyújtott
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Sor # {0}: Batch Nem kell egyeznie {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Átalakítás nem Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Vásárlási nyugta kell benyújtani
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Orvosi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Veszteség indoka
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Munkaállomás zárva a következő időpontokban per Nyaralás listája: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Lehetőségek
 DocType: Employee,Single,Egyedülálló
 DocType: Issue,Attachment,Attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Költségvetést nem lehet beállítani Group Cost Center
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globális beállítások minden egyes gyártási folyamat.
 DocType: Accounts Settings,Accounts Frozen Upto,A számlák be vannak fagyasztva eddig
 DocType: SMS Log,Sent On,Elküldve
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,Attribute {0} selected multiple times in Attributes Table,Képesség {0} kiválasztott többször attribútumok táblázat
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,Attribute {0} selected multiple times in Attributes Table,Képesség {0} kiválasztott többször attribútumok táblázat
 DocType: HR Settings,Employee record is created using selected field. ,Munkavállalói rekord jön létre a kiválasztott mező.
 DocType: Sales Order,Not Applicable,Nem értelmezhető
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Nyaralás mester.
 DocType: Material Request Item,Required Date,Szükséges dátuma
 DocType: Delivery Note,Billing Address,Számlázási cím
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Kérjük, adja tételkód."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Kérjük, adja tételkód."
 DocType: BOM,Costing,Költség
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ha be van jelölve, az adó összegét kell tekinteni, mint amelyek már szerepelnek a Print Ár / Print Összeg"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Összesen Mennyiség
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja Warehouse, amelyek anyaga kérés jelenik meg"
 DocType: Production Order,Additional Operating Cost,További üzemeltetési költség
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikum
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"To merge, following properties must be same for both items","Egyesíteni, a következő tulajdonságokkal kell, hogy egyezzen mindkét tételek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","Egyesíteni, a következő tulajdonságokkal kell, hogy egyezzen mindkét tételek"
 DocType: Shipping Rule,Net Weight,Nettó súly
 DocType: Employee,Emergency Phone,Sürgősségi telefon
 ,Serial No Warranty Expiry,Sorozatszám garanciaidő lejárta
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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,Törlés vállalkozásnak adott
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Elem {0} nem Purchase Elem
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Elem {0} nem Purchase Elem
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} nem érvényes email címet 'Notification \ Email Address """
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Ebben az évben számlázva:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adók és költségek hozzáadása / szerkesztése
 DocType: Purchase Invoice,Supplier Invoice No,Beszállítói számla száma
 DocType: Territory,For reference,Referenciaként
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nem lehet törölni a sorozatszám {0}, mivel ezt használja a részvény tranzakciók"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Zárás (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Zárás (Cr)
 DocType: Serial No,Warranty Period (Days),Garancia idő (nap)
 DocType: Installation Note Item,Installation Note Item,Telepítési feljegyzés Elem
 ,Pending Qty,Folyamatban db
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** A havi elosztási ** segít terjeszteni a költségvetési egész hónapban, ha a szezonalitás a te dolgod. Terjeszteni a költségvetési ezzel a forgalmazás, állítsa ezt ** havi megoszlása ** a ** Cost Center **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nincs bejegyzés találat a számlatáblázat
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nincs bejegyzés találat a számlatáblázat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Kérjük, válasszon Társaság és a Party Type első"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Pénzügyi / számviteli év.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sajnáljuk, Serial Nos nem lehet összevonni,"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,Projekt feladat
 ,Lead Id,Célpont ID
 DocType: C-Form Invoice Detail,Grand Total,Mindösszesen
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,"Pénzügyi év kezdő dátuma nem lehet nagyobb, mint a pénzügyi év vége dátum"
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,"Pénzügyi év kezdő dátuma nem lehet nagyobb, mint a pénzügyi év vége dátum"
 DocType: Warranty Claim,Resolution,Megoldás
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Szállított: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Szállított: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Fizetendő számla
 DocType: Sales Order,Billing and Delivery Status,Számlázási és Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Törzsvásárlóid
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,Árajánlat az ő részére
 DocType: Lead,Middle Income,Közepes jövedelmű
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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ége pont {0} nem lehet megváltoztatni közvetlenül, mert már tett néhány tranzakció (k) másik UOM. Szükséged lesz egy új tétel, hogy egy másik Alapértelmezett UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +711,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ége pont {0} nem lehet megváltoztatni közvetlenül, mert már tett néhány tranzakció (k) másik UOM. Szükséged lesz egy új tétel, hogy egy másik Alapértelmezett UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
 DocType: Purchase Order Item,Billed Amt,Számlázott össz.
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logikai Warehouse amely ellen állomány bejegyzések történnek.
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Termelési rend Kötelező
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Pályázatírás
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Egy másik Sales Person {0} létezik az azonos dolgozói azonosító
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatív Stock Error ({6}) jogcím {0} Warehouse {1} a {2} {3} {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatív Stock Error ({6}) jogcím {0} Warehouse {1} a {2} {3} {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Pénzügyi év társaság
 DocType: Packing Slip Item,DN Detail,DN részlete
 DocType: Time Log,Billed,Kiszámlázzák
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,Alapértelmezett Költség Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Karbantartási ütemterv
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Aztán árképzési szabályok szűrik ki alapul vevő, Customer Group, Territory, Szállító, Szállító Type, kampány, értékesítési partner stb"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Nettó készletváltozás
 DocType: Employee,Passport Number,Útlevél száma
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Menedzser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,A vásárlástól átvétele
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Ugyanazt a tételt már többször jelenik meg.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,A vásárlástól átvétele
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Ugyanazt a tételt már többször jelenik meg.
 DocType: SMS Settings,Receiver Parameter,Vevő Paraméter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,Az 'alapján' 'és a 'csoport szerint' nem lehet ugyanazon
 DocType: Sales Person,Sales Person Targets,Értékesítői célok
 DocType: Production Order Operation,In minutes,Perceken
 DocType: Issue,Resolution Date,Megoldás dátuma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},Kérjük alapértelmezett Készpénz vagy bankszámlára Fizetési mód {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},Kérjük alapértelmezett Készpénz vagy bankszámlára Fizetési mód {0}
 DocType: Selling Settings,Customer Naming By,Vásárlói Elnevezése a
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Átalakítás Group
 DocType: Activity Cost,Activity Type,Tevékenység típusa
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Kiadás
 DocType: Activity Cost,Projects User,Projekt felhasználó
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Fogyasztott
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nem található a Számla részletek táblázatban
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} nem található a Számla részletek táblázatban
 DocType: Company,Round Off Cost Center,Fejezze ki Cost Center
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Karbantartás látogatás {0} törölni kell lemondása előtt ezt a Vevői rendelés
 DocType: Material Request,Material Transfer,Anyag átrakása
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Hogy nyomon tétel az értékesítési és beszerzési dokumentumok alapján soros nos. Ez is használják a pálya garanciális részleteket a termék.
 DocType: Purchase Receipt Item Supplied,Current Stock,Raktárkészlet
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Elutasított Warehouse kötelező elleni regected elem
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Összesen számlázási idén
 DocType: Account,Expenses Included In Valuation,Költségekből Értékelési
 DocType: Employee,Provide email id registered in company,Adjon email id bejegyzett cég
 DocType: Hub Settings,Seller City,Eladó város
 DocType: Email Digest,Next email will be sent on:,A következő emailt küldjük:
 DocType: Offer Letter Term,Offer Letter Term,Ajánlat Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Tételnek változatok.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Tételnek változatok.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elem {0} nem található
 DocType: Bin,Stock Value,Készlet értéke
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Fa Típus
@@ -580,18 +584,18 @@
 DocType: Purchase Order,Supply Raw Materials,Supply nyersanyagok
 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ámlán kerül előállításra. Úgy keletkezett benyújtani."
 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 +92,{0} is not a stock Item,{0} nem Stock tétel
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nem Stock tétel
 DocType: Mode of Payment Account,Default Account,Alapértelmezett számla
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Lead kell állítani, ha Opportunity készült Lead"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Kérjük, válassza ki a heti egyszeri nap"
 DocType: Production Order Operation,Planned End Time,Tervezett End Time
 ,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 +112,Account with existing transaction cannot be converted to ledger,Véve a meglévő tranzakciós nem lehet átalakítani főkönyvi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Véve a meglévő tranzakciós nem lehet átalakítani főkönyvi
 DocType: Delivery Note,Customer's Purchase Order No,A Vevő rendelésének száma
 DocType: Employee,Cell Number,Mobilszám
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Anyag kéréseket
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Elveszett
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Ha nem tud belépni a jelenlegi utalványt ""Against Naplókönyvelés"" oszlopban"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"Ha nem tud belépni a jelenlegi utalványt ""Against Naplókönyvelés"" oszlopban"
 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 +33,Monthly salary statement.,Havi kimutatást.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: A {0} típusú {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Könyvelési tételek nem lehet neki felróni az ágakat. Bejegyzés elleni csoportjai nem engedélyezettek.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nem lehet kikapcsolni vagy törölni BOM mivel kapcsolódik más Darabjegyzékeket
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nem lehet kikapcsolni vagy törölni BOM mivel kapcsolódik más Darabjegyzékeket
 DocType: Opportunity,Maintenance,Karbantartás
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Vásárlási nyugta számát szükséges Elem {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Vásárlási nyugta számát szükséges Elem {0}
 DocType: Item Attribute Value,Item Attribute Value,Elem Jellemző értéke
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Értékesítési kampányok.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Árlista nincs kiválasztva
 DocType: Employee,Family Background,Családi háttér
 DocType: Process Payroll,Send Email,E-mail küldése
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nincs jogosultság
 DocType: Company,Default Bank Account,Alapértelmezett bankszámlaszám
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Kiszűrni alapuló párt, válasszuk a párt Írja első"
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Tételek magasabb weightage jelenik meg a magasabb
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Megbékélés részlete
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Saját számlák
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Saját számlák
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Egyetlen dolgozó sem találtam
 DocType: Purchase Order,Stopped,Megállítva
 DocType: Item,If subcontracted to a vendor,Ha alvállalkozásba eladó
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Küldés most
 ,Support Analytics,Támogatási analitika
 DocType: Item,Website Warehouse,Weboldal Warehouse
+DocType: Payment Reconciliation,Minimum Invoice Amount,Minimális Számla összege
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","A hónap napja, amelyen auto számla jön létre pl 05, 28 stb"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,"Pontszám kell lennie, kisebb vagy egyenlő, mint 5"
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form bejegyzések
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features","Annak érdekében, hogy &quot;Point of Sale&quot; funkciók"
 DocType: Bin,Moving Average Rate,Mozgóátlag
 DocType: Production Planning Tool,Select Items,Válassza ki az elemeket
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} ellen Bill {1} kelt {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} ellen Bill {1} kelt {2}
 DocType: Maintenance Visit,Completion Status,Készültségi állapot
 DocType: Sales Invoice Item,Target Warehouse,Cél raktár
 DocType: Item,Allow over delivery or receipt upto this percent,Hagyjuk fölött szállítás vagy nyugtát Akár ezt a százalékos
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatikusan üzenet írása benyújtása tranzakciókat.
 DocType: Production Order,Item To Manufacture,Anyag gyártáshoz
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} állapot {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Megrendelést Fizetés
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Megrendelést Fizetés
 DocType: Sales Order Item,Projected Qty,Tervezett mennyiség
 DocType: Sales Invoice,Payment Due Date,Fizetési határidő
 DocType: Newsletter,Newsletter Manager,Hírlevél menedzser
@@ -704,7 +709,7 @@
 DocType: Sales Invoice Item,Stock Details,Stock Részletek
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt érték
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Az értékesítés helyén
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Számlaegyenleg már Credit, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Tartozik"""
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Számlaegyenleg már Credit, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Tartozik"""
 DocType: Account,Balance must be,Egyensúlyt kell
 DocType: Hub Settings,Publish Pricing,Közzé Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Elutasított igény indoklása
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Devizaárfolyam mester.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nem található a Time Slot a következő {0} nap Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Terv anyagot részegységekre
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} aktívnak kell lennie
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} aktívnak kell lennie
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Kérjük, válassza ki a dokumentum típusát első"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Mégsem Material Látogatás {0} törlése előtt ezt a karbantartási látogatás
 DocType: Salary Slip,Leave Encashment Amount,Hagyja beváltása Összeg
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,Alapértelmezett fizetendő számlák
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"Employee {0} nem aktív, vagy nem létezik"
 DocType: Features Setup,Item Barcode,Elem vonalkódja
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Elem változatok {0} frissített
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Elem változatok {0} frissített
 DocType: Quality Inspection Reading,Reading 6,Olvasás 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Vásárlást igazoló számlát Advance
 DocType: Address,Shop,Bolt
 DocType: Hub Settings,Sync Now,Szinkronizálás most
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit bejegyzés nem kapcsolódik a {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit bejegyzés nem kapcsolódik a {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Alapértelmezett Bank / Cash fiók automatikusan frissített POS számla, ha ezt a módot választotta."
 DocType: Employee,Permanent Address Is,Állandó lakhelye
 DocType: Production Order Operation,Operation completed for how many finished goods?,Művelet befejeződött hány késztermékek?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,A Brand
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Engedmény a túl- {0} keresztbe jogcím {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Engedmény a túl- {0} keresztbe jogcím {1}.
 DocType: Employee,Exit Interview Details,Kilépési interjú részletei
 DocType: Item,Is Purchase Item,Beszerzendő tétel?
 DocType: Journal Entry Account,Purchase Invoice,Vásárlási számla
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,Összesen szavakban
 DocType: Material Request Item,Lead Time Date,Átfutási idő dátuma
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,kötelező. Talán Pénzváltó rekord nem teremtett
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Kérem adjon meg Serial No jogcím {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Kérem adjon meg Serial No jogcím {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Mert &quot;Termék Bundle&quot; tételek, raktár, Serial No és Batch Nem fogják tekinteni a &quot;Csomagolási lista&quot; táblázatban. Ha Warehouse és a Batch Nem vagyunk azonosak az összes csomagoljon bármely &quot;Product Bundle&quot; elemet, ezek az értékek bekerülnek a fő tétel asztal, értékek lesznek másolva &quot;Csomagolási lista&quot; táblázatban."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Kiszállítás a vevő felé.
 DocType: Purchase Invoice Item,Purchase Order Item,Megrendelés Termék
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variancia
 ,Company Name,Cég neve
 DocType: SMS Center,Total Message(s),Teljes üzenet (ek)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Válassza ki a tétel a Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Select Item for Transfer,Válassza ki a tétel a Transfer
+DocType: Purchase Invoice,Additional Discount Percentage,További kedvezmény százalékos
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Listájának megtekintéséhez minden segítséget videók
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Válassza ki a fiók vezetője a bank, ahol check rakódott le."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Lehetővé teszi a felhasználó szerkesztheti árjegyzéke Rate tranzakciókban
 DocType: Pricing Rule,Max Qty,Max Mennyiség
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Fizetés ellenében Sales / Megrendelés mindig fel kell tüntetni, előre"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Vegyi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,"Összes példány már átadott, erre a gyártási utasítás."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,"Összes példány már átadott, erre a gyártási utasítás."
 DocType: Process Payroll,Select Payroll Year and Month,"Válassza bérszámfejtés év, hónap"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Tovább a megfelelő csoportba (általában pénzeszközök felhasználása&gt; forgóeszközök&gt; bankszámlák és új fiók létrehozása (kattintva Add Child) típusú &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Villamosenergia-költség
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),Minden Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Kifizetett előlegek átmásolása
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Arcképed csatolása
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Csinál
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Csinál
 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 formájában. Kérjük, forduljon support@erpnext.com ha a probléma továbbra is fennáll."
-apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Kosár
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Kosár
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Megrendelni típusa közül kell {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 +35,Opening Qty,Nyitva Mennyiség
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 az
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Attribútum tábla kötelező
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,Attribútum tábla kötelező
 DocType: Production Planning Tool,Get Sales Orders,Get Vevőmegrendelés
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nem lehet negatív
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Kedvezmény
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Kedvezmény
 DocType: Features Setup,Purchase Discounts,Árengedmények
 DocType: Workstation,Wages,Munkabér
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Frissülni fog, ha idő Napló &quot;Számlázható&quot;"
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,Szállítási állam
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Elemet kell hozzá az 'hogy elemeket vásárlása bevételek ""gombot"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Az értékesítési költségek
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Normál vásárlás
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Normál vásárlás
 DocType: GL Entry,Against,Ellen
 DocType: Item,Default Selling Cost Center,Alapértelmezett Selling Cost Center
 DocType: Sales Partner,Implementation Partner,Kivitelező partner
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,Nagykereskedő
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Kosár Szállítási szabály
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Gyártási rendelés {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',"Kérjük, állítsa be az &quot;Apply További kedvezmény&quot;"
 ,Ordered Items To Be Billed,Rendelt mennyiség számlázásra
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Range kell lennie kisebb hatótávolsággal
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Válassza ki a Time Naplók és elküldése hogy hozzon létre egy új Értékesítési számlák.
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ez az Időnapló gyűjtő ki lett számlázva.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Hozzon létre Opportunity
 DocType: Salary Slip,Leave Without Pay,Fizetés nélküli szabadságon
-DocType: Supplier,Communications,Távközlés
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Kapacitás tervezés Error
 ,Trial Balance for Party,Trial Balance Party
 DocType: Lead,Consultant,Szaktanácsadó
 DocType: Salary Slip,Earnings,Keresetek
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Kész elem {0} kell beírni gyártása típusú bejegyzést
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Nyitva Könyvelési egyenleg
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Kész elem {0} kell beírni gyártása típusú bejegyzést
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Nyitva Könyvelési egyenleg
 DocType: Sales Invoice Advance,Sales Invoice Advance,Értékesítési számla előleg
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nincs kérni
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""A tényleges kezdési dátum"" nem lehet nagyobb, mint a ""tényleges záró dátum"""
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,Jelenlegi pénzügyi év
 DocType: Global Defaults,Disable Rounded Total,Kerekített összesen elrejtése
 DocType: Lead,Call,Hívás
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Bejegyzések"" nem lehet üres"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,"""Bejegyzések"" nem lehet üres"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},A {0} duplikált sor azonos ezzel: {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Beállítása Alkalmazottak
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,Felhasználó ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Kilátás Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Legkorábbi
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel Group létezik azonos nevű, kérjük, változtassa meg az elem nevét, vagy nevezze át a tétel-csoportban"
+apps/erpnext/erpnext/stock/doctype/item/item.py +444,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel Group létezik azonos nevű, kérjük, változtassa meg az elem nevét, vagy nevezze át a tétel-csoportban"
 DocType: Production Order,Manufacture against Sales Order,Gyártás ellen Vevői
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,A világ többi része
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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 Batch
 ,Budget Variance Report,Költségkeret Variance jelentés
 DocType: Salary Slip,Gross Pay,Bruttó fizetés
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Nem engedélyezett szerkeszteni befagyasztott számlára {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get kiváló számlák
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Vevői {0} nem érvényes
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sajnáljuk, a vállalatok nem lehet összevonni,"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Sajnáljuk, a vállalatok nem lehet összevonni,"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Kis
 DocType: Employee,Employee Number,Munkavállalói száma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case szám (ok) már használatban van. Próbálja a Case {0}
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,Probléma helye
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Szerződés
 DocType: Email Digest,Add Quote,Add Idézet
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion tényező szükséges UOM: {0} Cikk: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion tényező szükséges UOM: {0} Cikk: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Közvetett költségek
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Menny kötelező
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Mezőgazdaság
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,A termékek vagy szolgáltatások
 DocType: Mode of Payment,Mode of Payment,Fizetési mód
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,Website Image should be a public file or website URL,Weboldal kép legyen nyilvános fájl vagy weboldal URL
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,"Ez egy gyökér tétel-csoportban, és nem lehet szerkeszteni."
 DocType: Journal Entry Account,Purchase Order,Megrendelés
 DocType: Warehouse,Warehouse Contact Info,Raktári kapcsolattartó
@@ -1018,8 +1024,8 @@
 DocType: Email Digest,Annual Income,Éves jövedelem
 DocType: Serial No,Serial No Details,Sorozatszám adatai
 DocType: Purchase Invoice Item,Item Tax Rate,Az anyag adójának mértéke
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, csak jóváírásokat lehet kapcsolni a másik ellen terheléssel"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Szállítólevélen {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","{0}, csak jóváírásokat lehet kapcsolni a másik ellen terheléssel"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Szállítólevélen {0} nem nyújtják be
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Elem {0} kell egy Alvállalkozásban Elem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Felszereltség
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Árképzési szabály először alapján kiválasztott ""Apply"" mezőben, ami lehet pont, pont-csoport vagy a márka."
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,Cél
 DocType: Sales Invoice Item,Edit Description,Leírás szerkesztése
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Várható szállítási határidő kisebb, mint a tervezett kezdési dátum."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,A Szállító
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,A Szállító
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Beállítás Account Type segít kiválasztani ezt a számlát a tranzakció.
 DocType: Purchase Invoice,Grand Total (Company Currency),Mindösszesen (Társaság Currency)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Összes kimenő
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,Könyvelési tétel
 DocType: Workstation,Workstation Name,Munkaállomás neve
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Összefoglaló email:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nem tartozik Elem {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} does not belong to Item {1},BOM {0} nem tartozik Elem {1}
 DocType: Sales Partner,Target Distribution,Cél Distribution
 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 utoljára létrehozott tranzakciós ilyen előtaggal"
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Hírlevelek kapcsolatoknak, vezetőknek"
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Árfolyam a záró figyelembe kell {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Pontjainak összegeként az összes célokat kell 100. {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Műveletek nem maradt üresen.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Műveletek nem maradt üresen.
 ,Delivered Items To Be Billed,Kiszállított anyag számlázásra
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,A sorozatszámhoz tartozó raktárat nem lehet megváltoztatni.
 DocType: Authorization Rule,Average Discount,Átlagos kedvezmény
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Re {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operation Leírás
 DocType: Item,Will also apply to variants,Is alkalmazni kell változatok
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nem lehet megváltoztatni pénzügyi év kezdő dátuma és a pénzügyi év vége dátum, amikor a pénzügyi év menti."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nem lehet megváltoztatni pénzügyi év kezdő dátuma és a pénzügyi év vége dátum, amikor a pénzügyi év menti."
 DocType: Quotation,Shopping Cart,Kosár
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Átlag napi kimenő
 DocType: Pricing Rule,Campaign,Kampány
@@ -1100,7 +1106,8 @@
 DocType: Sales Order Item,Planned Quantity,Tervezett mennyiség
 DocType: Purchase Invoice Item,Item Tax Amount,Az anyag adójának értéke
 DocType: Item,Maintain Stock,Fenntartani Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Stock bejegyzés már létrehozott termelési rendelés
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Stock bejegyzés már létrehozott termelési rendelés
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Nettó változás állóeszköz-
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Hagyja üresen, ha figyelembe valamennyi megjelölés"
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Charge típusú ""közvetlen"" sorában {0} nem lehet jogcím tartalmazza Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,"nem lehet nagyobb, mint 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Elem {0} nem Stock tétel
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Elem {0} nem Stock tétel
 DocType: Maintenance Visit,Unscheduled,Nem tervezett
 DocType: Employee,Owned,Tulaj
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,"Attól függ, fizetés nélküli szabadságon"
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Részegységek
 DocType: Shipping Rule Condition,To Value,Hogy Érték
 DocType: Supplier,Stock Manager,Stock menedzser
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Forrás raktárban kötelező sorban {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Forrás raktárban kötelező sorban {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Csomagjegy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office Rent
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Beállítás SMS gateway beállítások
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nem címre hozzá még.
 DocType: Workstation Working Hour,Workstation Working Hour,Munkaállomás munkaideje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Elemző
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő JV összeget {2}"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő JV összeget {2}"
 DocType: Item,Inventory,Leltár
 DocType: Features Setup,"To enable ""Point of Sale"" view","Annak érdekében, hogy &quot;Point of Sale&quot; nézet"
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Fizetés nem lehet üres Kosár
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Fizetés nem lehet üres Kosár
 DocType: Item,Sales Details,Értékesítés részletei
 DocType: Opportunity,With Items,A tételek
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,A Menny
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,Szülő Cost Center
 DocType: Sales Invoice,Source,Forrás
 DocType: Leave Type,Is Leave Without Pay,A fizetés nélküli szabadságon
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nincs bejegyzés találat a fizetési táblázat
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nincs bejegyzés találat a fizetési táblázat
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Pénzügyi év kezdő dátuma
 DocType: Employee External Work History,Total Experience,Összesen Experience
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Csomagjegy(ek) törölve
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Csomagjegy(ek) törölve
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow Befektetési
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding és díjak
 DocType: Material Request Item,Sales Order No,Sales Order No
 DocType: Item Group,Item Group Name,Anyagcsoport neve
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer anyagok gyártása
 DocType: Pricing Rule,For Price List,Ezen árlistán
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Vételi árfolyamon a tétel: {0} nem található, ami szükséges könyv könyvelési tételt (ráfordítás). Kérjük beszélve tétel ára ellen felvásárlási árlistát."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Vételi árfolyamon a tétel: {0} nem található, ami szükséges könyv könyvelési tételt (ráfordítás). Kérjük beszélve tétel ára ellen felvásárlási árlistát."
 DocType: Maintenance Schedule,Schedules,Menetrendek
 DocType: Purchase Invoice Item,Net Amount,Nettó Összege
 DocType: Purchase Order Item Supplied,BOM Detail No,Anyagjegyzék részlet száma
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),További kedvezmény összege (Társaság Currency)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Hiba: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Hiba: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Kérjük, hozzon létre új fiókot a számlatükör."
 DocType: Maintenance Visit,Maintenance Visit,Karbantartási látogatás
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Vásárló > Vásárlói csoport > Terület
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,Értékesítő partner célja
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Számviteli könyvelése {0} csak akkor lehet elvégezni a pénznem: {1}
 DocType: Pricing Rule,Pricing Rule,Árképzési szabály
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Anyag Kérelem Megrendelés
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Anyag Kérelem Megrendelés
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Sor # {0}: Visszaküldött pont {1} nem létezik {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankszámlák
 ,Bank Reconciliation Statement,Bank Megbékélés nyilatkozat
@@ -1225,11 +1233,11 @@
 ,POS,Értékesítési hely (POS)
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Nyitva Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} kell csak egyszer jelenik meg
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nem szabad Tranfer több {0}, mint {1} ellen Megrendelés {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nem szabad Tranfer több {0}, mint {1} ellen Megrendelés {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},A levelek foglalás sikeres {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nincsenek tételek csomag
 DocType: Shipping Rule Condition,From Value,Értéktől
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Gyártási mennyiség kötelező
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Gyártási mennyiség kötelező
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Összegek nem tükröződik bank
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Követelések cég költségén.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,"Anyag kérelmek, amelyek esetében Szállító idézetek nem jönnek létre"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"A nap (ok) on, amelyre pályázik a szabadság szabadság. Nem kell alkalmazni a szabadság."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Hogy nyomon elemeket használja vonalkód. Ön képes lesz arra, hogy belépjen elemek szállítólevél és Értékesítési számlák beolvasásával vonalkód pont."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Mark kézbesítettnek
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Mark kézbesítettnek
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Tedd Idézet
 DocType: Dependent Task,Dependent Task,Függő Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 sorban {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 sorban {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Leave of type {0} cannot be longer than {1},"Szabadság típusú {0} nem lehet hosszabb, mint {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Próbálja Tervezési tevékenység X nappal előre.
 DocType: HR Settings,Stop Birthday Reminders,Megállás Születésnapi emlékeztetők
 DocType: SMS Center,Receiver List,Vevő lista
 DocType: Payment Tool Detail,Payment Amount,Kifizetés összege
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Elfogyasztott
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} megtekintése
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} megtekintése
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Nettó Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Bérszerkeztet levonása
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} adta meg többször a konverziós tényező táblázat
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} adta meg többször a konverziós tényező táblázat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Költsége Kiadott elemek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},"Mennyiség nem lehet több, mint {0}"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Életkor (nap)
 DocType: Quotation Item,Quotation Item,Árajánlat tétele
 DocType: Account,Account Name,Számla név
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,"Dátum nem lehet nagyobb, mint dátuma"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,"Dátum nem lehet nagyobb, mint dátuma"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} {1} mennyiséget nem lehet egy töredéke
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Szállító Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Szállító rész száma
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Konverziós arány nem lehet 0 vagy 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Konverziós arány nem lehet 0 vagy 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} törlik vagy megállt
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,A jármű útnak indításának ideje
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Vásárlási nyugta {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Vásárlási nyugta {0} nem nyújtják be
 DocType: Company,Default Payable Account,Alapértelmezett fizetendő számla
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","A beállítások Online bevásárlókosár mint a hajózás szabályait, árlistát stb"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% számlázott
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Saját kérdések
 DocType: BOM Item,BOM Item,Anyagjegyzék tétel
 DocType: Appraisal,For Employee,Dolgozónak
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Sor {0}: Advance ellen Szállító kell megterhelni
 DocType: Company,Default Values,Alapértelmezett értékek
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Fizetés összege nem lehet negatív
 DocType: Expense Claim,Total Amount Reimbursed,Megtérített teljes összeg
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Ellen Szállító Számla {0} dátuma {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Ellen Szállító Számla {0} dátuma {1}
 DocType: Customer,Default Price List,Alapértelmezett árjegyzék
 DocType: Payment Reconciliation,Payments,Kifizetések
 DocType: Budget Detail,Budget Allocated,Lefoglalt költségkeret
 DocType: Journal Entry,Entry Type,Bejegyzés típusa
 ,Customer Credit Balance,Customer Credit Balance
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Nettó Szállítói kötelezettségek változása
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Kérjük, ellenőrizze az e-mail id"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Vásárlói szükséges ""Customerwise Discount"""
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Frissítse bank fizetési időpontokat folyóiratokkal.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Bevásárló kosár engedélyezése
 DocType: Employee,Permanent Address,Állandó lakcím
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Elem {0} kell lennie a szolgáltatás elemet.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","A kifizetett előleg ellen {0} {1} nem lehet nagyobb, \ mint Mindösszesen {2}"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Kérjük, jelölje ki az elemet kódot"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Csökkentse levonás fizetés nélküli szabadságon (LWP)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súly említik, \ nKérlek beszélve ""Súly UOM"" túl"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Anyaga Request használják e Stock Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Egy darab anyag.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',"A(z) {0} időnapló gyűjtőt be kell ""Küldeni"""
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"A(z) {0} időnapló gyűjtőt be kell ""Küldeni"""
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Tedd számviteli könyvelése minden Készletmozgás
 DocType: Leave Allocation,Total Leaves Allocated,Összes lekötött szabadság
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Warehouse szükség Row {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Warehouse szükség Row {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Adjon meg egy érvényes költségvetési év kezdetének és befejezésének időpontjai
 DocType: Employee,Date Of Retirement,A nyugdíjazás
 DocType: Upload Attendance,Get Template,Get Template
 DocType: Address,Postal,Postai
 DocType: Item,Weightage,Súlyozás
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Az ügyfélszolgálati csoport létezik azonos nevű kérjük, változtassa meg az Ügyfél nevét vagy nevezze át a Vásárlói csoport"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Kérjük, válassza ki a {0} először."
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,"Kérjük, válassza ki a {0} először."
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},text {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Új Kapcsolat
 DocType: Territory,Parent Territory,Szülő Terület
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Anyag bevételezése
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Párt típusa és fél köteles a követelések / kötelezettségek figyelembe {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ha ennek az elemnek a változatokat, akkor nem lehet kiválasztani a vevői rendelések stb"
 DocType: Lead,Next Contact By,Next Kapcsolat
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Szükséges mennyiséget tétel {0} sorban {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},Szükséges mennyiséget tétel {0} sorban {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} nem lehet törölni, mint a mennyiség létezik tétel {1}"
 DocType: Quotation,Order Type,Rendelés típusa
 DocType: Purchase Invoice,Notification Email Address,Értesítendő emailcímek
@@ -1361,15 +1373,15 @@
 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: Sales Invoice Item,Batch No,Kötegszám
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Hogy több értékesítési megrendelések ellen ügyfél Megrendelés
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Legfontosabb
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Legfontosabb
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variáns
 DocType: Naming Series,Set prefix for numbering series on your transactions,Előtagja a számozás sorozat a tranzakciók
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Megállt érdekében nem lehet törölni. Kidugaszol törölni.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablon"
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablon"
 DocType: Employee,Leave Encashed?,Hagyja beváltásának módjáról?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Lehetőség A mező kitöltése kötelező
 DocType: Item,Variants,Változatok
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Beszerzési rendelés készítése
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Beszerzési rendelés készítése
 DocType: SMS Center,Send To,Címzett
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Nincs elég szabadság mérlege Leave Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Lekötött összeg
@@ -1382,7 +1394,7 @@
 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ókat közöl Szállító
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Címek
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Ellen Naplókönyvelés {0} nem rendelkezik páratlan {1} bejegyzést
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Ellen Naplókönyvelés {0} nem rendelkezik páratlan {1} bejegyzést
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplikált sorozatszám lett beírva ehhez a tételhez: {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Ennek feltétele a szállítási szabály
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,"Elem nem engedjük, hogy a gyártási rendelés."
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,A hitel összege a számla pénzneme
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Naplók gyártás.
 DocType: Item,Apply Warehouse-wise Reorder Level,Alkalmazni Warehouse-bölcs Reorder Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} kell benyújtani
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} kell benyújtani
 DocType: Authorization Control,Authorization Control,Felhatalmazásvezérlés
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Sor # {0}: Elutasítva Warehouse kötelező elleni elutasított elem {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,A feladatok időnaplói.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Fizetés
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Fizetés
 DocType: Production Order Operation,Actual Time and Cost,Tényleges idő és költség
 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},Anyag kérésére legfeljebb {0} tehető jogcím {1} ellen Vevői {2}
 DocType: Employee,Salutation,Megszólítás
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Társult
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Elem {0} nem folytatásos tétel
 DocType: SMS Center,Create Receiver List,Címzettlista létrehozása
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Lejárt
 DocType: Packing Slip,To Package No.,A csomag No.
 DocType: Warranty Claim,Issue Date,Probléma dátuma
 DocType: Activity Cost,Activity Cost,Activity költség
@@ -1449,7 +1461,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Elért
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Terület / Ügyfél
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,pl. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő számlázni fennálló összeg {2}"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő számlázni fennálló összeg {2}"
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,A szavak lesz látható mentése után a kereskedelmi számla.
 DocType: Item,Is Sales Item,Eladható tétel?
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Tétel csoportfa
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} létrehozva
 DocType: Delivery Note Item,Against Sales Order,Ellen Vevői
 ,Serial No Status,Sorozatszám állapota
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Az Anyagok rész nem lehet üres
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Az Anyagok rész nem lehet üres
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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}"
 DocType: Pricing Rule,Selling,Értékesítés
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 Termék Csoport
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Vámok és adók
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Kérjük, adja Hivatkozási dátum"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,"Kérjük, adja Hivatkozási dátum"
 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} fizetési bejegyzéseket nem lehet szűrni {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Táblázat a tétel, amely megjelenik a Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Mellékelt Mennyiség
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,Telepítési idő
 DocType: Sales Invoice,Accounting Details,Számviteli Részletek
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Törölje az összes tranzakciók erre Társaság
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Row # {0}: Operation {1} nem fejeződik be a {2} Mennyiség késztermékek a gyártási utasítás # {3}. Kérjük, frissítse az operációs státuszt keresztül Time Naplók"
+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,"Row # {0}: Operation {1} nem fejeződik be a {2} Mennyiség késztermékek a gyártási utasítás # {3}. Kérjük, frissítse az operációs státuszt keresztül Time Naplók"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Befektetések
 DocType: Issue,Resolution Details,Megoldás részletei
 DocType: Quality Inspection Reading,Acceptance Criteria,Elfogadási határ
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,Tábla törlése
 DocType: Features Setup,Brands,Márkák
 DocType: C-Form Invoice Detail,Invoice No,Számlát nem
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Tól Megrendelés
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Tól Megrendelés
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Hagyja nem alkalmazható / lemondás előtt {0}, mint szabadság egyensúlya már carry-továbbította a jövőben szabadság elosztása rekordot {1}"
 DocType: Activity Cost,Costing Rate,Költségszámítás Rate
 ,Customer Addresses And Contacts,Vevő címek és kapcsolatok
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,Karbantartási ütemezések
 ,Quotation Trends,Idézet Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Elem Csoport nem említett elem mestere jogcím {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,Megterhelése figyelembe kell venni a követelések között
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Megterhelése figyelembe kell venni a követelések között
 DocType: Shipping Rule Condition,Shipping Amount,Szállítandó mennyiség
 ,Pending Amount,Függőben lévő összeg
 DocType: Purchase Invoice Item,Conversion Factor,Konverziós tényező
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Fája finanial számlák.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Hagyja üresen, ha figyelembe munkavállalói típusok"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Terjesztheti alapuló díjak
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Account {0} típusú legyen ""Fixed Asset"" tételként {1} egy eszköz tétele"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Account {0} típusú legyen ""Fixed Asset"" tételként {1} egy eszköz tétele"
 DocType: HR Settings,HR Settings,Munkaügyi beállítások
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Költségén Követelés jóváhagyására vár. Csak a költség Jóváhagyó frissítheti állapotát.
 DocType: Purchase Invoice,Additional Discount Amount,További kedvezmény összege
 DocType: Leave Block List Allow,Leave Block List Allow,Hagyja Block List engedélyezése
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Rövidített nem lehet üres vagy hely
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Rövidített nem lehet üres vagy hely
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Összesen Aktuális
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Egység
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} most az alapértelmezett pénzügyi évben. Kérjük, frissítse böngészőjét, hogy a változtatások életbe léptetéséhez."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Költségtérítési igényeket
 DocType: Issue,Support,Támogatás
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Kosár megtekintése
 ,BOM Search,BOM Keresés
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zárás (nyitás + összesítések)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Kérjük, adja valuta Társaság"
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM átváltási arányra is szükség sorában {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Távolság dátum nem lehet a bejelentkezés előtt időpont sorában {0}
 DocType: Salary Slip,Deduction,Levonás
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Elem Ár hozzáadott {0} árjegyzéke {1}
 DocType: Address Template,Address Template,Címlista sablon
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,"Kérjük, adja Alkalmazott Id e üzletkötő"
 DocType: Territory,Classification of Customers by region,Fogyasztói csoportosítás régiónként
 DocType: Project,% Tasks Completed,% feladat elvégezve
 DocType: Project,Gross Margin,Bruttó árrés
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Kérjük, adja Production pont első"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,letiltott felhasználó
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,letiltott felhasználó
 DocType: Opportunity,Quotation,Árajánlat
 DocType: Salary Slip,Total Deduction,Összesen levonása
 DocType: Quotation,Maintenance User,Karbantartás Felhasználó
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Elem {0} már visszatért
 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 ** az adott pénzügyi évben. Minden könyvelési tétel, és más jelentős tranzakciókat nyomon elleni ** pénzügyi év **."
 DocType: Opportunity,Customer / Lead Address,Vevő / Célpont címe
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány mellékletet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány mellékletet {0}
 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
@@ -1588,12 +1602,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Kövesse nyomon az értékesítési kampányok. Kövesse nyomon az érdeklődők, idézetek, vevői rendelés, stb a kampányok felmérni Return on Investment."
 DocType: Expense Claim,Approver,Jóváhagyó
 ,SO Qty,SO Mennyiség
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock bejegyzések létezéséről ellen raktárban {0}, így nem lehet újra rendelhet, illetve módosíthatja Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock bejegyzések létezéséről ellen raktárban {0}, így nem lehet újra rendelhet, illetve módosíthatja Warehouse"
 DocType: Appraisal,Calculate Total Score,Számolja ki Total Score
 DocType: Supplier Quotation,Manufacturing Manager,Gyártási menedzser
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} még garanciális max {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Osztott szállítólevél csomagokat.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Szállítások
+apps/erpnext/erpnext/hooks.py +69,Shipments,Szállítások
 DocType: Purchase Order Item,To be delivered to customer,Be kell nyújtani az ügyfél
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Idő Log Status kell benyújtani.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Soros {0} nem tartozik semmilyen Warehouse
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Válassza ki Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Hagyja üresen, ha venni valamennyi szervezeti egység"
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Típusú foglalkoztatás (munkaidős, szerződéses, gyakornok stb)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} kötelező tétel {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} kötelező tétel {1}
 DocType: Currency Exchange,From Currency,Deviza-
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Kérjük, válasszon odaítélt összeg, Számla típusa és számlaszámra adni legalább egy sorban"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Vevői szükséges Elem {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Kérjük, válasszon odaítélt összeg, Számla típusa és számlaszámra adni legalább egy sorban"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Vevői szükséges Elem {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Összegek nem tükröződik rendszer
 DocType: Purchase Invoice Item,Rate (Company Currency),Érték (a cég pénznemében)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Egyéb
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Kedvezmény
 DocType: Purchase Order Item,Reference Document Type,Referencia Dokumentum típus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} ellen Vevői {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} ellen Vevői {1}
 DocType: Account,Fixed Asset,Az állóeszköz-
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialized Inventory
 DocType: Activity Type,Default Billing Rate,Alapértelmezett díjszabás
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Vevői rendelés Fizetési
 DocType: Expense Claim Detail,Expense Claim Detail,Béremelés részlete
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Naplók létre:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,"Kérjük, válassza ki a megfelelő fiókot"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,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: Employee,Blood Group,Vércsoport
 DocType: Purchase Invoice Item,Page Break,Oldaltörés
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,Az Idő
 DocType: Authorization Rule,Approving Role (above authorized value),Jóváhagyó szerepe (a fenti engedélyezett érték)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Hozzáadni a gyermek csomópontok, felfedezni fát, és kattintson a csomópont, amely alapján a felvenni kívánt több csomópontban."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Hitel figyelembe kell venni a fizetendő
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzív: {0} nem lehet a szülő vagy a gyermek {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Hitel figyelembe kell venni a fizetendő
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzív: {0} nem lehet a szülő vagy a gyermek {2}
 DocType: Production Order Operation,Completed Qty,Befejezett Mennyiség
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, csak betéti számlák köthető másik ellen jóváírás"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","{0}, csak betéti számlák köthető másik ellen jóváírás"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Árlista {0} van tiltva
 DocType: Manufacturing Settings,Allow Overtime,Hagyjuk Túlóra
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sorozatszám szükséges jogcím {1}. Megadta {2}.
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,Vásárlói pont kódok
 DocType: Opportunity,Lost Reason,Elveszett Reason
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Hozzon létre Fizetési bejegyzés ellen megrendelések vagy számlák.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Új cím
 DocType: Quality Inspection,Sample Size,A minta mérete
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Összes példány már kiszámlázott
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,All items have already been invoiced,Összes példány 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 'A Case No. """
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,További költség központok tehető alatt Csoportok de bejegyzéseket lehet tenni ellene nem Csoportok
 DocType: Project,External,Külső
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,Átnevezési eszköz
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Költségek újraszámolása
 DocType: Item Reorder,Item Reorder,Anyag újrarendelés
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer anyag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transfer anyag
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Adja meg a működését, a működési költségek, és hogy egy egyedi Operation nem a műveleteket."
 DocType: Purchase Invoice,Price List Currency,Árlista pénzneme
 DocType: Naming Series,User must always select,Felhasználó mindig válassza
 DocType: Stock Settings,Allow Negative Stock,Negatív készlet engedélyezése
 DocType: Installation Note,Installation Note,Telepítési feljegyzés
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Add adók
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Cash pénzügyi
 ,Financial Analytics,Pénzügyi analitika
 DocType: Quality Inspection,Verified By,Ellenőrizte
 DocType: Address,Subsidiary,Leányvállalat
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,Bérlap létrehozása
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Várható egyenleg bankonként
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Pénzeszközök forrását (Források)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Mennyiség sorban {0} ({1}) meg kell egyeznie a gyártott mennyiség {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Mennyiség sorban {0} ({1}) meg kell egyeznie a gyártott mennyiség {2}
 DocType: Appraisal,Employee,Munkavállaló
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import-mail-tól
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Meghívás Felhasználó
 DocType: Features Setup,After Sale Installations,Miután Eladó létesítmények
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} teljesen számlázott
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} teljesen számlázott
 DocType: Workstation Working Hour,End Time,End Time
 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ési vagy megvásárolható.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Utalvány által csoportosítva
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Szükség
 DocType: Sales Invoice,Mass Mailing,Tömeges email
 DocType: Rename Tool,File to Rename,Fájl átnevezése
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Rendelési szám szükséges Elem {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Rendelési szám szükséges Elem {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mutass Kifizetések
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Meghatározott BOM {0} nem létezik jogcím {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Karbantartási ütemterv {0} törölni kell lemondása előtt ezt a Vevői rendelés
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,Értékesítési sorrendbe
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Készítsen Customer
 DocType: Purchase Invoice,Credit To,Hitel
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktív vezet / ügyfelek
 DocType: Employee Education,Post Graduate,Posztgraduális
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Karbantartási ütemterv részlete
 DocType: Quality Inspection Reading,Reading 9,Olvasás 9
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,Felvetette
 DocType: Payment Tool,Payment Account,Fizetési számla
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Kérjük, adja Társaság a folytatáshoz"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Nettó változás Vevők
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzációs Off
 DocType: Quality Inspection Reading,Accepted,Elfogadva
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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örzsadatok marad, ahogy van. Ez a művelet nem vonható vissza."
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,Teljes összeg kiegyenlítéséig
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nem lehet nagyobb, mint a tervezett quanitity ({2}) a gyártási utasítás {3}"
 DocType: Shipping Rule,Shipping Rule Label,Szállítási lehetőség címkéi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletek, számla tartalmaz csepp szállítási elemet."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletek, számla tartalmaz csepp szállítási elemet."
 DocType: Newsletter,Test,Teszt
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Mivel már meglévő részvény tranzakciók ezt az elemet, \ nem tudja megváltoztatni az értékeket &quot;Has Serial No&quot;, &quot;a kötegelt Nem&quot;, &quot;Úgy Stock pont&quot; és &quot;értékelési módszer&quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Gyors Naplókönyvelés
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Gyors Naplókönyvelés
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Nem tudod megváltoztatni mértéke, ha BOM említett Against olyan tétel"
 DocType: Employee,Previous Work Experience,Korábbi szakmai tapasztalat
 DocType: Stock Entry,For Quantity,Mert Mennyiség
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Kérjük, adja Tervezett Mennyiség jogcím {0} sorban {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} nem nyújtják be
 apps/erpnext/erpnext/config/stock.py +18,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 termelési érdekében jön létre minden kész a jó elemet.
 DocType: Purchase Invoice,Terms and Conditions1,Általános szerződési feltételek1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,Megengedett érték
 DocType: Contact,Enter department to which this Contact belongs,"Adja egysége, ahova a kapcsolattartónak tartozik"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Összesen Hiány
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Elem vagy raktár sorban {0} nem egyezik Material kérése
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Elem vagy raktár sorban {0} nem egyezik Material kérése
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Mértékegység
 DocType: Fiscal Year,Year End Date,Év végi dátum
 DocType: Task Depends On,Task Depends On,A feladat tőle függ:
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Szerződés befejezés dátuma nem lehet nagyobb, mint Csatlakozás dátuma"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"A harmadik fél forgalmazó / kereskedő / bizományos / társult / viszonteladó, aki eladja a vállalatok termékek a jutalék."
 DocType: Customer Group,Has Child Node,Lesz gyerek bejegyzése?
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} ellen Megrendelés {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} ellen Megrendelés {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Írja be a statikus url paramétereket itt (Pl. A feladó = ERPNext, username = ERPNext, password = 1234 stb)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} sem aktív pénzügyi évben. További részletekért ellenőrizze {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ez egy példa honlapján automatikusan generált a ERPNext
@@ -1874,7 +1892,7 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Normál adó sablont, hogy lehet alkalmazni, hogy minden vásárlási tranzakciókat. Ez a sablon tartalmazhat listáját adó fejek és egyéb ráfordítások fejek, mint a ""Shipping"", ""biztosítás"", ""kezelés"" stb #### Megjegyzés Az adó mértéke határozná meg itt lesz az adó normál kulcsának minden ** elemek * *. Ha vannak ** ** elemek, amelyek különböző mértékben, akkor hozzá kell adni a ** Elem Tax ** asztalra a ** Elem ** mester. #### Leírása oszlopok 1. Számítási típus: - Ez lehet a ** Teljes nettó ** (vagyis az összege alapösszeg). - ** Az előző sor Total / Összeg ** (kumulatív adók vagy díjak). Ha ezt a lehetőséget választja, az adó fogják alkalmazni százalékában az előző sor (az adótábla) mennyisége vagy teljes. - ** A tényleges ** (mint említettük). 2. Account Head: A fiók főkönyvi, amelyek szerint ez az adó könyvelik 3. Cost Center: Ha az adó / díj olyan jövedelem (például a szállítás), vagy költségkímélő kell foglalni ellen Cost Center. 4. Leírás: Leírás az adó (amely lehet nyomtatott számlák / idézetek). 5. Rate: adókulcs. 6. Összeg: Adó összege. 7. Teljes: Összesített összesen ebben a kérdésben. 8. Adja Row: Ha alapuló ""Előző Row Total"" kiválaszthatja a sor számát veszik, mint a bázis ezt a számítást (alapértelmezett az előző sor). 9. fontolják meg az adózási vagy illeték: Ebben a részben megadhatja, ha az adó / díj abban az értékelésben (nem része összesen), vagy kizárólag a teljes (nem hozzáadott értéket az elem), vagy mindkettő. 10. Adjon vagy le lehet vonni: Akár akarjuk adni vagy le lehet vonni az adóból."
 DocType: Purchase Receipt Item,Recd Quantity,RecD Mennyiség
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Nem lehet még több tétel {0}, mint Sales Rendelési mennyiség {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,"Stock Entry {0} nem nyújtják be,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,"Stock Entry {0} nem nyújtják be,"
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Account
 DocType: Tax Rule,Billing City,Számlázási város
 DocType: Global Defaults,Hide Currency Symbol,Pénznem szimbólumának elrejtése
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Közműben
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 felett
 DocType: Buying Settings,Default Buying Price List,Alapértelmezett Vásárlási árjegyzéke
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Nem alkalmazottja a fent kiválasztott kritériumoknak vagy fizetés csúszik már létrehozott
 DocType: Notification Control,Sales Order Message,Vevői Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Alapértelmezett értékek, mint a társaság, Valuta, folyó pénzügyi évben, stb"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Fizetési mód
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Lásd az 'Anyagköltség számítás módja' a Költség részben
 DocType: Appraisal Goal,Key Responsibility Area,Felelősségi terület
 DocType: Item Reorder,Material Request Type,Anyagigénylés típusa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Sor {0}: UOM átváltási arányra is kötelező
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Költségközpont
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Utalvány #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Minden címek.
 DocType: Company,Stock Settings,Készlet beállítások
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Összevonása csak akkor lehetséges, ha a következő tulajdonságok azonosak mindkét bejegyzések. Van Group, Root típusa, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Összevonása csak akkor lehetséges, ha a következő tulajdonságok azonosak mindkét bejegyzések. Van Group, Root típusa, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,A vevői csoport fa.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Új költségközpont neve
 DocType: Leave Control Panel,Leave Control Panel,Hagyja Vezérlőpult
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Fizetési eszköz Detail
 ,Sales Browser,Értékesítési Browser
 DocType: Journal Entry,Total Credit,Követelés összesen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik elleni készletnövekedést {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Helyi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik elleni készletnövekedést {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Helyi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),A hitelek és előlegek (Eszközök)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Adósok
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Nagy
@@ -2003,7 +2022,7 @@
 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ók lehet címkézett ellen több ** értékesítők ** így, és kövesse nyomon célokat."
 ,S.O. No.,SO No.
 DocType: Production Order Operation,Make Time Log,Legyen ideje Bejelentkezés
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,"Kérjük, állítsa újrarendezésből mennyiség"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,"Kérjük, állítsa újrarendezésből mennyiség"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Kérjük, hozzon létre Ügyfél a Lead {0}"
 DocType: Price List,Applicable for Countries,Alkalmazható Országok
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Számítógépek
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast egy tételt kell beírni a negatív mennyiség cserébe dokumentum
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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ő munkaállomás {1}, lebontják a művelet a több művelet"
 ,Requested,Kért
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Nincs megjegyzés
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Nincs megjegyzés
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Lejárt
 DocType: Account,Stock Received But Not Billed,"Stock érkezett, de nem számlázzák"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root Figyelembe kell lennie egy csoportja
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root Figyelembe kell lennie egy csoportja
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttó bér + hátralékot összeg + beváltása Összeg - Total levonása
 DocType: Monthly Distribution,Distribution Name,Nagykereskedelem neve
 DocType: Features Setup,Sales and Purchase,Értékesítés és beszerzés
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,Párt Balance
 DocType: Sales Invoice Item,Time Log Batch,Időnapló gyűjtő
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Kérjük, válassza az Apply kedvezmény"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Fizetés Slip Létrehozta
 DocType: Company,Default Receivable Account,Alapértelmezett Receivable Account
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Készítse Bank Belépő a teljes bért fizet a fent kiválasztott kritériumoknak
 DocType: Stock Entry,Material Transfer for Manufacture,Anyag átrakása gyártásához
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,Félévente
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,A {0} pénzügyi év nem található.
 DocType: Bank Reconciliation,Get Relevant Entries,Get vonatkozó bejegyzései
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Számviteli könyvelése Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Számviteli könyvelése Stock
 DocType: Sales Invoice,Sales Team1,Értékesítő csapat1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Elem {0} nem létezik
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Elem {0} nem létezik
 DocType: Sales Invoice,Customer Address,Vevő címe
 DocType: Purchase Invoice,Apply Additional Discount On,Alkalmazza További kedvezmény
 DocType: Account,Root Type,Root Type
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Mutasd ezt slideshow a lap tetején
 DocType: BOM,Item UOM,Az anyag mennyiségi egysége
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Adó összege után kedvezmény összege (Társaság Currency)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Cél raktárban kötelező sorban {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Cél raktárban kötelező sorban {0}
 DocType: Quality Inspection,Quality Inspection,Minőségvizsgálat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag kért Mennyiség kevesebb, mint Minimális rendelési menny"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag kért Mennyiség kevesebb, mint Minimális rendelési menny"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Account {0} lefagyott
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Jogi személy / leányvállalat külön számlatükör tartozó Szervezet.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Élelmiszerek, italok és dohány"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL vagy BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Egyszerre csak fizetés ellenében nem számlázott {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Egyszerre csak fizetés ellenében nem számlázott {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Jutalék mértéke nem lehet nagyobb, mint a 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum készletszint
 DocType: Stock Entry,Subcontract,Alvállalkozói
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Bejövő minőségi ellenőrzés.
 DocType: Purchase Order Item,Returned Qty,Visszatért db
 DocType: Employee,Exit,Kilépés
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type kötelező
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root Type kötelező
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,{0} sorozatszám létrehozva
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","A könnyebb ügyfelek, ezek a kódok használhatók a nyomtatási formátumok, mint számlákon és a szállítóleveleken"
 DocType: Employee,You can enter any date manually,Megadhat bármilyen dátum kézi
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Próbaidő
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Csak az ágakat engedélyezettek a tranzakciós
 DocType: Expense Claim,Expense Approver,Költségén Jóváhagyó
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +110,Row {0}: Advance against Customer must be credit,Sor {0}: Advance ellen ügyfelet meg kell hitelt
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Vásárlási nyugta mellékelt tételek
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Fizet
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Fizet
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Hogy Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS átjáró URL-je
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Rönk fenntartása sms szállítási állapot
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Újra rendelési szint
 DocType: Attendance,Attendance Date,Jelenléti dátuma
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Fizetés szakítás alapján a kereseti és levonás.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Számlát a gyermek csomópontok nem lehet átalakítani főkönyvi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Számlát a gyermek csomópontok nem lehet átalakítani főkönyvi
 DocType: Address,Preferred Shipping Address,Ez legyen a szállítási cím is
 DocType: Purchase Receipt Item,Accepted Warehouse,Elfogadott raktár
 DocType: Bank Reconciliation Detail,Posting Date,Rögzítés dátuma
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,A {0} sorozatszám nem létezik
 DocType: Pricing Rule,Discount Percentage,Kedvezmény százaléka
 DocType: Payment Reconciliation Invoice,Invoice Number,Számla száma
-apps/erpnext/erpnext/hooks.py +54,Orders,Rendelés
+apps/erpnext/erpnext/hooks.py +55,Orders,Rendelés
 DocType: Leave Control Panel,Employee Type,Munkaviszony típusa
 DocType: Employee Leave Approver,Leave Approver,Szabadság jóváhagyó
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Anyaga átadott gyártása
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% -a Anyagok számlázott ellen Vevői
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Időszakban a nevezési határidő
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,"Költség Center meglévő tranzakciók nem lehet átalakítani, hogy csoportban"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Értékcsökkenés
+DocType: Account,Depreciation,Értékcsökkenés
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Szállító (k)
 DocType: Customer,Credit Limit,Credit Limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Tranzakció kiválasztása
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,Igényelt
 DocType: Quotation Item,Against Doctype,Ellen Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Kövesse nyomon ezt a szállítólevél ellen Project
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root fiók nem törölhető
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Származó nettó cash Befektetés
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root fiók nem törölhető
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mutasd Stock bejegyzések
 ,Is Primary Address,Van Elsődleges cím
 DocType: Production Order,Work-in-Progress Warehouse,Work in progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referencia # {0} dátuma {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referencia # {0} dátuma {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Kezelje címek
 DocType: Pricing Rule,Item Code,Tételkód
 DocType: Production Planning Tool,Create Production Orders,Gyártásrendelés létrehozása
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,Felhasználói megjegyzés
 DocType: Lead,Market Segment,Piaci rész
 DocType: Employee Internal Work History,Employee Internal Work History,A munkavállaló cégen belüli mozgása
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Zárás (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Zárás (Dr)
 DocType: Contact,Passive,Passzív
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} nincs raktáron
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Adó sablon eladási ügyleteket.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,Számlázott összeg
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Megbékélés
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get frissítések
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,"A(z) {0} anyagigénylés törölve, vagy leállítva"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,"A(z) {0} anyagigénylés törölve, vagy leállítva"
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Adjunk hozzá néhány mintát bejegyzések
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Hagyja Management
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Számla által csoportosítva
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","A számla fej mellett felelősség, amelyben Profit / Loss könyvelik"
 DocType: Payment Tool,Against Vouchers,Ellen utalványok
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Gyors súgó
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Értékesítési Extrák
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} költségvetés Account {1} ellen Cost Center {2} meg fogja haladni a {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Különbség Figyelembe kell lennie Eszköz / Forrás típusú számla, mivel ez a Stock Megbékélés egy Nyitva Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Megrendelés számát szükséges Elem {0}
 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"" a ""Dátumig"" után kell állnia"
 ,Stock Projected Qty,Stock kivetített Mennyiség
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Vásárlói {0} nem tartozik a projekt {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Vásárlói {0} nem tartozik a projekt {1}
 DocType: Sales Order,Customer's Purchase Order,Ügyfél Megrendelés
 DocType: Warranty Claim,From Company,Cégtől
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Érték vagy menny
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Hagyja Block List hozhatja
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Fogod használni a belépéshez
 DocType: Sales Partner,Retailer,Kiskereskedő
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Hitel figyelembe kell egy Mérlegszámla
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Hitel figyelembe kell egy Mérlegszámla
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Minden beszállító típusok
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Elem kód megadása kötelező, mert pont nincs automatikusan számozott"
+apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Elem kód megadása kötelező, mert pont nincs automatikusan számozott"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Idézet {0} nem type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Karbantartandó eszköz
 DocType: Sales Order,%  Delivered,% kiszállítva
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),A bruttó tömeg a csomag. Általában a nettó tömeg + csomagolóanyag súlyát. (Nyomtatási)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"A felhasználók ezzel a szereppel megengedett, hogy a befagyasztott számlák és létrehozza / módosítja könyvelési tételek ellen befagyasztott számlák"
 DocType: Serial No,Is Cancelled,ez törölve
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Saját szállítások
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Saját szállítások
 DocType: Journal Entry,Bill Date,Bill dátuma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Még ha több árképzési szabályok kiemelten, akkor a következő belső prioritások kerülnek alkalmazásra:"
 DocType: Supplier,Supplier Details,Beszállító részletei
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Hívások
 DocType: Project,Total Costing Amount (via Time Logs),Összesen Költség Összeg (via Idő Napló)
 DocType: Purchase Order Item Supplied,Stock UOM,Készlet mértékegysége
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Megrendelés {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Megrendelés {0} nem nyújtják be
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Tervezett
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} nem tartozik Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Megjegyzés: A rendszer nem ellenőrzi túlteljesítés és over-foglalás jogcím {0}, mint a mennyiség vagy összeg 0"
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Megjegyzés: A rendszer nem ellenőrzi túlteljesítés és over-foglalás jogcím {0}, mint a mennyiség vagy összeg 0"
 DocType: Notification Control,Quotation Message,Idézet Message
 DocType: Issue,Opening Date,Kezdési dátum
 DocType: Journal Entry,Remark,Megjegyzés
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,Kötegelt a számlázással
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Bills által felvetett Szállítók.
 DocType: POS Profile,Write Off Account,Leíró számla
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Kedvezmény összege
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against vásárlási számla
 DocType: Item,Warranty Period (in days),Garancia hossza (napokban)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Származó nettó cash-műveletek
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,pl. ÁFA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4. pont
 DocType: Journal Entry Account,Journal Entry Account,Könyvelési tétel számlaszáma
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"A nyugdíjazás nagyobbnak kell lennie, mint Csatlakozás dátuma"
 DocType: Sales Invoice,Against Income Account,Elleni jövedelem számla
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% szállítva
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,"Elem {0}: Rendezett Mennyiség {1} nem lehet kevesebb, mint a minimális rendelési mennyiség {2} (pontban meghatározott)."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,"Elem {0}: Rendezett Mennyiség {1} nem lehet kevesebb, mint a minimális rendelési mennyiség {2} (pontban meghatározott)."
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Havi elosztási százalék
 DocType: Territory,Territory Targets,Területi célpontok
 DocType: Delivery Note,Transporter Info,Fuvarozó adatai
@@ -2421,10 +2443,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch szám kötelező tétel {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,"Ez egy gyökér értékesítő személyt, és nem lehet szerkeszteni."
 ,Stock Ledger,Készlet könyvelés
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Rate: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Fizetés Slip levonása
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Válasszon egy csoportot csomópont először.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Ezen célok közül kell választani: {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Ezen célok közül kell választani: {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,"Töltse ki az űrlapot, és mentse el"
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Töltse le a jelentést, amely tartalmazza az összes nyersanyagot, a legfrissebb Készlet állapot"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Közösségi Fórum
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Cég (nem ügyfél vagy szállító) mestere.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Kérjük, írja be a ""szülés várható időpontja"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Szállítólevelek {0} törölni kell lemondása előtt ezt a Vevői rendelés
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,"Befizetett összeg + Írja egyszeri összeg nem lehet nagyobb, mint a Grand Total"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,"Befizetett összeg + Írja egyszeri összeg nem lehet nagyobb, mint a 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} nem érvényes Batch Number jogcím {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Megjegyzés: Nincs elég szabadság mérlege Leave Type {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Megjegyzés: Ha a fizetés nem történik ellen utalást, hogy Naplókönyvelés kézzel."
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,"{0} ""{1}"" le van tiltva"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Beállítás Nyílt
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Küldd automatikus e-maileket Kapcsolatok benyújtásával tranzakciókat.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Menny nem avalable raktárban {1} a {2} {3}. Elérhető Mennyiség: {4}, Transzfer Mennyiség: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3. pont
 DocType: Purchase Order,Customer Contact Email,Vásárlói Email
 DocType: Sales Team,Contribution (%),Hozzájárulás (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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, mert ""Készpénz vagy bankszámláját"" nem volt megadva"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,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, mert ""Készpénz vagy bankszámláját"" nem volt megadva"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Felelősségek
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Sablon
 DocType: Sales Person,Sales Person Name,Értékesítő neve
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Mielőtt megbékélés
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Adók és költségek hozzáadása (a cég pénznemében)
-apps/erpnext/erpnext/stock/doctype/item/item.py +374,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Elem Tax Row {0} kell figyelembe típusú adót vagy bevételként vagy ráfordításként vagy fizetős
+apps/erpnext/erpnext/stock/doctype/item/item.py +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Elem Tax Row {0} kell figyelembe típusú adót vagy bevételként vagy ráfordításként vagy fizetős
 DocType: Sales Order,Partly Billed,Részben számlázott
 DocType: Item,Default BOM,Alapértelmezett BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Kérjük ismíteld cég nevét, hogy erősítse"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Teljes fennálló Amt
 DocType: Time Log Batch,Total Hours,Össz óraszám
 DocType: Journal Entry,Printing Settings,Nyomtatási beállítások
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},"Összesen Betéti kell egyeznie az összes Credit. A különbség az, {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},"Összesen Betéti kell egyeznie az összes Credit. A különbség az, {0}"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Áthozás fuvarlevélből
 DocType: Time Log,From Time,Időtől
 DocType: Notification Control,Custom Message,Egyedi üzenet
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Készpénz vagy bankszámlára kötelező a fizetés bejegyzés
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Készpénz vagy bankszámlára kötelező a fizetés bejegyzés
 DocType: Purchase Invoice,Price List Exchange Rate,Árlista árfolyam
 DocType: Purchase Invoice Item,Rate,Arány
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","Többszörös Ár szabály létezik azonos kritériumok, kérjük, oldja \ konfliktus elsőbbséget. Ár Szabályok: {0}"
 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 +580,Issue Material,Kérdés Anyag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Kérdés Anyag
 DocType: Material Request Item,For Warehouse,Ebbe a raktárba
 DocType: Employee,Offer Date,Ajánlat dátum
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Idézetek
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,Sorozatszám
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Kérjük, adja fenntartás Részletek először"
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,"Jelenleg több, mint a szabadság munkanapon ebben a hónapban."
 DocType: Product Bundle Item,Product Bundle Item,Termék Bundle pont
 DocType: Sales Partner,Sales Partner Name,Értékesítő partner neve
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maximális Számla összege
 DocType: Purchase Invoice Item,Image View,Kép megtekintése
 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 időpontok megadása
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & árutőzsdén
+apps/erpnext/erpnext/stock/doctype/item/item.py +553,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége Variant &#39;{0}&#39; meg kell egyeznie a sablon &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,A számítás ezen alapul
 DocType: Delivery Note Item,From Warehouse,Raktárról
 DocType: Purchase Taxes and Charges,Valuation and Total,Értékelési és Total
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ez pont egy változata {0} (Template). Attribútumok kerülnek másolásra át a sablont, kivéve, ha ""No Copy"" van beállítva"
 DocType: Account,Purchase User,Vásárlási Felhasználó
 DocType: Notification Control,Customize the Notification,Értesítés testreszabása
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,A működésből származó pénzáramlás
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Alapértelmezett Címsablon nem lehet törölni
 DocType: Sales Invoice,Shipping Rule,Szállítási lehetőség
 DocType: Journal Entry,Print Heading,Nyomtatás címsor
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Nyersanyag
 DocType: Leave Application,Follow via Email,Kövesse e-mailben
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Adó összege után kedvezmény összege
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Gyermek fiók létezik erre a számlára. Nem törölheti ezt a fiókot.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,Child account exists for this account. You can not delete this account.,Gyermek 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 target Menny vagy előirányzott összeg kötelező
 apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Nincs alapértelmezett BOM létezik tétel {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Kérjük, válasszon Könyvelési dátum első"
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Szükséges a Serialized tétel {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Alkalmazandó (elnevezését)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,A kosárban
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Csoportosítva
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Engedélyezése / tiltása a pénznemnek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postai költségek
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Szórakozás és szabadidő
 DocType: Purchase Order,The date on which recurring order will be stop,"Az időpont, amikor az ismétlődő rend lesz megállítani"
 DocType: Quality Inspection,Item Serial No,Anyag-sorozatszám
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} csökkenteni kell {1} vagy növelnie kell overflow tolerancia
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} csökkenteni kell {1} vagy növelnie kell overflow tolerancia
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Összesen Present
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Óra
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialized Elem {0} nem lehet frissíteni \ felhasználásával Stock Megbékélés
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Át az anyagot szállító
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Át az anyagot szállító
 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 Serial No nem lehet Warehouse. Warehouse kell beállítani Stock Entry vagy vásárlási nyugta
 DocType: Lead,Lead Type,Célpont típusa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Hozzon létre Idézet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Ön nem jogosult jóváhagyni levelek blokkolása időpontjai
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Mindezen tételek már kiszámlázott
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Mindezen tételek már kiszámlázott
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Lehet jóvá {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Szállítás feltételei
 DocType: BOM Replace Tool,The new BOM after replacement,"Az anyagjegyzék, amire le lesz cserélve mindenhol"
 DocType: Features Setup,Point of Sale,Értékesítési hely
 DocType: Account,Tax,Adó
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} nem érvényes {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,A Termék Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,A Termék Bundle
 DocType: Production Planning Tool,Production Planning Tool,Gyártástervező eszköz
 DocType: Quality Inspection,Report Date,Jelentés dátuma
 DocType: C-Form,Invoices,Számlák
 DocType: Job Opening,Job Title,Állás megnevezése
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} címzettek
 DocType: Features Setup,Item Groups in Details,Az anyagcsoport részletei
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Mennyiség hogy Előállítás nagyobbnak kell lennie, mint 0."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -2618,8 +2644,9 @@
 DocType: Stock Entry,Update Rate and Availability,Frissítési gyakoriság és a szabad
 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ékos Ön lehet kapni, vagy adja tovább ellen a megrendelt mennyiség. Például: Ha Ön által megrendelt 100 egység. és a juttatás 10%, akkor Ön lehet kapni 110 egység."
 DocType: Pricing Rule,Customer Group,Vevő csoport
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Költség számla kötelező elem {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Költség számla kötelező elem {0}
 DocType: Item,Website Description,Weboldal leírása
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Nettó változása Részvény
 DocType: Serial No,AMC Expiry Date,Éves karbantartási szerződés lejárati dátuma
 ,Sales Register,Értékesítési Regisztráció
 DocType: Quotation,Quotation Lost Reason,Árajánlat elutasításának oka
@@ -2627,12 +2654,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nincs semmi szerkeszteni.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,"Összefoglaló ebben a hónapban, és folyamatban lévő tevékenységek"
 DocType: Customer Group,Customer Group Name,Vevő csoport neve
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},Töröld a számla {0} a C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Please remove this Invoice {0} from C-Form {1},Töröld a számla {0} a 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,"Kérjük, válasszon átviszi, ha Ön is szeretné közé előző pénzügyi év mérlege hagyja a költségvetési évben"
 DocType: GL Entry,Against Voucher Type,Ellen-bizonylat típusa
 DocType: Item,Attributes,Attribútumok
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Tételek áthozása
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Kérjük, adja leírni Account"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Tételek áthozása
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Kérjük, adja leírni Account"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Utolsó rendelési dátum
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Tedd Jövedéki számla
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Account {0} nem tartozik a cég {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Project-bölcs adatok nem állnak rendelkezésre árajánlat
 DocType: Project,Expected End Date,Várható befejezés dátuma
 DocType: Appraisal Template,Appraisal Template Title,Teljesítmény értékelő sablon címe
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Kereskedelmi
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Kereskedelmi
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Szülőelem {0} nem lehet Stock pont
 DocType: Cost Center,Distribution Id,Nagykereskedelem azonosító
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Döbbenetes szolgáltatások
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Érték Képesség {0} kell tartományon belül a {1} {2} a lépésekben {3}
 DocType: Tax Rule,Sales,Értékesítés
 DocType: Stock Entry Detail,Basic Amount,Alapösszege
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse szükséges Stock tétel {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Warehouse szükséges Stock tétel {0}
 DocType: Leave Allocation,Unused leaves,A fel nem használt levelek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Kr
 DocType: Customer,Default Receivable Accounts,Default Követelés számlák
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Növekménye Képesség {0} nem lehet 0
 DocType: Journal Entry,Pay To / Recd From,Fizetni / követelni tőle
 DocType: Naming Series,Setup Series,Sorszámozás beállítása
+DocType: Payment Reconciliation,To Invoice Date,A számla keltétől
 DocType: Supplier,Contact HTML,Kapcsolattartó HTML leírása
 DocType: Landed Cost Voucher,Purchase Receipts,Vásárlási bevételek
-DocType: Payment Reconciliation,Maximum Amount,Maximális összeg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hogyan árképzési szabály alkalmazása során?
 DocType: Quality Inspection,Delivery Note No,Szállítólevél száma
 DocType: Company,Retail,Kiskereskedelem
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Vásárlói {0} nem létezik
 DocType: Attendance,Absent,Hiányzik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Termék Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Sor {0}: Érvénytelen hivatkozás {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Termék Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Sor {0}: Érvénytelen hivatkozás {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vásároljon adók és illetékek Template
 DocType: Upload Attendance,Download Template,Sablon letöltése
 DocType: GL Entry,Remarks,Megjegyzések
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,Havi jelenléti ív
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nem található bejegyzés
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Cost Center kötelező tétel {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Hogy elemeket Termék Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Hogy elemeket Termék Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Account {0} inaktív
 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,Jelenléti Dátum és jelenlét a mai napig kötelező
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Eredménykimutatás"" típusú számla {0} nem engedélyezett Nyitó Bejegyzés"
 DocType: Features Setup,Sales Discounts,Értékesítési Kedvezmények
 DocType: Hub Settings,Seller Country,Eladó Ország
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Adja Napirendi honlap
 DocType: Authorization Rule,Authorization Rule,Jóváhagyási szabály
 DocType: Sales Invoice,Terms and Conditions Details,Általános szerződési feltételek részletei
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Műszaki adatok
 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/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ruházat és kiegészítők
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Számú rendelés
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,Számlázási Összeg
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Érvénytelen mennyiséget megadott elem {0}. A mennyiség nagyobb, mint 0."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,A pályázatokat a szabadság.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Véve a meglévő ügylet nem törölhető
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Véve a meglévő ügylet nem törölhető
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Jogi költségek
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","A hónap napja, amelyen auto érdekében jön létre pl 05, 28 stb"
 DocType: Sales Invoice,Posting Time,Rögzítés ideje
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,Üzemzavar
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Fiók: {0} pénznem: {1} nem választható
 DocType: Bank Reconciliation Detail,Cheque Date,Csekk dátuma
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: Parent véve {1} nem tartozik a cég: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: Parent véve {1} nem tartozik a cég: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Sikeresen törölve valamennyi ügylet a vállalattal kapcsolatos!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Mivel a dátum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Próbaidő
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Alapértelmezett Warehouse kötelező Stock tétel.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Alapértelmezett Warehouse kötelező Stock tétel.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Kifizetését fizetése a hónap {0} és az év {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert árjegyzéke mértéke, ha hiányzik"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Teljes befizetett összeg
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Összesen Számlázási összeg (via Idő Napló)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Az általunk forgalmazott ezt a tárgyat
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Szállító Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,"Mennyiség nagyobbnak kell lennie, mint 0"
 DocType: Journal Entry,Cash Entry,Készpénz Entry
 DocType: Sales Partner,Contact Desc,Kapcsolattartó leírása
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Típusú levelek, mint alkalmi, beteg stb"
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Add sorok beállítani éves költségvetésekben számlák.
 DocType: Buying Settings,Default Supplier Type,Alapértelmezett beszállító típus
 DocType: Production Order,Total Operating Cost,Teljes működési költség
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Megjegyzés: Elem {0} többször jelenik meg
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Megjegyzés: Elem {0} többször jelenik meg
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Minden Kapcsolattartó.
 DocType: Newsletter,Test Email Id,Teszt email azonosítója
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Cég rövidítése
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Minden vásárlói csoport
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán Pénzváltó rekord nem teremtett {1} {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Adó Sablon kötelező.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Account {0}: Parent véve {1} nem létezik
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,Account {0}: Parent véve {1} nem létezik
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Árlista Rate (Társaság Currency)
 DocType: Account,Temporary,Ideiglenes
 DocType: Address,Preferred Billing Address,Ez legyen a számlázási cím is
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,Elem-bölcs árjegyzéke Rate
 DocType: Purchase Order Item,Supplier Quotation,Beszállítói ajánlat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"A szavak lesz látható, ha menteni a stringet."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} megállt
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} megállt
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
 DocType: Lead,Add to calendar on this date,Hozzáadás a naptárhoz ezen a napon
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Szabályok hozzátéve szállítási költségeket.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Közelgő események
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,Célponttól
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Megrendelések bocsátott termelés.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Válassza ki Fiscal Year ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS Profil köteles a POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS Profil köteles a POS Entry
 DocType: Hub Settings,Name Token,Név Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Normál Ajánló
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Adni legalább egy raktárban kötelező
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Selling,Normál Ajánló
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Adni legalább egy raktárban kötelező
 DocType: Serial No,Out of Warranty,Garanciaidőn túl
 DocType: BOM Replace Tool,Replace,Csere
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} ellen Értékesítési számlák {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Kérjük, adja alapértelmezett mértékegység"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} ellen Értékesítési számlák {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,"Kérjük, adja alapértelmezett mértékegység"
 DocType: Purchase Invoice Item,Project Name,Projekt neve
 DocType: Supplier,Mention if non-standard receivable account,"Beszélve, ha nem szabványos követelések számla"
 DocType: Journal Entry Account,If Income or Expense,Ha bevételként vagy ráfordításként
 DocType: Features Setup,Item Batch Nos,Anyag kötegszáma
 DocType: Stock Ledger Entry,Stock Value Difference,Stock értékkülönbözet
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Emberi Erőforrás
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,Emberi Erőforrás
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Fizetési Megbékélés Fizetés
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Adó eszközök
 DocType: BOM Item,BOM No,Anyagjegyzék száma
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Naplókönyvelés {0} nem veszik {1} vagy már párba utalvány
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,Journal Entry {0} does not have account {1} or already matched against other voucher,Naplókönyvelés {0} nem veszik {1} vagy már párba utalvány
 DocType: Item,Moving Average,Mozgóátlag
 DocType: BOM Replace Tool,The BOM which will be replaced,"Az anyagjegyzék, ami le lesz cserélve mindenhol"
 DocType: Account,Debit,Tartozás
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,Járulékos költség
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Üzleti év végén dátuma
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nem tudja kiszűrni alapján utalvány No, ha csoportosítva utalvány"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Beszállítói ajánlat készítése
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Beszállítói ajánlat készítése
 DocType: Quality Inspection,Incoming,Bejövő
 DocType: BOM,Materials Required (Exploded),Szükséges anyagok (Robbantott)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Csökkentse Megszerezte a fizetés nélküli szabadságon (LWP)
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Sor # {0}: Sorszám {1} nem egyezik a {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Alkalmi szabadság
 DocType: Batch,Batch ID,Köteg ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Megjegyzés: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Megjegyzés: {0}
 ,Delivery Note Trends,Szállítólevélen Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ezen a héten összefoglalója
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} kell egy megvásárolt vagy alvállalkozásba tétel sorában {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Átlagos vásárlási ráta
 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/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},"A teljes téma / Transfer mennyiséget {0} Anyag kérése {1} nem lehet nagyobb, mint kért mennyiséget {2} jogcím {3}"
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Hírlevelek
 DocType: Address,Shipping,Szállítás
 DocType: Stock Ledger Entry,Stock Ledger Entry,Készlet könyvelés tétele
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,A befejezés dátuma az aktuális rendelés időszaka
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Tedd Ajánlatot Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Visszatérés
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Alapértelmezett mértékegysége Variant meg kell egyeznie a Template
 DocType: Production Order Operation,Production Order Operation,Gyártási rendelés Operation
 DocType: Pricing Rule,Disable,Tiltva
 DocType: Project Task,Pending Review,Ellenőrzésre vár
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Az ügyfél Id
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"Az Idő nagyobbnak kell lennie, mint a Time"
 DocType: Journal Entry Account,Exchange Rate,Átváltási arány
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Vevői {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Vevői {0} nem nyújtják be
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Parent véve {1} nem Bolong a cég {2}
 DocType: BOM,Last Purchase Rate,Utolsó beszerzési ár
 DocType: Account,Asset,Vagyontárgy
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,Elérhető készlet a csomagoláshoz
 DocType: Item Variant,Item Variant,Elem Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Ha ezt Címsablon alapértelmezett, mivel nincs más alapértelmezett"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Számlaegyenleg már terhelés, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Credit"""
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Számlaegyenleg már terhelés, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Credit"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,A szűrő ügyfélen alapul
 DocType: Payment Tool Detail,Against Voucher No,Ellen betétlapjának
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,Következő Kapcsolat
 DocType: Employee,Employment Type,Dolgozó típusa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Befektetett eszközök
+,Cash Flow,Pénzforgalom
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Jelentkezési határidő nem lehet az egész két alocation bejegyzések
 DocType: Item Group,Default Expense Account,Alapértelmezett áfás számlát
 DocType: Employee,Notice (days),Figyelmeztetés (nap)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,Raktárak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Nyomtatás és álló
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Csoport Node
-DocType: Payment Reconciliation,Minimum Amount,Minimális összeg
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Késztermék frissítése
 DocType: Workstation,per hour,óránként
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Véve a raktárban (Perpetual Inventory) jön létre e számla.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Raktár nem lehet törölni a készletek főkönyvi bejegyzés létezik erre a raktárban.
 DocType: Company,Distribution,Nagykereskedelem
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Kifizetett Összeg
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Kifizetett Összeg
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projekt menedzser
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,A(z) {0} tételre max. {1}% engedmény adható
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Támogatási analitika
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Cég hiányát raktárakban {0}
 DocType: POS Profile,Terms and Conditions,Általános Szerződési Feltételek
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},El kellene belüli pénzügyi évben. Feltételezve To Date = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},El kellene belüli pénzügyi évben. Feltételezve To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Itt tart fenn magasság, súly, allergia, egészségügyi problémák stb"
 DocType: Leave Block List,Applies to Company,Vonatkozik Társaság
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Nem lehet mondani, mert be Stock Entry {0} létezik"
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Kérjük, adja vásárlás nyugtáinak"
 DocType: Sales Invoice,Get Advances Received,Befogadott előlegek átmásolása
 DocType: Email Digest,Add/Remove Recipients,Hozzáadása / eltávolítása címzettek
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},A tranzakció nem megengedett ellen leállította a termelést Megrendelni {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,Transaction not allowed against stopped Production Order {0},A tranzakció nem megengedett ellen leállította a termelést Megrendelni {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 a költségvetési évben alapértelmezettként, kattintson a ""Beállítás alapértelmezettként"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Beállítás bejövő kiszolgáló támogatási email id. (Pl support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Hiány Mennyiség
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Elem változat {0} létezik azonos tulajdonságokkal
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Elem változat {0} létezik azonos tulajdonságokkal
 DocType: Salary Slip,Salary Slip,Bérlap
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Időpontig"" szükséges"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Létrehoz csomagolás kombiné a csomagokat szállítani. Használt értesíteni csomag számát, a doboz tartalma, és a súlya."
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Munkavállalók adatait.
 DocType: HR Settings,Payroll Settings,Bérszámfejtés Beállítások
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Egyezik összeköttetésben nem álló számlákat és a kifizetéseket.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Place Order
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Place Order
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root nem lehet egy szülő költséghely
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Válasszon márkát ...
 DocType: Sales Invoice,C-Form Applicable,C-formában idéztük
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,Kezdés dátuma
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Osztja levelek időszakra.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Kattintson ide, hogy ellenőrizze"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Account {0}: Nem rendelhet magának szülői fiók
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Account {0}: Nem rendelhet magának szülői fiók
 DocType: Purchase Invoice Item,Price List Rate,Árlista arány
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mutasd a ""raktáron"", vagy ""nincs raktáron"" alapján álló állomány ebben a raktárban."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Anyagjegyzék (BOM)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,Várható indulás dátuma
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Vegye ki az elemet, ha terheket nem adott elemre alkalmazandó"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Pl. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Kaphat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Kaphat
 DocType: Maintenance Visit,Fully Completed,Teljesen kész
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% kész
 DocType: Employee,Educational Qualification,Iskolai végzettség
 DocType: Workstation,Operating Costs,A működési költségek
 DocType: Employee Leave Approver,Employee Leave Approver,Munkavállalói Leave Jóváhagyó
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} sikeresen hozzáadva a hírlevél listán.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Egy Reorder bejegyzés már létezik erre a raktárban {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Egy Reorder bejegyzés már létezik erre a raktárban {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nem jelenthetjük, mint elveszett, mert Idézet történt."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Vásárlási mester menedzser
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Gyártási rendelés {0} kell benyújtani
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Gyártási rendelés {0} kell benyújtani
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Kérjük, válassza ki a Start és végének dátumát jogcím {0}"
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Főbb jelentések
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,"A mai napig nem lehet, mielőtt a dátumot"
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,Iparág
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Valami hiba történt!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Figyelmeztetés: Hagyjon kérelem tartalmazza a következő blokk húsz óra
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Értékesítési számlák {0} már benyújtott
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Értékesítési számlák {0} már benyújtott
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Teljesítési dátum
 DocType: Purchase Invoice Item,Amount (Company Currency),Összeg (Társaság Currency)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Szervezeti egység (osztály) mestere.
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,Sorozatszám karbantartási szerződés lejárati ideje
 DocType: Item,Unit of Measure Conversion,Mértékegység átváltás
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Nem változtatható meg a munkavállaló
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Egy bejegyzésben nem lehet egyszerre tartozás és követelés is.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Egy bejegyzésben nem lehet egyszerre tartozás és követelés is.
 DocType: Naming Series,Help HTML,Súgó HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Összesen weightage kijelölt kell 100%. Ez {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Engedmény a túl- {0} keresztbe jogcím {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Engedmény a túl- {0} keresztbe jogcím {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Teljes név vagy szervezet, amely ezt a címet tartozik."
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Ön Szállítók
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nem lehet beállítani elveszett Sales elrendelése esetén.
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,Probléma dátuma
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: A {0} az {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Sor # {0}: Állítsa Szállító jogcím {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,Weboldal kép {0} csatolt tétel {1} nem található
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Weboldal kép {0} csatolt tétel {1} 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 ezt a tárgyat több csoportban a honlapon.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Kérjük, ellenőrizze Több pénznem opciót, hogy számláikat más pénznemben"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,"Kérjük, ellenőrizze Több pénznem opciót, hogy számláikat más pénznemben"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Cikk: {0} nem létezik a rendszerben
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Ön nem jogosult a beállított értéket Frozen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Ön nem jogosult a beállított értéket Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Nem egyeztetett bejegyzés
+DocType: Payment Reconciliation,From Invoice Date,Honnan Számla dátuma
 DocType: Cost Center,Budgets,Költségvetési
-DocType: Employee,Emergency Contact Details,Sürgősségi Elérhetőségek
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Mit csinál?
 DocType: Delivery Note,To Warehouse,Raktárba
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Account {0} adta meg többször költségvetési évben {1}
 ,Average Commission Rate,Átlagos jutalék mértéke
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Jelenlétit nem lehet megjelölni a jövőbeli időpontokban
 DocType: Pricing Rule,Pricing Rule Help,Árképzési szabály Súgó
 DocType: Purchase Taxes and Charges,Account Head,Számla fejléc
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Frissítse többletköltségek kiszámítására landolt bekerülési
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektromos
 DocType: Stock Entry,Total Value Difference (Out - In),Összesen értékkülönbözet (Out - A)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Sor {0}: árfolyam kötelező
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Sor {0}: árfolyam kötelező
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Felhasználói azonosító nem állította be az Employee {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Re jótállási igény
 DocType: Stock Entry,Default Source Warehouse,Alapértelmezett raktár
 DocType: Item,Customer Code,Vevő kódja
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Születésnapi emlékeztető {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Napok óta utolsó rendelés
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Megterhelése figyelembe kell egy Mérlegszámla
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,Debit To account must be a Balance Sheet account,Megterhelése figyelembe kell egy Mérlegszámla
 DocType: Buying Settings,Naming Series,Sorszámozási csoport
 DocType: Leave Block List,Leave Block List Name,Hagyja Block List név
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Eszközök
@@ -3271,7 +3301,7 @@
 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} típusú legyen kötelezettség / saját tőke
 DocType: Authorization Rule,Based On,Alapuló
 DocType: Sales Order Item,Ordered Qty,Rendelt menny.
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Elem {0} van tiltva
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Elem {0} van tiltva
 DocType: Stock Settings,Stock Frozen Upto,Készlet zárolása eddig
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},"Közötti időszakra, és időszakról kilenc óra kötelező visszatérő {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt feladatok és tevékenységek.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Vásárlási ellenőrizni kell, amennyiben alkalmazható a kiválasztott {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"A kedvezménynek kisebbnek kell lennie, mint 100"
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Írj egy egyszeri összeget (Társaság Currency)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beszerzési költség utalvány
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Kérjük, állítsa {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Ismételje meg a hónap napja
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,Feltöltés Nézőszám
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mennyiség van szükség
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing tartomány 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Összeg
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Összeg
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Anyagjegyzék cserélve
 ,Sales Analytics,Értékesítési analítika
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,"Kérjük, adja alapértelmezett pénznem Company mester"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,"Kérjük, adja alapértelmezett pénznem Company mester"
 DocType: Stock Entry Detail,Stock Entry Detail,Készlet mozgás részletei
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Napi emlékeztetők
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Adó szabály ütközik {0}
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,"A termelt mennyiség,"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Mérnök
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Keresés részegységek
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Tételkód szükség Row {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Tételkód szükség Row {0}
 DocType: Sales Partner,Partner Type,Partner típusa
 DocType: Purchase Taxes and Charges,Actual,Tényleges
 DocType: Authorization Rule,Customerwise Discount,Customerwise Kedvezmény
 DocType: Purchase Invoice,Against Expense Account,Ellen áfás számlát
 DocType: Production Order,Production Order,Gyártásrendelés
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Telepítési feljegyzés {0} már benyújtott
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Telepítési feljegyzés {0} már benyújtott
 DocType: Quotation Item,Against Docname,Ellen Docname
 DocType: SMS Center,All Employee (Active),Minden dolgozó (Aktív)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Tekintse meg most
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,Alkalmazható Nyaralás listája
 DocType: Employee,Cheque,Csekk
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Sorozat Frissítve
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Report Type kötelező
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Report Type kötelező
 DocType: Item,Serial Number Series,Sorozatszám sorozat
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse kötelező Stock tétel {0} sorban {1}
 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 Elem több csoportban
 apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Az első felhasználó: You
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Pénzügyi év kezdő dátuma és a pénzügyi év vége dátum már meghatározták Fiscal Year {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Sikeresen Egyeztetett
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Pénzügyi év kezdő dátuma és a pénzügyi év vége dátum már meghatározták Fiscal Year {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Sikeresen Egyeztetett
 DocType: Production Order,Planned End Date,Tervezett befejezési dátuma
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ahol az anyagok tárolva vannak.
 DocType: Tax Rule,Validity,Érvényességi
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,Jelenléti
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Postára adás dátuma és a kiküldetés ideje kötelező
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Postára adás dátuma és a kiküldetés ideje kötelező
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Adó sablont vásárol tranzakciókat.
 ,Item Prices,Elem árak
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,A szavak lesz látható mentése után a megrendelés.
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,Vélemény dátuma
 DocType: Purchase Invoice,Advance Payments,Előzetes kifizetések
 DocType: Purchase Taxes and Charges,On Net Total,Nettó összeshez
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Cél raktár sorban {0} meg kell egyeznie a gyártási utasítás
+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 sorban {0} meg kell egyeznie a gyártási utasítás
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nincs joga felhasználni fizetési eszköz
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""Értesítési e-mail címek"" nem meghatározott ismétlődő% s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,"Valuta nem lehet változtatni, miután bejegyzések segítségével más pénznemben"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,"Valuta nem lehet változtatni, miután bejegyzések segítségével más pénznemben"
 DocType: Company,Round Off Account,Fejezze ki Account
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Igazgatási költségek
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Tanácsadó
 DocType: Customer Group,Parent Customer Group,Szülő Vásárlói csoport
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Változás
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Változás
 DocType: Purchase Invoice,Contact Email,Kapcsolattartó e-mailcíme
 DocType: Appraisal Goal,Score Earned,Pontszám Szerzett
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","pl. ""Cégem Kft."""
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,Bruttó tömeg mértékegysége
 DocType: Email Digest,Receivables / Payables,Követelések / Kötelezettségek
 DocType: Delivery Note Item,Against Sales Invoice,Ellen Értékesítési számlák
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Hitelszámla
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Hitelszámla
 DocType: Landed Cost Item,Landed Cost Item,Beszerzési költség tétel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mutasd a nulla értékeket
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,"Mennyiség pont után kapott gyártási / visszacsomagolásánál a megadott alapanyagok mennyiségét,"
 DocType: Payment Reconciliation,Receivable / Payable Account,Követelések / Account
 DocType: Delivery Note Item,Against Sales Order Item,Ellen Vevői Elem
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},"Kérjük, adja Jellemző értéke az attribútum {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},"Kérjük, adja Jellemző értéke az attribútum {0}"
 DocType: Item,Default Warehouse,Alapértelmezett raktár
 DocType: Task,Actual End Date (via Time Logs),Tényleges End Date (via Idő Napló)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Költségvetést nem lehet rendelni ellen Group Account {0}
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Tervezze idő naplók kívül Workstation munkaidő.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} már benyújtott
 ,Items To Be Requested,Tételek kell kérni
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Kap Utolsó Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Díjszabás alapján tevékenység típusa (óránként)
 DocType: Company,Company Info,Cégadatok
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Cég E-mail ID nem található, így a levél nem ment"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),A vagyon (eszközök)
 DocType: Production Planning Tool,Filter based on item,A szűrő cikken alapul
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Betéti Számla
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Betéti Számla
 DocType: Fiscal Year,Year Start Date,Év Start Date
 DocType: Attendance,Employee Name,Munkavállalói név
 DocType: Sales Invoice,Rounded Total (Company Currency),Kerekített összeg (a cég pénznemében)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Nem burkolt csoporthoz, mert Account Type választja."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Nem burkolt csoporthoz, mert Account Type választja."
 DocType: Purchase Common,Purchase Common,Vásárlási Közös
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} módosításra került. Kérjük, frissítse."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Állj felhasználók abban, hogy Leave Alkalmazások következő napokon."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,A lehetőségektől
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Munkavállalói juttatások
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiséget kell egyezniük a mennyiséget tétel {0} sorban {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiséget kell egyezniük a mennyiséget tétel {0} sorban {1}
 DocType: Production Order,Manufactured Qty,Gyártott menny.
 DocType: Purchase Receipt Item,Accepted Quantity,Elfogadott mennyiség
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nem létezik
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Bills emelte az ügyfelek számára.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt azonosító
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row {0}: Az összeg nem lehet nagyobb, mint lévő összeget ad költségelszámolás benyújtás {1}. Függő Összeg: {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row {0}: Az összeg nem lehet nagyobb, mint lévő összeget ad költségelszámolás benyújtás {1}. Függő Összeg: {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} előfizetők hozzá
 DocType: Maintenance Schedule,Schedule,Ütemezés
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Adjuk költségvetés erre a költséghely. Beállításához költségvetésű akció, lásd a &quot;Társaság List&quot;"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Kerékagy
 DocType: GL Entry,Voucher Type,Bizonylat típusa
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,"Árlista nem található, vagy a fogyatékkal"
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,"Árlista nem található, vagy a fogyatékkal"
 DocType: Expense Claim,Approved,Jóváhagyott
 DocType: Pricing Rule,Price,Árazás
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Munkavállalói megkönnyebbült {0} kell beállítani -Bal-
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Számviteli naplóbejegyzések.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Elérhető Mennyiség a raktárról
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Kérjük, válassza ki a dolgozó Record első."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Sor {0}: Party / fiók nem egyezik {1} / {2} a {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Sor {0}: Party / fiók nem egyezik {1} / {2} a {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Hogy hozzon létre egy adószámlára
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Kérjük, adja áfás számlát"
 DocType: Account,Stock,Készlet
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,A szerződés End Date
 DocType: Sales Order,Track this Sales Order against any Project,Kövesse nyomon ezt a Vevői ellen Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull megrendelések (folyamatban szállítani) alapján a fenti kritériumok
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,A beszállító Idézet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,A beszállító Idézet
 DocType: Deduction Type,Deduction Type,Levonás típusa
 DocType: Attendance,Half Day,Félnapos
 DocType: Pricing Rule,Min Qty,Min. menny.
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,Ügylet dátuma
 DocType: Production Plan Item,Planned Qty,Tervezett Mennyiség
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Összes adó
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Mert Mennyiség (gyártott db) kötelező
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Mert Mennyiség (gyártott db) kötelező
 DocType: Stock Entry,Default Target Warehouse,Alapértelmezett cél raktár
 DocType: Purchase Invoice,Net Total (Company Currency),Nettó összesen (a cég pénznemében)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party típusa és fél csak akkor alkalmazható elleni követelések / fiók
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,Jutalék mértéke
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Győződjön Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blokk szabadság alkalmazások osztály.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,A kosár üres
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,A kosár üres
 DocType: Production Order,Actual Operating Cost,Tényleges működési költség
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root nem lehet szerkeszteni.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root nem lehet szerkeszteni.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,"Az elkülönített összeg nem lehet nagyobb, mint a kiigazítatlan összeg"
 DocType: Manufacturing Settings,Allow Production on Holidays,Termelés engedélyezése ünnepnapokon
 DocType: Sales Order,Customer's Purchase Order Date,A Vevő rendelésének dátuma
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Tervező
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Általános szerződési feltételek sablon
 DocType: Serial No,Delivery Details,Szállítási adatok
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Költség Center szükséges sorában {0} adók táblázat típusú {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Költség Center szükséges sorában {0} adók táblázat típusú {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatikusan létrehozza Anyag kérése esetén mennyiséget megadott szint alá esik
 ,Item-wise Purchase Register,Elem-bölcs vásárlása Regisztráció
 DocType: Batch,Expiry Date,Lejárat dátuma
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Beállításához újrarendezésből szinten elemet kell a vásárlást pont vagy a gyártási tétel
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Beállításához újrarendezésből szinten elemet kell a vásárlást pont vagy a gyártási tétel
 ,Supplier Addresses and Contacts,Szállító Címek és Kapcsolatok
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Kérjük, válasszon Kategória első"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projektek.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Fél Nap)
 DocType: Supplier,Credit Days,Credit Napok
 DocType: Leave Type,Is Carry Forward,Van átviszi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Elemek áthozása Anyagjegyzékből
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Elemek áthozása Anyagjegyzékből
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Átfutási idő napokban
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Darabjegyzékben
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party típusa és fél köteles a követelések / fiók {1}
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,Kilépés indoka
 DocType: Expense Claim Detail,Sanctioned Amount,Szentesített Összeg
 DocType: GL Entry,Is Opening,Nyit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: terheléssel nem kapcsolódik a {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Account {0} nem létezik
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Row {0}: terheléssel nem kapcsolódik a {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Account {0} nem létezik
 DocType: Account,Cash,Készpénz
 DocType: Employee,Short biography for website and other publications.,Rövid életrajz honlap és egyéb kiadványok.
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 1acdb7f..d02b83d 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produk Konsumen
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Silakan pilih Partai Jenis pertama
 DocType: Item,Customer Items,Produk Pelanggan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Akun {0}: akun Induk {1} tidak dapat berupa buku besar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Akun {0}: akun Induk {1} tidak dapat berupa buku besar
 DocType: Item,Publish Item to hub.erpnext.com,Publikasikan Item untuk hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Notifikasi Email
 DocType: Item,Default Unit of Measure,Standar Satuan Ukur
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Mata Uang diperlukan untuk Daftar Harga {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dihitung dalam transaksi.
 DocType: Purchase Order,Customer Contact,Kontak Pelanggan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Dari Material Permintaan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Dari Material Permintaan
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Pemohon Job
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Tidak ada lagi hasil.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1.5. Untuk menjaga pelanggan bijaksana kode barang dan membuat mereka dicari berdasarkan penggunaan kode mereka pilihan ini
 DocType: Mode of Payment Account,Mode of Payment Account,Cara Rekening Pembayaran
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Tampilkan Varian
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Kuantitas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Kuantitas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredit (Kewajiban)
 DocType: Employee Education,Year of Passing,Tahun Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Dalam Persediaan
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Perawatan Kesehatan
 DocType: Purchase Invoice,Monthly,Bulanan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Keterlambatan pembayaran (Hari)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Faktur
 DocType: Maintenance Schedule Item,Periodicity,Masa haid
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Alamat Email
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Pertahanan
 DocType: Company,Abbr,Singkatan
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Baris {0}: {1} {2} tidak cocok dengan {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Baris {0}: {1} {2} tidak cocok dengan {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Kendaraan yang
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Silakan pilih Daftar Harga
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Silakan pilih Daftar Harga
 DocType: Production Order Operation,Work In Progress,Bekerja In Progress
 DocType: Employee,Holiday List,Liburan List
 DocType: Time Log,Time Log,Waktu Log
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Perusahaan yang sama dimasukkan lebih dari sekali
 DocType: Employee,Married,Belum Menikah
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Tidak diizinkan untuk {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
 DocType: Payment Reconciliation,Reconcile,Mendamaikan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Toko bahan makanan
 DocType: Quality Inspection Reading,Reading 1,Membaca 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Membuat Bank Masuk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Dana pensiun
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Gudang adalah wajib jika jenis account adalah Gudang
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Gudang adalah wajib jika jenis account adalah Gudang
 DocType: SMS Center,All Sales Person,Semua Salesmen
 DocType: Lead,Person Name,Nama orang
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Periksa apakah urutan berulang, hapus centang untuk menghentikan berulang atau meletakkan tepat Tanggal Berakhir"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Tertarik
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Pembukaan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Dari {0} ke {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Dari {0} ke {1}
 DocType: Item,Copy From Item Group,Salin Dari Barang Grup
 DocType: Journal Entry,Opening Entry,Membuka Entri
 DocType: Stock Entry,Additional Costs,Biaya tambahan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Akun dengan transaksi yang ada tidak dapat dikonversi ke grup.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Akun dengan transaksi yang ada tidak dapat dikonversi ke grup.
 DocType: Lead,Product Enquiry,Enquiry Produk
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Silahkan masukkan perusahaan pertama
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Silakan pilih Perusahaan pertama
 DocType: Employee Education,Under Graduate,Under Graduate
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Sasaran On
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Sasaran On
 DocType: BOM,Total Cost,Total Biaya
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Log Aktivitas:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Item {0} tidak ada dalam sistem atau telah berakhir
@@ -165,7 +165,7 @@
 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 melampirkan gambar yang sudah dimodifikasi.
  Semua tanggal dan karyawan kombinasi dalam jangka waktu yang dipilih akan datang dalam template, dengan catatan kehadiran yang ada"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Item {0} tidak aktif atau akhir hidup telah tercapai
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,Item {0} tidak aktif atau akhir hidup telah tercapai
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Akan diperbarui setelah Faktur Penjualan yang Dikirim.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 Barang, pajak dalam baris {1} juga harus disertakan"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Pengaturan untuk modul HR
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Rincian operasi yang dilakukan.
 DocType: Serial No,Maintenance Status,Status pemeliharaan
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Item dan Harga
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Dari tanggal harus dalam Tahun Anggaran. Dengan asumsi Dari Tanggal = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Dari tanggal harus dalam Tahun Anggaran. Dengan asumsi Dari Tanggal = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Pilih Karyawan untuk siapa Anda menciptakan Appraisal.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Biaya Pusat {0} bukan milik Perusahaan {1}
 DocType: Customer,Individual,Individu
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Masukkan Perusahaan
 DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Penjualan Faktur Barang
 ,Production Orders in Progress,Pesanan produksi di Progress
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Kas Bersih dari Pendanaan
 DocType: Lead,Address & Contact,Alamat & Kontak
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan daun yang tidak terpakai dari alokasi sebelumnya
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Berikutnya Berulang {0} akan dibuat pada {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Nama Kontak
 DocType: Production Plan Item,SO Pending Qty,SO Pending Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Membuat Slip gaji untuk kriteria yang disebutkan di atas.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Tidak diberikan deskripsi
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Permintaan pembelian.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Menghilangkan Tanggal harus lebih besar dari Tanggal Bergabung
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,Item Situs Spesifikasi
 DocType: Payment Tool,Reference No,Referensi Tidak
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Tinggalkan Diblokir
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bursa Rekonsiliasi Barang
 DocType: Stock Entry,Sales Invoice No,Penjualan Faktur ada
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Pemasok Type
 DocType: Item,Publish in Hub,Publikasikan di Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Item {0} dibatalkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Item {0} dibatalkan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Hubungan
 DocType: Shipping Rule,Worldwide Shipping,Pengiriman seluruh dunia
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Dikonfirmasi pesanan dari pelanggan.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Saran
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Menetapkan anggaran Group-bijaksana Barang di Wilayah ini. Anda juga bisa memasukkan musiman dengan menetapkan Distribusi.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Cukup masukkan rekening kelompok orang tua untuk gudang {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pembayaran terhadap {0} {1} tidak dapat lebih besar dari Posisi Jumlah {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pembayaran terhadap {0} {1} tidak dapat lebih besar dari Posisi Jumlah {2}
 DocType: Supplier,Address HTML,Alamat HTML
 DocType: Lead,Mobile No.,Ponsel Nomor
 DocType: Maintenance Schedule,Generate Schedule,Menghasilkan Jadwal
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Terbaru
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 karakter
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,The Approver Cuti pertama dalam daftar akan ditetapkan sebagai default Tinggalkan Approver
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Belajar
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Kegiatan Biaya per Karyawan
 DocType: Accounts Settings,Settings for Accounts,Pengaturan Akun
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Mengelola Penjualan Orang Pohon.
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Multi Currency
 DocType: Payment Reconciliation Invoice,Invoice Type,Invoice Type
 DocType: Sales Invoice Item,Delivery Note,Pengiriman Note
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Menyiapkan Pajak
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Menyiapkan Pajak
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Masuk pembayaran telah dimodifikasi setelah Anda menariknya. Silakan menariknya lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Barang
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Barang
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Ringkasan untuk minggu ini dan kegiatan yang tertunda
 DocType: Workstation,Rent Cost,Sewa Biaya
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Silakan pilih bulan dan tahun
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Tersedia dalam BOM, Pengiriman Catatan, Purchase Invoice, Pesanan Produksi, Purchase Order, Penerimaan Pembelian, Faktur Penjualan, Sales Order, Stock Masuk, Timesheet"
 DocType: Item Tax,Tax Rate,Tarif Pajak
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Pilih Barang
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Pilih Barang
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} berhasil batch-bijaksana, tidak dapat didamaikan dengan menggunakan \
  Stock Rekonsiliasi, bukan menggunakan Stock Masuk"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Purchase Invoice {0} sudah disampaikan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Purchase Invoice {0} sudah disampaikan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch ada harus sama {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Dikonversi ke non-Grup
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Pembelian Penerimaan harus diserahkan
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medis
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Alasan untuk kehilangan
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tanggal berikut sesuai Liburan Daftar: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Peluang
 DocType: Employee,Single,Tunggal
 DocType: Issue,Attachment,Lampiran
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Anggaran tidak dapat ditetapkan untuk kelompok Biaya Pusat
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,Master Holiday.
 DocType: Material Request Item,Required Date,Diperlukan Tanggal
 DocType: Delivery Note,Billing Address,Alamat Penagihan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Masukkan Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Masukkan Item Code.
 DocType: BOM,Costing,Biaya
 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"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Jumlah Qty
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Masukkan Gudang yang Material Permintaan akan dibangkitkan
 DocType: Production Order,Additional Operating Cost,Tambahan Biaya Operasi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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,Darurat Telepon
 ,Serial No Warranty Expiry,Serial No Garansi kadaluarsa
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Kenaikan tidak bisa 0
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Hapus Transaksi Perusahaan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Item {0} tidak Pembelian Barang
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Item {0} tidak Pembelian Barang
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} adalah alamat email yang tidak valid dalam 'Pemberitahuan \
  Alamat Email'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Total Penagihan Tahun ini:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Pajak dan Biaya
 DocType: Purchase Invoice,Supplier Invoice No,Pemasok Faktur ada
 DocType: Territory,For reference,Untuk referensi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Tidak dapat menghapus Serial ada {0}, seperti yang digunakan dalam transaksi saham"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Penutup (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Penutup (Cr)
 DocType: Serial No,Warranty Period (Days),Masa Garansi (Hari)
 DocType: Installation Note Item,Installation Note Item,Instalasi Catatan Barang
 ,Pending Qty,Tertunda Qty
@@ -466,7 +469,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Distribusi Bulanan ** membantu Anda mendistribusikan anggaran di bulan jika Anda memiliki musiman dalam bisnis Anda.
 
  Untuk mendistribusikan anggaran menggunakan distribusi ini, mengatur Distribusi Bulanan ** ini ** di ** Biaya Pusat **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Tidak ada catatan yang ditemukan dalam tabel Faktur
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +20,Please select Company and Party Type first,Silakan pilih Perusahaan dan Partai Jenis pertama
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Keuangan / akuntansi tahun.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial Nos tidak dapat digabungkan"
@@ -474,9 +477,9 @@
 DocType: Project Task,Project Task,Proyek Tugas
 ,Lead Id,Timbal Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Tahun Anggaran Tanggal Mulai tidak boleh lebih besar dari Fiscal Year End Tanggal
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Tahun Anggaran Tanggal Mulai tidak boleh lebih besar dari Fiscal Year End Tanggal
 DocType: Warranty Claim,Resolution,Resolusi
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Disampaikan: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Disampaikan: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Account Payable
 DocType: Sales Order,Billing and Delivery Status,Penagihan dan Pengiriman Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ulangi Pelanggan
@@ -491,7 +494,7 @@
 DocType: Quotation,Quotation To,Quotation Untuk
 DocType: Lead,Middle Income,Penghasilan Tengah
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Jumlah yang dialokasikan tidak dijinkan negatif
 DocType: Purchase Order Item,Billed Amt,Jumlah tagihan
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Sebuah Gudang logis terhadap entri saham yang dibuat.
@@ -500,7 +503,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produksi Order adalah Wajib
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Penulisan Proposal
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Lain Penjualan Person {0} ada dengan id Karyawan yang sama
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Kesalahan Stock negatif ({6}) untuk Item {0} Gudang {1} di {2} {3} in {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Kesalahan Stock negatif ({6}) untuk Item {0} Gudang {1} di {2} {3} in {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskal Tahun Perusahaan
 DocType: Packing Slip Item,DN Detail,DN Detil
 DocType: Time Log,Billed,Ditagih
@@ -519,16 +522,17 @@
 DocType: Activity Type,Default Costing Rate,Standar Biaya Tingkat
 DocType: Maintenance Schedule,Maintenance Schedule,Jadwal pemeliharaan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Kemudian Pricing Aturan disaring berdasarkan Pelanggan, Kelompok Pelanggan, Wilayah, Supplier, Supplier Type, Kampanye, Penjualan Mitra dll"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Perubahan bersih dalam Persediaan
 DocType: Employee,Passport Number,Nomor Paspor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manajer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Dari Penerimaan Pembelian
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Item yang sama telah dimasukkan beberapa kali.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Dari Penerimaan Pembelian
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Item yang sama telah dimasukkan beberapa kali.
 DocType: SMS Settings,Receiver Parameter,Receiver Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Berdasarkan' dan 'Kelompokkan Dengan' tidak bisa sama
 DocType: Sales Person,Sales Person Targets,Target Penjualan Orang
 DocType: Production Order Operation,In minutes,Dalam menit
 DocType: Issue,Resolution Date,Resolusi Tanggal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
 DocType: Selling Settings,Customer Naming By,Penamaan Pelanggan Dengan
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konversikan ke Grup
 DocType: Activity Cost,Activity Type,Jenis Kegiatan
@@ -539,7 +543,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Penerbitan
 DocType: Activity Cost,Projects User,Proyek Pengguna
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Dikonsumsi
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} tidak ditemukan dalam tabel Rincian Tagihan
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} tidak ditemukan dalam tabel Rincian Tagihan
 DocType: Company,Round Off Cost Center,Bulat Off Biaya Pusat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Pemeliharaan Kunjungan {0} harus dibatalkan sebelum membatalkan Sales Order ini
 DocType: Material Request,Material Transfer,Material Transfer
@@ -561,13 +565,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Pemasaran
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Untuk melacak item dalam penjualan dan dokumen pembelian berdasarkan nos serial mereka. Hal ini juga dapat digunakan untuk melacak rincian garansi produk.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stok saat ini
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Gudang Ditolak adalah wajib terhadap barang regected
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Total tagihan tahun ini
 DocType: Account,Expenses Included In Valuation,Biaya Termasuk Dalam Penilaian
 DocType: Employee,Provide email id registered in company,Menyediakan email id yang terdaftar di perusahaan
 DocType: Hub Settings,Seller City,Penjual Kota
 DocType: Email Digest,Next email will be sent on:,Email berikutnya akan dikirim pada:
 DocType: Offer Letter Term,Offer Letter Term,Menawarkan Surat Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Item memiliki varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Item memiliki varian.
 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 saham
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Jenis Pohon
@@ -585,18 +589,18 @@
 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 +92,{0} is not a stock Item,{0} bukan merupakan barang persediaan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} bukan merupakan barang persediaan
 DocType: Mode of Payment Account,Default Account,Standar Akun
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Timbal harus diatur jika Peluang terbuat dari Timbal
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Silakan pilih dari hari mingguan
 DocType: Production Order Operation,Planned End Time,Rencana Akhir Waktu
 ,Sales Person Target Variance Item Group-Wise,Penjualan Orang Sasaran Variance Barang Group-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Akun dengan transaksi yang ada tidak dapat dikonversi ke buku besar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Akun dengan transaksi yang ada tidak dapat dikonversi ke buku besar
 DocType: Delivery Note,Customer's Purchase Order No,Nasabah Purchase Order No
 DocType: Employee,Cell Number,Nomor Cell
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Permintaan Auto Generated Material
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tersesat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak dapat memasukkan voucher saat ini di kolom 'Atas Journal Entry'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak dapat memasukkan voucher saat ini di kolom 'Atas Journal Entry'
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Peluang Dari
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Pernyataan gaji bulanan.
@@ -605,9 +609,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Dari {0} tipe {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor Konversi adalah wajib
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Entri akuntansi dapat dilakukan terhadap node daun. Entri terhadap Grup tidak diperbolehkan.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Nomor Penerimaan Pembelian diperlukan untuk Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Nomor Penerimaan Pembelian diperlukan untuk Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atribut Nilai
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Kampanye penjualan.
 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.
@@ -665,7 +669,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Daftar Harga tidak dipilih
 DocType: Employee,Family Background,Latar Belakang Keluarga
 DocType: Process Payroll,Send Email,Kirim Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Peringatan: tidak valid Lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Peringatan: tidak valid Lampiran {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Tidak ada Izin
 DocType: Company,Default Bank Account,Standar Rekening Bank
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Untuk menyaring berdasarkan Party, pilih Partai Ketik pertama"
@@ -673,7 +677,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Item dengan weightage lebih tinggi akan ditampilkan lebih tinggi
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Rincian Rekonsiliasi Bank
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Faktur saya
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Faktur saya
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Tidak ada karyawan yang ditemukan
 DocType: Purchase Order,Stopped,Terhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak ke vendor
@@ -683,6 +687,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Kirim sekarang
 ,Support Analytics,Dukungan Analytics
 DocType: Item,Website Warehouse,Situs Gudang
+DocType: Payment Reconciliation,Minimum Invoice Amount,Faktur Jumlah minimum
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form catatan
@@ -692,7 +697,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Untuk mengaktifkan &quot;Point of Sale&quot; fitur
 DocType: Bin,Moving Average Rate,Moving Average Tingkat
 DocType: Production Planning Tool,Select Items,Pilih Produk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} terhadap Bill {1} tanggal {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} terhadap Bill {1} tanggal {2}
 DocType: Maintenance Visit,Completion Status,Status Penyelesaian
 DocType: Sales Invoice Item,Target Warehouse,Target Gudang
 DocType: Item,Allow over delivery or receipt upto this percent,Biarkan selama pengiriman atau penerimaan upto persen ini
@@ -704,7 +709,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Secara otomatis menulis pesan pada pengajuan transaksi.
 DocType: Production Order,Item To Manufacture,Barang Untuk Industri
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Status adalah {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Pembelian Order untuk Pembayaran
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Pembelian Order untuk Pembayaran
 DocType: Sales Order Item,Projected Qty,Proyeksi Jumlah
 DocType: Sales Invoice,Payment Due Date,Tanggal Jatuh Tempo Pembayaran
 DocType: Newsletter,Newsletter Manager,Newsletter Manajer
@@ -728,7 +733,7 @@
 DocType: Sales Invoice Item,Stock Details,Detail saham
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Nilai Proyek
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Titik penjualan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo rekening telah berada di Kredit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Debit'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo rekening telah berada di Kredit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Debit'"
 DocType: Account,Balance must be,Saldo harus
 DocType: Hub Settings,Publish Pricing,Publikasikan Harga
 DocType: Notification Control,Expense Claim Rejected Message,Beban Klaim Ditolak Pesan
@@ -751,7 +756,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Menguasai nilai tukar mata uang.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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,Bahan rencana sub-rakitan
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} harus aktif
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} harus aktif
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Silakan pilih jenis dokumen pertama
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Tinggalkan Pencairan Jumlah
@@ -769,17 +774,17 @@
 DocType: Supplier,Default Payable Accounts,Standar Account Payable
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Karyawan {0} tidak aktif atau tidak ada
 DocType: Features Setup,Item Barcode,Item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Item Varian {0} diperbarui
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Item Varian {0} diperbarui
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pembelian Faktur Muka
 DocType: Address,Shop,Toko
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Baris {0}: entry Kredit tidak dapat dihubungkan dengan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Baris {0}: entry Kredit tidak dapat dihubungkan dengan {1}
 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.
 DocType: Employee,Permanent Address Is,Alamat permanen Apakah
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasi selesai untuk berapa banyak barang jadi?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Merek
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Penyisihan over-{0} menyeberang untuk Item {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Penyisihan over-{0} menyeberang untuk Item {1}.
 DocType: Employee,Exit Interview Details,Detail Exit Interview
 DocType: Item,Is Purchase Item,Apakah Pembelian Barang
 DocType: Journal Entry Account,Purchase Invoice,Purchase Invoice
@@ -791,7 +796,7 @@
 DocType: Salary Slip,Total in words,Jumlah kata
 DocType: Material Request Item,Lead Time Date,Timbal Waktu Tanggal
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,Wajib diisi. Mungkin Kurs Mata Uang tidak dibuat untuk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Silakan tentukan Serial ada untuk Item {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Silakan tentukan Serial ada untuk Item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Untuk &#39;Produk Bundle&#39; item, Gudang, Serial No dan Batch ada akan dianggap dari &#39;Packing List&#39; meja. Jika Gudang dan Batch ada yang sama untuk semua item kemasan untuk setiap item &#39;Produk Bundle&#39;, nilai-nilai dapat dimasukkan dalam tabel Barang utama, nilai akan disalin ke &#39;Packing List&#39; meja."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Pengiriman ke pelanggan.
 DocType: Purchase Invoice Item,Purchase Order Item,Purchase Order Barang
@@ -800,14 +805,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Perbedaan
 ,Company Name,Company Name
 DocType: SMS Center,Total Message(s),Total Pesan (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Pilih item untuk transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Izinkan user/pengguna untuk mengubah rate daftar harga di dalam transaksi
 DocType: Pricing Rule,Max Qty,Max Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Baris {0}: Pembayaran terhadap Penjualan / Purchase Order harus selalu ditandai sebagai muka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimia
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Semua item telah dialihkan untuk Pesanan Produksi ini.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Semua item telah dialihkan untuk Pesanan Produksi ini.
 DocType: Process Payroll,Select Payroll Year and Month,Pilih Payroll Tahun dan Bulan
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Pergi ke kelompok yang sesuai (biasanya Penerapan Dana&gt; Aset Lancar&gt; Account Bank dan membuat Akun baru (dengan mengklik Tambahkan Anak) tipe &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Biaya Listrik
@@ -821,10 +827,10 @@
 DocType: SMS Center,All Lead (Open),Semua Prospektus (Open)
 DocType: Purchase Invoice,Get Advances Paid,Dapatkan Uang Muka Dibayar
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Pasang Gambar Anda
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Membuat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Membuat
 DocType: Journal Entry,Total Amount in Words,Jumlah Total 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 +3,My Cart,Cart saya
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Cart saya
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Pesanan Type harus menjadi salah satu {0}
 DocType: Lead,Next Contact Date,Berikutnya Hubungi Tanggal
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Membuka Qty
@@ -843,10 +849,10 @@
 DocType: POS Profile,Cash/Bank Account,Rekening Kas / Bank
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Tabel atribut wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,Tabel atribut wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Pesanan Penjualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} tidak dapat negatif
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Diskon
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Diskon
 DocType: Features Setup,Purchase Discounts,Membeli Diskon
 DocType: Workstation,Wages,Upah
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Akan diperbarui hanya jika Waktu Log adalah &#39;Ditagih&#39;
@@ -871,7 +877,7 @@
 DocType: Tax Rule,Shipping State,Pengiriman Negara
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item harus ditambahkan dengan menggunakan 'Dapatkan Produk dari Pembelian Penerimaan' tombol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Beban Penjualan
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard Membeli
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standard Membeli
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Default Jual Biaya Pusat
 DocType: Sales Partner,Implementation Partner,Implementasi Mitra
@@ -913,6 +919,7 @@
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Belanja Pengiriman Aturan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Pesanan produksi {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Silahkan mengatur &#39;Terapkan Diskon tambahan On&#39;
 ,Ordered Items To Be Billed,Memerintahkan Items Akan Ditagih
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Dari Rentang harus kurang dari Untuk Rentang
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Pilih Waktu Log dan Kirim untuk membuat Faktur Penjualan baru.
@@ -922,13 +929,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Batch Waktu Log ini telah ditagih.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Buat Peluang
 DocType: Salary Slip,Leave Without Pay,Tinggalkan Tanpa Bayar
-DocType: Supplier,Communications,Komunikasi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Kapasitas Kesalahan Perencanaan
 ,Trial Balance for Party,Neraca percobaan untuk Partai
 DocType: Lead,Consultant,Konsultan
 DocType: Salary Slip,Earnings,Penghasilan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Selesai Barang {0} harus dimasukkan untuk jenis Industri entri
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Membuka Saldo Akuntansi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Selesai Barang {0} harus dimasukkan untuk jenis Industri entri
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Membuka Saldo Akuntansi
 DocType: Sales Invoice Advance,Sales Invoice Advance,Faktur Penjualan Muka
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Tidak ada yang meminta
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Tanggal Mulai Sebenarnya' tidak dapat lebih besar dari 'Tanggal Selesai Sebenarnya'
@@ -970,7 +976,7 @@
 DocType: Global Defaults,Current Fiscal Year,Tahun Anggaran saat ini
 DocType: Global Defaults,Disable Rounded Total,Nonaktifkan Rounded Jumlah
 DocType: Lead,Call,Panggilan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Entries' tidak boleh kosong
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'Entries' tidak boleh kosong
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Baris duplikat {0} dengan sama {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Menyiapkan Karyawan
@@ -982,9 +988,9 @@
 DocType: Contact,User ID,ID Pemakai
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Terlama
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 barang"
+apps/erpnext/erpnext/stock/doctype/item/item.py +444,"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 barang"
 DocType: Production Order,Manufacture against Sales Order,Industri melawan Sales Order
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Istirahat Of The World
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,Rest Of The World,Istirahat 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,Gross Bayar
@@ -1014,7 +1020,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Tidak berwenang untuk mengedit Akun frozen {0}
 DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Posisi Faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} tidak valid
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1027,13 +1033,13 @@
 DocType: Employee,Place of Issue,Tempat Issue
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrak
 DocType: Email Digest,Add Quote,Add Quote
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} di Item: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} di Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Biaya tidak langsung
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Produk atau Jasa
 DocType: Mode of Payment,Mode of Payment,Mode Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,Website Image should be a public file or website URL,Website Image harus file umum atau URL situs
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ini adalah kelompok barang akar dan tidak dapat diedit.
 DocType: Journal Entry Account,Purchase Order,Purchase Order
 DocType: Warehouse,Warehouse Contact Info,Info Kontak Gudang
@@ -1042,8 +1048,8 @@
 DocType: Email Digest,Annual Income,Pendapatan tahunan
 DocType: Serial No,Serial No Details,Serial Tidak Detail
 DocType: Purchase Invoice Item,Item Tax Rate,Tarif Pajak Barang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Pengiriman Note {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Pengiriman Note {0} tidak disampaikan
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Peralatan Modal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule harga pertama dipilih berdasarkan 'Terapkan On' lapangan, yang dapat Barang, Barang Grup atau Merek."
@@ -1053,7 +1059,7 @@
 DocType: Appraisal Goal,Goal,Sasaran
 DocType: Sales Invoice Item,Edit Description,Mengedit Keterangan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Diharapkan Pengiriman Tanggal adalah lebih rendah daripada Tanggal Rencana Start.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Untuk Pemasok
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Untuk Pemasok
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Mengatur Tipe Akun membantu dalam memilih Akun ini dalam transaksi.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Perusahaan Mata Uang)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Outgoing
@@ -1066,7 +1072,7 @@
 DocType: Journal Entry,Journal Entry,Jurnal Entri
 DocType: Workstation,Workstation Name,Workstation Nama
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} bukan milik Barang {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} does not belong to Item {1},BOM {0} bukan milik Barang {1}
 DocType: Sales Partner,Target Distribution,Target Distribusi
 DocType: Salary Slip,Bank Account No.,Rekening Bank No
 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
@@ -1098,7 +1104,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Newsletter ke kontak, memimpin."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operasi tidak dapat dibiarkan kosong.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operasi tidak dapat dibiarkan kosong.
 ,Delivered Items To Be Billed,Produk Disampaikan Akan Ditagih
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Gudang tidak dapat diubah untuk Serial Number
 DocType: Authorization Rule,Average Discount,Rata-rata Diskon
@@ -1113,7 +1119,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Dari {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operasi Deskripsi
 DocType: Item,Will also apply to variants,Juga akan berlaku untuk varian
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Tidak dapat mengubah Tahun Anggaran Tanggal Mulai dan Tanggal Akhir Tahun Anggaran setelah Tahun Anggaran disimpan.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Tidak dapat mengubah Tahun Anggaran Tanggal Mulai dan Tanggal Akhir Tahun Anggaran setelah Tahun Anggaran disimpan.
 DocType: Quotation,Shopping Cart,Daftar Belanja
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Rata-rata Harian Outgoing
 DocType: Pricing Rule,Campaign,Promosi
@@ -1124,7 +1130,8 @@
 DocType: Sales Order Item,Planned Quantity,Direncanakan Kuantitas
 DocType: Purchase Invoice Item,Item Tax Amount,Jumlah Pajak Barang
 DocType: Item,Maintain Stock,Menjaga Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Saham Entries sudah dibuat untuk Pesanan Produksi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Saham Entries sudah dibuat untuk Pesanan Produksi
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1136,7 +1143,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,tidak dapat lebih besar dari 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Item {0} bukan merupakan saham Barang
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Item {0} bukan merupakan saham Barang
 DocType: Maintenance Visit,Unscheduled,Terjadwal
 DocType: Employee,Owned,Dimiliki
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Tergantung pada Cuti Tanpa Bayar
@@ -1174,7 +1181,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,Untuk Menghargai
 DocType: Supplier,Stock Manager,Bursa Manajer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk baris {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk baris {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Packing Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kantor Sewa
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Pengaturan gerbang Pengaturan SMS
@@ -1182,10 +1189,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Tidak ada alamat belum ditambahkan.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Jam Kerja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analis
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan jumlah JV {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan jumlah JV {2}
 DocType: Item,Inventory,Inventarisasi
 DocType: Features Setup,"To enable ""Point of Sale"" view",Untuk mengaktifkan &quot;Point of Sale&quot; tampilan
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Pembayaran tidak dapat dibuat untuk keranjang kosong
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Pembayaran tidak dapat dibuat untuk keranjang kosong
 DocType: Item,Sales Details,Detail Penjualan
 DocType: Opportunity,With Items,Dengan Produk
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Dalam Qty
@@ -1200,10 +1207,11 @@
 DocType: Cost Center,Parent Cost Center,Parent Biaya Pusat
 DocType: Sales Invoice,Source,Sumber
 DocType: Leave Type,Is Leave Without Pay,Apakah Tinggalkan Tanpa Bayar
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Tidak ada catatan yang ditemukan dalam tabel Pembayaran
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Tidak ada catatan yang ditemukan dalam tabel Pembayaran
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Tahun Buku Tanggal mulai
 DocType: Employee External Work History,Total Experience,Jumlah Pengalaman
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packing slip (s) dibatalkan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Packing slip (s) dibatalkan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Arus Kas dari Investasi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Pengangkutan dan Forwarding Biaya
 DocType: Material Request Item,Sales Order No,Sales Order No
 DocType: Item Group,Item Group Name,Nama Item Grup
@@ -1211,12 +1219,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Material untuk Industri
 DocType: Pricing Rule,For Price List,Untuk Daftar Harga
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Pencarian eksekutif
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Tingkat pembelian untuk item: {0} tidak ditemukan, yang diperlukan untuk buku akuntansi entri (beban). Sebutkan harga barang terhadap daftar harga beli."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Tingkat pembelian untuk item: {0} tidak ditemukan, yang diperlukan untuk buku akuntansi entri (beban). Sebutkan harga barang terhadap daftar harga beli."
 DocType: Maintenance Schedule,Schedules,Jadwal Pelajaran
 DocType: Purchase Invoice Item,Net Amount,Jumlah Bersih
 DocType: Purchase Order Item Supplied,BOM Detail No,No. Rincian BOM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Tambahan Jumlah Diskon (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Kesalahan: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Kesalahan: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Silahkan buat akun baru dari Bagan Akun.
 DocType: Maintenance Visit,Maintenance Visit,Pemeliharaan Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Pelanggan> Grup Pelanggan> Wilayah
@@ -1242,7 +1250,7 @@
 DocType: Sales Partner,Sales Partner Target,Penjualan Mitra Sasaran
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Masuk akuntansi untuk {0} hanya dapat dilakukan dalam mata uang: {1}
 DocType: Pricing Rule,Pricing Rule,Aturan Harga
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Permintaan bahan Pembelian Pesanan
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Permintaan bahan Pembelian Pesanan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Returned Barang {1} tidak ada dalam {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Rekening Bank
 ,Bank Reconciliation Statement,Pernyataan Rekonsiliasi Bank
@@ -1250,11 +1258,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Membuka Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} harus muncul hanya sekali
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},Daun Dialokasikan Berhasil untuk {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Tidak ada item untuk berkemas
 DocType: Shipping Rule Condition,From Value,Dari Nilai
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Manufaktur Kuantitas adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Manufaktur Kuantitas adalah wajib
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Jumlah yang tidak tercermin di bank
 DocType: Quality Inspection Reading,Reading 4,Membaca 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Klaim untuk biaya perusahaan.
@@ -1266,33 +1274,34 @@
 ,Material Requests for which Supplier Quotations are not created,Permintaan Material yang Pemasok Kutipan tidak diciptakan
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Untuk melacak item menggunakan barcode. Anda akan dapat memasukkan item dalam Pengiriman Note dan Faktur Penjualan dengan memindai barcode barang.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Tandai sebagai Disampaikan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Tandai sebagai Disampaikan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Membuat Quotation
 DocType: Dependent Task,Dependent Task,Tugas Dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,Leave of type {0} cannot be longer than {1},Tinggalkan 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,Berhenti Ulang Tahun Pengingat
 DocType: SMS Center,Receiver List,Receiver Daftar
 DocType: Payment Tool Detail,Payment Amount,Jumlah pembayaran
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Dikonsumsi Jumlah
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} View
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} View
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Perubahan bersih dalam kas
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktur Gaji Pengurangan
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Biaya Produk Dikeluarkan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Kuantitas tidak boleh lebih dari {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Umur (Hari)
 DocType: Quotation Item,Quotation Item,Quotation Barang
 DocType: Account,Account Name,Nama Akun
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Dari Tanggal tidak dapat lebih besar dari To Date
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Dari Tanggal tidak dapat lebih besar dari To Date
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial ada {0} kuantitas {1} tak bisa menjadi pecahan
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Pemasok Type induk.
 DocType: Purchase Order Item,Supplier Part Number,Pemasok Part Number
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Tingkat konversi tidak bisa 0 atau 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Tingkat konversi tidak bisa 0 atau 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} dibatalkan atau dihentikan
 DocType: Accounts Settings,Credit Controller,Kontroler Kredit
 DocType: Delivery Note,Vehicle Dispatch Date,Kendaraan Dispatch Tanggal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Penerimaan Pembelian {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Penerimaan Pembelian {0} tidak disampaikan
 DocType: Company,Default Payable Account,Standar Hutang Akun
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% Ditagih
@@ -1304,15 +1313,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Masalah saya
 DocType: BOM Item,BOM Item,Komponen BOM
 DocType: Appraisal,For Employee,Untuk Karyawan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Row {0}: Muka melawan Pemasok harus mendebet
 DocType: Company,Default Values,Nilai Default
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Baris {0}: Jumlah pembayaran tidak boleh negatif
 DocType: Expense Claim,Total Amount Reimbursed,Jumlah Total diganti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Terhadap Pemasok Faktur {0} tanggal {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Terhadap Pemasok Faktur {0} tanggal {1}
 DocType: Customer,Default Price List,Standar List Harga
 DocType: Payment Reconciliation,Payments,2. Payment (Pembayaran)
 DocType: Budget Detail,Budget Allocated,Anggaran Dialokasikan
 DocType: Journal Entry,Entry Type,Entri Type
 ,Customer Credit Balance,Saldo Kredit Pelanggan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Perubahan bersih Hutang
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Harap verifikasi id email Anda
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Pelanggan yang dibutuhkan untuk 'Customerwise Diskon'
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Perbarui tanggal pembayaran bank dengan jurnal.
@@ -1333,7 +1344,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktifkan Keranjang Belanja
 DocType: Employee,Permanent Address,Permanent Alamat
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Item {0} harus Layanan Barang.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Uang muka dibayar terhadap {0} {1} tidak dapat lebih besar \ dari Grand Total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Silahkan pilih kode barang
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Mengurangi Pengurangan untuk Tinggalkan Tanpa Bayar (LWP)
@@ -1350,18 +1361,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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 bahan yang digunakan untuk membuat Masuk Bursa ini
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unit tunggal Item.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Waktu Log Batch {0} harus 'Dikirim'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Waktu Log Batch {0} harus 'Dikirim'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Membuat Entri Akuntansi Untuk Setiap Gerakan Stock
 DocType: Leave Allocation,Total Leaves Allocated,Jumlah Daun Dialokasikan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Gudang diperlukan pada Row ada {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Gudang diperlukan pada Row ada {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Masukkan Tahun Mulai berlaku Keuangan dan Tanggal Akhir
 DocType: Employee,Date Of Retirement,Tanggal Of Pensiun
 DocType: Upload Attendance,Get Template,Dapatkan Template
 DocType: Address,Postal,Pos
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Kelompok Pelanggan sudah ada dengan nama yang sama, silakan mengubah nama Pelanggan atau mengubah nama Grup Pelanggan"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Silahkan pilih {0} pertama.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},teks {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Silahkan pilih {0} pertama.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},teks {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Kontak baru
 DocType: Territory,Parent Territory,Wilayah Induk
 DocType: Quality Inspection Reading,Reading 2,Membaca 2
 DocType: Stock Entry,Material Receipt,Material Receipt
@@ -1369,7 +1381,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partai Jenis dan Partai diperlukan untuk Piutang / Hutang akun {0}
 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,Berikutnya Contact By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Kuantitas yang dibutuhkan untuk Item {0} berturut-turut {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,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 +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Gudang {0} tidak dapat dihapus sebagai kuantitas ada untuk Item {1}
 DocType: Quotation,Order Type,Pesanan Type
 DocType: Purchase Invoice,Notification Email Address,Pemberitahuan Alamat Email
@@ -1386,15 +1398,15 @@
 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: Sales Invoice Item,Batch No,No. Batch
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Memungkinkan Penjualan beberapa Pesanan terhadap Purchase Order Nasabah
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Utama
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Utama
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variasi
 DocType: Naming Series,Set prefix for numbering series on your transactions,Mengatur awalan untuk penomoran seri pada transaksi Anda
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Agar Berhenti tidak dapat dibatalkan. Unstop untuk membatalkan.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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?,Tinggalkan dicairkan?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Dari bidang wajib
 DocType: Item,Variants,Varian
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Membuat Purchase Order
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Membuat Purchase Order
 DocType: SMS Center,Send To,Kirim Ke
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1407,7 +1419,7 @@
 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 Pemasok Anda
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Alamat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Jurnal Entri {0} tidak memiliki tertandingi {1} entri
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Jurnal Entri {0} tidak memiliki tertandingi {1} entri
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item tidak diperbolehkan untuk memiliki Orde Produksi.
@@ -1416,10 +1428,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Jumlah kredit di Akun Mata Uang
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Waktu Log untuk manufaktur.
 DocType: Item,Apply Warehouse-wise Reorder Level,Terapkan Gudang-bijaksana Susun ulang Tingkat
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} harus diserahkan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} harus diserahkan
 DocType: Authorization Control,Authorization Control,Pengendalian Otorisasi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Ditolak Gudang adalah wajib terhadap ditolak Barang {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Waktu Log untuk tugas-tugas.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pembayaran
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Pembayaran
 DocType: Production Order Operation,Actual Time and Cost,Waktu aktual dan Biaya
 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}
 DocType: Employee,Salutation,Salam
@@ -1436,7 +1449,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Rekan
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Item {0} bukan merupakan Barang serial
 DocType: SMS Center,Create Receiver List,Buat Daftar Penerima
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expired
 DocType: Packing Slip,To Package No.,Untuk Paket No
 DocType: Warranty Claim,Issue Date,Tanggal dibuat
 DocType: Activity Cost,Activity Cost,Kegiatan Biaya
@@ -1474,7 +1486,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dicapai
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Wilayah / Pelanggan
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,misalnya 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan faktur jumlah yang luar biasa {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan faktur jumlah yang luar biasa {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Dalam Kata-kata akan terlihat setelah Anda menyimpan Faktur Penjualan.
 DocType: Item,Is Sales Item,Apakah Penjualan Barang
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Grup Pohon
@@ -1486,7 +1498,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} dibuat
 DocType: Delivery Note Item,Against Sales Order,Terhadap Order Penjualan
 ,Serial No Status,Serial ada Status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Tabel barang tidak boleh kosong
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Tabel barang tidak boleh kosong
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"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}"
@@ -1496,7 +1508,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
 DocType: Website Item Group,Website Item Group,Situs Barang Grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Tugas dan Pajak
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Harap masukkan tanggal Referensi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Harap masukkan tanggal Referensi
 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} entri pembayaran tidak dapat disaring oleh {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabel untuk Item yang akan ditampilkan di Situs Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Disediakan Qty
@@ -1511,7 +1523,7 @@
 DocType: Installation Note,Installation Time,Instalasi Waktu
 DocType: Sales Invoice,Accounting Details,Detail Akuntansi
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Hapus semua Transaksi untuk Perusahaan ini
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operasi {1} tidak selesai untuk {2} qty barang jadi di Produksi Orde # {3}. Silakan update status operasi via Waktu Log
+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,Row # {0}: Operasi {1} tidak selesai untuk {2} qty barang jadi di Produksi Orde # {3}. Silakan update status operasi via Waktu Log
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investasi
 DocType: Issue,Resolution Details,Detail Resolusi
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriteria Penerimaan
@@ -1527,7 +1539,7 @@
 DocType: Holiday List,Clear Table,Jelas Table
 DocType: Features Setup,Brands,Merek
 DocType: C-Form Invoice Detail,Invoice No,Faktur ada
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Dari Purchase Order
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Dari Purchase Order
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Tinggalkan tidak dapat diterapkan / dibatalkan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
 DocType: Activity Cost,Costing Rate,Biaya Tingkat
 ,Customer Addresses And Contacts,Alamat Pelanggan Dan Kontak
@@ -1544,7 +1556,7 @@
 ,Maintenance Schedules,Jadwal pemeliharaan
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Grup tidak disebutkan dalam master barang untuk item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
 DocType: Shipping Rule Condition,Shipping Amount,Pengiriman Jumlah
 ,Pending Amount,Pending Jumlah
 DocType: Purchase Invoice Item,Conversion Factor,Faktor konversi
@@ -1561,12 +1573,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Pohon rekening finanial.
 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,Mendistribusikan Biaya Berdasarkan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Akun {0} harus bertipe 'Aset Tetap' dikarenakan Barang {1} adalah merupakan sebuah Aset Tetap
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Akun {0} harus bertipe 'Aset Tetap' dikarenakan Barang {1} adalah merupakan sebuah Aset Tetap
 DocType: HR Settings,HR Settings,Pengaturan HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Beban Klaim sedang menunggu persetujuan. Hanya Approver Beban dapat memperbarui status.
 DocType: Purchase Invoice,Additional Discount Amount,Tambahan Jumlah Diskon
 DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Block List Izinkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr tidak boleh kosong atau ruang
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr tidak boleh kosong atau ruang
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Olahraga
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Aktual
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Satuan
@@ -1578,6 +1590,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Klaim Beban
 DocType: Issue,Support,Mendukung
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Lihat Keranjang
 ,BOM Search,BOM Cari
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Penutupan (Membuka Total +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Silakan tentukan mata uang di Perusahaan
@@ -1589,13 +1602,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM Konversi diperlukan berturut-turut {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Tanggal clearance tidak bisa sebelum tanggal check-in baris {0}
 DocType: Salary Slip,Deduction,Deduksi
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Item Harga ditambahkan untuk {0} di Daftar Harga {1}
 DocType: Address Template,Address Template,Template Alamat
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Cukup masukkan Id Karyawan penjualan orang ini
 DocType: Territory,Classification of Customers by region,Klasifikasi Pelanggan menurut wilayah
 DocType: Project,% Tasks Completed,% Tugas Selesai
 DocType: Project,Gross Margin,Margin kotor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Masukkan Produksi Barang pertama
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,pengguna cacat
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,pengguna cacat
 DocType: Opportunity,Quotation,Kutipan
 DocType: Salary Slip,Total Deduction,Jumlah Pengurangan
 DocType: Quotation,Maintenance User,Pemeliharaan Pengguna
@@ -1604,7 +1618,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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,Pelanggan / Lead Alamat
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Peringatan: sertifikat SSL tidak valid pada lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Peringatan: sertifikat SSL tidak valid pada lampiran {0}
 DocType: Production Order Operation,Actual Operation Time,Realisasi Waktu Operasi
 DocType: Authorization Rule,Applicable To (User),Berlaku Untuk (User)
 DocType: Purchase Taxes and Charges,Deduct,Mengurangi
@@ -1614,12 +1628,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pelihara Penjualan Kampanye. Melacak Memimpin, Kutipan, Sales Order dll dari Kampanye untuk mengukur Return on Investment."
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,SO Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Entri saham ada terhadap gudang {0}, maka Anda tidak dapat menetapkan kembali atau memodifikasi Gudang"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Entri saham ada terhadap gudang {0}, maka Anda tidak dapat menetapkan kembali atau memodifikasi Gudang"
 DocType: Appraisal,Calculate Total Score,Hitung Total Skor
 DocType: Supplier Quotation,Manufacturing Manager,Manufaktur Manajer
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Membagi Pengiriman Catatan ke dalam paket.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Pengiriman
+apps/erpnext/erpnext/hooks.py +69,Shipments,Pengiriman
 DocType: Purchase Order Item,To be delivered to customer,Yang akan dikirimkan ke pelanggan
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Waktu Log Status harus Dikirim.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial ada {0} bukan milik Gudang setiap
@@ -1639,10 +1653,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (permanen, kontrak, magang dll)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
 DocType: Currency Exchange,From Currency,Dari Mata
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Silakan pilih Jumlah Alokasi, Faktur Jenis dan Faktur Nomor di minimal satu baris"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Sales Order yang diperlukan untuk Item {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Silakan pilih Jumlah Alokasi, Faktur Jenis dan Faktur Nomor di minimal satu baris"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Sales Order yang diperlukan untuk Item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Jumlah yang tidak tercermin dalam sistem
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Perusahaan Mata Uang)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Lainnya
@@ -1658,7 +1672,7 @@
 DocType: Quality Inspection,In Process,Dalam Proses
 DocType: Authorization Rule,Itemwise Discount,Itemwise Diskon
 DocType: Purchase Order Item,Reference Document Type,Dokumen referensi Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} terhadap Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} terhadap Sales Order {1}
 DocType: Account,Fixed Asset,Fixed Asset
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Persediaan serial
 DocType: Activity Type,Default Billing Rate,Standar Tingkat Penagihan
@@ -1668,7 +1682,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order untuk Pembayaran
 DocType: Expense Claim Detail,Expense Claim Detail,Beban Klaim Detil
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Waktu Log dibuat:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Silakan pilih akun yang benar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Silakan pilih akun yang benar
 DocType: Item,Weight UOM,Berat UOM
 DocType: Employee,Blood Group,Golongan darah
 DocType: Purchase Invoice Item,Page Break,Halaman Istirahat
@@ -1699,10 +1713,10 @@
 DocType: Time Log,To Time,Untuk Waktu
 DocType: Authorization Rule,Approving Role (above authorized value),Menyetujui Peran (di atas nilai yang berwenang)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Untuk menambahkan node anak, mengeksplorasi pohon dan klik pada node di mana Anda ingin menambahkan lebih banyak node."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit Untuk akun harus rekening Hutang
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} tidak bisa menjadi induk atau cabang dari {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Kredit Untuk akun harus rekening Hutang
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} tidak bisa menjadi induk atau cabang dari {2}
 DocType: Production Order Operation,Completed Qty,Selesai Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Daftar Harga {0} dinonaktifkan
 DocType: Manufacturing Settings,Allow Overtime,Biarkan Lembur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial Number diperlukan untuk Item {1}. Anda telah disediakan {2}.
@@ -1710,8 +1724,9 @@
 DocType: Item,Customer Item Codes,Pelanggan Barang Kode
 DocType: Opportunity,Lost Reason,Kehilangan Alasan
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Buat Entri Pembayaran terhadap Pesanan atau Faktur.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Alamat baru
 DocType: Quality Inspection,Sample Size,Ukuran Sampel
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Semua Barang telah tertagih
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,All items have already been invoiced,Semua 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/accounts/page/accounts_browser/accounts_browser.js +304,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
 DocType: Project,External,Eksternal
@@ -1767,13 +1782,14 @@
 DocType: Rename Tool,Rename Tool,Rename Alat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Pembaruan Biaya
 DocType: Item Reorder,Item Reorder,Item Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Material Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Material Transfer
 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."
 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 Bursa Negatif
 DocType: Installation Note,Installation Note,Instalasi Note
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Tambahkan Pajak
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Arus Kas dari Pendanaan
 ,Financial Analytics,Analytics keuangan
 DocType: Quality Inspection,Verified By,Diverifikasi oleh
 DocType: Address,Subsidiary,Anak Perusahaan
@@ -1783,19 +1799,19 @@
 DocType: Process Payroll,Create Salary Slip,Buat Slip Gaji
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Saldo diharapkan sebagai per bank
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Sumber Dana (Kewajiban)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,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 +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Jumlah berturut-turut {0} ({1}) harus sama dengan jumlah yang diproduksi {2}
 DocType: Appraisal,Employee,Karyawan
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Impor Email Dari
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Undang sebagai Pengguna
 DocType: Features Setup,After Sale Installations,Pemasangan setelah Penjualan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} telah ditagih sepenuhnya
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} telah ditagih sepenuhnya
 DocType: Workstation Working Hour,End Time,Akhir Waktu
 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 +75,Group by Voucher,Group by Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan On
 DocType: Sales Invoice,Mass Mailing,Mailing massa
 DocType: Rename Tool,File to Rename,File untuk Ganti nama
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Nomor pesanan purchse diperlukan untuk Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Nomor pesanan purchse diperlukan untuk Item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Tampilkan Pembayaran
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadwal pemeliharaan {0} harus dibatalkan sebelum membatalkan Sales Order ini
@@ -1805,6 +1821,7 @@
 DocType: Selling Settings,Sales Order Required,Sales Order Diperlukan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Buat Pelanggan
 DocType: Purchase Invoice,Credit To,Kredit Untuk
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Memimpin aktif / Pelanggan
 DocType: Employee Education,Post Graduate,Pasca Sarjana
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Jadwal pemeliharaan Detil
 DocType: Quality Inspection Reading,Reading 9,Membaca 9
@@ -1816,6 +1833,7 @@
 DocType: Warranty Claim,Raised By,Dibesarkan Oleh
 DocType: Payment Tool,Payment Account,Akun Pembayaran
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Perubahan bersih Piutang
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensasi Off
 DocType: Quality Inspection Reading,Accepted,Diterima
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.
@@ -1823,17 +1841,17 @@
 DocType: Payment Tool,Total Payment Amount,Jumlah Total Pembayaran
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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 Pesanan Produksi {3}
 DocType: Shipping Rule,Shipping Rule Label,Peraturan Pengiriman Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","Tidak bisa update saham, faktur berisi penurunan barang pengiriman."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Tidak bisa update saham, faktur berisi penurunan barang pengiriman."
 DocType: Newsletter,Test,tes
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Karena ada transaksi saham yang ada untuk item ini, \ Anda tidak dapat mengubah nilai-nilai &#39;Memiliki Serial No&#39;, &#39;Apakah Batch Tidak&#39;, &#39;Apakah Stok Item&#39; dan &#39;Metode Penilaian&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Cepat Journal Masuk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Cepat Journal Masuk
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah kurs jika BOM disebutkan atas tiap barang
 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 +157,Please enter Planned Qty for Item {0} at row {1},Masukkan Planned Qty untuk Item {0} pada baris {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} tidak di-posting
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} tidak di-posting
 apps/erpnext/erpnext/config/stock.py +18,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 barang jadi.
 DocType: Purchase Invoice,Terms and Conditions1,Syarat dan Conditions1
@@ -1846,7 +1864,7 @@
 DocType: Authorization Rule,Authorized Value,Nilai resmi
 DocType: Contact,Enter department to which this Contact belongs,Memasukkan departemen yang Kontak ini milik
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Jumlah Absen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Item atau Gudang untuk baris {0} Material tidak cocok Permintaan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Item atau Gudang untuk baris {0} Material tidak cocok Permintaan
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Satuan Ukur
 DocType: Fiscal Year,Year End Date,Tanggal Akhir Tahun
 DocType: Task Depends On,Task Depends On,Tugas Tergantung Pada
@@ -1872,7 +1890,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrak Tanggal Akhir harus lebih besar dari Tanggal Bergabung
 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.
 DocType: Customer Group,Has Child Node,Memiliki Anak Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} terhadap Purchase Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} terhadap Purchase Order {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Masukkan parameter url statis di sini (Misalnya pengirim = ERPNext, username = ERPNext, password = 1234 dll)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} tidak dalam Tahun Fiskal aktif. Untuk lebih jelasnya lihat {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ini adalah situs contoh auto-dihasilkan dari ERPNext
@@ -1920,7 +1938,7 @@
  10. Menambah atau Dikurangi: Apakah Anda ingin menambah atau mengurangi pajak."
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kuantitas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Tidak dapat menghasilkan lebih Barang {0} daripada kuantitas Sales Order {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Masuk Bursa {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Masuk Bursa {0} tidak disampaikan
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Rekening Kas
 DocType: Tax Rule,Billing City,Penagihan Kota
 DocType: Global Defaults,Hide Currency Symbol,Sembunyikan Currency Symbol
@@ -1952,6 +1970,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Beban utilitas
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-ke atas
 DocType: Buying Settings,Default Buying Price List,Standar Membeli Daftar Harga
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Tidak ada karyawan untuk kriteria di atas yang dipilih ATAU Slip gaji sudah dibuat
 DocType: Notification Control,Sales Order Message,Sales Order Pesan
 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"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Jenis Pembayaran
@@ -1987,7 +2006,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Lihat ""Rate Of Material Berbasis"" dalam Biaya Bagian"
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility area
 DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Faktor Konversi adalah wajib
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Biaya Pusat
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -2010,7 +2029,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Silakan pilih nilai untuk {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Semua Alamat
 DocType: Company,Stock Settings,Pengaturan saham
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan ini hanya mungkin jika sifat berikut yang sama di kedua catatan. Apakah Group, Akar Jenis, Perusahaan"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan ini hanya mungkin jika sifat berikut yang sama di kedua catatan. Apakah Group, Akar Jenis, Perusahaan"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Manage Group Pelanggan Pohon.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Baru Nama Biaya Pusat
 DocType: Leave Control Panel,Leave Control Panel,Tinggalkan Control Panel
@@ -2030,8 +2049,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Alat Pembayaran Detil
 ,Sales Browser,Penjualan Browser
 DocType: Journal Entry,Total Credit,Jumlah Kredit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: lain {0} # {1} ada terhadap masuknya saham {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,[Daerah
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: lain {0} # {1} ada terhadap masuknya saham {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,[Daerah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Pinjaman Uang Muka dan (Aset)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitur
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Besar
@@ -2050,7 +2069,7 @@
 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
 DocType: Production Order Operation,Make Time Log,Membuat Waktu Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Silahkan mengatur kuantitas menyusun ulang
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Silahkan mengatur kuantitas menyusun ulang
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Silakan membuat pelanggan dari Lead {0}
 DocType: Price List,Applicable for Countries,Berlaku untuk Negara
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Komputer
@@ -2110,10 +2129,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Tidak ada Keterangan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Tidak ada Keterangan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Terlambat
 DocType: Account,Stock Received But Not Billed,Stock Diterima Tapi Tidak Ditagih
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Akar Rekening harus kelompok
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Akar Rekening harus kelompok
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + + Pencairan tunggakan Jumlah Jumlah - Total Pengurangan
 DocType: Monthly Distribution,Distribution Name,Nama Distribusi
 DocType: Features Setup,Sales and Purchase,Penjualan dan Pembelian
@@ -2127,6 +2146,7 @@
 DocType: Journal Entry Account,Party Balance,Saldo Partai
 DocType: Sales Invoice Item,Time Log Batch,Waktu Log Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Silakan pilih Terapkan Diskon Pada
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Slip Gaji Dibuat
 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 Masuk untuk total gaji yang dibayarkan untuk kriteria di atas yang dipilih
 DocType: Stock Entry,Material Transfer for Manufacture,Alih Material untuk Industri
@@ -2134,9 +2154,9 @@
 DocType: Purchase Invoice,Half-yearly,Setengah tahun sekali
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Tahun fiskal {0} tidak ditemukan.
 DocType: Bank Reconciliation,Get Relevant Entries,Dapatkan Entries Relevan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Masuk akuntansi Saham
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Masuk akuntansi Saham
 DocType: Sales Invoice,Sales Team1,Penjualan team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Item {0} tidak ada
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Item {0} tidak ada
 DocType: Sales Invoice,Customer Address,Alamat pelanggan
 DocType: Purchase Invoice,Apply Additional Discount On,Terapkan tambahan Diskon Pada
 DocType: Account,Root Type,Akar Type
@@ -2145,15 +2165,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Tampilkan slide ini di bagian atas halaman
 DocType: BOM,Item UOM,Barang UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Jumlah pajak Setelah Diskon Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target gudang adalah wajib untuk baris {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Target gudang adalah wajib untuk baris {0}
 DocType: Quality Inspection,Quality Inspection,Inspeksi Kualitas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Ekstra Kecil
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Makanan, Minuman dan Tembakau"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL atau BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Tingkat komisi tidak dapat lebih besar dari 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Persediaan Tingkat Minimum
 DocType: Stock Entry,Subcontract,Kontrak tambahan
@@ -2191,7 +2211,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Pemeriksaan mutu yang masuk.
 DocType: Purchase Order Item,Returned Qty,Kembali Qty
 DocType: Employee,Exit,Keluar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Akar Type adalah wajib
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Akar Type adalah wajib
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial ada {0} dibuat
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kenyamanan pelanggan, kode ini dapat digunakan dalam format cetak seperti Faktur dan Pengiriman Catatan"
 DocType: Employee,You can enter any date manually,Anda dapat memasukkan tanggal apapun secara manual
@@ -2199,8 +2219,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Masa percobaan
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Hanya node daun yang diperbolehkan dalam transaksi
 DocType: Expense Claim,Expense Approver,Beban Approver
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +110,Row {0}: Advance against Customer must be credit,Row {0}: Muka terhadap Nasabah harus kredit
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Penerimaan Pembelian Barang Disediakan
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Membayar
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Membayar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Untuk Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Log untuk mempertahankan status pengiriman sms
@@ -2217,7 +2238,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Susun ulang Tingkat
 DocType: Attendance,Attendance Date,Tanggal Kehadiran
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gaji perpisahan berdasarkan Produktif dan Pengurangan.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Akun dengan node anak tidak dapat dikonversi ke buku besar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Akun dengan node anak tidak dapat dikonversi ke buku besar
 DocType: Address,Preferred Shipping Address,Disukai Alamat Pengiriman
 DocType: Purchase Receipt Item,Accepted Warehouse,Gudang Diterima
 DocType: Bank Reconciliation Detail,Posting Date,Tanggal Posting
@@ -2235,7 +2256,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial ada {0} tidak ada
 DocType: Pricing Rule,Discount Percentage,Persentase Diskon
 DocType: Payment Reconciliation Invoice,Invoice Number,Nomor Faktur
-apps/erpnext/erpnext/hooks.py +54,Orders,Pesanan
+apps/erpnext/erpnext/hooks.py +55,Orders,Pesanan
 DocType: Leave Control Panel,Employee Type,Tipe Karyawan
 DocType: Employee Leave Approver,Leave Approver,Tinggalkan Approver
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Bahan Ditransfer untuk Industri
@@ -2247,7 +2268,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Bahan ditagih terhadap Sales Order ini
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periode Penutupan Masuk
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Penyusutan
+DocType: Account,Depreciation,Penyusutan
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Pemasok (s)
 DocType: Customer,Credit Limit,Batas Kredit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Pilih jenis transaksi
@@ -2272,11 +2293,12 @@
 DocType: Material Request,Requested For,Diminta Untuk
 DocType: Quotation Item,Against Doctype,Terhadap Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Melacak Pengiriman ini Catatan terhadap Proyek apapun
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Account root tidak bisa dihapus
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Kas Bersih dari Investasi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Account root tidak bisa dihapus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Tampilkan Entries Bursa
 ,Is Primary Address,Apakah Alamat Primer
 DocType: Production Order,Work-in-Progress Warehouse,Kerja-in Progress-Gudang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referensi # {0} tanggal {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referensi # {0} tanggal {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Mengelola Alamat
 DocType: Pricing Rule,Item Code,Item Code
 DocType: Production Planning Tool,Create Production Orders,Buat Pesanan Produksi
@@ -2284,7 +2306,7 @@
 DocType: Journal Entry,User Remark,Keterangan Pengguna
 DocType: Lead,Market Segment,Segmen Pasar
 DocType: Employee Internal Work History,Employee Internal Work History,Karyawan Kerja internal Sejarah
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Penutup (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Penutup (Dr)
 DocType: Contact,Passive,Pasif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial ada {0} bukan dalam stok
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Template Pajak menjual transaksi.
@@ -2300,7 +2322,7 @@
 ,Billed Amount,Jumlah Tagihan
 DocType: Bank Reconciliation,Bank Reconciliation,Rekonsiliasi Bank
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dapatkan Update
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Permintaan Material {0} dibatalkan atau dihentikan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Permintaan Material {0} dibatalkan atau dihentikan
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Tambahkan beberapa catatan sampel
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Tinggalkan Manajemen
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Group by Akun
@@ -2309,14 +2331,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Account kepala di bawah Kewajiban, di mana Laba / Rugi akan dipesan"
 DocType: Payment Tool,Against Vouchers,Terhadap Voucher
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Bantuan Cepat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Penjualan Ekstra
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},"{0} anggaran untuk Akun {1} terhadap ""Cost Center"" {2} akan melebihi oleh {3}"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Perbedaan Akun harus rekening Jenis Aset / Kewajiban, karena ini Bursa Rekonsiliasi adalah Masuk Pembukaan"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
 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'
 ,Stock Projected Qty,Stock Proyeksi Jumlah
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik proyek {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik proyek {1}
 DocType: Sales Order,Customer's Purchase Order,Purchase Order pelanggan
 DocType: Warranty Claim,From Company,Dari Perusahaan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Nilai atau Qty
@@ -2326,9 +2348,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Tinggalkan Block List Diizinkan
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Anda akan menggunakannya untuk Login
 DocType: Sales Partner,Retailer,Pengecer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit Untuk akun harus rekening Neraca
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Semua Jenis pemasok
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Item Code adalah wajib karena Item tidak secara otomatis nomor
+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 +93,Quotation {0} not of type {1},Quotation {0} bukan dari jenis {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Jadwal pemeliharaan Barang
 DocType: Sales Order,%  Delivered,% Terkirim
@@ -2372,7 +2394,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Berat kotor paket. Berat + kemasan biasanya net berat bahan. (Untuk mencetak)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peran ini diperbolehkan untuk mengatur account beku dan membuat / memodifikasi entri akuntansi terhadap rekening beku
 DocType: Serial No,Is Cancelled,Apakah Dibatalkan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Pengiriman saya
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Pengiriman saya
 DocType: Journal Entry,Bill Date,Bill Tanggal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Bahkan jika ada beberapa Aturan Harga dengan prioritas tertinggi, kemudian mengikuti prioritas internal diterapkan:"
 DocType: Supplier,Supplier Details,Pemasok Rincian
@@ -2393,10 +2415,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Panggilan
 DocType: Project,Total Costing Amount (via Time Logs),Jumlah Total Biaya (via Waktu Log)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Purchase Order {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Purchase Order {0} tidak disampaikan
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Proyeksi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial ada {0} bukan milik Gudang {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,Tanggal pembukaan
 DocType: Journal Entry,Remark,Komentar
@@ -2409,9 +2431,9 @@
 DocType: Time Log,Batched for Billing,Batched untuk Billing
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Bills diajukan oleh Pemasok.
 DocType: POS Profile,Write Off Account,Menulis Off Akun
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Jumlah Diskon
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kembali Terhadap Pembelian Faktur
 DocType: Item,Warranty Period (in days),Masa Garansi (dalam hari)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Kas Bersih dari Operasi
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,misalnya PPN
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
 DocType: Journal Entry Account,Journal Entry Account,Masuk Rekening Journal
@@ -2452,7 +2474,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Tanggal Of Pensiun harus lebih besar dari Tanggal Bergabung
 DocType: Sales Invoice,Against Income Account,Terhadap Akun Pendapatan
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Terkirim
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Target Wilayah
 DocType: Delivery Note,Transporter Info,Info Transporter
@@ -2480,10 +2502,10 @@
 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/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Ini adalah orang penjualan akar dan tidak dapat diedit.
 ,Stock Ledger,Bursa Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Tingkat: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Tingkat: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Slip Gaji Pengurangan
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Pilih simpul kelompok pertama.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Tujuan harus menjadi salah satu {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Tujuan harus menjadi salah satu {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Isi formulir dan menyimpannya
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download laporan yang berisi semua bahan baku dengan status persediaan terbaru mereka
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Komunitas
@@ -2521,7 +2543,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Perusahaan (tidak Pelanggan atau Pemasok) Master.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Masukkan 'Diharapkan Pengiriman Tanggal'
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Catatan pengiriman {0} harus dibatalkan sebelum membatalkan Sales Order ini
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} tidak Nomor Batch berlaku untuk barang {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Catatan: Tidak ada saldo cuti cukup bagi Leave Type {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Catatan: Jika pembayaran tidak dilakukan terhadap setiap referensi, membuat Journal Masuk manual."
@@ -2538,13 +2560,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Terbuka
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Kirim email otomatis ke Kontak transaksi Mengirimkan.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Baris {0}: Qty tidak avalable di gudang {1} pada {2} {3}.
  Qty Tersedia: {4}, Transfer Qty: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Butir 3
 DocType: Purchase Order,Customer Contact Email,Email Kontak Pelanggan
 DocType: Sales Team,Contribution (%),Kontribusi (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Tanggung Jawab
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Contoh
 DocType: Sales Person,Sales Person Name,Penjualan Person Nama
@@ -2555,20 +2577,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Sebelum rekonsiliasi
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,Standar BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Mohon tipe nama perusahaan untuk mengkonfirmasi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Jumlah Posisi Amt
 DocType: Time Log Batch,Total Hours,Jumlah Jam
 DocType: Journal Entry,Printing Settings,Pengaturan pencetakan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit harus sama dengan total kredit. Perbedaannya adalah {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit harus sama dengan total kredit. Perbedaannya adalah {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotif
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Dari Delivery Note
 DocType: Time Log,From Time,Dari Waktu
 DocType: Notification Control,Custom Message,Custom Pesan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Perbankan Investasi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Kas atau Rekening Bank wajib untuk membuat entri pembayaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Kas atau Rekening Bank wajib untuk membuat entri pembayaran
 DocType: Purchase Invoice,Price List Exchange Rate,Daftar Harga Tukar
 DocType: Purchase Invoice Item,Rate,Menilai
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Menginternir
@@ -2587,9 +2609,10 @@
  konflik dengan menetapkan prioritas. Harga Aturan: {0}"
 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 +580,Issue Material,Isu Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Isu Material
 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,Kutipan
 DocType: Hub Settings,Access Token,Akses Token
 DocType: Sales Invoice Item,Serial No,Serial ada
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Cukup masukkan Maintaince Detail pertama
@@ -2603,10 +2626,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Ada lebih dari hari kerja libur bulan ini.
 DocType: Product Bundle Item,Product Bundle Item,Produk Bundle Barang
 DocType: Sales Partner,Sales Partner Name,Penjualan Mitra Nama
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimum Faktur Jumlah
 DocType: Purchase Invoice Item,Image View,Citra Tampilan
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Total
@@ -2614,6 +2639,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Barang ini adalah Varian dari {0} (Template). Atribut akan disalin dari template kecuali 'No Copy' diatur
 DocType: Account,Purchase User,Pembelian Pengguna
 DocType: Notification Control,Customize the Notification,Sesuaikan Pemberitahuan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Arus Kas dari Operasi
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Template Default Address tidak bisa dihapus
 DocType: Sales Invoice,Shipping Rule,Aturan Pengiriman
 DocType: Journal Entry,Print Heading,Cetak Pos
@@ -2624,7 +2650,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Bahan Baku
 DocType: Leave Application,Follow via Email,Ikuti via Email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Jumlah pajak Setelah Diskon Jumlah
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,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 +335,Please select Posting Date first,Silakan pilih Posting Tanggal pertama
@@ -2642,6 +2668,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Diperlukan untuk Serial Barang {0}
 DocType: Journal Entry,Bank Entry,Bank Masuk
 DocType: Authorization Rule,Applicable To (Designation),Berlaku Untuk (Penunjukan)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Tambahkan ke Keranjang Belanja
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Kelompok Dengan
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Mengaktifkan / menonaktifkan mata uang.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Beban pos
@@ -2649,30 +2676,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Hiburan & Kenyamanan
 DocType: Purchase Order,The date on which recurring order will be stop,Tanggal perintah berulang akan berhenti
 DocType: Quality Inspection,Item Serial No,Item Serial No
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} harus dikurangi oleh {1} atau Anda harus meningkatkan toleransi overflow
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} harus dikurangi oleh {1} atau Anda harus meningkatkan toleransi overflow
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Hadir
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Jam
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serial Barang {0} tidak dapat diperbarui \
  menggunakan Stock Rekonsiliasi"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Mentransfer Bahan untuk Pemasok
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Mentransfer Bahan untuk Pemasok
 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,Baru Serial ada tidak dapat memiliki Gudang. Gudang harus diatur oleh Bursa Masuk atau Penerimaan Pembelian
 DocType: Lead,Lead Type,Timbal Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Buat Quotation
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Anda tidak berwenang untuk menyetujui daun di Blok Tanggal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Semua barang-barang tersebut telah ditagih
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Semua barang-barang tersebut telah ditagih
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Dapat disetujui oleh {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Aturan Pengiriman Kondisi
 DocType: BOM Replace Tool,The new BOM after replacement,The BOM baru setelah penggantian
 DocType: Features Setup,Point of Sale,Point of Sale
 DocType: Account,Tax,PPN
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Baris {0}: {1} tidak valid {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Dari Bundle Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Dari Bundle Produk
 DocType: Production Planning Tool,Production Planning Tool,Alat Perencanaan Produksi
 DocType: Quality Inspection,Report Date,Tanggal Laporan
 DocType: C-Form,Invoices,Faktur
 DocType: Job Opening,Job Title,Jabatan
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Penerima
 DocType: Features Setup,Item Groups in Details,Item Grup dalam Rincian
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Kuantitas untuk Industri harus lebih besar dari 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Mulai Point-of-Sale (POS)
@@ -2680,8 +2706,9 @@
 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: Pricing Rule,Customer Group,Kelompok Pelanggan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Rekening pengeluaran adalah wajib untuk item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Rekening pengeluaran adalah wajib untuk item {0}
 DocType: Item,Website Description,Website Description
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Perubahan Bersih Ekuitas
 DocType: Serial No,AMC Expiry Date,AMC Tanggal Berakhir
 ,Sales Register,Daftar Penjualan
 DocType: Quotation,Quotation Lost Reason,Quotation Kehilangan Alasan
@@ -2689,12 +2716,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Tidak ada yang mengedit.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Ringkasan untuk bulan ini dan kegiatan yang tertunda
 DocType: Customer Group,Customer Group Name,Nama Kelompok Pelanggan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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 daun tahun fiskal ini
 DocType: GL Entry,Against Voucher Type,Terhadap Tipe Voucher
 DocType: Item,Attributes,Atribut
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Dapatkan Produk
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Cukup masukkan Write Off Akun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Dapatkan Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Cukup masukkan Write Off Akun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Pesanan terakhir Tanggal
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Membuat Cukai Faktur
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Akun {0} tidak milik perusahaan {1}
@@ -2710,7 +2737,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data proyek-bijaksana tidak tersedia untuk Quotation
 DocType: Project,Expected End Date,Diharapkan Tanggal Akhir
 DocType: Appraisal Template,Appraisal Template Title,Judul Template Penilaian
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Komersial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Komersial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Induk Barang {0} tidak harus menjadi Stok Item
 DocType: Cost Center,Distribution Id,Id Distribusi
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Layanan mengagumkan
@@ -2723,7 +2750,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Nilai untuk Atribut {0} harus berada dalam kisaran {1} ke {2} dalam penambahan sebesar {3}
 DocType: Tax Rule,Sales,Penjualan
 DocType: Stock Entry Detail,Basic Amount,Dasar Jumlah
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Barang {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Barang {0}
 DocType: Leave Allocation,Unused leaves,Daun terpakai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standar Piutang Account
@@ -2735,16 +2762,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Penerimaan pembelian
-DocType: Payment Reconciliation,Maximum Amount,Jumlah Maksimum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Bagaimana Rule Harga diterapkan?
 DocType: Quality Inspection,Delivery Note No,Pengiriman Note No
 DocType: Company,Retail,Eceran
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Pelanggan {0} tidak ada
 DocType: Attendance,Absent,Absen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle Produk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: referensi tidak valid {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle Produk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Row {0}: referensi tidak valid {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Membeli Pajak dan Biaya Template
 DocType: Upload Attendance,Download Template,Download Template
 DocType: GL Entry,Remarks,Keterangan
@@ -2771,7 +2798,7 @@
 ,Monthly Attendance Sheet,Lembar Kehadiran Bulanan
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Tidak ada catatan ditemukan
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},"{0} {1}: ""Cost Center"" adalah wajib untuk Item {2}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Dapatkan Produk dari Bundle Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Dapatkan Produk dari Bundle Produk
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Akun {0} tidak aktif
 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
@@ -2780,8 +2807,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Tipe akun 'Laba Rugi' {0} tidak diperbolehkan dalam Entri Saldo Awal
 DocType: Features Setup,Sales Discounts,Penjualan Diskon
 DocType: Hub Settings,Seller Country,Penjual Negara
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publikasikan Produk di Website
 DocType: Authorization Rule,Authorization Rule,Regulasi Autorisasi
 DocType: Sales Invoice,Terms and Conditions Details,Syarat dan Ketentuan Detail
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Spesifikasi
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Penjualan Pajak dan Biaya Template
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Pakaian & Aksesoris
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Jumlah Pesanan
@@ -2803,7 +2832,7 @@
 DocType: Time Log,Billing Amount,Penagihan Jumlah
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Kuantitas tidak valid untuk item {0}. Jumlah harus lebih besar dari 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Aplikasi untuk cuti.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Akun dengan transaksi yang ada tidak dapat dihapus
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Akun dengan transaksi yang ada tidak dapat dihapus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Beban Legal
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Hari bulan yang urutan otomatis akan dihasilkan misalnya 05, 28 dll"
 DocType: Sales Invoice,Posting Time,Posting Waktu
@@ -2819,11 +2848,11 @@
 DocType: Maintenance Visit,Breakdown,Rincian
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata: {1} tidak dapat dipilih
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tanggal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Akun {0}: akun Induk {1} bukan milik perusahaan: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Akun {0}: akun Induk {1} bukan milik perusahaan: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Berhasil dihapus semua transaksi yang terkait dengan perusahaan ini!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Seperti pada Tanggal
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Percobaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Standar Warehouse adalah wajib bagi saham Barang.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Standar Warehouse adalah wajib bagi saham Barang.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
 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 +25,Total Paid Amount,Jumlah Total Dibayar
@@ -2835,6 +2864,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Jumlah Total Tagihan (via Waktu Log)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Kami menjual item ini
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Pemasok Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Kuantitas harus lebih besar dari 0
 DocType: Journal Entry,Cash Entry,Masuk Kas
 DocType: Sales Partner,Contact Desc,Contact Info
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Jenis daun seperti kasual, dll sakit"
@@ -2843,7 +2873,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tambahkan baris untuk mengatur akun anggaran tahunan.
 DocType: Buying Settings,Default Supplier Type,Standar Pemasok Type
 DocType: Production Order,Total Operating Cost,Total Biaya Operasional
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Catatan: Barang {0} masuk beberapa kali
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Catatan: Barang {0} masuk beberapa kali
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Semua Kontak.
 DocType: Newsletter,Test Email Id,Uji Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Singkatan Perusahaan
@@ -2868,7 +2898,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Semua Grup Pelanggan
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin data rekaman kurs mata uang tidak dibuat untuk {1} ke {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template pajak adalah wajib.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Akun {0}: akun Induk {1} tidak ada
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Sementara
 DocType: Address,Preferred Billing Address,Disukai Alamat Penagihan
@@ -2886,8 +2916,8 @@
 ,Item-wise Price List Rate,Barang-bijaksana Daftar Harga Tingkat
 DocType: Purchase Order Item,Supplier Quotation,Pemasok 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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} dihentikan
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} dihentikan
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
 DocType: Lead,Add to calendar on this date,Tambahkan ke kalender pada tanggal ini
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Aturan untuk menambahkan biaya pengiriman.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Acara Mendatang
@@ -2908,24 +2938,24 @@
 DocType: Customer,From Lead,Dari Timbal
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Pesanan dirilis untuk produksi.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Masuk
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Masuk
 DocType: Hub Settings,Name Token,Nama Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard Jual
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Setidaknya satu gudang adalah wajib
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,Out of Garansi
 DocType: BOM Replace Tool,Replace,Mengganti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Masukkan Satuan default Ukur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Masukkan Satuan default Ukur
 DocType: Purchase Invoice Item,Project Name,Nama Proyek
 DocType: Supplier,Mention if non-standard receivable account,Menyebutkan jika non-standar piutang
 DocType: Journal Entry Account,If Income or Expense,Jika Penghasilan atau Beban
 DocType: Features Setup,Item Batch Nos,Item Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Nilai saham Perbedaan
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Sumber Daya Manusia
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Aset pajak
 DocType: BOM Item,BOM No,No. BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM yang akan diganti
 DocType: Account,Debit,Debet
@@ -2962,7 +2992,7 @@
 DocType: Stock Entry Detail,Additional Cost,Biaya tambahan
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Tahun Keuangan Akhir Tanggal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Tidak dapat memfilter berdasarkan No. Voucher, jika dikelompokkan berdasarkan Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Membuat Pemasok Quotation
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Membuat Pemasok Quotation
 DocType: Quality Inspection,Incoming,Incoming
 DocType: BOM,Materials Required (Exploded),Bahan yang dibutuhkan (Meledak)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Mengurangi Produktif untuk Tinggalkan Tanpa Bayar (LWP)
@@ -2970,7 +3000,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} tidak sesuai dengan {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Santai Cuti
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Catatan: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Catatan: {0}
 ,Delivery Note Trends,Tren pengiriman Note
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ringkasan minggu ini
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} harus merupakan barang yang dibeli atau barang sub-kontrak di baris {1}
@@ -2985,6 +3015,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Tingkat Membeli
 DocType: Task,Actual Time (in Hours),Waktu yang sebenarnya (di Jam)
 DocType: Employee,History In Company,Sejarah Dalam Perusahaan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Total kuantitas Issue / transfer {0} Material Permintaan {1} tidak dapat lebih besar daripada kuantitas yang diminta {2} untuk Item {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletter
 DocType: Address,Shipping,Pengiriman
 DocType: Stock Ledger Entry,Stock Ledger Entry,Bursa Ledger entri
@@ -3004,7 +3035,6 @@
 DocType: Purchase Order,End date of current order's period,Tanggal akhir periode orde berjalan
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Membuat Penawaran Surat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Kembali
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Standar Satuan Ukur untuk Varian harus sama dengan Template
 DocType: Production Order Operation,Production Order Operation,Pesanan Operasi Produksi
 DocType: Pricing Rule,Disable,Nonaktifkan
 DocType: Project Task,Pending Review,Pending Ulasan
@@ -3012,7 +3042,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Pelanggan Id
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Untuk waktu harus lebih besar dari Dari Waktu
 DocType: Journal Entry Account,Exchange Rate,Nilai Tukar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Sales Order {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Sales Order {0} tidak disampaikan
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Gudang {0}: akun induk {1} tidak terkait kepada perusahaan {2}
 DocType: BOM,Last Purchase Rate,Tingkat Pembelian Terakhir
 DocType: Account,Asset,Aset
@@ -3032,7 +3062,7 @@
 ,Available Stock for Packing Items,Tersedia Stock untuk Packing Produk
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Mengatur Template Alamat ini sebagai default karena tidak ada standar lainnya
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Manajemen Kualitas
 DocType: Production Planning Tool,Filter based on customer,Filter berdasarkan pelanggan
 DocType: Payment Tool Detail,Against Voucher No,Terhadap Voucher Tidak ada
@@ -3049,6 +3079,7 @@
 DocType: Opportunity,Next Contact,Hubungi Berikutnya
 DocType: Employee,Employment Type,Jenis Pekerjaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Aktiva Tetap
+,Cash Flow,Arus kas
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Periode aplikasi tidak bisa di dua catatan alokasi
 DocType: Item Group,Default Expense Account,Beban standar Akun
 DocType: Employee,Notice (days),Notice (hari)
@@ -3080,13 +3111,12 @@
 DocType: Production Order,Warehouses,Gudang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Cetak dan Alat Tulis
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Node kelompok
-DocType: Payment Reconciliation,Minimum Amount,Jumlah Minimum
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Barang pembaruan Selesai
 DocType: Workstation,per hour,per jam
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Akun untuk gudang (Inventaris Perpetual) akan dibuat di bawah Rekening ini.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak dapat dihapus sebagai entri stok buku ada untuk gudang ini.
 DocType: Company,Distribution,Distribusi
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Jumlah Dibayar
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Jumlah Dibayar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Manager Project
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Pengiriman
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Diskon Max diperbolehkan untuk item: {0} {1}%
@@ -3110,7 +3140,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Dukungan Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Perusahaan hilang di gudang {0}
 DocType: POS Profile,Terms and Conditions,Syarat dan Ketentuan
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Untuk tanggal harus dalam Tahun Anggaran. Dengan asumsi To Date = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Untuk tanggal harus dalam Tahun Anggaran. Dengan asumsi To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Di sini Anda dapat mempertahankan tinggi, berat, alergi, masalah medis dll"
 DocType: Leave Block List,Applies to Company,Berlaku untuk Perusahaan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Tidak bisa membatalkan karena disampaikan Stock entri {0} ada
@@ -3124,11 +3154,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Cukup masukkan Pembelian Penerimaan
 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 +425,Transaction not allowed against stopped Production Order {0},Transaksi tidak diperbolehkan berhenti melawan Orde Produksi {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Pengaturan server masuk untuk email dukungan id. (Misalnya support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Kekurangan Jumlah
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
 DocType: Salary Slip,Salary Slip,Slip Gaji
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Sampai Tanggal' harus diisi
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Menghasilkan kemasan slip paket yang akan dikirimkan. Digunakan untuk memberitahu nomor paket, isi paket dan berat."
@@ -3217,7 +3247,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Catatan karyawan.
 DocType: HR Settings,Payroll Settings,Pengaturan Payroll
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Cocokkan Faktur non-linked dan Pembayaran.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Order
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Order
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root tidak dapat memiliki pusat biaya orang tua
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Pilih Merek ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Berlaku
@@ -3232,7 +3262,7 @@
 DocType: Appraisal,Start Date,Tanggal Mulai
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Alokasi cuti untuk periode tertentu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik di sini untuk memverifikasi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Akun {0}: Anda tidak dapat menetapkanya sebagai Akun Induk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Akun {0}: Anda tidak dapat menetapkanya sebagai Akun Induk
 DocType: Purchase Invoice Item,Price List Rate,Daftar Harga Tingkat
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Tampilkan ""In Stock"" atau ""Tidak di Bursa"" didasarkan pada stok yang tersedia di gudang ini."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Material (BOM)
@@ -3241,17 +3271,17 @@
 DocType: Project,Expected Start Date,Diharapkan Tanggal Mulai
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Hapus item jika biaya ini tidak berlaku untuk item
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Misalnya. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Menerima
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Menerima
 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: Employee Leave Approver,Employee Leave Approver,Karyawan Tinggalkan Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} telah berhasil ditambahkan ke daftar Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri perekam sudah ada untuk gudang ini {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Tidak dapat mendeklarasikan sebagai hilang, karena Quotation telah dibuat."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pembelian Guru Manajer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Pesanan produksi {0} harus diserahkan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Pesanan produksi {0} harus diserahkan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Silakan pilih Tanggal Mulai dan Tanggal Akhir untuk Item {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Laporan Utama
 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
@@ -3269,7 +3299,7 @@
 DocType: Industry Type,Industry Type,Jenis Industri
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Ada yang salah!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Peringatan: Tinggalkan aplikasi berisi tanggal blok berikut
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Faktur Penjualan {0} telah disampaikan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Faktur Penjualan {0} telah disampaikan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Tanggal Penyelesaian
 DocType: Purchase Invoice Item,Amount (Company Currency),Jumlah (Perusahaan Mata Uang)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unit Organisasi (kawasan) menguasai.
@@ -3288,10 +3318,10 @@
 ,Serial No Service Contract Expiry,Serial No Layanan Kontrak kadaluarsa
 DocType: Item,Unit of Measure Conversion,Unit Konversi Ukur
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Karyawan tidak dapat diubah
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Anda tidak dapat kredit dan mendebit rekening yang sama pada waktu yang sama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Anda tidak dapat kredit dan mendebit rekening yang sama pada waktu yang sama
 DocType: Naming Series,Help HTML,Bantuan HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Jumlah weightage ditugaskan harus 100%. Ini adalah {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Penyisihan over-{0} menyeberang untuk Item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Penyisihan over-{0} menyeberang untuk Item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nama orang atau organisasi yang alamat ini milik.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Pemasok Anda
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Tidak dapat ditetapkan sebagai Hilang sebagai Sales Order dibuat.
@@ -3304,35 +3334,35 @@
 DocType: Employee,Date of Issue,Tanggal Issue
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Set Pemasok untuk item {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,Website Image {0} attached to Item {1} cannot be found,Website Image {0} melekat Butir {1} tidak dapat ditemukan
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Daftar Barang ini dalam beberapa kelompok di website.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Silakan periksa opsi Mata multi untuk memungkinkan account dengan mata uang lainnya
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Silakan periksa opsi Mata multi untuk memungkinkan account dengan mata uang lainnya
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} tidak ada dalam sistem
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Anda tidak diizinkan untuk menetapkan nilai yg sedang dibekukan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Anda tidak diizinkan untuk menetapkan nilai yg sedang dibekukan
 DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan Entries Unreconciled
+DocType: Payment Reconciliation,From Invoice Date,Dari Faktur Tanggal
 DocType: Cost Center,Budgets,Anggaran
-DocType: Employee,Emergency Contact Details,Detail Darurat Kontak
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Apa gunanya?
 DocType: Delivery Note,To Warehouse,Untuk Gudang
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Akun {0} telah dimasukkan lebih dari sekali untuk tahun fiskal {1}
 ,Average Commission Rate,Rata-rata Komisi Tingkat
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,"""Memiliki Nomor Serial' tidak bisa 'dipilih' untuk item non-stok"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,"""Memiliki Nomor Serial' tidak bisa 'dipilih' untuk item non-stok"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,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
 DocType: Purchase Taxes and Charges,Account Head,Akun Kepala
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Memperbarui biaya tambahan untuk menghitung biaya mendarat item
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Listrik
 DocType: Stock Entry,Total Value Difference (Out - In),Total Nilai Selisih (Out - Dalam)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Kurs adalah wajib
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Row {0}: Kurs adalah wajib
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID tidak ditetapkan untuk Karyawan {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Dari Garansi Klaim
 DocType: Stock Entry,Default Source Warehouse,Sumber standar Gudang
 DocType: Item,Customer Code,Kode Pelanggan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder untuk {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Hari Sejak Orde terakhir
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
 DocType: Buying Settings,Naming Series,Penamaan Series
 DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Block List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aset saham
@@ -3345,7 +3375,7 @@
 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
 DocType: Authorization Rule,Based On,Berdasarkan
 DocType: Sales Order Item,Ordered Qty,Memerintahkan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Item {0} dinonaktifkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Item {0} dinonaktifkan
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periode Dari dan Untuk Periode tanggal wajib bagi berulang {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Kegiatan proyek / tugas.
@@ -3353,7 +3383,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Menulis Off Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Biaya mendarat
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Silakan set {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ulangi pada Hari Bulan
@@ -3383,12 +3413,12 @@
 DocType: Upload Attendance,Upload Attendance,Upload Kehadiran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM dan Manufaktur Kuantitas diperlukan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Penuaan Rentang 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Jumlah
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Jumlah
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM diganti
 ,Sales Analytics,Penjualan Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Pengaturan manufaktur
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Menyiapkan Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Masukkan mata uang default di Perusahaan Guru
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Masukkan mata uang default di Perusahaan Guru
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Masuk Detil
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Pengingat harian
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Aturan pajak Konflik dengan {0}
@@ -3414,13 +3444,13 @@
 DocType: Sales Order Item,Produced Quantity,Diproduksi Jumlah
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Insinyur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Cari Sub Sidang
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Item Code dibutuhkan pada Row ada {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Item Code dibutuhkan pada Row ada {0}
 DocType: Sales Partner,Partner Type,Mitra Type
 DocType: Purchase Taxes and Charges,Actual,Aktual
 DocType: Authorization Rule,Customerwise Discount,Customerwise Diskon
 DocType: Purchase Invoice,Against Expense Account,Terhadap Akun Biaya
 DocType: Production Order,Production Order,Pesanan Produksi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Instalasi Catatan {0} telah disampaikan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Instalasi Catatan {0} telah disampaikan
 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
@@ -3432,15 +3462,15 @@
 DocType: Employee,Applicable Holiday List,Daftar hari libur yang berlaku
 DocType: Employee,Cheque,Cek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seri Diperbarui
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Jenis Laporan adalah wajib
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Jenis Laporan adalah wajib
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Gudang adalah wajib bagi saham Barang {0} berturut-turut {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Grosir
 DocType: Issue,First Responded On,Pertama Menanggapi On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Daftar Lintas Item dalam beberapa kelompok
 apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Pengguna Pertama: Anda
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Berhasil Berdamai
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Berhasil Berdamai
 DocType: Production Order,Planned End Date,Direncanakan Tanggal Berakhir
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Dimana item disimpan.
 DocType: Tax Rule,Validity,Keabsahan
@@ -3448,7 +3478,7 @@
 DocType: Attendance,Attendance,Kehadiran
 DocType: BOM,Materials,bahan materi
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Tanggal posting dan posting waktu adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Tanggal posting dan posting waktu adalah wajib
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Template pajak untuk membeli transaksi.
 ,Item Prices,Harga Barang
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Dalam Kata-kata akan terlihat setelah Anda menyimpan Purchase Order.
@@ -3457,15 +3487,15 @@
 DocType: Task,Review Date,Ulasan Tanggal
 DocType: Purchase Invoice,Advance Payments,Uang Muka
 DocType: Purchase Taxes and Charges,On Net Total,Pada Bersih Jumlah
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target gudang di baris {0} harus sama dengan Orde Produksi
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Tidak ada izin untuk menggunakan Alat Pembayaran
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Notifikasi Alamat Email' tidak ditentukan untuk nota langganan %s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Bulat Off Akun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Beban Administrasi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Konsultasi
 DocType: Customer Group,Parent Customer Group,Induk Pelanggan Grup
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Perubahan
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Perubahan
 DocType: Purchase Invoice,Contact Email,Email Kontak
 DocType: Appraisal Goal,Score Earned,Skor Earned
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","misalnya ""My Company LLC """
@@ -3475,13 +3505,13 @@
 DocType: Packing Slip,Gross Weight UOM,Berat Kotor UOM
 DocType: Email Digest,Receivables / Payables,Piutang / Hutang
 DocType: Delivery Note Item,Against Sales Invoice,Terhadap Faktur Penjualan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Akun kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Akun kredit
 DocType: Landed Cost Item,Landed Cost Item,Landed Biaya Barang
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Tampilkan nilai nol
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Jumlah barang yang diperoleh setelah manufaktur / repacking dari mengingat jumlah bahan baku
 DocType: Payment Reconciliation,Receivable / Payable Account,Piutang / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,Terhadap Sales Order Barang
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Standar Gudang
 DocType: Task,Actual End Date (via Time Logs),Sebenarnya Tanggal Akhir (via Waktu Log)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Anggaran tidak dapat diberikan terhadap Account Group {0}
@@ -3517,29 +3547,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Rencana waktu log luar Jam Kerja Workstation.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} telah diserahkan
 ,Items To Be Requested,Items Akan Diminta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Dapatkan Terakhir Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Tingkat penagihan berdasarkan Jenis Kegiatan (per jam)
 DocType: Company,Company Info,Info Perusahaan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Perusahaan Email ID tidak ditemukan, maka surat tidak terkirim"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Penerapan Dana (Aset)
 DocType: Production Planning Tool,Filter based on item,Filter berdasarkan pada item
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Akun Debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Akun Debit
 DocType: Fiscal Year,Year Start Date,Tanggal Mulai Tahun
 DocType: Attendance,Employee Name,Nama Karyawan
 DocType: Sales Invoice,Rounded Total (Company Currency),Rounded Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,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 +124,Cannot covert to Group because Account Type is selected.,Tidak dapat mengkonversi ke Grup karena Account Type dipilih.
 DocType: Purchase Common,Purchase Common,Pembelian Umum
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,Dari Peluang
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Manfaat Karyawan
 DocType: Sales Invoice,Is POS,Apakah POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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,Diproduksi Qty
 DocType: Purchase Receipt Item,Accepted Quantity,Kuantitas Diterima
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} tidak ada
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Bills diajukan ke Pelanggan.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proyek Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} pelanggan telah ditambahkan
 DocType: Maintenance Schedule,Schedule,Jadwal
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Tentukan Anggaran untuk Biaya Pusat ini. Untuk mengatur aksi anggaran, lihat &quot;Daftar Perusahaan&quot;"
@@ -3547,7 +3578,7 @@
 DocType: Quality Inspection Reading,Reading 3,Membaca 3
 ,Hub,Pusat
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
 DocType: Expense Claim,Approved,Disetujui
 DocType: Pricing Rule,Price,Harga
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Karyawan lega pada {0} harus ditetapkan sebagai 'Kiri'
@@ -3561,7 +3592,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Pencatatan Jurnal akuntansi.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Jumlah yang tersedia di Gudang Dari
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Silakan pilih Rekam Karyawan pertama.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partai / Rekening tidak sesuai dengan {1} / {2} di {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partai / Rekening tidak sesuai dengan {1} / {2} di {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Untuk membuat Akun Pajak
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Masukkan Beban Akun
 DocType: Account,Stock,Stock
@@ -3572,7 +3603,7 @@
 DocType: Employee,Contract End Date,Tanggal Kontrak End
 DocType: Sales Order,Track this Sales Order against any Project,Melacak Pesanan Penjualan ini terhadap Proyek apapun
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tarik pesanan penjualan (pending untuk memberikan) berdasarkan kriteria di atas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Dari Pemasok Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Dari Pemasok Quotation
 DocType: Deduction Type,Deduction Type,Pengurangan Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Qty
@@ -3580,7 +3611,7 @@
 DocType: GL Entry,Transaction Date,Transaction Tanggal
 DocType: Production Plan Item,Planned Qty,Rencana Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Pajak
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Untuk Quantity (Diproduksi Qty) adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Untuk Quantity (Diproduksi Qty) adalah wajib
 DocType: Stock Entry,Default Target Warehouse,Standar Sasaran Gudang
 DocType: Purchase Invoice,Net Total (Company Currency),Jumlah Bersih (Perusahaan Mata Uang)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partai Jenis dan Partai ini hanya berlaku terhadap Piutang / Hutang akun
@@ -3634,9 +3665,9 @@
 DocType: Customer,Commission Rate,Komisi Tingkat
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Membuat Varian
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Memblokir aplikasi cuti berdasarkan departemen.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Cart adalah Kosong
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Cart adalah Kosong
 DocType: Production Order,Actual Operating Cost,Realisasi Biaya Operasi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root tidak dapat diedit.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root tidak dapat diedit.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Jumlah yang dialokasikan tidak boleh lebih besar dari sisa jumlah
 DocType: Manufacturing Settings,Allow Production on Holidays,Biarkan Produksi di hari libur
 DocType: Sales Order,Customer's Purchase Order Date,Nasabah Purchase Order Tanggal
@@ -3647,11 +3678,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Perancang
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Syarat dan Ketentuan Template
 DocType: Serial No,Delivery Details,Detail Pengiriman
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Biaya Pusat diperlukan dalam baris {0} dalam tabel Pajak untuk tipe {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Biaya Pusat diperlukan dalam baris {0} dalam tabel Pajak untuk tipe {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Secara otomatis membuat Bahan Permintaan jika kuantitas turun di bawah tingkat ini
 ,Item-wise Purchase Register,Barang-bijaksana Pembelian Register
 DocType: Batch,Expiry Date,Tanggal Berakhir
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk mengatur tingkat pemesanan ulang, barang harus Item Pembelian atau Manufacturing Barang"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk mengatur tingkat pemesanan ulang, barang harus Item Pembelian atau Manufacturing Barang"
 ,Supplier Addresses and Contacts,Pemasok Alamat dan Kontak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Silahkan pilih Kategori pertama
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Menguasai proyek.
@@ -3659,7 +3690,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Setengah Hari)
 DocType: Supplier,Credit Days,Hari Kredit
 DocType: Leave Type,Is Carry Forward,Apakah Carry Teruskan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Dapatkan item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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,Memimpin Waktu Hari
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Material
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partai Jenis dan Partai diperlukan untuk Piutang / Hutang akun {1}
@@ -3667,7 +3698,7 @@
 DocType: Employee,Reason for Leaving,Alasan Meninggalkan
 DocType: Expense Claim Detail,Sanctioned Amount,Jumlah sanksi
 DocType: GL Entry,Is Opening,Apakah Membuka
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Baris {0}: Debit masuk tidak dapat dihubungkan dengan {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Akun {0} tidak ada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Baris {0}: Debit masuk tidak dapat dihubungkan dengan {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Akun {0} tidak ada
 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/it.csv b/erpnext/translations/it.csv
index 3a290b4..f3ea8fc 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Prodotti di consumo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Seleziona il Partito Tipo primo
 DocType: Item,Customer Items,Articoli clienti
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Il Conto {0}: conto derivato {1} non può essere un libro mastro
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Il Conto {0}: conto derivato {1} non può essere un libro mastro
 DocType: Item,Publish Item to hub.erpnext.com,Pubblicare Item a hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Notifiche e-mail
 DocType: Item,Default Unit of Measure,Unità di Misura Predefinita
@@ -21,13 +21,13 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},È richiesto di valuta per il listino prezzi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sarà calcolato nella transazione
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Da Material Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Da Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Albero
 DocType: Job Applicant,Job Applicant,Candidato di lavoro
 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/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Imposta tipo effettivo non può essere incluso nel prezzo dell&#39;oggetto in riga {0}
-DocType: C-Form,Customer,Cliente
+DocType: C-Form,Customer,Clienti
 DocType: Purchase Receipt Item,Required By,Richiesto da
 DocType: Delivery Note,Return Against Delivery Note,Di ritorno contro Consegna Nota
 DocType: Department,Department,Dipartimento
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Per mantenere il codice cliente e renderli ricercabili in base al loro codice usare questa opzione
 DocType: Mode of Payment Account,Mode of Payment Account,Modalità di pagamento Conto
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mostra Varianti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Quantità
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Quantità
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Prestiti (passività )
 DocType: Employee Education,Year of Passing,Anni dal superamento
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,In Giacenza
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Assistenza Sanitaria
 DocType: Purchase Invoice,Monthly,Mensile
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Ritardo nel pagamento (Giorni)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Fattura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Fattura
 DocType: Maintenance Schedule Item,Periodicity,Periodicità
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Indirizzo E-Mail
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Fiscal Year {0} è richiesto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Difesa
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Punteggio (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Riga {0}: {1} {2} non corrisponde con {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Riga {0}: {1} {2} non corrisponde con {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Veicolo No
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Seleziona Listino Prezzi
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Seleziona Listino Prezzi
 DocType: Production Order Operation,Work In Progress,Work In Progress
 DocType: Employee,Holiday List,Elenco Vacanza
 DocType: Time Log,Time Log,Tempo di Log
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,La stessa azienda viene inserito più di una volta
 DocType: Employee,Married,Sposato
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Non consentito per {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
 DocType: Payment Reconciliation,Reconcile,conciliare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,drogheria
 DocType: Quality Inspection Reading,Reading 1,Lettura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Crea Voce Banca
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondi Pensione
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Warehouse è obbligatoria se il tipo di conto è Warehouse
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Warehouse è obbligatoria se il tipo di conto è Warehouse
 DocType: SMS Center,All Sales Person,Tutti i Venditori
 DocType: Lead,Person Name,Nome Person
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Controllare se l'ordine ricorrenti, deselezionare per fermare ricorrenti o mettere Data fine corretta"
@@ -116,7 +116,7 @@
 DocType: Warehouse,Warehouse Detail,Magazzino Dettaglio
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Limite di credito è stato attraversato per il cliente {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Tipo fiscale
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Non sei autorizzato a aggiungere o aggiornare le voci prima di {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Non sei autorizzato ad aggiungere o aggiornare le voci prima di {0}
 DocType: Item,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
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Interessati
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Da {0} a {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Da {0} a {1}
 DocType: Item,Copy From Item Group,Copiare da elemento Gruppo
 DocType: Journal Entry,Opening Entry,Apertura Entry
 DocType: Stock Entry,Additional Costs,Costi aggiuntivi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Conto con transazione esistente non può essere convertito al gruppo .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Conto con transazione esistente non può essere convertito al gruppo .
 DocType: Lead,Product Enquiry,Prodotto Inchiesta
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Inserisci prima azienda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Seleziona prima azienda
 DocType: Employee Education,Under Graduate,Sotto Laurea
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,obiettivo On
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,obiettivo On
 DocType: BOM,Total Cost,Costo totale
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro attività :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,L'articolo {0} non esiste nel sistema o è scaduto
@@ -165,7 +165,7 @@
 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 +444,Item {0} is not active or end of life has been reached,L'articolo {0} non è attivo o la fine della vita è stato raggiunta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Saranno aggiornate dopo fattura di vendita sia presentata.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Impostazioni per il modulo HR
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,I dettagli delle operazioni effettuate.
 DocType: Serial No,Maintenance Status,Stato di manutenzione
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Oggetti e prezzi
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Dalla data deve essere entro l'anno fiscale. Assumendo Dalla Data = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Dalla data deve essere entro l'anno fiscale. Assumendo Dalla Data = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Selezionare il dipendente per il quale si sta creando la valutazione.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centro di costo {0} non appartiene alla società {1}
 DocType: Customer,Individual,Individuale
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Inserisci Società
 DocType: Delivery Note Item,Against Sales Invoice Item,Contro fattura di vendita dell'oggetto
 ,Production Orders in Progress,Ordini di produzione in corso
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Di cassa netto da finanziamento
 DocType: Lead,Address & Contact,Indirizzo e Contatto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Aggiungere le foglie non utilizzate precedentemente assegnata
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Successivo ricorrente {0} verrà creato su {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Nome Contatto
 DocType: Production Plan Item,SO Pending Qty,SO attesa Qtà
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea busta paga per i criteri sopra menzionati.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Nessuna descrizione fornita
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Richiesta di acquisto.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Solo il selezionato Lascia Approver può presentare questo Leave applicazione
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Data Alleviare deve essere maggiore di Data di giunzione
@@ -233,10 +235,10 @@
 DocType: Item Website Specification,Item Website Specification,Specifica da Sito Web dell'articolo
 DocType: Payment Tool,Reference No,Di riferimento
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Lascia Bloccato
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,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/accounts/utils.py +341,Annual,annuale
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voce Riconciliazione Giacenza
-DocType: Stock Entry,Sales Invoice No,Fattura Commerciale No
+DocType: Stock Entry,Sales Invoice No,Fattura di Vendita n.
 DocType: Material Request Item,Min Order Qty,Qtà Minima Ordine
 DocType: Lead,Do Not Contact,Non Contattaci
 DocType: Sales 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.
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Tipo Fornitore
 DocType: Item,Publish in Hub,Pubblicare in Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,L'articolo {0} è annullato
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,L'articolo {0} è annullato
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Relazione
 DocType: Shipping Rule,Worldwide Shipping,Spedizione in tutto il mondo
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Ordini Confermati da Clienti.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Suggerimenti
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Impostare la voce del budget di Gruppo-saggi su questo territorio. È inoltre possibile includere la stagionalità impostando la distribuzione.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Inserisci il gruppo account padre per il magazzino {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Il pagamento contro {0} {1} non può essere maggiore di eccezionale Importo {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Il pagamento contro {0} {1} non può essere maggiore di eccezionale Importo {2}
 DocType: Supplier,Address HTML,Indirizzo HTML
 DocType: Lead,Mobile No.,Num. Cellulare
 DocType: Maintenance Schedule,Generate Schedule,Genera Programma
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ultimo
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caratteri
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Lascia il primo responsabile approvazione della lista sarà impostato come predefinito Lascia Approver
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Imparare
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Costo attività per i dipendenti
 DocType: Accounts Settings,Settings for Accounts,Impostazioni per gli account
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Gestire Organizzazione Venditori
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo Fattura
 DocType: Sales Invoice Item,Delivery Note,Nota Consegna
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Impostazione Tasse
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Impostazione Tasse
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Riepilogo per questa settimana e le attività in corso
 DocType: Workstation,Rent Cost,Affitto Costo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Si prega di selezionare mese e anno
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponibile in distinta , bolla di consegna , fattura di acquisto , ordine di produzione , ordine di acquisto , ricevuta d'acquisto , fattura di vendita , ordini di vendita , dell'entrata Stock , Timesheet"
 DocType: Item Tax,Tax Rate,Aliquota Fiscale
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} già stanziato per Employee {1} per il periodo {2} a {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Seleziona elemento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Seleziona elemento
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Voce: {0} gestito non può conciliarsi con \
  della Riconciliazione, utilizzare invece dell'entrata Stock saggio-batch,"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Acquisto Fattura {0} è già presentato
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Acquisto Fattura {0} è già presentato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Convert to non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Acquisto ricevuta deve essere presentata
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motivo per Perdere
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation è chiuso nei seguenti giorni secondo l'elenco di vacanza: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Opportunità
 DocType: Employee,Single,Singolo
 DocType: Issue,Attachment,Attaccamento
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Bilancio non può essere impostato per Gruppo centro di costo
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Impostazioni globali per tutti i processi produttivi.
 DocType: Accounts Settings,Accounts Frozen Upto,Conti congelati Fino
 DocType: SMS Log,Sent On,Inviata il
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,Maestro di vacanza .
 DocType: Material Request Item,Required Date,Data richiesta
 DocType: Delivery Note,Billing Address,Indirizzo Fatturazione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Inserisci il codice dell'articolo.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Inserisci il codice dell'articolo.
 DocType: BOM,Costing,Valutazione Costi
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se selezionato, l&#39;importo della tassa sarà considerata già inclusa nel Stampa Valuta / Stampa Importo"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totale Quantità
@@ -419,9 +423,9 @@
 DocType: Stock Entry,Difference Account,account differenza
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +305,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 funzionamento
+DocType: Production Order,Additional Operating Cost,Ulteriori costi di esercizio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,cosmetici
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Serial No Garanzia di scadenza
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Incremento non può essere 0
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Elimina transazioni Azienda
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,L'articolo {0} non è un'Articolo da Acquistare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,L'articolo {0} non è un'Articolo da Acquistare
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} non è un indirizzo email valido in 'Notifica \
  Indirizzo email'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Fatturato totale dell'anno:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Aggiungere / Modificare Tasse e Costi
 DocType: Purchase Invoice,Supplier Invoice No,Fornitore fattura n
 DocType: Territory,For reference,Per riferimento
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Chiusura (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Chiusura (Cr)
 DocType: Serial No,Warranty Period (Days),Periodo di garanzia (Giorni)
 DocType: Installation Note Item,Installation Note Item,Installazione Nota articolo
 ,Pending Qty,In attesa Quantità
@@ -464,7 +467,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","La **distribuzione mensile** aiuta a distribuire il budget attraverso mesi se si dispone di stagionalità nel vostro business. Per distribuire un budget con questa distribuzione, impostare questa **Distribuzione mensile** nel **Centro di costo**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nessun record trovato nella tabella Fattura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nessun record trovato nella tabella Fattura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Selezionare prego e Partito Tipo primo
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Esercizio finanziario / contabile .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Siamo spiacenti , Serial Nos non può essere fusa"
@@ -472,9 +475,9 @@
 DocType: Project Task,Project Task,Progetto Task
 ,Lead Id,Id Contatto
 DocType: C-Form Invoice Detail,Grand Total,Totale Generale
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Anno fiscale Data di inizio non deve essere maggiore di Data Fine dell'anno fiscale
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Anno fiscale Data di inizio non deve essere maggiore di Data Fine dell'anno fiscale
 DocType: Warranty Claim,Resolution,Risoluzione
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Consegna: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Consegna: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Conto da pagare
 DocType: Sales Order,Billing and Delivery Status,Fatturazione e di condizione di consegna
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ripetere i clienti
@@ -485,11 +488,11 @@
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componenti stipendio.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database Potenziali Clienti.
 DocType: Authorization Rule,Customer or Item,Cliente o Voce
-apps/erpnext/erpnext/config/crm.py +17,Customer database.,Database Cliente.
+apps/erpnext/erpnext/config/crm.py +17,Customer database.,Database Clienti.
 DocType: Quotation,Quotation To,Preventivo Per
 DocType: Lead,Middle Income,Reddito Medio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Importo concesso non può essere negativo
 DocType: Purchase Order Item,Billed Amt,Importo Fatturato
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Deposito logica a fronte del quale sono calcolate le scorte.
@@ -498,7 +501,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordine di produzione è obbligatorio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Scrivere proposta
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Archivio Error ( {6} ) per la voce {0} in Magazzino {1} su {2} {3} {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Archivio Error ( {6} ) per la voce {0} in Magazzino {1} su {2} {3} {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Anno Fiscale Società
 DocType: Packing Slip Item,DN Detail,Dettaglio DN
 DocType: Time Log,Billed,Addebbitato
@@ -517,16 +520,17 @@
 DocType: Activity Type,Default Costing Rate,Tasso Costing Predefinito
 DocType: Maintenance Schedule,Maintenance Schedule,Programma di manutenzione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Poi Regole dei prezzi vengono filtrati in base a cliente, Gruppo Cliente, Territorio, Fornitore, Fornitore Tipo, Campagna, Partner di vendita ecc"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Variazione netta Inventario
 DocType: Employee,Passport Number,Numero di passaporto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Da Ricevuta di Acquisto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Lo stesso oggetto è stato inserito più volte.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Da Ricevuta di Acquisto
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Lo stesso oggetto è stato inserito più volte.
 DocType: SMS Settings,Receiver Parameter,Ricevitore Parametro
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basato Su' e 'Raggruppato Per' non può essere lo stesso
 DocType: Sales Person,Sales Person Targets,Sales Person Obiettivi
 DocType: Production Order Operation,In minutes,In pochi minuti
 DocType: Issue,Resolution Date,Risoluzione Data
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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/accounts/doctype/sales_invoice/sales_invoice.py +663,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}
 DocType: Selling Settings,Customer Naming By,Cliente nominato di
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convert to Group
 DocType: Activity Cost,Activity Type,Tipo Attività
@@ -537,7 +541,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,editoria
 DocType: Activity Cost,Projects User,Progetti utente
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumato
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} non trovato in tabella Dettagli Fattura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} non trovato in tabella Dettagli Fattura
 DocType: Company,Round Off Cost Center,Arrotondamento Centro di costo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenzione Visita {0} deve essere cancellato prima di annullare questo ordine di vendita
 DocType: Material Request,Material Transfer,Material Transfer
@@ -559,13 +563,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Per tenere traccia di voce in documenti di vendita e di acquisto in base alle loro n ° di serie. Questo è può anche usato per rintracciare informazioni sulla garanzia del prodotto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Giacenza Corrente
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Warehouse Respinto è obbligatoria alla voce regected
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Fatturazione totale quest&#39;anno
 DocType: Account,Expenses Included In Valuation,Spese incluse nella Valutazione
 DocType: Employee,Provide email id registered in company,Fornire id-mail registrato in azienda
 DocType: Hub Settings,Seller City,Città Venditore
 DocType: Email Digest,Next email will be sent on:,La prossimo Email verrà inviato:
 DocType: Offer Letter Term,Offer Letter Term,Offerta Lettera Termine
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Articolo ha varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Articolo ha varianti.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,albero Type
@@ -583,18 +587,18 @@
 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.,La data in cui viene generato prossima fattura. Viene generato su Invia.
 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 +92,{0} is not a stock Item,{0} non è un articolo in scorta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} non è un articolo in scorta
 DocType: Mode of Payment Account,Default Account,Account Predefinito
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Contatto deve essere impostato se Opportunità generata da Contatto
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Seleziona il giorno di riposo settimanale
 DocType: Production Order Operation,Planned End Time,Planned End Time
 ,Sales Person Target Variance Item Group-Wise,Sales Person target Varianza articolo Group- Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Conto con transazione esistente non può essere convertito in contabilità
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Conto con transazione esistente non può essere convertito in contabilità
 DocType: Delivery Note,Customer's Purchase Order No,Ordine Acquisto Cliente N.
 DocType: Employee,Cell Number,Numero di Telefono
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Richieste Materiale Auto generata
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Non è possibile immettere buono attuale in 'Against Journal Entry' colonna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Non è possibile immettere buono attuale in 'Against Journal Entry' colonna
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Opportunità da
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Busta Paga Mensile.
@@ -603,9 +607,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Da {0} di tipo {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Riga {0}: fattore di conversione è obbligatoria
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Le voci di contabilità può essere fatta contro nodi foglia. Non sono ammesse le voci contro gruppi.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Acquisto Ricevuta richiesta per la voce {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Acquisto Ricevuta richiesta per la voce {0}
 DocType: Item Attribute Value,Item Attribute Value,Valore Attributo Articolo
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campagne di vendita .
 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.
@@ -663,7 +667,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Listino Prezzi non selezionati
 DocType: Employee,Family Background,Sfondo Famiglia
 DocType: Process Payroll,Send Email,Invia Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nessuna autorizzazione
 DocType: Company,Default Bank Account,Conto Banca Predefinito
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Per filtrare sulla base del partito, selezionare Partito Digitare prima"
@@ -671,7 +675,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,Gli articoli con maggiore weightage nel periodo più alto
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Dettaglio Riconciliazione Banca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Le mie fatture
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Le mie fatture
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nessun dipendente trovato
 DocType: Purchase Order,Stopped,Arrestato
 DocType: Item,If subcontracted to a vendor,Se subappaltato a un fornitore
@@ -681,6 +685,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Invia Ora
 ,Support Analytics,Analytics Support
 DocType: Item,Website Warehouse,Magazzino sito web
+DocType: Payment Reconciliation,Minimum Invoice Amount,Importo Minimo Fattura
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Il giorno del mese su cui viene generata fattura automatica es 05, 28 ecc"
 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/config/accounts.py +169,C-Form records,Record C -Form
@@ -690,7 +695,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Per attivare la &quot;Point of Sale&quot; caratteristiche
 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 +328,{0} against Bill {1} dated {2},{0} contro Bill {1} in data {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} contro Bill {1} in data {2}
 DocType: Maintenance Visit,Completion Status,Stato Completamento
 DocType: Sales Invoice Item,Target Warehouse,Obiettivo Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Consenti superamento ricezione o invio fino a questa percentuale
@@ -702,7 +707,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Comporre automaticamente il messaggio di presentazione delle transazioni .
 DocType: Production Order,Item To Manufacture,Articolo per la fabbricazione
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} stato è {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordine d&#39;acquisto a pagamento
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ordine d&#39;acquisto a pagamento
 DocType: Sales Order Item,Projected Qty,Qtà Proiettata
 DocType: Sales Invoice,Payment Due Date,Pagamento Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
@@ -726,7 +731,7 @@
 DocType: Sales Invoice Item,Stock Details,Dettagli della
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valore di progetto
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punto vendita
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo del conto già in credito, non sei autorizzato a impostare 'saldo deve essere' come 'Debito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo del conto già in credito, non sei autorizzato a impostare 'saldo deve essere' come 'Debito'"
 DocType: Account,Balance must be,Saldo deve essere
 DocType: Hub Settings,Publish Pricing,Pubblicare Prezzi
 DocType: Notification Control,Expense Claim Rejected Message,Messaggio Rimborso Spese Rifiutato
@@ -749,7 +754,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Maestro del tasso di cambio di valuta .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} deve essere attivo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} deve essere attivo
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Si prega di selezionare il tipo di documento prima
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Lascia Incasso Importo
@@ -767,20 +772,20 @@
 DocType: Supplier,Default Payable Accounts,Debiti default
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} non è attiva o non esiste
 DocType: Features Setup,Item Barcode,Barcode articolo
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Voce Varianti {0} aggiornato
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Voce Varianti {0} aggiornato
 DocType: Quality Inspection Reading,Reading 6,Lettura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Acquisto Advance Fattura
 DocType: Address,Shop,Negozio
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Riga {0}: ingresso di credito non può essere collegato con un {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conto predefinito Banca / Contante  aggiornato automaticamente in Fatture POS quando selezioni questo metodo
 DocType: Employee,Permanent Address Is,Indirizzo permanente è
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operazione completata per quanti prodotti finiti?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,La Marca
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Indennità per over-{0} attraversato per la voce {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Indennità per over-{0} attraversato per la voce {1}.
 DocType: Employee,Exit Interview Details,Uscire Dettagli Intervista
 DocType: Item,Is Purchase Item,È Acquisto Voce
-DocType: Journal Entry Account,Purchase Invoice,Acquisto Fattura
+DocType: Journal Entry Account,Purchase Invoice,Fattura di Acquisto
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
 DocType: Stock Entry,Total Outgoing Value,Totale Valore uscita
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,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
@@ -789,7 +794,7 @@
 DocType: Salary Slip,Total in words,Totale in parole
 DocType: Material Request Item,Lead Time Date,Data Tempo di Esecuzione
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,è obbligatorio. Forse record di cambio valuta non viene creato per
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Si prega di specificare Numero d'ordine per la voce {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Si prega di specificare Numero d'ordine per la voce {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Per &#39;prodotto Bundle&#39;, Warehouse, numero di serie e Batch No sarà considerata dal &#39;Packing List&#39; tavolo. Se Magazzino e Batch No sono gli stessi per tutti gli elementi di imballaggio per un elemento qualsiasi &#39;Product Bundle&#39;, questi valori possono essere inseriti nella tabella principale elemento, i valori verranno copiati a &#39;Packing List&#39; tavolo."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Le spedizioni verso i clienti.
 DocType: Purchase Invoice Item,Purchase Order Item,Ordine di acquisto dell&#39;oggetto
@@ -798,14 +803,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varianza
 ,Company Name,Nome Azienda
 DocType: SMS Center,Total Message(s),Messaggio Total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Selezionare la voce per il trasferimento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Select Item for Transfer,Selezionare la voce per il trasferimento
+DocType: Purchase Invoice,Additional Discount Percentage,Additional Percentuale di sconto
 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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Consenti all&#39;utente di modificare Listino cambio nelle transazioni
 DocType: Pricing Rule,Max Qty,Qtà max
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Riga {0}: Pagamento contro vendite / ordine di acquisto deve essere sempre contrassegnato come anticipo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,chimico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Tutti gli articoli sono già stati trasferiti per questo ordine di produzione.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Tutti gli articoli sono già stati trasferiti per questo ordine di produzione.
 DocType: Process Payroll,Select Payroll Year and Month,Selezionare Payroll Anno e mese
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Vai al gruppo appropriato (solitamente Applicazione dei fondi&gt; Attività correnti&gt; conti bancari e creare un nuovo account (facendo clic su Add Child) di tipo &quot;Banca&quot;
 DocType: Workstation,Electricity Cost,Costo Elettricità
@@ -819,10 +825,10 @@
 DocType: SMS Center,All Lead (Open),Tutti LEAD (Aperto)
 DocType: Purchase Invoice,Get Advances Paid,Ottenere anticipo pagamento
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Allega la tua foto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Fare
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Fare
 DocType: Journal Entry,Total Amount in Words,Importo totale in parole
 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 +3,My Cart,Il mio carrello
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Il mio carrello
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tipo ordine deve essere uno dei {0}
 DocType: Lead,Next Contact Date,Successivo Contact Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantità di apertura
@@ -841,10 +847,10 @@
 DocType: POS Profile,Cash/Bank Account,Conto Cassa/Banca
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Elementi rimossi senza variazione di quantità o valore.
 DocType: Delivery Note,Delivery To,Consegna a
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Tavolo attributo è obbligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} non può essere negativo
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Sconto
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Sconto
 DocType: Features Setup,Purchase Discounts,Acquisto Sconti
 DocType: Workstation,Wages,Salari
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Verrà aggiornato solo se tempo Log è &#39;fatturabile&#39;
@@ -869,7 +875,7 @@
 DocType: Tax Rule,Shipping State,Stato Spedizione
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'oggetto deve essere aggiunto utilizzando 'ottenere elementi dal Receipts Purchase pulsante
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Spese di vendita
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Comprare standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Comprare standard
 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
@@ -911,6 +917,7 @@
 DocType: Sales Partner,Distributor,Distributore
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrello Regola Spedizione
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ordine di produzione {0} deve essere cancellato prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Impostare &#39;Applica ulteriore sconto On&#39;
 ,Ordered Items To Be Billed,Articoli ordinati da fatturare
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Da Campo deve essere inferiore al campo
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selezionare Time Diari e Invia per creare una nuova fattura di vendita.
@@ -920,13 +927,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Questo Log Batch Ora è stato fatturato.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,creare Opportunità
 DocType: Salary Slip,Leave Without Pay,Lascia senza stipendio
-DocType: Supplier,Communications,comunicazioni
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacity Planning Errore
 ,Trial Balance for Party,Bilancio di verifica per il partito
 DocType: Lead,Consultant,Consulente
 DocType: Salary Slip,Earnings,Rendimenti
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Voce Finito {0} deve essere inserito per il tipo di fabbricazione ingresso
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Apertura bilancio contabile
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Voce Finito {0} deve essere inserito per il tipo di fabbricazione ingresso
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Apertura bilancio contabile
 DocType: Sales Invoice Advance,Sales Invoice Advance,Fattura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Niente da chiedere
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Data Inizio effettivo' non può essere maggiore di 'Data di fine effettiva'
@@ -952,7 +958,7 @@
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Il rivenditore avrà un ricordo in questa data per contattare il cliente
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,"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"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Fiscale e di altre deduzioni salariali.
-DocType: Lead,Lead,Contatto
+DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Debiti
 DocType: Account,Warehouse,magazzino
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rifiutato Quantità non è possibile entrare in acquisto di ritorno
@@ -968,7 +974,7 @@
 DocType: Global Defaults,Current Fiscal Year,Anno Fiscale Corrente
 DocType: Global Defaults,Disable Rounded Total,Disabilita Arrotondamento su Totale
 DocType: Lead,Call,Chiama
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'le voci' non possono essere vuote
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'le voci' non possono essere vuote
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Fila Duplicate {0} con lo stesso {1}
 ,Trial Balance,Bilancio di verifica
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Impostazione dipendenti
@@ -980,9 +986,9 @@
 DocType: Contact,User ID,ID utente
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,vista Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,La prima
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"An Item Group exists with same name, please change the item name or rename the item group","Un gruppo di elementi esiste con lo stesso nome , si prega di cambiare il nome della voce o rinominare il gruppo di articoli"
+apps/erpnext/erpnext/stock/doctype/item/item.py +444,"An Item Group exists with same name, please change the item name or rename the item group","Un gruppo di elementi esiste con lo stesso nome , si prega di cambiare il nome della voce o rinominare il gruppo di articoli"
 DocType: Production Order,Manufacture against Sales Order,Produzione contro Ordine di vendita
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resto del Mondo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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 Batch
 ,Budget Variance Report,Report Variazione Budget
 DocType: Salary Slip,Gross Pay,Retribuzione lorda
@@ -1012,7 +1018,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Non autorizzato a modificare account congelati {0}
 DocType: Journal Entry,Get Outstanding Invoices,Ottieni fatture non saldate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} non è valido
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1025,13 +1031,13 @@
 DocType: Employee,Place of Issue,Luogo di emissione
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,contratto
 DocType: Email Digest,Add Quote,Aggiungere Citazione
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Fattore coversion UOM richiesto per Confezionamento: {0} alla voce: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Fattore coversion UOM richiesto per Confezionamento: {0} alla voce: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,spese indirette
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Riga {0}: Quantità è obbligatorio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,agricoltura
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,I vostri prodotti o servizi
 DocType: Mode of Payment,Mode of Payment,Modalità di Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,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/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Questo è un gruppo elemento principale e non può essere modificato .
 DocType: Journal Entry Account,Purchase Order,Ordine di acquisto
 DocType: Warehouse,Warehouse Contact Info,Magazzino contatto
@@ -1040,8 +1046,8 @@
 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/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Consegna Note {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Consegna Note {0} non è presentata
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Attrezzature Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1051,7 +1057,7 @@
 DocType: Appraisal Goal,Goal,Obiettivo
 DocType: Sales Invoice Item,Edit Description,Modifica Descrizione
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data prevista di consegna è minore del previsto Data inizio.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,per Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,per Fornitore
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Impostazione Tipo di account aiuta nella scelta questo account nelle transazioni.
 DocType: Purchase Invoice,Grand Total (Company Currency),Totale generale (valuta Azienda)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Uscita totale
@@ -1064,7 +1070,7 @@
 DocType: Journal Entry,Journal Entry,Journal Entry
 DocType: Workstation,Workstation Name,Nome workstation
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email di Sintesi:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} non appartiene alla voce {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} does not belong to Item {1},BOM {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
@@ -1096,7 +1102,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter per contatti (leads).
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Le operazioni non possono essere lasciati vuoti.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Le operazioni non possono essere lasciati vuoti.
 ,Delivered Items To Be Billed,Gli Articoli consegnati da Fatturare
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazzino non può essere modificato per Serial No.
 DocType: Authorization Rule,Average Discount,Sconto Medio
@@ -1111,7 +1117,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Da {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operazione Descrizione
 DocType: Item,Will also apply to variants,Si applicheranno anche alle varianti
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Impossibile modificare Fiscal Year data di inizio e di fine anno fiscale una volta l'anno fiscale è stato salvato.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Impossibile modificare Fiscal Year data di inizio e di fine anno fiscale una volta l'anno fiscale è stato salvato.
 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: Pricing Rule,Campaign,Campagna
@@ -1122,7 +1128,8 @@
 DocType: Sales Order Item,Planned Quantity,Prevista Quantità
 DocType: Purchase Invoice Item,Item Tax Amount,Articolo fiscale Ammontare
 DocType: Item,Maintain Stock,Mantenere Scorta
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Le voci di archivio già creati per ordine di produzione
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1131,10 +1138,10 @@
 apps/erpnext/erpnext/config/support.py +38,Communication log.,Log comunicazione
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Importo Acquisto
 DocType: Sales Invoice,Shipping Address Name,Indirizzo Shipping Name
-apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Grafico dei Conti
+apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,non può essere superiore a 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,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 Slip Deduction,Depends on Leave Without Pay,Dipende in aspettativa senza assegni
@@ -1172,7 +1179,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,sub Assemblies
 DocType: Shipping Rule Condition,To Value,Per Valore
 DocType: Supplier,Stock Manager,Manager di Giacenza
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Magazzino Source è obbligatorio per riga {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Magazzino Source è obbligatorio per riga {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Documento di trasporto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Affitto Ufficio
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Impostazioni del gateway configurazione di SMS
@@ -1180,10 +1187,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nessun indirizzo ancora aggiunto.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation ore di lavoro
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a JV importo {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a JV importo {2}
 DocType: Item,Inventory,Inventario
 DocType: Features Setup,"To enable ""Point of Sale"" view",Per attivare la &quot;Point of Sale&quot; vista
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Il pagamento non può essere effettuato per carrello vuoto
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Il pagamento non può essere effettuato per carrello vuoto
 DocType: Item,Sales Details,Dettagli di vendita
 DocType: Opportunity,With Items,Con gli articoli
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qtà
@@ -1198,10 +1205,11 @@
 DocType: Cost Center,Parent Cost Center,Parent Centro di costo
 DocType: Sales Invoice,Source,Fonte
 DocType: Leave Type,Is Leave Without Pay,È lasciare senza stipendio
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nessun record trovato nella tabella di Pagamento
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nessun record trovato nella tabella di Pagamento
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Esercizio Data di inizio
 DocType: Employee External Work History,Total Experience,Esperienza totale
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Bolla di accompagnamento ( s ) annullato
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Bolla di accompagnamento ( s ) annullato
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow da investimenti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e spese
 DocType: Material Request Item,Sales Order No,Ordine di vendita No
 DocType: Item Group,Item Group Name,Nome Gruppo Articoli
@@ -1209,12 +1217,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Trasferimento Materiali per Produzione
 DocType: Pricing Rule,For Price List,Per Listino Prezzi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Tasso di acquisto per la voce: {0} non trovato, che è necessario per prenotare l'ingresso contabilità (oneri). Si prega di indicare prezzi contro un listino prezzi di acquisto."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Tasso di acquisto per la voce: {0} non trovato, che è necessario per prenotare l'ingresso contabilità (oneri). Si prega di indicare prezzi contro un listino prezzi di acquisto."
 DocType: Maintenance Schedule,Schedules,Orari
 DocType: Purchase Invoice Item,Net Amount,Importo Netto
 DocType: Purchase Order Item Supplied,BOM Detail No,DIBA Dettagli N.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ulteriori Importo Discount (valuta Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Errore: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Errore: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Si prega di creare un nuovo account dal Piano dei conti .
 DocType: Maintenance Visit,Maintenance Visit,Visita di manutenzione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Clienti> Gruppi clienti> Territorio
@@ -1240,7 +1248,7 @@
 DocType: Sales Partner,Sales Partner Target,Vendite Partner di destinazione
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Ingresso contabile per {0} può essere fatta solo in valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Regola Prezzi
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Richiesta materiale per ordine d&#39;acquisto
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Richiesta materiale per ordine d&#39;acquisto
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: restituito Voce {1} non esiste in {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Conti bancari
 ,Bank Reconciliation Statement,Prospetto di Riconciliazione Banca
@@ -1248,11 +1256,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Apertura della Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} deve apparire una sola volta
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},Foglie allocata 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
 DocType: Shipping Rule Condition,From Value,Da Valore
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Produzione La quantità è obbligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Produzione La quantità è obbligatoria
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Gli importi non riflette in banca
 DocType: Quality Inspection Reading,Reading 4,Lettura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Reclami per spese dell'azienda.
@@ -1264,33 +1272,34 @@
 ,Material Requests for which Supplier Quotations are not created,Richieste di materiale con le quotazioni dei fornitori non sono creati
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Il giorno (s) in cui si stanno applicando per ferie sono le vacanze. Non è necessario chiedere un permesso.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Per tenere traccia di elementi con codice a barre. Si sarà in grado di inserire articoli nel DDT e fattura di vendita attraverso la scansione del codice a barre del prodotto.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Segna come Consegnato
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Segna come Consegnato
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Crea Preventivo
 DocType: Dependent Task,Dependent Task,Task dipendente
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Lista Ricevitore
 DocType: Payment Tool Detail,Payment Amount,Pagamento Importo
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantità consumata
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vista
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Vista
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Variazione netta delle disponibilità
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struttura salariale Deduzione
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stato inserito più di una volta Factor Tabella di conversione
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stato inserito più di una volta Factor Tabella di conversione
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo di elementi Emesso
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantità non deve essere superiore a {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Età (Giorni)
 DocType: Quotation Item,Quotation Item,Preventivo Articolo
 DocType: Account,Account Name,Nome Conto
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Dalla data non può essere maggiore di A Data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Dalla data non può essere maggiore di A Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} {1} quantità non può essere una frazione
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Fornitore Tipo master.
 DocType: Purchase Order Item,Supplier Part Number,Numero di parte del fornitore
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Il tasso di conversione non può essere 0 o 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Il tasso di conversione non può essere 0 o 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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,Veicolo Spedizione Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Acquisto Ricevuta {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Acquisto Ricevuta {0} non è presentata
 DocType: Company,Default Payable Account,Conto da pagare Predefinito
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Impostazioni per in linea carrello della spesa, come le regole di trasporto, il listino prezzi ecc"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fatturato
@@ -1302,15 +1311,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,I miei problemi
 DocType: BOM Item,BOM Item,DIBA Articolo
 DocType: Appraisal,For Employee,Per Dipendente
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Riga {0}: Advance contro Fornitore deve essere addebito
 DocType: Company,Default Values,Valori Predefiniti
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Riga {0}: Importo del pagamento non può essere negativo
 DocType: Expense Claim,Total Amount Reimbursed,Dell&#39;importo totale rimborsato
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contro Fornitore Invoice {0} {1} datato
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Contro Fornitore Invoice {0} {1} datato
 DocType: Customer,Default Price List,Listino Prezzi Predefinito
 DocType: Payment Reconciliation,Payments,Pagamenti
 DocType: Budget Detail,Budget Allocated,Budget Assegnato
 DocType: Journal Entry,Entry Type,Tipo voce
 ,Customer Credit Balance,Balance Credit clienti
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Variazione netta dei debiti
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Verifica il tuo id e-mail
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Cliente richiesto per ' Customerwise Discount '
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Risale aggiornamento versamento bancario con riviste.
@@ -1318,7 +1329,7 @@
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning per (giorni)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Nessuno articolo ha modifiche in termini di quantità o di valore.
 DocType: Warranty Claim,Warranty Claim,Richiesta di Garanzia
-,Lead Details,Dettagli Contatto
+,Lead Details,Dettagli Lead
 DocType: Purchase Invoice,End date of current invoice's period,Data di fine del periodo di fatturazione corrente
 DocType: Pricing Rule,Applicable For,applicabile per
 DocType: Bank Reconciliation,From Date,Da Data
@@ -1331,7 +1342,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Abilita Carrello
 DocType: Employee,Permanent Address,Indirizzo permanente
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,L'Articolo {0} deve essere un Servizio
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Anticipo versato contro {0} {1} non può essere maggiore \ di Gran Totale {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Si prega di selezionare il codice articolo
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Ridurre Deduzione per aspettativa senza assegni (LWP)
@@ -1348,18 +1359,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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 usato per fare questo Stock Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unità singola di un articolo.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Tempo Log Lotto {0} deve essere ' inoltrata '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Tempo Log Lotto {0} deve essere ' inoltrata '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Fai Entry Accounting per ogni Archivio Movimento
 DocType: Leave Allocation,Total Leaves Allocated,Totale Foglie allocati
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Magazzino richiesto al Fila No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Magazzino richiesto al Fila No {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Postale
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Esiste un Gruppo Clienti con lo stesso nome, per favore cambiare il nome del Cliente o rinominare il Gruppo Clienti"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Si prega di selezionare {0} prima.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Si prega di selezionare {0} prima.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},text {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nuovo contatto
 DocType: Territory,Parent Territory,Territorio genitore
 DocType: Quality Inspection Reading,Reading 2,Lettura 2
 DocType: Stock Entry,Material Receipt,Materiale Ricevuta
@@ -1367,7 +1379,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partito Tipo e partito è richiesto per Crediti / Debiti conto {0}
 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,Successivo Contatto Con
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +213,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 +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} non può essere soppresso in quanto esiste la quantità per articolo {1}
 DocType: Quotation,Order Type,Tipo di ordine
 DocType: Purchase Invoice,Notification Email Address,Indirizzo e-mail di notifica
@@ -1384,15 +1396,15 @@
 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: Sales Invoice Item,Batch No,Lotto N.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Consentire a più ordini di vendita contro ordine di acquisto di un cliente
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,principale
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,principale
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Impostare prefisso per numerazione serie sulle transazioni
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Arrestato ordine non può essere cancellato . Stappare per annullare.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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 incassati?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Dal campo è obbligatorio
 DocType: Item,Variants,Varianti
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Crea Ordine d'Acquisto
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Crea Ordine d'Acquisto
 DocType: SMS Center,Send To,Invia a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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,Somma stanziata
@@ -1405,7 +1417,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Magazzino e di riferimento
 DocType: Supplier,Statutory info and other general information about your Supplier,Sindaco informazioni e altre informazioni generali sulla tua Fornitore
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Indirizzi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contro diario {0} non ha alcun ineguagliata {1} entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Contro diario {0} non ha alcun ineguagliata {1} entry
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,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 una regola di trasporto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,L'articolo non può avere Ordine di Produzione.
@@ -1414,10 +1426,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Importo del credito Account Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Registri di tempo per la produzione.
 DocType: Item,Apply Warehouse-wise Reorder Level,Usa le informazioni di Magazziono per determinare livello di riordino
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} deve essere presentata
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} deve essere presentata
 DocType: Authorization Control,Authorization Control,Controllo Autorizzazioni
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Rifiutato Warehouse è obbligatoria per la voce respinto {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tempo di log per le attività.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Versamento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Versamento
 DocType: Production Order Operation,Actual Time and Cost,Tempo reale e costi
 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},Richiesta materiale di massimo {0} può essere fatto per la voce {1} contro Sales Order {2}
 DocType: Employee,Salutation,Appellativo
@@ -1434,7 +1447,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,L'articolo {0} non è un elemento serializzato
 DocType: SMS Center,Create Receiver List,Crea Elenco Ricezione
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Scaduto
 DocType: Packing Slip,To Package No.,A Pacchetto no
 DocType: Warranty Claim,Issue Date,Data di Emissione
 DocType: Activity Cost,Activity Cost,Attività Costo
@@ -1472,7 +1484,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Raggiunto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territorio / Cliente
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,ad esempio 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a fatturare importo residuo {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a fatturare importo residuo {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,In parole saranno visibili una volta che si salva la fattura di vendita.
 DocType: Item,Is Sales Item,È Voce vendite
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Struttura Gruppi Articoli
@@ -1484,7 +1496,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creato
 DocType: Delivery Note Item,Against Sales Order,Contro Sales Order
 ,Serial No Status,Serial No Stato
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Tavolo articolo non può essere vuoto
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Tavolo articolo non può essere vuoto
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Riga {0}: Per impostare {1} periodicità, differenza tra da e per la data \
  deve essere maggiore o uguale a {2}"
@@ -1494,7 +1506,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Data di scadenza non può essere precedente 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 +170,Duties and Taxes,Dazi e tasse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Inserisci Data di riferimento
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Inserisci Data di riferimento
 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} voci di pagamento non possono essere filtrate per {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tavolo per la voce che verrà mostrato in Sito Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Dotazione Qtà
@@ -1509,7 +1521,7 @@
 DocType: Installation Note,Installation Time,Tempo di installazione
 DocType: Sales Invoice,Accounting Details,Dettagli contabile
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Eliminare tutte le Operazioni per questa Azienda
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operazione {1} non è completato per {2} qty di prodotti finiti in ordine di produzione # {3}. Si prega di aggiornare lo stato di funzionamento tramite registri Tempo
+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,Row # {0}: Operazione {1} non è completato per {2} qty di prodotti finiti in ordine di produzione # {3}. Si prega di aggiornare lo stato di funzionamento tramite registri Tempo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investimenti
 DocType: Issue,Resolution Details,Dettagli risoluzione
 DocType: Quality Inspection Reading,Acceptance Criteria,Criterio  di accettazione
@@ -1525,7 +1537,7 @@
 DocType: Holiday List,Clear Table,Pulisci Tabella
 DocType: Features Setup,Brands,Marche
 DocType: C-Form Invoice Detail,Invoice No,Fattura n
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Da Ordine di Acquisto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Da Ordine di Acquisto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lasciare non può essere applicata / annullato prima {0}, come equilibrio congedo è già stato inoltrato carry-in futuro record di assegnazione congedo {1}"
 DocType: Activity Cost,Costing Rate,Costing Tasso
 ,Customer Addresses And Contacts,Indirizzi e Contatti Cliente
@@ -1542,7 +1554,7 @@
 ,Maintenance Schedules,Programmi di manutenzione
 ,Quotation Trends,Tendenze di preventivo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,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
 ,Pending Amount,In attesa di Importo
 DocType: Purchase Invoice Item,Conversion Factor,Fattore di Conversione
@@ -1559,12 +1571,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Albero dei conti finanial .
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Il Conto {0} deve essere di tipo ' Asset fisso ' come voce {1} è un Asset articolo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Il Conto {0} deve essere di tipo ' Asset fisso ' come voce {1} è un Asset articolo
 DocType: HR Settings,HR Settings,Impostazioni HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Claim è in attesa di approvazione . Solo il Responsabile approvazione spesa può aggiornare lo stato .
 DocType: Purchase Invoice,Additional Discount Amount,Ulteriori Importo Sconto
 DocType: Leave Block List Allow,Leave Block List Allow,Lascia Block List Consentire
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Sigla non può essere vuoto o spazio
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Sigla non può essere vuoto o spazio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportivo
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totale Actual
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Unità
@@ -1575,7 +1587,8 @@
 DocType: POS Profile,Price List,Listino Prezzi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Rimborsi spese
-DocType: Issue,Support,Sostenere
+DocType: Issue,Support,Post Vendita
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Vedi il carrello
 ,BOM Search,BOM Ricerca
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Chiusura (apertura + totali)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Si prega di specificare la valuta in azienda
@@ -1587,13 +1600,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Fattore UOM conversione è necessaria in riga {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Data di Liquidazione non può essere prima della data di arrivo in riga {0}
 DocType: Salary Slip,Deduction,Deduzioni
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Articolo Prezzo aggiunto per {0} in Listino Prezzi {1}
 DocType: Address Template,Address Template,Indirizzo Template
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% Attività Completate
 DocType: Project,Gross Margin,Margine lordo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Inserisci Produzione articolo prima
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,utente disabilitato
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utente disabilitato
 DocType: Opportunity,Quotation,Quotazione
 DocType: Salary Slip,Total Deduction,Deduzione totale
 DocType: Quotation,Maintenance User,Manutenzione utente
@@ -1602,7 +1616,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 altre operazioni importanti sono tracciati per **Anno Fiscale**.
 DocType: Opportunity,Customer / Lead Address,Indirizzo Cliente / Contatto
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
 DocType: Production Order Operation,Actual Operation Time,Actual Tempo di funzionamento
 DocType: Authorization Rule,Applicable To (User),Applicabile a (Utente)
 DocType: Purchase Taxes and Charges,Deduct,Detrarre
@@ -1612,18 +1626,18 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Tenere traccia delle campagne di vendita. Tenere traccia di Contatti, Preventivi, Ordini ecc da campagne per misurare il ritorno sull'investimento."
 DocType: Expense Claim,Approver,Certificatore
 ,SO Qty,SO Quantità
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Esistono voci Immagini contro warehouse {0}, quindi non è possibile riassegnare o modificare Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Esistono voci Immagini contro warehouse {0}, quindi non è possibile riassegnare o modificare Warehouse"
 DocType: Appraisal,Calculate Total Score,Calcolare il punteggio totale
 DocType: Supplier Quotation,Manufacturing Manager,Manager Produzione
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Split di consegna Nota in pacchetti.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Spedizioni
+apps/erpnext/erpnext/hooks.py +69,Shipments,Spedizioni
 DocType: Purchase Order Item,To be delivered to customer,Da consegnare al cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Stato deve essere presentata.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,N. di serie {0} non appartiene ad alcun magazzino
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),In Parole (Azienda valuta)
-DocType: Pricing Rule,Supplier,Fornitore
+DocType: Pricing Rule,Supplier,Fornitori
 DocType: C-Form,Quarter,Trimestrale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Spese Varie
 DocType: Global Defaults,Default Company,Azienda Predefinita
@@ -1637,10 +1651,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"Types of employment (permanent, contract, intern etc.).","Tipi di occupazione (permanente , contratti , ecc intern ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
 DocType: Currency Exchange,From Currency,Da Valuta
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleziona importo assegnato, Tipo fattura e fattura numero in almeno uno di fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordine di vendita necessaria per la voce {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleziona importo assegnato, Tipo fattura e fattura numero in almeno uno di fila"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Ordine di vendita necessaria per la voce {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Gli importi non riflette nel sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Tariffa (Valuta Azienda)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Altri
@@ -1656,7 +1670,7 @@
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Sconto Itemwise
 DocType: Purchase Order Item,Reference Document Type,Riferimento Tipo di documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contro Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} contro Sales Order {1}
 DocType: Account,Fixed Asset,Asset fisso
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialized Inventario
 DocType: Activity Type,Default Billing Rate,Predefinito fatturazione Tasso
@@ -1666,7 +1680,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Ordine di vendita a pagamento
 DocType: Expense Claim Detail,Expense Claim Detail,Dettaglio Rimborso Spese
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Tempo Logs creato:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Seleziona account corretto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Seleziona account corretto
 DocType: Item,Weight UOM,Peso UOM
 DocType: Employee,Blood Group,Gruppo Discendenza
 DocType: Purchase Invoice Item,Page Break,Interruzione di pagina
@@ -1697,10 +1711,10 @@
 DocType: Time Log,To Time,Per Tempo
 DocType: Authorization Rule,Approving Role (above authorized value),Approvazione di ruolo (di sopra del valore autorizzato)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Per aggiungere nodi figlio , esplorare albero e fare clic sul nodo in cui si desidera aggiungere più nodi ."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Per account deve essere un account a pagamento
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM ricorsione : {0} non può essere genitore o figlio di {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Credit Per account deve essere un account a pagamento
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},BOM ricorsione : {0} non può essere genitore o figlio di {2}
 DocType: Production Order Operation,Completed Qty,Q.tà Completata
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Prezzo di listino {0} è disattivato
 DocType: Manufacturing Settings,Allow Overtime,Consenti Overtime
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numeri di serie necessari per la voce {1}. Lei ha fornito {2}.
@@ -1708,8 +1722,9 @@
 DocType: Item,Customer Item Codes,Codici Voce clienti
 DocType: Opportunity,Lost Reason,Perso Motivo
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Creare voci di pagamento nei confronti di ordini o fatture.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nuovo indirizzo
 DocType: Quality Inspection,Sample Size,Dimensione del campione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Tutti gli articoli sono già stati fatturati
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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
 DocType: Project,External,Esterno
@@ -1742,7 +1757,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Non valido {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Importo Anticipo
 DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Dalla Data' è obbligatorio
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,Il campo 'Data' è obbligatorio
 DocType: Journal Entry,Reference Number,Numero di riferimento
 DocType: Employee,Employment Details,Dettagli Dipendente
 DocType: Employee,New Workplace,Nuovo posto di lavoro
@@ -1765,13 +1780,14 @@
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,aggiornamento dei costi
 DocType: Item Reorder,Item Reorder,Articolo riordino
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Material Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Material Transfer
 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."
 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,Consentire Scorte Negative
 DocType: Installation Note,Installation Note,Nota Installazione
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Aggiungi Imposte
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Flusso di cassa da finanziamento
 ,Financial Analytics,Analisi Finanziaria
 DocType: Quality Inspection,Verified By,Verificato da
 DocType: Address,Subsidiary,Sussidiario
@@ -1781,19 +1797,19 @@
 DocType: Process Payroll,Create Salary Slip,Creare busta paga
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Equilibrio previsto come da banca
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fonte di Fondi ( Passivo )
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantità in riga {0} ( {1} ) deve essere uguale quantità prodotta {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantità in riga {0} ( {1} ) deve essere uguale quantità prodotta {2}
 DocType: Appraisal,Employee,Dipendente
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importa posta elettronica da
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Invita come utente
 DocType: Features Setup,After Sale Installations,Installazioni Post Vendita
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} è completamente fatturato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} è completamente fatturato
 DocType: Workstation Working Hour,End Time,Ora fine
 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 +75,Group by Voucher,Gruppo da Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Richiesto On
 DocType: Sales Invoice,Mass Mailing,Mailing di massa
 DocType: Rename Tool,File to Rename,File da rinominare
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Numero Purchse ordine richiesto per la voce {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Numero Purchse ordine richiesto per la voce {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostra Pagamenti
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,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
@@ -1803,6 +1819,7 @@
 DocType: Selling Settings,Sales Order Required,Ordine di vendita richiesto
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crea clienti
 DocType: Purchase Invoice,Credit To,Credito a
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Leads attivi / Clienti
 DocType: Employee Education,Post Graduate,Post Laurea
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Programma di manutenzione Dettaglio
 DocType: Quality Inspection Reading,Reading 9,Lettura 9
@@ -1814,6 +1831,7 @@
 DocType: Warranty Claim,Raised By,Sollevata dal
 DocType: Payment Tool,Payment Account,Conto di Pagamento
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Si prega di specificare Società di procedere
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Variazione netta dei crediti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compensativa Off
 DocType: Quality Inspection Reading,Accepted,Accettato
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.
@@ -1821,17 +1839,17 @@
 DocType: Payment Tool,Total Payment Amount,Importo totale Pagamento
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) non può essere superiore a quantità pianificata ({2}) in ordine di produzione {3}
 DocType: Shipping Rule,Shipping Rule Label,Etichetta Regola di Spedizione
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, fattura contiene articoli di trasporto di goccia."
 DocType: Newsletter,Test,Prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Siccome ci sono transazioni di magazzino per questo articolo, \ non è possibile modificare i valori di 'Ha Numero Seriale', 'Ha Numero Lotto', 'presente in Scorta' e 'il metodo di valutazione'"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Breve diario
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Breve diario
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Non è possibile modificare tariffa se BOM menzionato agianst tutto l'articolo
 DocType: Employee,Previous Work Experience,Lavoro precedente esperienza
 DocType: Stock Entry,For Quantity,Per Quantità
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,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 +211,{0} {1} is not submitted,{0} {1} non è presentato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} non è presentato
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Termini e Condizioni 1
@@ -1844,9 +1862,9 @@
 DocType: Authorization Rule,Authorized Value,Valore Autorizzato
 DocType: Contact,Enter department to which this Contact belongs,Inserisci reparto a cui appartiene questo contatto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Totale Assente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Voce o Magazzino per riga {0} non corrisponde Material Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Voce o Magazzino per riga {0} non corrisponde Material Request
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unità di Misura
-DocType: Fiscal Year,Year End Date,Data di Fine Anno
+DocType: Fiscal Year,Year End Date,Data di fine anno
 DocType: Task Depends On,Task Depends On,Attività dipende
 DocType: Lead,Opportunity,Opportunità
 DocType: Salary Structure Earning,Salary Structure Earning,Struttura salariale Guadagnare
@@ -1870,7 +1888,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data fine contratto deve essere maggiore di Data di giunzione
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distributore di terze parti / rivenditore / commissionario / affiliate / rivenditore che vende i prodotti delle aziende per una commissione.
 DocType: Customer Group,Has Child Node,Ha un Nodo Figlio
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contro ordine di acquisto {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} contro ordine di acquisto {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Inserisci parametri statici della url qui (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} non è in alcun anno fiscale attivo. Per maggiori dettagli si veda {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Questo è un sito di esempio generato automaticamente da ERPNext
@@ -1918,7 +1936,7 @@
  10. Aggiungi o dedurre: Se si desidera aggiungere o detrarre l'imposta."
 DocType: Purchase Receipt Item,Recd Quantity,RECD Quantità
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Non può produrre più Voce {0} di Sales Order quantità {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Giacenza {0} non inserita
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Giacenza {0} non inserita
 DocType: Payment Reconciliation,Bank / Cash Account,Banca / Account Cash
 DocType: Tax Rule,Billing City,Fatturazione Città
 DocType: Global Defaults,Hide Currency Symbol,Nascondi Simbolo Valuta
@@ -1950,6 +1968,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Spese Utility
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Sopra
 DocType: Buying Settings,Default Buying Price List,Predefinito acquisto Prezzo di listino
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Nessun dipendente per i criteri sopra selezionati o busta paga già creato
 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"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tipo di pagamento
@@ -1985,7 +2004,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Vedere &quot;tasso di materiali a base di&quot; in Costing Sezione
 DocType: Appraisal Goal,Key Responsibility Area,Area Chiave Responsabilità
 DocType: Item Reorder,Material Request Type,Materiale Tipo di richiesta
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Riga {0}: UOM fattore di conversione è obbligatoria
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Rif
 DocType: Cost Center,Cost Center,Centro di Costo
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -2008,7 +2027,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Si prega di selezionare un valore per {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Tutti gli indirizzi.
 DocType: Company,Stock Settings,Impostazioni Giacenza
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusione è possibile solo se seguenti sono gli stessi in entrambi i record. È il gruppo, Radice Tipo, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusione è possibile solo se seguenti sono gli stessi in entrambi i record. È il gruppo, Radice Tipo, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gestire Organizzazione Gruppi Clienti
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Nuovo Centro di costo Nome
 DocType: Leave Control Panel,Leave Control Panel,Lascia il Pannello di controllo
@@ -2028,8 +2047,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Dettaglio strumento di pagamento
 ,Sales Browser,Browser vendite
 DocType: Journal Entry,Total Credit,Totale credito
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Attenzione: Un altro {0} # {1} esiste per l'entrata Giacenza {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Locale
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Attenzione: Un altro {0} # {1} esiste per l'entrata Giacenza {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Locale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Crediti ( Assets )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
@@ -2048,7 +2067,7 @@
 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.
 DocType: Production Order Operation,Make Time Log,Crea Log Tempo
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Si prega di impostare la quantità di riordino
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Si prega di impostare la quantità di riordino
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Si prega di creare Cliente da Contatto {0}
 DocType: Price List,Applicable for Countries,Applicabile per i paesi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,computer
@@ -2108,10 +2127,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Nessun Commento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Nessun Commento
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,In ritardo
 DocType: Account,Stock Received But Not Billed,Giacenza Ricevuta ma non Fatturata
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Account root deve essere un gruppo
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Account root deve essere un gruppo
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,retribuzione lorda + Importo posticipata + Importo incasso - Deduzione totale
 DocType: Monthly Distribution,Distribution Name,Nome della Distribuzione
 DocType: Features Setup,Sales and Purchase,Vendita e Acquisto
@@ -2121,10 +2140,11 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,La sottoscrizione di {0} è stata rimossa da questo elenco.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasso Netto (Valuta Azienda)
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Gestire Organizzazione Territorio.
-DocType: Journal Entry Account,Sales Invoice,Fattura Commerciale
+DocType: Journal Entry Account,Sales Invoice,Fattura di Vendita
 DocType: Journal Entry Account,Party Balance,Balance Partito
 DocType: Sales Invoice Item,Time Log Batch,Tempo Log Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Si prega di selezionare Applica sconto su
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Retribuzione slittamento Creato
 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: Stock Entry,Material Transfer for Manufacture,Material Transfer per Produzione
@@ -2132,9 +2152,9 @@
 DocType: Purchase Invoice,Half-yearly,Seme-strale
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Anno {0} fiscale non trovato.
 DocType: Bank Reconciliation,Get Relevant Entries,Prendi le voci rilevanti
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Voce contabilità per scorta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Voce contabilità per scorta
 DocType: Sales Invoice,Sales Team1,Vendite Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,L'articolo {0} non esiste
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,L'articolo {0} non esiste
 DocType: Sales Invoice,Customer Address,Indirizzo Cliente
 DocType: Purchase Invoice,Apply Additional Discount On,Applicare Sconto Ulteriori On
 DocType: Account,Root Type,Root Tipo
@@ -2143,15 +2163,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Mostra questo slideshow in cima alla pagina
 DocType: BOM,Item UOM,Articolo UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Fiscale Ammontare Dopo Ammontare Sconto (Società valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Magazzino di destinazione è obbligatoria per riga {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Magazzino di destinazione è obbligatoria per riga {0}
 DocType: Quality Inspection,Quality Inspection,Controllo Qualità
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Prodotti alimentari , bevande e tabacco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Posso solo effettuare il pagamento non ancora fatturate contro {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Posso solo effettuare il pagamento non ancora fatturate contro {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Tasso Commissione non può essere superiore a 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Livello Minimo di Inventario
 DocType: Stock Entry,Subcontract,Subappaltare
@@ -2189,7 +2209,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Controllo di qualità in arrivo.
 DocType: Purchase Order Item,Returned Qty,Tornati Quantità
 DocType: Employee,Exit,Esci
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type è obbligatorio
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root Type è obbligatorio
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} creato
 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 bolle di consegna"
 DocType: Employee,You can enter any date manually,È possibile immettere qualsiasi data manualmente
@@ -2197,8 +2217,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Periodo Di Prova
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Solo i nodi foglia sono ammessi nelle transazioni
 DocType: Expense Claim,Expense Approver,Expense Approver
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +110,Row {0}: Advance against Customer must be credit,Riga {0}: Advance contro il Cliente deve essere di credito
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Acquisto Ricevuta Articolo inserito
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagare
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Pagare
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Per Data Ora
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,I registri per il mantenimento dello stato di consegna sms
@@ -2215,7 +2236,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Riordina Level
 DocType: Attendance,Attendance Date,Data Presenza
 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 +110,Account with child nodes cannot be converted to ledger,Conto con nodi figlio non può essere convertito in contabilità
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Conto con nodi figlio non può essere convertito in contabilità
 DocType: Address,Preferred Shipping Address,Preferito Indirizzo spedizione
 DocType: Purchase Receipt Item,Accepted Warehouse,Magazzino Accettato
 DocType: Bank Reconciliation Detail,Posting Date,Data di registrazione
@@ -2233,7 +2254,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial No {0} non esiste
 DocType: Pricing Rule,Discount Percentage,Percentuale di sconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Numero di fattura
-apps/erpnext/erpnext/hooks.py +54,Orders,Ordini
+apps/erpnext/erpnext/hooks.py +55,Orders,Ordini
 DocType: Leave Control Panel,Employee Type,Tipo Dipendente
 DocType: Employee Leave Approver,Leave Approver,Lascia Approvatore
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiale trasferito per Produzione
@@ -2245,7 +2266,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% dei materiali fatturati su questo Ordine di Vendita
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Entrata Periodo di chiusura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ammortamento
+DocType: Account,Depreciation,ammortamento
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornitore (s)
 DocType: Customer,Credit Limit,Limite Credito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleziona il tipo di operazione
@@ -2270,11 +2291,12 @@
 DocType: Material Request,Requested For,richiesto Per
 DocType: Quotation Item,Against Doctype,Per Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Sottoscrivi questa bolla di consegna contro ogni progetto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Account root non può essere eliminato
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Di cassa netto da investimenti
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Account root non può essere eliminato
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostra Immagini Entries
 ,Is Primary Address,È primario Indirizzo
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Riferimento # {0} datato {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Riferimento # {0} datato {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gestire Indirizzi
 DocType: Pricing Rule,Item Code,Codice Articolo
 DocType: Production Planning Tool,Create Production Orders,Crea Ordine Prodotto
@@ -2282,10 +2304,10 @@
 DocType: Journal Entry,User Remark,Osservazioni utenti
 DocType: Lead,Market Segment,Segmento di Mercato
 DocType: Employee Internal Work History,Employee Internal Work History,Storia lavorativa Interna del Dipendente
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Chiusura (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Chiusura (Dr)
 DocType: Contact,Passive,Passive
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} non in magazzino
-apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modello fiscale per la vendita di transazioni.
+apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modelli fiscali per le transazioni di vendita.
 DocType: Sales Invoice,Write Off Outstanding Amount,Scrivi Off eccezionale Importo
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Seleziona se necessiti di fattura ricorrente periodica. Dopo aver inserito ogni fattura vendita, la sezione Ricorrenza diventa visibile."
 DocType: Account,Accounts Manager,Gestione conti
@@ -2298,7 +2320,7 @@
 ,Billed Amount,importo fatturato
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliazione Banca
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Ricevi aggiornamenti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Richiesta materiale {0} viene annullato o interrotto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Richiesta materiale {0} viene annullato o interrotto
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Aggiungere un paio di record di esempio
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lascia Gestione
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Raggruppa per conto
@@ -2307,14 +2329,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","La testa account con responsabilità, in cui sarà prenotato Utile / Perdita"
 DocType: Payment Tool,Against Vouchers,Contro Buoni
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Guida rapida
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Origine e magazzino target non possono essere uguali per riga {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Origine e magazzino target non possono essere uguali per riga {0}
 DocType: Features Setup,Sales Extras,Extra di vendita
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget per conto {1} contro il centro di costo {2} supererà da {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
 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'
 ,Stock Projected Qty,Qtà Prevista Giacenza
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
 DocType: Sales Order,Customer's Purchase Order,Ordine di Acquisto del Cliente
 DocType: Warranty Claim,From Company,Da Azienda
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valore o Quantità
@@ -2324,9 +2346,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Lascia Block List ammessi
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Si utilizzerà per il login
 DocType: Sales Partner,Retailer,Dettagliante
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credito Per account deve essere un account di Stato Patrimoniale
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Tutti i tipi di fornitori
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +46,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 +93,Quotation {0} not of type {1},Preventivo {0} non di tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programma di manutenzione Voce
 DocType: Sales Order,%  Delivered,%  Consegnato
@@ -2370,7 +2392,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Il peso lordo del pacchetto. Di solito peso netto + peso materiale di imballaggio. (Per la stampa)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gli utenti con questo ruolo sono autorizzati a impostare conti congelati e creare / modificare le voci contabili nei confronti di conti congelati
 DocType: Serial No,Is Cancelled,È Annullato
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Le mie spedizioni
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Le mie spedizioni
 DocType: Journal Entry,Bill Date,Data Fattura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Anche se ci sono più regole sui prezzi con la priorità più alta, si applicano quindi le seguenti priorità interne:"
 DocType: Supplier,Supplier Details,Fornitore Dettagli
@@ -2391,10 +2413,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,chiamate
 DocType: Project,Total Costing Amount (via Time Logs),Importo totale Costing (via Time Diari)
 DocType: Purchase Order Item Supplied,Stock UOM,UdM Giacenza
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Purchase Order {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Purchase Order {0} non è presentata
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,proiettata
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} non appartiene al Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : Il sistema non controlla over - consegna e over -booking per la voce {0} come la quantità o la quantità è 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : Il sistema non controlla over - consegna e over -booking per la voce {0} come la quantità o la quantità è 0
 DocType: Notification Control,Quotation Message,Messaggio Preventivo
 DocType: Issue,Opening Date,Data di apertura
 DocType: Journal Entry,Remark,Osservazioni
@@ -2407,9 +2429,9 @@
 DocType: Time Log,Batched for Billing,Raggruppati per la Fatturazione
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Fatture sollevate dai fornitori.
 DocType: POS Profile,Write Off Account,Scrivi Off account
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Cassa netto da attività
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,ad esempio IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Articolo 4
 DocType: Journal Entry Account,Journal Entry Account,Addebito Journal
@@ -2450,7 +2472,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data del pensionamento deve essere maggiore di Data Assunzione
 DocType: Sales Invoice,Against Income Account,Per Reddito Conto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Consegnato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Obiettivi Territorio
 DocType: Delivery Note,Transporter Info,Info Transporter
@@ -2478,10 +2500,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numero di lotto è obbligatoria per la voce {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Si tratta di una persona di vendita di root e non può essere modificato .
 ,Stock Ledger,Inventario
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Vota: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Vota: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Stipendio slittamento Deduzione
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Selezionare un nodo primo gruppo.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Scopo deve essere uno dei {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Scopo deve essere uno dei {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Compila il modulo e salvarlo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Scaricare un report contenete tutte le materie prime con il loro recente stato di inventario
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
@@ -2519,7 +2541,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Azienda ( non cliente o fornitore ) master.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Inserisci il ' Data prevista di consegna '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Note di consegna {0} devono essere cancellate prima di annullare questo ordine di vendita
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,Importo versato + Scrivi Off importo non può essere superiore a Grand Total
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,Importo versato + Scrivi Off importo non può essere superiore a 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} non è un numero di lotto valido per la voce {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Nota : Non c'è equilibrio congedo sufficiente per Leave tipo {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Se il pagamento non viene effettuato nei confronti di qualsiasi riferimento, fare manualmente Journal Entry."
@@ -2536,37 +2558,37 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' è disabilitato
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Imposta come Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Invia e-mail automatica di contatti su operazioni Invio.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Riga {0}: Quantità non avalable in magazzino {1} il {2} {3}.
  Disponibile Quantità: {4}, Qty trasferimento: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Articolo 3
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Sales Team,Contribution (%),Contributo (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilità
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modelli
 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/public/js/setup_wizard.js +273,Add Users,Aggiungi utenti
+apps/erpnext/erpnext/public/js/setup_wizard.js +273,Add Users,Aggiungi Utenti
 DocType: Pricing Rule,Item Group,Gruppo Articoli
 DocType: Task,Actual Start Date (via Time Logs),Actual Data di inizio (via Time Diari)
 DocType: Stock Reconciliation Item,Before reconciliation,Prima di riconciliazione
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,BOM Predefinito
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Si prega di digitare nuovamente il nome della società per confermare
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totale Outstanding Amt
 DocType: Time Log Batch,Total Hours,Totale ore
 DocType: Journal Entry,Printing Settings,Impostazioni di stampa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Debito totale deve essere pari al totale credito .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Debito totale deve essere pari al totale credito .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Da Nota di Consegna
 DocType: Time Log,From Time,Da Periodo
 DocType: Notification Control,Custom Message,Messaggio Personalizzato
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Contanti o conto bancario è obbligatoria per effettuare il pagamento voce
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Contanti o conto bancario è obbligatoria per effettuare il pagamento voce
 DocType: Purchase Invoice,Price List Exchange Rate,Listino Prezzi Tasso di Cambio
 DocType: Purchase Invoice Item,Rate,Tariffa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stagista
@@ -2585,9 +2607,10 @@
  conflitto assegnando priorità. Regole Prezzo: {0}"
 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 +580,Issue Material,Fornire Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Fornire Materiale
 DocType: Material Request Item,For Warehouse,Per Magazzino
 DocType: Employee,Offer Date,offerta Data
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citazioni
 DocType: Hub Settings,Access Token,Token di accesso
 DocType: Sales Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Inserisci Maintaince dettagli prima
@@ -2596,15 +2619,17 @@
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Se si è a lungo stampare formati, questa funzione può essere usato per dividere la pagina da stampare su più pagine con tutte le intestazioni e piè di pagina in ogni pagina"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,tutti i Territori
 DocType: Purchase Invoice,Items,Articoli
-DocType: Fiscal Year,Year Name,Anno Nome
+DocType: Fiscal Year,Year Name,Nome Anno
 DocType: Process Payroll,Process Payroll,Processo Payroll
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Ci sono più feste di giorni di lavoro di questo mese .
 DocType: Product Bundle Item,Product Bundle Item,Prodotto Bundle Voce
 DocType: Sales Partner,Sales Partner Name,Vendite Partner Nome
+DocType: Payment Reconciliation,Maximum Invoice Amount,Importo Massimo Fattura
 DocType: Purchase Invoice Item,Image View,Visualizza immagine
 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 +553,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 magazzino
 DocType: Purchase Taxes and Charges,Valuation and Total,Valutazione e Total
@@ -2612,6 +2637,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Questo Articolo è una variante di {0} (Modello). Gli attributi vengono copiati dal modello solo se si imposta 'No Copy'
 DocType: Account,Purchase User,Acquisto utente
 DocType: Notification Control,Customize the Notification,Personalizzare Notifica
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cash flow operativo
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Indirizzo modello predefinito non può essere eliminato
 DocType: Sales Invoice,Shipping Rule,Spedizione Rule
 DocType: Journal Entry,Print Heading,Stampa Rubrica
@@ -2622,7 +2648,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Materia prima
 DocType: Leave Application,Follow via Email,Seguire via Email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Fiscale Ammontare Dopo Sconto Importo
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,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 +335,Please select Posting Date first,Seleziona Data Pubblicazione primo
@@ -2640,6 +2666,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Obbligatorio per la voce Serialized {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Applicabile a (Designazione)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Aggiungi al carrello
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Raggruppa Per
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Abilitare / disabilitare valute.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,spese postali
@@ -2647,30 +2674,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Intrattenimento e tempo libero
 DocType: Purchase Order,The date on which recurring order will be stop,La data in cui ordine ricorrente sarà ferma
 DocType: Quality Inspection,Item Serial No,Articolo N. d&#39;ordine
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve essere ridotto di {1} o si dovrebbe aumentare la tolleranza di superamento soglia
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve essere ridotto di {1} o si dovrebbe aumentare la tolleranza di superamento soglia
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Presente totale
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Ora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Voce {0} non può essere aggiornato tramite \
  riconciliazione Archivio"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Trasferire il materiale al Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Trasferire il materiale al Fornitore
 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 non può avere Warehouse . Warehouse deve essere impostato da dell'entrata Stock o ricevuta d'acquisto
 DocType: Lead,Lead Type,Tipo Contatto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crea Preventivo
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Non sei autorizzato ad approvare foglie su Date Block
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Tutti questi elementi sono già stati fatturati
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Tutti questi elementi sono già stati fatturati
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Può essere approvato da {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Spedizione condizioni regola
 DocType: BOM Replace Tool,The new BOM after replacement,Il nuovo BOM dopo la sostituzione
 DocType: Features Setup,Point of Sale,Punto di vendita
 DocType: Account,Tax,Tassa
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Riga {0}: {1} non è un valido {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Da Bundle prodotto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Da Bundle prodotto
 DocType: Production Planning Tool,Production Planning Tool,Production Planning Tool
 DocType: Quality Inspection,Report Date,Data Segnala
 DocType: C-Form,Invoices,Fatture
 DocType: Job Opening,Job Title,Professione
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatari
 DocType: Features Setup,Item Groups in Details,Gruppi di articoli in Dettagli
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantità di Fabbricazione deve essere maggiore di 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -2678,8 +2704,9 @@
 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: Pricing Rule,Customer Group,Gruppo Cliente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Conto spese è obbligatoria per l'elemento {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Conto spese è obbligatoria per l'elemento {0}
 DocType: Item,Website Description,Descrizione del sito
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Variazione netta Patrimonio
 DocType: Serial No,AMC Expiry Date,AMC Data Scadenza
 ,Sales Register,Commerciale Registrati
 DocType: Quotation,Quotation Lost Reason,Motivo Preventivo Perso
@@ -2687,12 +2714,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Non c'è nulla da modificare.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Riepilogo per questo mese e le attività in corso
 DocType: Customer Group,Customer Group Name,Nome Gruppo Cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Attributi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Ottieni articoli
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Inserisci Scrivi Off conto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Ottieni articoli
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Inserisci Scrivi Off conto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order Data
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Crea Fattura Accise (bolla)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Il Conto {0} non appartiene alla società {1}
@@ -2708,7 +2735,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dati di progetto non sono disponibile per Preventivo
 DocType: Project,Expected End Date,Data prevista di fine
 DocType: Appraisal Template,Appraisal Template Title,Valutazione Titolo Modello
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,commerciale
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,commerciale
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Voce genitore {0} non deve essere un Articolo Articolo
 DocType: Cost Center,Distribution Id,ID di Distribuzione
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servizi di punta
@@ -2721,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Rapporto qualità-attributo {0} deve essere compresa tra {1} a {2} nei incrementi di {3}
 DocType: Tax Rule,Sales,Vendite
 DocType: Stock Entry Detail,Basic Amount,Importo di base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
 DocType: Leave Allocation,Unused leaves,Foglie non utilizzati
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Predefinito Contabilità clienti
@@ -2733,17 +2760,17 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incremento per attributo {0} non può essere 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Da
 DocType: Naming Series,Setup Series,Serie Setup
+DocType: Payment Reconciliation,To Invoice Date,Per Data fattura
 DocType: Supplier,Contact HTML,Contatto HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Ricevute di acquisto
-DocType: Payment Reconciliation,Maximum Amount,Importo Massimo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Come viene applicata la Regola Tariffaria?
-DocType: Quality Inspection,Delivery Note No,Nota Consegna N.
+DocType: Quality Inspection,Delivery Note No,Documento di Trasporto N.
 DocType: Company,Retail,Vendita al dettaglio
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,{0} non esiste clienti
 DocType: Attendance,Absent,Assente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle prodotto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Riga {0}: Riferimento non valido {1}
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Acquistare Tasse e spese Template
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle prodotto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,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: Upload Attendance,Download Template,Scarica Modello
 DocType: GL Entry,Remarks,Osservazioni
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Codice Articolo Materia Prima
@@ -2769,7 +2796,7 @@
 ,Monthly Attendance Sheet,Foglio Presenze Mensile
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nessun record trovato
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: centro di costo è obbligatorio per la voce {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Il Conto {0} è inattivo
 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
@@ -2778,14 +2805,16 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Il tipo di conto {0} 'Profitti e Perdite' non consentito nella voce di apertura
 DocType: Features Setup,Sales Discounts,Sconti di vendita
 DocType: Hub Settings,Seller Country,Vendita Paese
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Pubblicare Articoli sul sito web
 DocType: Authorization Rule,Authorization Rule,Ruolo Autorizzazione
 DocType: Sales Invoice,Terms and Conditions Details,Termini e condizioni dettagli
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Tasse di vendita e spese dei modelli
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,specificazioni
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Modelli Tasse di Vendita e Oneri
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Abbigliamento e accessori
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Numero di ordinazione
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner verrà mostrato sulla parte superiore della lista dei prodotti.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Specificare le condizioni per determinare il valore di spedizione
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Aggiungi ai bambini
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Aggiungi una sottovoce
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Ruolo permesso di impostare conti congelati e modificare le voci congelati
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Impossibile convertire centro di costo a registro come ha nodi figlio
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
@@ -2801,7 +2830,7 @@
 DocType: Time Log,Billing Amount,Fatturazione Importo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantità non valido specificato per l'elemento {0}. La quantità dovrebbe essere maggiore di 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Richieste di Ferie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Conto con transazione esistente non può essere cancellato
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Conto con transazione esistente non può essere cancellato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Spese legali
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Il giorno del mese su cui ordine automatica verrà generato ad esempio 05, 28 ecc"
 DocType: Sales Invoice,Posting Time,Tempo Distacco
@@ -2817,11 +2846,11 @@
 DocType: Maintenance Visit,Breakdown,Esaurimento
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Account: {0} con valuta: {1} non può essere selezionato
 DocType: Bank Reconciliation Detail,Cheque Date,Data Assegno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Il Conto {0}: conto derivato{1} non appartiene alla società: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Il Conto {0}: conto derivato{1} non appartiene alla società: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Cancellato con successo tutte le operazioni relative a questa società!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Come in data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Magazino predefinito necessario per articolo in Giacenza.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Magazino predefinito necessario per articolo in Giacenza.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Il pagamento dello stipendio del mese {0} e l'anno {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserimento automatico tasso Listino se mancante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importo totale pagato
@@ -2833,6 +2862,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Importo totale fatturazione (via Time Diari)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Vendiamo questo articolo
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fornitore Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Quantità deve essere maggiore di 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Desc Contatto
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Tipo di foglie come casuale, malati ecc"
@@ -2841,7 +2871,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Aggiungere righe per impostare i budget annuali sui conti.
 DocType: Buying Settings,Default Supplier Type,Tipo Fornitore Predefinito
 DocType: Production Order,Total Operating Cost,Totale costi di esercizio
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : Articolo {0} inserito più volte
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Nota : Articolo {0} inserito più volte
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tutti i contatti.
 DocType: Newsletter,Test Email Id,Prova Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abbreviazione Società
@@ -2866,7 +2896,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tutti i gruppi di clienti
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Tax modello è obbligatoria.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Il Conto {0}: conto derivato {1} non esiste
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,Il Conto {0}: conto derivato {1} non esiste
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prezzo di listino (Valuta Azienda)
 DocType: Account,Temporary,Temporaneo
 DocType: Address,Preferred Billing Address,Preferito Indirizzo di fatturazione
@@ -2884,8 +2914,8 @@
 ,Item-wise Price List Rate,Articolo -saggio Listino Tasso
 DocType: Purchase Order Item,Supplier Quotation,Preventivo Fornitore
 DocType: Quotation,In Words will be visible once you save the Quotation.,In parole saranno visibili una volta che si salva il preventivo.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} è fermato
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} è fermato
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
 DocType: Lead,Add to calendar on this date,Aggiungi al calendario in questa data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regole per l'aggiunta di spese di spedizione .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Prossimi eventi
@@ -2905,24 +2935,24 @@
 DocType: Customer,From Lead,Da Contatto
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Gli ordini rilasciati per la produzione.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selezionare l'anno fiscale ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
 DocType: Hub Settings,Name Token,Nome Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Selling standard
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Almeno un Magazzino è obbligatorio
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Selling,Selling standard
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Almeno un Magazzino è obbligatorio
 DocType: Serial No,Out of Warranty,Fuori Garanzia
 DocType: BOM Replace Tool,Replace,Sostituire
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contro Fattura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Inserisci unità di misura predefinita
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} contro Fattura {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Inserisci unità di misura predefinita
 DocType: Purchase Invoice Item,Project Name,Nome del progetto
 DocType: Supplier,Mention if non-standard receivable account,Menzione se conto credito non standard
 DocType: Journal Entry Account,If Income or Expense,Se proventi od oneri
 DocType: Features Setup,Item Batch Nos,Numeri Lotto Articolo
 DocType: Stock Ledger Entry,Stock Value Difference,Differenza Valore Giacenza
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Risorsa Umana
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Attività fiscali
 DocType: BOM Item,BOM No,N. DiBa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Diario {0} non ha conto {1} o già confrontato altro buono
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,Journal Entry {0} does not have account {1} or already matched against other voucher,Diario {0} non ha conto {1} o già confrontato altro buono
 DocType: Item,Moving Average,Media Mobile
 DocType: BOM Replace Tool,The BOM which will be replaced,La distinta base che sarà sostituito
 DocType: Account,Debit,Debito
@@ -2959,7 +2989,7 @@
 DocType: Stock Entry Detail,Additional Cost,Costo aggiuntivo
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data di Esercizio di fine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Non è possibile filtrare sulla base di Voucher No , se raggruppati per Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Crea Quotazione Fornitore
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Crea Quotazione Fornitore
 DocType: Quality Inspection,Incoming,In arrivo
 DocType: BOM,Materials Required (Exploded),Materiali necessari (esploso)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Ridurre Guadagnare in aspettativa senza assegni (LWP)
@@ -2967,7 +2997,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,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/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,ID Lotto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota Consegna Tendenza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Sintesi di questa settimana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve essere un articolo acquistato o in subappalto in riga {1}
@@ -2977,11 +3007,12 @@
 DocType: Opportunity,Opportunity Date,Data Opportunità
 DocType: Purchase Receipt,Return Against Purchase Receipt,Di ritorno contro RICEVUTA
 DocType: Purchase Order,To Bill,Per Bill
-DocType: Material Request,% Ordered,Ordinato%
+DocType: Material Request,% Ordered,% Ordinato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,lavoro a cottimo
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Buying Rate
 DocType: Task,Actual Time (in Hours),Tempo reale (in ore)
 DocType: Employee,History In Company,Storia Aziendale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},La quantità totale di emissione / trasferimento {0} in Materiale Richiesta {1} non può essere maggiore di quantità richiesta {2} per la voce {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletters
 DocType: Address,Shipping,Spedizione
 DocType: Stock Ledger Entry,Stock Ledger Entry,Voce Inventario
@@ -3001,15 +3032,14 @@
 DocType: Purchase Order,End date of current order's period,Data di fine del periodo di fine corso
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Crea una Lettera d'Offerta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Ritorno
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Unità di misura predefinita per la variante deve essere lo stesso come modello
 DocType: Production Order Operation,Production Order Operation,Ordine di produzione Operation
 DocType: Pricing Rule,Disable,Disattiva
 DocType: Project Task,Pending Review,In attesa recensione
 DocType: Task,Total Expense Claim (via Expense Claim),Rimborso spese totale (via Expense Claim)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id cliente
+apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id Cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Per ora deve essere maggiore di From Time
 DocType: Journal Entry Account,Exchange Rate,Tasso di cambio:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Sales Order {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Sales Order {0} non è presentata
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: conto Parent {1} non Bolong alla società {2}
 DocType: BOM,Last Purchase Rate,Ultimo Purchase Rate
 DocType: Account,Asset,attività
@@ -3029,7 +3059,7 @@
 ,Available Stock for Packing Items,Disponibile Magazzino per imballaggio elementi
 DocType: Item Variant,Item Variant,Elemento Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,L'impostazione di questo modello di indirizzo di default perché non c'è altro difetto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del conto già in debito, non ti è permesso di impostare 'saldo deve essere' come 'credito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del conto già in debito, non ti è permesso di impostare 'saldo deve essere' come 'credito'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestione della qualità
 DocType: Production Planning Tool,Filter based on customer,Filtro basato sul cliente
 DocType: Payment Tool Detail,Against Voucher No,Contro Voucher No
@@ -3046,6 +3076,7 @@
 DocType: Opportunity,Next Contact,Successivo Contattaci
 DocType: Employee,Employment Type,Tipo Dipendente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,immobilizzazioni
+,Cash Flow,Flusso di cassa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Periodo di applicazione non può essere tra due record alocation
 DocType: Item Group,Default Expense Account,Account Spese Predefinito
 DocType: Employee,Notice (days),Avviso ( giorni )
@@ -3077,13 +3108,12 @@
 DocType: Production Order,Warehouses,Magazzini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Stampa e Fermo
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Nodo Group
-DocType: Payment Reconciliation,Minimum Amount,Importo Minimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Merci aggiornamento finiti
 DocType: Workstation,per hour,all'ora
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Conto per il magazzino ( Perpetual Inventory) verrà creato con questo account .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazzino non può essere eliminato siccome esiste articolo ad inventario per questo Magazzino .
 DocType: Company,Distribution,Distribuzione
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Importo pagato
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Importo pagato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Spedizione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Sconto massimo consentito per la voce: {0} {1}%
@@ -3107,7 +3137,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics supporto
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Azienda è presente nei magazzini {0}
 DocType: POS Profile,Terms and Conditions,Termini e Condizioni
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},'A Data' deve essere entro l'anno fiscale. Assumendo A Data = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},'A Data' deve essere entro l'anno fiscale. Assumendo A Data = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Qui è possibile mantenere l'altezza, il peso, le allergie, le preoccupazioni mediche ecc"
 DocType: Leave Block List,Applies to Company,Applica ad Azienda
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Impossibile annullare perché esiste la scorta {0}
@@ -3117,15 +3147,15 @@
 DocType: Sales Order Item,For Production,Per la produzione
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Inserisci ordine di vendita nella tabella sopra
 DocType: Project Task,View Task,Vista Task
-apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Il tuo anno finanziario comincia
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Il tuo anno finanziario comincia il
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Inserisci acquisto Receipts
 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 +425,Transaction not allowed against stopped Production Order {0},Operazione non ammessi contro Production smesso di ordine {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configurazione del server in arrivo per il supporto e-mail id . ( ad esempio support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Carenza Quantità
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
 DocType: Salary Slip,Salary Slip,Stipendio slittamento
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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."
@@ -3214,7 +3244,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Informazioni Dipendente.
 DocType: HR Settings,Payroll Settings,Impostazioni Payroll
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Partita Fatture non collegati e pagamenti.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Invia ordine
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Invia ordine
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root non può avere un centro di costo genitore
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Seleziona Marchio ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Applicable
@@ -3229,7 +3259,7 @@
 DocType: Appraisal,Start Date,Data di inizio
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Allocare le foglie per un periodo .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Clicca qui per verificare
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Il Conto {0}: Non è possibile assegnare stesso come conto principale
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Il Conto {0}: Non è possibile assegnare stesso come conto principale
 DocType: Purchase Invoice Item,Price List Rate,Prezzo di listino Vota
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Mostra &quot;Disponibile&quot; o &quot;Non disponibile&quot; sulla base di scorte disponibili in questo magazzino.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Distinta Materiali (DiBa)
@@ -3238,17 +3268,17 @@
 DocType: Project,Expected Start Date,Data prevista di inizio
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Rimuovere articolo se le spese non è applicabile a tale elemento
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ad es. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Ricevere
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Ricevere
 DocType: Maintenance Visit,Fully Completed,Debitamente compilato
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Completato
 DocType: Employee,Educational Qualification,Titolo di Studio
 DocType: Workstation,Operating Costs,Costi operativi
 DocType: Employee Leave Approver,Employee Leave Approver,Approvatore Congedo Dipendente
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} è stato aggiunto alla nostra lista Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Non è possibile dichiarare come perduto, perché è stato fatto il Preventivo."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Acquisto Maestro Direttore
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Ordine di produzione {0} deve essere presentata
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Ordine di produzione {0} deve essere presentata
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +136,Main Reports,Rapporti principali
 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'
@@ -3266,7 +3296,7 @@
 DocType: Industry Type,Industry Type,Tipo Industria
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Qualcosa è andato storto!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Attenzione: Lascia applicazione contiene seguenti date di blocco
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,{0} è già stato presentato fattura di vendita
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,{0} è già stato presentato fattura di vendita
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data Completamento
 DocType: Purchase Invoice Item,Amount (Company Currency),Importo (Valuta Azienda)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unità organizzativa ( dipartimento) master.
@@ -3285,10 +3315,10 @@
 ,Serial No Service Contract Expiry,Serial No Contratto di Servizio di scadenza
 DocType: Item,Unit of Measure Conversion,Unità di Conversione di misura
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Il dipendente non può essere modificato
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,"Non si può di credito e debito stesso conto , allo stesso tempo"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,"Non si può di credito e debito stesso conto , allo stesso tempo"
 DocType: Naming Series,Help HTML,Aiuto HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage totale assegnato dovrebbe essere al 100 % . E ' {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Indennità per over-{0} incrociate per la voce {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Indennità per over-{0} incrociate per la voce {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nome della persona o organizzazione che questo indirizzo appartiene.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,I vostri fornitori
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Impossibile impostare come persa come è fatto Sales Order .
@@ -3301,35 +3331,35 @@
 DocType: Employee,Date of Issue,Data Pubblicazione
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Da {0} per {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare fornitore per voce {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Si prega di verificare l&#39;opzione multi valuta per consentire agli account con altra valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Si prega di verificare l&#39;opzione multi valuta per consentire agli account con altra valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Voce: {0} non esiste nel sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Non sei autorizzato a impostare il valore Congelato
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Non sei autorizzato a impostare il valore bloccato
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get non riconciliati Entries
+DocType: Payment Reconciliation,From Invoice Date,Da Data fattura
 DocType: Cost Center,Budgets,I bilanci
-DocType: Employee,Emergency Contact Details,Dettagli Contatto Emergenza
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Che cosa fa ?
 DocType: Delivery Note,To Warehouse,A Magazzino
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Il Conto {0} è stato inserito più di una volta per l'anno fiscale {1}
 ,Average Commission Rate,Tasso medio di commissione
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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/hr/doctype/attendance/attendance.py +34,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
 DocType: Purchase Taxes and Charges,Account Head,Conto Capo
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Aggiornare costi aggiuntivi per calcolare il costo sbarcato di articoli
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,elettrico
 DocType: Stock Entry,Total Value Difference (Out - In),Totale Valore Differenza (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Riga {0}: Tasso di cambio è obbligatorio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Riga {0}: Tasso di cambio è obbligatorio
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID utente non è impostato per Employee {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Da Richiesta di Garanzia
 DocType: Stock Entry,Default Source Warehouse,Magazzino Origine Predefinito
 DocType: Item,Customer Code,Codice Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Promemoria Compleanno per {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Giorni dall'ultimo ordine
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
 DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Lascia Block List Nome
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Attivo Immagini
@@ -3342,7 +3372,7 @@
 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
 DocType: Authorization Rule,Based On,Basato su
 DocType: Sales Order Item,Ordered Qty,Quantità ordinato
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Voce {0} è disattivato
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Voce {0} è disattivato
 DocType: Stock Settings,Stock Frozen Upto,Giacenza Bloccate Fino
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periodo Dal periodo e per date obbligatorie per ricorrenti {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Attività / attività del progetto.
@@ -3350,7 +3380,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","L'acquisto deve essere controllato, se applicabile per è selezionato 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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrivi Off Importo (Società valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Voucher Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Impostare {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ripetere il Giorno del mese
@@ -3379,12 +3409,12 @@
 DocType: Upload Attendance,Upload Attendance,Carica presenze
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM e produzione quantità sono necessari
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gamma Ageing 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Importo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Importo
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,DiBa Sostituire
 ,Sales Analytics,Analisi dei dati di vendita
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Inserisci valuta predefinita in Azienda Maestro
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Inserisci valuta predefinita in Azienda Maestro
 DocType: Stock Entry Detail,Stock Entry Detail,Dettaglio Giacenza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Promemoria quotidiani
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflitti norma fiscale con {0}
@@ -3410,13 +3440,13 @@
 DocType: Sales Order Item,Produced Quantity,Prodotto Quantità
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingegnere
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Cerca Sub Assemblies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Codice Articolo richiesto alla Riga N. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Codice Articolo richiesto alla Riga N. {0}
 DocType: Sales Partner,Partner Type,Tipo di partner
 DocType: Purchase Taxes and Charges,Actual,Attuale
 DocType: Authorization Rule,Customerwise Discount,Sconto Cliente saggio
 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 +263,Installation Note {0} has already been submitted,Nota Installazione {0} già inserita
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Nota Installazione {0} già inserita
 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
@@ -3428,15 +3458,15 @@
 DocType: Employee,Applicable Holiday List,Lista Vacanze Applicabile
 DocType: Employee,Cheque,Assegno
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,serie Aggiornato
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Tipo di rapporto è obbligatoria
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Tipo di rapporto è obbligatoria
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazzino è obbligatorio per l'Articolo in Giacenza {0} alla Riga {1}
 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/public/js/setup_wizard.js +101,The First User: You,Il Primo Utente : Tu
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Riconciliati con successo
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Riconciliati con successo
 DocType: Production Order,Planned End Date,Data di fine pianificata
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Dove gli elementi vengono memorizzati.
 DocType: Tax Rule,Validity,Validità
@@ -3444,8 +3474,8 @@
 DocType: Attendance,Attendance,Presenze
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Data di registrazione e il distacco ora è obbligatorio
-apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Modello fiscale per l'acquisto di transazioni.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Data di registrazione e il distacco ora è obbligatorio
+apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Modelli fiscali per le transazioni di acquisto.
 ,Item Prices,Voce Prezzi
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,In parole saranno visibili una volta che si salva di Acquisto.
 DocType: Period Closing Voucher,Period Closing Voucher,Periodo di chiusura Voucher
@@ -3453,15 +3483,15 @@
 DocType: Task,Review Date,Data di revisione
 DocType: Purchase Invoice,Advance Payments,Pagamenti anticipati
 DocType: Purchase Taxes and Charges,On Net Total,Sul totale netto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Magazzino Target in riga {0} deve essere uguale ordine di produzione
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Magazzino Target in riga {0} deve essere uguale ordine di produzione
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Non autorizzato a utilizzare lo Strumento di Pagamento
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Indirizzi email di notifica' non specificati per %s ricorrenti
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Arrotondamento Account
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Spese Amministrative
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Gruppo clienti
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Cambiamento
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Cambiamento
 DocType: Purchase Invoice,Contact Email,Email Contatto
 DocType: Appraisal Goal,Score Earned,Punteggio Earned
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","ad esempio ""My Company LLC """
@@ -3471,13 +3501,13 @@
 DocType: Packing Slip,Gross Weight UOM,Peso Lordo UOM
 DocType: Email Digest,Receivables / Payables,Crediti / Debiti
 DocType: Delivery Note Item,Against Sales Invoice,Per Fattura Vendita
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Conto di credito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Conto di credito
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost articolo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostra valori zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantità di prodotto ottenuto dopo la produzione / reimballaggio da determinati quantitativi di materie prime
 DocType: Payment Reconciliation,Receivable / Payable Account,Conto Crediti / Debiti
 DocType: Delivery Note Item,Against Sales Order Item,Contro Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,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 +572,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
 DocType: Item,Default Warehouse,Magazzino Predefinito
 DocType: Task,Actual End Date (via Time Logs),Data di fine effettiva (via Time Diari)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Bilancio non può essere assegnato contro account gruppo {0}
@@ -3513,29 +3543,30 @@
 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/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} è già stata presentata
 ,Items To Be Requested,Articoli da richiedere
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Ottieni ultima quotazione acquisto
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Fatturazione tariffa si basa su Tipo Attività (per ora)
 DocType: Company,Company Info,Info Azienda
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Azienda Email ID non trovato , quindi posta non inviato"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Applicazione dei fondi ( Assets )
 DocType: Production Planning Tool,Filter based on item,Filtro basato sul articolo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Conto di addebito
-DocType: Fiscal Year,Year Start Date,Anno Data di inizio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Conto di addebito
+DocType: Fiscal Year,Year Start Date,Data di inizio anno
 DocType: Attendance,Employee Name,Nome Dipendente
 DocType: Sales Invoice,Rounded Total (Company Currency),Totale arrotondato (Azienda valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Non può convertirsi gruppo perché è stato selezionato Tipo di account.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,Non può convertirsi gruppo perché è stato selezionato Tipo di account.
 DocType: Purchase Common,Purchase Common,Comuni di acquisto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} è stato modificato. Aggiornare prego.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Impedire agli utenti di effettuare Lascia le applicazioni in giorni successivi.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,da Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefici per i dipendenti
 DocType: Sales Invoice,Is POS,È POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pranzo quantità deve essere uguale quantità per articolo {0} in riga {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Pranzo quantità deve essere uguale quantità per articolo {0} in riga {1}
 DocType: Production Order,Manufactured Qty,Quantità Prodotto
 DocType: Purchase Receipt Item,Accepted Quantity,Quantità accettata
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} non esiste
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Fatture sollevate dai Clienti.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Progetto Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abbonati aggiunti
 DocType: Maintenance Schedule,Schedule,Pianificare
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definire bilancio per questo centro di costo. Per impostare l&#39;azione di bilancio, vedere &quot;Elenco Società&quot;"
@@ -3543,7 +3574,7 @@
 DocType: Quality Inspection Reading,Reading 3,Lettura 3
 ,Hub,Mozzo
 DocType: GL Entry,Voucher Type,Voucher Tipo
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Listino Prezzi non trovato o disattivato
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Listino Prezzi non trovato o disattivato
 DocType: Expense Claim,Approved,Approvato
 DocType: Pricing Rule,Price,prezzo
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Dipendente esonerato da {0} deve essere impostato come 'Congedato'
@@ -3557,10 +3588,10 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Diario scritture contabili.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponibile Quantità a partire Warehouse
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Si prega di selezionare i dipendenti Record prima.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riga {0}: partito / Account non corrisponde con {1} / {2} {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riga {0}: partito / Account non corrisponde con {1} / {2} {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Per creare un Account Tax
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Inserisci il Conto uscite
-DocType: Account,Stock,Azione
+DocType: Account,Stock,Magazzino
 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
@@ -3568,7 +3599,7 @@
 DocType: Employee,Contract End Date,Data fine Contratto
 DocType: Sales Order,Track this Sales Order against any Project,Traccia questo ordine di vendita nei confronti di qualsiasi progetto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tirare ordini di vendita (in attesa di consegnare) sulla base dei criteri di cui sopra
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Da Preventivo del Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Da Preventivo del Fornitore
 DocType: Deduction Type,Deduction Type,Tipo Deduzione
 DocType: Attendance,Half Day,Mezza Giornata
 DocType: Pricing Rule,Min Qty,Qtà Min
@@ -3576,7 +3607,7 @@
 DocType: GL Entry,Transaction Date,Transaction Data
 DocType: Production Plan Item,Planned Qty,Qtà Planned
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Totale IVA
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Per quantità (Quantità Prodotto) è obbligatorio
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Per quantità (Quantità Prodotto) è obbligatorio
 DocType: Stock Entry,Default Target Warehouse,Magazzino Destinazione Predefinito
 DocType: Purchase Invoice,Net Total (Company Currency),Totale Netto (Valuta Azienda)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riga {0}: Partito Tipo e partito si applica solo nei confronti Crediti / Debiti conto
@@ -3624,15 +3655,15 @@
 DocType: Item Group,General Settings,Impostazioni generali
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Da Valuta e A Valuta non possono essere gli stessi
 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/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,È necessario salvare il modulo prima di procedere
 DocType: Item Attribute,Numeric Values,Valori numerici
 apps/erpnext/erpnext/public/js/setup_wizard.js +262,Attach Logo,Allega Logo
 DocType: Customer,Commission Rate,Tasso Commissione
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Fai Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blocco domande uscita da ufficio.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Carrello è Vuoto
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Carrello è Vuoto
 DocType: Production Order,Actual Operating Cost,Actual Cost operativo
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root non può essere modificato .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root non può essere modificato .
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Importo concesso può non superiore all'importo unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Consentire una produzione su Holidays
 DocType: Sales Order,Customer's Purchase Order Date,Data ordine acquisto Cliente
@@ -3643,11 +3674,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termini e condizioni Template
 DocType: Serial No,Delivery Details,Dettagli Consegna
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro di costo è richiesto in riga {0} nella tabella Tasse per il tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Centro di costo è richiesto in riga {0} nella tabella Tasse per il tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Creazione automatica di materiale richiesta se la quantità scende al di sotto di questo livello
 ,Item-wise Purchase Register,Articolo-saggio Acquisto Registrati
 DocType: Batch,Expiry Date,Data Scadenza
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per impostare il livello di riordino, elemento deve essere un acquisto dell&#39;oggetto o Produzione Voce"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per impostare il livello di riordino, elemento deve essere un acquisto dell&#39;oggetto o Produzione Voce"
 ,Supplier Addresses and Contacts,Indirizzi e contatti Fornitore
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Si prega di selezionare Categoria prima
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Progetto Master.
@@ -3655,7 +3686,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Mezza giornata)
 DocType: Supplier,Credit Days,Giorni Credito
 DocType: Leave Type,Is Carry Forward,È Portare Avanti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Recupera elementi da Distinta Base
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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 Tempo di Esecuzione
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Distinta materiali
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riga {0}: Partito Tipo e Partito è necessario per Crediti / Debiti conto {1}
@@ -3663,7 +3694,7 @@
 DocType: Employee,Reason for Leaving,Motivo per Lasciare
 DocType: Expense Claim Detail,Sanctioned Amount,Importo sanzionato
 DocType: GL Entry,Is Opening,Sta aprendo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Riga {0}: addebito iscrizione non può essere collegato con un {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Il Conto {0} non esiste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Riga {0}: addebito iscrizione non può essere collegato con un {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Il Conto {0} non esiste
 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 3e624b7..0fe3135 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,消費者製品
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,先に当事者タイプを選択してください
 DocType: Item,Customer Items,顧客アイテム
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,アカウント{0}:親勘定{1}は元帳にすることができません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,アカウント{0}:親勘定{1}は元帳にすることができません
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.comにアイテムを発行
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,メール通知
 DocType: Item,Default Unit of Measure,デフォルト数量単位
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,顧客の連絡先
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,資材要求元
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,資材要求元
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0}ツリー
 DocType: Job Applicant,Job Applicant,求職者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,これ以上、結果はありません。
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 . 顧客ごとのアイテムコードを維持し、コードで検索を可能にするためには、このオプションを使用します。
 DocType: Mode of Payment Account,Mode of Payment Account,支払口座のモード
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,バリエーションを表示
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,数量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ローン(負債)
 DocType: Employee Education,Year of Passing,経過年
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,在庫中
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,健康管理
 DocType: Purchase Invoice,Monthly,月次
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),支払いの遅延(日)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,請求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,請求
 DocType: Maintenance Schedule Item,Periodicity,周期性
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,メールアドレス
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,年度は、{0}が必要です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防御
 DocType: Company,Abbr,略称
 DocType: Appraisal Goal,Score (0-5),スコア(0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}:{1} {2} は {3}と一致しません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},行{0}:{1} {2} は {3}と一致しません
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,行 {0}:
 DocType: Delivery Note,Vehicle No,車両番号
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,価格表を選択してください
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,価格表を選択してください
 DocType: Production Order Operation,Work In Progress,進行中の作業
 DocType: Employee,Holiday List,休日のリスト
 DocType: Time Log,Time Log,時間ログ
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同じ会社が複数回入力されています
 DocType: Employee,Married,結婚してる
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0}のために許可されていません
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
 DocType: Payment Reconciliation,Reconcile,照合
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,食料品
 DocType: Quality Inspection Reading,Reading 1,報告要素1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,銀行エントリを作成
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,年金基金
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,アカウントタイプが「倉庫」の場合、倉庫が必須です
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,アカウントタイプが「倉庫」の場合、倉庫が必須です
 DocType: SMS Center,All Sales Person,全ての営業担当者
 DocType: Lead,Person Name,人名
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",注文が定期的な場合にはチェックをオンにしし、繰り返しを停止する場合はチェックをオフにするか適切な終了日を指定してください
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,関心あり
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,部品表
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,期首
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},{0}から{1}へ
+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,エントリーを開く
 DocType: Stock Entry,Additional Costs,追加費用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,既存の取引を持つアカウントをグループに変換することはできません。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,既存の取引を持つアカウントをグループに変換することはできません。
 DocType: Lead,Product Enquiry,製品のお問い合わせ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,最初の「会社」を入力してください
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,目標
+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 +9,Activity Log:,活動ログ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,アイテム{0}は、システムに存在しないか有効期限が切れています
@@ -165,7 +165,7 @@
 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 +444,Item {0} is not active or end of life has been reached,アイテム{0}は、アクティブでないか、販売終了となっています
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,アイテム{0}は、アクティブでないか、販売終了となっています
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,請求書を提出すると更新されます。
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,人事モジュール設定
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,作業遂行の詳細
 DocType: Serial No,Maintenance Status,メンテナンスステータス
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,アイテムと価格
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},開始日は当会計年度内にする必要があります。(もしかして:開始日= {0})
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},開始日は当会計年度内にする必要があります。(もしかして:開始日= {0})
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,査定を作成する従業員を選択してください。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},コストセンター{0}は会社{1}に属していません
 DocType: Customer,Individual,個人
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,財務によるキャッシュ・フロー
 DocType: Lead,Address & Contact,住所・連絡先
 DocType: Leave Allocation,Add unused leaves from previous allocations,前回の割り当てから未使用の葉を追加
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},次の繰り返し {0} は {1} 上に作成されます
@@ -222,6 +223,7 @@
 ,Contact Name,担当者名
 DocType: Production Plan Item,SO Pending Qty,受注保留数量
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,上記の基準の給与伝票を作成します。
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,説明がありません
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,仕入要求
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を提出可能です
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,退職日は入社日より後でなければなりません
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,アイテムのWebサイトの仕様
 DocType: Payment Tool,Reference No,参照番号
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,年次
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,在庫棚卸アイテム
 DocType: Stock Entry,Sales Invoice No,請求番号
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,サプライヤータイプ
 DocType: Item,Publish in Hub,ハブに公開
 ,Terretory,地域
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,アイテム{0}をキャンセルしました
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,アイテム{0}をキャンセルしました
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,資材要求
 DocType: Bank Reconciliation,Update Clearance Date,清算日の更新
 DocType: Item,Purchase Details,仕入詳細
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},仕入注文 {1} の「原材料供給」テーブルにアイテム {0} が見つかりません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},仕入注文 {1} の「原材料供給」テーブルにアイテム {0} が見つかりません
 DocType: Employee,Relation,関連
 DocType: Shipping Rule,Worldwide Shipping,全世界出荷
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,お客様からのご注文確認。
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,提案
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,この地域用にアイテムグループごとの予算を設定します。また「配分」を設定することで、期間を含めることができます。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},倉庫{0}の親勘定グループを入力してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} に対する支払は残高 {2} より大きくすることができません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,スケジュールを生成
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,新着
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,最大5文字
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,リストに最初に追加される休暇承認者は、デフォルト休暇承認者として設定されます。
+apps/erpnext/erpnext/config/desktop.py +73,Learn,こちらをご覧ください
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,従業員一人当たりの活動コスト
 DocType: Accounts Settings,Settings for Accounts,アカウント設定
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,セールスパーソンツリーを管理します。
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,複数通貨
 DocType: Payment Reconciliation Invoice,Invoice Type,請求書タイプ
 DocType: Sales Invoice Item,Delivery Note,納品書
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,税設定
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,税設定
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,支払エントリが変更されています。引用しなおしてください
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,今週と保留中の活動の概要
 DocType: Workstation,Rent Cost,地代・賃料
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,月と年を選択してください
@@ -309,11 +312,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",部品表、納品書、請求書、製造指示、発注、仕入領収書、納品書、受注、在庫エントリー、タイムシートで利用可能
 DocType: Item Tax,Tax Rate,税率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,アイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,アイテムを選択
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","アイテム:{0}はバッチごとに管理され、「在庫棚卸」を使用して照合することはできません。
 代わりに「在庫エントリー」を使用してください。"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行#{0}:バッチ番号は {1} {2}と同じである必要があります
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,非グループに変換
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,仕入時の領収書を提出しなければなりません
@@ -354,6 +357,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,検診
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,失敗の原因
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,シングル
 DocType: Issue,Attachment,添付
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,予算はグループコストセンターに設定することができません
@@ -383,13 +387,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,休日マスター
 DocType: Material Request Item,Required Date,要求日
 DocType: Delivery Note,Billing Address,請求先住所
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,アイテムコードを入力してください
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,アイテムコードを入力してください
 DocType: BOM,Costing,原価計算
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",チェックすると、税額が既に表示上の単価/額に含まれているものと見なされます
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,合計数量
@@ -422,7 +426,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
 DocType: Shipping Rule,Net Weight,正味重量
 DocType: Employee,Emergency Phone,緊急電話
 ,Serial No Warranty Expiry,シリアル番号(保証期限)
@@ -441,15 +445,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,増分は0にすることはできません
 DocType: Production Planning Tool,Material Requirement,資材所要量
 DocType: Company,Delete Company Transactions,会社の取引を削除
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,アイテム{0}は仕入アイテムではありません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,アイテム{0}は仕入アイテムではありません
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} は「通知メールアドレス」として無効なメールアドレスです
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,請求合計/年:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,租税公課の追加/編集
 DocType: Purchase Invoice,Supplier Invoice No,サプライヤー請求番号
 DocType: Territory,For reference,参考のため
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",それは株式取引で使用されているように、{0}シリアル番号を削除することはできません
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),(貸方)を閉じる
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),(貸方)を閉じる
 DocType: Serial No,Warranty Period (Days),保証期間(日数)
 DocType: Installation Note Item,Installation Note Item,設置票アイテム
 ,Pending Qty,保留中の数量
@@ -465,7 +468,7 @@
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","「月次配分」は、ビジネスに季節性がある場合、月間で予算を配分するのに使用できます。
 配分を行なう場合には、「コストセンター」にこの「月次配分」を設定してください。"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,請求書テーブルにレコードが見つかりません
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,請求書テーブルにレコードが見つかりません
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,最初の会社と当事者タイプを選択してください
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,会計年度
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",シリアル番号をマージすることはできません
@@ -473,9 +476,9 @@
 DocType: Project Task,Project Task,プロジェクトタスク
 ,Lead Id,リードID
 DocType: C-Form Invoice Detail,Grand Total,総額
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,会計年度の開始日は終了日より後にはできません
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,会計年度の開始日は終了日より後にはできません
 DocType: Warranty Claim,Resolution,課題解決
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},配送済:{0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},配送済:{0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,買掛金勘定
 DocType: Sales Order,Billing and Delivery Status,請求と配達の状況
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,リピート顧客
@@ -490,7 +493,7 @@
 DocType: Quotation,Quotation To,見積先
 DocType: Lead,Middle Income,中収益
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),開く(貸方)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,割当額をマイナスにすることはできません
 DocType: Purchase Order Item,Billed Amt,支払額
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,在庫エントリが作成されるのに対する論理的な倉庫。
@@ -499,7 +502,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,製造指示は必須です
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,提案の作成
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,他の営業担当者 {0} が同じ従業員IDとして存在します
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},マイナス在庫エラー({6})アイテム {0} 倉庫 {1}の {4} {5} 内 {2} {3}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},マイナス在庫エラー({6})アイテム {0} 倉庫 {1}の {4} {5} 内 {2} {3}
 DocType: Fiscal Year Company,Fiscal Year Company,会計年度(会社)
 DocType: Packing Slip Item,DN Detail,請求書詳細
 DocType: Time Log,Billed,課金
@@ -518,16 +521,17 @@
 DocType: Activity Type,Default Costing Rate,デフォルト原価
 DocType: Maintenance Schedule,Maintenance Schedule,メンテナンス予定
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",価格設定ルールは、顧客、顧客グループ、地域、サプライヤー、サプライヤータイプ、キャンペーン、販売パートナーなどに基づいて抽出されます
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,在庫の純変更
 DocType: Employee,Passport Number,パスポート番号
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,マネージャー
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,参照元仕入領収書
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,同じアイテムが複数回入力されています
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,参照元仕入領収書
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,同じアイテムが複数回入力されています
 DocType: SMS Settings,Receiver Parameter,受領者パラメータ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,「参照元」と「グループ元」は同じにすることはできません
 DocType: Sales Person,Sales Person Targets,営業担当者の目標
 DocType: Production Order Operation,In minutes,分単位
 DocType: Issue,Resolution Date,課題解決日
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
 DocType: Selling Settings,Customer Naming By,顧客名設定
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,グループへの変換
 DocType: Activity Cost,Activity Type,活動タイプ
@@ -538,7 +542,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}:{1}は請求書詳細テーブルに存在しません
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス訪問 {0} をキャンセルしなければなりません
 DocType: Material Request,Material Transfer,資材移送
@@ -560,13 +564,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,マーケティング
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,シリアル番号に基づき販売と仕入書類からアイテムを追跡します。製品の保証詳細を追跡するのにも使えます。
 DocType: Purchase Receipt Item Supplied,Current Stock,現在の在庫
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,拒否されたアイテムに対しては拒否された倉庫が必須です
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,今年の合計請求
 DocType: Account,Expenses Included In Valuation,評価中経費
 DocType: Employee,Provide email id registered in company,会社に登録されたメールアドレスを提供
 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 +533,Item has variants.,アイテムはバリエーションがあります
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ツリー型
@@ -584,18 +588,18 @@
 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 +92,{0} is not a stock Item,{0}は在庫アイテムではありません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0}は在庫アイテムではありません
 DocType: Mode of Payment Account,Default Account,デフォルトアカウント
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,リードから機会を作る場合は、リードが設定されている必要があります
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,週休日を選択してください
 DocType: Production Order Operation,Planned End Time,計画終了時間
 ,Sales Person Target Variance Item Group-Wise,(アイテムグループごとの)各営業ターゲット差違
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,既存の取引を持つアカウントは、元帳に変換することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,既存の取引を持つアカウントは、元帳に変換することはできません
 DocType: Delivery Note,Customer's Purchase Order No,顧客の発注番号
 DocType: Employee,Cell Number,携帯電話の番号
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,生成される自動材料要求
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,失われた
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,「対仕訳入力」列に対してこの伝票を入力することはできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,「対仕訳入力」列に対してこの伝票を入力することはできません
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,エネルギー
 DocType: Opportunity,Opportunity From,機会元
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月次給与計算書。
@@ -604,9 +608,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}:タイプ{1}の{0}から
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,行{0}:換算係数が必須です
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,会計エントリはリーフノードに対して行うことができます。グループに対するエントリは許可されていません。
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,別の部品表にリンクされているため、無効化や部品表のキャンセルはできません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,別の部品表にリンクされているため、無効化や部品表のキャンセルはできません
 DocType: Opportunity,Maintenance,メンテナンス
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},アイテム{0}には領収書番号が必要です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},アイテム{0}には領収書番号が必要です
 DocType: Item Attribute Value,Item Attribute Value,アイテムの属性値
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,販売キャンペーン。
 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.
@@ -671,7 +675,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,価格表が選択されていません
 DocType: Employee,Family Background,家族構成
 DocType: Process Payroll,Send Email,メールを送信
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},警告:不正な添付ファイル{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},警告:不正な添付ファイル{0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,権限がありませんん
 DocType: Company,Default Bank Account,デフォルト銀行口座
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",「当事者」に基づいてフィルタリングするには、最初の「当事者タイプ」を選択してください
@@ -679,7 +683,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,番号
 DocType: Item,Items with higher weightage will be shown higher,高い比重を持つアイテムはより高く表示されます
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行勘定調整詳細
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,自分の請求書
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,自分の請求書
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,従業員が見つかりません
 DocType: Purchase Order,Stopped,停止
 DocType: Item,If subcontracted to a vendor,ベンダーに委託した場合
@@ -689,6 +693,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,今すぐ送信
 ,Support Analytics,サポート分析
 DocType: Item,Website Warehouse,ウェブサイトの倉庫
+DocType: Payment Reconciliation,Minimum Invoice Amount,最低請求額
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",自動請求を生成する日付(例:05、28など)
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,スコアは5以下でなければなりません
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Cフォームの記録
@@ -698,7 +703,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",POS機能を有効にする
 DocType: Bin,Moving Average Rate,移動平均レート
 DocType: Production Planning Tool,Select Items,アイテム選択
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{2}を指定日とする支払{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{2}を指定日とする支払{1}に対する{0}
 DocType: Maintenance Visit,Completion Status,完了状況
 DocType: Sales Invoice Item,Target Warehouse,ターゲット倉庫
 DocType: Item,Allow over delivery or receipt upto this percent,このパーセント以上の配送または受領を許可
@@ -710,7 +715,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,取引の送信時、自動的にメッセージを作成します。
 DocType: Production Order,Item To Manufacture,製造するアイテム
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}状態は{2}です
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,発注からの支払
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,発注からの支払
 DocType: Sales Order Item,Projected Qty,予想数量
 DocType: Sales Invoice,Payment Due Date,支払期日
 DocType: Newsletter,Newsletter Manager,ニュースレターマネージャー
@@ -734,7 +739,7 @@
 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 +304,Point-of-Sale,POS
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",口座残高がすで貸方に存在しており、「残高仕訳先」を「借方」に設定することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",口座残高がすで貸方に存在しており、「残高仕訳先」を「借方」に設定することはできません
 DocType: Account,Balance must be,残高仕訳先
 DocType: Hub Settings,Publish Pricing,価格設定を公開
 DocType: Notification Control,Expense Claim Rejected Message,経費請求拒否されたメッセージ
@@ -757,7 +762,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,為替レートマスター
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,部品表{0}はアクティブでなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,部品表{0}はアクティブでなければなりません
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,文書タイプを選択してください
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,このメンテナンス訪問をキャンセルする前に資材訪問{0}をキャンセルしなくてはなりません
 DocType: Salary Slip,Leave Encashment Amount,休暇現金化量
@@ -775,17 +780,17 @@
 DocType: Supplier,Default Payable Accounts,デフォルト買掛金勘定
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,従業員{0}はアクティブでないか、存在しません
 DocType: Features Setup,Item Barcode,アイテムのバーコード
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
 DocType: Quality Inspection Reading,Reading 6,報告要素6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,仕入請求前払
 DocType: Address,Shop,店
 DocType: Hub Settings,Sync Now,今すぐ同期
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},行{0}:貸方エントリは{1}とリンクすることができません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},行{0}:貸方エントリは{1}とリンクすることができません
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,このモードを選択した場合、デフォルトの銀行口座/現金勘定がPOS請求書内で自動的に更新されます。
 DocType: Employee,Permanent Address Is,本籍地
 DocType: Production Order Operation,Operation completed for how many finished goods?,作業完了時の完成品数
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ブランド
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,{0}以上の引当金は、アイテム {1}と相殺されています。
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0}以上の引当金は、アイテム {1}と相殺されています。
 DocType: Employee,Exit Interview Details,インタビュー詳細を終了
 DocType: Item,Is Purchase Item,仕入アイテム
 DocType: Journal Entry Account,Purchase Invoice,仕入請求
@@ -797,7 +802,7 @@
 DocType: Salary Slip,Total in words,合計の文字表記
 DocType: Material Request Item,Lead Time Date,リードタイム日
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,必須です。多分両替レコードが作成されません
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},行 {0}:アイテム{1}のシリアル番号を指定してください
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},行 {0}:アイテム{1}のシリアル番号を指定してください
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.",「製品付属品」アイテム、倉庫、シリアル番号、バッチ番号は、「梱包リスト」テーブルから検討します。倉庫とバッチ番号が任意の「製品付属品」アイテムのすべての梱包アイテムと同じであれば、これらの値はメインのアイテムテーブルに入力することができ、「梱包リスト」テーブルにコピーされます。
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,顧客への出荷
 DocType: Purchase Invoice Item,Purchase Order Item,発注アイテム
@@ -806,14 +811,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,差違
 ,Company Name,(会社名)
 DocType: SMS Center,Total Message(s),全メッセージ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,配送のためのアイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,小切手が預けられた銀行の勘定科目を選択してください
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ユーザーに取引の価格表単価の編集を許可
 DocType: Pricing Rule,Max Qty,最大数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,化学
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,アイテムは全てこの製造指示に移動されています。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,アイテムは全てこの製造指示に移動されています。
 DocType: Process Payroll,Select Payroll Year and Month,賃金台帳 年と月を選択
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",適切なグループ(通常は資金運用>流動資産>銀行口座)に移動し、新しい「銀行」アカウント(クリックして子要素を追加します)を作成してください。
 DocType: Workstation,Electricity Cost,電気代
@@ -827,12 +833,12 @@
 DocType: SMS Center,All Lead (Open),全リード(オープン)
 DocType: Purchase Invoice,Get Advances Paid,立替金を取得
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,あなたの写真を添付
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,作成
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,作成
 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 +3,My Cart,Myカート
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Myカート
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,数量を開く
@@ -851,10 +857,10 @@
 DocType: POS Profile,Cash/Bank Account,現金/銀行口座
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
 DocType: Delivery Note,Delivery To,納品先
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,属性表は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,属性表は必須です
 DocType: Production Planning Tool,Get Sales Orders,注文を取得
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}はマイナスにできません
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,割引
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,割引
 DocType: Features Setup,Purchase Discounts,仕入割引
 DocType: Workstation,Wages,賃金
 DocType: Time Log,Will be updated only if Time Log is 'Billable',時間ログは「請求可能」である場合にのみ更新されます
@@ -879,7 +885,7 @@
 DocType: Tax Rule,Shipping State,出荷状態
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,アイテムは、ボタン「領収書からアイテムの取得」を使用して追加する必要があります
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,販売費
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,標準購入
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,標準購入
 DocType: GL Entry,Against,に対して
 DocType: Item,Default Selling Cost Center,デフォルト販売コストセンター
 DocType: Sales Partner,Implementation Partner,導入パートナー
@@ -921,6 +927,7 @@
 DocType: Sales Partner,Distributor,販売代理店
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ショッピングカート出荷ルール
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,受注キャンセルには製造指示{0}のキャンセルをしなければなりません
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',設定」で追加の割引を適用」してください
 ,Ordered Items To Be Billed,支払予定注文済アイテム
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,範囲開始は範囲終了よりも小さくなければなりません
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,タイムログを選択し、新しい請求書を作成し提出してください。
@@ -930,13 +937,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,この時間ログバッチは請求済みです
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,機会作成
 DocType: Salary Slip,Leave Without Pay,無給休暇
-DocType: Supplier,Communications,コミュニケーション
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,キャパシティプランニングのエラー
 ,Trial Balance for Party,当事者用の試算表
 DocType: Lead,Consultant,コンサルタント
 DocType: Salary Slip,Earnings,収益
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,完成アイテム{0}は製造タイプのエントリで入力する必要があります
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,期首残高
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,完成アイテム{0}は製造タイプのエントリで入力する必要があります
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,期首残高
 DocType: Sales Invoice Advance,Sales Invoice Advance,前払金
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,要求するものがありません
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',「実際の開始日」は、「実際の終了日」より後にすることはできません
@@ -978,7 +984,7 @@
 DocType: Global Defaults,Current Fiscal Year,現在の会計年度
 DocType: Global Defaults,Disable Rounded Total,合計の四捨五入を無効にする
 DocType: Lead,Call,電話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,「エントリ」は空にできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,「エントリ」は空にできません
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},行{0}は{1}と重複しています
 ,Trial Balance,試算表
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,従業員設定
@@ -990,9 +996,9 @@
 DocType: Contact,User ID,ユーザー ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,元帳の表示
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最初
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
 DocType: Production Order,Manufacture against Sales Order,受注に対する製造
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,その他の地域
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,給与総額
@@ -1022,7 +1028,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},凍結されたアカウント{0}を編集する権限がありません
 DocType: Journal Entry,Get Outstanding Invoices,未払いの請求を取得
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,受注{0}は有効ではありません
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",企業はマージできません
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged",企業はマージできません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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} から試してみてください
@@ -1035,13 +1041,13 @@
 DocType: Employee,Place of Issue,発生場所
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,契約書
 DocType: Email Digest,Add Quote,引用を追加
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},アイテム{1}の{0}には数量単位変換係数が必要です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},アイテム{1}の{0}には数量単位変換係数が必要です
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,間接経費
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,行{0}:数量は必須です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,あなたの製品またはサービス
 DocType: Mode of Payment,Mode of Payment,支払方法
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,ウェブサイトのイメージは、公開ファイルまたはウェブサイトのURLを指定する必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ウェブサイトのイメージは、公開ファイルまたはウェブサイトのURLを指定する必要があります
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,これは、ルートアイテムグループであり、編集することはできません。
 DocType: Journal Entry Account,Purchase Order,発注
 DocType: Warehouse,Warehouse Contact Info,倉庫連絡先情報
@@ -1050,8 +1056,8 @@
 DocType: Email Digest,Annual Income,年間所得
 DocType: Serial No,Serial No Details,シリアル番号詳細
 DocType: Purchase Invoice Item,Item Tax Rate,アイテムごとの税率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,納品書{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,納品書{0}は提出されていません
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,アイテム{0}は下請けアイテムでなければなりません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",価格設定ルールは、「適用」フィールドに基づき、アイテム、アイテムグループ、ブランドとすることができます。
@@ -1061,7 +1067,7 @@
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,説明編集
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,配送予定日が計画開始日よりも前に指定されています
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,サプライヤー用
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,サプライヤー用
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,アカウントタイプを設定すると、取引内で選択できるようになります
 DocType: Purchase Invoice,Grand Total (Company Currency),総合計(会社通貨)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,出費総額
@@ -1074,7 +1080,7 @@
 DocType: Journal Entry,Journal Entry,仕訳
 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 +427,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,この接頭辞が付いた最新の取引番号です
@@ -1106,7 +1112,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",連絡先・リードへのニュースレター
 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}になっています
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,作業は空白にできません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,作業は空白にできません
 ,Delivered Items To Be Billed,未入金の納品済アイテム
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,倉庫は製造番号によって変更することはできません。
 DocType: Authorization Rule,Average Discount,平均割引
@@ -1121,7 +1127,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},{0}から | {1} {2}
 DocType: BOM Operation,Operation Description,作業説明
 DocType: Item,Will also apply to variants,バリエーションにも適用されます
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,年度が保存されると会計年度の開始日と会計年度終了日を変更することはできません。
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,年度が保存されると会計年度の開始日と会計年度終了日を変更することはできません。
 DocType: Quotation,Shopping Cart,カート
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,平均支出
 DocType: Pricing Rule,Campaign,キャンペーン
@@ -1132,7 +1138,8 @@
 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 +211,Stock Entries already created for Production Order ,製造指示が作成済の在庫エントリー
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,製造指示が作成済の在庫エントリー
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,固定資産の純変動
 DocType: Leave Control Panel,Leave blank if considered for all designations,全ての肩書を対象にする場合は空白のままにします
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大:{0}
@@ -1144,7 +1151,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,勘定科目表
 DocType: Material Request,Terms and Conditions Content,規約の内容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100を超えることはできません
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
 DocType: Maintenance Visit,Unscheduled,スケジュール解除済
 DocType: Employee,Owned,所有済
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,無給休暇に依存
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,組立部品
 DocType: Shipping Rule Condition,To Value,値
 DocType: Supplier,Stock Manager,在庫マネージャー
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},行{0}には出庫元が必須です
+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 +581,Packing Slip,梱包伝票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,事務所賃料
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,SMSゲートウェイの設定
@@ -1190,10 +1197,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,アドレスがまだ追加されていません
 DocType: Workstation Working Hour,Workstation Working Hour,作業所の労働時間
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,アナリスト
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}:割り当て額{1}は仕訳伝票額{2}以下でなければなりません
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}:割り当て額{1}は仕訳伝票額{2}以下でなければなりません
 DocType: Item,Inventory,在庫
 DocType: Features Setup,"To enable ""Point of Sale"" view",POS画面を有効にする
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,空のカートに支払はできません
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,空のカートに支払はできません
 DocType: Item,Sales Details,販売明細
 DocType: Opportunity,With Items,関連アイテム
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,数量中
@@ -1208,10 +1215,11 @@
 DocType: Cost Center,Parent Cost Center,親コストセンター
 DocType: Sales Invoice,Source,ソース
 DocType: Leave Type,Is Leave Without Pay,無給休暇
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,支払テーブルにレコードが見つかりません
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,支払テーブルにレコードが見つかりません
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,会計年度の開始日
 DocType: Employee External Work History,Total Experience,実績合計
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,梱包伝票(S)をキャンセル
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,梱包伝票(S)をキャンセル
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,投資活動によるキャッシュフロー
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,運送・転送料金
 DocType: Material Request Item,Sales Order No,受注番号
 DocType: Item Group,Item Group Name,アイテムグループ名
@@ -1219,13 +1227,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,製造用資材配送
 DocType: Pricing Rule,For Price List,価格表用
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ヘッドハンティング
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","アイテム{0}の仕入額が見つかりません、会計エントリ(費用)を記帳するために必要とされています。
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","アイテム{0}の仕入額が見つかりません、会計エントリ(費用)を記帳するために必要とされています。
 仕入価格表に対するアイテム価格を記載してください。"
 DocType: Maintenance Schedule,Schedules,スケジュール
 DocType: Purchase Invoice Item,Net Amount,正味金額
 DocType: Purchase Order Item Supplied,BOM Detail No,部品表詳細番号
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),追加割引額(会社通貨)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},エラー:{0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},エラー:{0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,勘定科目表から新しいアカウントを作成してください
 DocType: Maintenance Visit,Maintenance Visit,メンテナンスのための訪問
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,顧客>顧客グループ>地域
@@ -1252,7 +1260,7 @@
 DocType: Sales Partner,Sales Partner Target,販売パートナー目標
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0}の勘定科目は通貨{1}でのみ作成可能です
 DocType: Pricing Rule,Pricing Rule,価格設定ルール
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,仕入注文のための資材要求
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,仕入注文のための資材要求
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},行#{0}:返品アイテム {1} は {2} {3}に存在しません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,銀行口座
 ,Bank Reconciliation Statement,銀行勘定調整表
@@ -1260,11 +1268,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,期首在庫残高
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0}が重複しています
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},発注{2}に対して{1}より{0}以上を配送することはできません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},休暇は{0}に正常に割り当てられました
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,梱包するアイテムはありません
 DocType: Shipping Rule Condition,From Value,値から
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,製造数量は必須です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,製造数量は必須です
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,銀行に反映されていない金額
 DocType: Quality Inspection Reading,Reading 4,報告要素4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,会社経費の請求
@@ -1276,33 +1284,34 @@
 ,Material Requests for which Supplier Quotations are not created,サプライヤー見積が作成されていない資材要求
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,あなたは休暇を申請された日(複数可)は祝日です。あなたは休暇を申請する必要はありません。
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,バーコードを使用してアイテムを追跡します。アイテムのバーコードをスキャンすることによって、納品書や請求書にアイテムを入力することができます。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,配信としてマーク
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,配信としてマーク
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,見積を作成
 DocType: Dependent Task,Dependent Task,依存タスク
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,誕生日リマインダを停止
 DocType: SMS Center,Receiver List,受領者リスト
 DocType: Payment Tool Detail,Payment Amount,支払金額
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消費額
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}ビュー
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0}ビュー
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,現金の純変更
 DocType: Salary Structure Deduction,Salary Structure Deduction,給与体系(控除)
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{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 +185,Quantity must not be more than {0},数量は{0}以下でなければなりません
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),期間(日)
 DocType: Quotation Item,Quotation Item,見積項目
 DocType: Account,Account Name,アカウント名
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,開始日は終了日より後にすることはできません
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,開始日は終了日より後にすることはできません
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,シリアル番号 {0}は量{1}の割合にすることはできません
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,サプライヤータイプマスター
 DocType: Purchase Order Item,Supplier Part Number,サプライヤー部品番号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,変換率は0か1にすることはできません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,変換率は0か1にすることはできません
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,領収書{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,領収書{0}は提出されていません
 DocType: Company,Default Payable Account,デフォルト買掛金勘定
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",オンラインショッピングカート設定(出荷ルール・価格表など)
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}%支払済
@@ -1314,15 +1323,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,自分の課題
 DocType: BOM Item,BOM Item,部品表アイテム
 DocType: Appraisal,For Employee,従業員用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,行{0}:サプライヤーに対して事前に引き落としされなければなりません
 DocType: Company,Default Values,デフォルト値
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,行{0}:支払額は負にすることはできません
 DocType: Expense Claim,Total Amount Reimbursed,総払戻額
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},対サプライヤー請求書{0} 日付{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},対サプライヤー請求書{0} 日付{1}
 DocType: Customer,Default Price List,デフォルト価格表
 DocType: Payment Reconciliation,Payments,支払
 DocType: Budget Detail,Budget Allocated,割当予算
 DocType: Journal Entry,Entry Type,エントリタイプ
 ,Customer Credit Balance,顧客貸方残高
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,買掛金の純変動
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,メールアドレスを確認してください
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',「顧客ごと割引」には顧客が必要です
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,銀行支払日と履歴を更新
@@ -1344,7 +1355,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,ショッピングカートを有効にする
 DocType: Employee,Permanent Address,本籍地
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,アイテム{0}はサービスアイテムでなければなりません。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",{0}への前払金として {1} は{2}の総計より大きくすることはできません
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,アイテムコードを選択してください。
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),無給休暇(LWP)の控除減
@@ -1361,10 +1372,10 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,この在庫エントリを作成するために使用される資材要求
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,アイテムの1単位
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',時間ログバッチ{0}は「提出済」でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',時間ログバッチ{0}は「提出済」でなければなりません
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,各在庫の動きを会計処理のエントリとして作成
 DocType: Leave Allocation,Total Leaves Allocated,休暇割当合計
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},行番号{0}には倉庫が必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},行番号{0}には倉庫が必要です
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,有効な会計年度開始日と終了日を入力してください
 DocType: Employee,Date Of Retirement,退職日
 DocType: Upload Attendance,Get Template,テンプレートを取得
@@ -1372,8 +1383,9 @@
 DocType: Item,Weightage,重み付け
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"同じ名前の顧客グループが存在します
 顧客名か顧客グループのどちらかの名前を変更してください"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,最初の{0}を選択してください
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},テキスト{0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,最初の{0}を選択してください
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},テキスト{0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,新しい連絡先
 DocType: Territory,Parent Territory,上位地域
 DocType: Quality Inspection Reading,Reading 2,報告要素2
 DocType: Stock Entry,Material Receipt,資材領収書
@@ -1381,7 +1393,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},売掛金/買掛金勘定{0}には当事者タイプと当事者が必要です。
 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 +210,Quantity required for Item {0} in row {1},行{1}のアイテム{0}に必要な数量
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},行{1}のアイテム{0}に必要な数量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},アイテム{1}が存在するため倉庫{0}を削除することができません
 DocType: Quotation,Order Type,注文タイプ
 DocType: Purchase Invoice,Notification Email Address,通知メールアドレス
@@ -1398,15 +1410,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,カラムが多すぎます。レポートをエクスポートして、スプレッドシートアプリケーションを使用して印刷します。
 DocType: Sales 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 +152,Main,メイン
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,メイン
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,バリエーション
 DocType: Naming Series,Set prefix for numbering series on your transactions,取引に連番の接頭辞を設定
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,停止された注文はキャンセルできません。キャンセルするには停止解除してください
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表({0})がアクティブでなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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: Item,Variants,バリエーション
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,発注を作成
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,発注を作成
 DocType: SMS Center,Send To,送信先
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
 DocType: Payment Reconciliation Payment,Allocated amount,割当額
@@ -1419,7 +1431,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,倉庫と問い合わせ先
 DocType: Supplier,Statutory info and other general information about your Supplier,サプライヤーに関する法定の情報とその他の一般情報
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,住所
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,対仕訳{0}に該当しないエントリ{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,対仕訳{0}に該当しないエントリ{1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},アイテム{0}に入力されたシリアル番号は重複しています
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,出荷ルールの条件
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,アイテムは製造指示を持つことができません
@@ -1428,10 +1440,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,アカウント通貨での貸方金額
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,製造用の時間ログ
 DocType: Item,Apply Warehouse-wise Reorder Level,倉庫ごとの再発注レベルを適用
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,部品表{0}を登録しなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,部品表{0}を登録しなければなりません
 DocType: Authorization Control,Authorization Control,認証コントロール
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行#{0}:倉庫拒否は却下されたアイテムに対して必須である{1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,タスクの時間ログ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,支払
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,支払
 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},資材要求の最大値{0}は、注{2}に対するアイテム{1}から作られます
 DocType: Employee,Salutation,敬称(例:Mr. Ms.)
@@ -1448,7 +1461,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,同僚
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,アイテム{0}にはシリアル番号が付与されていません
 DocType: SMS Center,Create Receiver List,受領者リストを作成
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,期限切れ
 DocType: Packing Slip,To Package No.,対象梱包番号
 DocType: Warranty Claim,Issue Date,課題日
 DocType: Activity Cost,Activity Cost,活動費用
@@ -1486,7 +1498,7 @@
 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 +65,Territory / Customer,地域/顧客
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,例「5」
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,販売アイテム
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,アイテムグループツリー
@@ -1498,7 +1510,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} 作成
 DocType: Delivery Note Item,Against Sales Order,対受注書
 ,Serial No Status,シリアル番号ステータス
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,アイテムテーブルは空白にすることはできません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,アイテムテーブルは空白にすることはできません
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",行{0}:{1}の周期を設定するには、開始日から終了日までの期間が {2} 以上必要です
 DocType: Pricing Rule,Selling,販売
@@ -1507,7 +1519,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,関税と税金
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,基準日を入力してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,Webサイトに表示されたアイテムの表
 DocType: Purchase Order Item Supplied,Supplied Qty,サプライ数量
@@ -1522,7 +1534,7 @@
 DocType: Installation Note,Installation Time,設置時間
 DocType: Sales Invoice,Accounting Details,会計詳細
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,この会社の全ての取引を削除
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"行 {0}:注文番号{3}には完成品{2}個が必要なため、作業{1}は完了していません。
+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,"行 {0}:注文番号{3}には完成品{2}個が必要なため、作業{1}は完了していません。
 時間ログから作業ステータスを更新してください"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投資
 DocType: Issue,Resolution Details,課題解決詳細
@@ -1539,7 +1551,7 @@
 DocType: Holiday List,Clear Table,テーブルを消去
 DocType: Features Setup,Brands,ブランド
 DocType: C-Form Invoice Detail,Invoice No,請求番号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,参照元発注
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,参照元発注
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,原価計算単価
 ,Customer Addresses And Contacts,顧客の住所と連絡先
@@ -1556,7 +1568,7 @@
 ,Maintenance Schedules,メンテナンス予定
 ,Quotation Trends,見積傾向
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},アイテム{0}のアイテムマスターにはアイテムグループが記載されていません
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
 DocType: Shipping Rule Condition,Shipping Amount,出荷量
 ,Pending Amount,保留中の金額
 DocType: Purchase Invoice Item,Conversion Factor,換算係数
@@ -1573,12 +1585,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,財務アカウントのツリー
 DocType: Leave Control Panel,Leave blank if considered for all employee types,全従業員タイプを対象にする場合は空白のままにします
 DocType: Landed Cost Voucher,Distribute Charges Based On,支払按分基準
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,アイテム{1}が資産アイテムである場合、アカウントアイテム{0}は「固定資産」でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,アイテム{1}が資産アイテムである場合、アカウントアイテム{0}は「固定資産」でなければなりません
 DocType: HR Settings,HR Settings,人事設定
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,経費請求は承認待ちです。経費承認者のみ、ステータスを更新することができます。
 DocType: Purchase Invoice,Additional Discount Amount,追加割引額
 DocType: Leave Block List Allow,Leave Block List Allow,許可する休暇リスト
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,スポーツ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,実費計
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,単位
@@ -1590,6 +1602,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}はデフォルト会計年度です。変更を反映するためにブラウザを更新してください
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,経費請求
 DocType: Issue,Support,サポート
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,カートを見る
 ,BOM Search,部品表(BOM)検索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),期末(期首+合計)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,会社に通貨を指定してください
@@ -1601,13 +1614,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},行{0}には数量単位変換係数が必要です
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},決済日付は行{0}の小切手日付より前にすることはできません
 DocType: Salary Slip,Deduction,控除
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},アイテムの価格は価格表{1}に{0}のために追加
 DocType: Address Template,Address Template,住所テンプレート
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,営業担当者の従業員IDを入力してください
 DocType: Territory,Classification of Customers by region,地域別の顧客の分類
 DocType: Project,% Tasks Completed,%作業完了
 DocType: Project,Gross Margin,売上総利益
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,最初の生産アイテムを入力してください
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,無効なユーザー
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,無効なユーザー
 DocType: Opportunity,Quotation,見積
 DocType: Salary Slip,Total Deduction,控除合計
 DocType: Quotation,Maintenance User,メンテナンスユーザー
@@ -1616,7 +1630,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},警告:添付ファイル{0}に無効なSSL証明書
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},警告:添付ファイル{0}に無効なSSL証明書
 DocType: Production Order Operation,Actual Operation Time,実作業時間
 DocType: Authorization Rule,Applicable To (User),(ユーザー)に適用
 DocType: Purchase Taxes and Charges,Deduct,差し引く
@@ -1626,12 +1640,12 @@
 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,受注数量
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",倉庫{0}に対して在庫エントリが存在するため、倉庫の再割り当てや変更ができません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",倉庫{0}に対して在庫エントリが存在するため、倉庫の再割り当てや変更ができません
 DocType: Appraisal,Calculate Total Score,合計スコアを計算
 DocType: Supplier Quotation,Manufacturing Manager,製造マネージャー
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},シリアル番号{0}は {1}まで保証期間内です
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,梱包ごとに納品書を分割
-apps/erpnext/erpnext/hooks.py +68,Shipments,出荷
+apps/erpnext/erpnext/hooks.py +69,Shipments,出荷
 DocType: Purchase Order Item,To be delivered to customer,顧客に配信します
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,時間ログのステータスが提出されなければなりません
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,シリアル番号は{0}任意の倉庫にも属していません
@@ -1651,10 +1665,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,会社を選択...
 DocType: Leave Control Panel,Leave blank if considered for all departments,全部門が対象の場合は空白のままにします
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",雇用タイプ(正社員、契約社員、インターンなど)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
 DocType: Currency Exchange,From Currency,通貨から
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",割当額、請求タイプ、請求書番号を少なくとも1つの行から選択してください
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},受注に必要な項目{0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",割当額、請求タイプ、請求書番号を少なくとも1つの行から選択してください
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},受注に必要な項目{0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,システムに反映されていない金額
 DocType: Purchase Invoice Item,Rate (Company Currency),レート(報告通貨)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,その他
@@ -1670,7 +1684,7 @@
 DocType: Quality Inspection,In Process,処理中
 DocType: Authorization Rule,Itemwise Discount,アイテムごとの割引
 DocType: Purchase Order Item,Reference Document Type,リファレンスドキュメントの種類
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},受注{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},受注{1}に対する{0}
 DocType: Account,Fixed Asset,固定資産
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,シリアル番号を付与した目録
 DocType: Activity Type,Default Billing Rate,デフォルト請求単価
@@ -1680,7 +1694,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,受注からの支払
 DocType: Expense Claim Detail,Expense Claim Detail,経費請求の詳細
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,時間ログを作成しました:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,正しいアカウントを選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,正しいアカウントを選択してください
 DocType: Item,Weight UOM,重量単位
 DocType: Employee,Blood Group,血液型
 DocType: Purchase Invoice Item,Page Break,改ページ
@@ -1711,10 +1725,10 @@
 DocType: Time Log,To Time,終了時間
 DocType: Authorization Rule,Approving Role (above authorized value),(許可された値以上の)役割を承認
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",子ノードを追加するには、ツリーを展開し、増やしたいノードの下をクリックしてください
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,「貸方へ」アカウントは買掛金でなければなりません
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},部品表再帰:{0} {2}の親または子にすることはできません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,「貸方へ」アカウントは買掛金でなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},部品表再帰:{0} {2}の親または子にすることはできません
 DocType: Production Order Operation,Completed Qty,完成した数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",{0}には、別の貸方エントリに対する借方勘定のみリンクすることができます
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry",{0}には、別の貸方エントリに対する借方勘定のみリンクすることができます
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,価格表{0}は無効になっています
 DocType: Manufacturing Settings,Allow Overtime,残業を許可
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,アイテム {1} には {0} 件のシリアル番号が必要です。{2} 件指定されています
@@ -1722,8 +1736,9 @@
 DocType: Item,Customer Item Codes,顧客アイテムコード
 DocType: Opportunity,Lost Reason,失われた理由
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,注文または請求書に対する支払エントリを作成
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新住所
 DocType: Quality Inspection,Sample Size,サンプルサイズ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,全てのアイテムはすでに請求済みです
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,コストセンターはさらにグループの下に作成できますが、エントリは非グループに対して対して作成できます
 DocType: Project,External,外部
@@ -1779,13 +1794,14 @@
 DocType: Rename Tool,Rename Tool,ツール名称変更
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,費用更新
 DocType: Item Reorder,Item Reorder,アイテム再注文
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,資材配送
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,資材配送
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",「運用」には「運用コスト」「固有の運用番号」を指定してください。
 DocType: Purchase Invoice,Price List Currency,価格表の通貨
 DocType: Naming Series,User must always select,ユーザーは常に選択する必要があります
 DocType: Stock Settings,Allow Negative Stock,マイナス在庫を許可
 DocType: Installation Note,Installation Note,設置票
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,税金を追加
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,財務活動によるキャッシュフロー
 ,Financial Analytics,財務分析
 DocType: Quality Inspection,Verified By,検証者
 DocType: Address,Subsidiary,子会社
@@ -1796,19 +1812,19 @@
 DocType: Process Payroll,Create Salary Slip,給与伝票を作成する
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,銀行口座ごとの予想残高
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),資金源泉(負債)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行の数量{0}({1})で製造量{2}と同じでなければなりません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行の数量{0}({1})で製造量{2}と同じでなければなりません
 DocType: Appraisal,Employee,従業員
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,メールインポート元
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,ユーザーとして招待
 DocType: Features Setup,After Sale Installations,販売後設置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1}は支払済です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1}は支払済です
 DocType: Workstation Working Hour,End Time,終了時間
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,販売・仕入用の標準的な契約条件
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,伝票によるグループ
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,必要な箇所
 DocType: Sales Invoice,Mass Mailing,大量送付
 DocType: Rename Tool,File to Rename,名前を変更するファイル
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},アイテム{0}には発注番号が必要です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},アイテム{0}には発注番号が必要です
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,支払いを表示
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},アイテム{1}には、指定した部品表{0}が存在しません
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス予定{0}をキャンセルしなければなりません
@@ -1818,6 +1834,7 @@
 DocType: Selling Settings,Sales Order Required,受注必須
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,顧客を作成
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,メンテナンス予定詳細
 DocType: Quality Inspection Reading,Reading 9,報告要素9
@@ -1829,6 +1846,7 @@
 DocType: Warranty Claim,Raised By,要求者
 DocType: Payment Tool,Payment Account,支払勘定
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,続行する会社を指定してください
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,売掛金の純変更
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,代償オフ
 DocType: Quality Inspection Reading,Accepted,承認済
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,本当にこの会社のすべての取引を削除するか確認してください。マスタデータは残ります。このアクションは、元に戻すことはできません。
@@ -1836,17 +1854,17 @@
 DocType: Payment Tool,Total Payment Amount,支払額合計
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,原材料は空白にできません。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,原材料は空白にできません。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
 DocType: Newsletter,Test,テスト
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",このアイテムには在庫取引が存在するため、「シリアル番号あり」「バッチ番号あり」「ストックアイテム」「評価方法」の値を変更することはできません。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,クイック仕訳
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,クイック仕訳
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,アイテムに対して部品表が記載されている場合は、レートを変更することができません
 DocType: Employee,Previous Work Experience,前職歴
 DocType: Stock Entry,For Quantity,数量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},アイテム{0}行{1}に予定数量を入力してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1}は提出されていません
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,アイテム要求
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,各完成品それぞれに独立した製造指示が作成されます。
 DocType: Purchase Invoice,Terms and Conditions1,規約1
@@ -1859,7 +1877,7 @@
 DocType: Authorization Rule,Authorized Value,認定値
 DocType: Contact,Enter department to which this Contact belongs,この連絡先の所属部署を入力してください
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,欠席計
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,行{0}のアイテムまたは倉庫が資材要求と一致していません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,行{0}のアイテムまたは倉庫が資材要求と一致していません
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,数量単位
 DocType: Fiscal Year,Year End Date,年終日
 DocType: Task Depends On,Task Depends On,依存するタスク
@@ -1885,7 +1903,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,契約終了日は、入社日よりも大きくなければなりません
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,コミッションのための企業の製品を販売している第三者の代理店/ディーラー/コミッションエージェント/アフィリエイト/リセラー。
 DocType: Customer Group,Has Child Node,子ノードあり
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},発注{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},発注{1}に対する{0}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","静的なURLパラメータを入力してください(例:sender=ERPNext, username=ERPNext, password=1234 など)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}は有効な会計年度内にありません。詳細については{2}を確認してください。
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,これはERPNextの自動生成ウェブサイトの例です。
@@ -1940,7 +1958,7 @@
 追加か控除かを選択します"
 DocType: Purchase Receipt Item,Recd Quantity,受領数量
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},受注数{1}より多くのアイテム{0}を製造することはできません
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金勘定
 DocType: Tax Rule,Billing City,請求先の市
 DocType: Global Defaults,Hide Currency Symbol,通貨記号を非表示にする
@@ -1972,6 +1990,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,水道光熱費
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
 DocType: Buying Settings,Default Buying Price List,デフォルト購入価格表
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.",会社、通貨、会計年度などのデフォルト値を設定
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,支払タイプ
@@ -2007,7 +2026,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",原価計算セクションの「資材単価基準」を参照してください。
 DocType: Appraisal Goal,Key Responsibility Area,重要責任分野
 DocType: Item Reorder,Material Request Type,資材要求タイプ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,行{0}:数量単位(UOM)換算係数は必須です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,行{0}:数量単位(UOM)換算係数は必須です
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,参照
 DocType: Cost Center,Cost Center,コストセンター
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,伝票番号
@@ -2029,7 +2048,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,全ての住所。
 DocType: Company,Stock Settings,在庫設定
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",両方のレコードで次のプロパティが同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",両方のレコードで次のプロパティが同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,顧客グループツリーを管理します。
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,新しいコストセンター名
 DocType: Leave Control Panel,Leave Control Panel,[コントロールパネル]を閉じる
@@ -2049,8 +2068,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,支払ツールの詳細
 ,Sales Browser,販売ブラウザ
 DocType: Journal Entry,Total Credit,貸方合計
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},警告:別の{0}#{1}が在庫エントリ{2}に対して存在します
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,現地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},警告:別の{0}#{1}が在庫エントリ{2}に対して存在します
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,債務者
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,L
@@ -2069,7 +2088,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,すべての販売取引について、複数の「営業担当者」に対するタグを付けることができるため、これによって目標を設定しチェックすることができます。
 ,S.O. No.,受注番号
 DocType: Production Order Operation,Make Time Log,時間ログを作成
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,再注文数量を設定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,再注文数量を設定してください
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},リード{0}から顧客を作成してください
 DocType: Price List,Applicable for Countries,国に適用
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,コンピュータ
@@ -2128,10 +2147,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,還付書内では、少なくとも1つの項目がマイナスで入力されていなければなりません
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,備考がありません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,備考がありません
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,期限超過
 DocType: Account,Stock Received But Not Billed,記帳前在庫
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,rootアカウントは、グループにする必要があります
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,rootアカウントは、グループにする必要があります
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,給与総額+滞納額+現金化金額 - 合計控除
 DocType: Monthly Distribution,Distribution Name,配布名
 DocType: Features Setup,Sales and Purchase,販売と仕入
@@ -2145,6 +2164,7 @@
 DocType: Journal Entry Account,Party Balance,当事者残高
 DocType: Sales Invoice Item,Time Log Batch,時間ログバッチ
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,「割引を適用」を選択してください
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,給与スリップを作成します
 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,製造用資材移送
@@ -2152,9 +2172,9 @@
 DocType: Purchase Invoice,Half-yearly,半年ごと
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,会計年度{0}が見つかりません
 DocType: Bank Reconciliation,Get Relevant Entries,関連するエントリを取得
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,在庫の会計エントリー
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,在庫の会計エントリー
 DocType: Sales Invoice,Sales Team1,販売チーム1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,アイテム{0}は存在しません
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,アイテム{0}は存在しません
 DocType: Sales Invoice,Customer Address,顧客の住所
 DocType: Purchase Invoice,Apply Additional Discount On,追加割引に適用
 DocType: Account,Root Type,ルートタイプ
@@ -2163,15 +2183,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,ページの上部にこのスライドショーを表示
 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 +149,Target warehouse is mandatory for row {0},{0}行にターゲット倉庫が必須です。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},{0}行にターゲット倉庫が必須です。
 DocType: Quality Inspection,Quality Inspection,品質検査
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,XS
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,警告:資材要求数が注文最小数を下回っています。
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,警告:資材要求数が注文最小数を下回っています。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,アカウント{0}は凍結されています
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,組織内で別々の勘定科目を持つ法人/子会社
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料&タバコ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL・BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},唯一の未請求{0}に対して支払いを行うことができます
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},唯一の未請求{0}に対して支払いを行うことができます
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,手数料率は、100を超えることはできません。
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最小在庫レベル
 DocType: Stock Entry,Subcontract,下請
@@ -2209,7 +2229,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,収入品質検査。
 DocType: Purchase Order Item,Returned Qty,返品数量
 DocType: Employee,Exit,終了
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,ルートタイプが必須です
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,ルートタイプが必須です
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,シリアル番号 {0}を作成しました
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",これらのコードは、顧客の便宜のために、請求書および納品書等の印刷形式で使用することができます
 DocType: Employee,You can enter any date manually,手動で日付を入力することができます
@@ -2217,8 +2237,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,試用期間
 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 +110,Row {0}: Advance against Customer must be credit,行{0}:お客様に対する事前クレジットでなければなりません
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,領収書アイテム供給済
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,支払
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,支払
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,終了日時
 DocType: SMS Settings,SMS Gateway URL,SMSゲートウェイURL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMSの配信状態を維持管理するためのログ
@@ -2235,7 +2256,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,再注文レベル
 DocType: Attendance,Attendance Date,出勤日
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,給与の支給と控除
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,子ノードを持つ勘定は、元帳に変換することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,子ノードを持つ勘定は、元帳に変換することはできません
 DocType: Address,Preferred Shipping Address,優先出荷住所
 DocType: Purchase Receipt Item,Accepted Warehouse,承認済み倉庫
 DocType: Bank Reconciliation Detail,Posting Date,転記日付
@@ -2253,7 +2274,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,シリアル番号 {0}は存在しません
 DocType: Pricing Rule,Discount Percentage,割引率
 DocType: Payment Reconciliation Invoice,Invoice Number,請求番号
-apps/erpnext/erpnext/hooks.py +54,Orders,注文
+apps/erpnext/erpnext/hooks.py +55,Orders,注文
 DocType: Leave Control Panel,Employee Type,従業員タイプ
 DocType: Employee Leave Approver,Leave Approver,休暇承認者
 DocType: Manufacturing Settings,Material Transferred for Manufacture,製造用移送資材
@@ -2265,7 +2286,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,%の資材が請求済(この受注を対象)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,決算エントリー
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,既存の取引があるコストセンターは、グループに変換することはできません
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,減価償却
+DocType: Account,Depreciation,減価償却
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),サプライヤー
 DocType: Customer,Credit Limit,与信限度
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,取引タイプを選択
@@ -2290,11 +2311,12 @@
 DocType: Material Request,Requested For,要求対象
 DocType: Quotation Item,Against Doctype,対文書タイプ
 DocType: Delivery Note,Track this Delivery Note against any Project,任意のプロジェクトに対してこの納品書を追跡します
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,rootアカウントを削除することはできません
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,投資からの純キャッシュ・フロー
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,rootアカウントを削除することはできません
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,在庫エントリー表示
 ,Is Primary Address,プライマリアドレス
 DocType: Production Order,Work-in-Progress Warehouse,作業中の倉庫
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},参照#{0} 日付{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},参照#{0} 日付{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,住所管理
 DocType: Pricing Rule,Item Code,アイテムコード
 DocType: Production Planning Tool,Create Production Orders,製造指示を作成
@@ -2302,7 +2324,7 @@
 DocType: Journal Entry,User Remark,ユーザー備考
 DocType: Lead,Market Segment,市場区分
 DocType: Employee Internal Work History,Employee Internal Work History,従業員の入社後の職歴
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),(借方)を閉じる
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),(借方)を閉じる
 DocType: Contact,Passive,消極的
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,シリアル番号{0}は在庫切れです
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,販売取引用の税のテンプレート
@@ -2318,7 +2340,7 @@
 ,Billed Amount,請求金額
 DocType: Bank Reconciliation,Bank Reconciliation,銀行勘定調整
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,アップデートを入手
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,資材要求{0}はキャンセルまたは停止されています
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,資材要求{0}はキャンセルまたは停止されています
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,いくつかのサンプルレコードを追加
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,休暇管理
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,勘定によるグループ
@@ -2327,14 +2349,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",損益における負債の勘定科目が記帳されます
 DocType: Payment Tool,Against Vouchers,対伝票
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,クイックヘルプ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},出庫元/入庫先を同じ行{0}に入れることはできません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},出庫元/入庫先を同じ行{0}に入れることはできません
 DocType: Features Setup,Sales Extras,試供
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},コストセンター{2}に対するアカウント{1}の予算{0}が {3}により超えてしまいます
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',「終了日」は「開始日」の後にしてください。
 ,Stock Projected Qty,予測在庫数
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
 DocType: Sales Order,Customer's Purchase Order,顧客の購入注文
 DocType: Warranty Claim,From Company,会社から
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,値または数量
@@ -2344,9 +2366,9 @@
 DocType: Leave Block List,Leave Block List Allowed,許可済休暇リスト
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,ログインに使用します
 DocType: Sales Partner,Retailer,小売業者
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,貸方アカウントは貸借対照表アカウントである必要があります
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,貸方アカウントは貸借対照表アカウントである必要があります
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,全てのサプライヤータイプ
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,アイテムは自動的に採番されていないため、アイテムコードが必須です
+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 +93,Quotation {0} not of type {1},見積{0}はタイプ{1}ではありません
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,メンテナンス予定アイテム
 DocType: Sales Order,%  Delivered,%納品済
@@ -2390,7 +2412,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),梱包の総重量は通常、正味重量+梱包材重量です (印刷用)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,この役割を持つユーザーは、口座の凍結と、凍結口座に対しての会計エントリーの作成/修正が許可されています
 DocType: Serial No,Is Cancelled,キャンセル済
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,自分の出荷
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,自分の出荷
 DocType: Journal Entry,Bill Date,ビル日
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",最高優先度を持つ複数の価格設定ルールがあった場合でも、次の内部優先順位が適用されます
 DocType: Supplier,Supplier Details,サプライヤー詳細
@@ -2411,10 +2433,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,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 +198,Purchase Order {0} is not submitted,発注{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,発注{0}は提出されていません
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,予想
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},倉庫 {1} に存在しないシリアル番号 {0}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注:アイテム{0}の数量が0であるため、システムは超過納品や超過注文をチェックしません。
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,日付を開く
 DocType: Journal Entry,Remark,備考
@@ -2427,9 +2449,9 @@
 DocType: Time Log,Batched for Billing,請求の一括処理
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,サプライヤーからの請求
 DocType: POS Profile,Write Off Account,償却勘定
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,割引額
 DocType: Purchase Invoice,Return Against Purchase Invoice,仕入請求書に対する返品
 DocType: Item,Warranty Period (in days),保証期間(日数)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,事業からの純キャッシュ・フロー
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,例「付加価値税(VAT)」
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,アイテム4
 DocType: Journal Entry Account,Journal Entry Account,仕訳勘定
@@ -2470,7 +2492,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,退職日は入社日より後でなければなりません
 DocType: Sales Invoice,Against Income Account,対損益勘定
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}%配送済
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,輸送情報
@@ -2498,10 +2520,10 @@
 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 +14,This is a root sales person and cannot be edited.,ルート(大元の)営業担当者なので編集できません
 ,Stock Ledger,在庫元帳
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},レート:{0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},レート:{0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,給与控除明細
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,はじめにグループノードを選択してください
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},目的は、{0}のいずれかである必要があります
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},目的は、{0}のいずれかである必要があります
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,フォームに入力して保存します
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,最新の在庫状況とのすべての原材料を含むレポートをダウンロード
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,コミュニティフォーラム
@@ -2539,7 +2561,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,会社(顧客・サプライヤーではない)のマスター
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',「納品予定日」を入力してください
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、納品書{0}をキャンセルしなければなりません
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,支払額+償却額は総計を超えることはできません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},注:休暇タイプ{0}のための休暇残高が足りません
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",注意:支払が任意の参照に対して行われていない場合は、手動で仕訳を作成します
@@ -2556,12 +2578,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}'は無効になっています
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,オープンに設定
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,取引を処理した時に連絡先に自動メールを送信
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}",行{0}:{2} {3} の倉庫 {1} で可能な数量ではありません(可能な数量 {4}/移転数量 {5})
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,アイテム3
 DocType: Purchase Order,Customer Contact Email,お客様の連絡先メールアドレス
 DocType: Sales Team,Contribution (%),寄与度(%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注:「現金または銀行口座」が指定されていないため、支払エントリが作成されません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注:「現金または銀行口座」が指定されていないため、支払エントリが作成されません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,責任
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,テンプレート
 DocType: Sales Person,Sales Person Name,営業担当者名
@@ -2572,20 +2594,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,照合前
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,アイテムごとの税の行{0}では、勘定タイプ「税」「収入」「経費」「支払」のいずれかが必要です
 DocType: Sales Order,Partly Billed,一部支払済
 DocType: Item,Default BOM,デフォルト部品表
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,確認のため会社名を再入力してください
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,残高合計
 DocType: Time Log Batch,Total Hours,時間合計
 DocType: Journal Entry,Printing Settings,印刷設定
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},借方合計は貸方合計に等しくなければなりません。{0}の差があります。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},借方合計は貸方合計に等しくなければなりません。{0}の差があります。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,自動車
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,納品書から
 DocType: Time Log,From Time,開始時間
 DocType: Notification Control,Custom Message,カスタムメッセージ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投資銀行
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,現金または銀行口座は、支払いのエントリを作成するための必須です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,現金または銀行口座は、支払いのエントリを作成するための必須です
 DocType: Purchase Invoice,Price List Exchange Rate,価格表為替レート
 DocType: Purchase Invoice Item,Rate,単価/率
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,インターン
@@ -2604,9 +2626,10 @@
 価格ルール:{0}"
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空会社
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,資材課題
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,資材課題
 DocType: Material Request Item,For Warehouse,倉庫用
 DocType: Employee,Offer Date,雇用契約日
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,名言集
 DocType: Hub Settings,Access Token,アクセストークン
 DocType: Sales Invoice Item,Serial No,シリアル番号
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,メンテナンス詳細を入力してください
@@ -2620,10 +2643,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,休日数が月営業日数を上回っています
 DocType: Product Bundle Item,Product Bundle Item,製品付属品アイテム
 DocType: Sales Partner,Sales Partner Name,販売パートナー名
+DocType: Payment Reconciliation,Maximum Invoice Amount,最大請求額
 DocType: Purchase Invoice Item,Image View,画像を見る
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,評価と総合
@@ -2631,6 +2656,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,この商品は、{0}(テンプレート)のバリエーションです。「コピーしない」が設定されていない限り、属性は、テンプレートからコピーされます
 DocType: Account,Purchase User,仕入ユーザー
 DocType: Notification Control,Customize the Notification,通知をカスタマイズ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,営業活動によるキャッシュフロー
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,デフォルトのアドレステンプレートを削除することはできません
 DocType: Sales Invoice,Shipping Rule,出荷ルール
 DocType: Journal Entry,Print Heading,印刷見出し
@@ -2641,7 +2667,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,原材料
 DocType: Leave Application,Follow via Email,メール経由でフォロー
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,割引後の税額
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,このアカウントには子アカウントが存在しています。このアカウントを削除することはできません。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,最初の転記日付を選択してください
@@ -2659,6 +2685,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},アイテム{0}には複数のシリアル番号が必要です
 DocType: Journal Entry,Bank Entry,銀行取引記帳
 DocType: Authorization Rule,Applicable To (Designation),(肩書)に適用
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,カートに追加
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,グループ化
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,通貨の有効/無効を切り替え
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,郵便経費
@@ -2666,29 +2693,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,エンターテインメント&レジャー
 DocType: Purchase Order,The date on which recurring order will be stop,繰り返し注文停止予定日
 DocType: Quality Inspection,Item Serial No,アイテムシリアル番号
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0}は {1}より減少させなければならないか、オーバーフロー許容値を増やす必要があります
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0}は {1}より減少させなければならないか、オーバーフロー許容値を増やす必要があります
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,総現在価値
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,時
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",シリアル番号が付与されたアイテム{0}は「在庫棚卸」を使用して更新することはできません
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,サプライヤーに資材を配送
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,サプライヤーに資材を配送
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,見積を登録
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,あなたがブロック日付の葉を承認する権限がありません
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,これら全アイテムはすでに請求済みです
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,これら全アイテムはすでに請求済みです
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0}によって承認することができます
 DocType: Shipping Rule,Shipping Rule Conditions,出荷ルール条件
 DocType: BOM Replace Tool,The new BOM after replacement,交換後の新しい部品表
 DocType: Features Setup,Point of Sale,POS
 DocType: Account,Tax,税
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},行{0}:{1}は有効な{2}ではありません
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,製品バンドルから
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,製品バンドルから
 DocType: Production Planning Tool,Production Planning Tool,製造計画ツール
 DocType: Quality Inspection,Report Date,レポート日
 DocType: C-Form,Invoices,請求
 DocType: Job Opening,Job Title,職業名
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0}受信者
 DocType: Features Setup,Item Groups in Details,アイテムグループ詳細
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,製造数量は0より大きくなければなりません
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),POSを開始
@@ -2696,8 +2722,9 @@
 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: Pricing Rule,Customer Group,顧客グループ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},アイテム{0}には経費科目が必須です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},アイテム{0}には経費科目が必須です
 DocType: Item,Website Description,ウェブサイトの説明
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,資本の純変動
 DocType: Serial No,AMC Expiry Date,年間保守契約の有効期限日
 ,Sales Register,販売登録
 DocType: Quotation,Quotation Lost Reason,失注理由
@@ -2705,12 +2732,12 @@
 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 +108,Summary for this month and pending activities,今月と保留中の活動の概要
 DocType: Customer Group,Customer Group Name,顧客グループ名
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,属性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,項目を取得
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,償却勘定を入力してください
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,項目を取得
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,償却勘定を入力してください
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,最終注文日
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,消費税請求書を作成
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},アカウント{0} は会社 {1} に所属していません
@@ -2726,7 +2753,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,プロジェクトごとのデータは、引用符は使用できません
 DocType: Project,Expected End Date,終了予定日
 DocType: Appraisal Template,Appraisal Template Title,査定テンプレートタイトル
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,営利企業
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,営利企業
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,親項目 {0} は在庫アイテムにはできません
 DocType: Cost Center,Distribution Id,配布ID
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,素晴らしいサービス
@@ -2739,7 +2766,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},属性 {0} の値は、{3}の単位で {1} から {2}の範囲内でなければなりません
 DocType: Tax Rule,Sales,販売
 DocType: Stock Entry Detail,Basic Amount,基本額
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
 DocType: Leave Allocation,Unused leaves,未使用の葉
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,貸方
 DocType: Customer,Default Receivable Accounts,デフォルト売掛金勘定
@@ -2751,16 +2778,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,仕入領収書
-DocType: Payment Reconciliation,Maximum Amount,最大額
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,どのように価格設定ルールが適用されている?
 DocType: Quality Inspection,Delivery Note No,納品書はありません
 DocType: Company,Retail,小売
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,顧客{0}は存在しません
 DocType: Attendance,Absent,欠勤
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,製品付属品
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}:無効参照{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,製品付属品
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},行{0}:無効参照{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購入租税公課テンプレート
 DocType: Upload Attendance,Download Template,テンプレートのダウンロード
 DocType: GL Entry,Remarks,備考
@@ -2787,7 +2814,7 @@
 ,Monthly Attendance Sheet,月次勤務表
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,レコードが見つかりません
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}:項目{2}には「コストセンター」が必須です
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,製品バンドルからアイテムを取得します。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,製品バンドルからアイテムを取得します。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,アカウント{0}はアクティブではありません
 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,出勤開始日と出勤日は必須です
@@ -2796,8 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,開いているエントリでは「損益」タイプアカウント{0}は許可されていません
 DocType: Features Setup,Sales Discounts,販売割引
 DocType: Hub Settings,Seller Country,販売者所在国
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,ウェブサイト上のアイテムを公開
 DocType: Authorization Rule,Authorization Rule,認証ルール
 DocType: Sales Invoice,Terms and Conditions Details,規約の詳細
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,仕様
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,販売租税公課テンプレート
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,服飾
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,注文数
@@ -2819,7 +2848,7 @@
 DocType: Time Log,Billing Amount,請求額
 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 +18,Applications for leave.,休暇申請
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,既存の取引を持つアカウントを削除することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,既存の取引を持つアカウントを削除することはできません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,訴訟費用
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",自動注文を生成する日付(例:05、28など)
 DocType: Sales Invoice,Posting Time,投稿時間
@@ -2835,11 +2864,11 @@
 DocType: Maintenance Visit,Breakdown,故障
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,アカウント:{0} で通貨:{1}を選択することはできません
 DocType: Bank Reconciliation Detail,Cheque Date,小切手日
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},アカウント{0}:親アカウント{1}は会社{2}に属していません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},アカウント{0}:親アカウント{1}は会社{2}に属していません
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,この会社に関連するすべての取引を正常に削除しました!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,基準日
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,試用
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,在庫アイテムにはデフォルト倉庫が必須です。
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,在庫アイテムにはデフォルト倉庫が必須です。
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},{1}年{0}月の給与支払
 DocType: Stock Settings,Auto insert Price List rate if missing,空の場合価格表の単価を自動挿入
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,支出額合計
@@ -2851,6 +2880,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),総請求金額(時間ログ経由)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,このアイテムを売る
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,サプライヤーID
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,量は、0より大きくなければなりません
 DocType: Journal Entry,Cash Entry,現金エントリー
 DocType: Sales Partner,Contact Desc,連絡先説明
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.",休暇の種類(欠勤・病欠など)
@@ -2859,7 +2889,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,アカウントの年間予算を設定するために行を追加
 DocType: Buying Settings,Default Supplier Type,デフォルトサプライヤータイプ
 DocType: Production Order,Total Operating Cost,営業費合計
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,注:アイテム{0}が複数回入力されています
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,注:アイテム{0}が複数回入力されています
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,全ての連絡先。
 DocType: Newsletter,Test Email Id,テスト用メールアドレス
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,会社略称
@@ -2884,7 +2914,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,全ての顧客グループ
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,税テンプレートは必須です
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,アカウント{0}:親アカウント{1}が存在しません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,アカウント{0}:親アカウント{1}が存在しません
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),価格表単価(会社通貨)
 DocType: Account,Temporary,仮勘定
 DocType: Address,Preferred Billing Address,優先請求先住所
@@ -2902,8 +2932,8 @@
 ,Item-wise Price List Rate,アイテムごとの価格表単価
 DocType: Purchase Order Item,Supplier Quotation,サプライヤー見積
 DocType: Quotation,In Words will be visible once you save the Quotation.,見積を保存すると表示される表記内。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}は停止しています
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1}は停止しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
 DocType: Lead,Add to calendar on this date,この日付でカレンダーに追加
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,送料を追加するためのルール
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,今後のイベント
@@ -2923,24 +2953,24 @@
 DocType: Customer,From Lead,リードから
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,製造の指示
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,年度選択...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
 DocType: Hub Settings,Name Token,名前トークン
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,標準販売
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,倉庫は少なくとも1つ必須です
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Selling,標準販売
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,倉庫は少なくとも1つ必須です
 DocType: Serial No,Out of Warranty,保証外
 DocType: BOM Replace Tool,Replace,置き換え
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},納品書{1}に対する{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,デフォルトの単位を入力してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},納品書{1}に対する{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,デフォルトの単位を入力してください
 DocType: Purchase Invoice Item,Project Name,プロジェクト名
 DocType: Supplier,Mention if non-standard receivable account,非標準の売掛金の場合に記載
 DocType: Journal Entry Account,If Income or Expense,収益または費用の場合
 DocType: Features Setup,Item Batch Nos,アイテムバッチ番号
 DocType: Stock Ledger Entry,Stock Value Difference,在庫価値の差違
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,人材
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,人材
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,支払照合 支払
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,税金資産
 DocType: BOM Item,BOM No,部品表番号
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,仕訳{0}は、勘定{1}が無いか、既に他の伝票に照合されています
 DocType: Item,Moving Average,移動平均
 DocType: BOM Replace Tool,The BOM which will be replaced,交換される部品表
 DocType: Account,Debit,借方
@@ -2978,7 +3008,7 @@
 DocType: Stock Entry Detail,Additional Cost,追加費用
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,会計年度終了日
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",伝票でグループ化されている場合、伝票番号でフィルタリングすることはできません。
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,サプライヤ見積を作成
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,サプライヤ見積を作成
 DocType: Quality Inspection,Incoming,収入
 DocType: BOM,Materials Required (Exploded),資材が必要です(展開)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),無給休暇(LWP)の所得減
@@ -2986,7 +3016,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},行#{0}:シリアル番号 {1} が {2} {3}と一致しません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,臨時休暇
 DocType: Batch,Batch ID,バッチID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},注:{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},注:{0}
 ,Delivery Note Trends,納品書の動向
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,今週のまとめ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},行{1}の{0}は仕入または下請アイテムでなければなりません
@@ -3001,6 +3031,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均購入レート
 DocType: Task,Actual Time (in Hours),実際の時間(時)
 DocType: Employee,History In Company,会社での履歴
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,ニュースレター
 DocType: Address,Shipping,出荷
 DocType: Stock Ledger Entry,Stock Ledger Entry,在庫元帳エントリー
@@ -3020,7 +3051,6 @@
 DocType: Purchase Order,End date of current order's period,現在の注文の期間の終了日
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,雇用契約書を作成
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,返品
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,バリエーションのデフォルトの数量単位はテンプレートと同じでなければなりません
 DocType: Production Order Operation,Production Order Operation,製造指示作業
 DocType: Pricing Rule,Disable,無効にする
 DocType: Project Task,Pending Review,レビュー待ち
@@ -3028,7 +3058,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,顧客ID
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,終了時間は開始時間より大きくなければなりません
 DocType: Journal Entry Account,Exchange Rate,為替レート
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,受注{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,受注{0}は提出されていません
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}:親口座{1}は会社{2}に属していません
 DocType: BOM,Last Purchase Rate,最新の仕入料金
 DocType: Account,Asset,資産
@@ -3048,7 +3078,7 @@
 ,Available Stock for Packing Items,梱包可能な在庫
 DocType: Item Variant,Item Variant,アイテムバリエーション
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,他にデフォルトがないので、このアドレステンプレートをデフォルトとして設定します
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",口座残高がすでに借方に存在しており、「残高仕訳先」を「貸方」に設定することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,品質管理
 DocType: Production Planning Tool,Filter based on customer,顧客に基づくフィルター
 DocType: Payment Tool Detail,Against Voucher No,対伝票番号
@@ -3065,6 +3095,7 @@
 DocType: Opportunity,Next Contact,次の連絡先
 DocType: Employee,Employment Type,雇用の種類
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定資産
+,Cash Flow,現金流量
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,アプリケーション期間は2 alocationレコードを横断することはできません
 DocType: Item Group,Default Expense Account,デフォルト経費
 DocType: Employee,Notice (days),お知らせ(日)
@@ -3096,13 +3127,12 @@
 DocType: Production Order,Warehouses,倉庫
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,印刷と固定化
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,グループノード
-DocType: Payment Reconciliation,Minimum Amount,最低額
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,完成品更新
 DocType: Workstation,per hour,毎時
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,倉庫(継続記録)のアカウントは、このアカウントの下に作成されます。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,在庫元帳にエントリーが存在する倉庫を削除することはできません。
 DocType: Company,Distribution,配布
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,支払額
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,支払額
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,プロジェクトマネージャー
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,発送
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,アイテムの許可最大割引:{0}が{1}%
@@ -3126,7 +3156,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,サポート分析
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},倉庫{0}に「会社」がありません
 DocType: POS Profile,Terms and Conditions,規約
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},開始日は会計年度内でなければなりません(もしかして:{0})
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},開始日は会計年度内でなければなりません(もしかして:{0})
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",ここでは、身長、体重、アレルギー、医療問題などを保持することができます
 DocType: Leave Block List,Applies to Company,会社に適用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,登録済みの在庫エントリ{0}が存在するため、キャンセルすることができません
@@ -3140,11 +3170,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,領収書を入力してください
 DocType: Sales Invoice,Get Advances Received,前受金を取得
 DocType: Email Digest,Add/Remove Recipients,受信者の追加/削除
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},停止された製造指示{0}に対しては取引が許可されていません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),サポートメールを受信するサーバのメールIDをセットアップします。 (例 support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,不足数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
 DocType: Salary Slip,Salary Slip,給料明細
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.",納品する梱包の荷造伝票を生成します。パッケージ番号、内容と重量を通知するために使用します。
@@ -3233,7 +3263,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,従業員レコード
 DocType: HR Settings,Payroll Settings,給与計算の設定
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,リンクされていない請求書と支払を照合
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,注文する
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,注文する
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ルートには親コストセンターを指定できません
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ブランドを選択してください...
 DocType: Sales Invoice,C-Form Applicable,C-フォーム適用
@@ -3248,7 +3278,7 @@
 DocType: Appraisal,Start Date,開始日
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,期間に休暇を割り当てる。
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,クリックして認証
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,アカウント{0}:自身を親アカウントに割当することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,アカウント{0}:自身を親アカウントに割当することはできません
 DocType: Purchase Invoice Item,Price List Rate,価格表単価
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",この倉庫での利用可能な在庫に基づいて「在庫あり」または「在庫切れ」を表示します
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),部品表(BOM)
@@ -3257,17 +3287,17 @@
 DocType: Project,Expected Start Date,開始予定日
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,料金がそのアイテムに適用できない場合は、アイテムを削除する
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例「smsgateway.com/api/send_sms.cgi」
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,受信
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,受信
 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: Employee Leave Approver,Employee Leave Approver,従業員休暇承認者
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} はニュースレターのリストに正常に追加されました
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:この倉庫{1}には既に再注文エントリが存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:この倉庫{1}には既に再注文エントリが存在しています
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",見積が作成されているため、失注を宣言できません
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,仕入マスターマネージャー
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,製造指示{0}を提出しなければなりません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,製造指示{0}を提出しなければなりません
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},アイテム{0}の開始日と終了日を選択してください
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,メインレポート
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,終了日を開始日の前にすることはできません
@@ -3285,7 +3315,7 @@
 DocType: Industry Type,Industry Type,業種タイプ
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,問題発生!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,警告:休暇申請に次の期間が含まれています。
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,請求書{0}は提出済です
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,請求書{0}は提出済です
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完了日
 DocType: Purchase Invoice Item,Amount (Company Currency),額(会社通貨)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,組織単位(部門)マスター。
@@ -3304,10 +3334,10 @@
 ,Serial No Service Contract Expiry,シリアル番号(サービス契約の有効期限)
 DocType: Item,Unit of Measure Conversion,数量単位変換
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,従業員を変更することはできません
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,同じ口座を同時に借方と貸方にすることはできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,同じ口座を同時に借方と貸方にすることはできません
 DocType: Naming Series,Help HTML,HTMLヘルプ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},割り当てられた重みづけの合計は100%でなければなりません。{0}になっています。
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},{0}以上の引当金は、アイテム {1}と相殺されています
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},{0}以上の引当金は、アイテム {1}と相殺されています
 DocType: Address,Name of person or organization that this address belongs to.,このアドレスが所属する個人または組織の名前。
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,サプライヤー
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,受注が作成されているため、失注にできません
@@ -3320,35 +3350,35 @@
 DocType: Employee,Date of Issue,発行日
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: {1}のための{0}から
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},行#{0}:項目の設定サプライヤー{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,ウェブサイトのイメージ{0}アイテムに添付{1}が見つかりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,アカウントで他の通貨の使用を可能にするには「複数通貨」オプションをチェックしてください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,アカウントで他の通貨の使用を可能にするには「複数通貨」オプションをチェックしてください
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,アイテム:{0}はシステムに存在しません
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,凍結された値を設定する権限がありません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,凍結された値を設定する権限がありません
 DocType: Payment Reconciliation,Get Unreconciled Entries,未照合のエントリーを取得
+DocType: Payment Reconciliation,From Invoice Date,請求書の日付から
 DocType: Cost Center,Budgets,予算
-DocType: Employee,Emergency Contact Details,緊急連絡先の詳細
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,これは何?
 DocType: Delivery Note,To Warehouse,倉庫
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},アカウント{0}は会計年度の{1}を複数回入力されました
 ,Average Commission Rate,平均手数料率
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,出勤は将来の日付にマークを付けることができません
 DocType: Pricing Rule,Pricing Rule Help,価格設定ルールヘルプ
 DocType: Purchase Taxes and Charges,Account Head,勘定科目
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,アイテムの陸揚費用を計算するために、追加の費用を更新してください
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,電気
 DocType: Stock Entry,Total Value Difference (Out - In),価値差違合計(出 - 入)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,行{0}:為替レートは必須です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,行{0}:為替レートは必須です
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},従業員{0}のユーザーIDが未設定です。
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,保証請求元
 DocType: Stock Entry,Default Source Warehouse,デフォルトの出庫元倉庫
 DocType: Item,Customer Code,顧客コード
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},{0}のための誕生日リマインダー
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,最新注文からの日数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,在庫資産
@@ -3361,7 +3391,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,アカウント{0}を閉じると、型責任/エクイティのものでなければなりません
 DocType: Authorization Rule,Based On,参照元
 DocType: Sales Order Item,Ordered Qty,注文数
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,項目{0}が無効になっています
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,項目{0}が無効になっています
 DocType: Stock Settings,Stock Frozen Upto,在庫凍結
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},からと期間、繰り返しのために必須の日付までの期間{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,プロジェクト活動/タスク
@@ -3369,7 +3399,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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未満でなければなりません
 DocType: Purchase Invoice,Write Off Amount (Company Currency),償却額(会社通貨)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,行#{0}:再注文数量を設定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,行#{0}:再注文数量を設定してください
 DocType: Landed Cost Voucher,Landed Cost Voucher,陸揚費用伝票
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},{0}を設定してください
 DocType: Purchase Invoice,Repeat on Day of Month,毎月繰り返し
@@ -3400,12 +3430,12 @@
 DocType: Upload Attendance,Upload Attendance,出勤アップロード
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,部品表と生産数量が必要です
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,エイジングレンジ2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,額
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,額
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,部品表交換
 ,Sales Analytics,販売分析
 DocType: Manufacturing Settings,Manufacturing Settings,製造設定
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,メール設定
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,会社マスターにデフォルトの通貨を入力してください
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,会社マスターにデフォルトの通貨を入力してください
 DocType: Stock Entry Detail,Stock Entry Detail,在庫エントリー詳細
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,毎日のリマインダー
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},{0}と税ルールが衝突しています
@@ -3431,13 +3461,13 @@
 DocType: Sales Order Item,Produced Quantity,生産数量
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,エンジニア
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,組立部品を検索
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},行番号{0}にアイテムコードが必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},行番号{0}にアイテムコードが必要です
 DocType: Sales Partner,Partner Type,パートナーの種類
 DocType: Purchase Taxes and Charges,Actual,実際
 DocType: Authorization Rule,Customerwise Discount,顧客ごと割引
 DocType: Purchase Invoice,Against Expense Account,対経費
 DocType: Production Order,Production Order,製造指示
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,設置票{0}はすでに提出されています
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,設置票{0}はすでに提出されています
 DocType: Quotation Item,Against Docname,文書名に対して
 DocType: SMS Center,All Employee (Active),全ての従業員(アクティブ)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,表示
@@ -3449,15 +3479,15 @@
 DocType: Employee,Applicable Holiday List,適切な休日リスト
 DocType: Employee,Cheque,小切手
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,シリーズ更新
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,レポートタイプは必須です
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,レポートタイプは必須です
 DocType: Item,Serial Number Series,シリアル番号シリーズ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},列{1}の在庫アイテム{0}には倉庫が必須です。
 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/public/js/setup_wizard.js +101,The First User: You,最初のユーザー:あなたです。
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},会計年度開始・終了日は、すでに会計年度{0}に設定されています
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,照合完了
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},会計年度開始・終了日は、すでに会計年度{0}に設定されています
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,照合完了
 DocType: Production Order,Planned End Date,計画終了日
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,アイテムが保存される場所
 DocType: Tax Rule,Validity,正当性
@@ -3465,7 +3495,7 @@
 DocType: Attendance,Attendance,出勤
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,転記日時は必須です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,転記日時は必須です
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,購入取引用の税のテンプレート
 ,Item Prices,アイテム価格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,発注を保存すると表示される表記内。
@@ -3474,15 +3504,15 @@
 DocType: Task,Review Date,レビュー日
 DocType: Purchase Invoice,Advance Payments,前払金
 DocType: Purchase Taxes and Charges,On Net Total,差引計
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,{0}列のターゲット倉庫は製造注文と同じでなければなりません。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,{0}列のターゲット倉庫は製造注文と同じでなければなりません。
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,支払ツールを使用する権限がありません
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,%s の繰り返しに「通知メールアドレス」が指定されていません
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,他の通貨を使用してエントリーを作成した後には通貨を変更することができません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,他の通貨を使用してエントリーを作成した後には通貨を変更することができません
 DocType: Company,Round Off Account,丸め誤差アカウント
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,一般管理費
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,コンサルティング
 DocType: Customer Group,Parent Customer Group,親顧客グループ
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,変更
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,変更
 DocType: Purchase Invoice,Contact Email,連絡先 メール
 DocType: Appraisal Goal,Score Earned,スコア獲得
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",例「マイカンパニーLLC」
@@ -3492,13 +3522,13 @@
 DocType: Packing Slip,Gross Weight UOM,総重量数量単位
 DocType: Email Digest,Receivables / Payables,売掛/買掛
 DocType: Delivery Note Item,Against Sales Invoice,対納品書
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,信用取引
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,信用取引
 DocType: Landed Cost Item,Landed Cost Item,輸入費用項目
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,ゼロ値を表示
 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 +562,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
 DocType: Item,Default Warehouse,デフォルト倉庫
 DocType: Task,Actual End Date (via Time Logs),実際の終了日(時間ログ経由)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},グループアカウント{0}に対して予算を割り当てることができません
@@ -3534,29 +3564,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ワークステーションの労働時間外のタイムログを計画します。
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}は提出済です
 ,Items To Be Requested,要求されるアイテム
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,最新の購入料金を取得
 DocType: Time Log,Billing Rate based on Activity Type (per hour),行動タイプ(毎時)に基づく請求単価
 DocType: Company,Company Info,会社情報
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent",会社メールアドレスが見つかなかったため、送信されませんでした。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),資金運用(資産)
 DocType: Production Planning Tool,Filter based on item,項目に基づくフィルター
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,デビットアカウント
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,デビットアカウント
 DocType: Fiscal Year,Year Start Date,年始日
 DocType: Attendance,Employee Name,従業員名
 DocType: Sales Invoice,Rounded Total (Company Currency),合計(四捨五入)(会社通貨)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,会計タイプが選択されているため、グループに変換することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,会計タイプが選択されているため、グループに変換することはできません
 DocType: Purchase Common,Purchase Common,仕入(共通)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,機会から
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,従業員給付
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},梱包済数量は、行{1}のアイテム{0}の数量と等しくなければなりません
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},梱包済数量は、行{1}のアイテム{0}の数量と等しくなければなりません
 DocType: Production Order,Manufactured Qty,製造数量
 DocType: Purchase Receipt Item,Accepted Quantity,受入数
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}:{1}は存在しません
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,顧客あて請求
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,プロジェクトID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}:経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}:経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}登録者追加済
 DocType: Maintenance Schedule,Schedule,スケジュール
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",このコストセンターの予算を定義します。予算のアクションを設定するには、「会社リスト」を参照してください
@@ -3564,7 +3595,7 @@
 DocType: Quality Inspection Reading,Reading 3,報告要素3
 ,Hub,ハブ
 DocType: GL Entry,Voucher Type,伝票タイプ
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,価格表が見つからないか無効になっています
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,価格表が見つからないか無効になっています
 DocType: Expense Claim,Approved,承認済
 DocType: Pricing Rule,Price,価格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',{0}から取り除かれた従業員は「退職」に設定されなければなりません
@@ -3578,7 +3609,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,会計仕訳
 DocType: Delivery Note Item,Available Qty at From Warehouse,倉庫からの利用可能な数量
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,先に従業員レコードを選択してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}:当事者/アカウントが {3} {4} の {1} / {2}と一致しません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}:当事者/アカウントが {3} {4} の {1} / {2}と一致しません
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,税勘定を作成
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,経費勘定を入力してください
 DocType: Account,Stock,在庫
@@ -3589,7 +3620,7 @@
 DocType: Employee,Contract End Date,契約終了日
 DocType: Sales Order,Track this Sales Order against any Project,任意のプロジェクトに対して、この受注を追跡します
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,上記の基準に基づいて(配送するために保留中の)受注を取り込む
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,サプライヤー見積から
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,サプライヤー見積から
 DocType: Deduction Type,Deduction Type,控除の種類
 DocType: Attendance,Half Day,半日
 DocType: Pricing Rule,Min Qty,最小数量
@@ -3597,7 +3628,7 @@
 DocType: GL Entry,Transaction Date,取引日
 DocType: Production Plan Item,Planned Qty,計画数量
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,税合計
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,数量(製造数量)が必須です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,数量(製造数量)が必須です
 DocType: Stock Entry,Default Target Warehouse,デフォルト入庫先倉庫
 DocType: Purchase Invoice,Net Total (Company Currency),差引計(会社通貨)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}:当事者タイプと当事者は売掛金/買掛金勘定に対してのみ適用されます
@@ -3651,9 +3682,9 @@
 DocType: Customer,Commission Rate,手数料率
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,バリエーション作成
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,部門別休暇申請
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,カートは空です
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,カートは空です
 DocType: Production Order,Actual Operating Cost,実際の営業費用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,ルートを編集することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,ルートを編集することはできません
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,割当額を未調整額より多くすることはできません
 DocType: Manufacturing Settings,Allow Production on Holidays,休日に製造を許可
 DocType: Sales Order,Customer's Purchase Order Date,顧客の発注日
@@ -3664,11 +3695,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,デザイナー
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,規約のテンプレート
 DocType: Serial No,Delivery Details,納品詳細
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
 DocType: Item,Automatically create Material Request if quantity falls below this level,量がこのレベルを下回った場合、自動的に資材要求を作成します
 ,Item-wise Purchase Register,アイテムごとの仕入登録
 DocType: Batch,Expiry Date,有効期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item",再注文のレベルを設定するには、アイテムは、購買アイテムや製造項目でなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item",再注文のレベルを設定するには、アイテムは、購買アイテムや製造項目でなければなりません
 ,Supplier Addresses and Contacts,サプライヤー住所・連絡先
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,カテゴリを選択してください
 apps/erpnext/erpnext/config/projects.py +18,Project master.,プロジェクトマスター
@@ -3676,7 +3707,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(半日)
 DocType: Supplier,Credit Days,信用日数
 DocType: Leave Type,Is Carry Forward,繰越済
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,部品表からアイテムを取得
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,部品表
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}:当事者タイプと当事者が売掛金/買掛金勘定 {1} に必要です
@@ -3684,7 +3715,7 @@
 DocType: Employee,Reason for Leaving,退職理由
 DocType: Expense Claim Detail,Sanctioned Amount,承認予算額
 DocType: GL Entry,Is Opening,オープン
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},行{0}:借方エントリは{1}とリンクすることができません
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,アカウント{0}は存在しません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},行{0}:借方エントリは{1}とリンクすることができません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,アカウント{0}は存在しません
 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 98f3915..c2b260e 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -18,7 +18,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",បញ្ឈប់ការបញ្ជាទិញផលិតផលដែលមិនអាចត្រូវបានលុបចោលឮវាជាលើកដំបូងដើម្បីបោះបង់
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* នឹងត្រូវបានគណនាក្នុងប្រតិបត្តិការនេះ។
 DocType: Purchase Order,Customer Contact,ទំនាក់ទំនងអតិថិជន
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,ពីសម្ភារៈស្នើសុំ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,ពីសម្ភារៈស្នើសុំ
 DocType: Job Applicant,Job Applicant,ការងារដែលអ្នកដាក់ពាក្យសុំ
 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,ផ្នែកច្បាប់
@@ -44,7 +44,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. ដើម្បីរក្សាអតិថិជនលេខកូដធាតុដែលមានប្រាជ្ញានិងដើម្បីធ្វើឱ្យពួកគេអាចស្វែងរកដោយផ្អែកលើការប្រើប្រាស់កូដរបស់ពួកគេជម្រើសនេះ
 DocType: Mode of Payment Account,Mode of Payment Account,របៀបនៃការទូទាត់គណនី
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,បង្ហាញវ៉ារ្យ៉ង់
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,បរិមាណដែលត្រូវទទួលទាន
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,បរិមាណដែលត្រូវទទួលទាន
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ការផ្តល់ប្រាក់កម្ចី (បំណុល)
 DocType: Employee Education,Year of Passing,ឆ្នាំ Pass
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,នៅក្នុងផ្សារ
@@ -54,14 +54,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ការថែទាំសុខភាព
 DocType: Purchase Invoice,Monthly,ប្រចាំខែ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ពន្យាពេលក្នុងការទូទាត់ (ថ្ងៃ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,វិក័យប័ត្រ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,វិក័យប័ត្រ
 DocType: Maintenance Schedule Item,Periodicity,រយៈពេល
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,អាសយដ្ឋានអ៊ីម៉ែល
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ការពារជាតិ
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ពិន្ទុ (0-5)
 DocType: Delivery Note,Vehicle No,គ្មានយានយន្ត
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,សូមជ្រើសតារាងតម្លៃ
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,សូមជ្រើសតារាងតម្លៃ
 DocType: Production Order Operation,Work In Progress,ការងារក្នុងវឌ្ឍនភាព
 DocType: Employee,Holiday List,បញ្ជីថ្ងៃឈប់សម្រាក
 DocType: Time Log,Time Log,កំណត់ហេតុម៉ោង
@@ -88,7 +87,7 @@
 DocType: Quality Inspection Reading,Reading 1,ការអានទី 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ធ្វើឱ្យធាតុរបស់ធនាគារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,មូលនិធិសោធននិវត្តន៍
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,ឃ្លាំងគឺជាចាំបាច់បើសិនជាប្រភេទគណនីគឺឃ្លាំង
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,ឃ្លាំងគឺជាចាំបាច់បើសិនជាប្រភេទគណនីគឺឃ្លាំង
 DocType: SMS Center,All Sales Person,ការលក់របស់បុគ្គលទាំងអស់
 DocType: Lead,Person Name,ឈ្មោះបុគ្គល
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","ពិនិត្យមើលប្រសិនបើកើតឡើងលំដាប់, ដោះធីកដើម្បីបញ្ឈប់ការកើតឡើងឬដាក់កាលបរិច្ឆេទបញ្ចប់ឱ្យបានត្រឹមត្រូវ"
@@ -110,12 +109,12 @@
 DocType: Item,Copy From Item Group,ការចម្លងពីធាតុគ្រុប
 DocType: Journal Entry,Opening Entry,ការបើកចូល
 DocType: Stock Entry,Additional Costs,ការចំណាយបន្ថែមទៀត
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម។
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម។
 DocType: Lead,Product Enquiry,ផលិតផលសំណួរ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,សូមបញ្ចូលក្រុមហ៊ុនដំបូង
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,គោលដៅនៅលើ
+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 +9,Activity Log:,កំណត់ហេតុសកម្មភាព:
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,អចលនទ្រព្យ
@@ -184,12 +183,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,សាច់ប្រាក់សុទ្ធពីការផ្តល់ហិរញ្ញប្បទាន
 DocType: Lead,Address & Contact,អាសយដ្ឋានទំនាក់ទំនង
 DocType: Leave Allocation,Add unused leaves from previous allocations,បន្ថែមស្លឹកដែលមិនបានប្រើពីការបែងចែកពីមុន
 DocType: Newsletter List,Total Subscribers,អតិថិជនសរុប
 ,Contact Name,ឈ្មោះទំនាក់ទំនង
 DocType: Production Plan Item,SO Pending Qty,សូដែលមិនទាន់បាន Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,បង្កើតប័ណ្ណប្រាក់បៀវត្សចំពោះលក្ខណៈវិនិច្ឆ័យដែលបានរៀបរាប់ខាងលើ។
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,ការពិពណ៌នាដែលបានផ្ដល់ឱ្យមិនមាន
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ស្នើសុំសម្រាប់ការទិញ។
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,មានតែការយល់ព្រមចាកចេញជ្រើសអាចដាក់ពាក្យសុំចាកចេញនេះ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,បន្ថយកាលបរិច្ឆេទត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
@@ -230,6 +231,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,មានចុងក្រោយ
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,អតិបរមា 5 តួអក្សរ
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ការអនុម័តចាកចេញដំបូងក្នុងបញ្ជីនេះនឹងត្រូវបានកំណត់ជាលំនាំដើមចាកចេញការអនុម័ត
+apps/erpnext/erpnext/config/desktop.py +73,Learn,រៀន
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,តម្លៃសកម្មភាពដោយបុគ្គលិក
 DocType: Accounts Settings,Settings for Accounts,ការកំណត់សម្រាប់គណនី
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,គ្រប់គ្រងការលក់បុគ្គលដើមឈើ។
@@ -248,7 +250,7 @@
 DocType: Journal Entry,Multi Currency,រូបិយប័ណ្ណពហុ
 DocType: Payment Reconciliation Invoice,Invoice Type,ប្រភេទវិក័យប័ត្រ
 DocType: Sales Invoice Item,Delivery Note,ដឹកជញ្ជូនចំណាំ
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,ការរៀបចំពន្ធ
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,ការរៀបចំពន្ធ
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,ចូលការទូទាត់ត្រូវបានកែប្រែបន្ទាប់ពីអ្នកបានទាញវា។ សូមទាញវាម្តងទៀត។
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,សង្ខេបសម្រាប់សប្តាហ៍នេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
 DocType: Workstation,Rent Cost,ការចំណាយជួល
@@ -265,7 +267,7 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,អត្រាដែលរូបិយវត្ថុរបស់អតិថិជនត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់អតិថិជន
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","ដែលមាននៅក្នុង Bom, ដឹកជញ្ជូនចំណាំ, ការទិញវិក័យប័ត្រ, ការបញ្ជាទិញផលិតផល, ការទិញលំដាប់, ទទួលទិញ, លក់វិក័យប័ត្រ, ការលក់លំដាប់, ហ៊ុនធាតុ, Timesheet"
 DocType: Item Tax,Tax Rate,អត្រាអាករ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,ជ្រើសធាតុ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,ជ្រើសធាតុ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,បម្លែងទៅនឹងការមិនគ្រុប
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ទទួលទិញត្រូវតែត្រូវបានដាក់ជូន
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,បាច់ (ច្រើន) នៃវត្ថុមួយ។
@@ -300,6 +302,7 @@
 DocType: Purchase Receipt,Vehicle Date,កាលបរិច្ឆេទយានយន្ត
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ពេទ្យ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ហេតុផលសម្រាប់ការសម្រក
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,ឱកាសការងារ
 DocType: Employee,Single,នៅលីវ
 DocType: Issue,Attachment,ឯកសារភ្ជាប់
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,ថវិកាដែលមិនអាចត្រូវបានកំណត់សម្រាប់មជ្ឈមណ្ឌលថ្លៃដើមគ្រុប
@@ -333,7 +336,7 @@
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,ចៅហ្វាយថ្ងៃឈប់សម្រាក។
 DocType: Material Request Item,Required Date,កាលបរិច្ឆេទដែលបានទាមទារ
 DocType: Delivery Note,Billing Address,វិក័យប័ត្រអាសយដ្ឋាន
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,សូមបញ្ចូលលេខកូដធាតុ។
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,សូមបញ្ចូលលេខកូដធាតុ។
 DocType: BOM,Costing,ចំណាយថវិកាអស់
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",ប្រសិនបើបានធីកចំនួនប្រាក់ពន្ធដែលនឹងត្រូវបានចាត់ទុកជាបានរួមបញ្ចូលរួចហើយនៅក្នុងអត្រាការបោះពុម្ព / បោះពុម្ពចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,សរុប Qty
@@ -365,7 +368,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
 DocType: Shipping Rule,Net Weight,ទំងន់សុទ្ធ
 DocType: Employee,Emergency Phone,ទូរស័ព្ទសង្រ្គោះបន្ទាន់
 ,Serial No Warranty Expiry,គ្មានផុតកំណត់ការធានាសៀរៀល
@@ -383,11 +386,10 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,ចំនួនបន្ថែមមិនអាចត្រូវបាន 0
 DocType: Production Planning Tool,Material Requirement,សម្ភារៈតម្រូវ
 DocType: Company,Delete Company Transactions,លុបប្រតិបត្តិការក្រុមហ៊ុន
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,វិក័យប័ត្រសរុបនៅឆ្នាំនេះ:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,បន្ថែម / កែសម្រួលពន្ធនិងការចោទប្រកាន់
 DocType: Purchase Invoice,Supplier Invoice No,វិក័យប័ត្រគ្មានការផ្គត់ផ្គង់
 DocType: Territory,For reference,សម្រាប់ជាឯកសារយោង
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),បិទ (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),បិទ (Cr)
 DocType: Serial No,Warranty Period (Days),រយៈពេលធានា (ថ្ងៃ)
 DocType: Installation Note Item,Installation Note Item,ធាតុចំណាំការដំឡើង
 ,Pending Qty,ដំណើ Qty
@@ -401,7 +403,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",** ចែកចាយប្រចាំខែ ** អាចជួយអ្នកបានចែកចាយថវិការបស់អ្នកនៅទូទាំងខែប្រសិនបើអ្នកមានរដូវនៅក្នុងអាជីវកម្មរបស់អ្នក។ ដើម្បីចែកចាយថវិការដោយប្រើការចែកចាយការនេះកំណត់ការចែកចាយប្រចាំខែ ** ** នៅក្នុងមជ្ឈមណ្ឌលនេះបាន ** ** ចំនាយ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,បានរកឃើញនៅក្នុងតារាងវិក័យប័ត្រកំណត់ត្រាគ្មាន
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,បានរកឃើញនៅក្នុងតារាងវិក័យប័ត្រកំណត់ត្រាគ្មាន
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,សូមជ្រើសប្រភេទក្រុមហ៊ុននិងបក្សទីមួយ
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,ហិរញ្ញវត្ថុ / ស្មើឆ្នាំ។
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","សូមអភ័យទោស, សៀរៀល, Nos មិនអាចត្រូវបានបញ្ចូលគ្នា"
@@ -409,7 +411,7 @@
 DocType: Project Task,Project Task,គម្រោងការងារ
 ,Lead Id,ការនាំមុខលេខសម្គាល់
 DocType: C-Form Invoice Detail,Grand Total,សម្ពោធសរុប
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ឆ្នាំសារពើពន្ធកាលបរិច្ឆេទចាប់ផ្តើមមិនគួរត្រូវបានធំជាងថ្ងៃខែឆ្នាំបញ្ចប់សារពើពន្ធ
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ឆ្នាំសារពើពន្ធកាលបរិច្ឆេទចាប់ផ្តើមមិនគួរត្រូវបានធំជាងថ្ងៃខែឆ្នាំបញ្ចប់សារពើពន្ធ
 DocType: Warranty Claim,Resolution,ការដោះស្រាយ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,គណនីត្រូវបង់
 DocType: Sales Order,Billing and Delivery Status,វិក័យប័ត្រនិងការដឹកជញ្ជូនស្ថានភាព
@@ -448,10 +450,11 @@
 DocType: Activity Type,Default Costing Rate,អត្រាផ្សារលំនាំដើម
 DocType: Maintenance Schedule,Maintenance Schedule,កាលវិភាគថែទាំ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","បន្ទាប់មក Pricing ក្បួនត្រូវបានត្រងចេញដោយផ្អែកលើអតិថិជន, ក្រុមអតិថិជនដែនដី, ហាងទំនិញ, ប្រភេទហាងទំនិញ, យុទ្ធនាការ, ការលក់ដៃគូល"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,ការផ្លាស់ប្តូរសុទ្ធនៅសារពើភ័ណ្ឌ
 DocType: Employee,Passport Number,លេខលិខិតឆ្លងដែន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,កម្មវិធីគ្រប់គ្រង
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,ពីការទទួលទិញ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,ធាតុដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង។
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,ពីការទទួលទិញ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,ធាតុដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង។
 DocType: SMS Settings,Receiver Parameter,អ្នកទទួលប៉ារ៉ាម៉ែត្រ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;ដោយផ្អែកលើ &quot;និង&quot; ក្រុមតាម&#39; មិនអាចជាដូចគ្នា
 DocType: Sales Person,Sales Person Targets,ការលក់មនុស្សគោលដៅ
@@ -486,13 +489,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,ទីផ្សារ
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,ដើម្បីតាមដានធាតុនៅក្នុងការលក់និងទិញដោយផ្អែកលើឯកសារសម្គាល់របស់ពួកគេ NOS ។ នេះក៏អាចត្រូវបានគេប្រើដើម្បីតាមដានព័ត៌មានលម្អិតធានានៃផលិតផល។
 DocType: Purchase Receipt Item Supplied,Current Stock,ហ៊ុននាពេលបច្ចុប្បន្ន
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,ឃ្លាំងបានច្រានចោលការប្រឆាំងនឹងធាតុគឺចាំបាច់ regected
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,វិក័យប័ត្រសរុបនៅឆ្នាំនេះ
 DocType: Account,Expenses Included In Valuation,ការចំណាយដែលបានរួមបញ្ចូលនៅក្នុងការវាយតម្លៃ
 DocType: Employee,Provide email id registered in company,ផ្តល់ជូននូវលេខសម្គាល់នៅក្នុងក្រុមហ៊ុនអ៊ីម៉ែលដែលបានចុះឈ្មោះ
 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 +533,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
 DocType: Bin,Stock Value,ភាគហ៊ុនតម្លៃ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ប្រភេទដើមឈើ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,qty ប្រើប្រាស់ក្នុងមួយឯកតា
@@ -514,19 +517,19 @@
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,សូមជ្រើសយកថ្ងៃឈប់សម្រាកប្រចាំសប្តាហ៍
 DocType: Production Order Operation,Planned End Time,ពេលវេលាដែលបានគ្រោងបញ្ចប់
 ,Sales Person Target Variance Item Group-Wise,ការលក់បុគ្គលធាតុគោលដៅអថេរ Group និងក្រុមហ៊ុនដែលមានប្រាជ្ញា
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ
 DocType: Delivery Note,Customer's Purchase Order No,ការទិញរបស់អតិថិជនលំដាប់គ្មាន
 DocType: Employee,Cell Number,លេខទូរស័ព្ទ
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,សម្ភារៈដោយស្វ័យប្រវត្តិសំណើបង្កើត
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ការបាត់បង់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,អ្នកមិនអាចបញ្ចូលទឹកប្រាក់ក្នុងពេលបច្ចុប្បន្ននៅក្នុងការប្រឆាំងនឹងការធាតុទិនានុប្បវត្តិ &quot;ជួរឈរ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,អ្នកមិនអាចបញ្ចូលទឹកប្រាក់ក្នុងពេលបច្ចុប្បន្ននៅក្នុងការប្រឆាំងនឹងការធាតុទិនានុប្បវត្តិ &quot;ជួរឈរ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ថាមពល
 DocType: Opportunity,Opportunity From,ឱកាសការងារពី
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,សេចក្តីថ្លែងការប្រាក់បៀវត្សរ៍ប្រចាំខែ។
 DocType: Item Group,Website Specifications,ជាក់លាក់វេបសាយ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,គណនីថ្មី
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,ធាតុគណនេយ្យអាចត្រូវបានធ្វើប្រឆាំងនឹងការថ្នាំងស្លឹក។ ធាតុប្រឆាំងនឹងក្រុមដែលមិនត្រូវបានអនុញ្ញាត។
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,មិនអាចធ្វើឱ្យឬបោះបង់ Bom ជាវាត្រូវបានផ្សារភ្ជាប់ជាមួយនឹង BOMs ផ្សេងទៀត
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,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/crm.py +64,Sales campaigns.,យុទ្ធនាការលក់។
@@ -570,7 +573,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,ធាតុជាមួយនឹង weightage ខ្ពស់ជាងនេះនឹងត្រូវបានបង្ហាញដែលខ្ពស់ជាង
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ពត៌មានលំអិតធនាគារការផ្សះផ្សា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,វិកិយប័ត្ររបស់ខ្ញុំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,វិកិយប័ត្ររបស់ខ្ញុំ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,រកមិនឃើញបុគ្គលិក
 DocType: Purchase Order,Stopped,បញ្ឈប់
 DocType: Item,If subcontracted to a vendor,ប្រសិនបើមានអ្នកលក់មួយម៉ៅការបន្ត
@@ -580,6 +583,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ផ្ញើឥឡូវ
 ,Support Analytics,ការគាំទ្រវិភាគ
 DocType: Item,Website Warehouse,វេបសាយឃ្លាំង
+DocType: Payment Reconciliation,Minimum Invoice Amount,ចំនួនវិក័យប័ត្រអប្បបរមា
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ថ្ងៃនៃខែដែលវិក័យប័ត្រដោយស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតឧ 05, 28 ល"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ពិន្ទុត្រូវតែតិចជាងឬស្មើនឹង 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,កំណត់ត្រា C-សំណុំបែបបទ
@@ -599,7 +603,7 @@
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,ប្រាក់ចំណេញសុទ្ធ / បាត់បង់
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,តែងសារស្វ័យប្រវត្តិនៅលើការដាក់ប្រតិបត្តិការ។
 DocType: Production Order,Item To Manufacture,ធាតុដើម្បីផលិត
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,ដីកាបង្គាប់ឱ្យទូទាត់ការទិញ
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,ដីកាបង្គាប់ឱ្យទូទាត់ការទិញ
 DocType: Sales Order Item,Projected Qty,ការព្យាករ Qty
 DocType: Sales Invoice,Payment Due Date,ការទូទាត់កាលបរិច្ឆេទ
 DocType: Newsletter,Newsletter Manager,កម្មវិធីគ្រប់គ្រងព្រឹត្តិប័ត្រព័ត៌មាន
@@ -621,7 +625,7 @@
 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 +304,Point-of-Sale,ចំណុចនៃការលក់
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណទាន, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណពន្ធ"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណទាន, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណពន្ធ"
 DocType: Account,Balance must be,មានតុល្យភាពត្រូវតែមាន
 DocType: Hub Settings,Publish Pricing,តម្លៃបោះពុម្ពផ្សាយ
 DocType: Notification Control,Expense Claim Rejected Message,សារពាក្យបណ្តឹងលើការចំណាយបានច្រានចោល
@@ -684,13 +688,14 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,អថេរ
 ,Company Name,ឈ្មោះក្រុមហ៊ុន
 DocType: SMS Center,Total Message(s),សារសរុប (s បាន)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,ជ្រើសធាតុសម្រាប់ការផ្ទេរ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,ជ្រើសប្រធានគណនីរបស់ធនាគារនេះដែលជាកន្លែងដែលការត្រួតពិនិត្យត្រូវបានតម្កល់ទុក។
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,អនុញ្ញាតឱ្យអ្នកប្រើដើម្បីកែសម្រួលអត្រាតំលៃបញ្ជីនៅក្នុងប្រតិបត្តិការ
 DocType: Pricing Rule,Max Qty,អតិបរមា Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,គីមី
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,ធាតុទាំងអស់ត្រូវបានបញ្ជូនរួចហើយសម្រាប់ការបញ្ជាទិញផលិតផលនេះ។
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,ធាតុទាំងអស់ត្រូវបានបញ្ជូនរួចហើយសម្រាប់ការបញ្ជាទិញផលិតផលនេះ។
 DocType: Process Payroll,Select Payroll Year and Month,ជ្រើសបើកប្រាក់បៀវត្សឆ្នាំនិងខែ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",សូមចូលទៅកាន់ក្រុមដែលសមស្រប (ជាធម្មតាពាក្យស្នើសុំរបស់មូលនិធិ&gt; ទ្រព្យបច្ចុប្បន្ន&gt; គណនីធនាគារនិងបង្កើតគណនីថ្មីមួយ (ដោយចុចលើ Add កុមារ) នៃប្រភេទ &quot;ធនាគារ&quot;
 DocType: Workstation,Electricity Cost,តម្លៃអគ្គិសនី
@@ -704,10 +709,10 @@
 DocType: SMS Center,All Lead (Open),អ្នកដឹកនាំការទាំងអស់ (ការបើកចំហ)
 DocType: Purchase Invoice,Get Advances Paid,ទទួលបានការវិវត្តបង់ប្រាក់
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,ភ្ជាប់រូបភាពរបស់អ្នក
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,ធ្វើឱ្យ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,ធ្វើឱ្យ
 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 +3,My Cart,កន្ត្រកទំនិញរបស់ខ្ញុំ
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,កន្ត្រកទំនិញរបស់ខ្ញុំ
 DocType: Lead,Next Contact Date,ទំនាក់ទំនងបន្ទាប់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,បើក Qty
 DocType: Holiday List,Holiday List Name,បញ្ជីថ្ងៃឈប់សម្រាកឈ្មោះ
@@ -724,9 +729,9 @@
 DocType: POS Profile,Cash/Bank Account,សាច់ប្រាក់ / គណនីធនាគារ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,ធាតុបានយកចេញដោយការផ្លាស់ប្តូរក្នុងបរិមាណឬតម្លៃទេ។
 DocType: Delivery Note,Delivery To,ដឹកជញ្ជូនដើម្បី
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
 DocType: Production Planning Tool,Get Sales Orders,ទទួលបានការបញ្ជាទិញលក់
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,បញ្ចុះតំលៃ
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,បញ្ចុះតំលៃ
 DocType: Features Setup,Purchase Discounts,ការបញ្ចុះតម្លៃទិញ
 DocType: Workstation,Wages,ប្រាក់ឈ្នួល
 DocType: Time Log,Will be updated only if Time Log is 'Billable',នឹងត្រូវបានធ្វើឱ្យទាន់សម័យតែប៉ុណ្ណោះប្រសិនបើកំណត់ហេតុពេលវេលាគឺ &quot;Billable&quot;
@@ -749,7 +754,7 @@
 DocType: Tax Rule,Shipping State,រដ្ឋការដឹកជញ្ជូន
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ធាតុត្រូវបានបន្ថែមដោយប្រើ &quot;ចូរក្រោកធាតុពីការទិញបង្កាន់ដៃ &#39;ប៊ូតុង
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ចំណាយការលក់
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,ទិញស្ដង់ដារ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,ទិញស្ដង់ដារ
 DocType: GL Entry,Against,ប្រឆាំងនឹងការ
 DocType: Item,Default Selling Cost Center,ចំណាយលើការលក់លំនាំដើមរបស់មជ្ឈមណ្ឌល
 DocType: Sales Partner,Implementation Partner,ដៃគូអនុវត្ដន៍
@@ -786,6 +791,7 @@
 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/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',សូមកំណត់ &#39;អនុវត្តការបញ្ចុះតម្លៃបន្ថែមទៀតនៅលើ &quot;
 ,Ordered Items To Be Billed,ធាតុបញ្ជាឱ្យនឹងត្រូវបានផ្សព្វផ្សាយ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,ពីជួរមានដើម្បីឱ្យមានតិចជាងដើម្បីជួរ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,ជ្រើសកំណត់ហេតុនិងការដាក់ស្នើវេលាម៉ោងដើម្បីបង្កើតវិក័យប័ត្រលក់ថ្មី។
@@ -795,12 +801,11 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,នេះបាច់កំណត់ហេតុម៉ោងត្រូវបានផ្សព្វផ្សាយ។
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,បង្កើតឱកាសការងារ
 DocType: Salary Slip,Leave Without Pay,ទុកឱ្យដោយគ្មានការបង់
-DocType: Supplier,Communications,ទំនាក់ទំនង
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,កំហុសក្នុងការធ្វើផែនការការកសាងសមត្ថភាព
 ,Trial Balance for Party,អង្គជំនុំតុល្យភាពសម្រាប់ការគណបក្ស
 DocType: Lead,Consultant,អ្នកប្រឹក្សាយោបល់
 DocType: Salary Slip,Earnings,ការរកប្រាក់ចំណូល
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,បើកសមតុល្យគណនី
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,បើកសមតុល្យគណនី
 DocType: Sales Invoice Advance,Sales Invoice Advance,ការលក់វិក័យប័ត្រជាមុន
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,គ្មានអ្វីដែលត្រូវស្នើសុំ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;ជាក់ស្តែងកាលបរិច្ឆេទចាប់ផ្តើម&quot; មិនអាចជាធំជាងជាក់ស្តែងកាលបរិច្ឆេទបញ្ចប់ &quot;
@@ -838,7 +843,7 @@
 DocType: Global Defaults,Current Fiscal Year,ឆ្នាំសារពើពន្ធនាពេលបច្ចុប្បន្ន
 DocType: Global Defaults,Disable Rounded Total,បិទការសរុបមូល
 DocType: Lead,Call,ការហៅ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&quot;ធាតុ&quot; មិនអាចទទេ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&quot;ធាតុ&quot; មិនអាចទទេ
 ,Trial Balance,អង្គជំនុំតុល្យភាព
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ការរៀបចំបុគ្គលិក
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,ក្រឡាចត្រង្គ &quot;
@@ -849,9 +854,9 @@
 DocType: Contact,User ID,លេខសម្គាល់អ្នកប្រើ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,មើលសៀវភៅ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ដំបូងបំផុត
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុមួយពូលមានឈ្មោះដូចគ្នាសូមប្ដូរឈ្មោះធាតុឬប្ដូរឈ្មោះធាតុដែលជាក្រុម
 DocType: Production Order,Manufacture against Sales Order,ផលិតប្រឆាំងនឹងការលក់សណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,នៅសល់នៃពិភពលោក
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,Rest Of The World,នៅសល់នៃពិភពលោក
 ,Budget Variance Report,របាយការណ៍អថេរថវិការ
 DocType: Salary Slip,Gross Pay,បង់សរុបបាន
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,ភាគលាភបង់ប្រាក់
@@ -876,7 +881,7 @@
 DocType: Item,Lead Time in days,អ្នកដឹកនាំការពេលវេលានៅក្នុងថ្ងៃ
 ,Accounts Payable Summary,គណនីចងការប្រាក់សង្ខេប
 DocType: Journal Entry,Get Outstanding Invoices,ទទួលបានវិកិយប័ត្រឆ្នើម
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ខ្នាតតូច
 DocType: Employee,Employee Number,ចំនួនបុគ្គលិក
 ,Invoiced Amount (Exculsive Tax),ចំនួន invoiced (ពន្ធលើ Exculsive)
@@ -891,7 +896,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,កសិកម្ម
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,ផលិតផលឬសេវាកម្មរបស់អ្នក
 DocType: Mode of Payment,Mode of Payment,របៀបនៃការទូទាត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,នេះគឺជាក្រុមមួយដែលធាតុ root និងមិនអាចត្រូវបានកែសម្រួល។
 DocType: Journal Entry Account,Purchase Order,ការបញ្ជាទិញ
 DocType: Warehouse,Warehouse Contact Info,ឃ្លាំងពត៌មានទំនាក់ទំនង
@@ -907,7 +912,7 @@
 DocType: Appraisal Goal,Goal,គ្រាប់បាល់បញ្ចូលទី
 DocType: Sales Invoice Item,Edit Description,កែសម្រួលការបរិយាយ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,គេរំពឹងថាកាលបរិច្ឆេទដឹកជញ្ជូនគឺតិចជាងចាប់ផ្ដើមគំរោងកាលបរិច្ឆេទ។
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,សម្រាប់ផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,សម្រាប់ផ្គត់ផ្គង់
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ការកំណត់ប្រភេទគណនីជួយក្នុងការជ្រើសគណនីនេះក្នុងប្រតិបតិ្តការ។
 DocType: Purchase Invoice,Grand Total (Company Currency),សម្ពោធសរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ចេញសរុប
@@ -945,7 +950,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,អ្នកអាចធ្វើឱ្យពេលវេលាជាគ្រាន់តែជាកំណត់ហេតុប្រឆាំងទៅនឹងគោលបំណងផលិតកម្មដែលបានដាក់ជូន
 DocType: Maintenance Schedule Item,No of Visits,គ្មានការមើល
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",ការពិពណ៌នាទៅទំនាក់ទំនងនាំ។
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,ប្រតិបត្តិការមិនអាចត្រូវបានទុកឱ្យនៅទទេ។
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,ប្រតិបត្តិការមិនអាចត្រូវបានទុកឱ្យនៅទទេ។
 ,Delivered Items To Be Billed,ធាតុដែលបានផ្តល់ជូននឹងត្រូវបានផ្សព្វផ្សាយ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ឃ្លាំងមិនអាចត្រូវបានផ្លាស់ប្តូរសម្រាប់លេខស៊េរី
 DocType: Authorization Rule,Average Discount,ការបញ្ចុះតម្លៃជាមធ្យម
@@ -959,7 +964,7 @@
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,សូមជ្រើសរើសឆ្នាំសារពើពន្ធ
 DocType: BOM Operation,Operation Description,ប្រតិបត្ដិការពិពណ៌នាសង្ខេប
 DocType: Item,Will also apply to variants,ក៏នឹងអនុវត្តទៅវ៉ារ្យ៉ង់
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,មិនអាចផ្លាស់ប្តូរការចាប់ផ្តើមឆ្នាំសារពើពន្ធឆ្នាំសារពើពន្ធនិងកាលបរិច្ឆេទនៅពេលដែលកាលបរិច្ឆេទបញ្ចប់ឆ្នាំសារពើពន្ធត្រូវបានរក្សាទុក។
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,មិនអាចផ្លាស់ប្តូរការចាប់ផ្តើមឆ្នាំសារពើពន្ធឆ្នាំសារពើពន្ធនិងកាលបរិច្ឆេទនៅពេលដែលកាលបរិច្ឆេទបញ្ចប់ឆ្នាំសារពើពន្ធត្រូវបានរក្សាទុក។
 DocType: Quotation,Shopping Cart,កន្រ្តកទំនិញ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,ជាមធ្យមប្រចាំថ្ងៃចេញ
 DocType: Pricing Rule,Campaign,យុទ្ធនាការឃោសនា
@@ -970,7 +975,8 @@
 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 +211,Stock Entries already created for Production Order ,ធាតុភាគហ៊ុនដែលបានបង្កើតរួចផលិតកម្មលំដាប់
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ធាតុភាគហ៊ុនដែលបានបង្កើតរួចផលិតកម្មលំដាប់
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,ការផ្លាស់ប្តូរសុទ្ធនៅលើអចលនទ្រព្យ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ប្រសិនបើអ្នកទុកវាឱ្យទទេសម្រាប់ការរចនាទាំងអស់បានពិចារណាថា
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,ចាប់ពី Datetime
 DocType: Email Digest,For Company,សម្រាប់ក្រុមហ៊ុន
@@ -1022,7 +1028,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,អ្នកវិភាគ
 DocType: Item,Inventory,សារពើភ័ណ្ឌ
 DocType: Features Setup,"To enable ""Point of Sale"" view",ដើម្បីបើកការ«ចំណុចនៃការលក់«ទស្សនៈ
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,ការទូទាត់មិនអាចត្រូវបានធ្វើឡើងសម្រាប់រទេះទទេ
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,ការទូទាត់មិនអាចត្រូវបានធ្វើឡើងសម្រាប់រទេះទទេ
 DocType: Item,Sales Details,ពត៌មានលំអិតការលក់
 DocType: Opportunity,With Items,ជាមួយនឹងការធាតុ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,នៅក្នុង qty
@@ -1036,10 +1042,11 @@
 DocType: Cost Center,Parent Cost Center,មជ្ឈមណ្ឌលតម្លៃដែលមាតាឬបិតា
 DocType: Sales Invoice,Source,ប្រភព
 DocType: Leave Type,Is Leave Without Pay,ត្រូវទុកឱ្យដោយគ្មានការបង់
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,រកឃើញនៅក្នុងតារាងគ្មានប្រាក់បង់ការកត់ត្រា
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,រកឃើញនៅក្នុងតារាងគ្មានប្រាក់បង់ការកត់ត្រា
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,កាលបរិច្ឆេទចាប់ផ្តើមក្នុងឆ្នាំហិរញ្ញវត្ថុ
 DocType: Employee External Work History,Total Experience,បទពិសោធន៍សរុប
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់ (s) បានត្រូវបានលុបចោល
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់ (s) បានត្រូវបានលុបចោល
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,លំហូរសាច់ប្រាក់ចេញពីការវិនិយោគ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ការចោទប្រកាន់ការដឹកជញ្ជូននិងការបញ្ជូនបន្ត
 DocType: Material Request Item,Sales Order No,គ្មានការលក់សណ្តាប់ធ្នាប់
 DocType: Item Group,Item Group Name,ធាតុឈ្មោះក្រុម
@@ -1075,7 +1082,7 @@
 DocType: Production Plan Sales Order,Production Plan Sales Order,ផលិតកម្មផែនការលក់សណ្តាប់ធ្នាប់
 DocType: Sales Partner,Sales Partner Target,ដៃគូគោលដៅការលក់
 DocType: Pricing Rule,Pricing Rule,វិធានការកំណត់តម្លៃ
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,សម្ភារៈសំណើទិញសណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,សម្ភារៈសំណើទិញសណ្តាប់ធ្នាប់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,គណនីធនាគារ
 ,Bank Reconciliation Statement,សេចក្តីថ្លែងការរបស់ធនាគារការផ្សះផ្សា
 DocType: Address,Lead Name,ការនាំមុខឈ្មោះ
@@ -1083,7 +1090,7 @@
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,ការបើកផ្សារហ៊ុនតុល្យភាព
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,គ្មានធាតុខ្ចប់
 DocType: Shipping Rule Condition,From Value,ពីតម្លៃ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,បរិមាណដែលត្រូវទទួលទានគឺចាំបាច់កម្មន្តសាល
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,បរិមាណដែលត្រូវទទួលទានគឺចាំបាច់កម្មន្តសាល
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,មានចំនួនមិនបានឆ្លុះបញ្ចាំងនៅក្នុងធនាគារ
 DocType: Quality Inspection Reading,Reading 4,ការអានទី 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ពាក្យបណ្តឹងសម្រាប់ការចំណាយរបស់ក្រុមហ៊ុន។
@@ -1095,7 +1102,7 @@
 ,Material Requests for which Supplier Quotations are not created,សំណើសម្ភារៈដែលសម្រង់សម្តីផ្គត់ផ្គង់មិនត្រូវបានបង្កើត
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ថ្ងៃនេះ (s) បាននៅលើដែលអ្នកកំពុងដាក់ពាក្យសុំឈប់សម្រាកគឺជាថ្ងៃឈប់សម្រាក។ អ្នកត្រូវការត្រូវបានអនុវត្តសម្រាប់ការឈប់សម្រាក។
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,ដើម្បីតាមដានធាតុដែលបានប្រើប្រាស់លេខកូដ។ អ្នកនឹងអាចចូលទៅក្នុងធាតុនៅក្នុងការចំណាំដឹកជញ្ជូននិងការលក់វិក័យប័ត្រដោយការស្កេនលេខកូដនៃធាតុ។
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,សម្គាល់ថាបានដឹកនាំ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,សម្គាល់ថាបានដឹកនាំ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ចូរធ្វើសម្រង់
 DocType: Dependent Task,Dependent Task,ការងារពឹងផ្អែក
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ការធ្វើផែនការប្រតិបត្ដិការសម្រាប់ការព្យាយាមរបស់ X នៅមុនថ្ងៃ។
@@ -1103,15 +1110,16 @@
 DocType: SMS Center,Receiver List,បញ្ជីអ្នកទទួល
 DocType: Payment Tool Detail,Payment Amount,ចំនួនទឹកប្រាក់ការទូទាត់
 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 +89,Net Change in Cash,ការផ្លាស់ប្តូរសាច់ប្រាក់សុទ្ធ
 DocType: Salary Structure Deduction,Salary Structure Deduction,ការកាត់រចនាសម្ព័ន្ធប្រាក់បៀវត្ស
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,តម្លៃនៃធាតុដែលបានចេញផ្សាយ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),អាយុ (ថ្ងៃ)
 DocType: Quotation Item,Quotation Item,ធាតុសម្រង់
 DocType: Account,Account Name,ឈ្មោះគណនី
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,ពីកាលបរិច្ឆេទមិនអាចមានចំនួនច្រើនជាងកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,ពីកាលបរិច្ឆេទមិនអាចមានចំនួនច្រើនជាងកាលបរិច្ឆេទ
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,ប្រភេទផ្គត់ផ្គង់គ្រូ។
 DocType: Purchase Order Item,Supplier Part Number,ក្រុមហ៊ុនផ្គត់ផ្គង់ផ្នែកមួយចំនួន
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,អត្រានៃការប្រែចិត្តជឿមិនអាចជា 0 ឬ 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,អត្រានៃការប្រែចិត្តជឿមិនអាចជា 0 ឬ 1
 DocType: Accounts Settings,Credit Controller,ឧបករណ៍ត្រួតពិនិត្យឥណទាន
 DocType: Delivery Note,Vehicle Dispatch Date,កាលបរិច្ឆេទបញ្ជូនយានយន្ត
 DocType: Company,Default Payable Account,គណនីទូទាត់លំនាំដើម
@@ -1131,6 +1139,7 @@
 DocType: Budget Detail,Budget Allocated,ថវិកាដែលបានត្រៀមបម្រុងទុក
 DocType: Journal Entry,Entry Type,ប្រភេទធាតុ
 ,Customer Credit Balance,សមតុល្យឥណទានអតិថិជន
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,ការផ្លាស់ប្តូរសុទ្ធក្នុងគណនីទូទាត់
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,សូមផ្ទៀងផ្ទាត់លេខសម្គាល់អ៊ីមែលរបស់អ្នក
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',អតិថិជនដែលបានទាមទារសម្រាប់ &#39;បញ្ចុះតម្លៃ Customerwise &quot;
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,ធ្វើឱ្យទាន់សម័យកាលបរិច្ឆេទទូទាត់ប្រាក់ធនាគារដែលទិនានុប្បវត្តិ។
@@ -1173,6 +1182,7 @@
 DocType: Address,Postal,ប្រៃសណីយ
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,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 +2,New Contact,ទំនាក់ទំនងថ្មី
 DocType: Territory,Parent Territory,ដែនដីមាតាឬបិតា
 DocType: Quality Inspection Reading,Reading 2,ការអាន 2
 DocType: Stock Entry,Material Receipt,សម្ភារៈបង្កាន់ដៃ
@@ -1193,14 +1203,14 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ជួរឈរច្រើនពេក។ នាំចេញរបាយការណ៍និងបោះពុម្ពដោយប្រើកម្មវិធីសៀវភៅបញ្ជីមួយ។
 DocType: Sales 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 +152,Main,ដើមចម្បង
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,ដើមចម្បង
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,វ៉ារ្យ៉ង់
 DocType: Naming Series,Set prefix for numbering series on your transactions,កំណត់បុព្វបទសម្រាប់លេខស៊េរីលើប្រតិបតិ្តការរបស់អ្នក
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,គោលបំណងបញ្ឈប់ការដែលមិនអាចត្រូវបានលុបចោល។ ឮដើម្បីលុបចោល។
 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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
 DocType: SMS Center,Send To,បញ្ជូនទៅ
 DocType: Payment Reconciliation Payment,Allocated amount,ទឹកប្រាក់ដែលត្រៀមបម្រុងទុក
 DocType: Sales Team,Contribution to Net Total,ការចូលរួមចំណែកក្នុងការសុទ្ធសរុប
@@ -1221,7 +1231,7 @@
 DocType: Item,Apply Warehouse-wise Reorder Level,អនុវត្តឃ្លាំងប្រាជ្ញារៀបចំកំរិត
 DocType: Authorization Control,Authorization Control,ការត្រួតពិនិត្យសេចក្តីអនុញ្ញាត
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,កំណត់ហេតុពេលវេលាសម្រាប់ការងារ។
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,ការទូទាត់
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,ការទូទាត់
 DocType: Production Order Operation,Actual Time and Cost,ពេលវេលាពិតប្រាកដនិងការចំណាយ
 DocType: Employee,Salutation,ពាក្យសួរសុខទុក្ខ
 DocType: Pricing Rule,Brand,ម៉ាក
@@ -1235,7 +1245,6 @@
 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 +87,Associate,រង
 DocType: SMS Center,Create Receiver List,បង្កើតបញ្ជីអ្នកទទួល
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,ផុតកំណត់
 DocType: Packing Slip,To Package No.,ខ្ចប់លេខ
 DocType: Warranty Claim,Issue Date,បញ្ហាកាលបរិច្ឆេទ
 DocType: Activity Cost,Activity Cost,ការចំណាយសកម្មភាព
@@ -1278,14 +1287,14 @@
 DocType: Naming Series,Current Value,តម្លៃបច្ចុប្បន្ន
 DocType: Delivery Note Item,Against Sales Order,ប្រឆាំងនឹងដីកាលក់
 ,Serial No Status,ស្ថានភាពគ្មានសៀរៀល
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,តារាងធាតុមិនអាចទទេ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,តារាងធាតុមិនអាចទទេ
 DocType: Pricing Rule,Selling,លក់
 DocType: Employee,Salary Information,ពត៌មានប្រាក់បៀវត្ស
 DocType: Sales Person,Name and Employee ID,ឈ្មោះនិងលេខសម្គាល់របស់និយោជិត
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,ភារកិច្ចនិងពន្ធ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,សូមបញ្ចូលកាលបរិច្ឆេទយោង
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,សូមបញ្ចូលកាលបរិច្ឆេទយោង
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,តារាងសម្រាប់ធាតុដែលនឹងត្រូវបានបង្ហាញនៅក្នុងវ៉ិបសាយ
 DocType: Purchase Order Item Supplied,Supplied Qty,ការផ្គត់ផ្គង់ Qty
 DocType: Material Request Item,Material Request Item,ការស្នើសុំសម្ភារៈធាតុ
@@ -1312,7 +1321,7 @@
 DocType: Holiday List,Clear Table,ជម្រះការតារាង
 DocType: Features Setup,Brands,ផលិតផលម៉ាក
 DocType: C-Form Invoice Detail,Invoice No,គ្មានវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,បានមកពីការទិញសណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,បានមកពីការទិញសណ្តាប់ធ្នាប់
 DocType: Activity Cost,Costing Rate,អត្រាការប្រាក់មានតម្លៃ
 ,Customer Addresses And Contacts,អាសយដ្ឋានអតិថិជននិងទំនាក់ទំនង
 DocType: Employee,Resignation Letter Date,កាលបរិច្ឆេទលិខិតលាលែងពីតំណែង
@@ -1326,7 +1335,7 @@
 DocType: Employee,Personal Details,ពត៌មានលំអិតផ្ទាល់ខ្លួន
 ,Maintenance Schedules,កាលវិភាគថែរក្សា
 ,Quotation Trends,សម្រង់និន្នាការ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
 DocType: Shipping Rule Condition,Shipping Amount,ចំនួនទឹកប្រាក់ការដឹកជញ្ជូន
 ,Pending Amount,ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេច
 DocType: Purchase Invoice Item,Conversion Factor,ការប្រែចិត្តជឿកត្តា
@@ -1346,7 +1355,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ពាក្យបណ្តឹងលើការចំណាយគឺត្រូវរង់ចាំការអនុម័ត។ មានតែការអនុម័តលើការចំណាយនេះអាចធ្វើឱ្យស្ថានភាពទាន់សម័យ។
 DocType: Purchase Invoice,Additional Discount Amount,ចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃបន្ថែម
 DocType: Leave Block List Allow,Leave Block List Allow,បញ្ជីប្លុកអនុញ្ញាតឱ្យចាកចេញពី
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,កីឡា
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,សរុបជាក់ស្តែង
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,អង្គភាព
@@ -1357,6 +1366,7 @@
 DocType: POS Profile,Price List,តារាងតម្លៃ
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ប្តឹងទាមទារសំណងលើការចំណាយ
 DocType: Issue,Support,ការគាំទ្រ
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,មើលរទេះ
 ,BOM Search,ស្វែងរក Bom
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),បិទ (បើក + + សរុប)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,សូមបញ្ជាក់រូបិយប័ណ្ណនៅក្នុងក្រុមហ៊ុន
@@ -1370,7 +1380,7 @@
 DocType: Project,% Tasks Completed,% ភារកិច្ចបានបញ្ចប់
 DocType: Project,Gross Margin,ប្រាក់ចំណេញដុល
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,សូមបញ្ចូលធាតុដំបូងផលិតកម្ម
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,អ្នកប្រើដែលបានបិទ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,អ្នកប្រើដែលបានបិទ
 DocType: Opportunity,Quotation,សម្រង់
 DocType: Salary Slip,Total Deduction,ការកាត់សរុប
 DocType: Quotation,Maintenance User,អ្នកប្រើប្រាស់ថែទាំ
@@ -1390,7 +1400,7 @@
 DocType: Appraisal,Calculate Total Score,គណនាពិន្ទុសរុប
 DocType: Supplier Quotation,Manufacturing Manager,កម្មវិធីគ្រប់គ្រងកម្មន្តសាល
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,ចំណាំដឹកជញ្ជូនពុះចូលទៅក្នុងកញ្ចប់។
-apps/erpnext/erpnext/hooks.py +68,Shipments,ការនាំចេញ
+apps/erpnext/erpnext/hooks.py +69,Shipments,ការនាំចេញ
 DocType: Purchase Order Item,To be delivered to customer,ត្រូវបានបញ្ជូនទៅកាន់អតិថិជន
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ស្ថានភាពកំណត់ហេតុម៉ោងត្រូវជូន។
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,ជួរដេក #
@@ -1407,7 +1417,7 @@
 DocType: Leave Control Panel,Leave blank if considered for all departments,ប្រសិនបើអ្នកទុកវាឱ្យទទេទាំងអស់ពិចារណាសម្រាប់នាយកដ្ឋាន
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",ប្រភេទការងារ (អចិន្ត្រយ៍កិច្ចសន្យាហាត់ជាដើម) ។
 DocType: Currency Exchange,From Currency,ចាប់ពីរូបិយប័ណ្ណ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","សូមជ្រើសចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក, ប្រភេទវិក័យប័ត្រនិងលេខវិក្កយបត្រក្នុងមួយជួរដេកយ៉ាងហោចណាស់"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","សូមជ្រើសចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក, ប្រភេទវិក័យប័ត្រនិងលេខវិក្កយបត្រក្នុងមួយជួរដេកយ៉ាងហោចណាស់"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,មានចំនួនមិនបានឆ្លុះបញ្ចាំងនៅក្នុងប្រព័ន្ធ
 DocType: Purchase Invoice Item,Rate (Company Currency),អត្រាការប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,អ្នកផ្សេងទៀត
@@ -1431,7 +1441,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,សណ្តាប់ធ្នាប់ការលក់ទៅការទូទាត់
 DocType: Expense Claim Detail,Expense Claim Detail,ពត៌មានលំអិតពាក្យបណ្តឹងលើការចំណាយ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,កំណត់ហេតុបង្កើតឡើងវេលាម៉ោង:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,សូមជ្រើសរើសគណនីដែលត្រឹមត្រូវ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,សូមជ្រើសរើសគណនីដែលត្រឹមត្រូវ
 DocType: Item,Weight UOM,ទំងន់ UOM
 DocType: Employee,Blood Group,ក្រុមឈាម
 DocType: Purchase Invoice Item,Page Break,ការបំបែកទំព័រ
@@ -1462,15 +1472,16 @@
 DocType: Time Log,To Time,ទៅពេល
 DocType: Authorization Rule,Approving Role (above authorized value),ការអនុម័តតួនាទី (ខាងលើតម្លៃដែលបានអនុញ្ញាត)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",ដើម្បីបន្ថែមថ្នាំងកុមារស្វែងយល់ពីដើមឈើហើយចុចលើថ្នាំងក្រោមដែលអ្នកចង់បន្ថែមថ្នាំងបន្ថែមទៀត។
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,ឥណទានទៅគណនីត្រូវតែជាគណនីទូទាត់មួយ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,ឥណទានទៅគណនីត្រូវតែជាគណនីទូទាត់មួយ
 DocType: Production Order Operation,Completed Qty,Qty បានបញ្ចប់
 DocType: Manufacturing Settings,Allow Overtime,អនុញ្ញាតឱ្យបន្ថែមម៉ោង
 DocType: Stock Reconciliation Item,Current Valuation Rate,អត្រាវាយតម្លៃនាពេលបច្ចុប្បន្ន
 DocType: Item,Customer Item Codes,កូដធាតុអតិថិជន
 DocType: Opportunity,Lost Reason,បាត់បង់មូលហេតុ
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,បង្កើតការប្រឆាំងនឹងការបញ្ជាទិញប្រាក់បង់ធាតុវិកិយប័ត្រឬ។
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,អាសយដ្ឋានថ្មី
 DocType: Quality Inspection,Sample Size,ទំហំគំរូ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,ធាតុទាំងអស់ត្រូវបាន invoiced រួចទៅហើយ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,មជ្ឈមណ្ឌលការចំណាយបន្ថែមទៀតអាចត្រូវបានធ្វើឡើងនៅក្រោមការក្រុមនោះទេប៉ុន្តែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
 DocType: Project,External,ខាងក្រៅ
@@ -1522,13 +1533,14 @@
 DocType: Rename Tool,Rename Tool,ឧបករណ៍ប្តូរឈ្មោះ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,តម្លៃដែលធ្វើឱ្យទាន់សម័យ
 DocType: Item Reorder,Item Reorder,ធាតុរៀបចំ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","បញ្ជាក់ប្រតិបត្តិការ, ការចំណាយប្រតិបត្ដិការនិងផ្ដល់ឱ្យនូវប្រតិបត្ដិការតែមួយគត់នោះទេដើម្បីឱ្យប្រតិបត្តិការរបស់អ្នក។"
 DocType: Purchase Invoice,Price List Currency,បញ្ជីតម្លៃរូបិយប័ណ្ណ
 DocType: Naming Series,User must always select,អ្នកប្រើដែលត្រូវតែជ្រើសតែងតែ
 DocType: Stock Settings,Allow Negative Stock,អនុញ្ញាតឱ្យហ៊ុនអវិជ្ជមាន
 DocType: Installation Note,Installation Note,ចំណាំការដំឡើង
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,បន្ថែមពន្ធ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,លំហូរសាច់ប្រាក់ពីការផ្តល់ហិរញ្ញប្បទាន
 ,Financial Analytics,វិភាគហិរញ្ញវត្ថុ
 DocType: Quality Inspection,Verified By,បានផ្ទៀងផ្ទាត់ដោយ
 DocType: Address,Subsidiary,ក្រុមហ៊ុនបុត្រសម្ព័ន្ធ
@@ -1555,6 +1567,7 @@
 DocType: Selling Settings,Sales Order Required,ការលក់លំដាប់ដែលបានទាមទារ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,បង្កើតអតិថិជន
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,ពត៌មានកាលវិភាគថែទាំ
 DocType: Quality Inspection Reading,Reading 9,ការអាន 9
@@ -1566,17 +1579,18 @@
 DocType: Warranty Claim,Raised By,បានលើកឡើងដោយ
 DocType: Payment Tool,Payment Account,គណនីទូទាត់ប្រាក់
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,សូមបញ្ជាក់ក្រុមហ៊ុនដើម្បីបន្ត
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,ការផ្លាស់ប្តូរសុទ្ធក្នុងគណនីអ្នកទទួល
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ទូទាត់បិទ
 DocType: Quality Inspection Reading,Accepted,បានទទួលយក
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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: Payment Tool,Total Payment Amount,ចំនួនទឹកប្រាក់សរុប
 DocType: Shipping Rule,Shipping Rule Label,វិធានការដឹកជញ្ជូនស្លាក
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
 DocType: Newsletter,Test,ការធ្វើតេស្ត
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","ដូចដែលមានប្រតិបតិ្តការភាគហ៊ុនដែលមានស្រាប់សម្រាប់ធាតុនេះ \ អ្នកមិនអាចផ្លាស់ប្តូរតម្លៃនៃ &quot;គ្មានសៀរៀល &#39;,&#39; មានជំនាន់ទីគ្មាន &#39;,&#39; គឺជាធាតុហ៊ុន&quot; និង &quot;វិធីសាស្រ្តវាយតម្លៃ&quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,អ្នកមិនអាចផ្លាស់ប្តូរអត្រាការបានប្រសិនបើ Bom បានរៀបរាប់ agianst ធាតុណាមួយ
 DocType: Employee,Previous Work Experience,បទពិសោធន៍ការងារមុន
 DocType: Stock Entry,For Quantity,ចប់
@@ -1670,6 +1684,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ចំណាយឧបករណ៍ប្រើប្រាស់
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 ខាងលើ
 DocType: Buying Settings,Default Buying Price List,តារាងតម្លៃទិញលំនាំដើម &amp; ‧;
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.",កំណត់តម្លៃលំនាំដើមដូចជាការក្រុមហ៊ុនរូបិយប័ណ្ណបច្ចុប្បន្នឆ្នាំសារពើពន្ធល
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,ប្រភេទការទូទាត់
@@ -1719,7 +1734,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,អាសយដ្ឋានទាំងអស់។
 DocType: Company,Stock Settings,ការកំណត់តម្លៃភាគហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","រួមបញ្ចូលគ្នារវាងគឺអាចធ្វើបានតែប៉ុណ្ណោះប្រសិនបើមានលក្ខណៈសម្បត្តិដូចខាងក្រោមគឺដូចគ្នានៅក្នុងកំណត់ត្រាទាំងពីរ។ គឺជាក្រុម, ប្រភេទជា Root ក្រុមហ៊ុន"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","រួមបញ្ចូលគ្នារវាងគឺអាចធ្វើបានតែប៉ុណ្ណោះប្រសិនបើមានលក្ខណៈសម្បត្តិដូចខាងក្រោមគឺដូចគ្នានៅក្នុងកំណត់ត្រាទាំងពីរ។ គឺជាក្រុម, ប្រភេទជា Root ក្រុមហ៊ុន"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,គ្រប់គ្រងក្រុមផ្ទាល់ខ្លួនដើមឈើ។
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,មជ្ឈមណ្ឌលការចំណាយថ្មីរបស់ឈ្មោះ
 DocType: Leave Control Panel,Leave Control Panel,ទុកឱ្យផ្ទាំងបញ្ជា
@@ -1738,7 +1753,7 @@
 DocType: Payment Tool Detail,Payment Tool Detail,ពត៌មាននៃឧបករណ៍ទូទាត់ប្រាក់
 ,Sales Browser,កម្មវិធីរុករកការលក់
 DocType: Journal Entry,Total Credit,ឥណទានសរុប
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,ក្នុងតំបន់
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,ជំពាក់បំណុល
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,ដែលមានទំហំធំ
@@ -1755,7 +1770,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ទាំងអស់តិបត្តិការអាចនឹងត្រូវបានដាក់ស្លាកលក់បានច្រើនជនលក់ប្រឆាំងនឹង ** ** ដូច្នេះអ្នកអាចកំណត់និងត្រួតពិនិត្យគោលដៅ។
 ,S.O. No.,សូលេខ
 DocType: Production Order Operation,Make Time Log,ធ្វើឱ្យការកំណត់ហេតុម៉ោង
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,សូមកំណត់បរិមាណការរៀបចំ
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,សូមកំណត់បរិមាណការរៀបចំ
 DocType: Price List,Applicable for Countries,អនុវត្តសម្រាប់បណ្តាប្រទេស
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,កុំព្យូទ័រ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,នេះគឺជាក្រុមអតិថិជនជា root និងមិនអាចត្រូវបានកែសម្រួល។
@@ -1797,10 +1812,10 @@
 DocType: Maintenance Visit,Purposes,គោលបំនង
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,យ៉ាងហោចណាស់ធាតុមួយដែលគួរតែត្រូវបញ្ចូលដោយបរិមាណអវិជ្ជមាននៅក្នុងឯកសារវិលត្រឡប់មកវិញ
 ,Requested,បានស្នើរសុំ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,គ្មានសុន្ទរកថា
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,គ្មានសុន្ទរកថា
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,ហួសកាលកំណត់
 DocType: Account,Stock Received But Not Billed,ភាគហ៊ុនបានទទួលប៉ុន្តែមិនបានផ្សព្វផ្សាយ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,គណនី root ត្រូវតែជាក្រុមមួយ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,គណនី root ត្រូវតែជាក្រុមមួយ
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ចំនួនសរុបបានចំនួនទឹកប្រាក់ប្រាក់ខែ + + + + Encashment បំណុល - ការកាត់សរុប
 DocType: Monthly Distribution,Distribution Name,ឈ្មោះចែកចាយ
 DocType: Features Setup,Sales and Purchase,ការលក់និងទិញ
@@ -1812,13 +1827,14 @@
 DocType: Journal Entry Account,Party Balance,តុល្យភាពគណបក្ស
 DocType: Sales Invoice Item,Time Log Batch,កំណត់ហេតុម៉ោងបាច់
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,សូមជ្រើសរើសអនុវត្តបញ្ចុះតម្លៃនៅលើ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,គ្រូពេទ្យប្រហែលជាត្រូវបានបង្កើតឡើងប្រាក់បៀវត្សរ៍
 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 +18,Discount Percentage can be applied either against a Price List or for all Price List.,ភាគរយបញ្ចុះតម្លៃអាចត្រូវបានអនុវត្តទាំងការប្រឆាំងនឹងតារាងតម្លៃមួយឬសម្រាប់តារាងតម្លៃទាំងអស់។
 DocType: Purchase Invoice,Half-yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
 DocType: Bank Reconciliation,Get Relevant Entries,ទទួលបានធាតុពាក់ព័ន្ធ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,ចូលគណនេយ្យសម្រាប់ក្រុមហ៊ុនផ្សារ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,ចូលគណនេយ្យសម្រាប់ក្រុមហ៊ុនផ្សារ
 DocType: Sales Invoice,Sales Team1,Team1 ការលក់
 DocType: Sales Invoice,Customer Address,អាសយដ្ឋានអតិថិជន
 DocType: Purchase Invoice,Apply Additional Discount On,អនុវត្តបន្ថែមការបញ្ចុះតម្លៃនៅលើ
@@ -1829,7 +1845,7 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ចំនួនប្រាក់ពន្ធបន្ទាប់ពីចំនួនការបញ្ចុះតម្លៃ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Quality Inspection,Quality Inspection,ពិនិត្យគុណភាព
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,បន្ថែមទៀតខ្នាតតូច
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ផ្នែកច្បាប់អង្គភាព / តារាងរួមផ្សំជាមួយនឹងគណនីដាច់ដោយឡែកមួយដែលជាកម្មសិទ្ធិរបស់អង្គការនេះ។
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","អាហារ, ភេសជ្ជៈនិងថ្នាំជក់"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,: PL ឬពាណិជ្ជកម្ម BS
@@ -1866,7 +1882,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,ការត្រួតពិនិត្យដែលមានគុណភាពចូល។
 DocType: Purchase Order Item,Returned Qty,ត្រឡប់មកវិញ Qty
 DocType: Employee,Exit,ការចាកចេញ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,ប្រភេទជា Root គឺជាចាំបាច់
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,ប្រភេទជា Root គឺជាចាំបាច់
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ចំពោះភាពងាយស្រួលនៃអតិថិជន, កូដទាំងនេះអាចត្រូវបានប្រើនៅក្នុងទ្រង់ទ្រាយបោះពុម្ពដូចជាការវិកិយប័ត្រនិងដឹកជញ្ជូនចំណាំ"
 DocType: Employee,You can enter any date manually,អ្នកអាចបញ្ចូលកាលបរិច្ឆេទណាមួយដោយដៃ
 DocType: Sales Invoice,Advertisement,ការផ្សព្វផ្សាយ
@@ -1874,7 +1890,7 @@
 DocType: Customer Group,Only leaf nodes are allowed in transaction,មានតែថ្នាំងស្លឹកត្រូវបានអនុញ្ញាតក្នុងប្រតិបត្តិការ
 DocType: Expense Claim,Expense Approver,ការអនុម័តការចំណាយ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ធាតុបង្កាន់ដៃទិញសហការី
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,បង់ប្រាក់
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,បង់ប្រាក់
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,ដើម្បី Datetime
 DocType: SMS Settings,SMS Gateway URL,URL ដែលបានសារ SMS Gateway
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,កំណត់ហេតុសម្រាប់ការរក្សាស្ថានភាពចែកចាយផ្ញើសារជាអក្សរ
@@ -1891,7 +1907,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,រៀបចំវគ្គ
 DocType: Attendance,Attendance Date,ការចូលរួមកាលបរិច្ឆេទ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ការបែកបាក់គ្នាដោយផ្អែកលើការរកប្រាក់ចំណូលបានប្រាក់ខែនិងការកាត់។
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,គណនីជាមួយថ្នាំងជាកុមារមិនអាចត្រូវបានបម្លែងទៅសៀវភៅ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,គណនីជាមួយថ្នាំងជាកុមារមិនអាចត្រូវបានបម្លែងទៅសៀវភៅ
 DocType: Address,Preferred Shipping Address,ការដឹកជញ្ជូនអាសយដ្ឋានដែលពេញចិត្ត
 DocType: Purchase Receipt Item,Accepted Warehouse,ឃ្លាំងទទួលយក
 DocType: Bank Reconciliation Detail,Posting Date,ការប្រកាសកាលបរិច្ឆេទ
@@ -1907,7 +1923,7 @@
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ស្លឹកថ្មីដែលបានបម្រុងទុក (ក្នុងថ្ងៃ)
 DocType: Pricing Rule,Discount Percentage,ភាគរយបញ្ចុះតំលៃ
 DocType: Payment Reconciliation Invoice,Invoice Number,លេខវិក្ក័យប័ត្រ
-apps/erpnext/erpnext/hooks.py +54,Orders,ការបញ្ជាទិញ
+apps/erpnext/erpnext/hooks.py +55,Orders,ការបញ្ជាទិញ
 DocType: Leave Control Panel,Employee Type,ប្រភេទបុគ្គលិក
 DocType: Employee Leave Approver,Leave Approver,ទុកឱ្យការអនុម័ត
 DocType: Manufacturing Settings,Material Transferred for Manufacture,សម្ភារៈផ្ទេរសម្រាប់ការផលិត
@@ -1919,7 +1935,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% នៃសមា្ភារៈ billed នឹងដីកាសម្រេចការលក់នេះ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,ចូលរយៈពេលបិទ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ជាមួយនឹងការប្រតិបត្តិការនៃមជ្ឈមណ្ឌលការចំណាយដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,រំលស់
+DocType: Account,Depreciation,រំលស់
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ក្រុមហ៊ុនផ្គត់ផ្គង់ (s បាន)
 DocType: Customer,Credit Limit,ដែនកំណត់ឥណទាន
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,ជ្រើសប្រភេទនៃការប្រតិបត្តិការ
@@ -1941,7 +1957,8 @@
 DocType: Material Request,Requested For,ស្នើសម្រាប់
 DocType: Quotation Item,Against Doctype,ប្រឆាំងនឹងការ DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,តាមដានការដឹកជញ្ជូនចំណាំនេះប្រឆាំងនឹងគម្រោងណាមួយឡើយ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,គណនី root មិនអាចត្រូវបានលុប
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,សាច់ប្រាក់សុទ្ធពីការវិនិយោគ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,គណនី root មិនអាចត្រូវបានលុប
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,បង្ហាញធាតុហ៊ុន
 ,Is Primary Address,គឺជាអាសយដ្ឋានបឋមសិក្សា
 DocType: Production Order,Work-in-Progress Warehouse,ការងារក្នុងវឌ្ឍនភាពឃ្លាំង
@@ -1952,7 +1969,7 @@
 DocType: Journal Entry,User Remark,សំគាល់របស់អ្នកប្រើ
 DocType: Lead,Market Segment,ចំណែកទីផ្សារ
 DocType: Employee Internal Work History,Employee Internal Work History,ប្រវត្តិការងាររបស់បុគ្គលិកផ្ទៃក្នុង
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),បិទ (លោកបណ្ឌិត)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),បិទ (លោកបណ្ឌិត)
 DocType: Contact,Passive,អកម្ម
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,ពុម្ពពន្ធលើការលក់ការធ្វើប្រតិបត្តិការ។
 DocType: Sales Invoice,Write Off Outstanding Amount,បិទការសរសេរចំនួនទឹកប្រាក់ដ៏ឆ្នើម
@@ -1987,9 +2004,9 @@
 DocType: Leave Block List,Leave Block List Allowed,ទុកឱ្យប្លុកដែលបានអនុញ្ញាតក្នុងបញ្ជី
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,អ្នកនឹងប្រើវាដើម្បីកត់ត្រាចូល
 DocType: Sales Partner,Retailer,ការលក់រាយ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,ឥណទានទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,ឥណទានទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រប់ប្រភេទ
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,ក្រមធាតុគឺជាចាំបាច់ដោយសារតែធាតុបង់លេខដោយស្វ័យប្រវត្តិគឺមិន
+apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,ក្រមធាតុគឺជាចាំបាច់ដោយសារតែធាតុបង់លេខដោយស្វ័យប្រវត្តិគឺមិន
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,កាលវិភាគធាតុថែទាំ
 DocType: Sales Order,%  Delivered,% ដឹកនាំ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,ធនាគាររូបារូប
@@ -2027,7 +2044,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ទំងន់សរុបនៃកញ្ចប់។ ជាធម្មតាមានទម្ងន់សុទ្ធ + + ការវេចខ្ចប់មានទម្ងន់សម្ភារៈ។ (សម្រាប់ការបោះពុម្ព)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,អ្នកប្រើដែលមានតួនាទីនេះត្រូវបានអនុញ្ញាតឱ្យកំណត់គណនីរបស់ទឹកកកនិងបង្កើត / កែប្រែធាតុគណនេយ្យប្រឆាំងនឹងគណនីជាទឹកកក
 DocType: Serial No,Is Cancelled,ត្រូវបានលុបចោល
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,ការនាំចេញរបស់យើង
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,ការនាំចេញរបស់យើង
 DocType: Journal Entry,Bill Date,លោក Bill កាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",បើទោះបីជាមានច្បាប់តម្លៃច្រើនដែលមានអាទិភាពខ្ពស់បំផុតបន្ទាប់មកបន្ទាប់ពីមានអាទិភាពផ្ទៃក្នុងត្រូវបានអនុវត្ត:
 DocType: Supplier,Supplier Details,ពត៌មានលំអិតក្រុមហ៊ុនផ្គត់ផ្គង់
@@ -2060,9 +2077,9 @@
 DocType: Time Log,Batched for Billing,Batched សម្រាប់វិក័យប័ត្រ
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,វិក័យប័ត្រដែលបានលើកឡើងដោយអ្នកផ្គត់ផ្គង់។
 DocType: POS Profile,Write Off Account,បិទការសរសេរគណនី
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,ចំនួនការបញ្ចុះតំលៃ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការទិញវិក័យប័ត្រ
 DocType: Item,Warranty Period (in days),ការធានារយៈពេល (នៅក្នុងថ្ងៃ)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,ប្រតិបត្ដិការសាច់ប្រាក់សុទ្ធពី
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,ឧអាករលើតម្លៃបន្ថែម
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,ធាតុ 4
 DocType: Journal Entry Account,Journal Entry Account,គណនីធាតុទិនានុប្បវត្តិ
@@ -2159,7 +2176,7 @@
 DocType: Company,Default Cash Account,គណនីសាច់ប្រាក់លំនាំដើម
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,ក្រុមហ៊ុន (មិនមានអតិថិជនឬផ្គត់) មេ។
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',សូមបញ្ចូល &#39;កាលបរិច្ឆេទដឹកជញ្ជូនរំពឹងទុក &quot;
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,ចំនួនទឹកប្រាក់ដែលបង់ + + បិទសរសេរចំនួនទឹកប្រាក់ដែលមិនអាចត្រូវបានធំជាងសម្ពោធសរុប
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,ចំនួនទឹកប្រាក់ដែលបង់ + + បិទសរសេរចំនួនទឹកប្រាក់ដែលមិនអាចត្រូវបានធំជាងសម្ពោធសរុប
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",ចំណាំ: ប្រសិនបើការទូទាត់មិនត្រូវបានធ្វើប្រឆាំងនឹងឯកសារយោងណាមួយដែលធ្វើឱ្យធាតុទិនានុប្បវត្តិដោយដៃ។
 DocType: Item,Supplier Items,ក្រុមហ៊ុនផ្គត់ផ្គង់ធាតុ
 DocType: Opportunity,Opportunity Type,ប្រភេទឱកាសការងារ
@@ -2175,7 +2192,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ធាតុ 3
 DocType: Purchase Order,Customer Contact Email,ទំនាក់ទំនងអតិថិជនអ៊ីម៉ែល
 DocType: Sales Team,Contribution (%),ចំែណក (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ចំណាំ: ការទូទាត់នឹងមិនចូលត្រូវបានបង្កើតតាំងពីសាច់ប្រាក់ឬគណនីធនាគារ &#39;មិនត្រូវបានបញ្ជាក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ចំណាំ: ការទូទាត់នឹងមិនចូលត្រូវបានបង្កើតតាំងពីសាច់ប្រាក់ឬគណនីធនាគារ &#39;មិនត្រូវបានបញ្ជាក់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,ការទទួលខុសត្រូវ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,ទំព័រគំរូ
 DocType: Sales Person,Sales Person Name,ការលក់ឈ្មោះបុគ្គល
@@ -2196,7 +2213,7 @@
 DocType: Time Log,From Time,ចាប់ពីពេលវេលា
 DocType: Notification Control,Custom Message,សារផ្ទាល់ខ្លួន
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ធនាគារវិនិយោគ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,គណនីសាច់ប្រាក់ឬធនាគារជាការចាំបាច់សម្រាប់ការធ្វើឱ្យធាតុដែលបានទូទាត់ប្រាក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,គណនីសាច់ប្រាក់ឬធនាគារជាការចាំបាច់សម្រាប់ការធ្វើឱ្យធាតុដែលបានទូទាត់ប្រាក់
 DocType: Purchase Invoice,Price List Exchange Rate,តារាងតម្លៃអត្រាប្តូរប្រាក់
 DocType: Purchase Invoice Item,Rate,អត្រាការប្រាក់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,ហាត់ការ
@@ -2211,9 +2228,10 @@
 DocType: Salary Structure,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 +580,Issue Material,សម្ភារៈបញ្ហា
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,សម្ភារៈបញ្ហា
 DocType: Material Request Item,For Warehouse,សម្រាប់ឃ្លាំង
 DocType: Employee,Offer Date,ការផ្តល់ជូនកាលបរិច្ឆេទ
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,សម្រង់ពាក្យ
 DocType: Hub Settings,Access Token,ការចូលដំណើរការ Token
 DocType: Sales Invoice Item,Serial No,សៀរៀលគ្មាន
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,សូមបញ្ចូលព័ត៌មានលំអិត Maintaince លើកដំបូង
@@ -2227,6 +2245,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,មានថ្ងៃឈប់សម្រាកច្រើនជាងថ្ងៃធ្វើការខែនេះ។
 DocType: Product Bundle Item,Product Bundle Item,ផលិតផលធាតុកញ្ចប់
 DocType: Sales Partner,Sales Partner Name,ឈ្មោះដៃគូការលក់
+DocType: Payment Reconciliation,Maximum Invoice Amount,ចំនួនវិក័យប័ត្រអតិបរមា
 DocType: Purchase Invoice Item,Image View,មើលរូបភាព
 DocType: Issue,Opening Time,ម៉ោងបើក
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ពីនិងដើម្បីកាលបរិច្ឆេទដែលបានទាមទារ
@@ -2237,6 +2256,7 @@
 DocType: Tax Rule,Shipping City,ការដឹកជញ្ជូនក្នុងទីក្រុង
 DocType: Account,Purchase User,អ្នកប្រើប្រាស់ទិញ
 DocType: Notification Control,Customize the Notification,ប្ដូរតាមសេចក្តីជូនដំណឹងនេះ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,លំហូរសាច់ប្រាក់ពីការប្រតិបត្ដិការ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,អាសយដ្ឋានលំនាំដើមទំព័រគំរូមិនអាចត្រូវបានលុប
 DocType: Sales Invoice,Shipping Rule,វិធានការដឹកជញ្ជូន
 DocType: Journal Entry,Print Heading,បោះពុម្ពក្បាល
@@ -2247,7 +2267,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,វត្ថុធាតុដើម
 DocType: Leave Application,Follow via Email,សូមអនុវត្តតាមរយៈអ៊ីម៉ែល
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ចំនួនប្រាក់ពន្ធបន្ទាប់ពីចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,គណនីកុមារដែលមានសម្រាប់គណនីនេះ។ អ្នកមិនអាចលុបគណនីនេះ។
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,សូមជ្រើសរើសកាលបរិច្ឆេទដំបូងគេបង្អស់
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,បើកកាលបរិច្ឆេទគួរតែមានមុនកាលបរិចេ្ឆទផុតកំណត់
@@ -2263,6 +2283,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +302,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",រាយបញ្ជីក្បាលពន្ធរបស់អ្នក (ឧទាហរណ៍អាករលើតម្លៃបន្ថែមពន្ធគយលពួកគេគួរតែមានឈ្មោះតែមួយគត់) និងអត្រាការស្ដង់ដាររបស់ខ្លួន។ ការនេះនឹងបង្កើតគំរូស្តង់ដាដែលអ្នកអាចកែសម្រួលនិងបន្ថែមច្រើនទៀតនៅពេលក្រោយ។
 DocType: Journal Entry,Bank Entry,ចូលធនាគារ
 DocType: Authorization Rule,Applicable To (Designation),ដែលអាចអនុវត្តទៅ (រចនា)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,បញ្ចូលទៅក្នុងរទេះ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ក្រុមតាម
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,អនុញ្ញាត / មិនអនុញ្ញាតឱ្យរូបិយប័ណ្ណ។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ចំណាយប្រៃសណីយ៍
@@ -2272,17 +2293,17 @@
 DocType: Quality Inspection,Item Serial No,គ្មានសៀរៀលធាតុ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,បច្ចុប្បន្នសរុប
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,ហួរ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,ផ្ទេរសម្ភារៈដើម្បីផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,ផ្ទេរសម្ភារៈដើម្បីផ្គត់ផ្គង់
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,បង្កើតសម្រង់
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យអនុម័តស្លឹកនៅលើកាលបរិច្ឆេទប្លុក
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,ធាតុទាំងអស់នេះត្រូវបានគេ invoiced រួចទៅហើយ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,ធាតុទាំងអស់នេះត្រូវបានគេ invoiced រួចទៅហើយ
 DocType: Shipping Rule,Shipping Rule Conditions,ការដឹកជញ្ជូនវិធានលក្ខខណ្ឌ
 DocType: BOM Replace Tool,The new BOM after replacement,នេះបន្ទាប់ពីការជំនួស Bom
 DocType: Features Setup,Point of Sale,ចំណុចនៃការលក់
 DocType: Account,Tax,ការបង់ពន្ធ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,ចាប់ពីកញ្ចប់ផលិតផល
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,ចាប់ពីកញ្ចប់ផលិតផល
 DocType: Production Planning Tool,Production Planning Tool,ឧបករណ៍ផែនការផលិតកម្ម
 DocType: Quality Inspection,Report Date,របាយការណ៍ស្តីពីកាលបរិច្ឆេទ
 DocType: C-Form,Invoices,វិក័យប័ត្រ
@@ -2295,6 +2316,7 @@
 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: Pricing Rule,Customer Group,ក្រុមផ្ទាល់ខ្លួន
 DocType: Item,Website Description,វេបសាយការពិពណ៌នាសង្ខេប
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ការផ្លាស់ប្តូរសុទ្ធនៅសមភាព
 DocType: Serial No,AMC Expiry Date,កាលបរិច្ឆេទ AMC ផុតកំណត់
 ,Sales Register,ការលក់ចុះឈ្មោះ
 DocType: Quotation,Quotation Lost Reason,សម្រង់បាត់បង់មូលហេតុ
@@ -2305,8 +2327,8 @@
 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,គុណលក្ខណៈ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,ទទួលបានធាតុ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,សូមបញ្ចូលបិទសរសេរគណនី
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,ទទួលបានធាតុ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,សូមបញ្ចូលបិទសរសេរគណនី
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,លំដាប់ចុងក្រោយកាលបរិច្ឆេទ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,ធ្វើឱ្យរដ្ឋាករវិក័យប័ត្រ
 DocType: C-Form,C-Form,C-សំណុំបែបបទ
@@ -2321,7 +2343,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,ទិន្នន័យគម្រោងប្រាជ្ញាគឺមិនអាចប្រើបានសម្រាប់សម្រង់
 DocType: Project,Expected End Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់
 DocType: Appraisal Template,Appraisal Template Title,ការវាយតម្លៃទំព័រគំរូចំណងជើង
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,ពាណិជ្ជ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,ពាណិជ្ជ
 DocType: Cost Center,Distribution Id,លេខសម្គាល់ការចែកចាយ
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,សេវាសេវាល្អមែនទែន
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,ផលិតផលឬសេវាកម្មទាំងអស់។
@@ -2342,14 +2364,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
 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
 DocType: Landed Cost Voucher,Purchase Receipts,បង្កាន់ដៃទិញ
-DocType: Payment Reconciliation,Maximum Amount,ចំនួនទឹកប្រាក់អតិបរមា
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,តើធ្វើដូចម្តេចតម្លៃវិធានត្រូវបានអនុវត្ត?
 DocType: Quality Inspection,Delivery Note No,ដឹកជញ្ជូនចំណាំគ្មាន
 DocType: Company,Retail,ការលក់រាយ
 DocType: Attendance,Absent,អវត្តមាន
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,កញ្ចប់ផលិតផល
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,កញ្ចប់ផលិតផល
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ទិញពន្ធនិងការចោទប្រកាន់ពីទំព័រគំរូ
 DocType: Upload Attendance,Download Template,ទំព័រគំរូទាញយក
 DocType: GL Entry,Remarks,សុន្ទរកថា
@@ -2373,15 +2395,17 @@
 DocType: Sales Invoice,Product Bundle Help,កញ្ចប់ជំនួយផលិតផល
 ,Monthly Attendance Sheet,សន្លឹកវត្តមានប្រចាំខែ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,បានរកឃើញថាគ្មានកំណត់ត្រា
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
 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 +122,Please enter 'Is Subcontracted' as Yes or No,សូមបញ្ចូល &lt;តើកិច្ចសន្យាបន្ដ &#39;ជាបាទឬទេ
 DocType: Sales Team,Contact No.,លេខទំនាក់ទំនងទៅ
 DocType: Features Setup,Sales Discounts,ការបញ្ចុះតម្លៃការលក់
 DocType: Hub Settings,Seller Country,អ្នកលក់ប្រទេស
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,បោះពុម្ពផ្សាយធាតុលើវេបសាយ
 DocType: Authorization Rule,Authorization Rule,វិធានសេចក្តីអនុញ្ញាត
 DocType: Sales Invoice,Terms and Conditions Details,លក្ខខណ្ឌពត៌មានលំអិត
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,ជាក់លាក់
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ពន្ធលក់និងការចោទប្រកាន់ពីទំព័រគំរូ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,សម្លៀកបំពាក់និងគ្រឿងបន្លាស់
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,ចំនួននៃលំដាប់
@@ -2400,7 +2424,7 @@
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,ដែលមានអាយុ
 DocType: Time Log,Billing Amount,ចំនួនវិក័យប័ត្រ
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,កម្មវិធីសម្រាប់ការឈប់សម្រាក។
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានលុប
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានលុប
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ការចំណាយផ្នែកច្បាប់
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ថ្ងៃនៃខែដែលការបញ្ជាទិញនឹងត្រូវបានបង្កើតដោយស្វ័យប្រវត្តិរបស់ឧ 05, 28 ល"
 DocType: Sales Invoice,Posting Time,ម៉ោងប្រកាស
@@ -2417,7 +2441,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,ទទួលបានជោគជ័យក្នុងការតិបត្តិការទាំងអស់ដែលបានលុបដែលទាក់ទងទៅនឹងក្រុមហ៊ុននេះ!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ដូចជានៅលើកាលបរិច្ឆេទ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,ការសាកល្បង
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,ឃ្លាំងលំនាំដើមគឺចាំបាច់សម្រាប់ធាតុភាគហ៊ុន។
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,ឃ្លាំងលំនាំដើមគឺចាំបាច់សម្រាប់ធាតុភាគហ៊ុន។
 DocType: Stock Settings,Auto insert Price List rate if missing,បញ្ចូលដោយស្វ័យប្រវត្តិប្រសិនបើអ្នកមានអត្រាតារាងតម្លៃបាត់ខ្លួន
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់សរុប
 ,Transferred Qty,ផ្ទេរ Qty
@@ -2428,6 +2452,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),ចំនួនវិក័យប័ត្រសរុប (តាមរយៈការពេលវេលាកំណត់ហេតុ)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,យើងលក់ធាតុនេះ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,លេខសម្គាល់អ្នកផ្គត់ផ្គង់
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,បរិមាណដែលត្រូវទទួលទានគួរជាធំជាង 0
 DocType: Journal Entry,Cash Entry,ចូលជាសាច់ប្រាក់
 DocType: Sales Partner,Contact Desc,ការទំនាក់ទំនង DESC
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","ប្រភេទនៃស្លឹកដូចជាការធម្មតា, ឈឺល"
@@ -2492,19 +2517,19 @@
 DocType: Customer,From Lead,បានមកពីអ្នកដឹកនាំ
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,ការបញ្ជាទិញដែលបានចេញផ្សាយសម្រាប់ការផលិត។
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ជ្រើសឆ្នាំសារពើពន្ធ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
 DocType: Hub Settings,Name Token,ឈ្មោះនិមិត្តសញ្ញា
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,ស្តង់ដាលក់
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,យ៉ាងហោចណាស់មានម្នាក់ឃ្លាំងគឺជាចាំបាច់
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,ជំនួស
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,សូមបញ្ចូលលំនាំដើមវិធានការអង្គភាព
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,សូមបញ្ចូលលំនាំដើមវិធានការអង្គភាព
 DocType: Purchase Invoice Item,Project Name,ឈ្មោះគម្រោង
 DocType: Supplier,Mention if non-standard receivable account,និយាយពីការប្រសិនបើគណនីដែលមិនមែនជាស្តង់ដាទទួល
 DocType: Journal Entry Account,If Income or Expense,ប្រសិនបើមានប្រាក់ចំណូលឬការចំណាយ
 DocType: Features Setup,Item Batch Nos,បាច់ធាតុ Nos
 DocType: Stock Ledger Entry,Stock Value Difference,ភាពខុសគ្នាតម្លៃភាគហ៊ុន
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,ធនធានមនុស្ស
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,ធនធានមនុស្ស
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ការទូទាត់ការផ្សះផ្សាការទូទាត់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,ការប្រមូលពន្ធលើទ្រព្យសម្បត្តិ
 DocType: BOM Item,BOM No,Bom គ្មាន
@@ -2542,7 +2567,7 @@
 DocType: Stock Entry Detail,Additional Cost,ការចំណាយបន្ថែមទៀត
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,កាលបរិច្ឆេទឆ្នាំហិរញ្ញវត្ថុបញ្ចប់
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",មិនអាចត្រងដោយផ្អែកលើប័ណ្ណគ្មានប្រសិនបើដាក់ជាក្រុមតាមប័ណ្ណ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,ធ្វើឱ្យសម្រង់ផ្គត់ផ្គង់
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,ធ្វើឱ្យសម្រង់ផ្គត់ផ្គង់
 DocType: Quality Inspection,Incoming,មកដល់
 DocType: BOM,Materials Required (Exploded),សំភារៈទាមទារ (ផ្ទុះ)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),កាត់បន្ថយរកស្នើសុំការអនុញ្ញាតដោយគ្មានការបង់ (LWP)
@@ -2579,7 +2604,6 @@
 DocType: Purchase Order,End date of current order's period,កាលបរិច្ឆេទបញ្ចប់នៃរយៈពេលការបញ្ជាទិញនាពេលបច្ចុប្បន្នរបស់
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ធ្វើឱ្យការផ្តល់ជូនលិខិត
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,ត្រឡប់មកវិញ
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,ឯកតាលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ត្រូវតែមានដូចគ្នាជាពុម្ព
 DocType: Production Order Operation,Production Order Operation,ផលិតកម្មលំដាប់ប្រតិបត្តិការ
 DocType: Pricing Rule,Disable,មិនអនុញ្ញាត
 DocType: Project Task,Pending Review,ការរង់ចាំការត្រួតពិនិត្យឡើងវិញ
@@ -2603,7 +2627,7 @@
 ,Available Stock for Packing Items,អាចរកបានសម្រាប់វេចខ្ចប់ហ៊ុនរបស់របរ
 DocType: Item Variant,Item Variant,ធាតុវ៉ារ្យង់
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,ការកំណត់អាសយដ្ឋានទំព័រគំរូជាលំនាំដើមនេះដូចជាមិនមានការលំនាំដើមផ្សេងទៀត
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណពន្ធ, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណទាន &quot;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,គ្រប់គ្រងគុណភាព
 DocType: Production Planning Tool,Filter based on customer,តម្រងផ្អែកលើការអតិថិជន
 DocType: Payment Tool Detail,Against Voucher No,ប្រឆាំងនឹងប័ណ្ណគ្មាន
@@ -2617,6 +2641,7 @@
 DocType: Opportunity,Next Contact,ទំនាក់ទំនងបន្ទាប់
 DocType: Employee,Employment Type,ប្រភេទការងារធ្វើ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ទ្រព្យសកម្មថេរ
+,Cash Flow,លំហូរសាច់ប្រាក់
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,រយៈពេលប្រើប្រាស់មិនអាចមាននៅទូទាំងកំណត់ត្រា alocation ទាំងពីរនាក់
 DocType: Item Group,Default Expense Account,ចំណាយតាមគណនីលំនាំដើម
 DocType: Employee,Notice (days),សេចក្តីជូនដំណឹង (ថ្ងៃ)
@@ -2644,13 +2669,12 @@
 DocType: Production Order,Warehouses,ឃ្លាំង
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,បោះពុម្ពនិងស្ថានី
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,ថ្នាំងគ្រុប
-DocType: Payment Reconciliation,Minimum Amount,ចំនួនទឹកប្រាក់អប្បបរមា
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,ធ្វើឱ្យទាន់សម័យបានបញ្ចប់ផលិតផល
 DocType: Workstation,per hour,ក្នុងមួយម៉ោង
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,គណនីសម្រាប់ឃ្លាំង (សារពើភ័ណ្ឌងូត) នឹងត្រូវបានបង្កើតឡើងក្រោមគណនីនេះ។
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ឃ្លាំងមិនអាចលុបធាតុដែលបានចុះក្នុងសៀវភៅភាគហ៊ុនមានសម្រាប់ឃ្លាំងនេះ។
 DocType: Company,Distribution,ចែកចាយ
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,ចំនួនទឹកប្រាក់ដែលបង់
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,ចំនួនទឹកប្រាក់ដែលបង់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,ប្រធានគ្រប់គ្រងគម្រោង
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,បញ្ជូន
 DocType: Account,Receivable,អ្នកទទួល
@@ -2756,7 +2780,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,កំណត់ត្រាបុគ្គលិក។
 DocType: HR Settings,Payroll Settings,ការកំណត់បើកប្រាក់បៀវត្ស
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,ផ្គូផ្គងនឹងវិកិយប័ត្រដែលមិនមានភ្ជាប់និងការទូទាត់។
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,លំដាប់ទីកន្លែង
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,លំដាប់ទីកន្លែង
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ជា root មិនអាចមានការកណ្តាលចំណាយឪពុកម្តាយ
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ជ្រើសម៉ាក ...
 DocType: Sales Invoice,C-Form Applicable,C-ទម្រង់ពាក្យស្នើសុំ
@@ -2778,7 +2802,7 @@
 DocType: Project,Expected Start Date,គេរំពឹងថានឹងចាប់ផ្តើមកាលបរិច្ឆេទ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,យកធាតុប្រសិនបើការចោទប្រកាន់គឺអាចអនុវត្តទៅធាតុដែល
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ឧទាហរណ៏។ smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,ទទួលបាន
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,ទទួលបាន
 DocType: Maintenance Visit,Fully Completed,បានបញ្ចប់យ៉ាងពេញលេញ
 DocType: Employee,Educational Qualification,គុណវុឌ្ឍិអប់រំ
 DocType: Workstation,Operating Costs,ចំណាយប្រតិបត្តិការ
@@ -2818,7 +2842,7 @@
 ,Serial No Service Contract Expiry,គ្មានសេវាកិច្ចសន្យាសៀរៀលផុតកំណត់
 DocType: Item,Unit of Measure Conversion,ឯកតានៃការប្រែចិត្តជឿវិធានការ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,និយោជិតមិនអាចត្រូវបានផ្លាស់ប្តូ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,អ្នកមិនអាចឥណទាននិងឥណពន្ធគណនីដូចគ្នានៅពេលតែមួយ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,អ្នកមិនអាចឥណទាននិងឥណពន្ធគណនីដូចគ្នានៅពេលតែមួយ
 DocType: Naming Series,Help HTML,ជំនួយ HTML
 DocType: Address,Name of person or organization that this address belongs to.,ឈ្មោះរបស់មនុស្សម្នាក់ឬអង្គការមួយដែលមានអាស័យដ្ឋានជារបស់វា។
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,អ្នកផ្គត់ផ្គង់របស់អ្នក
@@ -2832,15 +2856,15 @@
 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/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,សូមពិនិត្យមើលជម្រើសរូបិយវត្ថុពហុដើម្បីអនុញ្ញាតឱ្យគណនីជារូបិយប័ណ្ណផ្សេងទៀត
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់តម្លៃទឹកកក
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,សូមពិនិត្យមើលជម្រើសរូបិយវត្ថុពហុដើម្បីអនុញ្ញាតឱ្យគណនីជារូបិយប័ណ្ណផ្សេងទៀត
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់តម្លៃទឹកកក
 DocType: Payment Reconciliation,Get Unreconciled Entries,ទទួលបានធាតុ Unreconciled
+DocType: Payment Reconciliation,From Invoice Date,ចាប់ពីកាលបរិច្ឆេទវិក័យប័ត្រ
 DocType: Cost Center,Budgets,ថវិកា
-DocType: Employee,Emergency Contact Details,ពត៌មានទំនាក់ទំនងសង្រ្គោះបន្ទាន់
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,តើធ្វើដូចម្ដេច?
 DocType: Delivery Note,To Warehouse,ដើម្បីឃ្លាំង
 ,Average Commission Rate,គណៈកម្មការជាមធ្យមអត្រាការ
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,ការចូលរួមមិនអាចត្រូវបានសម្គាល់សម្រាប់កាលបរិច្ឆេទនាពេលអនាគត
 DocType: Pricing Rule,Pricing Rule Help,វិធានកំណត់តម្លៃជំនួយ
 DocType: Purchase Taxes and Charges,Account Head,នាយកគណនី
@@ -2851,7 +2875,7 @@
 DocType: Stock Entry,Default Source Warehouse,លំនាំដើមឃ្លាំងប្រភព
 DocType: Item,Customer Code,លេខកូដអតិថិជន
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,ភាគហ៊ុនទ្រព្យសកម្ម
@@ -2891,12 +2915,12 @@
 DocType: Upload Attendance,Upload Attendance,វត្តមានផ្ទុកឡើង
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,កម្មន្តសាលចំនូន Bom និងត្រូវបានតម្រូវ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ជួរ Ageing 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,ចំនួនទឹកប្រាក់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,ចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom បានជំនួស
 ,Sales Analytics,វិភាគការលក់
 DocType: Manufacturing Settings,Manufacturing Settings,ការកំណត់កម្មន្តសាល
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ការបង្កើតអ៊ីម៉ែ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,សូមបញ្ចូលរូបិយប័ណ្ណលំនាំដើមនៅក្នុងក្រុមហ៊ុនអនុបណ្ឌិត
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,សូមបញ្ចូលរូបិយប័ណ្ណលំនាំដើមនៅក្នុងក្រុមហ៊ុនអនុបណ្ឌិត
 DocType: Stock Entry Detail,Stock Entry Detail,ពត៌មាននៃភាគហ៊ុនចូល
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,ការរំលឹកជារៀងរាល់ថ្ងៃ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,New Account Name,ឈ្មោះគណនីថ្មី
@@ -2935,13 +2959,13 @@
 DocType: Employee,Applicable Holiday List,បញ្ជីថ្ងៃឈប់សម្រាកដែលអាចអនុវត្តបាន
 DocType: Employee,Cheque,មូលប្បទានប័ត្រ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,បានបន្ទាន់សម័យស៊េរី
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,របាយការណ៏ចាំបាច់ប្រភេទ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,របាយការណ៏ចាំបាច់ប្រភេទ
 DocType: Item,Serial Number Series,កម្រងឯកសារលេខសៀរៀល
 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/public/js/setup_wizard.js +101,The First User: You,អ្នកប្រើដំបូង: អ្នក
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,ផ្សះផ្សាដោយជោគជ័យ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,ផ្សះផ្សាដោយជោគជ័យ
 DocType: Production Order,Planned End Date,កាលបរិច្ឆេទបញ្ចប់ការគ្រោងទុក
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,ដែលជាកន្លែងដែលធាតុត្រូវបានរក្សាទុក។
 DocType: Tax Rule,Validity,សុពលភាព
@@ -2949,7 +2973,7 @@
 DocType: Attendance,Attendance,ការចូលរួម
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,ប្រកាសកាលបរិច្ឆេទនិងពេលវេលាជាការចាំបាច់បង្ហោះ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,ប្រកាសកាលបរិច្ឆេទនិងពេលវេលាជាការចាំបាច់បង្ហោះ
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,ពុម្ពពន្ធលើការទិញប្រតិបត្តិការ។
 ,Item Prices,តម្លៃធាតុ
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការបញ្ជាទិញនេះ។
@@ -2960,12 +2984,12 @@
 DocType: Purchase Taxes and Charges,On Net Total,នៅលើសុទ្ធសរុប
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,មិនមានការអនុញ្ញាតឱ្យប្រើឧបករណ៍ការទូទាត់
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,&quot;ការជូនដំណឹងអាសយដ្ឋានអ៊ីមែល &#39;មិនត្រូវបានបញ្ជាក់សម្រាប់% s ដែលកើតឡើង
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,រូបិយប័ណ្ណមិនអាចត្រូវបានផ្លាស់ប្តូរបន្ទាប់ពីធ្វើការធាតុប្រើប្រាស់រូបិយប័ណ្ណផ្សេងទៀតមួយចំនួន
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,រូបិយប័ណ្ណមិនអាចត្រូវបានផ្លាស់ប្តូរបន្ទាប់ពីធ្វើការធាតុប្រើប្រាស់រូបិយប័ណ្ណផ្សេងទៀតមួយចំនួន
 DocType: Company,Round Off Account,បិទការប្រកួតជុំទីគណនី
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,ចំណាយរដ្ឋបាល
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,ការប្រឹក្សាយោបល់
 DocType: Customer Group,Parent Customer Group,ឪពុកម្តាយដែលជាក្រុមអតិថិជន
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,ការផ្លាស់ប្តូរ
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,ការផ្លាស់ប្តូរ
 DocType: Purchase Invoice,Contact Email,ទំនាក់ទំនងតាមអ៊ីមែល
 DocType: Appraisal Goal,Score Earned,គ្រាប់បាល់បញ្ចូលទីទទួលបាន
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",ឧទាហរណ៍ដូចជារឿង &quot;My ក្រុមហ៊ុន LLC បាន&quot;
@@ -2975,7 +2999,7 @@
 DocType: Packing Slip,Gross Weight UOM,សរុបបានទំ UOM
 DocType: Email Digest,Receivables / Payables,ទទួល / បង់
 DocType: Delivery Note Item,Against Sales Invoice,ប្រឆាំងនឹងការវិក័យប័ត្រលក់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,គណនីឥណទាន
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,គណនីឥណទាន
 DocType: Landed Cost Item,Landed Cost Item,ធាតុតម្លៃដែលបានចុះចត
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,បង្ហាញតម្លៃសូន្យ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,បរិមាណនៃការផលិតធាតុដែលទទួលបានបន្ទាប់ / វែចខ្ចប់ឡើងវិញពីបរិមាណដែលបានផ្តល់វត្ថុធាតុដើម
@@ -3014,16 +3038,17 @@
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,រក្សាអត្រាការវដ្តនៃការលក់ពេញមួយដូចគ្នា
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,គម្រោងការកំណត់ហេតុពេលវេលាដែលនៅក្រៅម៉ោងស្ថានីយការងារការងារ។
 ,Items To Be Requested,ធាតុដែលនឹងត្រូវបានស្នើ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,ទទួលបានអត្រាការទិញចុងក្រោយ
 DocType: Time Log,Billing Rate based on Activity Type (per hour),អត្រាការប្រាក់វិក័យប័ត្រដែលមានមូលដ្ឋានលើប្រភេទសកម្មភាព (ក្នុងមួយម៉ោង)
 DocType: Company,Company Info,ពត៌មានរបស់ក្រុមហ៊ុន
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent",រកមិនឃើញអ៊ីម៉ែលដែលជាក្រុមហ៊ុនលេខសម្គាល់ដូចនេះ mail មិនបានចាត់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),កម្មវិធីរបស់មូលនិធិ (ទ្រព្យសកម្ម)
 DocType: Production Planning Tool,Filter based on item,តម្រងមានមូលដ្ឋានលើធាតុ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,គណនីឥណពន្ធវីសា
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,គណនីឥណពន្ធវីសា
 DocType: Fiscal Year,Year Start Date,នៅឆ្នាំកាលបរិច្ឆេទចាប់ផ្តើម
 DocType: Attendance,Employee Name,ឈ្មោះបុគ្គលិក
 DocType: Sales Invoice,Rounded Total (Company Currency),សរុបមូល (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,មិនអាចសម្ងាត់មួយដើម្បីពូលដោយសារតែប្រភេទគណនីត្រូវបានជ្រើស។
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,មិនអាចសម្ងាត់មួយដើម្បីពូលដោយសារតែប្រភេទគណនីត្រូវបានជ្រើស។
 DocType: Purchase Common,Purchase Common,ទិញទូទៅ
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,បញ្ឈប់ការរបស់អ្នកប្រើពីការធ្វើឱ្យកម្មវិធីដែលបានចាកចេញនៅថ្ងៃបន្ទាប់។
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,ពីឱកាស
@@ -3039,7 +3064,7 @@
 DocType: Quality Inspection Reading,Reading 3,ការអានទី 3
 ,Hub,ហាប់
 DocType: GL Entry,Voucher Type,ប្រភេទកាតមានទឹកប្រាក់
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,រកមិនឃើញបញ្ជីថ្លៃឬជនពិការ
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,រកមិនឃើញបញ្ជីថ្លៃឬជនពិការ
 DocType: Expense Claim,Approved,បានអនុម័ត
 DocType: Pricing Rule,Price,តំលៃលក់
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",ជ្រើស &quot;បាទ&quot; នឹងផ្តល់ឱ្យអត្តសញ្ញាណតែមួយគត់ដើម្បីឱ្យអង្គភាពគ្នានៃធាតុដែលអាចត្រូវបានមើលនៅក្នុងស៊េរីចៅហ្វាយគ្មាននេះ។
@@ -3061,7 +3086,7 @@
 DocType: Employee,Contract End Date,កាលបរិច្ឆេទការចុះកិច្ចសន្យាបញ្ចប់
 DocType: Sales Order,Track this Sales Order against any Project,តាមដានការបញ្ជាទិញលក់នេះប្រឆាំងនឹងគម្រោងណាមួយឡើយ
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,ការបញ្ជាទិញការលក់ទាញ (ដែលមិនទាន់សម្រេចបាននូវការផ្តល់) ដោយផ្អែកលើលក្ខណៈវិនិច្ឆ័យដូចខាងលើនេះ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,ចាប់ពីសម្រង់ផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,ចាប់ពីសម្រង់ផ្គត់ផ្គង់
 DocType: Deduction Type,Deduction Type,ប្រភេទកាត់កង
 DocType: Attendance,Half Day,ពាក់កណ្តាលថ្ងៃ
 DocType: Pricing Rule,Min Qty,លោក Min Qty
@@ -3069,7 +3094,7 @@
 DocType: GL Entry,Transaction Date,ប្រតិបត្តិការកាលបរិច្ឆេទ
 DocType: Production Plan Item,Planned Qty,បានគ្រោងទុក Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,ការប្រមូលពន្ធលើចំនួនសរុប
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,ចប់ (ផលិត Qty) គឺជាចាំបាច់
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,ចប់ (ផលិត Qty) គឺជាចាំបាច់
 DocType: Stock Entry,Default Target Warehouse,ឃ្លាំងគោលដៅលំនាំដើម
 DocType: Purchase Invoice,Net Total (Company Currency),សរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Notification Control,Purchase Receipt Message,សារបង្កាន់ដៃទិញ
@@ -3119,9 +3144,9 @@
 DocType: Customer,Commission Rate,អត្រាប្រាក់កំរៃ
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,កម្មវិធីដែលបានឈប់សម្រាកប្លុកដោយនាយកដ្ឋាន។
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,រទេះទទេ
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,រទេះទទេ
 DocType: Production Order,Actual Operating Cost,ការចំណាយប្រតិបត្តិការបានពិតប្រាកដ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,ជា root មិនអាចត្រូវបានកែសម្រួល។
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,ជា root មិនអាចត្រូវបានកែសម្រួល។
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចធំជាងចំនួនសរុប unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,ផលិតកម្មនៅលើថ្ងៃឈប់សម្រាកអនុញ្ញាតឱ្យ
 DocType: Sales Order,Customer's Purchase Order Date,របស់អតិថិជនទិញលំដាប់កាលបរិច្ឆេទ
@@ -3135,7 +3160,7 @@
 DocType: Item,Automatically create Material Request if quantity falls below this level,បង្កើតសម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិបើបរិមាណធ្លាក់នៅក្រោមកម្រិតនេះ
 ,Item-wise Purchase Register,ចុះឈ្មោះទិញធាតុប្រាជ្ញា
 DocType: Batch,Expiry Date,កាលបរិច្ឆេទផុតកំណត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item",ដើម្បីកំណត់កម្រិតការរៀបចំធាតុត្រូវតែជាធាតុទិញឬធាតុកម្មន្តសាល
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item",ដើម្បីកំណត់កម្រិតការរៀបចំធាតុត្រូវតែជាធាតុទិញឬធាតុកម្មន្តសាល
 ,Supplier Addresses and Contacts,អាសយដ្ឋានក្រុមហ៊ុនផ្គត់ផ្គង់និងទំនាក់ទំនង
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,សូមជ្រើសប្រភេទជាលើកដំបូង
 apps/erpnext/erpnext/config/projects.py +18,Project master.,ចៅហ្វាយគម្រោង។
@@ -3143,7 +3168,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
 DocType: Supplier,Credit Days,ថ្ងៃឥណទាន
 DocType: Leave Type,Is Carry Forward,គឺត្រូវបានអនុវត្តទៅមុខ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,ទទួលបានធាតុពី Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,វិក័យប័ត្រនៃសម្ភារៈ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,យោងកាលបរិច្ឆេទ
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 7a0512a..3dbae88 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,ಗ್ರಾಹಕ ಉತ್ಪನ್ನಗಳು
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,ಮೊದಲ ಪಕ್ಷದ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Item,Customer Items,ಗ್ರಾಹಕ ವಸ್ತುಗಳು
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಒಂದು ಲೆಡ್ಜರ್ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಒಂದು ಲೆಡ್ಜರ್ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com ಗೆ ಐಟಂ ಪ್ರಕಟಿಸಿ
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,ಇಮೇಲ್ ಅಧಿಸೂಚನೆಗಳನ್ನು
 DocType: Item,Default Unit of Measure,ಮಾಪನದ ಡೀಫಾಲ್ಟ್ ಘಟಕ
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,ಗ್ರಾಹಕ ಸಂಪರ್ಕ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ಟ್ರೀ
 DocType: Job Applicant,Job Applicant,ಜಾಬ್ ಸಂ
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ಹೆಚ್ಚು ಫಲಿತಾಂಶಗಳು.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 ಬುದ್ಧಿವಂತ ಗ್ರಾಹಕ ಐಟಂ ಕೋಡ್ ನಿರ್ವಹಿಸಲು ಮತ್ತು ತಮ್ಮ ಕೋಡ್ ಬಳಕೆ ಈ ಆಯ್ಕೆಯನ್ನು ಆಧರಿಸಿ ಅವುಗಳನ್ನು ಹುಡುಕಲು ಸುಲಭವಾಗುವಂತೆ
 DocType: Mode of Payment Account,Mode of Payment Account,ಪಾವತಿ ಖಾತೆಯಿಂದ ಮೋಡ್
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,ತೋರಿಸು ಮಾರ್ಪಾಟುಗಳು
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ಸಾಲ ( ಹೊಣೆಗಾರಿಕೆಗಳು )
 DocType: Employee Education,Year of Passing,ಸಾಗುವುದು ವರ್ಷ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ಸಂಗ್ರಹಣೆಯಲ್ಲಿ
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ಆರೋಗ್ಯ
 DocType: Purchase Invoice,Monthly,ಮಾಸಿಕ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ಪಾವತಿ ವಿಳಂಬ (ದಿನಗಳು)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,ಸರಕುಪಟ್ಟಿ
 DocType: Maintenance Schedule Item,Periodicity,ನಿಯತಕಾಲಿಕತೆ
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ಇಮೇಲ್ ವಿಳಾಸ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ರಕ್ಷಣೆ
 DocType: Company,Abbr,ರದ್ದು
 DocType: Appraisal Goal,Score (0-5),ಸ್ಕೋರ್ ( 0-5 )
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},ಸಾಲು {0}: {1} {2} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},ಸಾಲು {0}: {1} {2} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ರೋ # {0}:
 DocType: Delivery Note,Vehicle No,ವಾಹನ ನಂ
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,ಬೆಲೆ ಪಟ್ಟಿ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,ಬೆಲೆ ಪಟ್ಟಿ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Production Order Operation,Work In Progress,ಪ್ರಗತಿಯಲ್ಲಿದೆ ಕೆಲಸ
 DocType: Employee,Holiday List,ಹಾಲಿಡೇ ಪಟ್ಟಿ
 DocType: Time Log,Time Log,ಟೈಮ್ ಲಾಗ್
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ಅದೇ ಕಂಪನಿಯ ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚು ಬಾರಿ ದಾಖಲಿಸಿದರೆ
 DocType: Employee,Married,ವಿವಾಹಿತರು
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ಜಾಹೀರಾತು ಅನುಮತಿಯಿಲ್ಲ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
 DocType: Payment Reconciliation,Reconcile,ರಾಜಿ ಮಾಡಿಸು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ದಿನಸಿ
 DocType: Quality Inspection Reading,Reading 1,1 ಓದುವಿಕೆ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ಪಿಂಚಣಿ ನಿಧಿಗಳು
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,ಖಾತೆಯನ್ನು ರೀತಿಯ ವೇರ್ಹೌಸ್ ವೇಳೆ ವೇರ್ಹೌಸ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,ಖಾತೆಯನ್ನು ರೀತಿಯ ವೇರ್ಹೌಸ್ ವೇಳೆ ವೇರ್ಹೌಸ್ ಕಡ್ಡಾಯ
 DocType: SMS Center,All Sales Person,ಎಲ್ಲಾ ಮಾರಾಟಗಾರನ
 DocType: Lead,Person Name,ವ್ಯಕ್ತಿ ಹೆಸರು
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","ಪರಿಶೀಲಿಸಿ ಸಲುವಾಗಿ ಮರುಕಳಿಸುವ ವೇಳೆ, ಮರುಕಳಿಸುವ ನಿಲ್ಲಿಸಲು ಅಥವಾ ಸರಿಯಾದ ಅಂತಿಮ ದಿನಾಂಕ ಹಾಕಲು ಗುರುತಿಸಬೇಡಿ"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,ಆಸಕ್ತಿ
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,ಮೆಟೀರಿಯಲ್ ಬಿಲ್
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,ಆರಂಭಿಕ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},ಗೆ {0} ಗೆ {1}
+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,ಎಂಟ್ರಿ ತೆರೆಯುವ
 DocType: Stock Entry,Additional Costs,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ .
 DocType: Lead,Product Enquiry,ಉತ್ಪನ್ನ ವಿಚಾರಣೆ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,ಮೊದಲ ಕಂಪನಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,ಟಾರ್ಗೆಟ್ ರಂದು
+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 +9,Activity Log:,ಚಟುವಟಿಕೆ ಲಾಗ್ :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,ಐಟಂ {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ಅಥವಾ ಮುಗಿದಿದೆ
@@ -165,7 +165,7 @@
 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 +444,Item {0} is not active or end of life has been reached,ಐಟಂ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಜೀವನದ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿತು ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,ಐಟಂ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಜೀವನದ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿತು ಮಾಡಲಾಗಿದೆ
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಸಲ್ಲಿಸಿದ ನಂತರ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮಾಡ್ಯೂಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,ಕಾರ್ಯಾಚರಣೆಗಳ ವಿವರಗಳು ನಡೆಸಿತು.
 DocType: Serial No,Maintenance Status,ನಿರ್ವಹಣೆ ಸ್ಥಿತಿಯನ್ನು
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,ಐಟಂಗಳನ್ನು ಮತ್ತು ಬೆಲೆ
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},ದಿನಾಂಕದಿಂದ ಹಣಕಾಸಿನ ವರ್ಷದ ಒಳಗೆ ಇರಬೇಕು. ದಿನಾಂಕದಿಂದ ಭಾವಿಸಿಕೊಂಡು = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},ದಿನಾಂಕದಿಂದ ಹಣಕಾಸಿನ ವರ್ಷದ ಒಳಗೆ ಇರಬೇಕು. ದಿನಾಂಕದಿಂದ ಭಾವಿಸಿಕೊಂಡು = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,ಧಿಡೀರನೆ ನೀವು ಅಪ್ರೈಸಲ್ ರಚಿಸುತ್ತಿರುವ ನೌಕರರ ಆಯ್ಕೆ .
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},ವೆಚ್ಚ ಸೆಂಟರ್ {0} ಸೇರುವುದಿಲ್ಲ ಕಂಪನಿ {1}
 DocType: Customer,Individual,ಇಂಡಿವಿಜುವಲ್
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,ಹಣಕಾಸು ನಿವ್ವಳ ನಗದು
 DocType: Lead,Address & Contact,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ
 DocType: Leave Allocation,Add unused leaves from previous allocations,ಹಿಂದಿನ ಹಂಚಿಕೆಗಳು ರಿಂದ ಬಳಕೆಯಾಗದ ಎಲೆಗಳು ಸೇರಿಸಿ
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},ಮುಂದಿನ ಮರುಕಳಿಸುವ {0} ಮೇಲೆ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ {1}
@@ -222,6 +223,7 @@
 ,Contact Name,ಸಂಪರ್ಕಿಸಿ ಹೆಸರು
 DocType: Production Plan Item,SO Pending Qty,ಆದ್ದರಿಂದ ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ಮೇಲೆ ತಿಳಿಸಿದ ಮಾನದಂಡಗಳನ್ನು ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸುತ್ತದೆ .
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,ಯಾವುದೇ ವಿವರಣೆ givenName
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ಖರೀದಿ ವಿನಂತಿ .
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,ಕೇವಲ ಆಯ್ದ ಲೀವ್ ಅನುಮೋದಕ ಈ ರಜೆ ಅಪ್ಲಿಕೇಶನ್ ಸಲ್ಲಿಸಬಹುದು
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,ದಿನಾಂಕ ನಿವಾರಿಸುವ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,ವಸ್ತು ವಿಶೇಷತೆಗಳು ವೆಬ್ಸೈಟ್
 DocType: Payment Tool,Reference No,ಉಲ್ಲೇಖ ಯಾವುದೇ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,ವಾರ್ಷಿಕ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಐಟಂ
 DocType: Stock Entry,Sales Invoice No,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ನಂ
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 DocType: Item,Publish in Hub,ಹಬ್ ಪ್ರಕಟಿಸಿ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Bank Reconciliation,Update Clearance Date,ಅಪ್ಡೇಟ್ ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
 DocType: Item,Purchase Details,ಖರೀದಿ ವಿವರಗಳು
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ಖರೀದಿ ಆದೇಶದ &#39;ಕಚ್ಚಾ ವಸ್ತುಗಳ ಸರಬರಾಜು ಕೋಷ್ಟಕದಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ ಐಟಂ {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ಖರೀದಿ ಆದೇಶದ &#39;ಕಚ್ಚಾ ವಸ್ತುಗಳ ಸರಬರಾಜು ಕೋಷ್ಟಕದಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ ಐಟಂ {0} {1}
 DocType: Employee,Relation,ರಿಲೇಶನ್
 DocType: Shipping Rule,Worldwide Shipping,ವಿಶ್ವಾದ್ಯಂತ ಹಡಗು
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ಗ್ರಾಹಕರಿಂದ ಕನ್ಫರ್ಮ್ಡ್ ಆದೇಶಗಳನ್ನು .
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,ಸಲಹೆಗಳು
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,ಈ ಪ್ರದೇಶ ಮೇಲೆ ಐಟಂ ಗುಂಪು ಬಲ್ಲ ಬಜೆಟ್ ಹೊಂದಿಸಲು . ನೀವು ಆದ್ದರಿಂದ ವಿತರಣೆ ಹೊಂದಿಸುವ ಮೂಲಕ ಋತುಗಳು ಒಳಗೊಳ್ಳಬಹುದು.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},ಗೋದಾಮಿನ ಪೋಷಕ ಖಾತೆಯನ್ನು ಗುಂಪು ನಮೂದಿಸಿ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ವಿರುದ್ಧ ಪಾವತಿ {0} {1} ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ವಿರುದ್ಧ ಪಾವತಿ {0} {1} ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {2}
 DocType: Supplier,Address HTML,ವಿಳಾಸ ಎಚ್ಟಿಎಮ್ಎಲ್
 DocType: Lead,Mobile No.,ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Maintenance Schedule,Generate Schedule,ವೇಳಾಪಟ್ಟಿ ರಚಿಸಿ
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ಇತ್ತೀಚಿನ
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,ಮ್ಯಾಕ್ಸ್ 5 ಪಾತ್ರಗಳು
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ಪಟ್ಟಿಯಲ್ಲಿ ಮೊದಲ ಲೀವ್ ಅನುಮೋದಕ ಡೀಫಾಲ್ಟ್ ಲೀವ್ ಅನುಮೋದಕ ಎಂದು ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ
+apps/erpnext/erpnext/config/desktop.py +73,Learn,ಕಲಿಯಿರಿ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ನೌಕರರ ಚಟುವಟಿಕೆಗಳನ್ನು ವೆಚ್ಚ
 DocType: Accounts Settings,Settings for Accounts,ಖಾತೆಗಳಿಗೆ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,ಮಾರಾಟಗಾರನ ಟ್ರೀ ನಿರ್ವಹಿಸಿ .
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,ಮಲ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Payment Reconciliation Invoice,Invoice Type,ಸರಕುಪಟ್ಟಿ ಪ್ರಕಾರ
 DocType: Sales Invoice Item,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,ತೆರಿಗೆಗಳು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,ತೆರಿಗೆಗಳು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,ನೀವು ಹೊರಹಾಕಿದ ನಂತರ ಪಾವತಿ ಎಂಟ್ರಿ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಎಳೆಯಲು ದಯವಿಟ್ಟು.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,ಈ ವಾರ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
 DocType: Workstation,Rent Cost,ಬಾಡಿಗೆ ವೆಚ್ಚ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,ತಿಂಗಳು ವರ್ಷದ ಆಯ್ಕೆಮಾಡಿ
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM , ಡೆಲಿವರಿ ನೋಟ್, ಖರೀದಿ ಸರಕುಪಟ್ಟಿ , ಉತ್ಪಾದನೆ ಆರ್ಡರ್ , ಆರ್ಡರ್ ಖರೀದಿಸಿ , ಖರೀದಿ ರಸೀತಿ , ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ , ಮಾರಾಟದ ಆರ್ಡರ್ , ಸ್ಟಾಕ್ ಎಂಟ್ರಿ , timesheet ಲಭ್ಯವಿದೆ"
 DocType: Item Tax,Tax Rate,ತೆರಿಗೆ ದರ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,ಆಯ್ಕೆ ಐಟಂ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","ಐಟಂ: {0} ಬ್ಯಾಚ್ ಬಲ್ಲ, ಬದಲಿಗೆ ಬಳಸಲು ಸ್ಟಾಕ್ ಎಂಟ್ರಿ \
  ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು ರಾಜಿ ಸಾಧ್ಯವಿಲ್ಲ ನಿರ್ವಹಿಸುತ್ತಿದ್ದ"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ರೋ # {0}: ಬ್ಯಾಚ್ ಯಾವುದೇ ಅದೇ ಇರಬೇಕು {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,ಅ ಗ್ರೂಪ್ ಗೆ ಪರಿವರ್ತಿಸಿ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ಸಲ್ಲಿಸಬೇಕು
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ವೈದ್ಯಕೀಯ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ಸೋತ ಕಾರಣ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,ಏಕೈಕ
 DocType: Issue,Attachment,ಲಗತ್ತು
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,ಬಜೆಟ್ ಗ್ರೂಪ್ ವೆಚ್ಚ ಸೆಂಟರ್ ಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,ಹಾಲಿಡೇ ಮಾಸ್ಟರ್ .
 DocType: Material Request Item,Required Date,ಅಗತ್ಯವಿರುವ ದಿನಾಂಕ
 DocType: Delivery Note,Billing Address,ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ.
 DocType: BOM,Costing,ಕಾಸ್ಟಿಂಗ್
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","ಪರಿಶೀಲಿಸಿದರೆ ಈಗಾಗಲೇ ಮುದ್ರಣ ದರ / ಪ್ರಿಂಟ್ ಪ್ರಮಾಣ ಸೇರಿಸಲಾಗಿದೆ ಎಂದು , ತೆರಿಗೆ ಪ್ರಮಾಣವನ್ನು ಪರಿಗಣಿಸಲಾಗುವುದು"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,ಒಟ್ಟು ಪ್ರಮಾಣ
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
 DocType: Shipping Rule,Net Weight,ನೆಟ್ ತೂಕ
 DocType: Employee,Emergency Phone,ತುರ್ತು ದೂರವಾಣಿ
 ,Serial No Warranty Expiry,ಸೀರಿಯಲ್ ಭರವಸೆಯಿಲ್ಲ ಅಂತ್ಯ
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,ಹೆಚ್ಚಳವನ್ನು 0 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Production Planning Tool,Material Requirement,ಮೆಟೀರಿಯಲ್ ಅವಶ್ಯಕತೆ
 DocType: Company,Delete Company Transactions,ಕಂಪನಿ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅಳಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,ಐಟಂ {0} ಐಟಂ ಖರೀದಿ ಇಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,ಐಟಂ {0} ಐಟಂ ಖರೀದಿ ಇಲ್ಲ
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} 'ಅಧಿಸೂಚನೆ \
  ಇಮೇಲ್ ವಿಳಾಸ' ಅಸಿಂಧುವಾದ ಇಮೇಲ್ ವಿಳಾಸ"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಈ ವರ್ಷ:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,ಸೇರಿಸಿ / ಸಂಪಾದಿಸಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Purchase Invoice,Supplier Invoice No,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ನಂ
 DocType: Territory,For reference,ಪರಾಮರ್ಶೆಗಾಗಿ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","ಅಳಿಸಿಹಾಕಲಾಗದು ಸೀರಿಯಲ್ ಯಾವುದೇ {0}, ಇದು ಸ್ಟಾಕ್ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುತ್ತದೆ"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),ಮುಚ್ಚುವ (ಸಿಆರ್)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),ಮುಚ್ಚುವ (ಸಿಆರ್)
 DocType: Serial No,Warranty Period (Days),ಖಾತರಿ ಕಾಲ (ದಿನಗಳು)
 DocType: Installation Note Item,Installation Note Item,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ ಐಟಂ
 ,Pending Qty,ಬಾಕಿ ಪ್ರಮಾಣ
@@ -466,7 +469,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** ಮಾಸಿಕ ವಿತರಣೆ ** ನಿಮ್ಮ ವ್ಯವಹಾರದಲ್ಲಿ ನೀವು ಋತುಗಳು ಹೊಂದಿದ್ದರೆ ನೀವು ತಿಂಗಳ ಅಡ್ಡಲಾಗಿ ನಿಮ್ಮ ಬಜೆಟ್ ವಿತರಿಸಲು ನೆರವಾಗುತ್ತದೆ.
 
 , ಈ ವಿತರಣಾ ಬಳಸಿಕೊಂಡು ಒಂದು ಬಜೆಟ್ ವಿತರಿಸಲು ** ವೆಚ್ಚ ಕೇಂದ್ರದಲ್ಲಿ ** ಈ ** ಮಾಸಿಕ ವಿತರಣೆ ಹೊಂದಿಸಲು **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,ಸರಕುಪಟ್ಟಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,ಸರಕುಪಟ್ಟಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,ಮೊದಲ ಕಂಪನಿ ಮತ್ತು ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,ಹಣಕಾಸು / ಲೆಕ್ಕಪರಿಶೋಧಕ ವರ್ಷ .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ಕ್ಷಮಿಸಿ, ಸೀರಿಯಲ್ ಸೂಲ ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
@@ -474,9 +477,9 @@
 DocType: Project Task,Project Task,ಪ್ರಾಜೆಕ್ಟ್ ಟಾಸ್ಕ್
 ,Lead Id,ಲೀಡ್ ಸಂ
 DocType: C-Form Invoice Detail,Grand Total,ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಮಾಡಬಾರದು
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಮಾಡಬಾರದು
 DocType: Warranty Claim,Resolution,ವಿಶ್ಲೇಷಣ
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},ತಲುಪಿಸಲಾಗಿದೆ: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},ತಲುಪಿಸಲಾಗಿದೆ: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,ಕೊಡಬೇಕಾದ ಖಾತೆ
 DocType: Sales Order,Billing and Delivery Status,ಬಿಲ್ಲಿಂಗ್ ಮತ್ತು ಡೆಲಿವರಿ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ಮತ್ತೆ ಗ್ರಾಹಕರ
@@ -491,7 +494,7 @@
 DocType: Quotation,Quotation To,ಉದ್ಧರಣಾ
 DocType: Lead,Middle Income,ಮಧ್ಯಮ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ತೆರೆಯುತ್ತಿದೆ ( ಸಿಆರ್)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 DocType: Purchase Order Item,Billed Amt,ಖ್ಯಾತವಾದ ಕಚೇರಿ
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಮಾಡಲಾಗುತ್ತದೆ ಇದು ವಿರುದ್ಧ ತಾರ್ಕಿಕ ವೇರ್ಹೌಸ್.
@@ -500,7 +503,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,ಪ್ರೊಪೋಸಲ್ ಬರವಣಿಗೆ
 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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},ನಿರಾಕರಣೆಗಳು ಸ್ಟಾಕ್ ದೋಷ ( {6} ) ಐಟಂ {0} ಮೇಲೆ {1} ವೇರ್ಹೌಸ್ {2} {3} ಗೆ {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},ನಿರಾಕರಣೆಗಳು ಸ್ಟಾಕ್ ದೋಷ ( {6} ) ಐಟಂ {0} ಮೇಲೆ {1} ವೇರ್ಹೌಸ್ {2} {3} ಗೆ {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,ಹಣಕಾಸಿನ ವರ್ಷ ಕಂಪನಿ
 DocType: Packing Slip Item,DN Detail,ಡಿ ವಿವರ
 DocType: Time Log,Billed,ಖ್ಯಾತವಾದ
@@ -519,16 +522,17 @@
 DocType: Activity Type,Default Costing Rate,ಡೀಫಾಲ್ಟ್ ಕಾಸ್ಟಿಂಗ್ ದರ
 DocType: Maintenance Schedule,Maintenance Schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","ನಂತರ ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ಗ್ರಾಹಕ ಆಧಾರಿತ ಸೋಸುತ್ತವೆ, ಗ್ರಾಹಕ ಗುಂಪಿನ, ಪ್ರದೇಶ, ಸರಬರಾಜುದಾರ, ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ, ಪ್ರಚಾರ, ಮಾರಾಟದ ಸಂಗಾತಿ ಇತ್ಯಾದಿ"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,ಇನ್ವೆಂಟರಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Employee,Passport Number,ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,ವ್ಯವಸ್ಥಾಪಕ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,ಖರೀದಿ ಸ್ವೀಕರಿಸಿದ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,ಅದೇ ಐಟಂ ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,ಖರೀದಿ ಸ್ವೀಕರಿಸಿದ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,ಅದೇ ಐಟಂ ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ.
 DocType: SMS Settings,Receiver Parameter,ಸ್ವೀಕರಿಸುವವರ ನಿಯತಾಂಕಗಳನ್ನು
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'ಆಧರಿಸಿ ' ಮತ್ತು ' ಗುಂಪಿನ ' ಇರಲಾಗುವುದಿಲ್ಲ
 DocType: Sales Person,Sales Person Targets,ಮಾರಾಟಗಾರನ ಗುರಿ
 DocType: Production Order Operation,In minutes,ನಿಮಿಷಗಳಲ್ಲಿ
 DocType: Issue,Resolution Date,ರೆಸಲ್ಯೂಶನ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 DocType: Selling Settings,Customer Naming By,ಗ್ರಾಹಕ ಹೆಸರಿಸುವ ಮೂಲಕ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,ಗ್ರೂಪ್ ಗೆ ಪರಿವರ್ತಿಸಿ
 DocType: Activity Cost,Activity Type,ಚಟುವಟಿಕೆ ವಿಧ
@@ -539,7 +543,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} ಸರಕುಪಟ್ಟಿ ವಿವರಗಳು ಟೇಬಲ್ ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ಭೇಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 DocType: Material Request,Material Transfer,ವಸ್ತು ವರ್ಗಾವಣೆ
@@ -561,13 +565,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,ಮಾರ್ಕೆಟಿಂಗ್
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,ಅವರ ಸರಣಿ ಸೂಲ ಆಧರಿಸಿ ಮಾರಾಟ ಮತ್ತು ಖರೀದಿ ದಾಖಲೆಗಳನ್ನು ಐಟಂ ಅನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಲು . ಆದ್ದರಿಂದ ಉತ್ಪನ್ನದ ಖಾತರಿ ವಿವರಗಳು ಪತ್ತೆಹಚ್ಚಲು ಬಳಸಲಾಗುತ್ತದೆ ಮಾಡಬಹುದು ಇದೆ .
 DocType: Purchase Receipt Item Supplied,Current Stock,ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ವೇರ್ಹೌಸ್ regected ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,ಈ ವರ್ಷ ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್
 DocType: Account,Expenses Included In Valuation,ವೆಚ್ಚಗಳು ಮೌಲ್ಯಾಂಕನ ಸೇರಿಸಲಾಗಿದೆ
 DocType: Employee,Provide email id registered in company,ಕಂಪನಿಗಳು ನೋಂದಣಿ ಇಮೇಲ್ ಐಡಿ ಒದಗಿಸಿ
 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 +533,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ಟ್ರೀ ಕೌಟುಂಬಿಕತೆ
@@ -585,18 +589,18 @@
 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 +92,{0} is not a stock Item,{0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Mode of Payment Account,Default Account,ಡೀಫಾಲ್ಟ್ ಖಾತೆ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,ಅವಕಾಶ ಪ್ರಮುಖ ತಯಾರಿಸಲಾಗುತ್ತದೆ ವೇಳೆ ಲೀಡ್ ಸೆಟ್ ಮಾಡಬೇಕು
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,ಸಾಪ್ತಾಹಿಕ ದಿನ ಆಫ್ ಆಯ್ಕೆಮಾಡಿ
 DocType: Production Order Operation,Planned End Time,ಯೋಜಿತ ಎಂಡ್ ಟೈಮ್
 ,Sales Person Target Variance Item Group-Wise,ಮಾರಾಟಗಾರನ ಟಾರ್ಗೆಟ್ ವೈಷಮ್ಯವನ್ನು ಐಟಂ ಗ್ರೂಪ್ ವೈಸ್
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Delivery Note,Customer's Purchase Order No,ಗ್ರಾಹಕರ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ನಂ
 DocType: Employee,Cell Number,ಸೆಲ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ಆಟೋ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ರಚಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ಲಾಸ್ಟ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,ನೀವು ಕಾಲಮ್ 'ಜರ್ನಲ್ ಎಂಟ್ರಿ ವಿರುದ್ಧ' ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಚೀಟಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,ನೀವು ಕಾಲಮ್ 'ಜರ್ನಲ್ ಎಂಟ್ರಿ ವಿರುದ್ಧ' ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಚೀಟಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ಶಕ್ತಿ
 DocType: Opportunity,Opportunity From,ಅವಕಾಶದಿಂದ
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,ಮಾಸಿಕ ವೇತನವನ್ನು ಹೇಳಿಕೆ .
@@ -605,9 +609,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: ಗೆ {0} ರೀತಿಯ {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ರೋ {0}: ಪರಿವರ್ತಿಸುವುದರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳು ಲೀಫ್ ನೋಡ್ಗಳು ವಿರುದ್ಧ ಮಾಡಬಹುದು. ಗುಂಪುಗಳ ವಿರುದ್ಧ ನಮೂದುಗಳು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಇತರ BOMs ಸಂಬಂಧ ಇದೆ ಎಂದು ಬಿಒಎಮ್ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಇತರ BOMs ಸಂಬಂಧ ಇದೆ ಎಂದು ಬಿಒಎಮ್ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Opportunity,Maintenance,ಸಂರಕ್ಷಣೆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},ಐಟಂ ಅಗತ್ಯವಿದೆ ಖರೀದಿ ರಸೀತಿ ಸಂಖ್ಯೆ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},ಐಟಂ ಅಗತ್ಯವಿದೆ ಖರೀದಿ ರಸೀತಿ ಸಂಖ್ಯೆ {0}
 DocType: Item Attribute Value,Item Attribute Value,ಐಟಂ ಮೌಲ್ಯ ಲಕ್ಷಣ
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,ಮಾರಾಟದ ಶಿಬಿರಗಳನ್ನು .
 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.
@@ -665,7 +669,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
 DocType: Employee,Family Background,ಕೌಟುಂಬಿಕ ಹಿನ್ನೆಲೆ
 DocType: Process Payroll,Send Email,ಇಮೇಲ್ ಕಳುಹಿಸಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,ಯಾವುದೇ ಅನುಮತಿ
 DocType: Company,Default Bank Account,ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ ಖಾತೆ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ಪಕ್ಷದ ಆಧಾರದ ಮೇಲೆ ಫಿಲ್ಟರ್ ಆರಿಸಿ ಪಕ್ಷದ ಮೊದಲ ನೀಡಿರಿ
@@ -673,7 +677,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,ಸೂಲ
 DocType: Item,Items with higher weightage will be shown higher,ಹೆಚ್ಚಿನ ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು ಹೊಂದಿರುವ ಐಟಂಗಳು ಹೆಚ್ಚಿನ ತೋರಿಸಲಾಗುತ್ತದೆ
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ ವಿವರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,ನನ್ನ ಇನ್ವಾಯ್ಸ್ಗಳು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,ನನ್ನ ಇನ್ವಾಯ್ಸ್ಗಳು
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,ಯಾವುದೇ ನೌಕರ
 DocType: Purchase Order,Stopped,ನಿಲ್ಲಿಸಿತು
 DocType: Item,If subcontracted to a vendor,ಮಾರಾಟಗಾರರ ಗೆ subcontracted ವೇಳೆ
@@ -683,6 +687,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ಈಗ ಕಳುಹಿಸಿ
 ,Support Analytics,ಬೆಂಬಲ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Item,Website Warehouse,ವೆಬ್ಸೈಟ್ ವೇರ್ಹೌಸ್
+DocType: Payment Reconciliation,Minimum Invoice Amount,ಕನಿಷ್ಠ ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣವನ್ನು
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ಸ್ವಯಂ ಸರಕುಪಟ್ಟಿ 05, 28 ಇತ್ಯಾದಿ ಉದಾ ರಚಿಸಲಾಗಿದೆ ಮೇಲೆ ತಿಂಗಳ ದಿನ"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ಸ್ಕೋರ್ ಕಡಿಮೆ ಅಥವಾ 5 ಸಮಾನವಾಗಿರಬೇಕು
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,ಸಿ ಆಕಾರ ರೆಕಾರ್ಡ್ಸ್
@@ -692,7 +697,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;ಮಾರಾಟದ&quot; ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಲು
 DocType: Bin,Moving Average Rate,ಮೂವಿಂಗ್ ಸರಾಸರಿ ದರ
 DocType: Production Planning Tool,Select Items,ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} ಬಿಲ್ ವಿರುದ್ಧ {1} ರ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} ಬಿಲ್ ವಿರುದ್ಧ {1} ರ {2}
 DocType: Maintenance Visit,Completion Status,ಪೂರ್ಣಗೊಂಡ ಸ್ಥಿತಿ
 DocType: Sales Invoice Item,Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
 DocType: Item,Allow over delivery or receipt upto this percent,ಈ ಶೇಕಡಾ ವರೆಗೆ ವಿತರಣೆ ಅಥವಾ ರಶೀದಿ ಮೇಲೆ ಅವಕಾಶ
@@ -704,7 +709,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವ್ಯವಹಾರಗಳ ಸಲ್ಲಿಕೆಯಲ್ಲಿ ಸಂದೇಶವನ್ನು ರಚಿಸಿದರು .
 DocType: Production Order,Item To Manufacture,ತಯಾರಿಸಲು ಐಟಂ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} ಸ್ಥಿತಿ {2} ಆಗಿದೆ
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,ಪಾವತಿ ಆರ್ಡರ್ ಖರೀದಿಸಿ
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,ಪಾವತಿ ಆರ್ಡರ್ ಖರೀದಿಸಿ
 DocType: Sales Order Item,Projected Qty,ಪ್ರಮಾಣ ಯೋಜಿತ
 DocType: Sales Invoice,Payment Due Date,ಪಾವತಿ ಕಾರಣ ದಿನಾಂಕ
 DocType: Newsletter,Newsletter Manager,ಸುದ್ದಿಪತ್ರ ಮ್ಯಾನೇಜರ್
@@ -728,7 +733,7 @@
 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 +304,Point-of-Sale,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","ಖಾತೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ರೆಡಿಟ್, ನೀವು ಹೊಂದಿಸಲು ಅನುಮತಿ ಇಲ್ಲ 'ಡೆಬಿಟ್' ಎಂದು 'ಬ್ಯಾಲೆನ್ಸ್ ಇರಲೇಬೇಕು'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","ಖಾತೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ರೆಡಿಟ್, ನೀವು ಹೊಂದಿಸಲು ಅನುಮತಿ ಇಲ್ಲ 'ಡೆಬಿಟ್' ಎಂದು 'ಬ್ಯಾಲೆನ್ಸ್ ಇರಲೇಬೇಕು'"
 DocType: Account,Balance must be,ಬ್ಯಾಲೆನ್ಸ್ ಇರಬೇಕು
 DocType: Hub Settings,Publish Pricing,ಬೆಲೆ ಪ್ರಕಟಿಸಿ
 DocType: Notification Control,Expense Claim Rejected Message,ಖರ್ಚು ಹೇಳಿಕೆಯನ್ನು ತಿರಸ್ಕರಿಸಿದರು ಸಂದೇಶ
@@ -751,7 +756,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರ ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,ಮೊದಲ ದಾಖಲೆ ಪ್ರಕಾರ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ಈ ನಿರ್ವಹಣೆ ಭೇಟಿ ರದ್ದು ಮೊದಲು ವಸ್ತು ಭೇಟಿ {0} ರದ್ದು
 DocType: Salary Slip,Leave Encashment Amount,ನಗದೀಕರಣ ಪ್ರಮಾಣ ಬಿಡಿ
@@ -769,17 +774,17 @@
 DocType: Supplier,Default Payable Accounts,ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,ನೌಕರರ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Features Setup,Item Barcode,ಐಟಂ ಬಾರ್ಕೋಡ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ಸರಕುಪಟ್ಟಿ ಮುಂಗಡ ಖರೀದಿ
 DocType: Address,Shop,ಅಂಗಡಿ
 DocType: Hub Settings,Sync Now,ಸಿಂಕ್ ಈಗ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},ಸಾಲು {0}: ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},ಸಾಲು {0}: ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ಈ ಕ್ರಮವನ್ನು ಆಯ್ಕೆ ಮಾಡಿದಾಗ ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪಿಓಎಸ್ ಸರಕುಪಟ್ಟಿ ರಲ್ಲಿ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
 DocType: Employee,Permanent Address Is,ಖಾಯಂ ವಿಳಾಸ ಈಸ್
 DocType: Production Order Operation,Operation completed for how many finished goods?,ಆಪರೇಷನ್ ಎಷ್ಟು ಸಿದ್ಧಪಡಿಸಿದ ವಸ್ತುಗಳನ್ನು ಪೂರ್ಣಗೊಂಡಿತು?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ಬ್ರ್ಯಾಂಡ್
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}.
 DocType: Employee,Exit Interview Details,ಎಕ್ಸಿಟ್ ಸಂದರ್ಶನ ವಿವರಗಳು
 DocType: Item,Is Purchase Item,ಖರೀದಿ ಐಟಂ
 DocType: Journal Entry Account,Purchase Invoice,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ
@@ -791,7 +796,7 @@
 DocType: Salary Slip,Total in words,ಪದಗಳನ್ನು ಒಟ್ಟು
 DocType: Material Request Item,Lead Time Date,ಲೀಡ್ ಟೈಮ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ ರಚಿಸಲಾಗಲಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},ರೋ # {0}: ಐಟಂ ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},ರೋ # {0}: ಐಟಂ ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","&#39;ಉತ್ಪನ್ನ ಕಟ್ಟು&#39; ಐಟಂಗಳನ್ನು, ವೇರ್ಹೌಸ್, ಸೀರಿಯಲ್ ಯಾವುದೇ ಮತ್ತು ಬ್ಯಾಚ್ ಯಾವುದೇ &#39;ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ ಮೇಜಿನಿಂದ ಪರಿಗಣಿಸಲಾಗುವುದು. ವೇರ್ಹೌಸ್ ಮತ್ತು ಬ್ಯಾಚ್ ಯಾವುದೇ ಯಾವುದೇ &#39;ಉತ್ಪನ್ನ ಕಟ್ಟು&#39; ಐಟಂ ಎಲ್ಲಾ ಪ್ಯಾಕಿಂಗ್ ವಸ್ತುಗಳನ್ನು ಅದೇ ಇದ್ದರೆ, ಆ ಮೌಲ್ಯಗಳು ಮುಖ್ಯ ಐಟಂ ಕೋಷ್ಟಕದಲ್ಲಿ ಪ್ರವೇಶಿಸಬಹುದಾದ, ಮೌಲ್ಯಗಳನ್ನು ಟೇಬಲ್ &#39;ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ&#39; ನಕಲು ನಡೆಯಲಿದೆ."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ಗ್ರಾಹಕರಿಗೆ ರವಾನಿಸಲಾಯಿತು .
 DocType: Purchase Invoice Item,Purchase Order Item,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂ
@@ -800,14 +805,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,ಭಿನ್ನಾಭಿಪ್ರಾಯ
 ,Company Name,ಕಂಪನಿ ಹೆಸರು
 DocType: SMS Center,Total Message(s),ಒಟ್ಟು ಸಂದೇಶ (ಗಳು)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,ಅಲ್ಲಿ ಚೆಕ್ ಠೇವಣಿ ಏನು ಬ್ಯಾಂಕ್ ಖಾತೆ ಮುಖ್ಯಸ್ಥ ಆಯ್ಕೆ .
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ಬಳಕೆದಾರ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬೆಲೆ ಪಟ್ಟಿ ದರ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಿ
 DocType: Pricing Rule,Max Qty,ಮ್ಯಾಕ್ಸ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,ರಾಸಾಯನಿಕ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವರ್ಗಾಯಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವರ್ಗಾಯಿಸಲಾಗಿದೆ.
 DocType: Process Payroll,Select Payroll Year and Month,ವೇತನದಾರರ ವರ್ಷ ಮತ್ತು ತಿಂಗಳು ಆಯ್ಕೆ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",ಸೂಕ್ತ ಗುಂಪು (ಸಾಮಾನ್ಯವಾಗಿ ಫಂಡ್ಸ್ ಅಪ್ಲಿಕೇಶನ್&gt; ಪ್ರಸಕ್ತ ಆಸ್ತಿಪಾಸ್ತಿಗಳು&gt; ಬ್ಯಾಂಕ್ ಖಾತೆಗಳ ಹೋಗಿ ರೀತಿಯ) ಮಕ್ಕಳ ಸೇರಿಸಿ ಕ್ಲಿಕ್ಕಿಸಿ (ಒಂದು ಹೊಸ ಖಾತೆ ರಚಿಸಿ &quot;ಬ್ಯಾಂಕ್&quot;
 DocType: Workstation,Electricity Cost,ವಿದ್ಯುತ್ ಬೆಲೆ
@@ -821,10 +827,10 @@
 DocType: SMS Center,All Lead (Open),ಎಲ್ಲಾ ಪ್ರಮುಖ ( ಓಪನ್ )
 DocType: Purchase Invoice,Get Advances Paid,ಪಾವತಿಸಿದ ಅಡ್ವಾನ್ಸಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,ನಿಮ್ಮ ಚಿತ್ರ ಲಗತ್ತಿಸಿ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,ಮಾಡಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,ಮಾಡಿ
 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 +3,My Cart,ನನ್ನ ಕಾರ್ಟ್
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,ನನ್ನ ಕಾರ್ಟ್
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,ಆರಂಭಿಕ ಪ್ರಮಾಣ
@@ -843,10 +849,10 @@
 DocType: POS Profile,Cash/Bank Account,ನಗದು / ಬ್ಯಾಂಕ್ ಖಾತೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಐಟಂಗಳನ್ನು.
 DocType: Delivery Note,Delivery To,ವಿತರಣಾ
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
 DocType: Production Planning Tool,Get Sales Orders,ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,ರಿಯಾಯಿತಿ
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,ರಿಯಾಯಿತಿ
 DocType: Features Setup,Purchase Discounts,ರಿಯಾಯಿತಿಯು ಖರೀದಿಸಿ
 DocType: Workstation,Wages,ವೇತನ
 DocType: Time Log,Will be updated only if Time Log is 'Billable',ಟೈಮ್ ಲಾಗ್ &#39;ಬಿಲ್ ಮಾಡಬಹುದಾದ&#39; ವೇಳೆ ಮಾತ್ರ ನವೀಕರಿಸಲಾಗುತ್ತದೆ
@@ -871,7 +877,7 @@
 DocType: Tax Rule,Shipping State,ಶಿಪ್ಪಿಂಗ್ ರಾಜ್ಯ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ಐಟಂ ಬಟನ್ 'ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ರಿಂದ ಐಟಂಗಳು ಪಡೆಯಿರಿ' ಬಳಸಿಕೊಂಡು ಸೇರಿಸಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ಮಾರಾಟ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಬೈಯಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಬೈಯಿಂಗ್
 DocType: GL Entry,Against,ವಿರುದ್ಧವಾಗಿ
 DocType: Item,Default Selling Cost Center,ಡೀಫಾಲ್ಟ್ ಮಾರಾಟ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Partner,Implementation Partner,ಅನುಷ್ಠಾನ ಸಂಗಾತಿ
@@ -913,6 +919,7 @@
 DocType: Sales Partner,Distributor,ವಿತರಕ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',ಸೆಟ್ &#39;ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸು&#39; ದಯವಿಟ್ಟು
 ,Ordered Items To Be Billed,ಖ್ಯಾತವಾದ ಐಟಂಗಳನ್ನು ಆದೇಶ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,ರೇಂಜ್ ಕಡಿಮೆ ಎಂದು ಹೊಂದಿದೆ ಹೆಚ್ಚಾಗಿ ಶ್ರೇಣಿಗೆ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,ಟೈಮ್ ದಾಖಲೆಗಳು ಆಯ್ಕೆ ಮತ್ತು ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ರಚಿಸಲು ಸಲ್ಲಿಸಿ .
@@ -922,13 +929,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,ಈ ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್ ಎನಿಸಿದೆ.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,ಅವಕಾಶ ರಚಿಸಿ
 DocType: Salary Slip,Leave Without Pay,ಪೇ ಇಲ್ಲದೆ ಬಿಡಿ
-DocType: Supplier,Communications,ಸಂಪರ್ಕ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ ದೋಷ
 ,Trial Balance for Party,ಪಕ್ಷದ ಟ್ರಯಲ್ ಬ್ಯಾಲೆನ್ಸ್
 DocType: Lead,Consultant,ಕನ್ಸಲ್ಟೆಂಟ್
 DocType: Salary Slip,Earnings,ಅರ್ನಿಂಗ್ಸ್
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,ಮುಗಿದ ಐಟಂ {0} ತಯಾರಿಕೆ ರೀತಿಯ ಪ್ರವೇಶ ನಮೂದಿಸಲಾಗುವ
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,ತೆರೆಯುವ ಲೆಕ್ಕಪರಿಶೋಧಕ ಬ್ಯಾಲೆನ್ಸ್
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,ಮುಗಿದ ಐಟಂ {0} ತಯಾರಿಕೆ ರೀತಿಯ ಪ್ರವೇಶ ನಮೂದಿಸಲಾಗುವ
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ತೆರೆಯುವ ಲೆಕ್ಕಪರಿಶೋಧಕ ಬ್ಯಾಲೆನ್ಸ್
 DocType: Sales Invoice Advance,Sales Invoice Advance,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಡ್ವಾನ್ಸ್
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,ಮನವಿ ನಥಿಂಗ್
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' ನಿಜವಾದ ಆರಂಭ ದಿನಾಂಕ ' ಗ್ರೇಟರ್ ದ್ಯಾನ್ ' ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ ' ಸಾಧ್ಯವಿಲ್ಲ
@@ -970,7 +976,7 @@
 DocType: Global Defaults,Current Fiscal Year,ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ
 DocType: Global Defaults,Disable Rounded Total,ದುಂಡಾದ ಒಟ್ಟು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Lead,Call,ಕರೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' ನಮೂದುಗಳು ' ಖಾಲಿ ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,' ನಮೂದುಗಳು ' ಖಾಲಿ ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},ನಕಲು ಸಾಲು {0} {1} ಒಂದೇ ಜೊತೆ
 ,Trial Balance,ಟ್ರಯಲ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ನೌಕರರು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
@@ -982,9 +988,9 @@
 DocType: Contact,User ID,ಬಳಕೆದಾರ ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,ವೀಕ್ಷಿಸು ಲೆಡ್ಜರ್
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ಮುಂಚಿನ
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
 DocType: Production Order,Manufacture against Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ತಯಾರಿಸಲು
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,ಗ್ರಾಸ್ ಪೇ
@@ -1014,7 +1020,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆ ಸಂಪಾದಿಸಲು ಅಧಿಕಾರ {0}
 DocType: Journal Entry,Get Outstanding Invoices,ಮಹೋನ್ನತ ಇನ್ವಾಯ್ಸಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಮಾನ್ಯವಾಗಿಲ್ಲ
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1027,13 +1033,13 @@
 DocType: Employee,Place of Issue,ಸಂಚಿಕೆ ಪ್ಲೇಸ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ಒಪ್ಪಂದ
 DocType: Email Digest,Add Quote,ಉದ್ಧರಣ ಸೇರಿಸಿ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM ಅಗತ್ಯವಿದೆ UOM coversion ಫ್ಯಾಕ್ಟರ್: {0} ಐಟಂ ರಲ್ಲಿ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM ಅಗತ್ಯವಿದೆ UOM coversion ಫ್ಯಾಕ್ಟರ್: {0} ಐಟಂ ರಲ್ಲಿ: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,ಪರೋಕ್ಷ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ರೋ {0}: ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,ವ್ಯವಸಾಯ
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಸೇವೆಗಳನ್ನು
 DocType: Mode of Payment,Mode of Payment,ಪಾವತಿಯ ಮಾದರಿಯು
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಐಟಂ ಗುಂಪು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 DocType: Journal Entry Account,Purchase Order,ಪರ್ಚೇಸ್ ಆರ್ಡರ್
 DocType: Warehouse,Warehouse Contact Info,ವೇರ್ಹೌಸ್ ಸಂಪರ್ಕ ಮಾಹಿತಿ
@@ -1042,8 +1048,8 @@
 DocType: Email Digest,Annual Income,ವಾರ್ಷಿಕ ಆದಾಯ
 DocType: Serial No,Serial No Details,ಯಾವುದೇ ಸೀರಿಯಲ್ ವಿವರಗಳು
 DocType: Purchase Invoice Item,Item Tax Rate,ಐಟಂ ತೆರಿಗೆ ದರ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,ಐಟಂ {0} ಒಂದು ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ಸಲಕರಣಾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ಬೆಲೆ ರೂಲ್ ಮೊದಲ ಐಟಂ, ಐಟಂ ಗುಂಪು ಅಥವಾ ಬ್ರಾಂಡ್ ಆಗಿರಬಹುದು, ಕ್ಷೇತ್ರದಲ್ಲಿ 'ರಂದು ಅನ್ವಯಿಸು' ಆಧಾರದ ಮೇಲೆ ಆಯ್ಕೆ."
@@ -1053,7 +1059,7 @@
 DocType: Appraisal Goal,Goal,ಗುರಿ
 DocType: Sales Invoice Item,Edit Description,ಸಂಪಾದಿಸಿ ವಿವರಣೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಪ್ಲಾನ್ಡ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಗಿಂತ ಕಡಿಮೆಯಾಗಿದೆ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,ಸರಬರಾಜುದಾರನ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,ಸರಬರಾಜುದಾರನ
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ AccountType ವ್ಯವಹಾರಗಳಲ್ಲಿ ಈ ಖಾತೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡುತ್ತದೆ .
 DocType: Purchase Invoice,Grand Total (Company Currency),ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ಒಟ್ಟು ಹೊರಹೋಗುವ
@@ -1066,7 +1072,7 @@
 DocType: Journal Entry,Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ
 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 +427,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,ಈ ಪೂರ್ವನಾಮವನ್ನು ಹೊಂದಿರುವ ಲೋಡ್ ದಾಖಲಿಸಿದವರು ವ್ಯವಹಾರದ ಸಂಖ್ಯೆ
@@ -1098,7 +1104,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","ಸಂಪರ್ಕಗಳಿಗೆ ಸುದ್ದಿಪತ್ರಗಳು , ಕಾರಣವಾಗುತ್ತದೆ ."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,ಕಾರ್ಯಾಚರಣೆ ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,ಕಾರ್ಯಾಚರಣೆ ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ.
 ,Delivered Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ವಿತರಿಸಲಾಯಿತು ಐಟಂಗಳು
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ವೇರ್ಹೌಸ್ ನೆಯ ಬದಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ .
 DocType: Authorization Rule,Average Discount,ಸರಾಸರಿ ರಿಯಾಯಿತಿ
@@ -1113,7 +1119,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},ಗೆ {0} | {1} {2}
 DocType: BOM Operation,Operation Description,OperationDescription
 DocType: Item,Will also apply to variants,ಸಹ ರೂಪಾಂತರಗಳು ಅನ್ವಯಿಸುತ್ತದೆ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷ ಉಳಿಸಲಾಗಿದೆ ಒಮ್ಮೆ ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷ ಉಳಿಸಲಾಗಿದೆ ಒಮ್ಮೆ ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Quotation,Shopping Cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,ಆವರೇಜ್ ಡೈಲಿ ಹೊರಹೋಗುವ
 DocType: Pricing Rule,Campaign,ದಂಡಯಾತ್ರೆ
@@ -1124,7 +1130,8 @@
 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 +211,Stock Entries already created for Production Order ,ಈಗಾಗಲೇ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ದಾಖಲಿಸಿದವರು ಸ್ಟಾಕ್ ನಮೂದುಗಳು
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ಈಗಾಗಲೇ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ದಾಖಲಿಸಿದವರು ಸ್ಟಾಕ್ ನಮೂದುಗಳು
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,ಸ್ಥಿರ ಸಂಪತ್ತಾದ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ಎಲ್ಲಾ ಅಂಕಿತಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},ಮ್ಯಾಕ್ಸ್: {0}
@@ -1136,7 +1143,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ಖಾತೆಗಳ ಚಾರ್ಟ್
 DocType: Material Request,Terms and Conditions Content,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿಷಯ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Maintenance Visit,Unscheduled,ಅನಿಗದಿತ
 DocType: Employee,Owned,ಸ್ವಾಮ್ಯದ
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಅವಲಂಬಿಸಿರುತ್ತದೆ
@@ -1174,7 +1181,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,ಉಪ ಅಸೆಂಬ್ಲೀಸ್
 DocType: Shipping Rule Condition,To Value,ಮೌಲ್ಯ
 DocType: Supplier,Stock Manager,ಸ್ಟಾಕ್ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},ಮೂಲ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
+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 +581,Packing Slip,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ಕಚೇರಿ ಬಾಡಿಗೆ
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,ಸೆಟಪ್ SMS ಗೇಟ್ವೇ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
@@ -1182,10 +1189,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ಯಾವುದೇ ವಿಳಾಸ ಇನ್ನೂ ಸೇರಿಸಲಾಗಿದೆ.
 DocType: Workstation Working Hour,Workstation Working Hour,ಕಾರ್ಯಸ್ಥಳ ವರ್ಕಿಂಗ್ ಅವರ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,ವಿಶ್ಲೇಷಕ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ಸಾಲು {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಜಂಟಿ ಉದ್ಯಮ ಪ್ರಮಾಣದ ಸಮ ಮಾಡಬೇಕು {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ಸಾಲು {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಜಂಟಿ ಉದ್ಯಮ ಪ್ರಮಾಣದ ಸಮ ಮಾಡಬೇಕು {2}
 DocType: Item,Inventory,ತಪಶೀಲು ಪಟ್ಟಿ
 DocType: Features Setup,"To enable ""Point of Sale"" view",ವೀಕ್ಷಿಸಿ &quot;ಮಾರಾಟದ&quot; ಶಕ್ತಗೊಳಿಸಲು
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,ಪಾವತಿ ಖಾಲಿ ಕಾರ್ಟ್ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,ಪಾವತಿ ಖಾಲಿ ಕಾರ್ಟ್ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item,Sales Details,ಮಾರಾಟದ ವಿವರಗಳು
 DocType: Opportunity,With Items,ವಸ್ತುಗಳು
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,ಸೇರಿಸಿ ಪ್ರಮಾಣ
@@ -1200,10 +1207,11 @@
 DocType: Cost Center,Parent Cost Center,ಪೋಷಕ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Invoice,Source,ಮೂಲ
 DocType: Leave Type,Is Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಇದೆ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,ಪಾವತಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,ಪಾವತಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,ಹಣಕಾಸು ವರ್ಷದ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Employee External Work History,Total Experience,ಒಟ್ಟು ಅನುಭವ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ (ಗಳು) ರದ್ದು
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ (ಗಳು) ರದ್ದು
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,ಹೂಡಿಕೆ ಹಣದ ಹರಿವನ್ನು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ಸರಕು ಮತ್ತು ಸಾಗಣೆಯನ್ನು ಚಾರ್ಜಸ್
 DocType: Material Request Item,Sales Order No,ಮಾರಾಟದ ಆದೇಶ ಸಂಖ್ಯೆ
 DocType: Item Group,Item Group Name,ಐಟಂ ಗುಂಪು ಹೆಸರು
@@ -1211,12 +1219,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,ತಯಾರಿಕೆಗೆ ವರ್ಗಾವಣೆ ಮೆಟೀರಿಯಲ್ಸ್
 DocType: Pricing Rule,For Price List,ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ಕಾರ್ಯನಿರ್ವಾಹಕ ಹುಡುಕು
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ಐಟಂ ಖರೀದಿ ದರ: {0} ಕಂಡುಬಂದಿಲ್ಲ, ಲೆಕ್ಕಪರಿಶೋಧಕ ಪ್ರವೇಶ (ಹೊಣೆಗಾರಿಕೆ) ಪುಸ್ತಕ ಬೇಕಾಗಿತ್ತು. ಒಂದು ಖರೀದಿಸುವ ಬೆಲೆ ಪಟ್ಟಿ ವಿರುದ್ಧ ಐಟಂ ಬೆಲೆ ನೀಡಿರಿ."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ಐಟಂ ಖರೀದಿ ದರ: {0} ಕಂಡುಬಂದಿಲ್ಲ, ಲೆಕ್ಕಪರಿಶೋಧಕ ಪ್ರವೇಶ (ಹೊಣೆಗಾರಿಕೆ) ಪುಸ್ತಕ ಬೇಕಾಗಿತ್ತು. ಒಂದು ಖರೀದಿಸುವ ಬೆಲೆ ಪಟ್ಟಿ ವಿರುದ್ಧ ಐಟಂ ಬೆಲೆ ನೀಡಿರಿ."
 DocType: Maintenance Schedule,Schedules,ವೇಳಾಪಟ್ಟಿಗಳು
 DocType: Purchase Invoice Item,Net Amount,ನೆಟ್ ಪ್ರಮಾಣ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM ವಿವರ ಯಾವುದೇ
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},ದೋಷ : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},ದೋಷ : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,ಖಾತೆಗಳ ಚಾರ್ಟ್ ಹೊಸ ಖಾತೆಯನ್ನು ರಚಿಸಿ.
 DocType: Maintenance Visit,Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ಗ್ರಾಹಕ> ಗ್ರಾಹಕ ಗುಂಪಿನ> ಪ್ರದೇಶ
@@ -1242,7 +1250,7 @@
 DocType: Sales Partner,Sales Partner Target,ಮಾರಾಟದ ಸಂಗಾತಿ ಟಾರ್ಗೆಟ್
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {1}
 DocType: Pricing Rule,Pricing Rule,ಬೆಲೆ ರೂಲ್
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ಆರ್ಡರ್ ಖರೀದಿಸಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ಆರ್ಡರ್ ಖರೀದಿಸಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},ರೋ # {0}: ರಿಟರ್ನ್ಡ ಐಟಂ {1} ಅಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಇಲ್ಲ {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,ಬ್ಯಾಂಕ್ ಖಾತೆಗಳು
 ,Bank Reconciliation Statement,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ ಹೇಳಿಕೆ
@@ -1250,11 +1258,11 @@
 ,POS,ಪಿಓಎಸ್
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,ತೆರೆಯುವ ಸ್ಟಾಕ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} ಒಮ್ಮೆ ಮಾತ್ರ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತವೆ ಮಾಡಬೇಕು
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ಹೆಚ್ಚು ವರ್ಗಾಯಿಸುವುದೇ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ {0} ಹೆಚ್ಚು {1} ಆರ್ಡರ್ ಖರೀದಿಸಿ ವಿರುದ್ಧ {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},ಎಲೆಗಳು ಯಶಸ್ವಿಯಾಗಿ ನಿಗದಿ {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ಪ್ಯಾಕ್ ಯಾವುದೇ ಐಟಂಗಳು
 DocType: Shipping Rule Condition,From Value,FromValue
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,ಬ್ಯಾಂಕ್ ಕಾಣಿಸಿಕೊಂಡಿಲ್ಲ ಪ್ರಮಾಣದ
 DocType: Quality Inspection Reading,Reading 4,4 ಓದುವಿಕೆ
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ಕಂಪನಿ ಖರ್ಚು ಹಕ್ಕು .
@@ -1266,33 +1274,34 @@
 ,Material Requests for which Supplier Quotations are not created,ಯಾವ ಸರಬರಾಜುದಾರ ಉಲ್ಲೇಖಗಳು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ದಾಖಲಿಸಿದವರು ಇಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ನೀವು ರಜೆ ಹಾಕುತ್ತಿವೆ ಮೇಲೆ ದಿನ (ಗಳು) ರಜಾದಿನಗಳು. ನೀವು ರಜೆ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ಅಗತ್ಯವಿದೆ.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,ಬಾರ್ಕೋಡ್ ಐಟಂಗಳನ್ನು ಟ್ರ್ಯಾಕ್ . ನೀವು ಐಟಂ ಬಾರ್ಸಂಕೇತವನ್ನು ಸ್ಕ್ಯಾನ್ ಮೂಲಕ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಮತ್ತು ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂಗಳನ್ನು ನಮೂದಿಸಿ ಸಾಧ್ಯವಾಗುತ್ತದೆ .
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,ಮಾರ್ಕ್ ತಲುಪಿಸಿದರು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,ಮಾರ್ಕ್ ತಲುಪಿಸಿದರು
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ಉದ್ಧರಣ ಮಾಡಿ
 DocType: Dependent Task,Dependent Task,ಅವಲಂಬಿತ ಟಾಸ್ಕ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,ನಿಲ್ಲಿಸಿ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳು
 DocType: SMS Center,Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ
 DocType: Payment Tool Detail,Payment Amount,ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ಸೇವಿಸುವ ಪ್ರಮಾಣವನ್ನು
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} ವೀಕ್ಷಿಸಿ
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} ವೀಕ್ಷಿಸಿ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,ನಗದು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Salary Structure Deduction,Salary Structure Deduction,ಸಂಬಳ ರಚನೆ ಕಳೆಯುವುದು
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {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 +185,Quantity must not be more than {0},ಪ್ರಮಾಣ ಹೆಚ್ಚು ಇರಬಾರದು {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),ವಯಸ್ಸು (ದಿನಗಳು)
 DocType: Quotation Item,Quotation Item,ನುಡಿಮುತ್ತುಗಳು ಐಟಂ
 DocType: Account,Account Name,ಖಾತೆ ಹೆಸರು
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,ದಿನಾಂಕದಿಂದ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,ದಿನಾಂಕದಿಂದ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಪ್ರಮಾಣ {1} ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,ಸರಬರಾಜುದಾರ ಟೈಪ್ ಮಾಸ್ಟರ್ .
 DocType: Purchase Order Item,Supplier Part Number,ಸರಬರಾಜುದಾರ ಭಾಗ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,ಪರಿವರ್ತನೆ ದರವು 0 ಅಥವಾ 1 ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,ಪರಿವರ್ತನೆ ದರವು 0 ಅಥವಾ 1 ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,ಖರೀದಿ ರಸೀತಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,ಖರೀದಿ ರಸೀತಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Company,Default Payable Account,ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","ಉದಾಹರಣೆಗೆ ಹಡಗು ನಿಯಮಗಳು, ಬೆಲೆ ಪಟ್ಟಿ ಇತ್ಯಾದಿ ಆನ್ಲೈನ್ ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% ಖ್ಯಾತವಾದ
@@ -1304,15 +1313,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,ನನ್ನ ತೊಂದರೆಗಳು
 DocType: BOM Item,BOM Item,BOM ಐಟಂ
 DocType: Appraisal,For Employee,ಉದ್ಯೋಗಿಗಳಿಗಾಗಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,ಸಾಲು {0}: ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಅಡ್ವಾನ್ಸ್ ಡೆಬಿಟ್ ಮಾಡಬೇಕು
 DocType: Company,Default Values,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,ಸಾಲು {0}: ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ನಕಾರಾತ್ಮಕವಾಗಿರಬಾರದು
 DocType: Expense Claim,Total Amount Reimbursed,ಒಟ್ಟು ಪ್ರಮಾಣ ಮತ್ತೆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಸರಕುಪಟ್ಟಿ {0} ರ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಸರಕುಪಟ್ಟಿ {0} ರ {1}
 DocType: Customer,Default Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ
 DocType: Payment Reconciliation,Payments,ಪಾವತಿಗಳು
 DocType: Budget Detail,Budget Allocated,ನಿಗದಿ ಮಾಡಿದ ಮುಂಗಡಪತ್ರ
 DocType: Journal Entry,Entry Type,ಎಂಟ್ರಿ ಟೈಪ್
 ,Customer Credit Balance,ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,ನಿಮ್ಮ ಇಮೇಲ್ ಐಡಿ ಪರಿಶೀಲಿಸಿ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',' Customerwise ಡಿಸ್ಕೌಂಟ್ ' ಅಗತ್ಯವಿದೆ ಗ್ರಾಹಕ
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,ಜರ್ನಲ್ ಬ್ಯಾಂಕಿಂಗ್ ಪಾವತಿ ದಿನಾಂಕ ನವೀಕರಿಸಿ .
@@ -1333,7 +1344,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Employee,Permanent Address,ಖಾಯಂ ವಿಳಾಸ
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,ಐಟಂ {0} ಒಂದು ಸೇವೆ ಐಟಂ ಇರಬೇಕು .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಹೆಚ್ಚು \ {0} {1} ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ ವಿರುದ್ಧ ಹಣ ಅಡ್ವಾನ್ಸ್ {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,ಐಟಂ ಕೋಡ್ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),ಪೇ ಇಲ್ಲದೆ ಬಿಡಿ ಕಡಿತಗೊಳಿಸು ಕಡಿಮೆ ( LWP )
@@ -1350,18 +1361,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ಈ ನೆಲದ ಎಂಟ್ರಿ ಮಾಡಲು ಬಳಸಲಾಗುತ್ತದೆ ವಿನಂತಿ ವಸ್ತು
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,ಐಟಂ ಏಕ ಘಟಕ .
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್ {0} ' ಸಲ್ಲಿಸಲಾಗಿದೆ ' ಮಾಡಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್ {0} ' ಸಲ್ಲಿಸಲಾಗಿದೆ ' ಮಾಡಬೇಕು
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ಪ್ರತಿ ಸ್ಟಾಕ್ ಚಳುವಳಿ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Leave Allocation,Total Leaves Allocated,ನಿಗದಿ ಒಟ್ಟು ಎಲೆಗಳು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},ರೋ ಯಾವುದೇ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},ರೋ ಯಾವುದೇ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,ಮಾನ್ಯ ಹಣಕಾಸು ವರ್ಷದ ಆರಂಭ ಮತ್ತು ಅಂತಿಮ ದಿನಾಂಕ ನಮೂದಿಸಿ
 DocType: Employee,Date Of Retirement,ನಿವೃತ್ತಿ ದಿನಾಂಕ
 DocType: Upload Attendance,Get Template,ಟೆಂಪ್ಲೆಟ್ ಪಡೆಯಿರಿ
 DocType: Address,Postal,ಅಂಚೆಯ
 DocType: Item,Weightage,weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ಎ ಗ್ರಾಹಕ ಗುಂಪಿನ ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಗ್ರಾಹಕ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},ಪಠ್ಯ {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},ಪಠ್ಯ {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,ಹೊಸ ಸಂಪರ್ಕ
 DocType: Territory,Parent Territory,ಪೋಷಕ ಪ್ರದೇಶ
 DocType: Quality Inspection Reading,Reading 2,2 ಓದುವಿಕೆ
 DocType: Stock Entry,Material Receipt,ಮೆಟೀರಿಯಲ್ ರಸೀತಿ
@@ -1369,7 +1381,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಅಗತ್ಯವಿದೆ {0}
 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 +210,Quantity required for Item {0} in row {1},ಐಟಂ ಬೇಕಾದ ಪ್ರಮಾಣ {0} ಸತತವಾಗಿ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},ಐಟಂ ಬೇಕಾದ ಪ್ರಮಾಣ {0} ಸತತವಾಗಿ {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},ಪ್ರಮಾಣ ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಎಂದು ವೇರ್ಹೌಸ್ {0} ಅಳಿಸಲಾಗಿಲ್ಲ {1}
 DocType: Quotation,Order Type,ಆರ್ಡರ್ ಪ್ರಕಾರ
 DocType: Purchase Invoice,Notification Email Address,ಅಧಿಸೂಚನೆ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು
@@ -1386,15 +1398,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ಹಲವು ಕಾಲಮ್ಗಳನ್ನು. ವರದಿಯನ್ನು ರಫ್ತು ಸ್ಪ್ರೆಡ್ಶೀಟ್ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಿಕೊಂಡು ಅದನ್ನು ಮುದ್ರಿಸಲು.
 DocType: Sales 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 +152,Main,ಮುಖ್ಯ
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,ಮುಖ್ಯ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,ಭಿನ್ನ
 DocType: Naming Series,Set prefix for numbering series on your transactions,ನಿಮ್ಮ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ಹೊಂದಿಸಿ ಪೂರ್ವಪ್ರತ್ಯಯ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,ನಿಲ್ಲಿಸಿತು ಆದೇಶವನ್ನು ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ . ರದ್ದು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು .
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
 DocType: SMS Center,Send To,ಕಳಿಸಿ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು
@@ -1407,7 +1419,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,ವೇರ್ಹೌಸ್ ಮತ್ತು ರೆಫರೆನ್ಸ್
 DocType: Supplier,Statutory info and other general information about your Supplier,ಕಾನೂನುಸಮ್ಮತ ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮ ಸರಬರಾಜುದಾರ ಬಗ್ಗೆ ಇತರ ಸಾಮಾನ್ಯ ಮಾಹಿತಿ
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,ವಿಳಾಸಗಳು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಯಾವುದೇ ಸಾಟಿಯಿಲ್ಲದ {1} ದಾಖಲೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಯಾವುದೇ ಸಾಟಿಯಿಲ್ಲದ {1} ದಾಖಲೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},ಐಟಂ ಪ್ರವೇಶಿಸಿತು ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ನಕಲು {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ಒಂದು ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ಒಂದು ಸ್ಥಿತಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,ಐಟಂ ಪ್ರೊಡಕ್ಷನ್ ಕ್ರಮಕ್ಕೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
@@ -1416,10 +1428,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,ಉತ್ಪಾದನೆ ಸಮಯ ದಾಖಲೆಗಳು.
 DocType: Item,Apply Warehouse-wise Reorder Level,ವೇರ್ಹೌಸ್ ಬಲ್ಲ ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ ಅರ್ಜಿ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,ಬಿಒಎಮ್ {0} ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,ಬಿಒಎಮ್ {0} ಸಲ್ಲಿಸಬೇಕು
 DocType: Authorization Control,Authorization Control,ಅಧಿಕಾರ ಕಂಟ್ರೋಲ್
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ರೋ # {0}: ವೇರ್ಹೌಸ್ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ತಿರಸ್ಕರಿಸಿದರು ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,ಕಾರ್ಯಗಳಿಗಾಗಿ ಟೈಮ್ ಲಾಗ್ .
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,ಪಾವತಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,ಪಾವತಿ
 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},ಗರಿಷ್ಠ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ಐಟಂ {1} {2} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ಮಾಡಬಹುದು
 DocType: Employee,Salutation,ವಂದನೆ
@@ -1436,7 +1449,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,ಜತೆಗೂಡಿದ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,ಐಟಂ {0} ಒಂದು ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಅಲ್ಲ
 DocType: SMS Center,Create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ರಚಿಸಿ
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,ಅವಧಿ
 DocType: Packing Slip,To Package No.,ನಂ ಕಟ್ಟಿನ
 DocType: Warranty Claim,Issue Date,ಸಂಚಿಕೆ ದಿನಾಂಕ
 DocType: Activity Cost,Activity Cost,ಚಟುವಟಿಕೆ ವೆಚ್ಚ
@@ -1474,7 +1486,7 @@
 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 +65,Territory / Customer,ಪ್ರದೇಶ / ಗ್ರಾಹಕ
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,ಇ ಜಿ 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,ಮಾರಾಟದ ಐಟಂ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,ಐಟಂ ಗುಂಪು ಟ್ರೀ
@@ -1486,7 +1498,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} ದಾಖಲಿಸಿದವರು
 DocType: Delivery Note Item,Against Sales Order,ಮಾರಾಟದ ಆದೇಶದ ವಿರುದ್ಧ
 ,Serial No Status,ಯಾವುದೇ ಸೀರಿಯಲ್ ಸ್ಥಿತಿ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,ಐಟಂ ಟೇಬಲ್ ಖಾಲಿ ಇರಕೂಡದು
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,ಐಟಂ ಟೇಬಲ್ ಖಾಲಿ ಇರಕೂಡದು
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","ಸಾಲು {0}: ಹೊಂದಿಸಲು {1} ಆವರ್ತನವು, ಮತ್ತು ದಿನಾಂಕ \
  ಗೆ ನಡುವಿನ ವ್ಯತ್ಯಾಸ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {2}"
@@ -1496,7 +1508,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,ಕರ್ತವ್ಯಗಳು ಮತ್ತು ತೆರಿಗೆಗಳು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,ಸರಬರಾಜು ಪ್ರಮಾಣ
@@ -1511,7 +1523,7 @@
 DocType: Installation Note,Installation Time,ಅನುಸ್ಥಾಪನ ಟೈಮ್
 DocType: Sales Invoice,Accounting Details,ಲೆಕ್ಕಪರಿಶೋಧಕ ವಿವರಗಳು
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,ಈ ಕಂಪೆನಿಗೆ ಎಲ್ಲಾ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅಳಿಸಿ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ರೋ # {0}: ಆಪರೇಷನ್ {1} ಉತ್ಪಾದನೆ ತಯಾರಾದ ಸರಕುಗಳ {2} ಪ್ರಮಾಣ ಫಾರ್ ಪೂರ್ಣಗೊಳಿಸಿಲ್ಲ ಆರ್ಡರ್ # {3}. ಟೈಮ್ ದಾಖಲೆಗಳು ಮೂಲಕ ಕಾರ್ಯಾಚರಣೆ ಸ್ಥಿತಿ ನವೀಕರಿಸಿ
+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,ರೋ # {0}: ಆಪರೇಷನ್ {1} ಉತ್ಪಾದನೆ ತಯಾರಾದ ಸರಕುಗಳ {2} ಪ್ರಮಾಣ ಫಾರ್ ಪೂರ್ಣಗೊಳಿಸಿಲ್ಲ ಆರ್ಡರ್ # {3}. ಟೈಮ್ ದಾಖಲೆಗಳು ಮೂಲಕ ಕಾರ್ಯಾಚರಣೆ ಸ್ಥಿತಿ ನವೀಕರಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ಸ್
 DocType: Issue,Resolution Details,ರೆಸಲ್ಯೂಶನ್ ವಿವರಗಳು
 DocType: Quality Inspection Reading,Acceptance Criteria,ಒಪ್ಪಿಕೊಳ್ಳುವ ಅಳತೆಗೋಲುಗಳನ್ನು
@@ -1527,7 +1539,7 @@
 DocType: Holiday List,Clear Table,ತೆರವುಗೊಳಿಸಿ ಟೇಬಲ್
 DocType: Features Setup,Brands,ಬ್ರಾಂಡ್ಸ್
 DocType: C-Form Invoice Detail,Invoice No,ಸರಕುಪಟ್ಟಿ ನಂ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಗೆ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಗೆ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,ಕಾಸ್ಟಿಂಗ್ ದರ
 ,Customer Addresses And Contacts,ಗ್ರಾಹಕ ವಿಳಾಸಗಳು ಮತ್ತು ಸಂಪರ್ಕಗಳು
@@ -1544,7 +1556,7 @@
 ,Maintenance Schedules,ನಿರ್ವಹಣಾ ವೇಳಾಪಟ್ಟಿಗಳು
 ,Quotation Trends,ನುಡಿಮುತ್ತುಗಳು ಟ್ರೆಂಡ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},ಐಟಂ ಐಟಂ ಮಾಸ್ಟರ್ ಉಲ್ಲೇಖಿಸಿಲ್ಲ ಐಟಂ ಗ್ರೂಪ್ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
 DocType: Shipping Rule Condition,Shipping Amount,ಶಿಪ್ಪಿಂಗ್ ಪ್ರಮಾಣ
 ,Pending Amount,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice Item,Conversion Factor,ಪರಿವರ್ತಿಸುವುದರ
@@ -1561,12 +1573,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial ಖಾತೆಗಳ ಟ್ರೀ .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,ಎಲ್ಲಾ ನೌಕರ ರೀತಿಯ ಪರಿಗಣಿಸಲಾಗಿದೆ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 DocType: Landed Cost Voucher,Distribute Charges Based On,ವಿತರಿಸಲು ಆರೋಪಗಳ ಮೇಲೆ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,ಐಟಂ {1} ಆಸ್ತಿ ಐಟಂ ಖಾತೆ {0} ಬಗೆಯ ' ಸ್ಥಿರ ಆಸ್ತಿ ' ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,ಐಟಂ {1} ಆಸ್ತಿ ಐಟಂ ಖಾತೆ {0} ಬಗೆಯ ' ಸ್ಥಿರ ಆಸ್ತಿ ' ಇರಬೇಕು
 DocType: HR Settings,HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ ಬಾಕಿ ಇದೆ . ಮಾತ್ರ ಖರ್ಚು ಅನುಮೋದಕ ಡೇಟ್ ಮಾಡಬಹುದು .
 DocType: Purchase Invoice,Additional Discount Amount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
 DocType: Leave Block List Allow,Leave Block List Allow,ಬ್ಲಾಕ್ ಲಿಸ್ಟ್ ಅನುಮತಿಸಿ ಬಿಡಿ
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ಕ್ರೀಡೆ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,ನಿಜವಾದ ಒಟ್ಟು
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,ಘಟಕ
@@ -1578,6 +1590,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ಈಗ ಡೀಫಾಲ್ಟ್ ಹಣಕಾಸಿನ ವರ್ಷ ಆಗಿದೆ . ಕಾರ್ಯಗತವಾಗಲು ಬದಲಾವಣೆಗೆ ನಿಮ್ಮ ಬ್ರೌಸರ್ ರಿಫ್ರೆಶ್ ಮಾಡಿ .
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ಖರ್ಚು ಹಕ್ಕು
 DocType: Issue,Support,ಬೆಂಬಲ
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,ಕಾರ್ಟ್ ವೀಕ್ಷಿಸಿ
 ,BOM Search,ಬೊಮ್ ಹುಡುಕಾಟ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),ಕ್ಲೋಸಿಂಗ್ (+ ಒಟ್ಟು ತೆರೆಯುವ)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,ಕಂಪನಿ ಕರೆನ್ಸಿ ಸೂಚಿಸಿ
@@ -1589,13 +1602,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ದಿನಾಂಕ ಸತತವಾಗಿ ಚೆಕ್ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Salary Slip,Deduction,ವ್ಯವಕಲನ
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},ಐಟಂ ಬೆಲೆ ಸೇರ್ಪಡೆ {0} ದರ ಪಟ್ಟಿ ರಲ್ಲಿ {1}
 DocType: Address Template,Address Template,ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,ಈ ಮಾರಾಟಗಾರನ ಉದ್ಯೋಗಿ ಅನ್ನು ನಮೂದಿಸಿ
 DocType: Territory,Classification of Customers by region,ಪ್ರದೇಶವಾರು ಗ್ರಾಹಕರು ವರ್ಗೀಕರಣ
 DocType: Project,% Tasks Completed,% ಪೂರ್ಣಗೊಂಡಿದೆ ಕಾರ್ಯಗಳು
 DocType: Project,Gross Margin,ಒಟ್ಟು ಅಂಚು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,ಮೊದಲ ಉತ್ಪಾದನೆ ಐಟಂ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,ಅಂಗವಿಕಲ ಬಳಕೆದಾರರ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ಅಂಗವಿಕಲ ಬಳಕೆದಾರರ
 DocType: Opportunity,Quotation,ಉದ್ಧರಣ
 DocType: Salary Slip,Total Deduction,ಒಟ್ಟು ಕಳೆಯುವುದು
 DocType: Quotation,Maintenance User,ನಿರ್ವಹಣೆ ಬಳಕೆದಾರ
@@ -1604,7 +1618,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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,ಕಳೆ
@@ -1614,12 +1628,12 @@
 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,ಆದ್ದರಿಂದ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಗೋದಾಮಿನ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ {0}, ಆದ್ದರಿಂದ ನೀವು ಮರು ನಿಯೋಜಿಸಲು ಅಥವಾ ವೇರ್ಹೌಸ್ ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಗೋದಾಮಿನ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ {0}, ಆದ್ದರಿಂದ ನೀವು ಮರು ನಿಯೋಜಿಸಲು ಅಥವಾ ವೇರ್ಹೌಸ್ ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Appraisal,Calculate Total Score,ಒಟ್ಟು ಸ್ಕೋರ್ ಲೆಕ್ಕ
 DocType: Supplier Quotation,Manufacturing Manager,ಉತ್ಪಾದನಾ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ವಾರಂಟಿ {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,ಪ್ರವಾಸ ಒಳಗೆ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸ್ಪ್ಲಿಟ್ .
-apps/erpnext/erpnext/hooks.py +68,Shipments,ಸಾಗಣೆಗಳು
+apps/erpnext/erpnext/hooks.py +69,Shipments,ಸಾಗಣೆಗಳು
 DocType: Purchase Order Item,To be delivered to customer,ಗ್ರಾಹಕನಿಗೆ ನೀಡಬೇಕಾಗಿದೆ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ಟೈಮ್ ಲಾಗ್ ಸ್ಥಿತಿ ಸಲ್ಲಿಸಬೇಕು.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,ಸೀರಿಯಲ್ ಯಾವುದೇ {0} ಯಾವುದೇ ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ
@@ -1639,10 +1653,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,ಕಂಪನಿ ಆಯ್ಕೆ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ಎಲ್ಲಾ ವಿಭಾಗಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","ಉದ್ಯೋಗ ವಿಧಗಳು ( ಶಾಶ್ವತ , ಒಪ್ಪಂದ , ಇಂಟರ್ನ್ , ಇತ್ಯಾದಿ ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
 DocType: Currency Exchange,From Currency,ಚಲಾವಣೆಯ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ನಿಗದಿ ಪ್ರಮಾಣ, ಸರಕುಪಟ್ಟಿ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ಆಯ್ಕೆಮಾಡಿ"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ನಿಗದಿ ಪ್ರಮಾಣ, ಸರಕುಪಟ್ಟಿ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ಆಯ್ಕೆಮಾಡಿ"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,ವ್ಯವಸ್ಥೆಯ ಕಾಣಿಸಿಕೊಂಡಿಲ್ಲ ಪ್ರಮಾಣದ
 DocType: Purchase Invoice Item,Rate (Company Currency),ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,ಇತರೆ
@@ -1658,7 +1672,7 @@
 DocType: Quality Inspection,In Process,ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿ
 DocType: Authorization Rule,Itemwise Discount,Itemwise ಡಿಸ್ಕೌಂಟ್
 DocType: Purchase Order Item,Reference Document Type,ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
 DocType: Account,Fixed Asset,ಸ್ಥಿರಾಸ್ತಿ
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,ಧಾರಾವಾಹಿಯಾಗಿ ಇನ್ವೆಂಟರಿ
 DocType: Activity Type,Default Billing Rate,ಡೀಫಾಲ್ಟ್ ಬಿಲ್ಲಿಂಗ್ ದರ
@@ -1668,7 +1682,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ಪಾವತಿ ಮಾರಾಟ ಆರ್ಡರ್
 DocType: Expense Claim Detail,Expense Claim Detail,ಖರ್ಚು ಹಕ್ಕು ವಿವರ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,ಟೈಮ್ ದಾಖಲೆಗಳು ದಾಖಲಿಸಿದವರು:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Item,Weight UOM,ತೂಕ UOM
 DocType: Employee,Blood Group,ರಕ್ತ ಗುಂಪು
 DocType: Purchase Invoice Item,Page Break,ಪುಟ ಬ್ರೇಕ್
@@ -1699,10 +1713,10 @@
 DocType: Time Log,To Time,ಸಮಯ
 DocType: Authorization Rule,Approving Role (above authorized value),(ಅಧಿಕಾರ ಮೌಲ್ಯವನ್ನು ಮೇಲೆ) ಪಾತ್ರ ಅನುಮೋದನೆ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","ChildNodes ಸೇರಿಸಲು, ಮರ ಅನ್ವೇಷಿಸಲು ಮತ್ತು ನೀವು ಹೆಚ್ಚು ಗ್ರಂಥಿಗಳು ಸೇರಿಸಲು ಬಯಸುವ ಯಾವ ನೋಡ್ ಅನ್ನು ."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಒಂದು ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಇರಬೇಕು
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM ಪುನರಾವರ್ತನ : {0} ಪೋಷಕರು ಅಥವಾ ಮಗು ಸಾಧ್ಯವಿಲ್ಲ {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಒಂದು ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಇರಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,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 +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, ಮಾತ್ರ ಡೆಬಿಟ್ ಖಾತೆಗಳನ್ನು ಇನ್ನೊಂದು ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","{0}, ಮಾತ್ರ ಡೆಬಿಟ್ ಖಾತೆಗಳನ್ನು ಇನ್ನೊಂದು ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,ಬೆಲೆ ಪಟ್ಟಿ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Manufacturing Settings,Allow Overtime,ಓವರ್ಟೈಮ್ ಅವಕಾಶ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ಐಟಂ ಬೇಕಾದ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗಳು {1}. ನೀವು ಒದಗಿಸಿದ {2}.
@@ -1710,8 +1724,9 @@
 DocType: Item,Customer Item Codes,ಗ್ರಾಹಕ ಐಟಂ ಕೋಡ್ಸ್
 DocType: Opportunity,Lost Reason,ಲಾಸ್ಟ್ ಕಾರಣ
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ಆದೇಶ ಅಥವಾ ಇನ್ವಾಯ್ಸ್ ವಿರುದ್ಧ ಪಾವತಿ ನಮೂದುಗಳು ರಚಿಸಿ.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,ಹೊಸ ವಿಳಾಸ
 DocType: Quality Inspection,Sample Size,ಸ್ಯಾಂಪಲ್ ಸೈಜ್
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,ಮತ್ತಷ್ಟು ವೆಚ್ಚ ಕೇಂದ್ರಗಳು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು
 DocType: Project,External,ಬಾಹ್ಯ
@@ -1767,13 +1782,14 @@
 DocType: Rename Tool,Rename Tool,ಟೂಲ್ ಮರುಹೆಸರಿಸು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,ನವೀಕರಣ ವೆಚ್ಚ
 DocType: Item Reorder,Item Reorder,ಐಟಂ ಮರುಕ್ರಮಗೊಳಿಸಿ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ಕಾರ್ಯಾಚರಣೆಗಳು , ನಿರ್ವಹಣಾ ವೆಚ್ಚ ನಿರ್ದಿಷ್ಟಪಡಿಸಲು ಮತ್ತು ಕಾರ್ಯಾಚರಣೆಗಳು ಒಂದು ಅನನ್ಯ ಕಾರ್ಯಾಚರಣೆ ಯಾವುದೇ ನೀಡಿ ."
 DocType: Purchase Invoice,Price List Currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Naming Series,User must always select,ಬಳಕೆದಾರ ಯಾವಾಗಲೂ ಆಯ್ಕೆ ಮಾಡಬೇಕು
 DocType: Stock Settings,Allow Negative Stock,ನಕಾರಾತ್ಮಕ ಸ್ಟಾಕ್ ಅನುಮತಿಸಿ
 DocType: Installation Note,Installation Note,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,ತೆರಿಗೆಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,ಹಣಕಾಸು ಹಣದ ಹರಿವನ್ನು
 ,Financial Analytics,ಹಣಕಾಸು ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Quality Inspection,Verified By,ಪರಿಶೀಲಿಸಲಾಗಿದೆ
 DocType: Address,Subsidiary,ಸಹಕಾರಿ
@@ -1783,19 +1799,19 @@
 DocType: Process Payroll,Create Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸಿ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,ಬ್ಯಾಂಕ್ ಪ್ರಕಾರ ನಿರೀಕ್ಷಿಸಲಾಗಿದೆ ಸಮತೋಲನ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ಗಳಂತಹವು ( ಹೊಣೆಗಾರಿಕೆಗಳು )
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ಪ್ರಮಾಣ ಸತತವಾಗಿ {0} ( {1} ) ಅದೇ ಇರಬೇಕು ತಯಾರಿಸಿದ ಪ್ರಮಾಣ {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ಪ್ರಮಾಣ ಸತತವಾಗಿ {0} ( {1} ) ಅದೇ ಇರಬೇಕು ತಯಾರಿಸಿದ ಪ್ರಮಾಣ {2}
 DocType: Appraisal,Employee,ನೌಕರರ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,ಆಮದು ಇಮೇಲ್
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,ಬಳಕೆದಾರ ಎಂದು ಆಹ್ವಾನಿಸಿ
 DocType: Features Setup,After Sale Installations,ಮಾರಾಟಕ್ಕೆ ಅನುಸ್ಥಾಪನೆಗಳು ನಂತರ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} ಸಂಪೂರ್ಣವಾಗಿ ವಿಧಿಸಲಾಗುತ್ತದೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} ಸಂಪೂರ್ಣವಾಗಿ ವಿಧಿಸಲಾಗುತ್ತದೆ
 DocType: Workstation Working Hour,End Time,ಎಂಡ್ ಟೈಮ್
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,ಮಾರಾಟದ ಅಥವಾ ಖರೀದಿಗಾಗಿ ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಒಪ್ಪಂದದ ವಿಚಾರದಲ್ಲಿ .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,ಚೀಟಿ ಮೂಲಕ ಗುಂಪು
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ಅಗತ್ಯವಿದೆ ರಂದು
 DocType: Sales Invoice,Mass Mailing,ಸಾಮೂಹಿಕ ಮೇಲಿಂಗ್
 DocType: Rename Tool,File to Rename,ಮರುಹೆಸರಿಸಲು ಫೈಲ್
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse ಆದೇಶ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse ಆದೇಶ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,ಶೋ ಪಾವತಿಗಳು
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ನಿಗದಿತ ಬಿಒಎಮ್ {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
@@ -1805,6 +1821,7 @@
 DocType: Selling Settings,Sales Order Required,ಮಾರಾಟದ ಆದೇಶ ಅಗತ್ಯವಿರುವ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ಗ್ರಾಹಕ ರಚಿಸಿ
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ವಿವರ
 DocType: Quality Inspection Reading,Reading 9,9 ಓದುವಿಕೆ
@@ -1816,6 +1833,7 @@
 DocType: Warranty Claim,Raised By,ಬೆಳೆಸಿದರು
 DocType: Payment Tool,Payment Account,ಪಾವತಿ ಖಾತೆ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ಪರಿಹಾರ ಆಫ್
 DocType: Quality Inspection Reading,Accepted,Accepted
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕಂಪನಿಗೆ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳ ಅಳಿಸಲು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಅದು ಎಂದು ನಿಮ್ಮ ಮಾಸ್ಟರ್ ಡೇಟಾ ಉಳಿಯುತ್ತದೆ. ಈ ಕಾರ್ಯವನ್ನು ರದ್ದುಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
@@ -1823,17 +1841,17 @@
 DocType: Payment Tool,Total Payment Amount,ಒಟ್ಟು ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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 +204,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
 DocType: Newsletter,Test,ಟೆಸ್ಟ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ನಿಮಗೆ ಮೌಲ್ಯಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ \ ಈ ಐಟಂ, ಇವೆ ಎಂದು &#39;ಸೀರಿಯಲ್ ಯಾವುದೇ ಹೊಂದಿದೆ&#39;, &#39;ಬ್ಯಾಚ್ ಹೊಂದಿದೆ ಇಲ್ಲ&#39;, &#39;ಸ್ಟಾಕ್ ಐಟಂ&#39; ಮತ್ತು &#39;ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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 +157,Please enter Planned Qty for Item {0} at row {1},ಐಟಂ ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0} ಸಾಲು {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,ಐಟಂಗಳನ್ನು ವಿನಂತಿಗಳು .
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ಪ್ರತ್ಯೇಕ ಉತ್ಪಾದನಾ ಸಲುವಾಗಿ ಪ್ರತಿ ಸಿದ್ಧಪಡಿಸಿದ ಉತ್ತಮ ಐಟಂ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ .
 DocType: Purchase Invoice,Terms and Conditions1,ನಿಯಮಗಳು ಮತ್ತು Conditions1
@@ -1846,7 +1864,7 @@
 DocType: Authorization Rule,Authorized Value,ಅಧಿಕೃತ ಮೌಲ್ಯ
 DocType: Contact,Enter department to which this Contact belongs,ಯಾವ ಇಲಾಖೆ ಯನ್ನು ಈ ಸಂಪರ್ಕಿಸಿ ಸೇರುತ್ತದೆ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,ಒಟ್ಟು ಆಬ್ಸೆಂಟ್
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,ಸಾಲು ಐಟಂ ಅಥವಾ ಗೋದಾಮಿನ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,ಸಾಲು ಐಟಂ ಅಥವಾ ಗೋದಾಮಿನ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,ಅಳತೆಯ ಘಟಕ
 DocType: Fiscal Year,Year End Date,ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ
 DocType: Task Depends On,Task Depends On,ಟಾಸ್ಕ್ ಅವಲಂಬಿಸಿರುತ್ತದೆ
@@ -1872,7 +1890,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ನಿಯೋಜನೆಗಾಗಿ ಕಂಪನಿಗಳು ಉತ್ಪನ್ನಗಳನ್ನು ಮಾರುತ್ತದೆ ಒಬ್ಬ ಮೂರನೇ ವ್ಯಕ್ತಿಯ ವಿತರಕ / ಡೀಲರ್ / ಆಯೋಗದ ಏಜೆಂಟ್ / ಅಂಗ / ಮರುಮಾರಾಟಗಾರರ.
 DocType: Customer Group,Has Child Node,ಮಗುವಿನ ನೋಡ್ ಹೊಂದಿದೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","ಇಲ್ಲಿ ಸ್ಥಿರ URL ನಿಯತಾಂಕಗಳನ್ನು ನಮೂದಿಸಲು ( ಉದಾ. ಕಳುಹಿಸುವವರ = ERPNext , ಬಳಕೆದಾರಹೆಸರು = ERPNext , ಪಾಸ್ವರ್ಡ್ = 1234 , ಇತ್ಯಾದಿ )"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ಯಾವುದೇ ಸಕ್ರಿಯ ವರ್ಷದಲ್ಲಿ. ಹೆಚ್ಚಿನ ವಿವರಗಳಿಗಾಗಿ ಚೆಕ್ {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,ಈ ERPNext ನಿಂದ ಸ್ವಯಂ ರಚಿತವಾದ ಒಂದು ಉದಾಹರಣೆ ವೆಬ್ಸೈಟ್
@@ -1920,7 +1938,7 @@
  10. ಸೇರಿಸಿ ಅಥವಾ ಕಡಿತಗೊಳಿಸದಿರುವುದರ: ನೀವು ಸೇರಿಸಲು ಅಥವಾ ತೆರಿಗೆ ಕಡಿತಗೊಳಿಸುವ ಬಯಸುವ ಎಂದು."
 DocType: Purchase Receipt Item,Recd Quantity,Recd ಪ್ರಮಾಣ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ಹೆಚ್ಚು ಐಟಂ ಉತ್ಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {0} ಹೆಚ್ಚು ಮಾರಾಟದ ಆರ್ಡರ್ ಪ್ರಮಾಣ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Payment Reconciliation,Bank / Cash Account,ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆ
 DocType: Tax Rule,Billing City,ಬಿಲ್ಲಿಂಗ್ ನಗರ
 DocType: Global Defaults,Hide Currency Symbol,ಕರೆನ್ಸಿ ಸಂಕೇತ ಮರೆಮಾಡಿ
@@ -1952,6 +1970,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ಯುಟಿಲಿಟಿ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 ಮೇಲೆ
 DocType: Buying Settings,Default Buying Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.","ಇತ್ಯಾದಿ ಕಂಪನಿ, ಕರೆನ್ಸಿ , ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ , ಹಾಗೆ ಹೊಂದಿಸಿ ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳು"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,ಪಾವತಿ ಪ್ರಕಾರ
@@ -1987,7 +2006,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","ವಿಭಾಗ ಕಾಸ್ಟಿಂಗ್ ರಲ್ಲಿ ""ಆಧರಿಸಿ ವಸ್ತುಗಳ ದರ "" ನೋಡಿ"
 DocType: Appraisal Goal,Key Responsibility Area,ಪ್ರಮುಖ ಜವಾಬ್ದಾರಿ ಪ್ರದೇಶ
 DocType: Item Reorder,Material Request Type,ಮೆಟೀರಿಯಲ್ RequestType
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,ಸಾಲು {0}: ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಪರಿವರ್ತನಾ ಕಾರಕ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ಸಾಲು {0}: ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಪರಿವರ್ತನಾ ಕಾರಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,ತೀರ್ಪುಗಾರ
 DocType: Cost Center,Cost Center,ವೆಚ್ಚ ಸೆಂಟರ್
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ಚೀಟಿ #
@@ -2010,7 +2029,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,ಎಲ್ಲಾ ವಿಳಾಸಗಳನ್ನು .
 DocType: Company,Stock Settings,ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ಕೆಳಗಿನ ಲಕ್ಷಣಗಳು ದಾಖಲೆಗಳಲ್ಲಿ ಅದೇ ವೇಳೆ ಮರ್ಜಿಂಗ್ ಮಾತ್ರ ಸಾಧ್ಯ. ಗ್ರೂಪ್, ರೂಟ್ ಕೌಟುಂಬಿಕತೆ, ಕಂಪನಿ"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ಕೆಳಗಿನ ಲಕ್ಷಣಗಳು ದಾಖಲೆಗಳಲ್ಲಿ ಅದೇ ವೇಳೆ ಮರ್ಜಿಂಗ್ ಮಾತ್ರ ಸಾಧ್ಯ. ಗ್ರೂಪ್, ರೂಟ್ ಕೌಟುಂಬಿಕತೆ, ಕಂಪನಿ"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ಗ್ರಾಹಕ ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಗ್ರೂಪ್ ಟ್ರೀ .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್ ಹೆಸರು
 DocType: Leave Control Panel,Leave Control Panel,ಕಂಟ್ರೋಲ್ ಪ್ಯಾನಲ್ ಬಿಡಿ
@@ -2030,8 +2049,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,ಪಾವತಿ ಉಪಕರಣ ವಿವರ
 ,Sales Browser,ಮಾರಾಟದ ಬ್ರೌಸರ್
 DocType: Journal Entry,Total Credit,ಒಟ್ಟು ಕ್ರೆಡಿಟ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,ಸ್ಥಳೀಯ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,ಸಾಲಗಾರರು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,ದೊಡ್ಡದು
@@ -2050,7 +2069,7 @@
 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. ನಂ
 DocType: Production Order Operation,Make Time Log,ದಾಖಲೆ ಮಾಡಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},{0} ನಿಂದ ಗ್ರಾಹಕ ಲೀಡ್ ರಚಿಸಲು ದಯವಿಟ್ಟು
 DocType: Price List,Applicable for Countries,ದೇಶಗಳು ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,ಕಂಪ್ಯೂಟರ್
@@ -2110,10 +2129,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,ಕನಿಷ್ಠ ಒಂದು ಐಟಂ ರಿಟರ್ನ್ ದಸ್ತಾವೇಜು ನಕಾರಾತ್ಮಕ ಪ್ರಮಾಣ ದಾಖಲಿಸಬೇಕಾಗುತ್ತದೆ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,ಮಿತಿಮೀರಿದ
 DocType: Account,Stock Received But Not Billed,ಸ್ಟಾಕ್ ಪಡೆದರು ಆದರೆ ಖ್ಯಾತವಾದ ಮಾಡಿರುವುದಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,ಮೂಲ ಖಾತೆಯು ಒಂದು ಗುಂಪು ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,ಮೂಲ ಖಾತೆಯು ಒಂದು ಗುಂಪು ಇರಬೇಕು
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ಗ್ರಾಸ್ ಪೇ + ನಗದೀಕರಣ ಬಾಕಿ ಪ್ರಮಾಣ ಪ್ರಮಾಣ - ಒಟ್ಟು ಕಳೆಯುವುದು
 DocType: Monthly Distribution,Distribution Name,ವಿತರಣೆ ಹೆಸರು
 DocType: Features Setup,Sales and Purchase,ಮಾರಾಟ ಮತ್ತು ಖರೀದಿ
@@ -2127,6 +2146,7 @@
 DocType: Journal Entry Account,Party Balance,ಪಕ್ಷದ ಬ್ಯಾಲೆನ್ಸ್
 DocType: Sales Invoice Item,Time Log Batch,ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,ರಿಯಾಯತಿ ಅನ್ವಯಿಸು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸಲಾಗಿದೆ
 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,ತಯಾರಿಕೆಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
@@ -2134,9 +2154,9 @@
 DocType: Purchase Invoice,Half-yearly,ಅರ್ಧವಾರ್ಷಿಕ
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ.
 DocType: Bank Reconciliation,Get Relevant Entries,ಸಂಬಂಧಿತ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,ಸ್ಟಾಕ್ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,ಸ್ಟಾಕ್ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ
 DocType: Sales Invoice,Sales Team1,ಮಾರಾಟದ team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Sales Invoice,Customer Address,ಗ್ರಾಹಕ ವಿಳಾಸ
 DocType: Purchase Invoice,Apply Additional Discount On,ಹೆಚ್ಚುವರಿ ರಿಯಾಯತಿ ಅನ್ವಯಿಸು
 DocType: Account,Root Type,ರೂಟ್ ಪ್ರಕಾರ
@@ -2145,15 +2165,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,ಪುಟದ ಮೇಲಿರುವ ಈ ಸ್ಲೈಡ್ಶೋ ತೋರಿಸು
 DocType: BOM,Item UOM,ಐಟಂ UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ಡಿಸ್ಕೌಂಟ್ ಪ್ರಮಾಣದ ನಂತರ ತೆರಿಗೆ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
 DocType: Quality Inspection,Quality Inspection,ಗುಣಮಟ್ಟದ ತಪಾಸಣೆ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,ಹೆಚ್ಚುವರಿ ಸಣ್ಣ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,ಖಾತೆ {0} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ಸಂಸ್ಥೆ ಸೇರಿದ ಖಾತೆಗಳ ಪ್ರತ್ಯೇಕ ಚಾರ್ಟ್ ಜೊತೆಗೆ ಕಾನೂನು ಘಟಕದ / ಅಂಗಸಂಸ್ಥೆ.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ಆಹಾರ , ಪಾನೀಯ ಮತ್ತು ತಂಬಾಕು"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,ಪಿಎಲ್ ಅಥವಾ ಬಿಎಸ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},ಮಾತ್ರ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},ಮಾತ್ರ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,ಕಮಿಷನ್ ದರ 100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,ಕನಿಷ್ಠ ಇನ್ವೆಂಟರಿ ಮಟ್ಟ
 DocType: Stock Entry,Subcontract,subcontract
@@ -2191,7 +2211,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,ಒಳಬರುವ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ .
 DocType: Purchase Order Item,Returned Qty,ಮರಳಿದರು ಪ್ರಮಾಣ
 DocType: Employee,Exit,ನಿರ್ಗಮನ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,ರೂಟ್ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,ರೂಟ್ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ದಾಖಲಿಸಿದವರು
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ಗ್ರಾಹಕರ ಅನುಕೂಲಕ್ಕಾಗಿ, ಪ್ರಬಂಧ ಸಂಕೇತಗಳು ಇನ್ವಾಯ್ಸ್ ಮತ್ತು ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು ರೀತಿಯ ಮುದ್ರಣ ಸ್ವರೂಪಗಳು ಬಳಸಬಹುದು"
 DocType: Employee,You can enter any date manually,ನೀವು ಕೈಯಾರೆ ಯಾವುದೇ ದಿನಾಂಕ ನಮೂದಿಸಬಹುದು
@@ -2199,8 +2219,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,ಉಮೇದುವಾರಿಕೆಯ ಅವಧಿಯಲ್ಲಿ
 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 +110,Row {0}: Advance against Customer must be credit,ಸಾಲು {0}: ಗ್ರಾಹಕ ವಿರುದ್ಧ ಅಡ್ವಾನ್ಸ್ ಕ್ರೆಡಿಟ್ ಇರಬೇಕು
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ಖರೀದಿ ರಸೀತಿ ಐಟಂ ವಿತರಿಸುತ್ತಾರೆ
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,ಪೇ
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,ಪೇ
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime ಗೆ
 DocType: SMS Settings,SMS Gateway URL,SMS ಗೇಟ್ವೇ URL ಅನ್ನು
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS ಡೆಲಿವರಿ ಸ್ಥಾನಮಾನ ಕಾಯ್ದುಕೊಳ್ಳುವುದು ದಾಖಲೆಗಳು
@@ -2217,7 +2238,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ
 DocType: Attendance,Attendance Date,ಅಟೆಂಡೆನ್ಸ್ ದಿನಾಂಕ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ಸಂಬಳ ವಿಘಟನೆಯ ಸಂಪಾದಿಸಿದ ಮತ್ತು ಕಳೆಯುವುದು ಆಧರಿಸಿ .
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಜೊತೆ ಖಾತೆ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಜೊತೆ ಖಾತೆ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Address,Preferred Shipping Address,ಮೆಚ್ಚಿನ ಶಿಪ್ಪಿಂಗ್ ವಿಳಾಸ
 DocType: Purchase Receipt Item,Accepted Warehouse,ಅಕ್ಸೆಪ್ಟೆಡ್ ವೇರ್ಹೌಸ್
 DocType: Bank Reconciliation Detail,Posting Date,ದಿನಾಂಕ ಪೋಸ್ಟ್
@@ -2235,7 +2256,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Pricing Rule,Discount Percentage,ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು
 DocType: Payment Reconciliation Invoice,Invoice Number,ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/hooks.py +54,Orders,ಆರ್ಡರ್ಸ್
+apps/erpnext/erpnext/hooks.py +55,Orders,ಆರ್ಡರ್ಸ್
 DocType: Leave Control Panel,Employee Type,ನೌಕರರ ಪ್ರಕಾರ
 DocType: Employee Leave Approver,Leave Approver,ಅನುಮೋದಕ ಬಿಡಿ
 DocType: Manufacturing Settings,Material Transferred for Manufacture,ವಸ್ತು ತಯಾರಿಕೆಗೆ ವರ್ಗಾಯಿಸಲಾಯಿತು
@@ -2247,7 +2268,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,ಈ ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ಕೊಕ್ಕಿನ ವಸ್ತುಗಳ %
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,ಅವಧಿಯ ಮುಕ್ತಾಯ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ವೆಚ್ಚ ಸೆಂಟರ್ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ಸವಕಳಿ
+DocType: Account,Depreciation,ಸವಕಳಿ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ಪೂರೈಕೆದಾರ (ರು)
 DocType: Customer,Credit Limit,ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,ವ್ಯವಹಾರದ ಪ್ರಕಾರವನ್ನುಆರಿಸಿ
@@ -2272,11 +2293,12 @@
 DocType: Material Request,Requested For,ಮನವಿ
 DocType: Quotation Item,Against Doctype,DOCTYPE ವಿರುದ್ಧ
 DocType: Delivery Note,Track this Delivery Note against any Project,ಯಾವುದೇ ಪ್ರಾಜೆಕ್ಟ್ ವಿರುದ್ಧ ಈ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಟ್ರ್ಯಾಕ್
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,ಮೂಲ ಖಾತೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,ಹೂಡಿಕೆ ನಿವ್ವಳ ನಗದು
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,ಮೂಲ ಖಾತೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,ಪ್ರದರ್ಶನ ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 ,Is Primary Address,ಪ್ರಾಥಮಿಕ ವಿಳಾಸ
 DocType: Production Order,Work-in-Progress Warehouse,ಕೆಲಸ ಪ್ರಗತಿಯಲ್ಲಿರುವ ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},ರೆಫರೆನ್ಸ್ # {0} {1} ರ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},ರೆಫರೆನ್ಸ್ # {0} {1} ರ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,ವಿಳಾಸಗಳನ್ನು ನಿರ್ವಹಿಸಿ
 DocType: Pricing Rule,Item Code,ಐಟಂ ಕೋಡ್
 DocType: Production Planning Tool,Create Production Orders,ಪ್ರೊಡಕ್ಷನ್ ಆದೇಶಗಳನ್ನು ರಚಿಸಲು
@@ -2284,7 +2306,7 @@
 DocType: Journal Entry,User Remark,ಬಳಕೆದಾರ ಟೀಕಿಸು
 DocType: Lead,Market Segment,ಮಾರುಕಟ್ಟೆ ವಿಭಾಗ
 DocType: Employee Internal Work History,Employee Internal Work History,ಆಂತರಿಕ ಕೆಲಸದ ಇತಿಹಾಸ
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),ಮುಚ್ಚುವ (ಡಾ)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),ಮುಚ್ಚುವ (ಡಾ)
 DocType: Contact,Passive,ನಿಷ್ಕ್ರಿಯ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಅಲ್ಲ ಸ್ಟಾಕ್
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,ವ್ಯವಹಾರ ಮಾರಾಟ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ .
@@ -2300,7 +2322,7 @@
 ,Billed Amount,ಖ್ಯಾತವಾದ ಪ್ರಮಾಣ
 DocType: Bank Reconciliation,Bank Reconciliation,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,ಅಪ್ಡೇಟ್ಗಳು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,ಕೆಲವು ಸ್ಯಾಂಪಲ್ ದಾಖಲೆಗಳನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಬಿಡಿ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,ಖಾತೆ ಗುಂಪು
@@ -2309,14 +2331,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","ಲಾಭ / ನಷ್ಟ ಗೊತ್ತು ಯಾವ ಹೊಣೆಗಾರಿಕೆ ಅಡಿಯಲ್ಲಿ ಖಾತೆ ತಲೆ ,"
 DocType: Payment Tool,Against Vouchers,ರಶೀದಿ ವಿರುದ್ಧ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,ತ್ವರಿತ ಸಹಾಯ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},ಮೂಲ ಮತ್ತು ಗುರಿ ಗೋದಾಮಿನ ಸಾಲಿನ ಇರಲಾಗುವುದಿಲ್ಲ {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},ಮೂಲ ಮತ್ತು ಗುರಿ ಗೋದಾಮಿನ ಸಾಲಿನ ಇರಲಾಗುವುದಿಲ್ಲ {0}
 DocType: Features Setup,Sales Extras,ಮಾರಾಟದ ಪರಿಕರಗಳು
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},ವೆಚ್ಚ ಸೆಂಟರ್ ವಿರುದ್ಧ ಬಜೆಟ್ {0} {1} ಖಾತೆಗೆ {2} {3} ಮೂಲಕ ಮೀರುತ್ತದೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',' ದಿನಾಂಕದಿಂದ ' ' ದಿನಾಂಕ ' ನಂತರ ಇರಬೇಕು
 ,Stock Projected Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ಯೋಜಿತ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
 DocType: Sales Order,Customer's Purchase Order,ಗ್ರಾಹಕರ ಆರ್ಡರ್ ಖರೀದಿಸಿ
 DocType: Warranty Claim,From Company,ಕಂಪನಿ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ಮೌಲ್ಯ ಅಥವಾ ಪ್ರಮಾಣ
@@ -2326,9 +2348,9 @@
 DocType: Leave Block List,Leave Block List Allowed,ಖಂಡ ಅನುಮತಿಸಲಾಗಿದೆ ಬಿಡಿ
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,ನೀವು ಲಾಗಿನ್ ಅದನ್ನು ಬಳಸುತ್ತದೆ
 DocType: Sales Partner,Retailer,ಚಿಲ್ಲರೆ ವ್ಯಾಪಾರಿ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ಎಲ್ಲಾ ವಿಧಗಳು ಸರಬರಾಜುದಾರ
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,ಐಟಂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಖ್ಯೆಯ ಕಾರಣ ಐಟಂ ಕೋಡ್ ಕಡ್ಡಾಯ
+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 +93,Quotation {0} not of type {1},ನುಡಿಮುತ್ತುಗಳು {0} ಅಲ್ಲ ರೀತಿಯ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಐಟಂ
 DocType: Sales Order,%  Delivered,ತಲುಪಿಸಲಾಗಿದೆ %
@@ -2372,7 +2394,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ಪ್ಯಾಕೇಜ್ ಒಟ್ಟಾರೆ ತೂಕದ . ಸಾಮಾನ್ಯವಾಗಿ ನಿವ್ವಳ ತೂಕ + ಪ್ಯಾಕೇಜಿಂಗ್ ವಸ್ತುಗಳ ತೂಕ . ( ಮುದ್ರಣ )
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ಈ ಪಾತ್ರವನ್ನು ಬಳಕೆದಾರರು ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳ ವಿರುದ್ಧ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು / ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳನ್ನು ಸೆಟ್ ಮತ್ತು ರಚಿಸಲು ಅವಕಾಶ
 DocType: Serial No,Is Cancelled,ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ ಇದೆ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,ನನ್ನ ಸಾಗಾಣಿಕೆಯಲ್ಲಿ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,ನನ್ನ ಸಾಗಾಣಿಕೆಯಲ್ಲಿ
 DocType: Journal Entry,Bill Date,ಬಿಲ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","ಹೆಚ್ಚಿನ ಆದ್ಯತೆ ಬಹು ಬೆಲೆ ನಿಯಮಗಳು ಇವೆ ಸಹ, ನಂತರ ಕೆಳಗಿನ ಆಂತರಿಕ ಆದ್ಯತೆಗಳು ಅನ್ವಯಿಸಲಾಗಿದೆ:"
 DocType: Supplier,Supplier Details,ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
@@ -2393,10 +2415,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,ಕರೆಗಳು
 DocType: Project,Total Costing Amount (via Time Logs),ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 DocType: Purchase Order Item Supplied,Stock UOM,ಸ್ಟಾಕ್ UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,ಯೋಜಿತ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ಗಮನಿಸಿ : ಸಿಸ್ಟಮ್ ಐಟಂ ಡೆಲಿವರಿ ಮೇಲೆ ಮತ್ತು ಅತಿ ಬುಕಿಂಗ್ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ {0} ಪ್ರಮಾಣ ಅಥವಾ ಪ್ರಮಾಣದ 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,ದಿನಾಂಕ ತೆರೆಯುವ
 DocType: Journal Entry,Remark,ಟೀಕಿಸು
@@ -2409,9 +2431,9 @@
 DocType: Time Log,Batched for Billing,ಬಿಲ್ಲಿಂಗ್ Batched
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,ಪೂರೈಕೆದಾರರು ಬೆಳೆಸಿದರು ಬಿಲ್ಲುಗಳನ್ನು .
 DocType: POS Profile,Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ವಿರುದ್ಧ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಹಿಂತಿರುಗಿ
 DocType: Item,Warranty Period (in days),( ದಿನಗಳಲ್ಲಿ ) ಖಾತರಿ ಅವಧಿಯ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,ಕಾರ್ಯಾಚರಣೆ ನಿವ್ವಳ ನಗದು
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,ಇ ಜಿ ವ್ಯಾಟ್
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,ಐಟಂ 4
 DocType: Journal Entry Account,Journal Entry Account,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಖಾತೆ
@@ -2452,7 +2474,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,ನಿವೃತ್ತಿ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 DocType: Sales Invoice,Against Income Account,ಆದಾಯ ಖಾತೆ ವಿರುದ್ಧ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% ತಲುಪಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,ಸಾರಿಗೆ ಮಾಹಿತಿ
@@ -2480,10 +2502,10 @@
 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 +14,This is a root sales person and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಮಾರಾಟಗಾರ ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 ,Stock Ledger,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},ದರ: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},ದರ: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,ಸಂಬಳದ ಸ್ಲಿಪ್ ಕಳೆಯುವುದು
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,ಮೊದಲ ಗುಂಪು ನೋಡ್ ಆಯ್ಕೆ.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},ಉದ್ದೇಶ ಒಂದು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},ಉದ್ದೇಶ ಒಂದು ಇರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,ರೂಪ ಭರ್ತಿ ಮಾಡಿ ಮತ್ತು ಅದನ್ನು ಉಳಿಸಲು
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,ಅವರ ಇತ್ತೀಚಿನ ದಾಸ್ತಾನು ಸ್ಥಿತಿಯನ್ನು ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಹೊಂದಿದ ಒಂದು ವರದಿಯನ್ನು ಡೌನ್ಲೋಡ್
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ಸಮುದಾಯ ವೇದಿಕೆ
@@ -2521,7 +2543,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,ಕಂಪನಿ ( ಗ್ರಾಹಕ ಅಥವಾ ಸರಬರಾಜುದಾರ ) ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',' ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ' ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,ಪಾವತಿಸಿದ ಪ್ರಮಾಣದ + ಆಫ್ ಬರೆಯಿರಿ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},ಗಮನಿಸಿ : ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","ಗಮನಿಸಿ: ಪಾವತಿ ಯಾವುದೇ ಉಲ್ಲೇಖ ವಿರುದ್ಧ ಹೋದರೆ, ಕೈಯಾರೆ ಜರ್ನಲ್ ನಮೂದನ್ನು ಮಾಡಲು."
@@ -2538,13 +2560,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ಓಪನ್ ಹೊಂದಿಸಿ
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸಂಪರ್ಕಗಳು ಸ್ವಯಂಚಾಲಿತ ಕಳುಹಿಸು.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","ಸಾಲು {0}: ಪ್ರಮಾಣ ಉಗ್ರಾಣದಲ್ಲಿ avalable ಅಲ್ಲ {1} ನಲ್ಲಿ {2} {3}.
  ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ: {4}, ಪ್ರಮಾಣ ವರ್ಗಾಯಿಸಿ: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ಐಟಂ 3
 DocType: Purchase Order,Customer Contact Email,ಗ್ರಾಹಕ ಸಂಪರ್ಕ ಇಮೇಲ್
 DocType: Sales Team,Contribution (%),ಕೊಡುಗೆ ( % )
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ಗಮನಿಸಿ : ಪಾವತಿ ಎಂಟ್ರಿ 'ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ' ಏನು ನಿರ್ದಿಷ್ಟಪಡಿಸಿಲ್ಲ ರಿಂದ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ಗಮನಿಸಿ : ಪಾವತಿ ಎಂಟ್ರಿ 'ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ' ಏನು ನಿರ್ದಿಷ್ಟಪಡಿಸಿಲ್ಲ ರಿಂದ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,ಜವಾಬ್ದಾರಿಗಳನ್ನು
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,ಟೆಂಪ್ಲೇಟು
 DocType: Sales Person,Sales Person Name,ಮಾರಾಟಗಾರನ ಹೆಸರು
@@ -2555,20 +2577,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,ಸಮನ್ವಯ ಮೊದಲು
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ಐಟಂ ತೆರಿಗೆ ರೋ {0} ಬಗೆಯ ತೆರಿಗೆ ಅಥವಾ ಆದಾಯ ಅಥವಾ ಖರ್ಚು ಅಥವಾ ಶುಲ್ಕಕ್ಕೆ ಖಾತೆಯನ್ನು ಹೊಂದಿರಬೇಕು
 DocType: Sales Order,Partly Billed,ಹೆಚ್ಚಾಗಿ ಖ್ಯಾತವಾದ
 DocType: Item,Default BOM,ಡೀಫಾಲ್ಟ್ BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,ಮರು ಮಾದರಿ ಕಂಪನಿ ಹೆಸರು ದೃಢೀಕರಿಸಿ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,ಒಟ್ಟು ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
 DocType: Time Log Batch,Total Hours,ಒಟ್ಟು ಅವರ್ಸ್
 DocType: Journal Entry,Printing Settings,ಮುದ್ರಣ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},ಒಟ್ಟು ಡೆಬಿಟ್ ಒಟ್ಟು ಕ್ರೆಡಿಟ್ ಸಮಾನವಾಗಿರಬೇಕು . ವ್ಯತ್ಯಾಸ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},ಒಟ್ಟು ಡೆಬಿಟ್ ಒಟ್ಟು ಕ್ರೆಡಿಟ್ ಸಮಾನವಾಗಿರಬೇಕು . ವ್ಯತ್ಯಾಸ {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ಆಟೋಮೋಟಿವ್
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 DocType: Time Log,From Time,ಸಮಯದಿಂದ
 DocType: Notification Control,Custom Message,ಕಸ್ಟಮ್ ಸಂದೇಶ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ ಬ್ಯಾಂಕಿಂಗ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಪಾವತಿ ಪ್ರವೇಶ ಮಾಡುವ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಪಾವತಿ ಪ್ರವೇಶ ಮಾಡುವ ಕಡ್ಡಾಯ
 DocType: Purchase Invoice,Price List Exchange Rate,ಬೆಲೆ ಪಟ್ಟಿ ವಿನಿಮಯ ದರ
 DocType: Purchase Invoice Item,Rate,ದರ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,ಆಂತರಿಕ
@@ -2587,9 +2609,10 @@
  ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ದಯವಿಟ್ಟು. ಬೆಲೆ ನಿಯಮಗಳು: {0}"
 DocType: Account,Bank,ಬ್ಯಾಂಕ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ಏರ್ಲೈನ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
 DocType: Material Request Item,For Warehouse,ಗೋದಾಮಿನ
 DocType: Employee,Offer Date,ಆಫರ್ ದಿನಾಂಕ
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ಉಲ್ಲೇಖಗಳು
 DocType: Hub Settings,Access Token,ಪ್ರವೇಶ ಟೋಕನ್
 DocType: Sales Invoice Item,Serial No,ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,ಮೊದಲ Maintaince ವಿವರಗಳು ನಮೂದಿಸಿ
@@ -2603,10 +2626,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,ಈ ತಿಂಗಳ ದಿನಗಳ ಕೆಲಸ ಹೆಚ್ಚು ರಜಾದಿನಗಳಲ್ಲಿ ಇವೆ .
 DocType: Product Bundle Item,Product Bundle Item,ಉತ್ಪನ್ನ ಕಟ್ಟು ಐಟಂ
 DocType: Sales Partner,Sales Partner Name,ಮಾರಾಟದ ಸಂಗಾತಿ ಹೆಸರು
+DocType: Payment Reconciliation,Maximum Invoice Amount,ಗರಿಷ್ಠ ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣವನ್ನು
 DocType: Purchase Invoice Item,Image View,ImageView
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು
@@ -2614,6 +2639,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ಈ ಐಟಂ {0} (ಟೆಂಪ್ಲೇಟು) ಒಂದು ಭೇದ. 'ಯಾವುದೇ ನಕಲಿಸಿ' ಸೆಟ್ ಹೊರತು ಲಕ್ಷಣಗಳು ಟೆಂಪ್ಲೇಟ್ ನಕಲು ಮಾಡಲಾಗುತ್ತದೆ
 DocType: Account,Purchase User,ಖರೀದಿ ಬಳಕೆದಾರ
 DocType: Notification Control,Customize the Notification,ಅಧಿಸೂಚನೆ ಕಸ್ಟಮೈಸ್
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,ಕಾರ್ಯಾಚರಣೆ ಕ್ಯಾಶ್ ಫ್ಲೋ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಅಳಿಸಲಾಗಿಲ್ಲ
 DocType: Sales Invoice,Shipping Rule,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
 DocType: Journal Entry,Print Heading,ಪ್ರಿಂಟ್ ಶಿರೋನಾಮೆ
@@ -2624,7 +2650,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,ಮೂಲಸಾಮಗ್ರಿ
 DocType: Leave Application,Follow via Email,ಇಮೇಲ್ ಮೂಲಕ ಅನುಸರಿಸಿ
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ಡಿಸ್ಕೌಂಟ್ ಪ್ರಮಾಣ ನಂತರ ತೆರಿಗೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,ಮಗುವಿನ ಖಾತೆಗೆ ಈ ಖಾತೆಗಾಗಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ . ನೀವು ಈ ಖಾತೆಯನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,ಮೊದಲ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆಮಾಡಿ
@@ -2642,6 +2668,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಸೀರಿಯಲ್ ಸೂಲ ಅಗತ್ಯವಿದೆ {0}
 DocType: Journal Entry,Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ
 DocType: Authorization Rule,Applicable To (Designation),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಹುದ್ದೆ )
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,ಕಾರ್ಟ್ ಸೇರಿಸಿ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ಗುಂಪಿನ
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಕರೆನ್ಸಿಗಳ ಸಕ್ರಿಯಗೊಳಿಸಿ .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ಅಂಚೆ ವೆಚ್ಚಗಳು
@@ -2649,30 +2676,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,ಮನರಂಜನೆ ಮತ್ತು ವಿರಾಮ
 DocType: Purchase Order,The date on which recurring order will be stop,ಮರುಕಳಿಸುವ ಸಲುವಾಗಿ ನಿಲ್ಲಿಸಲು ಯಾವ ದಿನಾಂಕ
 DocType: Quality Inspection,Item Serial No,ಐಟಂ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} ಕಡಿಮೆ ಮಾಡಬೇಕು ಅಥವಾ ನೀವು ಉಕ್ಕಿ ಸಹನೆ ಹೆಚ್ಚಾಗಬೇಕು
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} ಕಡಿಮೆ ಮಾಡಬೇಕು ಅಥವಾ ನೀವು ಉಕ್ಕಿ ಸಹನೆ ಹೆಚ್ಚಾಗಬೇಕು
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,ಒಟ್ಟು ಪ್ರೆಸೆಂಟ್
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,ಗಂಟೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು \
  ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,ಸರಬರಾಜುದಾರರಿಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,ಸರಬರಾಜುದಾರರಿಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,ಉದ್ಧರಣ ರಚಿಸಿ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,ನೀವು ಬ್ಲಾಕ್ ದಿನಾಂಕ ಎಲೆಗಳು ಅನುಮೋದಿಸಲು ನಿನಗೆ ಅಧಿಕಾರವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,ಈ ಎಲ್ಲಾ ವಸ್ತುಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,ಈ ಎಲ್ಲಾ ವಸ್ತುಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ಅನುಮೋದನೆ ಮಾಡಬಹುದು
 DocType: Shipping Rule,Shipping Rule Conditions,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ನಿಯಮಗಳು
 DocType: BOM Replace Tool,The new BOM after replacement,ಬದಲಿ ನಂತರ ಹೊಸ BOM
 DocType: Features Setup,Point of Sale,ಪಾಯಿಂಟ್ ಆಫ್ ಸೇಲ್
 DocType: Account,Tax,ತೆರಿಗೆ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},ಸಾಲು {0}: {1} ಒಂದು ಮಾನ್ಯವಾಗಿಲ್ಲ {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
 DocType: Production Planning Tool,Production Planning Tool,ತಯಾರಿಕಾ ಯೋಜನೆ ಉಪಕರಣ
 DocType: Quality Inspection,Report Date,ವರದಿಯ ದಿನಾಂಕ
 DocType: C-Form,Invoices,ಇನ್ವಾಯ್ಸ್ಗಳು
 DocType: Job Opening,Job Title,ಕೆಲಸದ ಶೀರ್ಷಿಕೆ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} ಪಡೆದವರು
 DocType: Features Setup,Item Groups in Details,ವಿವರಗಳನ್ನು ಐಟಂ ಗುಂಪುಗಳು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,ತಯಾರಿಸಲು ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),ಪ್ರಾರಂಭಿಸಿ ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ (ಪಿಓಎಸ್)
@@ -2680,8 +2706,9 @@
 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: Pricing Rule,Customer Group,ಗ್ರಾಹಕ ಗುಂಪಿನ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ಐಟಂ ಕಡ್ಡಾಯ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ಐಟಂ ಕಡ್ಡಾಯ {0}
 DocType: Item,Website Description,ವೆಬ್ಸೈಟ್ ವಿವರಣೆ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ಇಕ್ವಿಟಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Serial No,AMC Expiry Date,ಎಎಂಸಿ ಅಂತ್ಯ ದಿನಾಂಕ
 ,Sales Register,ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
 DocType: Quotation,Quotation Lost Reason,ನುಡಿಮುತ್ತುಗಳು ಲಾಸ್ಟ್ ಕಾರಣ
@@ -2689,12 +2716,12 @@
 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 +108,Summary for this month and pending activities,ಈ ತಿಂಗಳ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
 DocType: Customer Group,Customer Group Name,ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,ಗುಣಲಕ್ಷಣಗಳು
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,ಕೊನೆಯ ಆದೇಶ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,ಅಬಕಾರಿ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},ಖಾತೆ {0} ಮಾಡುತ್ತದೆ ಕಂಪನಿ ಸೇರಿದೆ ಅಲ್ಲ {1}
@@ -2710,7 +2737,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,ಪ್ರಾಜೆಕ್ಟ್ ಬಲ್ಲ ದಶಮಾಂಶ ಉದ್ಧರಣ ಲಭ್ಯವಿಲ್ಲ
 DocType: Project,Expected End Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Appraisal Template,Appraisal Template Title,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು ಶೀರ್ಷಿಕೆ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,ವ್ಯಾಪಾರದ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,ವ್ಯಾಪಾರದ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,ಪೋಷಕ ಐಟಂ {0} ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಇರಬಾರದು
 DocType: Cost Center,Distribution Id,ವಿತರಣೆ ಸಂ
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,ಆಕರ್ಷಕ ಸೇವೆಗಳು
@@ -2723,7 +2750,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} ಲಕ್ಷಣ ಮೌಲ್ಯವನ್ನು ವ್ಯಾಪ್ತಿಯಲ್ಲಿ ಇರಬೇಕು {1} ಗೆ {2} ಏರಿಕೆಗಳಲ್ಲಿ {3}
 DocType: Tax Rule,Sales,ಮಾರಾಟದ
 DocType: Stock Entry Detail,Basic Amount,ಬೇಸಿಕ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
 DocType: Leave Allocation,Unused leaves,ಬಳಕೆಯಾಗದ ಎಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,ಕೋಟಿ
 DocType: Customer,Default Receivable Accounts,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ಡೀಫಾಲ್ಟ್
@@ -2735,16 +2762,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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,ಸಂಪರ್ಕಿಸಿ ಎಚ್ಟಿಎಮ್ಎಲ್
 DocType: Landed Cost Voucher,Purchase Receipts,ಖರೀದಿ ರಸೀದಿಗಳನ್ನು
-DocType: Payment Reconciliation,Maximum Amount,ಗರಿಷ್ಠ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,ಹೇಗೆ ಬೆಲೆ ರೂಲ್ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ?
 DocType: Quality Inspection,Delivery Note No,ಡೆಲಿವರಿ ನೋಟ್ ನಂ
 DocType: Company,Retail,ಚಿಲ್ಲರೆ ವ್ಯಪಾರ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,ಗ್ರಾಹಕ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Attendance,Absent,ಆಬ್ಸೆಂಟ್
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},ಸಾಲು {0}: ಅಮಾನ್ಯ ಉಲ್ಲೇಖಿತ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},ಸಾಲು {0}: ಅಮಾನ್ಯ ಉಲ್ಲೇಖಿತ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
 DocType: Upload Attendance,Download Template,ಡೌನ್ಲೋಡ್ ಟೆಂಪ್ಲೇಟು
 DocType: GL Entry,Remarks,ರಿಮಾರ್ಕ್ಸ್
@@ -2771,7 +2798,7 @@
 ,Monthly Attendance Sheet,ಮಾಸಿಕ ಹಾಜರಾತಿ ಹಾಳೆ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,ಯಾವುದೇ ದಾಖಲೆ
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ವೆಚ್ಚ ಸೆಂಟರ್ ಐಟಂ ಕಡ್ಡಾಯ {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,ಖಾತೆ {0} ನಿಷ್ಕ್ರಿಯ
 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,ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ಅಟೆಂಡೆನ್ಸ್ ಹಾಜರಿದ್ದ ಕಡ್ಡಾಯ
@@ -2780,8 +2807,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' ಲಾಭ ಮತ್ತು ನಷ್ಟ ' ಮಾದರಿ ಖಾತೆಯನ್ನು {0} ಎಂಟ್ರಿ ತೆರೆಯುವ ಅನುಮತಿ ಇಲ್ಲ
 DocType: Features Setup,Sales Discounts,ಮಾರಾಟದ ರಿಯಾಯಿತಿಯು
 DocType: Hub Settings,Seller Country,ಮಾರಾಟಗಾರ ಕಂಟ್ರಿ
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಐಟಂಗಳನ್ನು ಪ್ರಕಟಿಸಿ
 DocType: Authorization Rule,Authorization Rule,ಅಧಿಕಾರ ರೂಲ್
 DocType: Sales Invoice,Terms and Conditions Details,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿವರಗಳು
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,ವಿಶೇಷಣಗಳು
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ಮಾರಾಟ ತೆರಿಗೆ ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ಬಟ್ಟೆಬರೆ ಮತ್ತು ಭಾಗಗಳು
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,ಆರ್ಡರ್ ಸಂಖ್ಯೆ
@@ -2803,7 +2832,7 @@
 DocType: Time Log,Billing Amount,ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ
 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 +18,Applications for leave.,ರಜೆ ಅಪ್ಲಿಕೇಷನ್ಗಳಿಗೆ .
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಅಳಿಸಲಾಗಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಅಳಿಸಲಾಗಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ಕಾನೂನು ವೆಚ್ಚ
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ಸ್ವಯಂ ಸಲುವಾಗಿ 05, 28 ಇತ್ಯಾದಿ ಉದಾ ರಚಿಸಲಾಗಿದೆ ಮೇಲೆ ತಿಂಗಳ ದಿನ"
 DocType: Sales Invoice,Posting Time,ಟೈಮ್ ಪೋಸ್ಟ್
@@ -2819,11 +2848,11 @@
 DocType: Maintenance Visit,Breakdown,ಅನಾರೋಗ್ಯದಿಂದ ಕುಸಿತ
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,ಖಾತೆ: {0} ಕರೆನ್ಸಿಗೆ: {1} ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Bank Reconciliation Detail,Cheque Date,ಚೆಕ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,ಯಶಸ್ವಿಯಾಗಿ ಈ ಕಂಪನಿಗೆ ಸಂಬಂಧಿಸಿದ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ದಿನಾಂಕದಂದು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,ಪರೀಕ್ಷಣೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},ತಿಂಗಳು ಮತ್ತು ವರ್ಷದ ಸಂಬಳ ಪಾವತಿ {0} {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ಆಟೋ ಇನ್ಸರ್ಟ್ ದರ ಪಟ್ಟಿ ದರ ಕಾಣೆಯಾಗಿದೆ ವೇಳೆ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ಒಟ್ಟು ಗಳಿಸುವ ಪ್ರಮಾಣ
@@ -2835,6 +2864,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,ನಾವು ಈ ಐಟಂ ಮಾರಾಟ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ಪೂರೈಕೆದಾರ ಐಡಿ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು
 DocType: Journal Entry,Cash Entry,ನಗದು ಎಂಟ್ರಿ
 DocType: Sales Partner,Contact Desc,ಸಂಪರ್ಕಿಸಿ DESC
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","ಪ್ರಾಸಂಗಿಕ , ಅನಾರೋಗ್ಯ , ಇತ್ಯಾದಿ ಎಲೆಗಳ ಪ್ರಕಾರ"
@@ -2843,7 +2873,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,ಖಾತೆಗಳ ವಾರ್ಷಿಕ ಬಜೆಟ್ ಹೊಂದಿಸಲು ಸಾಲುಗಳನ್ನು ಸೇರಿಸಿ .
 DocType: Buying Settings,Default Supplier Type,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 DocType: Production Order,Total Operating Cost,ಒಟ್ಟು ವೆಚ್ಚವನ್ನು
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,ರೇಟಿಂಗ್ : ಐಟಂ {0} ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,ರೇಟಿಂಗ್ : ಐಟಂ {0} ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು .
 DocType: Newsletter,Test Email Id,ಟೆಸ್ಟ್ ಮಿಂಚಂಚೆ
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,ಕಂಪನಿ ಸಂಕ್ಷೇಪಣ
@@ -2868,7 +2898,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಕಡ್ಡಾಯವಾಗಿದೆ.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ಬೆಲೆ ಪಟ್ಟಿ ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 DocType: Account,Temporary,ತಾತ್ಕಾಲಿಕ
 DocType: Address,Preferred Billing Address,ಮೆಚ್ಚಿನ ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ
@@ -2886,8 +2916,8 @@
 ,Item-wise Price List Rate,ಐಟಂ ಬಲ್ಲ ಬೆಲೆ ಪಟ್ಟಿ ದರ
 DocType: Purchase Order Item,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
 DocType: Quotation,In Words will be visible once you save the Quotation.,ನೀವು ಉದ್ಧರಣ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} ನಿಲ್ಲಿಸಿದಾಗ
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} ನಿಲ್ಲಿಸಿದಾಗ
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
 DocType: Lead,Add to calendar on this date,ಈ ದಿನಾಂಕದಂದು ಕ್ಯಾಲೆಂಡರ್ಗೆ ಸೇರಿಸು
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,ಹಡಗು ವೆಚ್ಚ ಸೇರಿಸುವ ನಿಯಮಗಳು .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ಮುಂಬರುವ ಕಾರ್ಯಕ್ರಮಗಳು
@@ -2908,24 +2938,24 @@
 DocType: Customer,From Lead,ಮುಂಚೂಣಿಯಲ್ಲಿವೆ
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,ಉತ್ಪಾದನೆಗೆ ಬಿಡುಗಡೆ ಆರ್ಡರ್ಸ್ .
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
 DocType: Hub Settings,Name Token,ಹೆಸರು ಟೋಕನ್
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,ಕನಿಷ್ಠ ಒಂದು ಗೋದಾಮಿನ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,ಬದಲಾಯಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ನಮೂದಿಸಿ
 DocType: Purchase Invoice Item,Project Name,ಪ್ರಾಜೆಕ್ಟ್ ಹೆಸರು
 DocType: Supplier,Mention if non-standard receivable account,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ವೇಳೆ
 DocType: Journal Entry Account,If Income or Expense,ವೇಳೆ ಆದಾಯ ಅಥವಾ ಖರ್ಚು
 DocType: Features Setup,Item Batch Nos,ಐಟಂ ಬ್ಯಾಚ್ ಸೂಲ
 DocType: Stock Ledger Entry,Stock Value Difference,ಸ್ಟಾಕ್ ಮೌಲ್ಯ ವ್ಯತ್ಯಾಸ
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,ಮಾನವ ಸಂಪನ್ಮೂಲ
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,ಮಾನವ ಸಂಪನ್ಮೂಲ
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ಪಾವತಿ ರಾಜಿ ಪಾವತಿಗೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,ತೆರಿಗೆ ಸ್ವತ್ತುಗಳು
 DocType: BOM Item,BOM No,ಯಾವುದೇ BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,ಜರ್ನಲ್ ಎಂಟ್ರಿ {0} {1} ಅಥವಾ ಈಗಾಗಲೇ ಇತರ ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲ
 DocType: Item,Moving Average,ಸರಾಸರಿ ಮೂವಿಂಗ್
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ಯಾವ ಸ್ಥಾನಾಂತರಿಸಲಾಗಿದೆ
 DocType: Account,Debit,ಡೆಬಿಟ್
@@ -2962,7 +2992,7 @@
 DocType: Stock Entry Detail,Additional Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,ಹಣಕಾಸು ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","ಚೀಟಿ ಮೂಲಕ ವರ್ಗೀಕರಿಸಲಾಗಿದೆ ವೇಳೆ , ಚೀಟಿ ಸಂಖ್ಯೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
 DocType: Quality Inspection,Incoming,ಒಳಬರುವ
 DocType: BOM,Materials Required (Exploded),ಬೇಕಾದ ಸಾಮಗ್ರಿಗಳು (ಸ್ಫೋಟಿಸಿತು )
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),ವೇತನ ಇಲ್ಲದೆ ರಜೆ ದುಡಿಯುತ್ತಿದ್ದ ಕಡಿಮೆ ( LWP )
@@ -2970,7 +3000,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ {1} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,ರಜೆ
 DocType: Batch,Batch ID,ಬ್ಯಾಚ್ ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},ರೇಟಿಂಗ್ : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},ರೇಟಿಂಗ್ : {0}
 ,Delivery Note Trends,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಪ್ರವೃತ್ತಿಗಳು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ಈ ವಾರದ ಸಾರಾಂಶ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} ಸತತವಾಗಿ ಖರೀದಿಸಲಾದ ಅಥವಾ ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು {1}
@@ -2985,6 +3015,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ಆವರೇಜ್. ಬೈಯಿಂಗ್ ದರ
 DocType: Task,Actual Time (in Hours),(ಘಂಟೆಗಳಲ್ಲಿ) ವಾಸ್ತವ ಟೈಮ್
 DocType: Employee,History In Company,ಕಂಪನಿ ಇತಿಹಾಸ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,ಸುದ್ದಿಪತ್ರಗಳು
 DocType: Address,Shipping,ಹಡಗು ರವಾನೆ
 DocType: Stock Ledger Entry,Stock Ledger Entry,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಎಂಟ್ರಿ
@@ -3004,7 +3035,6 @@
 DocType: Purchase Order,End date of current order's period,ಪ್ರಸ್ತುತ ಸಲುವಾಗಿ ನ ಅವಧಿಯ ಕೊನೆಯಲ್ಲಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ಆಫರ್ ಲೆಟರ್ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,ರಿಟರ್ನ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು
 DocType: Production Order Operation,Production Order Operation,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಆಪರೇಷನ್
 DocType: Pricing Rule,Disable,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Project Task,Pending Review,ಬಾಕಿ ರಿವ್ಯೂ
@@ -3012,7 +3042,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ಗ್ರಾಹಕ ಗುರುತು
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,ಟೈಮ್ ಟೈಮ್ ಗೆ ಹೆಚ್ಚು ಇರಬೇಕು ಗೆ
 DocType: Journal Entry Account,Exchange Rate,ವಿನಿಮಯ ದರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},ವೇರ್ಹೌಸ್ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಕಂಪನಿಗೆ ಸದಸ್ಯ ಮಾಡುವುದಿಲ್ಲ {2}
 DocType: BOM,Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ
 DocType: Account,Asset,ಆಸ್ತಿಪಾಸ್ತಿ
@@ -3032,7 +3062,7 @@
 ,Available Stock for Packing Items,ಐಟಂಗಳು ಪ್ಯಾಕಿಂಗ್ ಸ್ಟಾಕ್ ಲಭ್ಯವಿದೆ
 DocType: Item Variant,Item Variant,ಐಟಂ ಭಿನ್ನ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಇಲ್ಲ ಎಂದು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಈ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ ಹೊಂದಿಸುವ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ಈಗಾಗಲೇ ಡೆಬಿಟ್ ರಲ್ಲಿ ಖಾತೆ ಸಮತೋಲನ, ನೀವು 'ಕ್ರೆಡಿಟ್' 'ಬ್ಯಾಲೆನ್ಸ್ ಇರಬೇಕು ಹೊಂದಿಸಲು ಅನುಮತಿ ಇಲ್ಲ"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
 DocType: Production Planning Tool,Filter based on customer,ಫಿಲ್ಟರ್ ಗ್ರಾಹಕ ಆಧಾರಿತ
 DocType: Payment Tool Detail,Against Voucher No,ಚೀಟಿ ಯಾವುದೇ ವಿರುದ್ಧ
@@ -3049,6 +3079,7 @@
 DocType: Opportunity,Next Contact,ಮುಂದಿನ ಸಂಪರ್ಕಿಸಿ
 DocType: Employee,Employment Type,ಉದ್ಯೋಗ ಪ್ರಕಾರ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ಸ್ಥಿರ ಆಸ್ತಿಗಳ
+,Cash Flow,ಕ್ಯಾಶ್ ಫ್ಲೋ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಎರಡು alocation ದಾಖಲೆಗಳನ್ನು ಅಡ್ಡಲಾಗಿ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item Group,Default Expense Account,ಡೀಫಾಲ್ಟ್ ಖರ್ಚು ಖಾತೆ
 DocType: Employee,Notice (days),ಎಚ್ಚರಿಕೆ ( ದಿನಗಳು)
@@ -3080,13 +3111,12 @@
 DocType: Production Order,Warehouses,ಗೋದಾಮುಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,ಮುದ್ರಣ ಮತ್ತು ಸ್ಟೇಷನರಿ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,ಗುಂಪು ನೋಡ್
-DocType: Payment Reconciliation,Minimum Amount,ಕನಿಷ್ಠ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,ಅಪ್ಡೇಟ್ ಪೂರ್ಣಗೊಂಡ ಸರಕನ್ನು
 DocType: Workstation,per hour,ಗಂಟೆಗೆ
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,ಗೋದಾಮಿನ ( ಸಾರ್ವಕಾಲಿಕ ದಾಸ್ತಾನು ) ಖಾತೆ ಈ ಖಾತೆಯ ಅಡಿಯಲ್ಲಿ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಪ್ರವೇಶ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಎಂದು ವೇರ್ಹೌಸ್ ಅಳಿಸಲಾಗುವುದಿಲ್ಲ .
 DocType: Company,Distribution,ಹಂಚುವುದು
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,ಮೊತ್ತವನ್ನು
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,ಮೊತ್ತವನ್ನು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,ರವಾನಿಸು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ಮ್ಯಾಕ್ಸ್ ರಿಯಾಯಿತಿ ಐಟಂ ಅವಕಾಶ: {0} {1}% ಆಗಿದೆ
@@ -3110,7 +3140,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ಬೆಂಬಲ Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},ಕಂಪನಿ ಗೋದಾಮುಗಳು ಕಾಣೆಯಾಗಿದೆ {0}
 DocType: POS Profile,Terms and Conditions,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},ದಿನಾಂಕ ಹಣಕಾಸಿನ ವರ್ಷದ ಒಳಗೆ ಇರಬೇಕು. ದಿನಾಂಕ ಭಾವಿಸಿಕೊಂಡು = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},ದಿನಾಂಕ ಹಣಕಾಸಿನ ವರ್ಷದ ಒಳಗೆ ಇರಬೇಕು. ದಿನಾಂಕ ಭಾವಿಸಿಕೊಂಡು = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ಇಲ್ಲಿ ನೀವು ಎತ್ತರ, ತೂಕ, ಅಲರ್ಜಿ , ವೈದ್ಯಕೀಯ ಇತ್ಯಾದಿ ಕನ್ಸರ್ನ್ಸ್ ಕಾಯ್ದುಕೊಳ್ಳಬಹುದು"
 DocType: Leave Block List,Applies to Company,ಕಂಪನಿ ಅನ್ವಯಿಸುತ್ತದೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,ಸಲ್ಲಿಸಿದ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಏಕೆಂದರೆ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -3124,11 +3154,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ನಮೂದಿಸಿ
 DocType: Sales Invoice,Get Advances Received,ಅಡ್ವಾನ್ಸಸ್ ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪಡೆಯಿರಿ
 DocType: Email Digest,Add/Remove Recipients,ಸೇರಿಸಿ / ತೆಗೆದುಹಾಕಿ ಸ್ವೀಕೃತದಾರರ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ವಿರುದ್ಧ ನಿಲ್ಲಿಸಿತು {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),ಬೆಂಬಲ ಇಮೇಲ್ ಐಡಿ ಸೆಟಪ್ ಒಳಬರುವ ಸರ್ವರ್ . ( ಇ ಜಿ support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ಕೊರತೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 DocType: Salary Slip,Salary Slip,ಸಂಬಳದ ಸ್ಲಿಪ್
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.","ಪ್ರವಾಸ ತಲುಪಬೇಕಾದರೆ ಚೂರುಗಳನ್ನು ಪ್ಯಾಕಿಂಗ್ ರಚಿಸಿ. ಪ್ಯಾಕೇಜ್ ಸಂಖ್ಯೆ, ಪ್ಯಾಕೇಜ್ ್ಷೀಸಿ ಮತ್ತು ಅದರ ತೂಕ ತಿಳಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
@@ -3217,7 +3247,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,ನೌಕರರ ದಾಖಲೆಗಳು .
 DocType: HR Settings,Payroll Settings,ವೇತನದಾರರ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,ಅಲ್ಲದ ಲಿಂಕ್ ಇನ್ವಾಯ್ಸ್ ಮತ್ತು ಪಾವತಿಗಳು ಫಲಿತಾಂಶ .
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,ಪ್ಲೇಸ್ ಆರ್ಡರ್
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,ಪ್ಲೇಸ್ ಆರ್ಡರ್
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ರೂಟ್ ಪೋಷಕರು ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ಆಯ್ಕೆ ಬ್ರ್ಯಾಂಡ್ ...
 DocType: Sales Invoice,C-Form Applicable,ಅನ್ವಯಿಸುವ ಸಿ ಆಕಾರ
@@ -3232,7 +3262,7 @@
 DocType: Appraisal,Start Date,ಪ್ರಾರಂಭ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,ಕಾಲ ಎಲೆಗಳು ನಿಯೋಜಿಸಿ.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,ಪರಿಶೀಲಿಸಲು ಇಲ್ಲಿ ಕ್ಲಿಕ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,ಖಾತೆ {0}: ನೀವು ಪೋಷಕರ ಖಾತೆಯ ಎಂದು ಸ್ವತಃ ನಿಯೋಜಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,ಖಾತೆ {0}: ನೀವು ಪೋಷಕರ ಖಾತೆಯ ಎಂದು ಸ್ವತಃ ನಿಯೋಜಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Invoice Item,Price List Rate,ಬೆಲೆ ಪಟ್ಟಿ ದರ
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",""" ಸ್ಟಾಕ್ ರಲ್ಲಿ "" ತೋರಿಸು ಅಥವಾ "" ಅಲ್ಲ ಸ್ಟಾಕ್ "" ಈ ಉಗ್ರಾಣದಲ್ಲಿ ಲಭ್ಯವಿರುವ ಸ್ಟಾಕ್ ಆಧರಿಸಿ ."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ (BOM)
@@ -3241,17 +3271,17 @@
 DocType: Project,Expected Start Date,ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,ಆರೋಪಗಳನ್ನು ಐಟಂ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ವೇಳೆ ಐಟಂ ತೆಗೆದುಹಾಕಿ
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ಉದಾ . smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,ಸ್ವೀಕರಿಸಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,ಸ್ವೀಕರಿಸಿ
 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: Employee Leave Approver,Employee Leave Approver,ನೌಕರರ ಲೀವ್ ಅನುಮೋದಕ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ಯಶಸ್ವಿಯಾಗಿ ನಮ್ಮ ಸುದ್ದಿಪತ್ರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲಾಗಿದೆ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","ಸೋತು ಉದ್ಧರಣ ಮಾಡಲಾಗಿದೆ ಏಕೆಂದರೆ , ಘೋಷಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ಖರೀದಿ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸಬೇಕು
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಐಟಂ ಎಂಡ್ ದಿನಾಂಕ ಆಯ್ಕೆ ಮಾಡಿ {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,ಮುಖ್ಯ ವರದಿಗಳು
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ಇಲ್ಲಿಯವರೆಗೆ fromDate ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -3269,7 +3299,7 @@
 DocType: Industry Type,Industry Type,ಉದ್ಯಮ ಪ್ರಕಾರ
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,ಏನೋ ತಪ್ಪಾಗಿದೆ!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,ಎಚ್ಚರಿಕೆ : ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ ಕೆಳಗಿನ ಬ್ಲಾಕ್ ದಿನಾಂಕಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,ಪೂರ್ಣಗೊಳ್ಳುವ ದಿನಾಂಕ
 DocType: Purchase Invoice Item,Amount (Company Currency),ಪ್ರಮಾಣ ( ಕರೆನ್ಸಿ ಕಂಪನಿ )
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,ಸಂಸ್ಥೆ ಘಟಕ ( ಇಲಾಖೆ ) ಮಾಸ್ಟರ್ .
@@ -3288,10 +3318,10 @@
 ,Serial No Service Contract Expiry,ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೇವೆ ಕಾಂಟ್ರಾಕ್ಟ್ ಅಂತ್ಯ
 DocType: Item,Unit of Measure Conversion,ಅಳತೆ ಮತಾಂತರದ ಘಟಕ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,ನೌಕರರ ಬದಲಾವಣೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,ನೀವು ಕ್ರೆಡಿಟ್ ಮತ್ತು sametime ನಲ್ಲಿ ಅದೇ ಖಾತೆಯನ್ನು ಡೆಬಿಟ್ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,ನೀವು ಕ್ರೆಡಿಟ್ ಮತ್ತು sametime ನಲ್ಲಿ ಅದೇ ಖಾತೆಯನ್ನು ಡೆಬಿಟ್ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Naming Series,Help HTML,HTML ಸಹಾಯ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},ನಿಯೋಜಿಸಲಾಗಿದೆ ಒಟ್ಟು ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು 100% ಇರಬೇಕು. ಇದು {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}
 DocType: Address,Name of person or organization that this address belongs to.,ವ್ಯಕ್ತಿ ಅಥವಾ ಸಂಸ್ಥೆಯ ಹೆಸರು ಈ ವಿಳಾಸಕ್ಕೆ ಸೇರುತ್ತದೆ .
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರು
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ಮಾರಾಟದ ಆರ್ಡರ್ ಮಾಡಿದ ಎಂದು ಕಳೆದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ .
@@ -3304,35 +3334,35 @@
 DocType: Employee,Date of Issue,ಸಂಚಿಕೆ ದಿನಾಂಕ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: ಗೆ {0} ಫಾರ್ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},ರೋ # {0}: ಐಟಂ ಹೊಂದಿಸಿ ಸರಬರಾಜುದಾರ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,ಐಟಂ {1} ಜೋಡಿಸಲಾದ ವೆಬ್ಸೈಟ್ ಚಿತ್ರ {0} ದೊರೆಯುತ್ತಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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.,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಈ ಐಟಂ ಪಟ್ಟಿ .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,ಇತರ ಕರೆನ್ಸಿ ಖಾತೆಗಳನ್ನು ಅವಕಾಶ ಮಲ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆಯನ್ನು ಪರಿಶೀಲಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,ಇತರ ಕರೆನ್ಸಿ ಖಾತೆಗಳನ್ನು ಅವಕಾಶ ಮಲ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆಯನ್ನು ಪರಿಶೀಲಿಸಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,ಐಟಂ: {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,ನೀವು ಫ್ರೋಜನ್ ಮೌಲ್ಯವನ್ನು ಅಧಿಕಾರ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,ನೀವು ಫ್ರೋಜನ್ ಮೌಲ್ಯವನ್ನು ಅಧಿಕಾರ
 DocType: Payment Reconciliation,Get Unreconciled Entries,ರಾಜಿಯಾಗದ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
+DocType: Payment Reconciliation,From Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಗೆ
 DocType: Cost Center,Budgets,ಬಜೆಟ್
-DocType: Employee,Emergency Contact Details,ತುರ್ತು ಸಂಪರ್ಕ ವಿವರಗಳು
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,ಇದು ಏನು ಮಾಡುತ್ತದೆ?
 DocType: Delivery Note,To Warehouse,ಗೋದಾಮಿನ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},ಖಾತೆ {0} ಹೆಚ್ಚು ಹಣಕಾಸಿನ ವರ್ಷ ಒಂದಕ್ಕಿಂತ ನಮೂದಿಸಲಾದ {1}
 ,Average Commission Rate,ಸರಾಸರಿ ಆಯೋಗದ ದರ
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,ಅಟೆಂಡೆನ್ಸ್ ಭವಿಷ್ಯದ ದಿನಾಂಕ ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Pricing Rule,Pricing Rule Help,ಬೆಲೆ ನಿಯಮ ಸಹಾಯ
 DocType: Purchase Taxes and Charges,Account Head,ಖಾತೆ ಹೆಡ್
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,ಐಟಂಗಳ ಬಂದಿಳಿದ ವೆಚ್ಚ ಲೆಕ್ಕ ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ ನವೀಕರಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,ವಿದ್ಯುತ್ತಿನ
 DocType: Stock Entry,Total Value Difference (Out - In),ಒಟ್ಟು ಮೌಲ್ಯ ವ್ಯತ್ಯಾಸ (ಔಟ್ - ರಲ್ಲಿ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,ಸಾಲು {0}: ವಿನಿಮಯ ದರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,ಸಾಲು {0}: ವಿನಿಮಯ ದರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ಬಳಕೆದಾರ ID ನೌಕರ ಸೆಟ್ {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,ಖಾತರಿ ಹಕ್ಕು
 DocType: Stock Entry,Default Source Warehouse,ಡೀಫಾಲ್ಟ್ ಮೂಲ ವೇರ್ಹೌಸ್
 DocType: Item,Customer Code,ಗ್ರಾಹಕ ಕೋಡ್
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},ಹುಟ್ಟುಹಬ್ಬದ ಜ್ಞಾಪನೆ {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,ದಿನಗಳಿಂದಲೂ ಕೊನೆಯ ಆರ್ಡರ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,ಸ್ಟಾಕ್ ಸ್ವತ್ತುಗಳು
@@ -3345,7 +3375,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,ಖಾತೆ {0} ಮುಚ್ಚುವ ರೀತಿಯ ಹೊಣೆಗಾರಿಕೆ / ಇಕ್ವಿಟಿ ಇರಬೇಕು
 DocType: Authorization Rule,Based On,ಆಧರಿಸಿದೆ
 DocType: Sales Order Item,Ordered Qty,ಪ್ರಮಾಣ ಆದೇಶ
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Stock Settings,Stock Frozen Upto,ಸ್ಟಾಕ್ ಘನೀಕೃತ ವರೆಗೆ
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},ಗೆ ಅವಧಿಯ ಮರುಕಳಿಸುವ ಕಡ್ಡಾಯವಾಗಿ ದಿನಾಂಕಗಳನ್ನು ಅವಧಿಯಲ್ಲಿ {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,ಪ್ರಾಜೆಕ್ಟ್ ಚಟುವಟಿಕೆ / ಕೆಲಸ .
@@ -3353,7 +3383,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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 ಇರಬೇಕು
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ಪ್ರಮಾಣದ ಆಫ್ ಬರೆಯಿರಿ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ಇಳಿಯಿತು ವೆಚ್ಚ ಚೀಟಿ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ
@@ -3383,12 +3413,12 @@
 DocType: Upload Attendance,Upload Attendance,ಅಟೆಂಡೆನ್ಸ್ ಅಪ್ಲೋಡ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,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/accounts/doctype/journal_entry/journal_entry.js +446,Amount,ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,ಪ್ರಮಾಣ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ಬದಲಾಯಿಸಲ್ಪಟ್ಟಿದೆ
 ,Sales Analytics,ಮಾರಾಟದ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Manufacturing Settings,Manufacturing Settings,ಉತ್ಪಾದನಾ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ಇಮೇಲ್ ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,CompanyMaster ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,ದೈನಂದಿನ ಜ್ಞಾಪನೆಗಳನ್ನು
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},ತೆರಿಗೆ ನಿಯಮದ ನಡುವೆ ಘರ್ಷಣೆ {0}
@@ -3414,13 +3444,13 @@
 DocType: Sales Order Item,Produced Quantity,ಉತ್ಪಾದನೆಯ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,ಇಂಜಿನಿಯರ್
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ಹುಡುಕು ಉಪ ಅಸೆಂಬ್ಲೀಸ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},ರೋ ನಂ ಅಗತ್ಯವಿದೆ ಐಟಂ ಕೋಡ್ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},ರೋ ನಂ ಅಗತ್ಯವಿದೆ ಐಟಂ ಕೋಡ್ {0}
 DocType: Sales Partner,Partner Type,ಸಂಗಾತಿ ಪ್ರಕಾರ
 DocType: Purchase Taxes and Charges,Actual,ವಾಸ್ತವಿಕ
 DocType: Authorization Rule,Customerwise Discount,Customerwise ಡಿಸ್ಕೌಂಟ್
 DocType: Purchase Invoice,Against Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ವಿರುದ್ಧ
 DocType: Production Order,Production Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 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,ಈಗ ವೀಕ್ಷಿಸಿ
@@ -3432,15 +3462,15 @@
 DocType: Employee,Applicable Holiday List,ಅನ್ವಯಿಸುವ ಹಾಲಿಡೇ ಪಟ್ಟಿ
 DocType: Employee,Cheque,ಚೆಕ್
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,ಸರಣಿ Updated
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,ವರದಿ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,ವರದಿ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
 DocType: Item,Serial Number Series,ಕ್ರಮ ಸಂಖ್ಯೆ ಸರಣಿ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ {0} ಸತತವಾಗಿ {1}
 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/public/js/setup_wizard.js +101,The First User: You,ಮೊದಲ ಬಳಕೆದಾರ : ನೀವು
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಈಗಾಗಲೇ ವಿತ್ತೀಯ ವರ್ಷದಲ್ಲಿ ಸೆಟ್ {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,ಯಶಸ್ವಿಯಾಗಿ ಮರುಕೌನ್ಸಿಲ್
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಈಗಾಗಲೇ ವಿತ್ತೀಯ ವರ್ಷದಲ್ಲಿ ಸೆಟ್ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,ಯಶಸ್ವಿಯಾಗಿ ಮರುಕೌನ್ಸಿಲ್
 DocType: Production Order,Planned End Date,ಯೋಜನೆ ಅಂತಿಮ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,ಐಟಂಗಳನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ ಅಲ್ಲಿ .
 DocType: Tax Rule,Validity,ವಾಯಿದೆ
@@ -3448,7 +3478,7 @@
 DocType: Attendance,Attendance,ಅಟೆಂಡೆನ್ಸ್
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮತ್ತು ಪೋಸ್ಟ್ ಸಮಯದಲ್ಲಿ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮತ್ತು ಪೋಸ್ಟ್ ಸಮಯದಲ್ಲಿ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,ವ್ಯವಹಾರ ಖರೀದಿ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ .
 ,Item Prices,ಐಟಂ ಬೆಲೆಗಳು
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,ನೀವು ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
@@ -3457,15 +3487,15 @@
 DocType: Task,Review Date,ರಿವ್ಯೂ ದಿನಾಂಕ
 DocType: Purchase Invoice,Advance Payments,ಅಡ್ವಾನ್ಸ್ ಪಾವತಿಗಳು
 DocType: Purchase Taxes and Charges,On Net Total,ನೆಟ್ ಒಟ್ಟು ರಂದು
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,ಸತತವಾಗಿ ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ {0} ಅದೇ ಇರಬೇಕು ಉತ್ಪಾದನೆ ಆರ್ಡರ್
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,ಸತತವಾಗಿ ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ {0} ಅದೇ ಇರಬೇಕು ಉತ್ಪಾದನೆ ಆರ್ಡರ್
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,ಯಾವುದೇ ಅನುಮತಿ ಪಾವತಿ ಉಪಕರಣವನ್ನು ಬಳಸಲು
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% ರು ಪುನರಾವರ್ತಿತ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ 'ಅಧಿಸೂಚನೆ ಇಮೇಲ್ ವಿಳಾಸಗಳು'
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,ಕರೆನ್ಸಿ ಕೆಲವು ಇತರ ಕರೆನ್ಸಿ ಬಳಸಿಕೊಂಡು ನಮೂದುಗಳನ್ನು ಮಾಡಿದ ನಂತರ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,ಕರೆನ್ಸಿ ಕೆಲವು ಇತರ ಕರೆನ್ಸಿ ಬಳಸಿಕೊಂಡು ನಮೂದುಗಳನ್ನು ಮಾಡಿದ ನಂತರ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Company,Round Off Account,ಖಾತೆ ಆಫ್ ಸುತ್ತ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,ಆಡಳಿತಾತ್ಮಕ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,ಕನ್ಸಲ್ಟಿಂಗ್
 DocType: Customer Group,Parent Customer Group,ಪೋಷಕ ಗ್ರಾಹಕ ಗುಂಪಿನ
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,ಬದಲಾವಣೆ
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,ಬದಲಾವಣೆ
 DocType: Purchase Invoice,Contact Email,ಇಮೇಲ್ ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ
 DocType: Appraisal Goal,Score Earned,ಸ್ಕೋರ್ ಗಳಿಸಿದರು
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","ಇ ಜಿ "" ನನ್ನ ಕಂಪನಿ ಎಲ್ಎಲ್ """
@@ -3475,13 +3505,13 @@
 DocType: Packing Slip,Gross Weight UOM,ಒಟ್ಟಾರೆ ತೂಕದ UOM
 DocType: Email Digest,Receivables / Payables,ಕರಾರು / ಸಂದಾಯಗಳು
 DocType: Delivery Note Item,Against Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,ಕ್ರೆಡಿಟ್ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,ಕ್ರೆಡಿಟ್ ಖಾತೆ
 DocType: Landed Cost Item,Landed Cost Item,ಇಳಿಯಿತು ವೆಚ್ಚ ಐಟಂ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,ಶೂನ್ಯ ಮೌಲ್ಯಗಳು ತೋರಿಸಿ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ಕಚ್ಚಾ ವಸ್ತುಗಳ givenName ಪ್ರಮಾಣದಲ್ಲಿ repacking / ತಯಾರಿಕಾ ನಂತರ ಪಡೆದುಕೊಂಡು ಐಟಂ ಪ್ರಮಾಣ
 DocType: Payment Reconciliation,Receivable / Payable Account,ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 DocType: Delivery Note Item,Against Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ವಿರುದ್ಧ
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
 DocType: Item,Default Warehouse,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್
 DocType: Task,Actual End Date (via Time Logs),ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},ಬಜೆಟ್ ಗ್ರೂಪ್ ಖಾತೆ ವಿರುದ್ಧ ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ {0}
@@ -3517,29 +3547,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ವರ್ಕ್ಸ್ಟೇಷನ್ ಕೆಲಸ ಅವಧಿಗಳನ್ನು ಹೊರತುಪಡಿಸಿ ಸಮಯ ದಾಖಲೆಗಳು ಯೋಜನೆ.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 ,Items To Be Requested,ಮನವಿ ಐಟಂಗಳನ್ನು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ ಸಿಗುತ್ತದೆ
 DocType: Time Log,Billing Rate based on Activity Type (per hour),ಚಟುವಟಿಕೆ ಆಧರಿತವಾಗಿ ಬಿಲ್ಲಿಂಗ್ ದರ (ಪ್ರತಿ ಗಂಟೆಗೆ)
 DocType: Company,Company Info,ಕಂಪನಿ ಮಾಹಿತಿ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","ಕಂಪನಿ ಇಮೇಲ್ ಐಡಿ ಪತ್ತೆಯಾಗಿಲ್ಲ , ಆದ್ದರಿಂದ ಕಳುಹಿಸಲಾಗಿಲ್ಲ ಮೇಲ್"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ನಿಧಿಗಳು ಅಪ್ಲಿಕೇಶನ್ ( ಆಸ್ತಿಗಳು )
 DocType: Production Planning Tool,Filter based on item,ಐಟಂ ಆಧರಿಸಿ ಫಿಲ್ಟರ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,ಡೆಬಿಟ್ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,ಡೆಬಿಟ್ ಖಾತೆ
 DocType: Fiscal Year,Year Start Date,ವರ್ಷದ ಆರಂಭ ದಿನಾಂಕ
 DocType: Attendance,Employee Name,ನೌಕರರ ಹೆಸರು
 DocType: Sales Invoice,Rounded Total (Company Currency),ದುಂಡಾದ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,ಖಾತೆ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಏಕೆಂದರೆ ಗ್ರೂಪ್ ನಿಗೂಢ ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,ಖಾತೆ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಏಕೆಂದರೆ ಗ್ರೂಪ್ ನಿಗೂಢ ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Purchase Common,Purchase Common,ಸಾಮಾನ್ಯ ಖರೀದಿ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,ಅವಕಾಶದಿಂದ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
 DocType: Sales Invoice,Is POS,ಪಿಓಎಸ್ ಹೊಂದಿದೆ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{0} ಸತತವಾಗಿ {1} ಪ್ಯಾಕ್ಡ್ ಪ್ರಮಾಣ ಐಟಂ ಪ್ರಮಾಣ ಸಮ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},{0} ಸತತವಾಗಿ {1} ಪ್ಯಾಕ್ಡ್ ಪ್ರಮಾಣ ಐಟಂ ಪ್ರಮಾಣ ಸಮ
 DocType: Production Order,Manufactured Qty,ತಯಾರಿಸಲ್ಪಟ್ಟ ಪ್ರಮಾಣ
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,ಗ್ರಾಹಕರು ಬೆಳೆದ ಬಿಲ್ಲುಗಳನ್ನು .
 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 +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} ಗ್ರಾಹಕರನ್ನು ಸೇರ್ಪಡೆ
 DocType: Maintenance Schedule,Schedule,ಕಾರ್ಯಕ್ರಮ
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","ಈ ವೆಚ್ಚ ಕೇಂದ್ರ ಬಜೆಟ್ ವಿವರಿಸಿ. ವೆಚ್ಚದ ಸೆಟ್, ನೋಡಿ &quot;ಕಂಪನಿ ಪಟ್ಟಿ&quot;"
@@ -3547,7 +3578,7 @@
 DocType: Quality Inspection Reading,Reading 3,3 ಓದುವಿಕೆ
 ,Hub,ಹಬ್
 DocType: GL Entry,Voucher Type,ಚೀಟಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Expense Claim,Approved,Approved
 DocType: Pricing Rule,Price,ಬೆಲೆ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',{0} ಮೇಲೆ ಬಿಡುಗಡೆ ನೌಕರರ ' ಎಡ ' ಹೊಂದಿಸಿ
@@ -3561,7 +3592,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,ಲೆಕ್ಕಪರಿಶೋಧಕ ಜರ್ನಲ್ ನಮೂದುಗಳು .
 DocType: Delivery Note Item,Available Qty at From Warehouse,ಗೋದಾಮಿನ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ಸಾಲು {0}: ಪಕ್ಷದ / ಖಾತೆ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {1} / {2} ನಲ್ಲಿ {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,ಒಂದು ತೆರಿಗೆ ಖಾತೆಯನ್ನು ರಚಿಸಲು
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
 DocType: Account,Stock,ಸ್ಟಾಕ್
@@ -3572,7 +3603,7 @@
 DocType: Employee,Contract End Date,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ
 DocType: Sales Order,Track this Sales Order against any Project,ಯಾವುದೇ ಪ್ರಾಜೆಕ್ಟ್ ವಿರುದ್ಧ ಈ ಮಾರಾಟದ ಆರ್ಡರ್ ಟ್ರ್ಯಾಕ್
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,ಮೇಲೆ ಮಾನದಂಡಗಳನ್ನು ಆಧರಿಸಿ ( ತಲುಪಿಸಲು ಬಾಕಿ ) ಮಾರಾಟ ಆದೇಶಗಳನ್ನು ಪುಲ್
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಗೆ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಗೆ
 DocType: Deduction Type,Deduction Type,ಕಡಿತವು ಕೌಟುಂಬಿಕತೆ
 DocType: Attendance,Half Day,ಅರ್ಧ ದಿನ
 DocType: Pricing Rule,Min Qty,ಮಿನ್ ಪ್ರಮಾಣ
@@ -3580,7 +3611,7 @@
 DocType: GL Entry,Transaction Date,TransactionDate
 DocType: Production Plan Item,Planned Qty,ಯೋಜಿಸಿದ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,ಒಟ್ಟು ತೆರಿಗೆ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,ಪ್ರಮಾಣ (ಪ್ರಮಾಣ ತಯಾರಿಸಲ್ಪಟ್ಟ) ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,ಪ್ರಮಾಣ (ಪ್ರಮಾಣ ತಯಾರಿಸಲ್ಪಟ್ಟ) ಕಡ್ಡಾಯ
 DocType: Stock Entry,Default Target Warehouse,ಡೀಫಾಲ್ಟ್ ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
 DocType: Purchase Invoice,Net Total (Company Currency),ನೆಟ್ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ಸಾಲು {0}: ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ವಿರುದ್ಧ ಮಾತ್ರ ಅನ್ವಯವಾಗುತ್ತದೆ
@@ -3634,9 +3665,9 @@
 DocType: Customer,Commission Rate,ಕಮಿಷನ್ ದರ
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,ಭಿನ್ನ ಮಾಡಿ
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,ಇಲಾಖೆ ರಜೆ ಅನ್ವಯಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ .
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,ಕಾರ್ಟ್ ಖಾಲಿಯಾಗಿದೆ
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,ಕಾರ್ಟ್ ಖಾಲಿಯಾಗಿದೆ
 DocType: Production Order,Actual Operating Cost,ನಿಜವಾದ ವೆಚ್ಚವನ್ನು
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,ರೂಟ್ ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,ರೂಟ್ ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು unadusted ಪ್ರಮಾಣದ ಹೆಚ್ಚಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Manufacturing Settings,Allow Production on Holidays,ರಜಾ ದಿನಗಳಲ್ಲಿ ಪ್ರೊಡಕ್ಷನ್ ಅವಕಾಶ
 DocType: Sales Order,Customer's Purchase Order Date,ಗ್ರಾಹಕರ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ದಿನಾಂಕ
@@ -3647,11 +3678,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ಡಿಸೈನರ್
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ಟೆಂಪ್ಲೇಟು
 DocType: Serial No,Delivery Details,ಡೆಲಿವರಿ ವಿವರಗಳು
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,ಪ್ರಮಾಣ ಈ ಮಟ್ಟಕ್ಕಿಂತಲೂ ಕಳಗೆ ಬಿದ್ದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ರಚಿಸಲು
 ,Item-wise Purchase Register,ಐಟಂ ಬುದ್ಧಿವಂತ ಖರೀದಿ ನೋಂದಣಿ
 DocType: Batch,Expiry Date,ಅಂತ್ಯ ದಿನಾಂಕ
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟದ ಹೊಂದಿಸಲು, ಐಟಂ ಖರೀದಿ ಐಟಂ ಅಥವಾ ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಐಟಂ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟದ ಹೊಂದಿಸಲು, ಐಟಂ ಖರೀದಿ ಐಟಂ ಅಥವಾ ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಐಟಂ ಇರಬೇಕು"
 ,Supplier Addresses and Contacts,ಸರಬರಾಜುದಾರ ವಿಳಾಸಗಳು ಮತ್ತು ಸಂಪರ್ಕಗಳು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,ಮೊದಲ ವರ್ಗ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/projects.py +18,Project master.,ಪ್ರಾಜೆಕ್ಟ್ ಮಾಸ್ಟರ್ .
@@ -3659,7 +3690,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(ಅರ್ಧ ದಿನ)
 DocType: Supplier,Credit Days,ಕ್ರೆಡಿಟ್ ಡೇಸ್
 DocType: Leave Type,Is Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಇದೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,ಸಾಮಗ್ರಿಗಳ ಬಿಲ್ಲು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ಸಾಲು {0}: ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಅಗತ್ಯವಿದೆ {1}
@@ -3667,7 +3698,7 @@
 DocType: Employee,Reason for Leaving,ಲೀವಿಂಗ್ ಕಾರಣ
 DocType: Expense Claim Detail,Sanctioned Amount,ಮಂಜೂರಾದ ಹಣದಲ್ಲಿ
 DocType: GL Entry,Is Opening,ಆರಂಭ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},ಸಾಲು {0}: ಡೆಬಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,ಖಾತೆ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},ಸಾಲು {0}: ಡೆಬಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,ಖಾತೆ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 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 8dd0769..22494cf 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,소비자 제품
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,첫 번째 파티 유형을 선택하십시오
 DocType: Item,Customer Items,고객 항목
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,계정 {0} : 부모 계정은 {1} 원장이 될 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,계정 {0} : 부모 계정은 {1} 원장이 될 수 없습니다
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.com에 항목을 게시
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,전자 메일 알림
 DocType: Item,Default Unit of Measure,측정의 기본 단위
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,고객 연락처
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,자료 요청에서
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,자료 요청에서
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} 트리
 DocType: Job Applicant,Job Applicant,구직자
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,더 이상 결과가 없습니다.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1고객 현명한 항목 코드를 유지하고 자신의 코드 사용이 옵션에 따라이를 검색 할 수 있도록
 DocType: Mode of Payment Account,Mode of Payment Account,지불 계정의 모드
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,쇼 변형
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,수량
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,수량
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),대출 (부채)
 DocType: Employee Education,Year of Passing,전달의 해
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,재고 있음
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,건강 관리
 DocType: Purchase Invoice,Monthly,월
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),지급 지연 (일)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,송장
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,송장
 DocType: Maintenance Schedule Item,Periodicity,주기성
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,이메일 주소
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,회계 연도는 {0} 필요
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,방어
 DocType: Company,Abbr,약어
 DocType: Appraisal Goal,Score (0-5),점수 (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},행 {0} : {1} {2}과 일치하지 않는 {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},행 {0} : {1} {2}과 일치하지 않는 {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,행 번호 {0} :
 DocType: Delivery Note,Vehicle No,차량 없음
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,가격리스트를 선택하세요
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,가격리스트를 선택하세요
 DocType: Production Order Operation,Work In Progress,진행중인 작업
 DocType: Employee,Holiday List,휴일 목록
 DocType: Time Log,Time Log,소요시간 로그
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,같은 회사가 두 번 이상 입력
 DocType: Employee,Married,결혼 한
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},허용되지 {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
 DocType: Payment Reconciliation,Reconcile,조정
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,식료품 점
 DocType: Quality Inspection Reading,Reading 1,읽기 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,은행 입장 확인
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,연금 펀드
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,계정 유형이 창고인 경우 창고는 필수입니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,계정 유형이 창고인 경우 창고는 필수입니다
 DocType: SMS Center,All Sales Person,모든 판매 사람
 DocType: Lead,Person Name,사람 이름
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","확인 순서를 반복하는 경우, 반복 중지하거나 적절한 종료 날짜를 넣어 선택 취소"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,관심
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,자재 명세서 (BOM)
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,열기
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},에서 {0}에 {1}
+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,항목 열기
 DocType: Stock Entry,Additional Costs,추가 비용
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,기존 거래와 계정 그룹으로 변환 할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,기존 거래와 계정 그룹으로 변환 할 수 없습니다.
 DocType: Lead,Product Enquiry,제품 문의
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,첫 번째 회사를 입력하십시오
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,대상에
+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 +9,Activity Log:,활동 로그 :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,{0} 항목을 시스템에 존재하지 않거나 만료
@@ -165,7 +165,7 @@
 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 +444,Item {0} is not active or end of life has been reached,{0} 항목을 활성화하지 않거나 수명이 도달했습니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,{0} 항목을 활성화하지 않거나 수명이 도달했습니다
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,견적서를 제출 한 후 업데이트됩니다.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,HR 모듈에 대한 설정
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,작업의 세부 사항은 실시.
 DocType: Serial No,Maintenance Status,유지 보수 상태
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,품목 및 가격
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},날짜에서 회계 연도 내에 있어야합니다.날짜 가정 = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},날짜에서 회계 연도 내에 있어야합니다.날짜 가정 = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,평가 대상 직원 선정
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},코스트 센터 {0}에 속하지 않는 회사 {1}
 DocType: Customer,Individual,개교회들과 사역들은 생겼다가 사라진다.
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Financing의 순 현금
 DocType: Lead,Address & Contact,주소 및 연락처
 DocType: Leave Allocation,Add unused leaves from previous allocations,이전 할당에서 사용하지 않는 잎 추가
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},다음 반복 {0} 생성됩니다 {1}
@@ -222,6 +223,7 @@
 ,Contact Name,담당자 이름
 DocType: Production Plan Item,SO Pending Qty,SO 보류 수량
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,위에서 언급 한 기준에 대한 급여 명세서를 작성합니다.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,주어진 설명이 없습니다
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,구입 요청합니다.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,만 선택 안함 승인자이 허가 신청을 제출할 수 있습니다
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,날짜를 완화하는 것은 가입 날짜보다 커야합니다
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,항목 웹 사이트 사양
 DocType: Payment Tool,Reference No,참조 번호
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,남겨 차단
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,연간
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,재고 조정 항목
 DocType: Stock Entry,Sales Invoice No,판매 송장 번호
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,공급 업체 유형
 DocType: Item,Publish in Hub,허브에 게시
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,{0} 항목 취소
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,{0} 항목 취소
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,자료 요청
 DocType: Bank Reconciliation,Update Clearance Date,업데이트 통관 날짜
 DocType: Item,Purchase Details,구매 상세 정보
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},구매 주문에 &#39;원료 공급&#39;테이블에없는 항목 {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},구매 주문에 &#39;원료 공급&#39;테이블에없는 항목 {0} {1}
 DocType: Employee,Relation,관계
 DocType: Shipping Rule,Worldwide Shipping,해외 배송
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,고객의 확정 주문.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,제안
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,이 지역에 상품 그룹 현명한 예산을 설정합니다.또한 배포를 설정하여 계절성을 포함 할 수 있습니다.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},웨어 하우스의 부모 계정 그룹을 입력하세요 {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},에 대한 지불은 {0} {1} 뛰어난 금액보다 클 수 없습니다 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,일정을 생성
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,최근
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,최대 5 자
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,목록의 첫 번째 허가 승인자는 기본 남겨 승인자로 설정됩니다
+apps/erpnext/erpnext/config/desktop.py +73,Learn,배우다
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,직원 당 활동 비용
 DocType: Accounts Settings,Settings for Accounts,계정에 대한 설정
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,판매 인 나무를 관리합니다.
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,멀티 통화
 DocType: Payment Reconciliation Invoice,Invoice Type,송장 유형
 DocType: Sales Invoice Item,Delivery Note,상품 수령증
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,세금 설정
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,세금 설정
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,당신이 그것을 끌어 후 결제 항목이 수정되었습니다.다시 당깁니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,이번 주 보류중인 활동에 대한 요약
 DocType: Workstation,Rent Cost,임대 비용
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,월 및 연도를 선택하세요
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, 배달 참고, 구매 송장, 생산 주문, 구매 주문, 구입 영수증, 견적서, 판매 주문, 재고 항목, 작업 표에서 사용 가능"
 DocType: Item Tax,Tax Rate,세율
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,항목 선택
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","항목 : {0} 배치 식, 대신 사용 재고 항목 \
  재고 조정을 사용하여 조정되지 않는 경우가 있습니다 관리"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},행 번호 {0} : 일괄 없음은 동일해야합니다 {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,비 그룹으로 변환
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,구매 영수증을 제출해야합니다
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,의료
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,잃는 이유
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,미혼
 DocType: Issue,Attachment,첨부
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,예산은 그룹의 비용 센터를 설정할 수 없습니다
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,휴일 마스터.
 DocType: Material Request Item,Required Date,필요한 날짜
 DocType: Delivery Note,Billing Address,청구 주소
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,상품 코드를 입력 해 주시기 바랍니다.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,상품 코드를 입력 해 주시기 바랍니다.
 DocType: BOM,Costing,원가 계산
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",선택하면 이미 인쇄 속도 / 인쇄 금액에 포함되어있는 세액은 간주됩니다
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,총 수량
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
 DocType: Shipping Rule,Net Weight,순중량
 DocType: Employee,Emergency Phone,긴급 전화
 ,Serial No Warranty Expiry,일련 번호 보증 만료
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,증가는 0이 될 수 없습니다
 DocType: Production Planning Tool,Material Requirement,자료 요구
 DocType: Company,Delete Company Transactions,회사 거래 삭제
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,항목 {0} 항목을 구매하지 않습니다
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,항목 {0} 항목을 구매하지 않습니다
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} '알림 \
  이메일 주소'에서 잘못된 이메일 주소입니다"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,총 결제 올해 :
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,세금과 요금 추가/편집
 DocType: Purchase Invoice,Supplier Invoice No,공급 업체 송장 번호
 DocType: Territory,For reference,참고로
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","삭제할 수 없습니다 시리얼 번호 {0}, 그것은 증권 거래에 사용되는로"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),결산 (CR)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),결산 (CR)
 DocType: Serial No,Warranty Period (Days),보증 기간 (일)
 DocType: Installation Note Item,Installation Note Item,설치 노트 항목
 ,Pending Qty,보류 수량
@@ -466,7 +469,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** 예산 월간 배분 ** 귀하의 비즈니스에 계절성이있는 경우 월별로 예산을 배분하는 데 도움이됩니다.
 
 ,이 분포를 사용하여 예산을 분배 ** 비용 센터에서 **이 ** 월간 배포를 설정하려면 **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,송장 테이블에있는 레코드 없음
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,송장 테이블에있는 레코드 없음
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,첫번째 회사와 파티 유형을 선택하세요
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,금융 / 회계 연도.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","죄송합니다, 시리얼 NOS는 병합 할 수 없습니다"
@@ -474,9 +477,9 @@
 DocType: Project Task,Project Task,프로젝트 작업
 ,Lead Id,리드 아이디
 DocType: C-Form Invoice Detail,Grand Total,총 합계
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,회계 연도의 시작 날짜는 회계 연도 종료 날짜보다 크지 않아야한다
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,회계 연도의 시작 날짜는 회계 연도 종료 날짜보다 크지 않아야한다
 DocType: Warranty Claim,Resolution,해상도
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},배달 : {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},배달 : {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,채무 계정
 DocType: Sales Order,Billing and Delivery Status,결제 및 배송 상태
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,반복 고객
@@ -491,7 +494,7 @@
 DocType: Quotation,Quotation To,에 견적
 DocType: Lead,Middle Income,중간 소득
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),오프닝 (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,할당 된 금액은 음수 일 수 없습니다
 DocType: Purchase Order Item,Billed Amt,청구 AMT 사의
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,재고 항목이 만들어지는에 대해 논리적 창고.
@@ -500,7 +503,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,생산 오더는 필수입니다
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,제안서 작성
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,또 다른 판매 사람 {0} 같은 직원 ID 존재
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},음의 재고 오류 ({6}) 항목에 대한 {0} 창고 {1}에 {2} {3}에서 {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},음의 재고 오류 ({6}) 항목에 대한 {0} 창고 {1}에 {2} {3}에서 {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,회계 연도 회사
 DocType: Packing Slip Item,DN Detail,DN 세부 정보
 DocType: Time Log,Billed,청구
@@ -519,16 +522,17 @@
 DocType: Activity Type,Default Costing Rate,기본 원가 계산 속도
 DocType: Maintenance Schedule,Maintenance Schedule,유지 보수 일정
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","그런 가격 설정 규칙은 고객에 따라 필터링됩니다, 고객 그룹, 지역, 공급 업체, 공급 업체 유형, 캠페인, 판매 파트너 등"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,재고의 순 변화
 DocType: Employee,Passport Number,여권 번호
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,관리자
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,구매 영수증에서
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,동일한 항목을 복수 회 입력되었습니다.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,구매 영수증에서
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,동일한 항목을 복수 회 입력되었습니다.
 DocType: SMS Settings,Receiver Parameter,수신기 매개 변수
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'을 바탕으로'와 '그룹으로는'동일 할 수 없습니다
 DocType: Sales Person,Sales Person Targets,영업 사원 대상
 DocType: Production Order Operation,In minutes,분에서
 DocType: Issue,Resolution Date,결의일
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
 DocType: Selling Settings,Customer Naming By,고객 이름 지정으로
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,그룹으로 변환
 DocType: Activity Cost,Activity Type,활동 유형
@@ -539,7 +543,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0} {1} 송장 정보 테이블에서 찾을 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,유지 보수 방문은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 DocType: Material Request,Material Transfer,재료 이송
@@ -561,13 +565,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,마케팅
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,자신의 시리얼 NOS에 따라 판매 및 구매 문서의 항목을 추적 할 수 있습니다.또한이 제품의 보증 내용을 추적하는 데 사용 할 수 있습니다.
 DocType: Purchase Receipt Item Supplied,Current Stock,현재 재고
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,거부 창고 regected 항목에 대해 필수입니다
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,올해 총 결제
 DocType: Account,Expenses Included In Valuation,비용은 평가에 포함
 DocType: Employee,Provide email id registered in company,이메일 ID는 회사에 등록 제공
 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 +533,Item has variants.,항목 변종이있다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,나무의 종류
@@ -585,18 +589,18 @@
 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 +92,{0} is not a stock Item,{0} 재고 상품이 아닌
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} 재고 상품이 아닌
 DocType: Mode of Payment Account,Default Account,기본 계정
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,기회고객을 리드고객으로 만든 경우 리드고객를 설정해야합니다
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,매주 오프 날짜를 선택하세요
 DocType: Production Order Operation,Planned End Time,계획 종료 시간
 ,Sales Person Target Variance Item Group-Wise,영업 사원 대상 분산 상품 그룹 와이즈
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,기존 거래와 계정 원장으로 변환 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,기존 거래와 계정 원장으로 변환 할 수 없습니다
 DocType: Delivery Note,Customer's Purchase Order No,고객의 구매 주문 번호
 DocType: Employee,Cell Number,핸드폰 번호
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,자동 자료 요청 생성
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,상실
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,당신은 열 '저널 항목에 대하여'에서 현재의 바우처를 입력 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,당신은 열 '저널 항목에 대하여'에서 현재의 바우처를 입력 할 수 없습니다
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,에너지
 DocType: Opportunity,Opportunity From,기회에서
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,월급의 문.
@@ -605,9 +609,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}에서 {0} 유형의 {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,행 {0} : 변환 계수는 필수입니다
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,회계 항목은 리프 노드에 대해 할 수있다. 그룹에 대한 항목은 허용되지 않습니다.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,비활성화하거나 다른 BOM을 함께 연결되어로 BOM을 취소 할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,비활성화하거나 다른 BOM을 함께 연결되어로 BOM을 취소 할 수 없습니다
 DocType: Opportunity,Maintenance,유지
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},상품에 필요한 구매 영수증 번호 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},상품에 필요한 구매 영수증 번호 {0}
 DocType: Item Attribute Value,Item Attribute Value,항목 속성 값
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,판매 캠페인.
 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.
@@ -665,7 +669,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,가격 목록을 선택하지
 DocType: Employee,Family Background,가족 배경
 DocType: Process Payroll,Send Email,이메일 보내기
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,아무 권한이 없습니다
 DocType: Company,Default Bank Account,기본 은행 계좌
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",파티를 기반으로 필터링하려면 선택 파티 첫 번째 유형
@@ -673,7 +677,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,NOS
 DocType: Item,Items with higher weightage will be shown higher,높은 weightage와 항목에서 높은 표시됩니다
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,은행 계정조정 세부 정보
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,내 송장
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,내 송장
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,검색된 직원이 없습니다
 DocType: Purchase Order,Stopped,중지
 DocType: Item,If subcontracted to a vendor,공급 업체에 하청하는 경우
@@ -683,6 +687,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,지금 보내기
 ,Support Analytics,지원 분석
 DocType: Item,Website Warehouse,웹 사이트 창고
+DocType: Payment Reconciliation,Minimum Invoice Amount,최소 송장 금액
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","자동 청구서는 05, 28 등의 예를 들어 생성되는 달의 날"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,점수보다 작거나 5 같아야
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C 형태의 기록
@@ -692,7 +697,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;판매 시점&quot;기능을 사용하려면
 DocType: Bin,Moving Average Rate,이동 평균 속도
 DocType: Production Planning Tool,Select Items,항목 선택
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} 빌에 대해 {1} 일자 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} 빌에 대해 {1} 일자 {2}
 DocType: Maintenance Visit,Completion Status,완료 상태
 DocType: Sales Invoice Item,Target Warehouse,목표웨어 하우스
 DocType: Item,Allow over delivery or receipt upto this percent,이 퍼센트 개까지 배달 또는 영수증을 통해 허용
@@ -704,7 +709,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,자동 거래의 제출에 메시지를 작성합니다.
 DocType: Production Order,Item To Manufacture,제조 품목에
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} 상태가 {2}이다
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,지불하기 위해 구매
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,지불하기 위해 구매
 DocType: Sales Order Item,Projected Qty,수량을 예상
 DocType: Sales Invoice,Payment Due Date,지불 기한
 DocType: Newsletter,Newsletter Manager,뉴스 관리자
@@ -728,7 +733,7 @@
 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 +304,Point-of-Sale,판매 시점
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","계정 잔액이 이미 신용, 당신이 설정할 수 없습니다 '직불 카드'로 '밸런스 것은이어야'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","계정 잔액이 이미 신용, 당신이 설정할 수 없습니다 '직불 카드'로 '밸런스 것은이어야'"
 DocType: Account,Balance must be,잔고는
 DocType: Hub Settings,Publish Pricing,가격을 게시
 DocType: Notification Control,Expense Claim Rejected Message,비용 청구 거부 메시지
@@ -751,7 +756,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,통화 환율 마스터.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,첫 번째 문서 유형을 선택하세요
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"이 유지 보수 방문을 취소하기 전, 재질 방문 {0} 취소"
 DocType: Salary Slip,Leave Encashment Amount,현금화 금액을 남겨주
@@ -769,17 +774,17 @@
 DocType: Supplier,Default Payable Accounts,기본 미지급금
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,직원 {0} 활성화되지 않거나 존재하지 않습니다
 DocType: Features Setup,Item Barcode,상품의 바코드
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,항목 변형 {0} 업데이트
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,항목 변형 {0} 업데이트
 DocType: Quality Inspection Reading,Reading 6,6 읽기
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,송장 전진에게 구입
 DocType: Address,Shop,상점
 DocType: Hub Settings,Sync Now,지금 동기화
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},행은 {0} : 신용 항목에 링크 할 수 없습니다 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},행은 {0} : 신용 항목에 링크 할 수 없습니다 {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,이 모드를 선택하면 기본 은행 / 현금 계정은 자동으로 POS 송장에 업데이트됩니다.
 DocType: Employee,Permanent Address Is,영구 주소는
 DocType: Production Order Operation,Operation completed for how many finished goods?,작업이 얼마나 많은 완제품 완료?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,브랜드
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,수당에 {0} 항목에 대한 교차에 대한 {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,수당에 {0} 항목에 대한 교차에 대한 {1}.
 DocType: Employee,Exit Interview Details,출구 인터뷰의 자세한 사항
 DocType: Item,Is Purchase Item,구매 상품입니다
 DocType: Journal Entry Account,Purchase Invoice,구매 송장
@@ -791,7 +796,7 @@
 DocType: Salary Slip,Total in words,즉 전체
 DocType: Material Request Item,Lead Time Date,리드 타임 날짜
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,필수입니다. 아마 환전 레코드가 만들어지지 않습니다
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},행 번호는 {0} 항목에 대한 일련 번호를 지정하십시오 {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},행 번호는 {0} 항목에 대한 일련 번호를 지정하십시오 {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","&#39;제품 번들&#39;항목, 창고, 일련 번호 및 배치에 대해 아니오 &#39;포장 목록&#39;테이블에서 고려 될 것이다. 창고 및 배치 없음 어떤 &#39;제품 번들&#39;항목에 대한 모든 포장 항목에 대해 동일한 경우, 그 값이 주요 항목 테이블에 입력 할 수는 값이 테이블 &#39;목록 포장&#39;을 복사됩니다."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,고객에게 선적.
 DocType: Purchase Invoice Item,Purchase Order Item,구매 주문 상품
@@ -800,14 +805,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,변화
 ,Company Name,회사 명
 DocType: SMS Center,Total Message(s),전체 메시지 (들)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,전송 항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,검사가 입금 된 은행 계좌 머리를 선택합니다.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,사용자가 거래 가격리스트 평가를 편집 할 수
 DocType: Pricing Rule,Max Qty,최대 수량
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,화학
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,모든 항목은 이미 생산 주문에 대한 전송되었습니다.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,모든 항목은 이미 생산 주문에 대한 전송되었습니다.
 DocType: Process Payroll,Select Payroll Year and Month,급여 연도와 월을 선택
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",해당 그룹 (일반적으로 펀드의 응용 프로그램&gt; 현재 자산&gt; 은행 계좌로 이동 유형) 자녀 추가 클릭하여 (새 계정 만들기 &quot;은행&quot;
 DocType: Workstation,Electricity Cost,전기 비용
@@ -821,10 +827,10 @@
 DocType: SMS Center,All Lead (Open),모든 납 (열기)
 DocType: Purchase Invoice,Get Advances Paid,선불지급
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,사진 첨부
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,확인
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,확인
 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 +3,My Cart,내 장바구니
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,내 장바구니
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,열기 수량
@@ -843,10 +849,10 @@
 DocType: POS Profile,Cash/Bank Account,현금 / 은행 계좌
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,양 또는 값의 변화없이 제거 항목.
 DocType: Delivery Note,Delivery To,에 배달
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,속성 테이블은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,속성 테이블은 필수입니다
 DocType: Production Planning Tool,Get Sales Orders,판매 주문을 받아보세요
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} 음수가 될 수 없습니다
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,할인
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,할인
 DocType: Features Setup,Purchase Discounts,할인 구매
 DocType: Workstation,Wages,임금
 DocType: Time Log,Will be updated only if Time Log is 'Billable',시간 로그 &#39;청구&#39;경우에만 업데이트됩니다
@@ -871,7 +877,7 @@
 DocType: Tax Rule,Shipping State,배송 상태
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,항목 버튼 '구매 영수증에서 항목 가져 오기'를 사용하여 추가해야합니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,영업 비용
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,표준 구매
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,표준 구매
 DocType: GL Entry,Against,에 대하여
 DocType: Item,Default Selling Cost Center,기본 판매 비용 센터
 DocType: Sales Partner,Implementation Partner,구현 파트너
@@ -913,6 +919,7 @@
 DocType: Sales Partner,Distributor,분배 자
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,쇼핑 카트 배송 규칙
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,생산 순서는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',설정 &#39;에 추가 할인을 적용&#39;하세요
 ,Ordered Items To Be Billed,청구 항목을 주문한
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,범위이어야한다보다는에게 범위
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,시간 로그를 선택하고 새로운 판매 송장을 만들 제출.
@@ -922,13 +929,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,이 시간 로그 일괄 청구하고있다.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,기회를 만들기
 DocType: Salary Slip,Leave Without Pay,지불하지 않고 종료
-DocType: Supplier,Communications,통신
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,용량 계획 오류
 ,Trial Balance for Party,파티를위한 시산표
 DocType: Lead,Consultant,컨설턴트
 DocType: Salary Slip,Earnings,당기순이익
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,완료 항목 {0} 제조 유형 항목을 입력해야합니다
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,개시 잔고
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,완료 항목 {0} 제조 유형 항목을 입력해야합니다
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,개시 잔고
 DocType: Sales Invoice Advance,Sales Invoice Advance,선행 견적서
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,요청하지 마
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','시작 날짜가' '종료 날짜 '보다 클 수 없습니다
@@ -970,7 +976,7 @@
 DocType: Global Defaults,Current Fiscal Year,당해 사업 연도
 DocType: Global Defaults,Disable Rounded Total,둥근 전체에게 사용 안 함
 DocType: Lead,Call,전화
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'항목은'비워 둘 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'항목은'비워 둘 수 없습니다
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},중복 행 {0}과 같은 {1}
 ,Trial Balance,시산표
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,직원 설정
@@ -982,9 +988,9 @@
 DocType: Contact,User ID,사용자 ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,보기 원장
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,처음
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
 DocType: Production Order,Manufacture against Sales Order,판매 주문에 대해 제조
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,세계의 나머지
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,총 지불
@@ -1014,7 +1020,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},동결 계정을 편집 할 수있는 권한이 없습니다 {0}
 DocType: Journal Entry,Get Outstanding Invoices,미결제 송장를 얻을
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,판매 주문 {0} 유효하지 않습니다
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1027,13 +1033,13 @@
 DocType: Employee,Place of Issue,문제의 장소
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,계약직
 DocType: Email Digest,Add Quote,견적 추가
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM에 필요한 UOM coversion 인자 : {0} 항목 {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM에 필요한 UOM coversion 인자 : {0} 항목 {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,간접 비용
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,행 {0} : 수량은 필수입니다
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,농업
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,귀하의 제품이나 서비스
 DocType: Mode of Payment,Mode of Payment,결제 방식
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,이 루트 항목 그룹 및 편집 할 수 없습니다.
 DocType: Journal Entry Account,Purchase Order,구매 주문
 DocType: Warehouse,Warehouse Contact Info,창고 연락처 정보
@@ -1042,8 +1048,8 @@
 DocType: Email Digest,Annual Income,연간 소득
 DocType: Serial No,Serial No Details,일련 번호 세부 사항
 DocType: Purchase Invoice Item,Item Tax Rate,항목 세율
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,{0} 항목 하위 계약 품목이어야합니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,자본 장비
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","가격 규칙은 첫 번째 항목, 항목 그룹 또는 브랜드가 될 수있는 필드 '에 적용'에 따라 선택됩니다."
@@ -1053,7 +1059,7 @@
 DocType: Appraisal Goal,Goal,골
 DocType: Sales Invoice Item,Edit Description,편집 설명
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,예상 배달 날짜는 계획 시작 날짜보다 적은이다.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,공급 업체
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,공급 업체
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,계정 유형을 설정하면 트랜잭션이 계정을 선택하는 데 도움이됩니다.
 DocType: Purchase Invoice,Grand Total (Company Currency),총계 (회사 통화)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,총 발신
@@ -1066,7 +1072,7 @@
 DocType: Journal Entry,Journal Entry,분개
 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 +427,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,이것은이 접두사를 마지막으로 생성 된 트랜잭션의 수입니다
@@ -1098,7 +1104,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","상대에게 뉴스 레터, 리드."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,작업은 비워 둘 수 없습니다.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,작업은 비워 둘 수 없습니다.
 ,Delivered Items To Be Billed,청구에 전달 항목
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,웨어 하우스는 일련 번호 변경할 수 없습니다
 DocType: Authorization Rule,Average Discount,평균 할인
@@ -1113,7 +1119,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},에서 {0} | {1} {2}
 DocType: BOM Operation,Operation Description,작업 설명
 DocType: Item,Will also apply to variants,또한 변형에 적용됩니다
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,회계 연도 시작 날짜와 회계 연도가 저장되면 회계 연도 종료 날짜를 변경할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,회계 연도 시작 날짜와 회계 연도가 저장되면 회계 연도 종료 날짜를 변경할 수 없습니다.
 DocType: Quotation,Shopping Cart,쇼핑 카트
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,평균 일일 보내는
 DocType: Pricing Rule,Campaign,캠페인
@@ -1124,7 +1130,8 @@
 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 +211,Stock Entries already created for Production Order ,이미 생산 오더에 대 한 만든 항목
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,이미 생산 오더에 대 한 만든 항목
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,고정 자산의 순 변화
 DocType: Leave Control Panel,Leave blank if considered for all designations,모든 지정을 고려하는 경우 비워 둡니다
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},최대 : {0}
@@ -1136,7 +1143,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,계정 차트
 DocType: Material Request,Terms and Conditions Content,약관 내용
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100보다 큰 수 없습니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
 DocType: Maintenance Visit,Unscheduled,예약되지 않은
 DocType: Employee,Owned,소유
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,무급 휴가에 따라 다름
@@ -1174,7 +1181,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,서브 어셈블리
 DocType: Shipping Rule Condition,To Value,값
 DocType: Supplier,Stock Manager,재고 관리자
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},소스웨어 하우스는 행에 대해 필수입니다 {0}
+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 +581,Packing Slip,포장 명세서
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,사무실 임대
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,설치 SMS 게이트웨이 설정
@@ -1182,10 +1189,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,어떤 주소는 아직 추가되지 않습니다.
 DocType: Workstation Working Hour,Workstation Working Hour,워크 스테이션 작업 시간
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,분석자
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},행 {0} : 할당 된 양 {1} 미만 또는 JV의 양에 해당한다 {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},행 {0} : 할당 된 양 {1} 미만 또는 JV의 양에 해당한다 {2}
 DocType: Item,Inventory,재고
 DocType: Features Setup,"To enable ""Point of Sale"" view",보기 &quot;판매 시점&quot;을 사용하려면
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,결제는 빈 카트에 할 수 없다
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,결제는 빈 카트에 할 수 없다
 DocType: Item,Sales Details,판매 세부 사항
 DocType: Opportunity,With Items,항목
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,수량에
@@ -1200,10 +1207,11 @@
 DocType: Cost Center,Parent Cost Center,부모의 비용 센터
 DocType: Sales Invoice,Source,소스
 DocType: Leave Type,Is Leave Without Pay,지불하지 않고 남겨주세요
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,지불 테이블에있는 레코드 없음
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,지불 테이블에있는 레코드 없음
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,회계 연도의 시작 날짜
 DocType: Employee External Work History,Total Experience,총 체험
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,포장 명세서 (들) 취소
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,포장 명세서 (들) 취소
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,투자의 현금 흐름
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,화물 운송 및 포워딩 요금
 DocType: Material Request Item,Sales Order No,판매 주문 번호
 DocType: Item Group,Item Group Name,항목 그룹 이름
@@ -1211,12 +1219,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,제조에 대한 전송 재료
 DocType: Pricing Rule,For Price List,가격 목록을 보려면
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,대표 조사
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","항목에 대한 구매 비율 : {0}을 (를) 찾을 수 없습니다, 회계 항목 (비용)을 예약하는 데 필요합니다.구매 가격 목록에 대해 품목 가격을 언급하시기 바랍니다."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","항목에 대한 구매 비율 : {0}을 (를) 찾을 수 없습니다, 회계 항목 (비용)을 예약하는 데 필요합니다.구매 가격 목록에 대해 품목 가격을 언급하시기 바랍니다."
 DocType: Maintenance Schedule,Schedules,일정
 DocType: Purchase Invoice Item,Net Amount,순액
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM 세부 사항 없음
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),추가 할인 금액 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},오류 : {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},오류 : {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,계정 차트에서 새로운 계정을 생성 해주세요.
 DocType: Maintenance Visit,Maintenance Visit,유지 보수 방문
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,고객 지원> 고객 그룹> 지역
@@ -1242,7 +1250,7 @@
 DocType: Sales Partner,Sales Partner Target,영업 파트너 대상
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0}에 대한 회계 항목 만 통화 할 수있다 : {1}
 DocType: Pricing Rule,Pricing Rule,가격 규칙
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,주문을 (를) 구매하려면 자료 요청
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,주문을 (를) 구매하려면 자료 요청
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},행 번호 {0} : 반환 항목 {1}에 존재하지 않는 {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,은행 계정
 ,Bank Reconciliation Statement,은행 계정 조정 계산서
@@ -1250,11 +1258,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,열기 주식 대차
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} 한 번만 표시합니다
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},더 tranfer 할 수 없습니다 {0}보다 {1} 구매 주문에 대한 {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},잎에 성공적으로 할당 된 {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,포장하는 항목이 없습니다
 DocType: Shipping Rule Condition,From Value,값에서
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,제조 수량이 필수입니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,제조 수량이 필수입니다
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,은행에 반영되지 금액
 DocType: Quality Inspection Reading,Reading 4,4 읽기
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,회사 경비 주장한다.
@@ -1266,33 +1274,34 @@
 ,Material Requests for which Supplier Quotations are not created,공급 업체의 견적이 생성되지 않는 자재 요청
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,당신이 휴가를 신청하는 날 (들)은 휴일입니다. 당신은 휴가를 신청할 필요가 없습니다.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,바코드를 사용하여 항목을 추적 할 수 있습니다.당신은 상품의 바코드를 스캔하여 납품서 및 판매 송장에서 항목을 입력 할 수 있습니다.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,마크 배달로
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,마크 배달로
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,견적 확인
 DocType: Dependent Task,Dependent Task,종속 작업
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,정지 생일 알림
 DocType: SMS Center,Receiver List,수신기 목록
 DocType: Payment Tool Detail,Payment Amount,결제 금액
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,소비 금액
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}보기
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0}보기
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,현금의 순 변화
 DocType: Salary Structure Deduction,Salary Structure Deduction,급여 구조 공제
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {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 +185,Quantity must not be more than {0},수량 이하이어야한다 {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),나이 (일)
 DocType: Quotation Item,Quotation Item,견적 상품
 DocType: Account,Account Name,계정 이름
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,날짜에서 날짜보다 클 수 없습니다
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,날짜에서 날짜보다 클 수 없습니다
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,일련 번호 {0} 수량 {1} 일부가 될 수 없습니다
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,공급 유형 마스터.
 DocType: Purchase Order Item,Supplier Part Number,공급 업체 부품 번호
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,변환 속도는 0 또는 1이 될 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,변환 속도는 0 또는 1이 될 수 없습니다
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,구입 영수증 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,구입 영수증 {0} 제출되지
 DocType: Company,Default Payable Account,기본 지불 계정
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","이러한 운송 규칙, 가격 목록 등 온라인 쇼핑 카트에 대한 설정"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0} % 청구
@@ -1304,15 +1313,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,내 문제
 DocType: BOM Item,BOM Item,BOM 상품
 DocType: Appraisal,For Employee,직원에 대한
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,행 {0} : 공급 업체에 대한 사전 직불해야
 DocType: Company,Default Values,기본값
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,행 {0} : 지불 금액은 음수가 될 수 없습니다
 DocType: Expense Claim,Total Amount Reimbursed,총 금액 상환
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},공급 업체 청구서를 {0} 일자 {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},공급 업체 청구서를 {0} 일자 {1}
 DocType: Customer,Default Price List,기본 가격리스트
 DocType: Payment Reconciliation,Payments,지불
 DocType: Budget Detail,Budget Allocated,할당 된 예산
 DocType: Journal Entry,Entry Type,항목 유형
 ,Customer Credit Balance,고객 신용 잔액
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,외상 매입금의 순 변화
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,귀하의 이메일 ID를 확인하십시오
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount','Customerwise 할인'을 위해 필요한 고객
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,저널과 은행의 지불 날짜를 업데이트합니다.
@@ -1333,7 +1344,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,장바구니 사용
 DocType: Employee,Permanent Address,영구 주소
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,항목 {0} 서비스 상품이어야합니다.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",총계보다 \ {0} {1} 초과 할 수 없습니다에 대해 지불 사전 {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,품목 코드를 선택하세요
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),무급 휴직 공제를 줄 (LWP)
@@ -1350,18 +1361,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,항목의 하나의 단위.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',시간 로그 일괄 {0} '제출'해야
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',시간 로그 일괄 {0} '제출'해야
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,모든 재고 이동을위한 회계 항목을 만듭니다
 DocType: Leave Allocation,Total Leaves Allocated,할당 된 전체 잎
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},행 없음에 필요한 창고 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},행 없음에 필요한 창고 {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,유효한 회계 연도 시작 및 종료 날짜를 입력하십시오
 DocType: Employee,Date Of Retirement,은퇴 날짜
 DocType: Upload Attendance,Get Template,양식 구하기
 DocType: Address,Postal,우편의
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,고객 그룹이 동일한 이름으로 존재하는 것은 고객의 이름을 변경하거나 고객 그룹의 이름을 바꾸십시오
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,먼저 {0}을 선택하십시오.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},텍스트 {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,먼저 {0}을 선택하십시오.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},텍스트 {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,새 연락처
 DocType: Territory,Parent Territory,상위 지역
 DocType: Quality Inspection Reading,Reading 2,2 읽기
 DocType: Stock Entry,Material Receipt,소재 영수증
@@ -1369,7 +1381,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},파티 형 파티는 채권 / 채무 계정이 필요합니다 {0}
 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 +210,Quantity required for Item {0} in row {1},상품에 필요한 수량 {0} 행에서 {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},상품에 필요한 수량 {0} 행에서 {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},수량이 항목에 대한 존재하는 창고 {0} 삭제할 수 없습니다 {1}
 DocType: Quotation,Order Type,주문 유형
 DocType: Purchase Invoice,Notification Email Address,알림 전자 메일 주소
@@ -1386,15 +1398,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,열이 너무 많습니다.보고서를 내 보낸 스프레드 시트 응용 프로그램을 사용하여 인쇄 할 수 있습니다.
 DocType: Sales 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 +152,Main,주요 기능
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,주요 기능
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,변체
 DocType: Naming Series,Set prefix for numbering series on your transactions,트랜잭션에 일련 번호에 대한 설정 접두사
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,정지 순서는 취소 할 수 없습니다.취소 멈추지.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,확인 구매 주문
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,확인 구매 주문
 DocType: SMS Center,Send To,보내기
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
 DocType: Payment Reconciliation Payment,Allocated amount,할당 된 양
@@ -1407,7 +1419,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,창고 및 참조
 DocType: Supplier,Statutory info and other general information about your Supplier,법정 정보 및 공급 업체에 대한 다른 일반적인 정보
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,주소
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,저널에 대하여 항목 {0} 어떤 타의 추종을 불허 {1} 항목이없는
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,저널에 대하여 항목 {0} 어떤 타의 추종을 불허 {1} 항목이없는
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},중복 된 일련 번호는 항목에 대해 입력 {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,배송 규칙의 조건
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,항목은 생산 주문을 할 수 없습니다.
@@ -1416,10 +1428,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,계정 통화 신용의 양
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,제조 시간 로그.
 DocType: Item,Apply Warehouse-wise Reorder Level,창고 현명한 재주문 수준을 적용
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
 DocType: Authorization Control,Authorization Control,권한 제어
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},행 번호 {0} : 창고 거부 거부 항목에 대해 필수입니다 {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,작업 시간에 로그인합니다.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,지불
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,지불
 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},최대의 자료 요청은 {0} 항목에 대한 {1}에 대해 수행 할 수있는 판매 주문 {2}
 DocType: Employee,Salutation,인사말
@@ -1436,7 +1449,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,준
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,{0} 항목을 직렬화 된 상품이 없습니다
 DocType: SMS Center,Create Receiver List,수신기 목록 만들기
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,만료
 DocType: Packing Slip,To Package No.,번호를 패키지에
 DocType: Warranty Claim,Issue Date,발행일
 DocType: Activity Cost,Activity Cost,활동 비용
@@ -1474,7 +1486,7 @@
 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 +65,Territory / Customer,지역 / 고객
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,예) 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,판매 상품입니다
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,항목 그룹 트리
@@ -1486,7 +1498,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} 생성
 DocType: Delivery Note Item,Against Sales Order,판매 주문에 대해
 ,Serial No Status,일련 번호 상태
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,항목 테이블은 비워 둘 수 없습니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,항목 테이블은 비워 둘 수 없습니다
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","행 {0} : 설정하려면 {1} 주기성에서 날짜와 \
 에 차이는보다 크거나 같아야합니다 {2}"
@@ -1496,7 +1508,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,관세 및 세금
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,참고 날짜를 입력 해주세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,납품 수량
@@ -1511,7 +1523,7 @@
 DocType: Installation Note,Installation Time,설치 시간
 DocType: Sales Invoice,Accounting Details,회계 세부 사항
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,이 회사의 모든 거래를 삭제
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,행 번호 {0} : 작업 {1} 생산에서 완제품 {2} 수량에 대한 완료되지 않은 주문 # {3}.시간 로그를 통해 동작 상태를 업데이트하세요
+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,행 번호 {0} : 작업 {1} 생산에서 완제품 {2} 수량에 대한 완료되지 않은 주문 # {3}.시간 로그를 통해 동작 상태를 업데이트하세요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,투자
 DocType: Issue,Resolution Details,해상도 세부 사항
 DocType: Quality Inspection Reading,Acceptance Criteria,허용 기준
@@ -1527,7 +1539,7 @@
 DocType: Holiday List,Clear Table,표 지우기
 DocType: Features Setup,Brands,상표
 DocType: C-Form Invoice Detail,Invoice No,아니 송장
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,구매 발주
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,구매 발주
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,원가 계산 속도
 ,Customer Addresses And Contacts,고객 주소 및 연락처
@@ -1544,7 +1556,7 @@
 ,Maintenance Schedules,관리 스케줄
 ,Quotation Trends,견적 동향
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},항목에 대한 항목을 마스터에 언급되지 않은 항목 그룹 {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
 DocType: Shipping Rule Condition,Shipping Amount,배송 금액
 ,Pending Amount,대기중인 금액
 DocType: Purchase Invoice Item,Conversion Factor,변환 계수
@@ -1561,12 +1573,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,재무계정트리
 DocType: Leave Control Panel,Leave blank if considered for all employee types,모든 직원의 유형을 고려하는 경우 비워 둡니다
 DocType: Landed Cost Voucher,Distribute Charges Based On,배포 요금을 기준으로
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,품목은 {1} 자산 상품이기 때문에 계정 {0} 형식의 '고정 자산'이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,품목은 {1} 자산 상품이기 때문에 계정 {0} 형식의 '고정 자산'이어야합니다
 DocType: HR Settings,HR Settings,HR 설정
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,비용 청구가 승인 대기 중입니다.만 비용 승인자 상태를 업데이트 할 수 있습니다.
 DocType: Purchase Invoice,Additional Discount Amount,추가 할인 금액
 DocType: Leave Block List Allow,Leave Block List Allow,차단 목록은 허용 남겨
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,약어는 비워둘수 없습니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,약어는 비워둘수 없습니다
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,스포츠
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,실제 총
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,단위
@@ -1578,6 +1590,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} 이제 기본 회계 연도이다.변경 내용을 적용하기 위해 브라우저를 새로 고침하십시오.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,비용 청구
 DocType: Issue,Support,기술 지원
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,장바구니보기
 ,BOM Search,BOM 검색
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),닫기 (+ 합계 열기)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,회사에 통화를 지정하십시오
@@ -1589,13 +1602,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM 변환 계수는 행에 필요한 {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},통관 날짜 행 체크인 날짜 이전 할 수 없습니다 {0}
 DocType: Salary Slip,Deduction,공제
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},상품 가격은 추가 {0} 가격 목록에서 {1}
 DocType: Address Template,Address Template,주소 템플릿
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,이 영업 사원의 직원 ID를 입력하십시오
 DocType: Territory,Classification of Customers by region,지역별 고객의 분류
 DocType: Project,% Tasks Completed,% 작업 완료
 DocType: Project,Gross Margin,매출 총 이익률
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,첫 번째 생산 품목을 입력하십시오
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,사용하지 않는 사용자
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,사용하지 않는 사용자
 DocType: Opportunity,Quotation,인용
 DocType: Salary Slip,Total Deduction,총 공제
 DocType: Quotation,Maintenance User,유지 보수 사용자
@@ -1604,7 +1618,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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,공제
@@ -1614,12 +1628,12 @@
 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,SO 수량
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","재고 항목이 창고에 존재 {0}, 따라서 당신은 다시 할당하거나 창고를 수정할 수 없습니다"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","재고 항목이 창고에 존재 {0}, 따라서 당신은 다시 할당하거나 창고를 수정할 수 없습니다"
 DocType: Appraisal,Calculate Total Score,총 점수를 계산
 DocType: Supplier Quotation,Manufacturing Manager,제조 관리자
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},일련 번호는 {0}까지 보증 {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,패키지로 배달 주를 분할합니다.
-apps/erpnext/erpnext/hooks.py +68,Shipments,선적
+apps/erpnext/erpnext/hooks.py +69,Shipments,선적
 DocType: Purchase Order Item,To be delivered to customer,고객에게 전달 될
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,소요시간 로그 상태는 제출해야합니다.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,일련 번호 {0} 어떤 창고에 속하지 않는
@@ -1639,10 +1653,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,회사를 선택 ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,모든 부서가 있다고 간주 될 경우 비워 둡니다
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","고용 (영구, 계약, 인턴 등)의 종류."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
 DocType: Currency Exchange,From Currency,통화와
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","이어야 한 행에 할당 된 금액, 송장 유형 및 송장 번호를 선택하세요"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},상품에 필요한 판매 주문 {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","이어야 한 행에 할당 된 금액, 송장 유형 및 송장 번호를 선택하세요"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},상품에 필요한 판매 주문 {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,시스템에 반영되지 금액
 DocType: Purchase Invoice Item,Rate (Company Currency),속도 (회사 통화)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,기타사항
@@ -1658,7 +1672,7 @@
 DocType: Quality Inspection,In Process,처리 중
 DocType: Authorization Rule,Itemwise Discount,Itemwise 할인
 DocType: Purchase Order Item,Reference Document Type,참조 문서 유형
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} 판매 주문에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} 판매 주문에 대한 {1}
 DocType: Account,Fixed Asset,고정 자산
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,직렬화 된 재고
 DocType: Activity Type,Default Billing Rate,기본 결제 요금
@@ -1668,7 +1682,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,지불에 판매 주문
 DocType: Expense Claim Detail,Expense Claim Detail,비용 청구 상세 정보
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,시간 로그 생성 :
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,올바른 계정을 선택하세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,올바른 계정을 선택하세요
 DocType: Item,Weight UOM,무게 UOM
 DocType: Employee,Blood Group,혈액 그룹
 DocType: Purchase Invoice Item,Page Break,페이지 나누기
@@ -1699,10 +1713,10 @@
 DocType: Time Log,To Time,시간
 DocType: Authorization Rule,Approving Role (above authorized value),(승인 된 값 이상) 역할을 승인
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","자식 노드를 추가하려면, 나무를 탐구하고 더 많은 노드를 추가 할 노드를 클릭합니다."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,대변계정은 채무 계정이어야합니다
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM 재귀 : {0} 부모 또는 자녀가 될 수 없습니다 {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,대변계정은 채무 계정이어야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,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 +116,"For {0}, only debit accounts can be linked against another credit entry",{0} 만 직불 계정은 다른 신용 항목에 링크 할 수 있습니다 들어
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry",{0} 만 직불 계정은 다른 신용 항목에 링크 할 수 있습니다 들어
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,가격 목록 {0} 비활성화
 DocType: Manufacturing Settings,Allow Overtime,초과 근무 허용
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} 항목에 필요한 일련 번호 {1}. 당신이 제공 한 {2}.
@@ -1710,8 +1724,9 @@
 DocType: Item,Customer Item Codes,고객 상품 코드
 DocType: Opportunity,Lost Reason,분실 된 이유
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,주문 또는 송장에 대한 지불 항목을 만듭니다.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,새 주소
 DocType: Quality Inspection,Sample Size,표본 크기
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,모든 상품은 이미 청구 된
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,또한 비용 센터 그룹에서 할 수 있지만 항목이 아닌 그룹에 대해 할 수있다
 DocType: Project,External,외부
@@ -1767,13 +1782,14 @@
 DocType: Rename Tool,Rename Tool,이름바꾸기 툴
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,업데이트 비용
 DocType: Item Reorder,Item Reorder,항목 순서 바꾸기
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,전송 자료
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,전송 자료
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","운영, 운영 비용을 지정하고 작업에 고유 한 작업에게 더를 제공합니다."
 DocType: Purchase Invoice,Price List Currency,가격리스트 통화
 DocType: Naming Series,User must always select,사용자는 항상 선택해야합니다
 DocType: Stock Settings,Allow Negative Stock,음의 재고 허용
 DocType: Installation Note,Installation Note,설치 노트
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,세금 추가
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,금융으로 인한 현금 흐름
 ,Financial Analytics,재무 분석
 DocType: Quality Inspection,Verified By,에 의해 확인
 DocType: Address,Subsidiary,자회사
@@ -1783,19 +1799,19 @@
 DocType: Process Payroll,Create Salary Slip,급여 슬립을 만듭니다
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,은행에 따라 예상 균형
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),자금의 출처 (부채)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},수량은 행에서 {0} ({1})와 동일해야합니다 제조 수량 {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},수량은 행에서 {0} ({1})와 동일해야합니다 제조 수량 {2}
 DocType: Appraisal,Employee,종업원
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,가져 오기 이메일
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,사용자로 초대하기
 DocType: Features Setup,After Sale Installations,판매 설치 후
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} 전액 청구됩니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} 전액 청구됩니다
 DocType: Workstation Working Hour,End Time,종료 시간
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,판매 또는 구매를위한 표준 계약 조건.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,바우처 그룹
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,필요에
 DocType: Sales Invoice,Mass Mailing,대량 메일 링
 DocType: Rename Tool,File to Rename,이름 바꾸기 파일
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},purchse를 주문 번호는 상품에 필요한 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},purchse를 주문 번호는 상품에 필요한 {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,쇼 지불
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},상품에 대한 존재하지 않습니다 BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,유지 보수 일정은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
@@ -1805,6 +1821,7 @@
 DocType: Selling Settings,Sales Order Required,판매 주문 필수
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,고객을 만들기
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,유지 보수 일정의 세부 사항
 DocType: Quality Inspection Reading,Reading 9,9 읽기
@@ -1816,6 +1833,7 @@
 DocType: Warranty Claim,Raised By,에 의해 제기
 DocType: Payment Tool,Payment Account,결제 계정
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,진행하는 회사를 지정하십시오
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,채권에 순 변경
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,보상 오프
 DocType: Quality Inspection Reading,Accepted,허용
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,당신이 정말로이 회사에 대한 모든 트랜잭션을 삭제 하시겠습니까 확인하시기 바랍니다. 그대로 마스터 데이터는 유지됩니다. 이 작업은 취소 할 수 없습니다.
@@ -1823,17 +1841,17 @@
 DocType: Payment Tool,Total Payment Amount,총 결제 금액
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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 +204,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
 DocType: Newsletter,Test,미리 보기
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","기존의 주식 거래는의 값을 변경할 수 없습니다 \이 항목에 대한 있기 때문에 &#39;일련 번호를 가지고&#39;, &#39;배치를 가지고 없음&#39;, &#39;주식 항목으로&#39;와 &#39;평가 방법&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,빠른 분개
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,빠른 분개
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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 +157,Please enter Planned Qty for Item {0} at row {1},항목에 대한 계획 수량을 입력하십시오 {0} 행에서 {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} 제출되지
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} 제출되지
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,상품에 대한 요청.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,별도의 생산 순서는 각 완제품 항목에 대해 작성됩니다.
 DocType: Purchase Invoice,Terms and Conditions1,약관 및 상태 인 경우 1
@@ -1846,7 +1864,7 @@
 DocType: Authorization Rule,Authorized Value,공인 값
 DocType: Contact,Enter department to which this Contact belongs,이 연락처가 속한 부서를 입력
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,총 결석
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,행에 대한 항목이나 창고 {0} 물자의 요청과 일치하지 않습니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,행에 대한 항목이나 창고 {0} 물자의 요청과 일치하지 않습니다
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,측정 단위
 DocType: Fiscal Year,Year End Date,연도 종료 날짜
 DocType: Task Depends On,Task Depends On,작업에 따라 다릅니다
@@ -1872,7 +1890,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,계약 종료 날짜는 가입 날짜보다 커야합니다
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,수수료에 대한 회사의 제품을 판매하는 타사 대리점 / 딜러 /위원회 에이전트 / 제휴 / 대리점.
 DocType: Customer Group,Has Child Node,아이 노드에게 있습니다
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} 구매 주문에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} 구매 주문에 대한 {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","여기에 정적 URL 매개 변수를 입력합니다 (예 : 보낸 사람 = ERPNext, 사용자 이름 = ERPNext, 암호 = 1234 등)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}되지 않은 활성 회계 연도에. 자세한 내용 확인은 {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,이 ERPNext에서 자동으로 생성 예를 들어 웹 사이트입니다
@@ -1920,7 +1938,7 @@
  10.추가 공제 : 추가하거나 세금을 공제할지 여부를 선택합니다."
 DocType: Purchase Receipt Item,Recd Quantity,Recd 수량
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},더 많은 항목을 생성 할 수 없습니다 {0}보다 판매 주문 수량 {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,재고 항목 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,재고 항목 {0} 제출되지
 DocType: Payment Reconciliation,Bank / Cash Account,은행 / 현금 계정
 DocType: Tax Rule,Billing City,결제시
 DocType: Global Defaults,Hide Currency Symbol,통화 기호에게 숨기기
@@ -1952,6 +1970,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,광열비
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 위
 DocType: Buying Settings,Default Buying Price List,기본 구매 가격 목록
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.","기타 회사, 통화, 당해 사업 연도와 같은 기본값을 설정"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,지불 유형
@@ -1987,7 +2006,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","절 원가 계산의 ""에 근거를 자료의 평가""를 참조하십시오"
 DocType: Appraisal Goal,Key Responsibility Area,주요 책임 지역
 DocType: Item Reorder,Material Request Type,자료 요청 유형
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,행 {0} : UOM 변환 계수는 필수입니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,행 {0} : UOM 변환 계수는 필수입니다
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,참조
 DocType: Cost Center,Cost Center,비용 센터
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,상품권 #
@@ -2010,7 +2029,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,모든 주소.
 DocType: Company,Stock Settings,스톡 설정
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","다음과 같은 속성이 모두 기록에 같은 경우 병합에만 가능합니다. 그룹, 루트 유형, 회사는"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","다음과 같은 속성이 모두 기록에 같은 경우 병합에만 가능합니다. 그룹, 루트 유형, 회사는"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,고객 그룹 트리를 관리 할 수 있습니다.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,새로운 비용 센터의 이름
 DocType: Leave Control Panel,Leave Control Panel,제어판에게 남겨
@@ -2030,8 +2049,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,지불 도구 세부 정보
 ,Sales Browser,판매 브라우저
 DocType: Journal Entry,Total Credit,총 크레딧
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},경고 : 또 다른 {0} # {1} 재고 항목에 대해 존재 {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,지역정보 검색
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},경고 : 또 다른 {0} # {1} 재고 항목에 대해 존재 {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,외상매출금
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,큰
@@ -2050,7 +2069,7 @@
 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 번호
 DocType: Production Order Operation,Make Time Log,시간 로그를 확인하십시오
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,재주문 수량을 설정하세요
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,재주문 수량을 설정하세요
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},리드에서 고객을 생성 해주세요 {0}
 DocType: Price List,Applicable for Countries,국가에 대한 적용
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,컴퓨터
@@ -2110,10 +2129,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,이어야 하나의 항목이 반환 문서에 부정적인 수량 입력해야합니다
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,없음 비고
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,없음 비고
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,연체
 DocType: Account,Stock Received But Not Billed,재고품 받았지만 청구하지
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,루트 계정은 그룹이어야합니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,루트 계정은 그룹이어야합니다
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,총 급여 + 연체 금액 + 현금화 금액 - 총 공제
 DocType: Monthly Distribution,Distribution Name,배포 이름
 DocType: Features Setup,Sales and Purchase,판매 및 구매
@@ -2127,6 +2146,7 @@
 DocType: Journal Entry Account,Party Balance,파티 밸런스
 DocType: Sales Invoice Item,Time Log Batch,시간 로그 배치
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,할인에 적용을 선택하세요
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,급여 슬립이 만든
 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,제조에 대한 자료 전송
@@ -2134,9 +2154,9 @@
 DocType: Purchase Invoice,Half-yearly,반년마다
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,회계 연도 {0}를 찾을 수 없습니다.
 DocType: Bank Reconciliation,Get Relevant Entries,관련 항목을보세요
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,재고에 대한 회계 항목
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,재고에 대한 회계 항목
 DocType: Sales Invoice,Sales Team1,판매 Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,{0} 항목이 존재하지 않습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,{0} 항목이 존재하지 않습니다
 DocType: Sales Invoice,Customer Address,고객 주소
 DocType: Purchase Invoice,Apply Additional Discount On,추가 할인에 적용
 DocType: Account,Root Type,루트 유형
@@ -2145,15 +2165,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,페이지 상단에이 슬라이드 쇼보기
 DocType: BOM,Item UOM,상품 UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),할인 금액 후 세액 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},목표웨어 하우스는 행에 대해 필수입니다 {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},목표웨어 하우스는 행에 대해 필수입니다 {0}
 DocType: Quality Inspection,Quality Inspection,품질 검사
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,매우 작은
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,계정 {0} 동결
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,조직에 속한 계정의 별도의 차트와 법인 / 자회사.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","음식, 음료 및 담배"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL 또는 BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},단지에 대한 지불을 할 수 미 청구 {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},단지에 대한 지불을 할 수 미 청구 {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,수수료율은 100보다 큰 수 없습니다
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,최소 재고 수준
 DocType: Stock Entry,Subcontract,하청
@@ -2191,7 +2211,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,수신 품질 검사.
 DocType: Purchase Order Item,Returned Qty,반품 수량
 DocType: Employee,Exit,닫기
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,루트 유형이 필수입니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,루트 유형이 필수입니다
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,일련 번호 {0} 생성
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","고객의 편의를 위해, 이러한 코드는 송장 배송 메모와 같은 인쇄 포맷으로 사용될 수있다"
 DocType: Employee,You can enter any date manually,당신은 수동으로 날짜를 입력 할 수 있습니다
@@ -2199,8 +2219,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,수습 기간
 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 +110,Row {0}: Advance against Customer must be credit,행 {0} : 고객에 대한 사전 신용해야합니다
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,구매 영수증 품목 공급
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,지불
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,지불
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,날짜 시간에
 DocType: SMS Settings,SMS Gateway URL,SMS 게이트웨이 URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS 전달 상태를 유지하기위한 로그
@@ -2217,7 +2238,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,재정렬 수준
 DocType: Attendance,Attendance Date,출석 날짜
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,급여 이별은 적립 및 차감에 따라.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,자식 노드와 계정 원장으로 변환 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,자식 노드와 계정 원장으로 변환 할 수 없습니다
 DocType: Address,Preferred Shipping Address,선호하는 배송 주소
 DocType: Purchase Receipt Item,Accepted Warehouse,허용 창고
 DocType: Bank Reconciliation Detail,Posting Date,등록일자
@@ -2235,7 +2256,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,일련 번호 {0}이 (가) 없습니다
 DocType: Pricing Rule,Discount Percentage,할인 비율
 DocType: Payment Reconciliation Invoice,Invoice Number,송장 번호
-apps/erpnext/erpnext/hooks.py +54,Orders,명령
+apps/erpnext/erpnext/hooks.py +55,Orders,명령
 DocType: Leave Control Panel,Employee Type,직원 유형
 DocType: Employee Leave Approver,Leave Approver,승인자를 남겨
 DocType: Manufacturing Settings,Material Transferred for Manufacture,재료 제조에 양도
@@ -2247,7 +2268,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,이 판매 주문에 대해 청구 자료 %
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,기간 결산 항목
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,기존의 트랜잭션 비용 센터는 그룹으로 변환 할 수 없습니다
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,감가 상각
+DocType: Account,Depreciation,감가 상각
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),공급 업체 (들)
 DocType: Customer,Credit Limit,신용 한도
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,거래 종류 선택
@@ -2272,11 +2293,12 @@
 DocType: Material Request,Requested For,에 대해 요청
 DocType: Quotation Item,Against Doctype,문서 종류에 대하여
 DocType: Delivery Note,Track this Delivery Note against any Project,모든 프로젝트에 대해이 배달 주를 추적
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,루트 계정은 삭제할 수 없습니다
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,투자에서 순 현금
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,루트 계정은 삭제할 수 없습니다
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,보기 재고 항목
 ,Is Primary Address,기본 주소는
 DocType: Production Order,Work-in-Progress Warehouse,작업중인 창고
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},참고 # {0} 년 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},참고 # {0} 년 {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,주소를 관리
 DocType: Pricing Rule,Item Code,상품 코드
 DocType: Production Planning Tool,Create Production Orders,생산 오더를 생성
@@ -2284,7 +2306,7 @@
 DocType: Journal Entry,User Remark,사용자 비고
 DocType: Lead,Market Segment,시장 세분
 DocType: Employee Internal Work History,Employee Internal Work History,직원 내부 작업 기록
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),결산 (박사)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),결산 (박사)
 DocType: Contact,Passive,수동
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,일련 번호 {0} 재고가없는
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,거래를 판매에 대한 세금 템플릿.
@@ -2300,7 +2322,7 @@
 ,Billed Amount,청구 금액
 DocType: Bank Reconciliation,Bank Reconciliation,은행 계정 조정
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,업데이트 받기
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,자료 요청 {0} 취소 또는 정지
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,자료 요청 {0} 취소 또는 정지
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,몇 가지 샘플 레코드 추가
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,관리를 남겨주세요
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,계정별 그룹
@@ -2309,14 +2331,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","이익 / 손실은 기장 할 수있는 부채 계정 헤드,"
 DocType: Payment Tool,Against Vouchers,쿠폰에 대하여
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,빠른 도움말
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},소스와 목표웨어 하우스는 행에 대해 동일 할 수 없습니다 {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},소스와 목표웨어 하우스는 행에 대해 동일 할 수 없습니다 {0}
 DocType: Features Setup,Sales Extras,판매 부가항목
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} 계정에 대한 예산은 {1} 코스트 센터에 대해 {2} {3}에 의해 초과
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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','시작일자'는  '마감일자'이후이 여야합니다
 ,Stock Projected Qty,재고 수량을 예상
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
 DocType: Sales Order,Customer's Purchase Order,고객의 구매 주문
 DocType: Warranty Claim,From Company,회사에서
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,값 또는 수량
@@ -2326,9 +2348,9 @@
 DocType: Leave Block List,Leave Block List Allowed,차단 목록은 허용 남겨
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,당신은 로그인하는 데 사용할 것
 DocType: Sales Partner,Retailer,소매상 인
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,계정에 신용은 대차 대조표 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,계정에 신용은 대차 대조표 계정이어야합니다
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,모든 공급 유형
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,항목이 자동으로 번호가되어 있지 않기 때문에 상품 코드는 필수입니다
+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 +93,Quotation {0} not of type {1},견적 {0}은 유형 {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,유지 보수 일정 상품
 DocType: Sales Order,%  Delivered,% 배달
@@ -2372,7 +2394,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),패키지의 총 무게.보통 그물 무게 + 포장 재료의 무게. (프린트)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,이 역할이있는 사용자는 고정 된 계정에 대한 계정 항목을 수정 / 동결 계정을 설정하고 만들 수 있습니다
 DocType: Serial No,Is Cancelled,취소된다
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,내 선적
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,내 선적
 DocType: Journal Entry,Bill Date,청구 일자
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","우선 순위가 가장 높은 가격에 여러 규칙이있는 경우에도, 그 다음 다음 내부의 우선 순위가 적용됩니다"
 DocType: Supplier,Supplier Details,공급 업체의 상세 정보
@@ -2393,10 +2415,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,통화
 DocType: Project,Total Costing Amount (via Time Logs),총 원가 계산 금액 (시간 로그를 통해)
 DocType: Purchase Order Item Supplied,Stock UOM,재고 UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,구매 주문 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,구매 주문 {0} 제출되지
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,예상
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},일련 번호 {0} 창고에 속하지 않는 {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,주 : 시스템이 항목에 대한 납품에 이상 - 예약 확인하지 않습니다 {0} 수량 또는 금액으로 0이됩니다
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,Opening 날짜
 DocType: Journal Entry,Remark,비고
@@ -2409,9 +2431,9 @@
 DocType: Time Log,Batched for Billing,결제를위한 일괄 처리
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,공급 업체에 의해 제기 된 지폐입니다.
 DocType: POS Profile,Write Off Account,감액계정
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,할인 금액
 DocType: Purchase Invoice,Return Against Purchase Invoice,에 대하여 구매 송장을 돌려줍니다
 DocType: Item,Warranty Period (in days),(일) 보증 기간
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,조작에서 순 현금
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,예) VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,항목 4
 DocType: Journal Entry Account,Journal Entry Account,분개 계정
@@ -2452,7 +2474,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,은퇴 날짜 가입 날짜보다 커야합니다
 DocType: Sales Invoice,Against Income Account,손익 계정에 대한
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0} % 배달
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,트랜스 정보
@@ -2480,10 +2502,10 @@
 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 +14,This is a root sales person and cannot be edited.,이 루트 판매 사람 및 편집 할 수 없습니다.
 ,Stock Ledger,재고 원장
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},속도 : {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},속도 : {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,급여 공제 전표
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,첫 번째 그룹 노드를 선택합니다.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},목적 중 하나 여야합니다 {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},목적 중 하나 여야합니다 {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,양식을 작성하고 저장
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,그들의 최신의 재고 상황에 따라 모든 원료가 포함 된 보고서를 다운로드
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,커뮤니티 포럼
@@ -2521,7 +2543,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,회사 (안 고객 또는 공급 업체) 마스터.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date','예상 배달 날짜'를 입력하십시오
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,배달 노트는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,지불 금액 + 금액 오프 쓰기 총합보다 클 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},참고 : 허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","참고 : 지불은 어떤 기준에 의해 만들어진되지 않은 경우, 수동 분개를합니다."
@@ -2538,13 +2560,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}'해제
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,열기로 설정
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,제출 거래에 연락처에 자동으로 이메일을 보내십시오.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","행 {0} : 수량이 창고에 avalable하지 {1}에 {2} {3}.
  가능 수량은 {4}, 수량을 전송 : {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,항목 3
 DocType: Purchase Order,Customer Contact Email,고객 연락처 이메일
 DocType: Sales Team,Contribution (%),기여도 (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,참고 : 결제 항목이 '현금 또는 은행 계좌'이 지정되지 않았기 때문에 생성되지 않습니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,참고 : 결제 항목이 '현금 또는 은행 계좌'이 지정되지 않았기 때문에 생성되지 않습니다
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,책임
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,템플릿
 DocType: Sales Person,Sales Person Name,영업 사원명
@@ -2555,20 +2577,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,계정조정전
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,상품 세금 행 {0} 유형의 세금 또는 수입 비용 또는 청구의 계정이 있어야합니다
 DocType: Sales Order,Partly Billed,일부 청구
 DocType: Item,Default BOM,기본 BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,다시 입력 회사 이름은 확인하시기 바랍니다
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,총 발행 AMT 사의
 DocType: Time Log Batch,Total Hours,총 시간
 DocType: Journal Entry,Printing Settings,인쇄 설정
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},총 직불 카드는 전체 신용 동일해야합니다.차이는 {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},총 직불 카드는 전체 신용 동일해야합니다.차이는 {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,자동차
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,배달 주에서
 DocType: Time Log,From Time,시간에서
 DocType: Notification Control,Custom Message,사용자 지정 메시지
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,투자 은행
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,현금 또는 은행 계좌 결제 항목을 만들기위한 필수입니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,현금 또는 은행 계좌 결제 항목을 만들기위한 필수입니다
 DocType: Purchase Invoice,Price List Exchange Rate,가격 기준 환율
 DocType: Purchase Invoice Item,Rate,비율
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,인턴
@@ -2587,9 +2609,10 @@
  충돌을 해결하십시오.가격 규칙 : {0}"
 DocType: Account,Bank,은행
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,항공 회사
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,문제의 소재
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,문제의 소재
 DocType: Material Request Item,For Warehouse,웨어 하우스
 DocType: Employee,Offer Date,제공 날짜
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,견적
 DocType: Hub Settings,Access Token,액세스 토큰
 DocType: Sales Invoice Item,Serial No,일련 번호
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Maintaince를 세부 사항을 먼저 입력하십시오
@@ -2603,10 +2626,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,이번 달 작업 일 이상 휴일이 있습니다.
 DocType: Product Bundle Item,Product Bundle Item,번들 제품 항목
 DocType: Sales Partner,Sales Partner Name,영업 파트너 명
+DocType: Payment Reconciliation,Maximum Invoice Amount,최대 송장 금액
 DocType: Purchase Invoice Item,Image View,이미지보기
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,평가 및 총
@@ -2614,6 +2639,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,이 항목은 {0} (템플릿)의 변종이다.'카피'가 설정되어 있지 않는 속성은 템플릿에서 복사됩니다
 DocType: Account,Purchase User,구매 사용자
 DocType: Notification Control,Customize the Notification,알림 사용자 지정
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,운영으로 인한 현금 흐름
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,기본 주소 템플릿을 삭제할 수 없습니다
 DocType: Sales Invoice,Shipping Rule,배송 규칙
 DocType: Journal Entry,Print Heading,인쇄 제목
@@ -2624,7 +2650,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,원료
 DocType: Leave Application,Follow via Email,이메일을 통해 수행
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,할인 금액 후 세액
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,이 계정에 하위계정이 존재합니다.이 계정을 삭제할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,첫 번째 게시 날짜를 선택하세요
@@ -2642,6 +2668,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},직렬화 된 항목에 대한 일련 NOS 필수 {0}
 DocType: Journal Entry,Bank Entry,은행 입장
 DocType: Authorization Rule,Applicable To (Designation),에 적용 (지정)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,쇼핑 카트에 담기
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,그룹으로
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ 비활성화 통화를 사용합니다.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,우편 비용
@@ -2649,30 +2676,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,엔터테인먼트 & 레저
 DocType: Purchase Order,The date on which recurring order will be stop,반복되는 순서가 중지됩니다 된 날짜
 DocType: Quality Inspection,Item Serial No,상품 시리얼 번호
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} 감소해야하거나 오버 플로우 내성을 증가한다
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} 감소해야하거나 오버 플로우 내성을 증가한다
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,전체 현재
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,시간
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","직렬화 된 항목 {0} 재고 조정을 사용 \
  업데이트 할 수 없습니다"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,공급 업체에 자료를 전송
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,공급 업체에 자료를 전송
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,견적을 만들기
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,당신은 블록 날짜에 잎을 승인 할 수있는 권한이 없습니다
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,이러한 모든 항목이 이미 청구 된
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,이러한 모든 항목이 이미 청구 된
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0}에 의해 승인 될 수있다
 DocType: Shipping Rule,Shipping Rule Conditions,배송 규칙 조건
 DocType: BOM Replace Tool,The new BOM after replacement,교체 후 새로운 BOM
 DocType: Features Setup,Point of Sale,판매 시점
 DocType: Account,Tax,세금
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},행 {0} : {1} 유효하지 않은 {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,제품 번들에서
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,제품 번들에서
 DocType: Production Planning Tool,Production Planning Tool,생산 계획 도구
 DocType: Quality Inspection,Report Date,보고서 날짜
 DocType: C-Form,Invoices,송장
 DocType: Job Opening,Job Title,직책
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0}받는 사람
 DocType: Features Setup,Item Groups in Details,자세한 사항 상품 그룹
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,제조하는 수량은 0보다 커야합니다.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),시작 판매 시점 (POS)
@@ -2680,8 +2706,9 @@
 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: Pricing Rule,Customer Group,고객 그룹
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},비용 계정 항목에 대한 필수 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},비용 계정 항목에 대한 필수 {0}
 DocType: Item,Website Description,웹 사이트 설명
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,자본에 순 변경
 DocType: Serial No,AMC Expiry Date,AMC 유효 날짜
 ,Sales Register,판매 등록
 DocType: Quotation,Quotation Lost Reason,견적 잃어버린 이유
@@ -2689,12 +2716,12 @@
 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 +108,Summary for this month and pending activities,이 달 보류중인 활동에 대한 요약
 DocType: Customer Group,Customer Group Name,고객 그룹 이름
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,속성
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,항목 가져 오기
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,계정을 끄기 쓰기 입력하십시오
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,항목 가져 오기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,계정을 끄기 쓰기 입력하십시오
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,마지막 주문 날짜
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,소비세 송장에게 확인
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},계정 {0} 수행은 회사 소유하지 {1}
@@ -2710,7 +2737,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,프로젝트 와이즈 데이터는 견적을 사용할 수 없습니다
 DocType: Project,Expected End Date,예상 종료 날짜
 DocType: Appraisal Template,Appraisal Template Title,평가 템플릿 제목
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,광고 방송
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,광고 방송
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,상위 항목 {0} 주식 항목이 아니어야합니다
 DocType: Cost Center,Distribution Id,배신 ID
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,멋진 서비스
@@ -2723,7 +2750,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} 속성에 대한 값의 범위 내에 있어야합니다 {1}에 {2}의 단위로 {3}
 DocType: Tax Rule,Sales,판매
 DocType: Stock Entry Detail,Basic Amount,기본 금액
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
 DocType: Leave Allocation,Unused leaves,사용하지 않는 잎
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
 DocType: Customer,Default Receivable Accounts,미수금 기본
@@ -2735,16 +2762,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,구매 영수증
-DocType: Payment Reconciliation,Maximum Amount,최대 금액
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,어떻게 가격의 규칙이 적용됩니다?
 DocType: Quality Inspection,Delivery Note No,납품서 없음
 DocType: Company,Retail,소매의
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,고객 {0}이 (가) 없습니다
 DocType: Attendance,Absent,없는
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,번들 제품
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},행 {0} : 잘못된 참조 {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,번들 제품
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},행 {0} : 잘못된 참조 {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,구매세금 및 요금 템플릿
 DocType: Upload Attendance,Download Template,다운로드 템플릿
 DocType: GL Entry,Remarks,Remarks
@@ -2771,7 +2798,7 @@
 ,Monthly Attendance Sheet,월간 출석 시트
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,검색된 레코드가 없습니다
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1} : 코스트 센터는 항목에 대해 필수입니다 {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,계정 {0} 비활성
 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,날짜에 날짜 및 출석 출석은 필수입니다
@@ -2780,8 +2807,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'손익'계정  {0}은 개시기입이 허용되지 않습니다
 DocType: Features Setup,Sales Discounts,매출 할인
 DocType: Hub Settings,Seller Country,판매자 나라
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,웹 사이트에 항목을 게시
 DocType: Authorization Rule,Authorization Rule,권한 부여 규칙
 DocType: Sales Invoice,Terms and Conditions Details,약관의 자세한 사항
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,사양
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,판매 세금 및 요금 템플릿
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,의류 및 액세서리
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,주문 번호
@@ -2803,7 +2832,7 @@
 DocType: Time Log,Billing Amount,결제 금액
 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 +18,Applications for leave.,휴가 신청.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,기존 거래 계정은 삭제할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,기존 거래 계정은 삭제할 수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,법률 비용
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","자동 주문은 05, 28 등의 예를 들어 생성되는 달의 날"
 DocType: Sales Invoice,Posting Time,등록시간
@@ -2819,11 +2848,11 @@
 DocType: Maintenance Visit,Breakdown,고장
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,계정 : {0} 통화로 : {1}을 선택할 수 없습니다
 DocType: Bank Reconciliation Detail,Cheque Date,수표 날짜
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},계정 {0} : 부모 계정 {1} 회사에 속하지 않는 {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},계정 {0} : 부모 계정 {1} 회사에 속하지 않는 {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,성공적으로이 회사에 관련된 모든 트랜잭션을 삭제!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,날짜에로
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,근신
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,기본 창고 재고 상품에 대한 필수입니다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,기본 창고 재고 상품에 대한 필수입니다.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},달의 급여의 지급 {0}과 연도 {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,자동 삽입 가격표 속도없는 경우
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,총 지불 금액
@@ -2835,6 +2864,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),총 결제 금액 (시간 로그를 통해)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,우리는이 품목을
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,공급 업체 아이디
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,수량이 0보다 커야합니다
 DocType: Journal Entry,Cash Entry,현금 항목
 DocType: Sales Partner,Contact Desc,연락처 제품 설명
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","캐주얼, 병 등과 같은 잎의 종류"
@@ -2843,7 +2873,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,계정에 연간 예산을 설정하는 행을 추가합니다.
 DocType: Buying Settings,Default Supplier Type,기본 공급자 유형
 DocType: Production Order,Total Operating Cost,총 영업 비용
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,참고 : {0} 항목을 여러 번 입력
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,참고 : {0} 항목을 여러 번 입력
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,모든 연락처.
 DocType: Newsletter,Test Email Id,테스트 이메일 아이디
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,회사의 약어
@@ -2868,7 +2898,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,모든 고객 그룹
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,세금 템플릿은 필수입니다.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,계정 {0} : 부모 계정 {1}이 (가) 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,계정 {0} : 부모 계정 {1}이 (가) 없습니다
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),가격 목록 비율 (회사 통화)
 DocType: Account,Temporary,일시적인
 DocType: Address,Preferred Billing Address,선호하는 결제 주소
@@ -2886,8 +2916,8 @@
 ,Item-wise Price List Rate,상품이 많다는 가격리스트 평가
 DocType: Purchase Order Item,Supplier Quotation,공급 업체 견적
 DocType: Quotation,In Words will be visible once you save the Quotation.,당신은 견적을 저장 한 단어에서 볼 수 있습니다.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}이 정지 될
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1}이 정지 될
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
 DocType: Lead,Add to calendar on this date,이 날짜에 캘린더에 추가
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,비용을 추가하는 규칙.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,다가오는 이벤트
@@ -2907,24 +2937,24 @@
 DocType: Customer,From Lead,리드에서
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,생산 발표 순서.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,회계 연도 선택 ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
 DocType: Hub Settings,Name Token,이름 토큰
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,표준 판매
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,이어야 한 창고는 필수입니다
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,교체
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} 견적서에 대한 {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,측정의 기본 단위를 입력하십시오
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} 견적서에 대한 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,측정의 기본 단위를 입력하십시오
 DocType: Purchase Invoice Item,Project Name,프로젝트 이름
 DocType: Supplier,Mention if non-standard receivable account,언급 표준이 아닌 채권 계정의 경우
 DocType: Journal Entry Account,If Income or Expense,만약 소득 또는 비용
 DocType: Features Setup,Item Batch Nos,상품 배치 NOS
 DocType: Stock Ledger Entry,Stock Value Difference,재고 가치의 차이
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,인적 자원
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,인적 자원
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,지불 화해 지불
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,법인세 자산
 DocType: BOM Item,BOM No,BOM 없음
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,분개 {0} {1} 또는 이미 다른 쿠폰에 대해 일치하는 계정이 없습니다
 DocType: Item,Moving Average,움직임 평균
 DocType: BOM Replace Tool,The BOM which will be replaced,대체됩니다 BOM
 DocType: Account,Debit,직불
@@ -2961,7 +2991,7 @@
 DocType: Stock Entry Detail,Additional Cost,추가 비용
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,회계 연도 종료일
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","바우처를 기반으로 필터링 할 수 없음, 바우처로 그룹화하는 경우"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,공급 업체의 견적을
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,공급 업체의 견적을
 DocType: Quality Inspection,Incoming,수신
 DocType: BOM,Materials Required (Exploded),필요한 재료 (분해)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),무급 휴직 적립 감소 (LWP)
@@ -2969,7 +2999,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},행 번호 {0} : 일련 번호 {1}과 일치하지 않는 {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,캐주얼 허가
 DocType: Batch,Batch ID,일괄 처리 ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},참고 : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},참고 : {0}
 ,Delivery Note Trends,배송 참고 동향
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,이번 주 요약
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} 행의 구입 또는 하위 계약 품목이어야 {1}
@@ -2984,6 +3014,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,평균. 구매 비율
 DocType: Task,Actual Time (in Hours),(시간) 실제 시간
 DocType: Employee,History In Company,회사의 역사
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,뉴스 레터
 DocType: Address,Shipping,배송
 DocType: Stock Ledger Entry,Stock Ledger Entry,재고 원장 입력
@@ -3003,7 +3034,6 @@
 DocType: Purchase Order,End date of current order's period,현재 주문의 기간의 종료일
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,제공 문자를 확인
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,반환
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,변형에 대한 측정의 기본 단위는 템플릿으로 동일해야합니다
 DocType: Production Order Operation,Production Order Operation,생산 오더 운영
 DocType: Pricing Rule,Disable,사용 안함
 DocType: Project Task,Pending Review,검토 중
@@ -3011,7 +3041,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,고객 아이디
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,시간은 시간보다는 커야하는 방법
 DocType: Journal Entry Account,Exchange Rate,환율
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},창고 {0} : 부모 계정이 {1} 회사에 BOLONG하지 않는 {2}
 DocType: BOM,Last Purchase Rate,마지막 구매 비율
 DocType: Account,Asset,자산
@@ -3031,7 +3061,7 @@
 ,Available Stock for Packing Items,항목 포장 재고품
 DocType: Item Variant,Item Variant,항목 변형
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,다른 기본이 없기 때문에 기본적으로이 주소 템플릿 설정
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","이미 직불의 계정 잔액, 당신은 같은 '신용', '균형이어야합니다'설정할 수 없습니다"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,품질 관리
 DocType: Production Planning Tool,Filter based on customer,필터 고객에 따라
 DocType: Payment Tool Detail,Against Voucher No,바우처 없음에 대하여
@@ -3048,6 +3078,7 @@
 DocType: Opportunity,Next Contact,다음 연락
 DocType: Employee,Employment Type,고용 유형
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,고정 자산
+,Cash Flow,현금 흐름
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,신청 기간은 2 alocation 기록을 통해 할 수 없습니다
 DocType: Item Group,Default Expense Account,기본 비용 계정
 DocType: Employee,Notice (days),공지 사항 (일)
@@ -3079,13 +3110,12 @@
 DocType: Production Order,Warehouses,창고
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,인쇄 및 정지
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,그룹 노드
-DocType: Payment Reconciliation,Minimum Amount,최소 금액
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,업데이트 완성품
 DocType: Workstation,per hour,시간당
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,웨어 하우스 (영구 재고)에 대한 계정은이 계정이 생성됩니다.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,재고 원장 항목이 창고에 존재하는웨어 하우스는 삭제할 수 없습니다.
 DocType: Company,Distribution,유통
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,지불 금액
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,지불 금액
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,프로젝트 매니저
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,파견
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,최대 할인 품목을 허용 : {0} {1} %이
@@ -3109,7 +3139,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,지원 Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},회사는 창고에없는 {0}
 DocType: POS Profile,Terms and Conditions,이용약관
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},현재까지의 회계 연도 내에 있어야합니다.날짜에 가정 = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},현재까지의 회계 연도 내에 있어야합니다.날짜에 가정 = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","여기서 당신은 신장, 체중, 알레르기, 의료 문제 등 유지 관리 할 수 있습니다"
 DocType: Leave Block List,Applies to Company,회사에 적용
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,제출 된 재고 항목 {0}이 존재하기 때문에 취소 할 수 없습니다
@@ -3123,11 +3153,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,구매 영수증을 입력하세요
 DocType: Sales Invoice,Get Advances Received,선불수취
 DocType: Email Digest,Add/Remove Recipients,추가 /받는 사람을 제거
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},거래 정지 생산 오더에 대해 허용되지 {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),지원 전자 우편 ID의 설정받는 서버. (예를 들어 support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,부족 수량
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
 DocType: Salary Slip,Salary Slip,급여 전표
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.","패키지가 제공하는 슬립 포장 생성합니다.패키지 번호, 패키지 내용과 그 무게를 통보하는 데 사용됩니다."
@@ -3216,7 +3246,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,직원 기록.
 DocType: HR Settings,Payroll Settings,급여 설정
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,연결되지 않은 청구서 지불을 일치시킵니다.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,장소 주문
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,장소 주문
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,루트는 부모의 비용 센터를 가질 수 없습니다
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,선택 브랜드 ...
 DocType: Sales Invoice,C-Form Applicable,해당 C-양식
@@ -3231,7 +3261,7 @@
 DocType: Appraisal,Start Date,시작 날짜
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,기간 동안 잎을 할당합니다.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,확인하려면 여기를 클릭하십시오
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,계정 {0} : 당신은 부모 계정 자체를 할당 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,계정 {0} : 당신은 부모 계정 자체를 할당 할 수 없습니다
 DocType: Purchase Invoice Item,Price List Rate,가격리스트 평가
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","""재고""표시 또는 ""재고 부족""이 창고에 재고를 기반으로."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),재료 명세서 (BOM)
@@ -3240,17 +3270,17 @@
 DocType: Project,Expected Start Date,예상 시작 날짜
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,요금은 해당 항목에 적용 할 수없는 경우 항목을 제거
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,예. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,수신
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,수신
 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: Employee Leave Approver,Employee Leave Approver,직원 허가 승인자
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} 성공적으로 우리의 뉴스 레터 목록에 추가되었습니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","손실로 견적이되었습니다 때문에, 선언 할 수 없습니다."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,구매 마스터 관리자
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,생산 오더 {0} 제출해야합니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,생산 오더 {0} 제출해야합니다
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},시작 날짜와 항목에 대한 종료 날짜를 선택하세요 {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,주 보고서
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,지금까지 날로부터 이전 할 수 없습니다
@@ -3268,7 +3298,7 @@
 DocType: Industry Type,Industry Type,산업 유형
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,문제가 발생했습니다!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,경고 : 응용 프로그램이 다음 블록 날짜를 포함 남겨
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,판매 송장 {0}이 (가) 이미 제출되었습니다
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,판매 송장 {0}이 (가) 이미 제출되었습니다
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,완료일
 DocType: Purchase Invoice Item,Amount (Company Currency),금액 (회사 통화)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,조직 단위 (현)의 마스터.
@@ -3287,10 +3317,10 @@
 ,Serial No Service Contract Expiry,일련 번호 서비스 계약 유효
 DocType: Item,Unit of Measure Conversion,측정 단위 변환
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,직원은 변경할 수 없다
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,당신은 신용과 같은 시간에 같은 계좌에서 금액을 인출 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,당신은 신용과 같은 시간에 같은 계좌에서 금액을 인출 할 수 없습니다
 DocType: Naming Series,Help HTML,도움말 HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},할당 된 총 weightage 100 %이어야한다.그것은 {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},수당에 {0} 항목에 대한 교차에 대한 {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},수당에 {0} 항목에 대한 교차에 대한 {1}
 DocType: Address,Name of person or organization that this address belongs to.,이 주소가 속해있는 개인이나 조직의 이름입니다.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,공급 업체
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,판매 주문이 이루어질으로 분실로 설정할 수 없습니다.
@@ -3303,35 +3333,35 @@
 DocType: Employee,Date of Issue,발행일
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}에서 {0}에 대한 {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},행 번호 {0} 항목에 대한 설정 공급 업체 {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,부품 {1}에 연결된 웹 사이트 콘텐츠 {0}를 찾을 수없는
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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.,웹 사이트에 여러 그룹에이 항목을 나열합니다.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,다른 통화와 계정을 허용하는 다중 통화 옵션을 확인하시기 바랍니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,다른 통화와 계정을 허용하는 다중 통화 옵션을 확인하시기 바랍니다
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,상품 : {0} 시스템에 존재하지 않을
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,당신은 고정 된 값을 설정할 수있는 권한이 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,당신은 고정 된 값을 설정할 수있는 권한이 없습니다
 DocType: Payment Reconciliation,Get Unreconciled Entries,비 조정 항목을보세요
+DocType: Payment Reconciliation,From Invoice Date,송장 일로부터
 DocType: Cost Center,Budgets,예산
-DocType: Employee,Emergency Contact Details,비상 연락처 세부 정보
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,그것은 무엇을 하는가?
 DocType: Delivery Note,To Warehouse,창고
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},계정 {0} 더 많은 회계 연도 번 이상 입력 한 {1}
 ,Average Commission Rate,평균위원회 평가
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고'재고 항목에 대해 '예'일 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고'재고 항목에 대해 '예'일 수 없습니다
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,출석은 미래의 날짜에 표시 할 수 없습니다
 DocType: Pricing Rule,Pricing Rule Help,가격 규칙 도움말
 DocType: Purchase Taxes and Charges,Account Head,계정 헤드
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,상품의 도착 비용을 계산하기 위해 추가적인 비용을 업데이트
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,전기의
 DocType: Stock Entry,Total Value Difference (Out - In),총 가치 차이 (아웃 -에서)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,행 {0} : 환율은 필수입니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,행 {0} : 환율은 필수입니다
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},사용자 ID 직원에 대한 설정하지 {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,보증 청구에서
 DocType: Stock Entry,Default Source Warehouse,기본 소스 창고
 DocType: Item,Customer Code,고객 코드
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},생일 알림 {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,일 이후 마지막 주문
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,재고 자산
@@ -3344,7 +3374,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,계정 {0}을 닫으면 형 책임 / 주식이어야합니다
 DocType: Authorization Rule,Based On,에 근거
 DocType: Sales Order Item,Ordered Qty,수량 주문
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,항목 {0} 사용할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,항목 {0} 사용할 수 없습니다
 DocType: Stock Settings,Stock Frozen Upto,재고 동결 개까지
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},에서와 기간 반복 필수 날짜로 기간 {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,프로젝트 활동 / 작업.
@@ -3352,7 +3382,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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 미만이어야합니다
 DocType: Purchase Invoice,Write Off Amount (Company Currency),금액을 상각 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
 DocType: Landed Cost Voucher,Landed Cost Voucher,착륙 비용 바우처
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},설정하십시오 {0}
 DocType: Purchase Invoice,Repeat on Day of Month,이달의 날 반복
@@ -3382,12 +3412,12 @@
 DocType: Upload Attendance,Upload Attendance,출석 업로드
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,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/accounts/doctype/journal_entry/journal_entry.js +446,Amount,양
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,양
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM 교체
 ,Sales Analytics,판매 분석
 DocType: Manufacturing Settings,Manufacturing Settings,제조 설정
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,이메일 설정
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,회사 마스터에 기본 통화를 입력 해주십시오
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,회사 마스터에 기본 통화를 입력 해주십시오
 DocType: Stock Entry Detail,Stock Entry Detail,재고 항목의 세부 사항
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,매일 알림
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},와 세금 규칙 충돌 {0}
@@ -3413,13 +3443,13 @@
 DocType: Sales Order Item,Produced Quantity,생산 수량
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,기사
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,검색 서브 어셈블리
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},행 번호에 필요한 상품 코드 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},행 번호에 필요한 상품 코드 {0}
 DocType: Sales Partner,Partner Type,파트너 유형
 DocType: Purchase Taxes and Charges,Actual,실제
 DocType: Authorization Rule,Customerwise Discount,Customerwise 할인
 DocType: Purchase Invoice,Against Expense Account,비용 계정에 대한
 DocType: Production Order,Production Order,생산 주문
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,설치 노트 {0}이 (가) 이미 제출되었습니다
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,설치 노트 {0}이 (가) 이미 제출되었습니다
 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,지금보기
@@ -3431,15 +3461,15 @@
 DocType: Employee,Applicable Holiday List,해당 휴일 목록
 DocType: Employee,Cheque,수표
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,시리즈 업데이트
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,보고서 유형이 필수입니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,보고서 유형이 필수입니다
 DocType: Item,Serial Number Series,일련 번호 시리즈
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},창고 재고 상품의 경우 필수 {0} 행에서 {1}
 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/public/js/setup_wizard.js +101,The First User: You,첫 번째 사용자 : 당신
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},회계 연도의 시작 날짜 및 회계 연도 종료 날짜가 이미 회계 연도에 설정되어 {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,성공적으로 조정 됨
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},회계 연도의 시작 날짜 및 회계 연도 종료 날짜가 이미 회계 연도에 설정되어 {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,성공적으로 조정 됨
 DocType: Production Order,Planned End Date,계획 종료 날짜
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,항목이 저장되는 위치.
 DocType: Tax Rule,Validity,효력
@@ -3447,7 +3477,7 @@
 DocType: Attendance,Attendance,출석
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,게시 날짜 및 게시 시간이 필수입니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,게시 날짜 및 게시 시간이 필수입니다
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,트랜잭션을 구입을위한 세금 템플릿.
 ,Item Prices,상품 가격
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,당신이 구매 주문을 저장 한 단어에서 볼 수 있습니다.
@@ -3456,15 +3486,15 @@
 DocType: Task,Review Date,검토 날짜
 DocType: Purchase Invoice,Advance Payments,사전 지불
 DocType: Purchase Taxes and Charges,On Net Total,인터넷 전체에
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,행의 목표웨어 하우스가 {0}과 동일해야합니다 생산 주문
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,행의 목표웨어 하우스가 {0}과 동일해야합니다 생산 주문
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,권한이 없습니다 지불 도구를 사용하지합니다
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% s을 (를) 반복되는 지정되지 않은 '알림 이메일 주소'
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,환율이 다른 통화를 사용하여 항목을 한 후 변경할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,환율이 다른 통화를 사용하여 항목을 한 후 변경할 수 없습니다
 DocType: Company,Round Off Account,반올림
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,관리비
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,컨설팅
 DocType: Customer Group,Parent Customer Group,상위 고객 그룹
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,변경
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,변경
 DocType: Purchase Invoice,Contact Email,담당자 이메일
 DocType: Appraisal Goal,Score Earned,점수 획득
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","예) ""내 회사 LLC """
@@ -3474,13 +3504,13 @@
 DocType: Packing Slip,Gross Weight UOM,총중량 UOM
 DocType: Email Digest,Receivables / Payables,채권 / 채무
 DocType: Delivery Note Item,Against Sales Invoice,견적서에 대하여
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,신용 계정
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,신용 계정
 DocType: Landed Cost Item,Landed Cost Item,착륙 비용 항목
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,0 값을보기
 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 +562,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
 DocType: Item,Default Warehouse,기본 창고
 DocType: Task,Actual End Date (via Time Logs),실제 종료 날짜 (시간 로그를 통해)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},예산은 그룹 계정에 할당 할 수 없습니다 {0}
@@ -3516,29 +3546,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,워크 스테이션 근무 시간 외에 시간 로그를 계획합니다.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}이 (가) 이미 제출되었습니다
 ,Items To Be Requested,요청 할 항목
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,마지막 구매께서는보세요
 DocType: Time Log,Billing Rate based on Activity Type (per hour),활동 유형에 따라 결제 요금 (시간당)
 DocType: Company,Company Info,회사 소개
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","회사 이메일 ID를 찾을 수 없습니다, 따라서 전송되지 메일"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),펀드의 응용 프로그램 (자산)
 DocType: Production Planning Tool,Filter based on item,항목을 기준으로 필터링
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,자동 이체 계좌
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,자동 이체 계좌
 DocType: Fiscal Year,Year Start Date,년 시작 날짜
 DocType: Attendance,Employee Name,직원 이름
 DocType: Sales Invoice,Rounded Total (Company Currency),둥근 합계 (회사 통화)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,계정 유형을 선택하기 때문에 그룹을 변환 할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,계정 유형을 선택하기 때문에 그룹을 변환 할 수 없습니다.
 DocType: Purchase Common,Purchase Common,공동 구매
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,기회에서
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,종업원 급여
 DocType: Sales Invoice,Is POS,POS입니다
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
 DocType: Production Order,Manufactured Qty,제조 수량
 DocType: Purchase Receipt Item,Accepted Quantity,허용 수량
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} : {1} 수행하지 존재
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,고객에게 제기 지폐입니다.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,프로젝트 ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} 가입자는 추가
 DocType: Maintenance Schedule,Schedule,일정
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",이 코스트 센터에 대한 예산을 정의합니다. 예산 작업을 설정하려면 다음을 참조 &quot;회사 목록&quot;
@@ -3546,7 +3577,7 @@
 DocType: Quality Inspection Reading,Reading 3,3 읽기
 ,Hub,허브
 DocType: GL Entry,Voucher Type,바우처 유형
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
 DocType: Expense Claim,Approved,인가 된
 DocType: Pricing Rule,Price,가격
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',{0}에 안심 직원은 '왼쪽'으로 설정해야합니다
@@ -3560,7 +3591,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,회계 분개.
 DocType: Delivery Note Item,Available Qty at From Warehouse,창고에서 이용 가능한 수량
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},행 {0} : 파티 / 계정과 일치하지 않는 {1} / {2}에서 {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,세금 계정을 만들려면
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,비용 계정을 입력하십시오
 DocType: Account,Stock,재고
@@ -3571,7 +3602,7 @@
 DocType: Employee,Contract End Date,계약 종료 날짜
 DocType: Sales Order,Track this Sales Order against any Project,모든 프로젝트에 대해이 판매 주문을 추적
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,위의 기준에 따라 (전달하기 위해 출원 중) 판매 주문을 당겨
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,공급 업체의 견적에서
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,공급 업체의 견적에서
 DocType: Deduction Type,Deduction Type,공제 유형
 DocType: Attendance,Half Day,반나절
 DocType: Pricing Rule,Min Qty,최소 수량
@@ -3579,7 +3610,7 @@
 DocType: GL Entry,Transaction Date,거래 날짜
 DocType: Production Plan Item,Planned Qty,계획 수량
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,총 세금
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,수량 (수량 제조) 필수
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,수량 (수량 제조) 필수
 DocType: Stock Entry,Default Target Warehouse,기본 대상 창고
 DocType: Purchase Invoice,Net Total (Company Currency),합계액 (회사 통화)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,행 {0} : 파티 형 파티는 채권 / 채무 계정에 대하여 만 적용
@@ -3633,9 +3664,9 @@
 DocType: Customer,Commission Rate,위원회 평가
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,변형을 확인
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,부서에서 허가 응용 프로그램을 차단합니다.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,바구니가 비어 있습니다
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,바구니가 비어 있습니다
 DocType: Production Order,Actual Operating Cost,실제 운영 비용
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,루트는 편집 할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,루트는 편집 할 수 없습니다.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,할당 된 금액은 unadusted 금액보다 큰 수 없습니다
 DocType: Manufacturing Settings,Allow Production on Holidays,휴일에 생산 허용
 DocType: Sales Order,Customer's Purchase Order Date,고객의 구매 주문 날짜
@@ -3646,11 +3677,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,디자이너
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,이용 약관 템플릿
 DocType: Serial No,Delivery Details,납품 세부 사항
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,수량이 수준 이하로 떨어질 경우 자동으로 자료 요청을 만들
 ,Item-wise Purchase Register,상품 현명한 구매 등록
 DocType: Batch,Expiry Date,유효 기간
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item",재주문 수준을 설정하려면 항목은 구매 상품 또는 제조 품목이어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item",재주문 수준을 설정하려면 항목은 구매 상품 또는 제조 품목이어야합니다
 ,Supplier Addresses and Contacts,공급 업체 주소 및 연락처
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,첫 번째 범주를 선택하십시오
 apps/erpnext/erpnext/config/projects.py +18,Project master.,프로젝트 마스터.
@@ -3658,7 +3689,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(반나절)
 DocType: Supplier,Credit Days,신용 일
 DocType: Leave Type,Is Carry Forward,이월된다
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM에서 항목 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,재료 명세서 (BOM)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},행 {0} : 파티 형 파티는 채권 / 채무 계정이 필요합니다 {1}
@@ -3666,7 +3697,7 @@
 DocType: Employee,Reason for Leaving,떠나는 이유
 DocType: Expense Claim Detail,Sanctioned Amount,제재 금액
 DocType: GL Entry,Is Opening,개시
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},행 {0} 차변 항목과 링크 될 수 없다 {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,계정 {0}이 (가) 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},행 {0} 차변 항목과 링크 될 수 없다 {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,계정 {0}이 (가) 없습니다
 DocType: Account,Cash,자금
 DocType: Employee,Short biography for website and other publications.,웹 사이트 및 기타 간행물에 대한 짧은 전기.
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 6d7edb3..327c93e 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Lūdzu, izvēlieties Party veids pirmais"
 DocType: Item,Customer Items,Klientu Items
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konts {0}: Mātes vērā {1} nevar būt grāmata
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Konts {0}: Mātes vērā {1} nevar būt grāmata
 DocType: Item,Publish Item to hub.erpnext.com,Publicēt postenis uz hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-pasta paziņojumi
 DocType: Item,Default Unit of Measure,Default Mērvienība
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valūta ir nepieciešama Cenrāža {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Tiks aprēķināts darījumā.
 DocType: Purchase Order,Customer Contact,Klientu Kontakti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,No Material Pieprasījums
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,No Material Pieprasījums
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Darba iesniedzējs
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nav vairāk rezultātu.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Lai saglabātu klientu gudrs pozīcijas kods un padarīt tās meklēšanai, pamatojoties uz to kodu Izmantojiet šo opciju"
 DocType: Mode of Payment Account,Mode of Payment Account,Mode maksājumu konta
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Rādīt Variants
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Daudzums
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Daudzums
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredītiem (pasīvi)
 DocType: Employee Education,Year of Passing,Gads Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,In noliktavā
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Veselības aprūpe
 DocType: Purchase Invoice,Monthly,Ikmēneša
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Maksājuma kavējums (dienas)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Pavadzīme
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Pavadzīme
 DocType: Maintenance Schedule Item,Periodicity,Periodiskums
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-pasta adrese
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,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
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Rezultāts (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rinda {0}: {1}{2} nesakrīt ar {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Rinda {0}: {1}{2} nesakrīt ar {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Transportlīdzekļu Nr
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Lūdzu, izvēlieties cenrādi"
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,"Lūdzu, izvēlieties cenrādi"
 DocType: Production Order Operation,Work In Progress,Work In Progress
 DocType: Employee,Holiday List,Brīvdienu saraksts
 DocType: Time Log,Time Log,Laiks Log
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Pats uzņēmums ir reģistrēts vairāk nekā vienu reizi
 DocType: Employee,Married,Precējies
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Aizliegts {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
 DocType: Payment Reconciliation,Reconcile,Saskaņot
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Pārtikas veikals
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Padarīt Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensiju fondi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Noliktava ir obligāta, ja konts veids ir noliktava"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,"Noliktava ir obligāta, ja konts veids ir noliktava"
 DocType: SMS Center,All Sales Person,Visi Sales Person
 DocType: Lead,Person Name,Persona Name
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Pārbaudiet, vai atkārtojas kārtību, noņemiet atzīmi, lai apturētu atkārtojas vai nodot pareizu beigu datumu"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Ieinteresēts
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill materiālu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Atklāšana
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},No {0} uz {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},No {0} uz {1}
 DocType: Item,Copy From Item Group,Kopēt no posteņa grupas
 DocType: Journal Entry,Opening Entry,Atklāšanas Entry
 DocType: Stock Entry,Additional Costs,Papildu izmaksas
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konts ar esošo darījumu nevar pārvērst grupai.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Konts ar esošo darījumu nevar pārvērst grupai.
 DocType: Lead,Product Enquiry,Produkts Pieprasījums
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Ievadiet uzņēmuma pirmais
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Lūdzu, izvēlieties Company pirmais"
 DocType: Employee Education,Under Graduate,Zem absolvents
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Mērķa On
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Mērķa On
 DocType: BOM,Total Cost,Kopējās izmaksas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitāte Log:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Postenis {0} nepastāv sistēmā vai ir beidzies
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Postenis {0} jābūt iegāde punkts
 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 +444,Item {0} is not active or end of life has been reached,Postenis {0} nav aktīvs vai ir sasniegts nolietoto
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,Postenis {0} nav aktīvs vai ir sasniegts nolietoto
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Atjauninās pēc pārdošanas rēķinu iesniegšanas.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Iestatījumi HR moduļa
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,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
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Preces un cenu
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},No datuma jābūt starp fiskālajā gadā. Pieņemot No datums = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},No datuma jābūt starp fiskālajā gadā. Pieņemot No datums = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Izvēlieties darba ņēmējam, kam jūs veidojat izvērtēšanu."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Izmaksās Center {0} nepieder Sabiedrībai {1}
 DocType: Customer,Individual,Indivīds
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Neto naudas no finansēšanas
 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
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Nākamais Atkārtojas {0} tiks izveidota {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Contact Name
 DocType: Production Plan Item,SO Pending Qty,SO Gaida Daudz
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Izveido atalgojumu par iepriekš minētajiem kritērijiem.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Apraksts nav dota
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pieprasīt iegādei.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Atbrīvojot datums nedrīkst būt lielāks par datums savienošana
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Postenis Website Specifikācija
 DocType: Payment Tool,Reference No,Atsauces Nr
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Atstājiet Bloķēts
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Gada
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Samierināšanās postenis
 DocType: Stock Entry,Sales Invoice No,Pārdošanas rēķins Nr
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Piegādātājs Type
 DocType: Item,Publish in Hub,Publicē Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Postenis {0} ir atcelts
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Postenis {0} ir atcelts
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Attiecība
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Apstiprināti pasūtījumus no klientiem.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Ieteikumi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Komplekta Grupa gudrs budžetu šajā teritorijā. Jūs varat arī sezonalitāti, iestatot Distribution."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Ievadiet mātes kontu grupu, par noliktavu {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksājumu pret {0} {1} nevar būt lielāks par izcilu Summu {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksājumu pret {0} {1} nevar būt lielāks par izcilu Summu {2}
 DocType: Supplier,Address HTML,Adrese HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Izveidot Kalendārs
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Jaunākais
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 simboli
 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
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Mācīties
 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
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Pārvaldīt pārdošanas persona Tree.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Multi Valūtas
 DocType: Payment Reconciliation Invoice,Invoice Type,Rēķins Type
 DocType: Sales Invoice Item,Delivery Note,Piegāde Note
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Iestatīšana Nodokļi
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Iestatīšana Nodokļi
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Kopsavilkums par šo nedēļu un izskatāmo darbību
 DocType: Workstation,Rent Cost,Rent izmaksas
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Lūdzu, izvēlieties mēnesi un gadu"
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Pieejams BOM, pavadzīme, pirkuma rēķina, ražošanas kārtību, pirkuma pasūtījuma, pirkuma čeka, pārdošanas rēķinu, pārdošanas rīkojumu, Fondu Entry, laika kontrolsaraksts"
 DocType: Item Tax,Tax Rate,Nodokļa likme
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Select postenis
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Select postenis
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Vienība: {0} izdevās partiju gudrs, nevar saskaņot, izmantojot \ Stock samierināšanās, nevis izmantot akciju Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Pārvērst ne-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Pirkuma saņemšana jāiesniedz
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicīnisks
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Iemesls zaudēt
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Darbstacija ir slēgta šādos datumos, kā par Holiday saraksts: {0}"
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Iespējas
 DocType: Employee,Single,Viens
 DocType: Issue,Attachment,Pieķeršanās
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budžets nevar iestatīt Group Cost Center
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,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 +563,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 +140,Holiday master.,Holiday meistars.
 DocType: Material Request Item,Required Date,Nepieciešamais Datums
 DocType: Delivery Note,Billing Address,Norēķinu adrese
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Ievadiet Preces kods.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Ievadiet Preces kods.
 DocType: BOM,Costing,Izmaksu
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ja atzīmēts, nodokļa summa tiks uzskatīta par jau iekļautas Print Rate / Print summa"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Kopā Daudz
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmētika
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Sērijas Nr Garantija derīguma
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Postenis {0} nav Iegādājieties postenis
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Postenis {0} nav Iegādājieties postenis
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} ir nederīgs e-pasta adresi ""Paziņojums \ e-pasta adrese"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Kopā Norēķinu Šogad:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Pievienot / rediģēt nodokļiem un maksājumiem
 DocType: Purchase Invoice,Supplier Invoice No,Piegādātāju rēķinu Nr
 DocType: Territory,For reference,Par atskaites
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Noslēguma (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Noslēguma (Cr)
 DocType: Serial No,Warranty Period (Days),Garantijas periods (dienas)
 DocType: Installation Note Item,Installation Note Item,Uzstādīšana Note postenis
 ,Pending Qty,Kamēr Daudz
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Mēneša Distribution ** palīdz izplatīt savu budžetu pāri mēnešiem, ja jums ir sezonalitātes jūsu biznesu. Izplatīt budžetu, izmantojot šo sadalījumu, noteikt šo ** Mēneša sadalījums ** ar ** izmaksu centra **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nav atrasti rēķinu tabulas ieraksti
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nav atrasti rēķinu tabulas ieraksti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Lūdzu, izvēlieties Uzņēmumu un Party tips pirmais"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanšu / grāmatvedības gadā.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Atvainojiet, Serial Nos nevar tikt apvienots"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,Projekta uzdevums
 ,Lead Id,Potenciālā klienta ID
 DocType: C-Form Invoice Detail,Grand Total,Pavisam kopā
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskālā gada sākuma datums nedrīkst būt lielāks par fiskālā gada beigu datuma
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskālā gada sākuma datums nedrīkst būt lielāks par fiskālā gada beigu datuma
 DocType: Warranty Claim,Resolution,Rezolūcija
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Piegādāts: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Piegādāts: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Maksājama konts
 DocType: Sales Order,Billing and Delivery Status,Norēķini un piegāde statuss
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Atkārtojiet Klienti
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,Citāts Lai
 DocType: Lead,Middle Income,Middle Ienākumi
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Atvere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Piešķirtā summa nevar būt negatīvs
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Loģisks Noliktava pret kuru noliktavas ierakstu veikšanas.
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ražošanas uzdevums ir obligāta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Priekšlikums Writing
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatīvs Stock Kļūda ({6}) postenī {0} noliktavā {1} uz {2}{3}{4}{5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatīvs Stock Kļūda ({6}) postenī {0} noliktavā {1} uz {2}{3}{4}{5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskālā Gads Company
 DocType: Packing Slip Item,DN Detail,DN Detail
 DocType: Time Log,Billed,Rēķins
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,Default Izmaksu Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Uzturēšana grafiks
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Tad Cenu Noteikumi tiek filtrētas, balstoties uz klientu, klientu grupā, teritorija, piegādātājs, piegādātāju veida, kampaņas, pārdošanas partneris uc"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Neto Izmaiņas sarakstā
 DocType: Employee,Passport Number,Pases numurs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Vadītājs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,No pirkuma čeka
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Pats priekšmets ir ierakstīta vairākas reizes.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,No pirkuma čeka
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Pats priekšmets ir ierakstīta vairākas reizes.
 DocType: SMS Settings,Receiver Parameter,Uztvērējs parametrs
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Pamatojoties uz"" un ""Group By"", nevar būt vienādi"
 DocType: Sales Person,Sales Person Targets,Sales Person Mērķi
 DocType: Production Order Operation,In minutes,Minūtēs
 DocType: Issue,Resolution Date,Izšķirtspēja Datums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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}
 DocType: Selling Settings,Customer Naming By,Klientu nosaukšana Līdz
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Pārveidot uz Group
 DocType: Activity Cost,Activity Type,Pasākuma veids
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicēšana
 DocType: Activity Cost,Projects User,Projekti User
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Patērētā
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nav atrasts Rēķina informācija tabulā
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} nav atrasts Rēķina informācija tabulā
 DocType: Company,Round Off Cost Center,Noapaļot izmaksu centru
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Uzturēšana Visit {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 DocType: Material Request,Material Transfer,Materiāls Transfer
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Mārketings
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Lai izsekotu objektu pārdošanas un pirkuma dokumentiem, pamatojoties uz to sērijas nos. Tas var arī izmantot, lai izsekotu garantijas informāciju par produktu."
 DocType: Purchase Receipt Item Supplied,Current Stock,Pašreizējā Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Noraidīts Noliktava ir obligāta pret regected postenī
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Kopā norēķinu šogad
 DocType: Account,Expenses Included In Valuation,Izdevumi iekļauts vērtēšanā
 DocType: Employee,Provide email id registered in company,Nodrošināt e-pasta id reģistrēts uzņēmums
 DocType: Hub Settings,Seller City,Pārdevējs City
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Prece ir varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Prece ir varianti.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0} nav krājums punkts
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nav krājums punkts
 DocType: Mode of Payment Account,Default Account,Default Account
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,"Lūdzu, izvēlieties nedēļas off diena"
 DocType: Production Order Operation,Planned End Time,Plānotais Beigu laiks
 ,Sales Person Target Variance Item Group-Wise,Sales Person Mērķa Variance Prece Group-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konts ar esošo darījumu nevar pārvērst par virsgrāmatā
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Konts ar esošo darījumu nevar pārvērst par virsgrāmatā
 DocType: Delivery Note,Customer's Purchase Order No,Klienta Pasūtījuma Nr
 DocType: Employee,Cell Number,Šūnu skaits
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiālu Pieprasījumi Radušies
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Zaudējis
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Jūs nevarat ievadīt pašreizējo kuponu in 'Pret žurnālu ierakstu kolonnā
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Jūs nevarat ievadīt pašreizējo kuponu in 'Pret žurnālu ierakstu kolonnā
 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 +33,Monthly salary statement.,Mēnešalga paziņojumu.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: No {0} tipa {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rinda {0}: pārveidošanas koeficients ir obligāta
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Grāmatvedības Ierakstus var veikt pret lapu mezgliem. Ieraksti pret grupām nav atļauts.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},"Pirkuma saņemšana skaits, kas nepieciešams postenī {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},"Pirkuma saņemšana skaits, kas nepieciešams postenī {0}"
 DocType: Item Attribute Value,Item Attribute Value,Postenis īpašības vērtība
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Pārdošanas kampaņas.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Cenrādis nav izvēlēts
 DocType: Employee,Family Background,Ģimene Background
 DocType: Process Payroll,Send Email,Sūtīt e-pastu
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nē Atļauja
 DocType: Company,Default Bank Account,Default bankas kontu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Lai filtrētu pamatojoties uz partijas, izvēlieties Party Type pirmais"
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Preces ar augstāku weightage tiks parādīts augstāk
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banku samierināšanās Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Mani Rēķini
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Mani Rēķini
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Neviens darbinieks atrasts
 DocType: Purchase Order,Stopped,Apturēts
 DocType: Item,If subcontracted to a vendor,Ja apakšlīgumu nodot pārdevējs
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nosūtīt tagad
 ,Support Analytics,Atbalsta Analytics
 DocType: Item,Website Warehouse,Mājas lapa Noliktava
+DocType: Payment Reconciliation,Minimum Invoice Amount,Minimālā Rēķina summa
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form ieraksti
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Lai aktivizētu &quot;tirdzniecības vieta&quot; funkcijas
 DocType: Bin,Moving Average Rate,Moving vidējā likme
 DocType: Production Planning Tool,Select Items,Izvēlieties preces
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} pret likumprojektu {1} datēts {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} pret likumprojektu {1} datēts {2}
 DocType: Maintenance Visit,Completion Status,Pabeigšana statuss
 DocType: Sales Invoice Item,Target Warehouse,Mērķa Noliktava
 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
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automātiski komponēt ziņu iesniegšanas darījumiem.
 DocType: Production Order,Item To Manufacture,Postenis ražot
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statuss ir {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Iegādājieties Rīkojumu Apmaksa
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Iegādājieties Rīkojumu Apmaksa
 DocType: Sales Order Item,Projected Qty,Prognozēts Daudz
 DocType: Sales Invoice,Payment Due Date,Maksājuma Due Date
 DocType: Newsletter,Newsletter Manager,Biļetens vadītājs
@@ -704,7 +709,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Tirdzniecības vieta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konta atlikums jau Kredīts, jums nav atļauts noteikt ""Balance Must Be"", jo ""debets"""
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konta atlikums jau Kredīts, jums nav atļauts noteikt ""Balance Must Be"", jo ""debets"""
 DocType: Account,Balance must be,Līdzsvars ir jābūt
 DocType: Hub Settings,Publish Pricing,Publicēt Cenas
 DocType: Notification Control,Expense Claim Rejected Message,Izdevumu noraida prasību Message
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valūtas maiņas kurss meistars.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} jābūt aktīvam
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} jābūt aktīvam
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Lūdzu, izvēlieties dokumenta veidu pirmais"
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Atstājiet inkasācijas summu
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,Noklusējuma samaksu konti
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Darbinieku {0} nav aktīvs vai neeksistē
 DocType: Features Setup,Item Barcode,Postenis Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Postenis Variants {0} atjaunināta
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Postenis Variants {0} atjaunināta
 DocType: Quality Inspection Reading,Reading 6,Lasīšana 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pirkuma rēķins Advance
 DocType: Address,Shop,Veikals
 DocType: Hub Settings,Sync Now,Sync Tagad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Rinda {0}: Credit ierakstu nevar saistīt ar {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Rinda {0}: Credit ierakstu nevar saistīt ar {1}
 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."
 DocType: Employee,Permanent Address Is,Pastāvīga adrese ir
 DocType: Production Order Operation,Operation completed for how many finished goods?,Darbība pabeigta uz cik gatavās produkcijas?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Pabalsts pārmērīga {0} šķērsoja postenī {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Pabalsts pārmērīga {0} šķērsoja postenī {1}.
 DocType: Employee,Exit Interview Details,Iziet Intervija Details
 DocType: Item,Is Purchase Item,Vai iegāde postenis
 DocType: Journal Entry Account,Purchase Invoice,Pirkuma rēķins
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,Kopā ar vārdiem
 DocType: Material Request Item,Lead Time Date,Izpildes laiks Datums
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,ir obligāta. Varbūt Valūtas ieraksts nav izveidots
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Lūdzu, norādiet Sērijas Nr postenī {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Lūdzu, norādiet Sērijas Nr postenī {1}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Par &quot;produkts saišķis&quot; vienību, noliktavu, Serial Nr un partijas Nr tiks uzskatīta no &quot;iepakojumu sarakstu&quot; tabulā. Ja Noliktavu un partijas Nr ir vienādas visiem iepakojuma vienības par jebkuru &quot;produkts saišķis&quot; posteni, šīs vērtības var ievadīt galvenajā postenis tabulas vērtības tiks kopēts &quot;iepakojumu sarakstu galda."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Sūtījumiem uz klientiem.
 DocType: Purchase Invoice Item,Purchase Order Item,Pasūtījuma postenis
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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 +626,Select Item for Transfer,Izvēlieties Prece pārneses
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Ļauj lietotājam rediģēt Cenrādi Rate darījumos
 DocType: Pricing Rule,Max Qty,Max Daudz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rinda {0}: Samaksa pret pārdošanas / pirkšanas ordeņa vienmēr jāmarķē kā iepriekš
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Ķīmisks
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,"Visi posteņi jau ir pārskaitīta, lai šim Ražošanas ordeni."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,"Visi posteņi jau ir pārskaitīta, lai šim Ražošanas ordeni."
 DocType: Process Payroll,Select Payroll Year and Month,Izvēlieties Algas gads un mēnesis
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Iet uz atbilstošo grupā (parasti piemērošana fondu&gt; apgrozāmo līdzekļu&gt; bankas kontos un izveidot jaunu kontu (noklikšķinot uz Pievienot Child) tipa &quot;Banka&quot;
 DocType: Workstation,Electricity Cost,Elektroenerģijas izmaksas
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),Visi Svins (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get Avansa Paid
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Pievienojiet savu attēlu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Padarīt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Padarīt
 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 +3,My Cart,Grozs
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Grozs
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Atklāšanas Daudzums
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,Naudas / bankas kontu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Atribūts tabula ir obligāta
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} nevar būt negatīvs
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Atlaide
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Atlaide
 DocType: Features Setup,Purchase Discounts,Pirkuma Atlaides
 DocType: Workstation,Wages,Alga
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Tiks atjaunināta tikai tad, ja Time žurnāls &quot;Billable&quot;"
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,Piegāde Valsts
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Postenī, jāpievieno, izmantojot ""dabūtu preces no pirkumu čekus 'pogu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Pārdošanas izmaksas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard Pirkšana
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standard Pirkšana
 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
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,Izplatītājs
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Grozs Piegāde noteikums
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ražošanas Order {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Lūdzu noteikt &quot;piemērot papildu Atlaide On&quot;
 ,Ordered Items To Be Billed,Pasūtītās posteņi ir Jāmaksā
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,No Range ir jābūt mazāk nekā svārstās
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,"Izvēlieties Time Baļķi un iesniegt, lai izveidotu jaunu pārdošanas rēķinu."
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Šoreiz Log Partijas ir jāmaksā.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Izveidot Opportunity
 DocType: Salary Slip,Leave Without Pay,Bezalgas atvaļinājums
-DocType: Supplier,Communications,Communications
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacity Planning kļūda
 ,Trial Balance for Party,Trial Balance uz pusi
 DocType: Lead,Consultant,Konsultants
 DocType: Salary Slip,Earnings,Peļņa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,"Gatavo postenis {0} ir jāieraksta, lai ražošana tipa ierakstu"
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Atvēršanas Grāmatvedības bilance
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,"Gatavo postenis {0} ir jāieraksta, lai ražošana tipa ierakstu"
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Atvēršanas Grāmatvedības bilance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Pārdošanas rēķins Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nekas pieprasīt
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Faktiskais sākuma datums"" nevar būt lielāks par ""faktiskā beigu datuma"""
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,Kārtējā fiskālajā gadā
 DocType: Global Defaults,Disable Rounded Total,Atslēgt noapaļotiem Kopā
 DocType: Lead,Call,Izsaukums
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Ieraksti"" nevar būt tukšs"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,"""Ieraksti"" nevar būt tukšs"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dublikāts rinda {0} ar pašu {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Iestatīšana Darbinieki
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,Lietotāja ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Senākās
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Izgatavojam pret pārdošanas rīkojumu
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Pārējā pasaule
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Nav atļauts rediģēt iesaldētā kontā {0}
 DocType: Journal Entry,Get Outstanding Invoices,Saņemt neapmaksātus rēķinus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}"
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,Izsniegšanas vieta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Līgums
 DocType: Email Digest,Add Quote,Pievienot Citēt
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM Coversion faktors nepieciešama UOM: {0} postenī: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM Coversion faktors nepieciešama UOM: {0} postenī: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Netiešie izdevumi
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Savus produktus vai pakalpojumus
 DocType: Mode of Payment,Mode of Payment,Maksājuma veidu
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,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/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Tas ir sakne posteni grupas un to nevar rediģēt.
 DocType: Journal Entry Account,Purchase Order,Pasūtījuma
 DocType: Warehouse,Warehouse Contact Info,Noliktava Kontaktinformācija
@@ -1018,8 +1024,8 @@
 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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Kapitāla Ekipējums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,Mērķis
 DocType: Sales Invoice Item,Edit Description,Edit Apraksts
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Paredzams, piegāde datums ir mazāks nekā plānotais sākuma datums."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Piegādātājam
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Piegādātājam
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,"Iestatīšana konta veidu palīdz, izvēloties šo kontu darījumos."
 DocType: Purchase Invoice,Grand Total (Company Currency),Pavisam kopā (Company valūta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Kopā Izejošais
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,Journal Entry
 DocType: Workstation,Workstation Name,Workstation Name
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pasts Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Biļeteni uz kontaktiem, rezultātā."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Darbības nevar atstāt tukšu.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Darbības nevar atstāt tukšu.
 ,Delivered Items To Be Billed,Piegādāts posteņi ir Jāmaksā
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Noliktava nevar mainīt Serial Nr
 DocType: Authorization Rule,Average Discount,Vidēji Atlaide
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},No {0} | {1}{2}
 DocType: BOM Operation,Operation Description,Darbība Apraksts
 DocType: Item,Will also apply to variants,Attieksies arī uz variantiem
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nevar mainīt fiskālā gada sākuma datumu un fiskālā gada beigu datumu, kad saimnieciskais gads ir saglabāts."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nevar mainīt fiskālā gada sākuma datumu un fiskālā gada beigu datumu, kad saimnieciskais gads ir saglabāts."
 DocType: Quotation,Shopping Cart,Grozs
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Izejošais
 DocType: Pricing Rule,Campaign,Kampaņa
@@ -1100,7 +1106,8 @@
 DocType: Sales Order Item,Planned Quantity,Plānotais daudzums
 DocType: Purchase Invoice Item,Item Tax Amount,Vienība Nodokļa summa
 DocType: Item,Maintain Stock,Uzturēt Noliktava
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Krājumu jau radīti Ražošanas Pasūtīt
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,nevar būt lielāks par 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,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 Slip Deduction,Depends on Leave Without Pay,Atkarīgs Bezalgas atvaļinājums
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub Kompleksi
 DocType: Shipping Rule Condition,To Value,Vērtēt
 DocType: Supplier,Stock Manager,Krājumu pārvaldnieks
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source noliktava ir obligāta rindā {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Source noliktava ir obligāta rindā {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Iepakošanas Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office Rent
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setup SMS vārti iestatījumi
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Neviena adrese vēl nav pievienota.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Darba stundu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analītiķis
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar JV summai {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar JV summai {2}
 DocType: Item,Inventory,Inventārs
 DocType: Features Setup,"To enable ""Point of Sale"" view",Lai aktivizētu &quot;tirdzniecības vieta&quot; Ņemot
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Maksājumu nevar būt par tukšu grozā
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Maksājumu nevar būt par tukšu grozā
 DocType: Item,Sales Details,Pārdošanas Details
 DocType: Opportunity,With Items,Ar preces
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,In Daudz
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,Parent Izmaksu centrs
 DocType: Sales Invoice,Source,Avots
 DocType: Leave Type,Is Leave Without Pay,Vai atstāt bez Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nav atrasti Maksājuma tabulā ieraksti
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nav atrasti Maksājuma tabulā ieraksti
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Finanšu gada sākuma datums
 DocType: Employee External Work History,Total Experience,Kopā pieredze
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packing Slip (s) atcelts
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Packing Slip (s) atcelts
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Naudas plūsma no ieguldījumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Kravu un Ekspedīcijas maksājumi
 DocType: Material Request Item,Sales Order No,Pasūtījumu Nr
 DocType: Item Group,Item Group Name,Postenis Grupas nosaukums
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Materiāli Ražošana
 DocType: Pricing Rule,For Price List,Par cenrādi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Pirkuma likme posteni: {0} nav atrasts, kas ir nepieciešams, lai rezervētu grāmatvedības ieraksts (izdevumi). Lūdzu, atsaucieties uz objektu cenu pret pērk cenrādi."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Pirkuma likme posteni: {0} nav atrasts, kas ir nepieciešams, lai rezervētu grāmatvedības ieraksts (izdevumi). Lūdzu, atsaucieties uz objektu cenu pret pērk cenrādi."
 DocType: Maintenance Schedule,Schedules,Saraksti
 DocType: Purchase Invoice Item,Net Amount,Neto summa
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nr
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Papildu Atlaide Summa (Uzņēmējdarbības valūta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Kļūda: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Kļūda: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Lūdzu, izveidojiet jaunu kontu no kontu plāna."
 DocType: Maintenance Visit,Maintenance Visit,Uzturēšana Apmeklēt
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Klientu> Klientu Group> Teritorija
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Mērķa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Grāmatvedības ieraksts par {0} var veikt tikai valūtā: {1}
 DocType: Pricing Rule,Pricing Rule,Cenu noteikums
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiāls Pieprasījums Pirkuma pasūtījums
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiāls Pieprasījums Pirkuma pasūtījums
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Atgriezās Vienība {1} jo neeksistē {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankas konti
 ,Bank Reconciliation Statement,Banku samierināšanās paziņojums
@@ -1225,11 +1233,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Atvēršanas Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} jānorāda tikai vienu reizi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,No vērtība
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Ražošanas daudzums ir obligāta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Ražošanas daudzums ir obligāta
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,"Summas, kas nav atspoguļots bankā"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Prasības attiecībā uz uzņēmuma rēķina.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,"Materiāls pieprasījumi, par kuriem Piegādātājs Citāti netiek radīti"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Izsekot objektus, izmantojot svītrkodu. Jums būs iespēja ievadīt objektus piegāde piezīmi un pārdošanas rēķinu, skenējot svītrkodu posteņa."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Atzīmēt kā Pasludināts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Atzīmēt kā Pasludināts
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Padarīt citāts
 DocType: Dependent Task,Dependent Task,Atkarīgs Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Uztvērējs Latviešu
 DocType: Payment Tool Detail,Payment Amount,Maksājuma summa
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Patērētā summa
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} View
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} View
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Neto izmaiņas naudas
 DocType: Salary Structure Deduction,Salary Structure Deduction,Algu struktūra atskaitīšana
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Izmaksas Izdoti preces
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Daudzums nedrīkst būt lielāks par {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Vecums (dienas)
 DocType: Quotation Item,Quotation Item,Citāts postenis
 DocType: Account,Account Name,Konta nosaukums
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,No datums nevar būt lielāks par līdz šim datumam
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,No datums nevar būt lielāks par līdz šim datumam
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Sērijas Nr {0} daudzums {1} nevar būt daļa
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,Konversijas ātrums nevar būt 0 vai 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Konversijas ātrums nevar būt 0 vai 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Pirkuma saņemšana {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Pirkuma saņemšana {0} nav iesniegta
 DocType: Company,Default Payable Account,Default Kreditoru konts
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% Jāmaksā
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mani jautājumi
 DocType: BOM Item,BOM Item,BOM postenis
 DocType: Appraisal,For Employee,Vajadzīgi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,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/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rinda {0}: Maksājuma summa nevar būt negatīvs
 DocType: Expense Claim,Total Amount Reimbursed,Atmaksāto līdzekļu kopsummas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Pret Piegādātāju rēķinu {0} datēts {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,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
 DocType: Payment Reconciliation,Payments,Maksājumi
 DocType: Budget Detail,Budget Allocated,Budžets Piešķirtie
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Klientu kredīta atlikuma
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Neto izmaiņas Kreditoru
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Lūdzu, apstipriniet savu e-pasta id"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Klientam nepieciešams ""Customerwise Atlaide"""
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Atjaunināt banku maksājumu datumus ar žurnāliem.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Ieslēgt Grozs
 DocType: Employee,Permanent Address,Pastāvīga adrese
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Postenis {0} jābūt Service punkts.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Izmaksāto avansu pret {0} {1} nevar būt lielāks \ nekā Kopsumma {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Lūdzu izvēlieties kodu
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Samazināt atvieglojumus par Bezalgas atvaļinājums (LWP)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Viena vienība posteņa.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',"Time Log Partijas {0} ir ""Iesniegtie"""
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"Time Log Partijas {0} ir ""Iesniegtie"""
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Noliktava vajadzīgi Row Nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Noliktava vajadzīgi Row Nr {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Pasta
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Klientu grupa pastāv ar tādu pašu nosaukumu, lūdzu mainīt Klienta nosaukumu vai pārdēvēt klientu grupai"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Lūdzu, izvēlieties {0} pirmās."
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Teksta {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,"Lūdzu, izvēlieties {0} pirmās."
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},Teksta {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Jauns kontakts
 DocType: Territory,Parent Territory,Parent Teritorija
 DocType: Quality Inspection Reading,Reading 2,Lasīšana 2
 DocType: Stock Entry,Material Receipt,Materiālu saņemšana
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Type un partija ir nepieciešama / debitoru kontā {0}
 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 +210,Quantity required for Item {0} in row {1},"Daudzumu, kas vajadzīgs postenī {0} rindā {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},"Daudzumu, kas vajadzīgs postenī {0} rindā {1}"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,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
@@ -1361,15 +1373,15 @@
 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: Sales Invoice Item,Batch No,Partijas Nr
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Galvenais
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Galvenais
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Apturēts rīkojumu nevar atcelt. Unstop lai atceltu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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: Item,Variants,Varianti
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Padarīt pirkuma pasūtījuma
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Padarīt pirkuma pasūtījuma
 DocType: SMS Center,Send To,Sūtīt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Noliktavas un atsauce
 DocType: Supplier,Statutory info and other general information about your Supplier,Normatīvais info un citu vispārīgu informāciju par savu piegādātāju
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adreses
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Prece nav atļauts būt Ražošanas uzdevums.
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Kredīta summa konta valūtā
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Laika Baļķi ražošanā.
 DocType: Item,Apply Warehouse-wise Reorder Level,Piesakies Warehouse-gudro Pārkārtot Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} jāiesniedz
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} jāiesniedz
 DocType: Authorization Control,Authorization Control,Autorizācija Control
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,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/config/projects.py +23,Time Log for tasks.,Laiks Pieteikties uz uzdevumiem.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Maksājums
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Maksājums
 DocType: Production Order Operation,Actual Time and Cost,Faktiskais laiks un izmaksas
 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},Materiāls pieprasījums maksimāli {0} var izdarīt postenī {1} pret pārdošanas ordeņa {2}
 DocType: Employee,Salutation,Sveiciens
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Līdzstrādnieks
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Postenis {0} nav sērijveida punkts
 DocType: SMS Center,Create Receiver List,Izveidot Uztvērēja sarakstu
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Beidzies
 DocType: Packing Slip,To Package No.,Iesaiņot No.
 DocType: Warranty Claim,Issue Date,Emisijas datums
 DocType: Activity Cost,Activity Cost,Aktivitāte Cost
@@ -1449,7 +1461,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Izpildīts
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Teritorija / Klientu
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,"piemēram, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar rēķinu nenomaksāto summu {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar rēķinu nenomaksāto summu {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Vārdos būs redzams pēc tam, kad esat saglabāt pārdošanas rēķinu."
 DocType: Item,Is Sales Item,Vai Pārdošanas punkts
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Postenis Group Tree
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} izveidots
 DocType: Delivery Note Item,Against Sales Order,Pret pārdošanas rīkojumu
 ,Serial No Status,Sērijas Nr statuss
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Postenis tabula nevar būt tukšs
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Postenis tabula nevar būt tukšs
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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}"
 DocType: Pricing Rule,Selling,Pārdod
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Nodevas un nodokļi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Ievadiet Atsauces datums
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Ievadiet Atsauces datums
 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} maksājumu ierakstus nevar filtrēt pēc {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabula postenī, kas tiks parādīts Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Piegādāto Daudz
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,Uzstādīšana laiks
 DocType: Sales Invoice,Accounting Details,Grāmatvedības Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,"Dzēst visas darījumi, par šo uzņēmumu"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Row # {0}: Operation {1} nav pabeigta {2} Daudz gatavo preču ražošanas kārtību # {3}. Lūdzu, atjauniniet darbības statusu, izmantojot Time Baļķi"
+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,"Row # {0}: Operation {1} nav pabeigta {2} Daudz gatavo preču ražošanas kārtību # {3}. Lūdzu, atjauniniet darbības statusu, izmantojot Time Baļķi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investīcijas
 DocType: Issue,Resolution Details,Izšķirtspēja Details
 DocType: Quality Inspection Reading,Acceptance Criteria,Pieņemšanas kritēriji
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,Skaidrs tabula
 DocType: Features Setup,Brands,Brands
 DocType: C-Form Invoice Detail,Invoice No,Rēķins Nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,No Pirkuma pasūtījums
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,No Pirkuma pasūtījums
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Atstājiet nevar piemērot / atcelts pirms {0}, jo atvaļinājumu bilance jau ir rokas nosūtīja nākotnē atvaļinājumu piešķiršanas ierakstu {1}"
 DocType: Activity Cost,Costing Rate,Izmaksu Rate
 ,Customer Addresses And Contacts,Klientu Adreses un kontakti
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,Apkopes grafiki
 ,Quotation Trends,Citāts tendences
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,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
 ,Pending Amount,Kamēr Summa
 DocType: Purchase Invoice Item,Conversion Factor,Conversion Factor
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Koks finanial kontiem.
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konts {0} ir jābūt tipa ""pamatlīdzeklis"", kā postenis {1} ir Asset postenis"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konts {0} ir jābūt tipa ""pamatlīdzeklis"", kā postenis {1} ir Asset postenis"
 DocType: HR Settings,HR Settings,HR iestatījumi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Izdevumu Prasība tiek gaidīts apstiprinājums. Tikai Izdevumu apstiprinātājs var atjaunināt statusu.
 DocType: Purchase Invoice,Additional Discount Amount,Papildus Atlaides summa
 DocType: Leave Block List Allow,Leave Block List Allow,Atstājiet Block Latviešu Atļaut
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sporta
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Kopā Faktiskais
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Vienība
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Izdevumu Prasības
 DocType: Issue,Support,Atbalsts
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Apskatīt grozu
 ,BOM Search,BOM Meklēt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Noslēguma (atvēršana + kopsummas)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Lūdzu, norādiet valūtu Company"
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM pārrēķināšanas koeficients ir nepieciešams rindā {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Klīrenss datums nevar būt pirms reģistrācijas datuma pēc kārtas {0}
 DocType: Salary Slip,Deduction,Atskaitīšana
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Prece Cena pievienots {0} Cenrādī {1}
 DocType: Address Template,Address Template,Adrese Template
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% Uzdevumi Pabeigti
 DocType: Project,Gross Margin,Bruto peļņa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Ievadiet Ražošanas Prece pirmais
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,invalīdiem lietotāju
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,invalīdiem lietotāju
 DocType: Opportunity,Quotation,Citāts
 DocType: Salary Slip,Total Deduction,Kopā atskaitīšana
 DocType: Quotation,Maintenance User,Uzturēšanas lietotājs
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
 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
@@ -1588,12 +1602,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Sekot izpārdošanām. Sekot noved citāti, Pasūtījumu utt no kampaņas, lai novērtētu atdevi no ieguldījumiem."
 DocType: Expense Claim,Approver,Apstiprinātājs
 ,SO Qty,SO Daudz
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Krājumu papildinājums pastāv pret noliktavā {0}, līdz ar to jūs nevarat atkārtoti piešķirt vai mainīt noliktava"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Krājumu papildinājums pastāv pret noliktavā {0}, līdz ar to jūs nevarat atkārtoti piešķirt vai mainīt noliktava"
 DocType: Appraisal,Calculate Total Score,Aprēķināt kopējo punktu skaitu
 DocType: Supplier Quotation,Manufacturing Manager,Ražošanas vadītājs
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Split Piegāde piezīme paketēs.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Sūtījumi
+apps/erpnext/erpnext/hooks.py +69,Shipments,Sūtījumi
 DocType: Purchase Order Item,To be delivered to customer,Jāpiegādā klientam
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Laiks Log Status jāiesniedz.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Sērijas Nr {0} nepieder nevienai noliktavā
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +356,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
 DocType: Currency Exchange,From Currency,No Valūta
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Lūdzu, izvēlieties piešķirtā summa, rēķina veidu un rēķina numura atleast vienā rindā"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Pasūtījumu nepieciešams postenī {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Lūdzu, izvēlieties piešķirtā summa, rēķina veidu un rēķina numura atleast vienā rindā"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Pasūtījumu nepieciešams postenī {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,"Summas, kas nav atspoguļots sistēmā"
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company valūta)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Pārējie
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,In process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Atlaide
 DocType: Purchase Order Item,Reference Document Type,Atsauces dokuments Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} pret pārdošanas ordeņa {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} pret pārdošanas ordeņa {1}
 DocType: Account,Fixed Asset,Pamatlīdzeklis
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serializēja inventarizācija
 DocType: Activity Type,Default Billing Rate,Default Norēķinu Rate
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order to Apmaksa
 DocType: Expense Claim Detail,Expense Claim Detail,Izdevumu Pretenzija Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Laiks Baļķi izveidots:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,"Lūdzu, izvēlieties pareizo kontu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,"Lūdzu, izvēlieties pareizo kontu"
 DocType: Item,Weight UOM,Svars UOM
 DocType: Employee,Blood Group,Asins Group
 DocType: Purchase Invoice Item,Page Break,Page Break
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,Uz laiku
 DocType: Authorization Rule,Approving Role (above authorized value),Apstiprinot loma (virs atļautā vērtība)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Lai pievienotu bērnu mezgliem, pētīt koku un noklikšķiniet uz mezglu, saskaņā ar kuru vēlaties pievienot vairāk mezglu."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredīts kontā jābūt Kreditoru konts
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Kredīts kontā jābūt Kreditoru konts
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},BOM rekursijas: {0} nevar būt vecāks vai bērns {2}
 DocType: Production Order Operation,Completed Qty,Pabeigts Daudz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Cenrādis {0} ir invalīds
 DocType: Manufacturing Settings,Allow Overtime,Atļaut Virsstundas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{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}."
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,Klientu punkts Codes
 DocType: Opportunity,Lost Reason,Zaudēja Iemesls
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Izveidot Maksājumu Ieraksti pret rīkojumiem vai rēķinos.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Jaunā adrese
 DocType: Quality Inspection,Sample Size,Izlases lielums
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Visi posteņi jau ir rēķinā
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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"
 DocType: Project,External,Ārējs
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,Pārdēvēt rīks
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update izmaksas
 DocType: Item Reorder,Item Reorder,Postenis Pārkārtot
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Materiāls
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transfer Materiāls
 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."
 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
 DocType: Installation Note,Installation Note,Uzstādīšana Note
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Pievienot Nodokļi
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Naudas plūsma no finansēšanas
 ,Financial Analytics,Finanšu Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Filiāle
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,Izveidot algas lapu
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,"Paredzams, bilance katru banku"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Līdzekļu avots (Pasīvi)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Daudzums rindā {0} ({1}) jābūt tādai pašai kā saražotā apjoma {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Daudzums rindā {0} ({1}) jābūt tādai pašai kā saražotā apjoma {2}
 DocType: Appraisal,Employee,Darbinieks
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importēt e-pastu no
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Uzaicināt kā lietotājs
 DocType: Features Setup,After Sale Installations,Pēc Pārdod Iekārtas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0}{1} ir pilnībā jāmaksā
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0}{1} ir pilnībā jāmaksā
 DocType: Workstation Working Hour,End Time,Beigu laiks
 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 +75,Group by Voucher,Grupa ar kuponu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nepieciešamais On
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Rename Tool,File to Rename,Failu pārdēvēt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},"Purchse Pasūtījuma skaits, kas nepieciešams postenī {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},"Purchse Pasūtījuma skaits, kas nepieciešams postenī {0}"
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Rādīt Maksājumi
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,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
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,Pasūtījumu Nepieciešamais
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Izveidot klientu
 DocType: Purchase Invoice,Credit To,Kredīts Lai
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktīvās pievadi / Klienti
 DocType: Employee Education,Post Graduate,Post Graduate
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Uzturēšanas grafika detaļas
 DocType: Quality Inspection Reading,Reading 9,Lasīšana 9
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,Paaugstināts Līdz
 DocType: Payment Tool,Payment Account,Maksājumu konts
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Neto izmaiņas debitoru
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensējošs Off
 DocType: Quality Inspection Reading,Accepted,Pieņemts
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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."
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,Kopā Maksājuma summa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}), nevar būt lielāks par plānoto quanitity ({2}) transportlīdzekļu ražošanā Order {3}"
 DocType: Shipping Rule,Shipping Rule Label,Piegāde noteikums Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Nevarēja atjaunināt sastāvu, rēķins ir piliens kuģniecības objektu."
 DocType: Newsletter,Test,Pārbaude
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Tā kā ir esošās akciju darījumi par šo priekšmetu, \ jūs nevarat mainīt vērtības &quot;Has Sērijas nē&quot;, &quot;Vai partijas Nē&quot;, &quot;Vai Stock Vienība&quot; un &quot;vērtēšanas metode&quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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: 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 +157,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 +211,{0} {1} is not submitted,{0}{1} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0}{1} nav iesniegta
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Noteikumi un Conditions1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,Autorizēts Value
 DocType: Contact,Enter department to which this Contact belongs,"Ievadiet departaments, kurā šis Kontaktinformācija pieder"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Kopā Nav
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Postenis vai noliktava rindā {0} nesakrīt Material pieprasījumu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Postenis vai noliktava rindā {0} nesakrīt Material pieprasījumu
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Mērvienības
 DocType: Fiscal Year,Year End Date,Gada beigu datums
 DocType: Task Depends On,Task Depends On,Uzdevums Atkarīgs On
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Līguma beigu datums ir jābūt lielākam nekā datums savienošana
 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."
 DocType: Customer Group,Has Child Node,Ir Bērnu Mezgls
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} pret Pirkuma pasūtījums {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} pret Pirkuma pasūtījums {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Ievadiet statiskās url parametrus šeit (Piem. Sūtītājs = ERPNext, lietotājvārds = ERPNext, parole = 1234 uc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} nekādā aktīvā fiskālajā gadā. Lai saņemtu sīkāku informāciju, pārbaudiet {2}."
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Šis ir piemērs mājas lapā automātiski ģenerēts no ERPNext
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,Recd daudzums
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nevar ražot vairāk Vienību {0} nekā Pasūtījumu daudzums {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
 DocType: Payment Reconciliation,Bank / Cash Account,Bankas / Naudas konts
 DocType: Tax Rule,Billing City,Norēķinu City
 DocType: Global Defaults,Hide Currency Symbol,Slēpt valūtas simbols
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Izdevumi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Virs
 DocType: Buying Settings,Default Buying Price List,Default Pirkšana Cenrādis
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Neviens darbinieks par iepriekš izvēlētajiem kritērijiem vai algu paslīdēt jau izveidots
 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"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Maksājuma veids
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Skatīt ""Rate Materiālu Balstoties uz"" in tāmēšanu iedaļā"
 DocType: Appraisal Goal,Key Responsibility Area,Key Atbildība Platība
 DocType: Item Reorder,Material Request Type,Materiāls Pieprasījuma veids
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Conversion Factor ir obligāta
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Izmaksas Center
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Kuponu #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Lūdzu, izvēlieties vērtību {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Visas adreses.
 DocType: Company,Stock Settings,Akciju iestatījumi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Apvienošana ir iespējama tikai tad, ja šādas īpašības ir vienādas abos ierakstos. Vai Group, Root Type, Uzņēmuma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Apvienošana ir iespējama tikai tad, ja šādas īpašības ir vienādas abos ierakstos. Vai Group, Root Type, Uzņēmuma"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Pārvaldīt Klientu grupa Tree.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Jaunais Izmaksu centrs Name
 DocType: Leave Control Panel,Leave Control Panel,Atstājiet Control Panel
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Maksājumu Tool Detail
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Kopā Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Brīdinājums: Vēl {0} # {1} eksistē pret akciju stāšanās {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Vietējs
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Brīdinājums: Vēl {0} # {1} eksistē pret akciju stāšanās {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Vietējs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Aizdevumi un avansi (Aktīvi)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Liels
@@ -2003,7 +2022,7 @@
 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.
 DocType: Production Order Operation,Make Time Log,Padarīt Time Ieiet
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Lūdzu noteikt pasūtīšanas daudzumu
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Lūdzu noteikt pasūtīšanas daudzumu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Lūdzu, izveidojiet Klientam no Svins {0}"
 DocType: Price List,Applicable for Countries,Piemērojams valstīs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Datori
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Nav Piezīmes
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Nav Piezīmes
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Nokavēts
 DocType: Account,Stock Received But Not Billed,Stock Saņemtā Bet ne Jāmaksā
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root Jāņem grupa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root Jāņem grupa
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto Pay + Arrear Summa + Inkasāciju Summa - Kopā atskaitīšana
 DocType: Monthly Distribution,Distribution Name,Distribution vārds
 DocType: Features Setup,Sales and Purchase,Pārdošanas un iegāde
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,Party Balance
 DocType: Sales Invoice Item,Time Log Batch,Laiks Log Partijas
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Lūdzu, izvēlieties Piesakies atlaide"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Alga Slip Izveidots
 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: Stock Entry,Material Transfer for Manufacture,Materiāls pārsūtīšana Ražošana
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,Reizi pusgadā
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskālā gads {0} nav atrasts.
 DocType: Bank Reconciliation,Get Relevant Entries,Saņemt attiecīgus ierakstus
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Grāmatvedības Entry par noliktavā
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Grāmatvedības Entry par noliktavā
 DocType: Sales Invoice,Sales Team1,Sales team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Postenis {0} nepastāv
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Postenis {0} nepastāv
 DocType: Sales Invoice,Customer Address,Klientu adrese
 DocType: Purchase Invoice,Apply Additional Discount On,Piesakies Papildu atlaide
 DocType: Account,Root Type,Root Type
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Parādiet šo slaidrādi augšpusē lapas
 DocType: BOM,Item UOM,Postenis UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Nodokļa summa pēc atlaides apmērs (Uzņēmējdarbības valūta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Mērķa noliktava ir obligāta rindā {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Mērķa noliktava ir obligāta rindā {0}
 DocType: Quality Inspection,Quality Inspection,Kvalitātes pārbaudes
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Pārtika, dzērieni un tabakas"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL vai BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Var tikai veikt maksājumus pret unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Var tikai veikt maksājumus pret unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Komisijas likme nevar būt lielāka par 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimālā Inventāra līmenis
 DocType: Stock Entry,Subcontract,Apakšlīgumu
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Ienākošais kvalitātes pārbaude.
 DocType: Purchase Order Item,Returned Qty,Atgriezās Daudz
 DocType: Employee,Exit,Izeja
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Sakne Type ir obligāts
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Sakne Type ir obligāts
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Sērijas Nr {0} izveidots
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Par ērtības klientiem, šie kodi var izmantot drukas formātos, piemēram, rēķinos un pavadzīmēs"
 DocType: Employee,You can enter any date manually,Jūs varat ievadīt jebkuru datumu manuāli
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Pārbaudes laiks
 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 +110,Row {0}: Advance against Customer must be credit,Row {0}: Advance pret Klientu jābūt kredīts
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Pirkuma čeka Prece Kopā
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Maksāt
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Maksāt
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Lai DATETIME
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Baļķi uzturēšanai sms piegādes statusu
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Pārkārtot Level
 DocType: Attendance,Attendance Date,Apmeklējumu Datums
 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 +110,Account with child nodes cannot be converted to ledger,Konts ar bērniem mezglu nevar pārvērst par virsgrāmatā
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Konts ar bērniem mezglu nevar pārvērst par virsgrāmatā
 DocType: Address,Preferred Shipping Address,Vēlamā Piegādes adrese
 DocType: Purchase Receipt Item,Accepted Warehouse,Pieņemts Noliktava
 DocType: Bank Reconciliation Detail,Posting Date,Norīkošanu Datums
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Sērijas Nr {0} nepastāv
 DocType: Pricing Rule,Discount Percentage,Atlaide procentuālā
 DocType: Payment Reconciliation Invoice,Invoice Number,Rēķina numurs
-apps/erpnext/erpnext/hooks.py +54,Orders,Pasūtījumi
+apps/erpnext/erpnext/hooks.py +55,Orders,Pasūtījumi
 DocType: Leave Control Panel,Employee Type,Darbinieku Type
 DocType: Employee Leave Approver,Leave Approver,Atstājiet apstiprinātāja
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Materiāls pārvietoti, lai ražošana"
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Materiālu jāmaksā pret šo pārdošanas rīkojuma
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periods Noslēguma Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Nolietojums
+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: Customer,Credit Limit,Kredītlimita
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Izvēlēties veidu darījumu
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,Pieprasīts Par
 DocType: Quotation Item,Against Doctype,Pret DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Sekot šim pavadzīmi pret jebkuru projektu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root konts nevar izdzēst
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Neto naudas no Investing
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root konts nevar izdzēst
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Rādīt krājumu papildināšanu
 ,Is Primary Address,Vai Primārā adrese
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress noliktavā
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Atsauce # {0} datēts {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Atsauce # {0} datēts {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Pārvaldīt adreses
 DocType: Pricing Rule,Item Code,Postenis Code
 DocType: Production Planning Tool,Create Production Orders,Izveidot pasūtījumu
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,Lietotājs Piezīme
 DocType: Lead,Market Segment,Tirgus segmentā
 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 +223,Closing (Dr),Noslēguma (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Noslēguma (Dr)
 DocType: Contact,Passive,Pasīvs
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Sērijas Nr {0} nav noliktavā
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Nodokļu veidni pārdošanas darījumu.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,Jāmaksā Summa
 DocType: Bank Reconciliation,Bank Reconciliation,Banku samierināšanās
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Saņemt atjauninājumus
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiāls Pieprasījums {0} ir atcelts vai pārtraukta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Materiāls Pieprasījums {0} ir atcelts vai pārtraukta
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Pievieno dažas izlases ierakstus
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Atstājiet Management
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa ar kontu
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Konts galva ar atbildību, kuru peļņa / zaudējumi tiks rezervēts"
 DocType: Payment Tool,Against Vouchers,Pret Kuponu
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ātrā palīdzība
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Pārdošanas Ekstras
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budžets konta {1} pret izmaksām centra {2} pārsniegs līdz {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
 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'"
 ,Stock Projected Qty,Stock Plānotais Daudzums
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
 DocType: Sales Order,Customer's Purchase Order,Klienta Pasūtījuma
 DocType: Warranty Claim,From Company,No Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Vērtība vai Daudz
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Atstājiet Block Latviešu Atļauts
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Jūs izmantot to uz autorizāciju
 DocType: Sales Partner,Retailer,Mazumtirgotājs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredīts kontā jābūt bilance konts
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Visi Piegādātājs veidi
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +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/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Citāts {0} nav tipa {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Uzturēšana grafiks postenis
 DocType: Sales Order,%  Delivered,% Piegādāts
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto iepakojuma svars. Parasti neto svars + iepakojuma materiālu svara. (Drukāšanai)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Lietotāji ar šo lomu ir atļauts noteikt iesaldētos kontus, un izveidot / mainīt grāmatvedības ierakstus pret iesaldētos kontus"
 DocType: Serial No,Is Cancelled,Tiek atcelta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mani sūtījumi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Mani sūtījumi
 DocType: Journal Entry,Bill Date,Bill Datums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Pat tad, ja ir vairāki cenu noteikšanas noteikumus ar augstāko prioritāti, tiek piemēroti tad šādi iekšējie prioritātes:"
 DocType: Supplier,Supplier Details,Piegādātājs Details
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Zvani
 DocType: Project,Total Costing Amount (via Time Logs),Kopā Izmaksu summa (via Time Baļķi)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Pasūtījuma {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Pasūtījuma {0} nav iesniegta
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Prognozēts
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Sērijas Nr {0} nepieder noliktavu {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Piezīme: Sistēma nepārbaudīs pārāk piegādi un pār-rezervāciju postenī {0} kā daudzums vai vērtība ir 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Piezīme: Sistēma nepārbaudīs pārāk piegādi un pār-rezervāciju postenī {0} kā daudzums vai vērtība ir 0
 DocType: Notification Control,Quotation Message,Citāts Message
 DocType: Issue,Opening Date,Atvēršanas datums
 DocType: Journal Entry,Remark,Piezīme
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,Batched par rēķinu
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Rēķini, ko piegādātāji izvirzītie."
 DocType: POS Profile,Write Off Account,Uzrakstiet Off kontu
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Neto naudas no operāciju
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,"piemēram, PVN"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4. punkts
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry konts
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,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
 DocType: Sales Invoice,Against Income Account,Pret ienākuma kontu
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Pasludināts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 Daudz {2} (definēts postenī).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,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 Daudz {2} (definēts postenī).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mēneša procentuālais sadalījums
 DocType: Territory,Territory Targets,Teritorija Mērķi
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2421,10 +2443,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partijas numurs ir obligāta postenī {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,"Tas ir sakņu pārdošanas persona, un to nevar rediģēt."
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Rate: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Alga Slip atskaitīšana
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Izvēlieties grupas mezglu pirmās.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Mērķim ir jābūt vienam no {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Mērķim ir jābūt vienam no {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Aizpildiet formu un saglabājiet to
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Lejupielādēt ziņojumu, kurā visas izejvielas, ar savu jaunāko inventāra statusu"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forums
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (nav Klients vai piegādātājs) kapteinis.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Ievadiet ""piegādes paredzētais datums"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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ā
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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ā
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nav derīgs Partijas skaits postenī {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Piezīme: Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Piezīme: Ja maksājums nav veikts pret jebkādu atsauci, veikt Journal Entry manuāli."
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Nosūtīt automātisko e-pastus kontaktiem Iesniedzot darījumiem.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Rinda {0}: Daudz nav avalable noliktavā {1} uz {2}{3}. Pieejams Daudzums: {4}, Transfer Daudzums: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Postenis 3
 DocType: Purchase Order,Customer Contact Email,Klientu Kontakti Email
 DocType: Sales Team,Contribution (%),Ieguldījums (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Pienākumi
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Template
 DocType: Sales Person,Sales Person Name,Sales Person Name
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Pirms samierināšanās
 apps/erpnext/erpnext/support/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 +374,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 +383,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ā
 DocType: Item,Default BOM,Default BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Lūdzu, atkārtoti tipa uzņēmuma nosaukums, lai apstiprinātu"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Kopā Izcila Amt
 DocType: Time Log Batch,Total Hours,Kopējais stundu skaits
 DocType: Journal Entry,Printing Settings,Drukāšanas iestatījumi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Kopējais debets jābūt vienādam ar kopējās kredīta. Atšķirība ir {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Kopējais debets jābūt vienādam ar kopējās kredīta. Atšķirība ir {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobiļu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,No piegāde piezīme
 DocType: Time Log,From Time,No Time
 DocType: Notification Control,Custom Message,Custom Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investīciju banku
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,"Nauda vai bankas konts ir obligāta, lai padarītu maksājumu ierakstu"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,"Nauda vai bankas konts ir obligāta, lai padarītu maksājumu ierakstu"
 DocType: Purchase Invoice,Price List Exchange Rate,Cenrādis Valūtas kurss
 DocType: Purchase Invoice Item,Rate,Likme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interns
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","Vairāki Cena noteikums pastāv ar tiem pašiem kritērijiem, lūdzu atrisināt \ konfliktu, piešķirot prioritāti. Cena Noteikumi: {0}"
 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 +580,Issue Material,Jautājums Materiāls
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Jautājums Materiāls
 DocType: Material Request Item,For Warehouse,Par Noliktava
 DocType: Employee,Offer Date,Piedāvājums Datums
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citāti
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,Sērijas Nr
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Ievadiet Maintaince Details pirmais
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimālais Rēķina summa
 DocType: Purchase Invoice Item,Image View,Image View
 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 +553,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 Noliktava
 DocType: Purchase Taxes and Charges,Valuation and Total,Vērtēšana un Total
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Šis postenis ir variants {0} (veidni). Atribūti tiks pārkopēti no šablona, ja ""Nē Copy"" ir iestatīts"
 DocType: Account,Purchase User,Iegādāties lietotāju
 DocType: Notification Control,Customize the Notification,Pielāgot paziņojumu
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Naudas plūsma no darbības
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Default Adrese Template nevar izdzēst
 DocType: Sales Invoice,Shipping Rule,Piegāde noteikums
 DocType: Journal Entry,Print Heading,Print virsraksts
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Izejviela
 DocType: Leave Application,Follow via Email,Sekot pa e-pastu
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Nodokļu summa pēc Atlaide Summa
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,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 +335,Please select Posting Date first,"Lūdzu, izvēlieties Publicēšanas datums pirmais"
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Sērijas Nos Nepieciešamais par sērijveida postenī {0}
 DocType: Journal Entry,Bank Entry,Banka Entry
 DocType: Authorization Rule,Applicable To (Designation),Piemērojamais Lai (Apzīmējums)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Pievienot grozam
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Ieslēgt / izslēgt valūtas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Pasta izdevumi
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Datums, kurā atkārtojas pasūtījums tiks apstāties"
 DocType: Quality Inspection,Item Serial No,Postenis Sērijas Nr
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} ir jāsamazina par {1}, vai jums vajadzētu palielināt pārplūdes toleranci"
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} ir jāsamazina par {1}, vai jums vajadzētu palielināt pārplūdes toleranci"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Kopā Present
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Stunda
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Sērijveida postenis {0} nevar atjaunināt \ izmantojot krājumu samierināšanās
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transfer Materiāls piegādātājam
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Transfer Materiāls piegādātājam
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Izveidot citāts
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Jums nav atļauts apstiprināt lapas par Grantu datumi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Visi šie posteņi jau rēķinā
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Visi šie posteņi jau rēķinā
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Var apstiprināt ar {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Piegāde pants Nosacījumi
 DocType: BOM Replace Tool,The new BOM after replacement,Jaunais BOM pēc nomaiņas
 DocType: Features Setup,Point of Sale,Point of Sale
 DocType: Account,Tax,Nodoklis
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rinda {0}: {1} nav derīgs {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,No produkta Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,No produkta Bundle
 DocType: Production Planning Tool,Production Planning Tool,Ražošanas plānošanas rīks
 DocType: Quality Inspection,Report Date,Ziņojums Datums
 DocType: C-Form,Invoices,Rēķini
 DocType: Job Opening,Job Title,Amats
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} saņēmēji
 DocType: Features Setup,Item Groups in Details,Postenis Grupas detaļās
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Daudzums, ražošana jābūt lielākam par 0."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -2618,8 +2644,9 @@
 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: Pricing Rule,Customer Group,Klientu Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Izdevumu konts ir obligāta posteni {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Izdevumu konts ir obligāta posteni {0}
 DocType: Item,Website Description,Mājas lapa Apraksts
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Neto pašu kapitāla izmaiņas
 DocType: Serial No,AMC Expiry Date,AMC Derīguma termiņš
 ,Sales Register,Sales Reģistrēties
 DocType: Quotation,Quotation Lost Reason,Citāts Lost Iemesls
@@ -2627,12 +2654,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Nav nekas, lai rediģētu."
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Kopsavilkums par šo mēnesi un izskatāmo darbību
 DocType: Customer Group,Customer Group Name,Klientu Grupas nosaukums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Atribūti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Saņemt Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Ievadiet norakstīt kontu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Saņemt Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Ievadiet norakstīt kontu
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Pēdējā pasūtījuma datums
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Padarīt akcīzes rēķinu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konts {0} nav pieder uzņēmumam {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekts gudrs dati nav pieejami aptauja
 DocType: Project,Expected End Date,"Paredzams, beigu datums"
 DocType: Appraisal Template,Appraisal Template Title,Izvērtēšana Template sadaļa
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Tirdzniecības
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Tirdzniecības
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent postenis {0} nedrīkst būt Stock Vienība
 DocType: Cost Center,Distribution Id,Distribution Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Cenas atribūtu {0} ir jābūt robežās no {1} līdz {2} Jo soli {3}
 DocType: Tax Rule,Sales,Sales
 DocType: Stock Entry Detail,Basic Amount,Pamatsumma
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
 DocType: Leave Allocation,Unused leaves,Neizmantotās lapas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default parādi Debitoru
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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,Setup Series
+DocType: Payment Reconciliation,To Invoice Date,Lai rēķina datuma
 DocType: Supplier,Contact HTML,Contact HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Pirkuma Kvītis
-DocType: Payment Reconciliation,Maximum Amount,Maksimālā summa
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kā Cenu noteikums tiek piemērots?
 DocType: Quality Inspection,Delivery Note No,Piegāde Note Nr
 DocType: Company,Retail,Mazumtirdzniecība
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Klientu {0} nepastāv
 DocType: Attendance,Absent,Nekonstatē
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produkta Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Invalid atsauce {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Produkta Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Row {0}: Invalid atsauce {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Pirkuma nodokļi un nodevas Template
 DocType: Upload Attendance,Download Template,Download Template
 DocType: GL Entry,Remarks,Piezīmes
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,Mēneša Apmeklējumu Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Neviens ieraksts atrasts
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0}{1}: Izmaksu centrs ir obligāta postenī {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konts {0} ir neaktīvs
 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
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Peļņas un zaudējumu"" tipa konts {0} nav atļauts atvēršana Entry"
 DocType: Features Setup,Sales Discounts,Pārdošanas Atlaides
 DocType: Hub Settings,Seller Country,Pārdevējs Country
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publicēt punkti Website
 DocType: Authorization Rule,Authorization Rule,Autorizācija noteikums
 DocType: Sales Invoice,Terms and Conditions Details,Noteikumi un nosacījumi Details
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Specifikācijas
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Pārdošanas nodokļi un maksājumi Template
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Apģērbs un Aksesuāri
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Skaits ordeņa
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,Norēķinu summa
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Noteikts posteni Invalid daudzums {0}. Daudzums ir lielāks par 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Pieteikumi atvaļinājuma.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konts ar esošo darījumu nevar izdzēst
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Konts ar esošo darījumu nevar izdzēst
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridiskie izdevumi
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Mēneša diena, kurā auto pasūtījums tiks radīts, piemēram 05, 28 utt"
 DocType: Sales Invoice,Posting Time,Norīkošanu laiks
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,Avārija
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Konts: {0} ar valūtu: {1} nevar atlasīt
 DocType: Bank Reconciliation Detail,Cheque Date,Čeku Datums
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konts {0}: Mātes vērā {1} nepieder uzņēmumam: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Konts {0}: Mātes vērā {1} nepieder uzņēmumam: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Veiksmīgi svītrots visas ar šo uzņēmumu darījumus!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kā datumā
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probācija
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Default Noliktava ir obligāta krājumu postenī.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Default Noliktava ir obligāta krājumu postenī.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Samaksa algas par mēnesi {0} un gads {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto ievietot Cenrādis likme, ja trūkst"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kopējais samaksāto summu
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Kopā Norēķinu Summa (via Time Baļķi)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Mēs pārdot šo Prece
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Piegādātājs Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Daudzums ir jābūt lielākam par 0
 DocType: Journal Entry,Cash Entry,Naudas Entry
 DocType: Sales Partner,Contact Desc,Contact Desc
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Veids lapām, piemēram, gadījuma, slimības uc"
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Pievienot rindas noteikt ikgadējos budžetus uz kontu.
 DocType: Buying Settings,Default Supplier Type,Default Piegādātājs Type
 DocType: Production Order,Total Operating Cost,Kopā ekspluatācijas izmaksas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Piezīme: postenis {0} ieraksta vairākas reizes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Piezīme: postenis {0} ieraksta vairākas reizes
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Visi Kontakti.
 DocType: Newsletter,Test Email Id,Tests Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Uzņēmuma saīsinājums
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Visas klientu grupas
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Nodokļu veidne ir obligāta.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konts {0}: Mātes vērā {1} neeksistē
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Pagaidu
 DocType: Address,Preferred Billing Address,Vēlamā Norēķinu adrese
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,Postenis gudrs Cenrādis Rate
 DocType: Purchase Order Item,Supplier Quotation,Piegādātājs Citāts
 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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0}{1} ir apturēta
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0}{1} ir apturēta
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
 DocType: Lead,Add to calendar on this date,Pievienot kalendāram šajā datumā
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Noteikumi par piebilstot piegādes izmaksas.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Gaidāmie notikumi
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,No Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Pasūtījumi izlaists ražošanai.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Izvēlieties fiskālajā gadā ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
 DocType: Hub Settings,Name Token,Nosaukums Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard pārdošana
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Vismaz viena noliktava ir obligāta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,No Garantijas
 DocType: BOM Replace Tool,Replace,Aizstāt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} pret pārdošanas rēķinu {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ievadiet noklusējuma mērvienības
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} pret pārdošanas rēķinu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Ievadiet noklusējuma mērvienības
 DocType: Purchase Invoice Item,Project Name,Projekta nosaukums
 DocType: Supplier,Mention if non-standard receivable account,Pieminēt ja nestandarta debitoru konts
 DocType: Journal Entry Account,If Income or Expense,Ja ieņēmumi vai izdevumi
 DocType: Features Setup,Item Batch Nos,Vienība Partijas Nr
 DocType: Stock Ledger Entry,Stock Value Difference,Preces vērtība Starpība
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Cilvēkresursi
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Nodokļu Aktīvi
 DocType: BOM Item,BOM No,BOM Nr
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM kas tiks aizstāti
 DocType: Account,Debit,Debets
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,Papildu izmaksas
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Finanšu gads beigu datums
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nevar filtrēt balstīta uz kupona, ja grupēti pēc kuponu"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Padarīt Piegādātāja citāts
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Padarīt Piegādātāja citāts
 DocType: Quality Inspection,Incoming,Ienākošs
 DocType: BOM,Materials Required (Exploded),Nepieciešamie materiāli (eksplodēja)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Samazināt Nopelnot par Bezalgas atvaļinājums (LWP)
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,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/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Partijas ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Piezīme: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Piezīme: {0}
 ,Delivery Note Trends,Piegāde Piezīme tendences
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ŠONEDĒĻ kopsavilkums
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} jābūt Pirkta vai Apakšuzņēmēju Ir rindā {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Vid. Pirkšana Rate
 DocType: Task,Actual Time (in Hours),Faktiskais laiks (stundās)
 DocType: Employee,History In Company,Vēsture Company
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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īt {1} nevar būt lielāks par pieprasīto daudzumu {2} postenim {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Biļeteni
 DocType: Address,Shipping,Piegāde
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,Beigu datums no kārtējā pasūtījuma perioda
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Padarīt piedāvājuma vēstule
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Atgriešanās
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Default mērvienība Variant jābūt tāda pati kā Template
 DocType: Production Order Operation,Production Order Operation,Ražošanas Order Operation
 DocType: Pricing Rule,Disable,Atslēgt
 DocType: Project Task,Pending Review,Kamēr apskats
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Klienta ID
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Lai Time jābūt lielākam par laiku
 DocType: Journal Entry Account,Exchange Rate,Valūtas kurss
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Noliktava {0}: Mātes vērā {1} nav Bolong uzņēmumam {2}
 DocType: BOM,Last Purchase Rate,"Pēdējā pirkuma ""Rate"""
 DocType: Account,Asset,Aktīvs
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,Pieejams Stock uz iepakojuma vienības
 DocType: Item Variant,Item Variant,Postenis Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Šī adrese veidne kā noklusējuma iestatījums, jo nav cita noklusējuma"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Kvalitātes vadība
 DocType: Production Planning Tool,Filter based on customer,"Filtrs, pamatojoties uz klientu"
 DocType: Payment Tool Detail,Against Voucher No,Pret kupona
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,Nākamais Kontakti
 DocType: Employee,Employment Type,Nodarbinātības Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Pamatlīdzekļi
+,Cash Flow,Naudas plūsma
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Pieteikumu iesniegšanas termiņš nevar būt pa diviem alocation ierakstiem
 DocType: Item Group,Default Expense Account,Default Izdevumu konts
 DocType: Employee,Notice (days),Paziņojums (dienas)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,Noliktavas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print un stacionārās
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Mezgls
-DocType: Payment Reconciliation,Minimum Amount,Minimālā summa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Atjaunināt Pabeigts preces
 DocType: Workstation,per hour,stundā
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Pārskats par noliktavas (nepārtrauktās inventarizācijas), tiks izveidots saskaņā ar šo kontu."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Noliktava nevar izdzēst, jo pastāv šī noliktava akciju grāmata ierakstu."
 DocType: Company,Distribution,Sadale
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Samaksātā summa
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Samaksātā summa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projekta vadītājs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Nosūtīšana
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max atlaide atļauta posteni: {0}{1}%
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Atbalsta Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Uzņēmums trūkst noliktavās {0}
 DocType: POS Profile,Terms and Conditions,Noteikumi un nosacījumi
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Līdz šim būtu jāatrodas attiecīgajā taksācijas gadā. Pieņemot, ka līdz šim datumam = {0}"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},"Līdz šim būtu jāatrodas attiecīgajā taksācijas gadā. Pieņemot, ka līdz šim datumam = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Šeit jūs varat saglabāt augstumu, svaru, alerģijas, medicīnas problēmas utt"
 DocType: Leave Block List,Applies to Company,Attiecas uz Company
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Nevar atcelt, jo iesniegts Stock Entry {0} eksistē"
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Ievadiet pirkumu čekus
 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 +425,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/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup ienākošā servera atbalstu e-pasta id. (Piem support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Trūkums Daudz
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,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 +577,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
 DocType: Salary Slip,Salary Slip,Alga Slip
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Lai datums"" ir nepieciešama"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Izveidot iepakošanas lapas par paketes jāpiegādā. Izmanto, lai paziņot Iepakojumu skaits, iepakojuma saturu un tā svaru."
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Darbinieku ieraksti.
 DocType: HR Settings,Payroll Settings,Algas iestatījumi
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match nesaistītajos rēķiniem un maksājumiem.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Pasūtīt
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Pasūtīt
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root nevar būt vecāks izmaksu centru
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Izvēlēties Brand ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Piemērojamais
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,Sākuma datums
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Piešķirt atstāj uz laiku.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Klikšķiniet šeit, lai pārbaudītu"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konts {0}: Jūs nevarat piešķirt sevi kā mātes kontu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Konts {0}: Jūs nevarat piešķirt sevi kā mātes kontu
 DocType: Purchase Invoice Item,Price List Rate,Cenrādis Rate
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Parādiet ""noliktavā"", vai ""nav noliktavā"", pamatojoties uz pieejamā krājuma šajā noliktavā."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,"Paredzams, sākuma datums"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Noņemt objektu, ja maksa nav piemērojama šim postenim"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Piem. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Saņemt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Saņemt
 DocType: Maintenance Visit,Fully Completed,Pilnībā Pabeigts
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% pabeigti
 DocType: Employee,Educational Qualification,Izglītības Kvalifikācijas
 DocType: Workstation,Operating Costs,Ekspluatācijas Izmaksas
 DocType: Employee Leave Approver,Employee Leave Approver,Darbinieku Leave apstiprinātājs
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ir veiksmīgi pievienota mūsu Newsletter sarakstā.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: Pārkārtot ieraksts jau eksistē šī noliktava {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Nevar atzīt par zaudēto, jo citāts ir veikts."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pirkuma Master vadītājs
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Ražošanas Order {0} jāiesniedz
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Ražošanas Order {0} jāiesniedz
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +136,Main Reports,Galvenie Ziņojumi
 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
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Kaut kas nogāja greizi!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Brīdinājums: Atvaļinājuma pieteikums ietver sekojošus bloķētus datumus
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Pārdošanas rēķins {0} jau ir iesniegti
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Pārdošanas rēķins {0} jau ir iesniegti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Pabeigšana Datums
 DocType: Purchase Invoice Item,Amount (Company Currency),Summa (Company valūta)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizācijas struktūrvienība (departaments) meistars.
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,Sērijas Nr Pakalpojumu līgums derīguma
 DocType: Item,Unit of Measure Conversion,Mērvienība Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Darbinieku nevar mainīt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,"Var nav kredīta un debeta pašu kontu, tajā pašā laikā"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,"Var nav kredīta un debeta pašu kontu, tajā pašā laikā"
 DocType: Naming Series,Help HTML,Palīdzība HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Kopā weightage piešķirts vajadzētu būt 100%. Tas ir {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Pabalsts pārmērīga {0} šķērsoja postenī {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Pabalsts pārmērīga {0} šķērsoja postenī {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Nosaukums personas vai organizācijas, ka šī adrese pieder."
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Jūsu Piegādātāji
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nevar iestatīt kā Lost kā tiek veikts Sales Order.
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,Izdošanas datums
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: No {0} uz {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Set Piegādātājs posteni {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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ā.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Lūdzu, pārbaudiet multi valūtu iespēju ļaut konti citā valūtā"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,"Lūdzu, pārbaudiet multi valūtu iespēju ļaut konti citā valūtā"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Punkts: {0} neeksistē sistēmā
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Jums nav atļauts uzstādīt Frozen vērtību
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Jums nav atļauts uzstādīt Frozen vērtību
 DocType: Payment Reconciliation,Get Unreconciled Entries,Saņemt Unreconciled Ieraksti
+DocType: Payment Reconciliation,From Invoice Date,No rēķina datuma
 DocType: Cost Center,Budgets,Budžeti
-DocType: Employee,Emergency Contact Details,Avārijas kontaktinformāciju var
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Ko tas dod?
 DocType: Delivery Note,To Warehouse,Uz noliktavu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konts {0} ir ievadīts vairāk nekā vienu reizi taksācijas gadā {1}
 ,Average Commission Rate,Vidēji Komisija likme
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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/hr/doctype/attendance/attendance.py +34,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
 DocType: Purchase Taxes and Charges,Account Head,Konts Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,"Atjaunināt papildu izmaksas, lai aprēķinātu izkraut objektu izmaksas"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrības
 DocType: Stock Entry,Total Value Difference (Out - In),Kopējā vērtība Starpība (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Valūtas kurss ir obligāta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Row {0}: Valūtas kurss ir obligāta
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},"Lietotāja ID nav noteikts, Darbinieka {0}"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,No garantijas prasību
 DocType: Stock Entry,Default Source Warehouse,Default Source Noliktava
 DocType: Item,Customer Code,Klienta kods
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Dzimšanas dienu atgādinājums par {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dienas Kopš pēdējā pasūtījuma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Akciju aktīvi
@@ -3271,7 +3301,7 @@
 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
 DocType: Authorization Rule,Based On,Pamatojoties uz
 DocType: Sales Order Item,Ordered Qty,Sakārtots Daudz
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Postenis {0} ir invalīds
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Postenis {0} ir invalīds
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Līdz pat
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},"Laika posmā no un periodu, lai datumiem obligātajām atkārtotu {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekta aktivitāte / uzdevums.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Norakstīt summu (Company valūta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Izkrauti izmaksas kuponu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Lūdzu noteikt {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Atkārtot mēneša diena
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,Augšupielāde apmeklējums
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM un ražošana daudzums ir nepieciešami
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Novecošana Range 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Summa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Summa
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM aizstāj
 ,Sales Analytics,Pārdošanas Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Ražošanas iestatījumi
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Iestatīšana E-pasts
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Ievadiet noklusējuma valūtu Uzņēmuma Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Ikdienas atgādinājumi
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Nodokļu noteikums Konflikti ar {0}
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,Saražotā daudzums
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inženieris
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Meklēt Sub Kompleksi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Postenis Code vajadzīga Row Nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Postenis Code vajadzīga Row Nr {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Faktisks
 DocType: Authorization Rule,Customerwise Discount,Customerwise Atlaide
 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 +263,Installation Note {0} has already been submitted,Jau ir iesniegta uzstādīšana Note {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Jau ir iesniegta uzstādīšana Note {0}
 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
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,Piemērojams brīvdienu sarakstu
 DocType: Employee,Cheque,Čeks
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Atjaunots
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Ziņojums Type ir obligāts
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Ziņojums Type ir obligāts
 DocType: Item,Serial Number Series,Sērijas numurs Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Noliktava ir obligāta krājuma priekšmetu {0} rindā {1}
 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/public/js/setup_wizard.js +101,The First User: You,Pirmais Lietotājs: You
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Veiksmīgi jāsaskaņo
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Veiksmīgi jāsaskaņo
 DocType: Production Order,Planned End Date,Plānotais beigu datums
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,"Gadījumos, kad preces tiek uzglabāti."
 DocType: Tax Rule,Validity,Derīgums
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,Apmeklētība
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Norīkošanu datumu un norīkošanu laiks ir obligāta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Norīkošanu datumu un norīkošanu laiks ir obligāta
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Nodokļu veidni pārdošanas darījumus.
 ,Item Prices,Izstrādājumu cenas
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Vārdos būs redzams pēc tam, kad esat saglabāt pirkuma pasūtījuma."
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,Pārskatīšana Datums
 DocType: Purchase Invoice,Advance Payments,Avansa maksājumi
 DocType: Purchase Taxes and Charges,On Net Total,No kopējiem neto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,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
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nē atļauju izmantot maksājumu ierīce
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""paziņojuma e-pasta adrese"", kas nav norādītas atkārtojas% s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Noapaļot kontu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administratīvie izdevumi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Klientu Group
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Maiņa
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Maiņa
 DocType: Purchase Invoice,Contact Email,Kontaktpersonas e-pasta
 DocType: Appraisal Goal,Score Earned,Score Nopelnītās
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","piemēram, ""My Company LLC"""
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,Bruto svars UOM
 DocType: Email Digest,Receivables / Payables,Debitori / Parādi
 DocType: Delivery Note Item,Against Sales Invoice,Pret pārdošanas rēķinu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Kredīta konts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Kredīta konts
 DocType: Landed Cost Item,Landed Cost Item,Izkrauti izmaksu pozīcijas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Parādīt nulles vērtības
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Daudzums posteņa iegūta pēc ražošanas / pārpakošana no dotajiem izejvielu daudzumu
 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 +562,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 +572,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
 DocType: Item,Default Warehouse,Default Noliktava
 DocType: Task,Actual End Date (via Time Logs),Faktiskā beigu datums (via Time Baļķi)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budžets nevar iedalīt pret grupas kontā {0}
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Plānot laiku žurnālus ārpus Workstation darba laiks.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0}{1} jau ir iesniegts
 ,Items To Be Requested,"Preces, kas jāpieprasa"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Saņemt pēdējā pirkšanas likme
 DocType: Time Log,Billing Rate based on Activity Type (per hour),"Norēķinu likme, pamatojoties uz darbības veida (stundā)"
 DocType: Company,Company Info,Uzņēmuma informācija
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Uzņēmuma e-pasta ID nav atrasts, tāpēc pasts nav nosūtīts"
 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)
 DocType: Production Planning Tool,Filter based on item,Filtrs balstās uz posteni
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Debeta kontu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debeta kontu
 DocType: Fiscal Year,Year Start Date,Gadu sākuma datums
 DocType: Attendance,Employee Name,Darbinieku Name
 DocType: Sales Invoice,Rounded Total (Company Currency),Noapaļota Kopā (Company valūta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Nevar slēptu to grupai, jo ir izvēlēta Account Type."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Nevar slēptu to grupai, jo ir izvēlēta Account Type."
 DocType: Purchase Common,Purchase Common,Pirkuma kopējā
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0}{1} ir mainīta. Lūdzu atsvaidzināt.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Pietura lietotājiem veikt Leave Pieteikumi uz nākamajās dienās.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,No Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Darbinieku pabalsti
 DocType: Sales Invoice,Is POS,Ir POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Pieņemts daudzums
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neeksistē
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Rēķinus izvirzīti klientiem.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekts Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonenti pievienotās
 DocType: Maintenance Schedule,Schedule,Grafiks
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definēt budžets šim izmaksu centru. Lai uzstādītu budžeta pasākumus, skatiet &quot;Uzņēmuma saraksts&quot;"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,Lasīšana 3
 ,Hub,Rumba
 DocType: GL Entry,Voucher Type,Kuponu Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
 DocType: Expense Claim,Approved,Apstiprināts
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"Darbinieku atvieglots par {0} ir jānosaka kā ""Kreisais"""
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Grāmatvedības dienasgrāmatas ieraksti.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Pieejams Daudz at No noliktavas
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Lūdzu, izvēlieties Darbinieku Ierakstīt pirmās."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Account nesakrīt ar {1} / {2} jo {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Account nesakrīt ar {1} / {2} jo {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Lai izveidotu nodokļu kontā
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Ievadiet izdevumu kontu
 DocType: Account,Stock,Krājums
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,Līgums beigu datums
 DocType: Sales Order,Track this Sales Order against any Project,Sekot šim klientu pasūtījumu pret jebkuru projektu
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Pull pārdošanas pasūtījumiem (līdz piegādāt), pamatojoties uz iepriekš minētajiem kritērijiem"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,No piegādātāja aptauja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,No piegādātāja aptauja
 DocType: Deduction Type,Deduction Type,Atskaitīšana Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Daudz
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,Darījuma datums
 DocType: Production Plan Item,Planned Qty,Plānotais Daudz
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Kopā Nodokļu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Par Daudzums (Rūpniecības Daudzums) ir obligāts
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Par Daudzums (Rūpniecības Daudzums) ir obligāts
 DocType: Stock Entry,Default Target Warehouse,Default Mērķa Noliktava
 DocType: Purchase Invoice,Net Total (Company Currency),Neto Kopā (Company valūta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tips un partija ir piemērojama tikai pret debitoru / kreditoru kontu
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,Komisija Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Padarīt Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Block atvaļinājums iesniegumi departamentā.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Grozs ir tukšs
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Grozs ir tukšs
 DocType: Production Order,Actual Operating Cost,Faktiskā ekspluatācijas izmaksas
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Saknes nevar rediģēt.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Saknes nevar rediģēt.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Piešķirtā summa nevar lielāka par unadusted summu
 DocType: Manufacturing Settings,Allow Production on Holidays,Atļaut Production brīvdienās
 DocType: Sales Order,Customer's Purchase Order Date,Klienta Pasūtījuma datums
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Dizainers
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Noteikumi un nosacījumi Template
 DocType: Serial No,Delivery Details,Piegādes detaļas
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Izmaksas Center ir nepieciešama rindā {0} nodokļos tabula veidam {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Izmaksas Center ir nepieciešama rindā {0} nodokļos tabula veidam {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automātiski izveidot Materiālu pieprasījumu, ja daudzums samazinās zem šī līmeņa"
 ,Item-wise Purchase Register,Postenis gudrs iegāde Reģistrēties
 DocType: Batch,Expiry Date,Derīguma termiņš
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Lai uzstādītu pasūtīšanas līmeni, postenis jābūt iegāde postenis vai Manufacturing postenis"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Lai uzstādītu pasūtīšanas līmeni, postenis jābūt iegāde postenis vai Manufacturing postenis"
 ,Supplier Addresses and Contacts,Piegādātāju Adreses un kontakti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Lūdzu, izvēlieties Kategorija pirmais"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekts meistars.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(puse dienas)
 DocType: Supplier,Credit Days,Kredīta dienas
 DocType: Leave Type,Is Carry Forward,Vai Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Dabūtu preces no BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Materiālu rēķins
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tips un partija ir nepieciešama debitoru / kreditoru kontā {1}
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,Iemesls Atstājot
 DocType: Expense Claim Detail,Sanctioned Amount,Sodīts Summa
 DocType: GL Entry,Is Opening,Vai atvēršana
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rinda {0}: debeta ierakstu nevar saistīt ar {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konts {0} nepastāv
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Rinda {0}: debeta ierakstu nevar saistīt ar {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Konts {0} nepastāv
 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 5c61e36..9026e18 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Производи за широка потрошувачка
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Ве молиме изберете партија Тип прв
 DocType: Item,Customer Items,Теми на клиентите
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,На сметка {0}: Родител на сметка {1} не може да биде Леџер
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,На сметка {0}: Родител на сметка {1} не може да биде Леџер
 DocType: Item,Publish Item to hub.erpnext.com,"Објавуваат елемент, за да hub.erpnext.com"
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mail известувања
 DocType: Item,Default Unit of Measure,Стандардно единица мерка
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,Контакт со клиентите
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Од материјално Барање
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Од материјално Барање
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} дрвото
 DocType: Job Applicant,Job Applicant,Работа на апликантот
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нема повеќе резултати.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. За да се задржи клиентите мудро код ставка и да ги пребарува врз основа на нивниот код Користете ја оваа опција
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на плаќање сметка
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Прикажи Варијанти
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Кол
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Кол
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредити (Пасива)
 DocType: Employee Education,Year of Passing,Година на полагање
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Залиха
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Здравствена заштита
 DocType: Purchase Invoice,Monthly,Месечен
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Задоцнување на плаќањето (во денови)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Поените
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail адреса
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Фискална година {0} е потребен
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Одбрана
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Резултат (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ред {0}: {1} {2} не се поклопува со {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Ред {0}: {1} {2} не се поклопува со {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Ред # {0}:
 DocType: Delivery Note,Vehicle No,Возило Не
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Ве молиме изберете Ценовник
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Ве молиме изберете Ценовник
 DocType: Production Order Operation,Work In Progress,Работа во прогрес
 DocType: Employee,Holiday List,Одмор Листа
 DocType: Time Log,Time Log,Време Влез
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Истата компанија се внесе повеќе од еднаш
 DocType: Employee,Married,Брак
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не се дозволени за {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
 DocType: Payment Reconciliation,Reconcile,Помират
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Направете банка Влегување
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиски фондови
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Склад е задолжително ако тип на сметка е складиште
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Склад е задолжително ако тип на сметка е складиште
 DocType: SMS Center,All Sales Person,Сите продажбата на лице
 DocType: Lead,Person Name,Име лице
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Проверете дали се повторуваат цел, ја избирате да се запре периодични или стави соодветна Крај Датум"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Заинтересирани
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Бил на материјалот
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Отворање
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Од {0} до {1}
+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,Отворање Влегување
 DocType: Stock Entry,Additional Costs,Е вклучена во цената
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Сметка со постојните трансакцијата не може да се конвертира во групата.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Сметка со постојните трансакцијата не може да се конвертира во групата.
 DocType: Lead,Product Enquiry,Производ пребарување
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Ве молиме внесете компанија прв
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,На цел
+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 +9,Activity Log:,Влез активност:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Точка {0} не постои во системот или е истечен
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Точка {0} мора да биде Набавка Точка
 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 +444,Item {0} is not active or end of life has been reached,Точка {0} не е активна или е достигнат крајот на животот
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,Точка {0} не е активна или е достигнат крајот на животот
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Ќе се ажурира по Продај фактура е поднесена.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Прилагодувања за Модул со хумани ресурси
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Детали за операции извршени.
 DocType: Serial No,Maintenance Status,Одржување Статус
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Теми и цени
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Од датумот треба да биде во рамките на фискалната година. Претпоставувајќи од датумот = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Од датумот треба да биде во рамките на фискалната година. Претпоставувајќи од датумот = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Изберете на вработените за кои ќе се создавање на оценување.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Чини Центар {0} не му припаѓа на компанијата {1}
 DocType: Customer,Individual,Индивидуални
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Нето паричен тек од финансирањето
 DocType: Lead,Address & Contact,Адреса и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додади неискористени листови од претходните алокации
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Следна Повторувачки {0} ќе се креира {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Име за Контакт
 DocType: Production Plan Item,SO Pending Qty,ПА очекување Количина
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Создава плата се лизга за горенаведените критериуми.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Нема опис даден
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Барање за купување.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Само избраните Остави Approver може да го достави овој Оставете апликација
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Ослободување Датум мора да биде поголема од датумот на пристап
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Точка на вебсајт Спецификација
 DocType: Payment Tool,Reference No,Референтен број
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Остави блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Акции помирување Точка
 DocType: Stock Entry,Sales Invoice No,Продај фактура Не
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Добавувачот Тип
 DocType: Item,Publish in Hub,Објави во Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Точка {0} е откажана
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Точка {0} е откажана
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Материјал Барање
 DocType: Bank Reconciliation,Update Clearance Date,Ажурирање Чистење Датум
 DocType: Item,Purchase Details,Купување Детали за
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не се најде во &quot;суровини испорачува&quot; маса во нарачката {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не се најде во &quot;суровини испорачува&quot; маса во нарачката {1}
 DocType: Employee,Relation,Врска
 DocType: Shipping Rule,Worldwide Shipping,Светот превозот
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Потврди налози од клиенти.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Предлози
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Сет точка група-мудар буџети на оваа територија. Вие исто така може да вклучува и сезоната со поставување на дистрибуција.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Ве молиме внесете група родител сметка за магацин {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаќање против {0} {1} не може да биде поголем од преостанатиот износ за наплата {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,Генерирање Распоред
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Најнови
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Макс 5 знаци
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Првиот Leave Approver во листата ќе биде поставена како стандардна Остави Approver
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Научат
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Трошоци активност по вработен
 DocType: Accounts Settings,Settings for Accounts,Поставки за сметки
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Управување со продажбата на лице дрвото.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Мулти Валута
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип на фактура
 DocType: Sales Invoice Item,Delivery Note,Потврда за испорака
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Поставување Даноци
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Поставување Даноци
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Плаќање Влегување е изменета откако ќе го влечат. Ве молиме да се повлече повторно.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} влезе двапати во точка Данок
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} влезе двапати во точка Данок
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,"Резимето на оваа недела, а во очекување на активности"
 DocType: Workstation,Rent Cost,Изнајмување на трошоците
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Ве молиме изберете месец и година
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Достапен во бирото, испорака, Набавка фактура, производство цел, нарачка, купување прием, Продај фактура, Продај Побарувања, Акции влез, timesheet"
 DocType: Item Tax,Tax Rate,Даночна стапка
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Одберете ја изборната ставка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Одберете ја изборната ставка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Точка: {0} успеа според групата, не може да се помири со користење \ берза помирување, наместо користење берза Влегување"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серија Не мора да биде иста како {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Претворат во не-групата
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Купување Потврда мора да се поднесе
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медицинска
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина за губење
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,Еден
 DocType: Issue,Attachment,Прилог
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Буџетот не може да се постави на трошоците центар група
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,Одмор господар.
 DocType: Material Request Item,Required Date,Бараниот датум
 DocType: Delivery Note,Billing Address,Платежна адреса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Ве молиме внесете Точка законик.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Ве молиме внесете Точка законик.
 DocType: BOM,Costing,Чини
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако е обележано, износот на данокот што ќе се смета како веќе се вклучени во Print Оцени / Печатење Износ"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Вкупно Количина
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Итни Телефон
 ,Serial No Warranty Expiry,Сериски Нема гаранција Важи
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Зголемување не може да биде 0
 DocType: Production Planning Tool,Material Requirement,Материјал Потребно
 DocType: Company,Delete Company Transactions,Избриши компанијата Трансакции
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Точка {0} не е купување Точка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Точка {0} не е купување Точка
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} не е валиден e-mail адреса во &quot;Известување \ Email адреса&quot;
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Вкупно регистрации оваа година:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додај / Уреди даноци и такси
 DocType: Purchase Invoice,Supplier Invoice No,Добавувачот Фактура бр
 DocType: Territory,For reference,За референца
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не можат да избришат сериски Не {0}, како што се користи во акции трансакции"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Затворање (ЦР)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Затворање (ЦР)
 DocType: Serial No,Warranty Period (Days),Гарантниот период (денови)
 DocType: Installation Note Item,Installation Note Item,Инсталација Забелешка Точка
 ,Pending Qty,Во очекување на Количина
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Месечен Дистрибуција ** ви помага да се дистрибуира вашиот буџет низ месеци ако имате сезоната во вашиот бизнис. Да се дистрибуира буџет со користење на овој дистрибуција, користете ја оваа ** Месечен Дистрибуција ** ** во центар на трошок на **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Не се пронајдени во табелата Фактура рекорди
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Не се пронајдени во табелата Фактура рекорди
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Ве молиме изберете компанија и Партијата Тип прв
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Финансиски / пресметковната година.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","За жал, сериски броеви не можат да се спојат"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,Проектна задача
 ,Lead Id,Водач Id
 DocType: C-Form Invoice Detail,Grand Total,Големиот Вкупно
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Почеток Датумот не треба да биде поголема од фискалната година Крај Датум
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Почеток Датумот не треба да биде поголема од фискалната година Крај Датум
 DocType: Warranty Claim,Resolution,Резолуција
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Испорачани: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Испорачани: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Треба да се плати сметката
 DocType: Sales Order,Billing and Delivery Status,Платежна и испорака Статус
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Повтори клиенти
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,Котација на
 DocType: Lead,Middle Income,Среден приход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Отворање (ЦР)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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. Ќе треба да се создаде нова точка да се користи различен Default UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +711,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. Ќе треба да се создаде нова точка да се користи различен Default UOM.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Распределени износ не може да биде негативен
 DocType: Purchase Order Item,Billed Amt,Таксуваната Амт
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логична Магацински против кои се направени записи парк.
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Производство цел е задолжително
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Пишување предлози
 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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Негативна состојба Грешка ({6}) за ставката {0} во складиште {1} на {2} {3} во {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Негативна состојба Грешка ({6}) за ставката {0} во складиште {1} на {2} {3} во {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година компанијата
 DocType: Packing Slip Item,DN Detail,DN Детална
 DocType: Time Log,Billed,Фактурирани
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,Чини стандардниот курс
 DocType: Maintenance Schedule,Maintenance Schedule,Распоред за одржување
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Потоа цени Правила се филтрирани врз основа на клиент, група на потрошувачи, територија, Добавувачот, Набавувачот Тип на кампањата, продажба партнер итн"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Нето промени во Инвентар
 DocType: Employee,Passport Number,Број на пасош
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Менаџер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Од Набавка Потврда
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Истата таа ствар е внесен повеќе пати.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Од Набавка Потврда
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Истата таа ствар е внесен повеќе пати.
 DocType: SMS Settings,Receiver Parameter,Приемник Параметар
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Врз основа на&quot; и &quot;група Со&quot; не може да биде ист
 DocType: Sales Person,Sales Person Targets,Продажбата на лице Цели
 DocType: Production Order Operation,In minutes,Во минути
 DocType: Issue,Resolution Date,Резолуцијата Датум
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
 DocType: Selling Settings,Customer Naming By,Именувањето на клиентите со
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Претворат во група
 DocType: Activity Cost,Activity Type,Тип на активност
@@ -534,7 +538,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} не се најде во Фактура Детали маса
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Одржување Посетете {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 DocType: Material Request,Material Transfer,Материјал трансфер
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Да ги пратите ставка во продажба и купување на документи врз основа на нивните сериски бр. Ова е, исто така, може да се користи за следење гаранција детали за производот."
 DocType: Purchase Receipt Item Supplied,Current Stock,Тековни берза
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Одбиени Магацински е задолжително против regected точка
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Вкупно платежна оваа година
 DocType: Account,Expenses Included In Valuation,Трошоци Вклучени Во Вреднување
 DocType: Employee,Provide email id registered in company,Обезбеди мејл ID регистрирани во компанијата
 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 +533,Item has variants.,Ставка има варијанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Тип на дрвото
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0} не е парк Точка
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} не е парк Точка
 DocType: Mode of Payment Account,Default Account,Стандардно профил
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Водач мора да се постави ако можност е направена од олово
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Ве молиме изберете неделно слободен ден
 DocType: Production Order Operation,Planned End Time,Планирани Крај
 ,Sales Person Target Variance Item Group-Wise,Продажбата на лице Целна група Варијанса точка-wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Сметка со постоечките трансакцијата не може да се конвертира Леџер
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Сметка со постоечките трансакцијата не може да се конвертира Леџер
 DocType: Delivery Note,Customer's Purchase Order No,Клиентите нарачка Не
 DocType: Employee,Cell Number,Мобилен Број
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Авто Материјал Барања Генерирано
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Си ја заборавивте
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Вие не може да влезе во тековната ваучер во &quot;Против весник Влегување&quot; колона
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Вие не може да влезе во тековната ваучер во &quot;Против весник Влегување&quot; колона
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергија
 DocType: Opportunity,Opportunity From,Можност од
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Месечен извештај плата.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Од {0} од типот на {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор на конверзија е задолжително
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Сметководствени записи може да се направи против лист јазли. Записи од групите не се дозволени.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да го деактивирате или да го откажете Бум како што е поврзано со други BOMs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да го деактивирате или да го откажете Бум како што е поврзано со други BOMs
 DocType: Opportunity,Maintenance,Одржување
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Купување Потврда број потребен за Точка {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Купување Потврда број потребен за Точка {0}
 DocType: Item Attribute Value,Item Attribute Value,Точка вредноста на атрибутот
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Продажбата на кампањи.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ценовник не е избрано
 DocType: Employee,Family Background,Семејно потекло
 DocType: Process Payroll,Send Email,Испрати E-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Нема дозвола
 DocType: Company,Default Bank Account,Стандардно банкарска сметка
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","За филтрирање врз основа на партија, изберете партија Тип прв"
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Бр
 DocType: Item,Items with higher weightage will be shown higher,Предмети со поголема weightage ќе бидат прикажани повисоки
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банка помирување Детална
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Мои Фактури
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Мои Фактури
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Не се пронајдени вработен
 DocType: Purchase Order,Stopped,Запрен
 DocType: Item,If subcontracted to a vendor,Ако иницираат да продавач
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Испрати Сега
 ,Support Analytics,Поддршка анализи
 DocType: Item,Website Warehouse,Веб-страница Магацински
+DocType: Payment Reconciliation,Minimum Invoice Amount,Минималниот износ на фактура
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","На ден од месецот на кој авто фактура ќе биде генериранa на пример 05, 28 итн"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Поени мора да е помала или еднаква на 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Форма записи
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Да им овозможи на &quot;Точка на продажба&quot; карактеристики
 DocType: Bin,Moving Average Rate,Преселба Просечна стапка
 DocType: Production Planning Tool,Select Items,Одбирајте ги изборните ставки
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} од Бил {1} датум {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} од Бил {1} датум {2}
 DocType: Maintenance Visit,Completion Status,Проектот Статус
 DocType: Sales Invoice Item,Target Warehouse,Целна Магацински
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволете врз доставувањето или приемот до овој процент
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматски компонира порака на поднесување на трансакции.
 DocType: Production Order,Item To Manufacture,Ставка за производство
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус е {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Нарачка на плаќање
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Нарачка на плаќање
 DocType: Sales Order Item,Projected Qty,Проектирани Количина
 DocType: Sales Invoice,Payment Due Date,Плаќање Поради Датум
 DocType: Newsletter,Newsletter Manager,Билтен менаџер
@@ -704,7 +709,7 @@
 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 +304,Point-of-Sale,Point-of-Продажба
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс на сметка веќе во кредит, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; дебитни &quot;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс на сметка веќе во кредит, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; дебитни &quot;"
 DocType: Account,Balance must be,Рамнотежа мора да биде
 DocType: Hub Settings,Publish Pricing,Објавување на цени
 DocType: Notification Control,Expense Claim Rejected Message,Сметка Тврдат Отфрлени порака
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Валута на девизниот курс господар.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,Бум {0} мора да биде активен
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,Бум {0} мора да биде активен
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Изберете го типот на документот прв
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Откажи материјал Посети {0} пред да го раскине овој Одржување Посета
 DocType: Salary Slip,Leave Encashment Amount,Остави инкасо Износ
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,Стандардно Обврски
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Вработен {0} не е активна или не постои
 DocType: Features Setup,Item Barcode,Точка Баркод
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Точка Варијанти {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Точка Варијанти {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Купување на фактура напредување
 DocType: Address,Shop,Продавница
 DocType: Hub Settings,Sync Now,Sync Сега
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Ред {0}: Кредитни влез не можат да бидат поврзани со {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Ред {0}: Кредитни влез не можат да бидат поврзани со {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Стандардно банка / готовинска сметка ќе се ажурира автоматски во POS Фактура кога е избрана оваа опција.
 DocType: Employee,Permanent Address Is,Постојана адреса е
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операцијата заврши за колку готовите производи?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Бренд
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Додаток за надминување {0} преминал за Точка {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Додаток за надминување {0} преминал за Точка {1}.
 DocType: Employee,Exit Interview Details,Излез Интервју Детали за
 DocType: Item,Is Purchase Item,Е Набавка Точка
 DocType: Journal Entry Account,Purchase Invoice,Купување на фактура
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,Вкупно со зборови
 DocType: Material Request Item,Lead Time Date,Водач Време Датум
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,е задолжително. Можеби рекорд Девизен не е создадена за
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Ве молиме наведете Сериски Не за Точка {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Ве молиме наведете Сериски Не за Точка {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","За предмети &quot;производ Бовча&quot;, складиште, сериски број и Batch нема да се смета од &quot;Пакување Листа на &#39;табелата. Ако Магацински и Batch Не се исти за сите предмети за пакување ставка било &quot;производ Бовча&quot;, тие вредности може да се влезе во главната маса точка, вредностите ќе биде копирана во &quot;Пакување Листа на &#39;табелата."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Пратки на клиентите.
 DocType: Purchase Invoice Item,Purchase Order Item,Нарачка Точка
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Варијанса
 ,Company Name,Име на компанијата
 DocType: SMS Center,Total Message(s),Вкупно пораки (и)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Одберете ја изборната ставка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 главата на банката во која е депониран чек.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Им овозможи на корисникот да ги уредувате Ценовник стапка во трансакции
 DocType: Pricing Rule,Max Qty,Макс Количина
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,Хемиски
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Сите предмети се веќе префрлени за оваа цел производство.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Сите предмети се веќе префрлени за оваа цел производство.
 DocType: Process Payroll,Select Payroll Year and Month,Изберете Даноци година и месец
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Оди до соодветната група (обично Примена на фондови&gt; Тековни средства&gt; банкарски сметки и да се создаде нова сметка (со кликање на Додади детето) од типот &quot;банка&quot;
 DocType: Workstation,Electricity Cost,Цената на електричната енергија
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),Сите Олово (Отвори)
 DocType: Purchase Invoice,Get Advances Paid,Се Напредокот Платени
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Закачите вашата слика
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Направете
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Направете
 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 +3,My Cart,Моја кошничка
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Моја кошничка
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Отворање Количина
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,Пари / банка сметка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Отстранет предмети без промена во количината или вредноста.
 DocType: Delivery Note,Delivery To,Испорака на
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Атрибут маса е задолжително
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,Атрибут маса е задолжително
 DocType: Production Planning Tool,Get Sales Orders,Земете Продај Нарачка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може да биде негативен
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Попуст
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Попуст
 DocType: Features Setup,Purchase Discounts,Купување Попусти
 DocType: Workstation,Wages,Платите
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Ќе се ажурира само ако Време Вклучи се &#39;Платимите &quot;
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,Превозот држава
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора да се додаде со користење на &quot;се предмети од Набавка Разписки&quot; копчето
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Трошоци за продажба
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Стандардна Купување
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Стандардна Купување
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,Стандардно Продажба Цена центар
 DocType: Sales Partner,Implementation Partner,Партнер имплементација
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа за испорака Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производство на налози {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Ве молиме да се постави на &quot;Примени Дополнителни попуст на &#39;
 ,Ordered Items To Be Billed,Нареди ставки за да бидат фактурирани
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Од опсег мора да биде помала од на опсег
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Изберете Време на дневници и поднесете да се создаде нов Продај фактура.
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Овој пат се Влез Batch се фактурирани.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Да се создадат услови
 DocType: Salary Slip,Leave Without Pay,Неплатено отсуство
-DocType: Supplier,Communications,Комуникации
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Капацитет Грешка планирање
 ,Trial Balance for Party,Судскиот биланс за партија
 DocType: Lead,Consultant,Консултант
 DocType: Salary Slip,Earnings,Приходи
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Заврши Точка {0} Мора да се внесе за влез тип Производство
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Отворање Сметководство Биланс
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Заврши Точка {0} Мора да се внесе за влез тип Производство
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Отворање Сметководство Биланс
 DocType: Sales Invoice Advance,Sales Invoice Advance,Продај фактура напредување
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ништо да побара
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Старт на проектот Датум &#39;не може да биде поголема од&#39; Крај на екстремна датум&quot;
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,Тековната фискална година
 DocType: Global Defaults,Disable Rounded Total,Оневозможи заоблени Вкупно
 DocType: Lead,Call,Повик
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&quot;Записи&quot; не може да биде празна
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&quot;Записи&quot; не може да биде празна
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дупликат ред {0} со истиот {1}
 ,Trial Balance,Судскиот биланс
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Поставување на вработените
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,ID на корисникот
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Види Леџер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Први
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
 DocType: Production Order,Manufacture against Sales Order,Производство против Продај Побарувања
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Остатокот од светот
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,Бруто плата
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Кои не се овластени да ги уредувате замрзната сметка {0}
 DocType: Journal Entry,Get Outstanding Invoices,Земете ненаплатени фактури
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продај Побарувања {0} не е валиден
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,Место на издавање
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Договор
 DocType: Email Digest,Add Quote,Додади цитат
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM фактор coversion потребни за UOM: {0} во точка: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM фактор coversion потребни за UOM: {0} во точка: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Индиректни трошоци
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ред {0}: Количина е задолжително
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земјоделството
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,Вашите производи или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плаќање
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ова е корен елемент група и не може да се уредува.
 DocType: Journal Entry Account,Purchase Order,Нарачката
 DocType: Warehouse,Warehouse Contact Info,Магацински Контакт Инфо
@@ -1018,8 +1024,8 @@
 DocType: Email Digest,Annual Income,Годишен приход
 DocType: Serial No,Serial No Details,Сериски № Детали за
 DocType: Purchase Invoice Item,Item Tax Rate,Точка даночна стапка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Точка {0} мора да биде под-договор Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитал опрема
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цените правило е првата избрана врз основа на &quot;Apply On&quot; поле, која може да биде точка, точка група или бренд."
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,Цел
 DocType: Sales Invoice Item,Edit Description,Измени Опис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Се очекува испорака датум е помал од планираниот почеток датум.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,За Добавувачот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,За Добавувачот
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Поставување тип на сметка помага во изборот на оваа сметка во трансакции.
 DocType: Purchase Invoice,Grand Total (Company Currency),Големиот Вкупно (Фирма валута)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Вкупниот појдовен
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,Весник Влегување
 DocType: Workstation,Workstation Name,Работна станица Име
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail билтени:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},Бум {0} не му припаѓа на точката {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,Ова е бројот на последниот создадена трансакција со овој префикс
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Билтенот на контакти, води."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Операции не може да се остави празно.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Операции не може да се остави празно.
 ,Delivered Items To Be Billed,"Дадени елементи, за да бидат фактурирани"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не може да се промени за Сериски број
 DocType: Authorization Rule,Average Discount,Просечната попуст
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Од {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Операција Опис
 DocType: Item,Will also apply to variants,Ќе важат и за варијанти
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Не може да се промени фискалната година Почеток Датум и фискалната година Крај Датум еднаш на фискалната година е спасен.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Не може да се промени фискалната година Почеток Датум и фискалната година Крај Датум еднаш на фискалната година е спасен.
 DocType: Quotation,Shopping Cart,Кошничка
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Ср Дневен заминување
 DocType: Pricing Rule,Campaign,Кампања
@@ -1100,7 +1106,8 @@
 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 +211,Stock Entries already created for Production Order ,Акции записи веќе создадена за цел производство
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Акции записи веќе создадена за цел производство
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Нето промени во основни средства
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставете го празно ако се земе предвид за сите ознаки
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,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 +182,Max: {0},Макс: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Сметковниот план
 DocType: Material Request,Terms and Conditions Content,Услови и правила Содржина
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,не може да биде поголема од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Точка {0} не е парк Точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Точка {0} не е парк Точка
 DocType: Maintenance Visit,Unscheduled,Непланирана
 DocType: Employee,Owned,Сопственост
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи неплатено отсуство
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Под собранија
 DocType: Shipping Rule Condition,To Value,На вредноста
 DocType: Supplier,Stock Manager,Акции менаџер
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Извор склад е задолжително за спорот {0}
+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 +581,Packing Slip,Пакување фиш
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Канцеларијата изнајмување
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Поставките за поставка на SMS портал
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Постои адреса додаде уште.
 DocType: Workstation Working Hour,Workstation Working Hour,Работна станица работен час
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Аналитичарот
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: распределени износ {1} мора да е помала или еднаква на JV износ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: распределени износ {1} мора да е помала или еднаква на JV износ {2}
 DocType: Item,Inventory,Инвентар
 DocType: Features Setup,"To enable ""Point of Sale"" view",Да им овозможи на &quot;Точка на продажба&quot; поглед
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плаќање не може да се направи за празни кошничка
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Плаќање не може да се направи за празни кошничка
 DocType: Item,Sales Details,Детали за продажба
 DocType: Opportunity,With Items,Со предмети
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Во Количина
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,Родител цена центар
 DocType: Sales Invoice,Source,Извор
 DocType: Leave Type,Is Leave Without Pay,Е неплатено отсуство
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Не се пронајдени во табелата за платен записи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Не се пронајдени во табелата за платен записи
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Финансиска година Почеток Датум
 DocType: Employee External Work History,Total Experience,Вкупно Искуство
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Пакување фиш (и) откажани
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Пакување фиш (и) откажани
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Парични текови од инвестициони
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товар и товар пријави
 DocType: Material Request Item,Sales Order No,Продај Побарувања Не
 DocType: Item Group,Item Group Name,Точка име на група
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Пренос на материјали за изработка
 DocType: Pricing Rule,For Price List,За Ценовник
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Извршниот Барај
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Купување стапка за ставка: {0} не е пронајден, кои се потребни да се резервира влез сметководството (сметка). Ве молиме спомнете ставка цена од купување на ценовникот."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Купување стапка за ставка: {0} не е пронајден, кои се потребни да се резервира влез сметководството (сметка). Ве молиме спомнете ставка цена од купување на ценовникот."
 DocType: Maintenance Schedule,Schedules,Распоред
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,Бум Детална Не
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Дополнителен попуст Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Грешка: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Грешка: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Ве молиме да се создаде нова сметка од сметковниот план.
 DocType: Maintenance Visit,Maintenance Visit,Одржување Посета
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Клиентите&gt; група на потрошувачи&gt; Територија
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,Продажбата партнер Целна
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Сметководство за влез на {0} може да се направи само во валута: {1}
 DocType: Pricing Rule,Pricing Rule,Цените Правило
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материјал Барање за нарачка
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Материјал Барање за нарачка
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ред # {0}: Назад Точка {1} не постои во {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банкарски сметки
 ,Bank Reconciliation Statement,Банка помирување изјава
@@ -1225,11 +1233,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Отворање берза Биланс
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} мора да се појави само еднаш
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Не е дозволено да tranfer повеќе {0} од {1} против нарачка {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},Остава распределени успешно за {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нема податоци за пакет
 DocType: Shipping Rule Condition,From Value,Од вредност
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Производство Кол е задолжително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Производство Кол е задолжително
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Износи не се гледа во банка
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Барања за сметка на компанијата.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,Материјал Барања за кои не се создадени Добавувачот Цитати
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ден (а) на која аплицирате за дозвола се одмори. Вие не треба да аплицираат за одмор.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Да ги пратите предмети со помош на баркод. Вие ќе бидете во можност да влезат предмети во Испратница и Продај фактура со скенирање на баркод на ставка.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Означи како Дадени
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Означи како Дадени
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направете цитат
 DocType: Dependent Task,Dependent Task,Зависни Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,Стоп роденден потсетници
 DocType: SMS Center,Receiver List,Листа на примачот
 DocType: Payment Tool Detail,Payment Amount,Исплата Износ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Конзумира Износ
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Види
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Види
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Нето промени во Пари
 DocType: Salary Structure Deduction,Salary Structure Deduction,Структура плата Одбивање
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {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 +185,Quantity must not be more than {0},Кол не смее да биде повеќе од {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Возраст (во денови)
 DocType: Quotation Item,Quotation Item,Цитат Точка
 DocType: Account,Account Name,Име на сметка
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Од датум не може да биде поголема од: Да најдам
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Од датум не може да биде поголема од: Да најдам
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} количина {1} не може да биде дел
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Добавувачот Тип господар.
 DocType: Purchase Order Item,Supplier Part Number,Добавувачот Дел број
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Стапка на конверзија не може да биде 0 или 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Стапка на конверзија не може да биде 0 или 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{1} {0} е откажана или запрена
 DocType: Accounts Settings,Credit Controller,Кредитна контролор
 DocType: Delivery Note,Vehicle Dispatch Date,Возило диспечерски Датум
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Купување Потврда {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Купување Потврда {0} не е поднесен
 DocType: Company,Default Payable Account,Стандардно се плаќаат профил
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Подесувања за онлајн шопинг количка како и со правилата за испорака, ценовник, итн"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Опишан
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Мои прашања
 DocType: BOM Item,BOM Item,Бум Точка
 DocType: Appraisal,For Employee,За вработените
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Ред {0}: Адванс против Добавувачот мора да се задолжи
 DocType: Company,Default Values,Стандардни вредности
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Ред {0}: износот за исплата не може да биде негативен
 DocType: Expense Claim,Total Amount Reimbursed,Вкупниот износ Надоместени
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Против Добавувачот Фактура {0} датум {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Против Добавувачот Фактура {0} датум {1}
 DocType: Customer,Default Price List,Стандардно Ценовник
 DocType: Payment Reconciliation,Payments,Плаќања
 DocType: Budget Detail,Budget Allocated,Буџетот
 DocType: Journal Entry,Entry Type,Тип на влез
 ,Customer Credit Balance,Клиент кредитна биланс
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Нето промени во сметки се плаќаат
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Ве молиме да се провери вашата e-mail проект
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Клиент потребни за &quot;Customerwise попуст&quot;
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Ажурирање на датуми банка плаќање со списанија.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Овозможи Кошничка
 DocType: Employee,Permanent Address,Постојана адреса
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Точка {0} мора да биде послужната ствар.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Однапред платени против {0} {1} не може да биде поголема \ отколку Вкупен збир {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Ве молиме изберете код ставка
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Намалување Одбивање за неплатено отсуство (LWP)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Една единица на некој објект.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Време Вклучи Серија {0} мора да биде предаден &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Време Вклучи Серија {0} мора да биде предаден &quot;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Направете влез сметководството за секој берза движење
 DocType: Leave Allocation,Total Leaves Allocated,Вкупно Лисја Распределени
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Магацински бара во ред Нема {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Магацински бара во ред Нема {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Ве молиме внесете валидна Финансиска година на отпочнување и завршување
 DocType: Employee,Date Of Retirement,Датум на заминување во пензија
 DocType: Upload Attendance,Get Template,Земете Шаблон
 DocType: Address,Postal,Поштенските
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"А група на клиентите постои со истото име, ве молиме промена на името на клиентите или преименување на група на купувачи"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Ве молиме изберете {0} прво.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},текст {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Ве молиме изберете {0} прво.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},текст {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Нов контакт
 DocType: Territory,Parent Territory,Родител Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
 DocType: Stock Entry,Material Receipt,Материјал Потврда
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Партијата Вид и Партијата е потребно за побарувања / Платив сметка {0}
 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 +210,Quantity required for Item {0} in row {1},Количината потребна за Точка {0} во ред {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},Количината потребна за Точка {0} во ред {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Магацински {0} не може да биде избришан како што постои количина за ставката {1}
 DocType: Quotation,Order Type,Цел Тип
 DocType: Purchase Invoice,Notification Email Address,Известување за е-мејл адреса
@@ -1361,15 +1373,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Премногу колона. Извоз на извештајот и печатење со помош на апликацијата табела.
 DocType: Sales 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 +152,Main,Главните
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Главните
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Намести префикс за нумерирање серија на вашиот трансакции
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Престана да не може да се откаже. Отпушвам да ја откажете.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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: Item,Variants,Варијанти
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Направи нарачка
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Направи нарачка
 DocType: SMS Center,Send To,Испрати до
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Нема доволно одмор биланс за Оставете Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,"Лимит,"
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Магацин и упатување
 DocType: Supplier,Statutory info and other general information about your Supplier,Законски информации и други општи информации за вашиот снабдувач
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адреси
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Против весник Влегување {0} не се имате било какви неспоредлив {1} влез
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Против весник Влегување {0} не се имате било какви неспоредлив {1} влез
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},СТРОГО серија № влезе за точка {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за испорака Правило
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Точка не е дозволено да има цел производство.
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Износ на кредитот во профил Валута
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Време на дневници за производство.
 DocType: Item,Apply Warehouse-wise Reorder Level,Применуваат Магацински-мудар Пренареждане Ниво
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,Бум {0} мора да се поднесе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,Бум {0} мора да се поднесе
 DocType: Authorization Control,Authorization Control,Овластување за контрола
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Отфрлени Магацински е задолжително против отфрли Точка {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Време Пријавете се за задачи.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Плаќање
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Плаќање
 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},Материјал Барање за максимум {0} може да се направи за ставката {1} против Продај Побарувања {2}
 DocType: Employee,Salutation,Титула
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Соработник
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Точка {0} не е серијали Точка
 DocType: SMS Center,Create Receiver List,Креирај Листа ресивер
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Истечен
 DocType: Packing Slip,To Package No.,Пакет бр
 DocType: Warranty Claim,Issue Date,Датум на издавање
 DocType: Activity Cost,Activity Cost,Цена активност
@@ -1449,7 +1461,7 @@
 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 +65,Territory / Customer,Подрачје / клиентите
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,на пример 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,Е продажба Точка
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Точка Група на дрвото
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} создаден
 DocType: Delivery Note Item,Against Sales Order,Против Продај Побарувања
 ,Serial No Status,Сериски № Статус
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Точка маса не може да биде празна
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Точка маса не може да биде празна
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Ред {0}: За да го поставите {1} поените, разликата помеѓу од и до денес \ мора да биде поголем или еднаков на {2}"
 DocType: Pricing Rule,Selling,Продажба
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Давачки и даноци
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Ве молиме внесете референтен датум
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,Опрема што се испорачува Количина
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,Инсталација време
 DocType: Sales Invoice,Accounting Details,Детали за сметководство
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Бришење на сите трансакции за оваа компанија
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Ред # {0}: Операција {1} не е завршена за {2} Количина на готови производи во производството со цел # {3}. Ве молиме да се ажурира статусот работењето преку Време на дневници
+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,Ред # {0}: Операција {1} не е завршена за {2} Количина на готови производи во производството со цел # {3}. Ве молиме да се ажурира статусот работењето преку Време на дневници
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолуцијата Детали за
 DocType: Quality Inspection Reading,Acceptance Criteria,Прифаќање критериуми
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,Јасно Табела
 DocType: Features Setup,Brands,Брендови
 DocType: C-Form Invoice Detail,Invoice No,Фактура бр
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Од нарачка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Од нарачка
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,Чини стапка
 ,Customer Addresses And Contacts,Адресите на клиентите и контакти
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,Распоред за одржување
 ,Quotation Trends,Трендови цитат
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Точка Група кои не се споменати во точка мајстор за ставката {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
 DocType: Shipping Rule Condition,Shipping Amount,Испорака Износ
 ,Pending Amount,Во очекување Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дрвото на finanial сметки.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Оставете го празно ако се земе предвид за сите видови на вработените
 DocType: Landed Cost Voucher,Distribute Charges Based On,Дистрибуирање пријави Врз основа на
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"На сметка {0} мора да биде од типот &quot;основни средства&quot;, како точка {1} е предност Точка"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"На сметка {0} мора да биде од типот &quot;основни средства&quot;, како точка {1} е предност Точка"
 DocType: HR Settings,HR Settings,Поставки за човечки ресурси
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Сметка тврдат дека е во очекување на одобрување. Само на сметка Approver може да го ажурира статусот.
 DocType: Purchase Invoice,Additional Discount Amount,Дополнителен попуст Износ
 DocType: Leave Block List Allow,Leave Block List Allow,Остави Забрани Листа Дозволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr не може да биде празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr не може да биде празно или простор
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Вкупно Крај
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Единица
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} сега е стандардно фискална година. Ве молиме да обновите вашиот прелистувач за промените да имаат ефект.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Сметка побарувања
 DocType: Issue,Support,Поддршка
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Види кошницата
 ,BOM Search,Бум Барај
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Затворање (отворање + одделение)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Ве молиме наведете валута во компанијата
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Фактор UOM конверзија е потребно во ред {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Датум дозвола не може да биде пред датумот проверка во ред {0}
 DocType: Salary Slip,Deduction,Одбивање
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Ставка Цена додаде за {0} во Ценовник {1}
 DocType: Address Template,Address Template,Адреса Шаблон
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Ве молиме внесете Id на вработените на ова продажбата на лице
 DocType: Territory,Classification of Customers by region,Класификација на клиенти од регионот
 DocType: Project,% Tasks Completed,% Задачи завршени
 DocType: Project,Gross Margin,Бруто маржа
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Ве молиме внесете Производство стварта прв
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,корисник со посебни потреби
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,корисник со посебни потреби
 DocType: Opportunity,Quotation,Цитат
 DocType: Salary Slip,Total Deduction,Вкупно Одбивање
 DocType: Quotation,Maintenance User,Одржување пристап
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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,Одземе
@@ -1588,12 +1602,12 @@
 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,Approver
 ,SO Qty,ПА Количина
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Записи акции постојат против магацин {0}, па затоа не можете да се ре-додели или менување Магацински"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Записи акции постојат против магацин {0}, па затоа не можете да се ре-додели или менување Магацински"
 DocType: Appraisal,Calculate Total Score,Пресмета вкупниот резултат
 DocType: Supplier Quotation,Manufacturing Manager,Производство менаџер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Сериски № {0} е под гаранција до {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Сплит за испорака во пакети.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Пратки
+apps/erpnext/erpnext/hooks.py +69,Shipments,Пратки
 DocType: Purchase Order Item,To be delivered to customer,Да бидат доставени до клиентите
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Вклучи Статус мора да се поднесе.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Сериски Не {0} не припаѓа на ниту еден Магацински
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Изберете компанијата ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставете го празно ако се земе предвид за сите одделенија
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Видови на вработување (постојан, договор, стаж итн)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
 DocType: Currency Exchange,From Currency,Од валутен
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ве молиме изберете распределени износот, видот Фактура и број на фактурата во барем еден ред"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Продај Побарувања потребни за Точка {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ве молиме изберете распределени износот, видот Фактура и број на фактурата во барем еден ред"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Продај Побарувања потребни за Точка {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Износи не се гледа на системот
 DocType: Purchase Invoice Item,Rate (Company Currency),Стапка (Фирма валута)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,"Други, пак,"
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,Во процесот
 DocType: Authorization Rule,Itemwise Discount,Itemwise попуст
 DocType: Purchase Order Item,Reference Document Type,Референтен документ Тип
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} против Продај Побарувања {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} против Продај Побарувања {1}
 DocType: Account,Fixed Asset,Основни средства
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Серијали Инвентар
 DocType: Activity Type,Default Billing Rate,Стандардно регистрации курс
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продај Побарувања на плаќање
 DocType: Expense Claim Detail,Expense Claim Detail,Барање Детална сметка
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Време на дневници на креирање:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Ве молиме изберете ја точната сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Ве молиме изберете ја точната сметка
 DocType: Item,Weight UOM,Тежина UOM
 DocType: Employee,Blood Group,Крвна група
 DocType: Purchase Invoice Item,Page Break,Page Break
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,На време
 DocType: Authorization Rule,Approving Role (above authorized value),Одобрување Улогата (над овластени вредност)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","За да додадете дете јазли, истражуваат дрво и кликнете на јазол под кои сакате да додадете повеќе лимфни јазли."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на сметка мора да биде плаќаат сметка
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},Бум на рекурзијата: {0} не може да биде родител или дете на {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Кредит на сметка мора да биде плаќаат сметка
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},Бум на рекурзијата: {0} не може да биде родител или дете на {2}
 DocType: Production Order Operation,Completed Qty,Завршено Количина
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само задолжува сметки може да се поврзат против друга кредитна влез"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само задолжува сметки може да се поврзат против друга кредитна влез"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ценовник {0} е исклучен
 DocType: Manufacturing Settings,Allow Overtime,Дозволете Прекувремена работа
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} сериски броеви потребно за Точка {1}. Сте ги доставиле {2}.
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,Клиент Точка Код
 DocType: Opportunity,Lost Reason,Си ја заборавивте Причина
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Креирај Плаќање записи против налози или фактури.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Големина на примерокот
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Сите предмети веќе се фактурира
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,Понатаму центри цена може да се направи под Групи но записи може да се направи врз несрпското групи
 DocType: Project,External,Надворешни
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,Преименувај алатката
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Ажурирање на трошоците
 DocType: Item Reorder,Item Reorder,Пренареждане точка
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Пренос на материјал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Пренос на материјал
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведете операции, оперативните трошоци и даде единствена работа нема да вашето работење."
 DocType: Purchase Invoice,Price List Currency,Ценовник Валута
 DocType: Naming Series,User must always select,Корисникот мора секогаш изберете
 DocType: Stock Settings,Allow Negative Stock,Дозволете негативна состојба
 DocType: Installation Note,Installation Note,Инсталација Забелешка
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Додади Даноци
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Паричен тек од финансирањето
 ,Financial Analytics,Финансиски анализи
 DocType: Quality Inspection,Verified By,Заверена од
 DocType: Address,Subsidiary,Подружница
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,Креирај Плата фиш
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,"Се очекува баланс, како на банката"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Извор на фондови (Пасива)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Кол во ред {0} ({1}) мора да биде иста како произведени количини {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Кол во ред {0} ({1}) мора да биде иста како произведени количини {2}
 DocType: Appraisal,Employee,Вработен
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Увоз-маил од
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Покани како пристап
 DocType: Features Setup,After Sale Installations,По продажбата Инсталации
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} е целосно фактурирани
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} е целосно фактурирани
 DocType: Workstation Working Hour,End Time,Крајот на времето
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандардна условите на договорот за продажба или купување.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Група од Ваучер
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Потребни на
 DocType: Sales Invoice,Mass Mailing,Масовно испраќање
 DocType: Rename Tool,File to Rename,Датотека за да ја преименувате
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Број на налогот се потребни за Точка {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Број на налогот се потребни за Точка {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Плаќања шоу
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Назначена Бум {0} не постои точка за {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Распоред за одржување {0} мора да биде укинат пред да го раскине овој Продај Побарувања
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,Продај Побарувања задолжителни
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Креирај клиентите
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,Распоред за одржување Детална
 DocType: Quality Inspection Reading,Reading 9,Читање 9
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,Покренати од страна на
 DocType: Payment Tool,Payment Account,Уплатна сметка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Нето промени во Побарувања
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Обесштетување Off
 DocType: Quality Inspection Reading,Accepted,Прифатени
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,Ве молиме бидете сигурни дека навистина сакате да ги избришете сите трансакции за оваа компанија. Вашиот господар на податоци ќе остане како што е. Ова дејство не може да се врати назад.
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,Вкупно исплата Износ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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 +204,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Како што постојат постојните акции трансакции за оваа точка, \ вие не може да се промени на вредностите на &quot;Мора Сериски Не&quot;, &quot;Дали Серија Не&quot;, &quot;Дали берза точка&quot; и &quot;метода на проценка&quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Брзо весник Влегување
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Брзо весник Влегување
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Вие не може да го промени стапка ако Бум споменати agianst која било ставка
 DocType: Employee,Previous Work Experience,Претходно работно искуство
 DocType: Stock Entry,For Quantity,За Кол
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Ве молиме внесете предвидено Количина за Точка {0} во ред {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} не е поднесен
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Барања за предмети.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Одделни производни цел ќе биде направена за секоја завршена добра ствар.
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Conditions1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,Овластен Вредност
 DocType: Contact,Enter department to which this Contact belongs,Внесете одделот на кој припаѓа оваа Контакт
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Вкупно Отсутни
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Точка или складиште ред {0} не се поклопува материјал Барање
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Точка или складиште ред {0} не се поклопува материјал Барање
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Единица мерка
 DocType: Fiscal Year,Year End Date,Година Крај Датум
 DocType: Task Depends On,Task Depends On,Задача зависи од
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Договор Крај Датум мора да биде поголема од датумот на пристап
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Трето лице дистрибутер / дилер / комисионен застапник / партнер / препродавач кој ги продава компании производи за провизија.
 DocType: Customer Group,Has Child Node,Има Јазол дете
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} против нарачка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} против нарачка {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Внесете статички URL параметри тука (на пр. Испраќачот = ERPNext, корисничко име = ERPNext, лозинка = 1234 итн)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} не во било кој активен фискална година. За повеќе детали проверете {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ова е пример веб-сајт автоматски генерирани од ERPNext
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,Recd Кол
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Не може да произведе повеќе Точка {0} од Продај Побарувања количина {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовинска сметка
 DocType: Tax Rule,Billing City,Платежна Сити
 DocType: Global Defaults,Hide Currency Symbol,Сокриј Валута Симбол
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Комунални трошоци
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Над 90-
 DocType: Buying Settings,Default Buying Price List,Стандардно Купување Ценовник
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.","Постави стандардните вредности, како компанија, валута, тековната фискална година, и др"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Тип на плаќање
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Видете &quot;стапката на материјали врз основа на&quot; Чини во Дел
 DocType: Appraisal Goal,Key Responsibility Area,Клучна одговорност Површина
 DocType: Item Reorder,Material Request Type,Материјал Тип на Барањето
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Ред {0}: UOM конверзија фактор е задолжително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ред {0}: UOM конверзија фактор е задолжително
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Реф
 DocType: Cost Center,Cost Center,Трошоците центар
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Сите адреси.
 DocType: Company,Stock Settings,Акции Settings
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спојувањето е можно само ако следниве својства се исти во двата записи. Е група, корен Тип компанијата"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спојувањето е можно само ако следниве својства се исти во двата записи. Е група, корен Тип компанијата"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управување на клиентите група на дрвото.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Нова цена центар Име
 DocType: Leave Control Panel,Leave Control Panel,Остави контролен панел
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Плаќање алатката Детална
 ,Sales Browser,Продажбата Browser
 DocType: Journal Entry,Total Credit,Вкупно кредитни
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Локалните
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,Должниците
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Големи
@@ -2003,7 +2022,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Сите Продажбата Трансакцијата може да бидат означени против повеќе ** продажба на лица **, така што ќе може да се постави и да се следи цели."
 ,S.O. No.,ПА број
 DocType: Production Order Operation,Make Time Log,Најдете време се Влез
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Ве молиме да го поставите редоследот квантитетот
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Ве молиме да го поставите редоследот квантитетот
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Ве молиме да се создаде клиент од водечкиот {0}
 DocType: Price List,Applicable for Countries,Применливи за земјите
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Компјутери
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Барем една ставка треба да се внесуваат со негативен количество во замена документ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Нема забелешки
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Нема забелешки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Задоцнета
 DocType: Account,Stock Received But Not Billed,"Акции примени, но не Опишан"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root сметката мора да биде група
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root сметката мора да биде група
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Бруто плата + Arrear Износ + инкасо Износ - Вкупно Одбивање
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 DocType: Features Setup,Sales and Purchase,Продажба и купување
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,Партијата Биланс
 DocType: Sales Invoice Item,Time Log Batch,Време Пријавете се Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Ве молиме изберете Примени попуст на
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Плата фиш Created
 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,Материјал трансфер за Производство
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,Полугодишен
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Фискална година {0} не е пронајдена.
 DocType: Bank Reconciliation,Get Relevant Entries,Добие релевантни записи
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Сметководство за влез на берза
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Сметководство за влез на берза
 DocType: Sales Invoice,Sales Team1,Продажбата Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Точка {0} не постои
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Точка {0} не постои
 DocType: Sales Invoice,Customer Address,Клиент адреса
 DocType: Purchase Invoice,Apply Additional Discount On,Да важат и дополнителни попуст на
 DocType: Account,Root Type,Корен Тип
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Прикажи Овој слајдшоу на врвот на страната
 DocType: BOM,Item UOM,Точка UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Износот на данокот По Износ попуст (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Целна склад е задолжително за спорот {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Целна склад е задолжително за спорот {0}
 DocType: Quality Inspection,Quality Inspection,Квалитет инспекција
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Екстра Мали
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,На сметка {0} е замрзнат
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правното лице / Подружница со посебен сметковен кои припаѓаат на Организацијата.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храна, пијалаци и тутун"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL или диплома
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Може само да се направи исплата против нефактурираното {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Може само да се направи исплата против нефактурираното {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Комисијата стапка не може да биде поголема од 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимална Инвентар ниво
 DocType: Stock Entry,Subcontract,Поддоговор
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Дојдовен инспекција квалитет.
 DocType: Purchase Order Item,Returned Qty,Врати Количина
 DocType: Employee,Exit,Излез
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Корен Тип е задолжително
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Корен Тип е задолжително
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Сериски № {0} создаден
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За погодност на клиентите, овие кодови може да се користи во печатените формати како Фактури и испорака белешки"
 DocType: Employee,You can enter any date manually,Можете да внесете кој било датум рачно
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Пробниот период
 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 +110,Row {0}: Advance against Customer must be credit,Ред {0}: напредување во однос на клиентите мора да бидат кредит
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Купување Потврда точка Опрема што се испорачува
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Плаќаат
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Плаќаат
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Да DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Дневници за одржување на статусот на испораката смс
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Пренареждане ниво
 DocType: Attendance,Attendance Date,Публика Датум
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Плата распадот врз основа на заработка и одбивање.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Сметка со дете јазли не можат да се конвертираат во Леџер
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Сметка со дете јазли не можат да се конвертираат во Леџер
 DocType: Address,Preferred Shipping Address,Најпосакувана Адреса за Испорака
 DocType: Purchase Receipt Item,Accepted Warehouse,Прифатени Магацински
 DocType: Bank Reconciliation Detail,Posting Date,Датум на објавување
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Сериски № {0} не постои
 DocType: Pricing Rule,Discount Percentage,Процент попуст
 DocType: Payment Reconciliation Invoice,Invoice Number,Број на фактура
-apps/erpnext/erpnext/hooks.py +54,Orders,Нарачка
+apps/erpnext/erpnext/hooks.py +55,Orders,Нарачка
 DocType: Leave Control Panel,Employee Type,Тип на вработените
 DocType: Employee Leave Approver,Leave Approver,Остави Approver
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Материјал префрлени за Производство
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% На материјали фактурирани против оваа Продај Побарувања
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Период Затворање Влегување
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Трошоците центар со постојните трансакции не може да се конвертира во групата
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизација
+DocType: Account,Depreciation,Амортизација
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Добавувачот (и)
 DocType: Customer,Credit Limit,Кредитен лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изберете тип на трансакција
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,Се бара за
 DocType: Quotation Item,Against Doctype,Против DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Следење на овој Испратница против било кој проект
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root сметката не може да се избришат
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Нето парични текови од инвестициони
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root сметката не може да се избришат
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Прикажи берза записи
 ,Is Primary Address,Е Основен адреса
 DocType: Production Order,Work-in-Progress Warehouse,Работа во прогрес Магацински
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Референтен # {0} датум {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Референтен # {0} датум {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управуваат со адреси
 DocType: Pricing Rule,Item Code,Точка законик
 DocType: Production Planning Tool,Create Production Orders,Креирај Производство Нарачка
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,Корисникот Напомена
 DocType: Lead,Market Segment,Сегмент од пазарот
 DocType: Employee Internal Work History,Employee Internal Work History,Вработен внатрешна работа Историја
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Затворање (д-р)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Затворање (д-р)
 DocType: Contact,Passive,Пасивни
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Сериски № {0} не во парк
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Данок дефиниција за продажба трансакции.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,Фактурирани Износ
 DocType: Bank Reconciliation,Bank Reconciliation,Банка помирување
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Добијат ажурирања
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Материјал Барање {0} е откажана или запрена
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Материјал Барање {0} е откажана или запрена
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Додадете неколку записи примерок
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Остави менаџмент
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Група од сметка
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Шефот на сметка под одговорност, во која Добивка / загуба ќе се резервира"
 DocType: Payment Tool,Against Vouchers,Против Ваучери
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Помош
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Изворот и целните склад не може да биде иста за спорот {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Изворот и целните склад не може да биде иста за спорот {0}
 DocType: Features Setup,Sales Extras,Продажба Бенефиции
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} буџетот на сметка {1} од трошоците центар {2} ќе се надмине со {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',&quot;Од датум&quot; мора да биде по &quot;Да најдам&quot;
 ,Stock Projected Qty,Акции Проектирани Количина
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
 DocType: Sales Order,Customer's Purchase Order,Нарачка на купувачот
 DocType: Warranty Claim,From Company,Од компанијата
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Вредност или Количина
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Остави Забрани листата на дозволени
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Вие ќе го користите за најава
 DocType: Sales Partner,Retailer,Трговија на мало
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на сметка мора да биде на сметка Биланс на состојба
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Кредит на сметка мора да биде на сметка Биланс на состојба
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Сите типови на Добавувачот
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Точка законик е задолжително, бидејќи точка не се нумерирани автоматски"
+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 +93,Quotation {0} not of type {1},Цитат {0} не е од типот на {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржување Распоред Точка
 DocType: Sales Order,%  Delivered,% Дадени
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежина на пакувањето. Обично нето тежина + материјал за пакување тежина. (За печатење)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Корисниците со оваа улога може да поставите замрзнати сметки и да се создаде / измени на сметководствените ставки кон замрзнатите сметки
 DocType: Serial No,Is Cancelled,Е Откажано
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Мои Пратки
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Мои Пратки
 DocType: Journal Entry,Bill Date,Бил Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Дури и ако постојат повеќе Цените правила со највисок приоритет, тогаш се применуваат следните интерни приоритети:"
 DocType: Supplier,Supplier Details,Добавувачот Детали за
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Повици
 DocType: Project,Total Costing Amount (via Time Logs),Вкупно Чини Износ (преку Време на дневници)
 DocType: Purchase Order Item Supplied,Stock UOM,Акции UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Нарачка {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Нарачка {0} не е поднесен
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Проектирани
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Сериски № {0} не припаѓаат Магацински {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Забелешка: системот не ќе ги провери над-испорака и над-резервација за Точка {0}, на пример количината или сума е 0"
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,Отворање датум
 DocType: Journal Entry,Remark,Напомена
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,Batched за регистрации
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Сметки кои произлегуваат од добавувачи.
 DocType: POS Profile,Write Off Account,Отпише профил
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Износ попуст
 DocType: Purchase Invoice,Return Against Purchase Invoice,Врати против Набавка Фактура
 DocType: Item,Warranty Period (in days),Гарантниот период (во денови)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Нето готовина од работењето
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,на пример ДДВ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Точка 4
 DocType: Journal Entry Account,Journal Entry Account,Весник Влегување профил
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Денот на неговото пензионирање мора да биде поголема од датумот на пристап
 DocType: Sales Invoice,Against Income Account,Против профил доход
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Дадени
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,Превозникот Информации
@@ -2421,10 +2443,10 @@
 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 +14,This is a root sales person and cannot be edited.,Ова е лице корен продажба и не може да се уредува.
 ,Stock Ledger,Акции Леџер
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Гласај: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Гласај: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Плата се лизга Дедукција
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Изберете група јазол во прв план.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Целта мора да биде еден од {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Целта мора да биде еден од {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Пополнете го формуларот и го спаси
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Преземете извештај кој ги содржи сите суровини со најновите статусот инвентар
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форуми во заедницата
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компанијата (не клиент или добавувач) господар.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Ве молиме внесете &#39;очекува испорака датум &quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Испорака белешки {0} мора да биде укинат пред да го раскине овој Продај Побарувања
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,Уплатениот износ + отпише сума не може да биде поголема од Гранд Вкупно
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},Забелешка: Не е доволно одмор биланс за Оставете Тип {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Забелешка: Ако плаќањето не е направена на секое повикување, направи весник влез рачно."
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави како отворено
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Испрати автоматски пораки до контакти за доставување на трансакции.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Ред {0}: Количина не avalable во магацин {1} на {2} {3}. Достапни Количина: {4}, пренос Количина: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Точка 3
 DocType: Purchase Order,Customer Contact Email,Контакт е-маил клиент
 DocType: Sales Team,Contribution (%),Придонес (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Забелешка: Плаќањето за влез нема да бидат направивме од &quot;Пари или банкарска сметка &#39;не е одредено,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Забелешка: Плаќањето за влез нема да бидат направивме од &quot;Пари или банкарска сметка &#39;не е одредено,"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Одговорности
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажбата на лице Име
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Пред помирување
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Точка Даночниот спор во {0} мора да има предвид типот Данок или на приход или трошок или Наплатлив
 DocType: Sales Order,Partly Billed,Делумно Опишан
 DocType: Item,Default BOM,Стандардно Бум
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Ве молиме име ре-вид на компанија за да се потврди
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Вкупно Најдобро Амт
 DocType: Time Log Batch,Total Hours,Вкупно часови
 DocType: Journal Entry,Printing Settings,Поставки за печатење
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Вкупно Дебитна мора да биде еднаков Вкупно кредит. Разликата е {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Вкупно Дебитна мора да биде еднаков Вкупно кредит. Разликата е {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилски
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Од Испратница
 DocType: Time Log,From Time,Од време
 DocType: Notification Control,Custom Message,Прилагодено порака
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестициско банкарство
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Парични средства или банкарска сметка е задолжително за правење влез плаќање
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Парични средства или банкарска сметка е задолжително за правење влез плаќање
 DocType: Purchase Invoice,Price List Exchange Rate,Ценовник курс
 DocType: Purchase Invoice Item,Rate,Стапка
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Практикант
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","Повеќе Цена правило постои со истите критериуми, ве молиме решавање \ конфликт со давање приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиокомпанијата
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Материјал прашање
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Материјал прашање
 DocType: Material Request Item,For Warehouse,За Магацински
 DocType: Employee,Offer Date,Датум на понуда
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитати
 DocType: Hub Settings,Access Token,Пристап знак
 DocType: Sales Invoice Item,Serial No,Сериски Не
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Ве молиме внесете Maintaince Детали за прв
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Постојат повеќе одмори од работни дена овој месец.
 DocType: Product Bundle Item,Product Bundle Item,Производ Бовча Точка
 DocType: Sales Partner,Sales Partner Name,Продажбата партнер Име
+DocType: Payment Reconciliation,Maximum Invoice Amount,Максималниот износ на фактура
 DocType: Purchase Invoice Item,Image View,Слика Види
 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 +553,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,Од магацин
 DocType: Purchase Taxes and Charges,Valuation and Total,Вреднување и вкупно
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Оваа содржина е варијанта на {0} (дефиниција). Атрибути ќе бидат копирани во текот од дефиниција освен ако е &quot;Не Копирај&quot; е поставена
 DocType: Account,Purchase User,Набавка пристап
 DocType: Notification Control,Customize the Notification,Персонализација на известувањето
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Парични текови од работење
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Стандардно адреса Шаблон не може да се избришат
 DocType: Sales Invoice,Shipping Rule,Испорака Правило
 DocType: Journal Entry,Print Heading,Печати Заглавие
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Суровина
 DocType: Leave Application,Follow via Email,Следете ги преку E-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Износот на данокот По Износ попуст
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Сметка детето постои за оваа сметка. Не можете да ја избришете оваа сметка.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Ве молиме изберете ја со Мислењата Датум прв
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Сериски броеви кои се потребни за серијали Точка {0}
 DocType: Journal Entry,Bank Entry,Банката Влегување
 DocType: Authorization Rule,Applicable To (Designation),Применливи To (Означување)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Додади во кошничка
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Со група
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Овозможи / оневозможи валути.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Поштенски трошоци
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забава &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,Датумот на кој периодично да се запре
 DocType: Quality Inspection,Item Serial No,Точка Сериски Не
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} мора да се намали од {1} или ќе треба да се зголеми претекување толеранција
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} мора да се намали од {1} или ќе треба да се зголеми претекување толеранција
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Вкупно Тековен
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Серијали Точка {0} не може да се ажурира \ користење на берза за помирување
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Пренос на материјал за да Добавувачот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Пренос на материјал за да Добавувачот
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Креирај цитат
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Немате дозвола да го одобри лисјата Забрани Термини
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Сите овие предмети веќе се фактурира
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Сите овие предмети веќе се фактурира
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Може да биде одобрена од страна на {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Услови за испорака Правило
 DocType: BOM Replace Tool,The new BOM after replacement,Новиот Бум по замена
 DocType: Features Setup,Point of Sale,Точка на продажба
 DocType: Account,Tax,Данок
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Ред {0}: {1} не е валиден {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Од производот Бовча
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Од производот Бовча
 DocType: Production Planning Tool,Production Planning Tool,Алатка за производство планирање
 DocType: Quality Inspection,Report Date,Датум на извештајот
 DocType: C-Form,Invoices,Фактури
 DocType: Job Opening,Job Title,Работно место
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Примателите
 DocType: Features Setup,Item Groups in Details,Точка групи во Детали
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Количина за производство мора да биде поголем од 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Почеток Point-of-продажба (ПОС)
@@ -2618,8 +2644,9 @@
 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: Pricing Rule,Customer Group,Група на потрошувачи
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Сметка сметка е задолжително за ставката {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Сметка сметка е задолжително за ставката {0}
 DocType: Item,Website Description,Веб-сајт Опис
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Нето промени во капиталот
 DocType: Serial No,AMC Expiry Date,АМЦ датумот на истекување
 ,Sales Register,Продажбата Регистрирај се
 DocType: Quotation,Quotation Lost Reason,Заборавена Причина цитат
@@ -2627,12 +2654,12 @@
 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 +108,Summary for this month and pending activities,Резиме за овој месец и во очекување на активности
 DocType: Customer Group,Customer Group Name,Клиент Име на групата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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,Атрибути
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Се предмети
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Ве молиме внесете го отпише профил
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Се предмети
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Ве молиме внесете го отпише профил
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Последните Ред Датум
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Направете акцизи Фактура
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},На сметка {0} не припаѓа на компанијата {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Проект-мудар податоци не се достапни за котација
 DocType: Project,Expected End Date,Се очекува Крај Датум
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Комерцијален
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Комерцијален
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родител Точка {0} не мора да биде Акции Точка
 DocType: Cost Center,Distribution Id,Id дистрибуција
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Прекрасно Услуги
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Вредноста за атрибутот {0} мора да биде во рамките на опсегот на {1} до {2} во зголемувања од {3}
 DocType: Tax Rule,Sales,Продажба
 DocType: Stock Entry Detail,Basic Amount,Основицата
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
 DocType: Leave Allocation,Unused leaves,Неискористени листови
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Стандардно сметки побарувања
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Набавка Разписки
-DocType: Payment Reconciliation,Maximum Amount,Максимална големина
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Како Цените правило се применува?
 DocType: Quality Inspection,Delivery Note No,Испратница Не
 DocType: Company,Retail,Трговија на мало
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Клиент {0} не постои
 DocType: Attendance,Absent,Отсутен
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Производ Бовча
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ред {0}: Невалидна референца {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Производ Бовча
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Ред {0}: Невалидна референца {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купување на даноци и такси Шаблон
 DocType: Upload Attendance,Download Template,Преземи Шаблон
 DocType: GL Entry,Remarks,Забелешки
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,Месечен евидентен лист
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Не се пронајдени рекорд
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Цена центар е задолжително за ставката {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Се предмети од производот Бовча
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Се предмети од производот Бовча
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,На сметка {0} е неактивен
 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,Публика од денот и Публика во тек е задолжително
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Добивка и загуба&quot; тип на сметка {0} не е дозволено во Отворање Влегување
 DocType: Features Setup,Sales Discounts,Попусти за продажба
 DocType: Hub Settings,Seller Country,Продавачот Земја
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Предмети објавуваат на веб-страницата
 DocType: Authorization Rule,Authorization Rule,Овластување Правило
 DocType: Sales Invoice,Terms and Conditions Details,Услови и правила Детали за
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Спецификации
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажбата на даноци и такси Шаблон
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Облека и додатоци
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Број на нарачка
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,Платежна Износ
 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 +18,Applications for leave.,Апликации за отсуство.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Сметка со постоечките трансакцијата не може да се избришат
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Сметка со постоечките трансакцијата не може да се избришат
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Правни трошоци
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","На ден од месецот на кој авто цел ќе биде генериранa на пример 05, 28 итн"
 DocType: Sales Invoice,Posting Time,Праќање пораки во Време
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,Дефект
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Сметка: {0} со валутна: не може да се одбрани {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Датум
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},На сметка {0}: Родител на сметка {1} не припаѓа на компанијата: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},На сметка {0}: Родител на сметка {1} не припаѓа на компанијата: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Успешно избришани сите трансакции поврзани со оваа компанија!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Како на датум
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Условна казна
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Стандардно Магацински е задолжително за акциите точка.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Стандардно Магацински е задолжително за акциите точка.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Исплата на плата за месец {0} и годината {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Авто вметнете Ценовник стапка ако недостасува
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Вкупно исплатен износ
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Вкупно регистрации Износ (преку Време на дневници)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Ние продаваме Оваа содржина
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id снабдувач
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Количина треба да биде поголем од 0
 DocType: Journal Entry,Cash Entry,Кеш Влегување
 DocType: Sales Partner,Contact Desc,Контакт Desc
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Тип на листовите како повик, болни итн"
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Додадете редови да го поставите на годишниот буџет на сметки.
 DocType: Buying Settings,Default Supplier Type,Стандардно Добавувачот Тип
 DocType: Production Order,Total Operating Cost,Вкупно оперативни трошоци
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Забелешка: Точката {0} влегоа неколку пати
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Забелешка: Точката {0} влегоа неколку пати
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Сите контакти.
 DocType: Newsletter,Test Email Id,Тест-мејл ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Компанијата Кратенка
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Сите групи потрошувачи
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Данок Шаблон е задолжително.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,На сметка {0}: Родител на сметка {1} не постои
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,На сметка {0}: Родител на сметка {1} не постои
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник стапка (Фирма валута)
 DocType: Account,Temporary,Привремено
 DocType: Address,Preferred Billing Address,Најпосакувана платежна адреса
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,Точка-мудар Ценовник стапка
 DocType: Purchase Order Item,Supplier Quotation,Добавувачот цитат
 DocType: Quotation,In Words will be visible once you save the Quotation.,Во Зборови ќе бидат видливи откако ќе го спаси котација.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} е запрен
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во точка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} е запрен
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во точка {1}
 DocType: Lead,Add to calendar on this date,Додади во календарот на овој датум
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила за додавање на трошоците за испорака.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Престојни настани
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,Од олово
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Нарачка пуштени во производство.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Изберете фискалната година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
 DocType: Hub Settings,Name Token,Име знак
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Стандардна Продажба
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Барем еден магацин е задолжително
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,Заменете
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} против Продај фактура {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ве молиме внесете го стандардно единица мерка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} против Продај фактура {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Ве молиме внесете го стандардно единица мерка
 DocType: Purchase Invoice Item,Project Name,Име на проектот
 DocType: Supplier,Mention if non-standard receivable account,Наведе ако нестандардни побарувања сметка
 DocType: Journal Entry Account,If Income or Expense,Ако приходите и расходите
 DocType: Features Setup,Item Batch Nos,Точка Серија броеви
 DocType: Stock Ledger Entry,Stock Value Difference,Акции Вредност разликата
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Човечки ресурси
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,Човечки ресурси
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Плаќање помирување на плаќање
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Даночни средства
 DocType: BOM Item,BOM No,Бум Не
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,Весник Влегување {0} нема сметка {1} или веќе се споредуваат со други ваучер
 DocType: Item,Moving Average,Се движат просек
 DocType: BOM Replace Tool,The BOM which will be replaced,Бум на која ќе биде заменет
 DocType: Account,Debit,Дебитна
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,Дополнителни трошоци
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Финансиска година Крај Датум
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрираат врз основа на ваучер Не, ако се групираат според ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Направете Добавувачот цитат
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Направете Добавувачот цитат
 DocType: Quality Inspection,Incoming,Дојдовни
 DocType: BOM,Materials Required (Exploded),Потребни материјали (експлодира)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Намалување на заработка за неплатено отсуство (LWP)
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Сериски Не {1} не се совпаѓа со {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Обичните Leave
 DocType: Batch,Batch ID,Серија проект
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Забелешка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Забелешка: {0}
 ,Delivery Note Trends,Испратница трендови
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Краток преглед на оваа недела
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} мора да биде купена или под-договор ставка во ред {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ср. Купување стапка
 DocType: Task,Actual Time (in Hours),Крај на времето (во часови)
 DocType: Employee,History In Company,Во историјата на компанијата
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,Билтени
 DocType: Address,Shipping,Испорака
 DocType: Stock Ledger Entry,Stock Ledger Entry,Акции Леџер Влегување
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,Датум на завршување на периодот тековниот ред е
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Направете Понуда писмо
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Враќање
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Стандардно единица мерка за варијанта мора да биде иста како Шаблон
 DocType: Production Order Operation,Production Order Operation,Производството со цел Операција
 DocType: Pricing Rule,Disable,Оневозможи
 DocType: Project Task,Pending Review,Во очекување Преглед
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id на купувачи
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,На време мора да биде поголем од Time
 DocType: Journal Entry Account,Exchange Rate,На девизниот курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Магацински {0}: Родител на сметка {1} не bolong на компанијата {2}
 DocType: BOM,Last Purchase Rate,Последните Набавка стапка
 DocType: Account,Asset,Средства
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,Достапни берза за материјали за пакување
 DocType: Item Variant,Item Variant,Точка Варијанта
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Поставуањето на оваа адреса Шаблон како стандардно што не постои друг стандардно
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс на сметка веќе во Дебитна, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; кредит &quot;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Управување со квалитет
 DocType: Production Planning Tool,Filter based on customer,Филтер врз основа на клиент
 DocType: Payment Tool Detail,Against Voucher No,Против ваучер Не
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,Следна Контакт
 DocType: Employee,Employment Type,Тип на вработување
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,"Основни средства,"
+,Cash Flow,Готовински тек
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Период апликација не може да биде во две alocation евиденција
 DocType: Item Group,Default Expense Account,Стандардно сметка сметка
 DocType: Employee,Notice (days),Известување (во денови)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,Магацини
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Печати и Стационарни
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Група Јазол
-DocType: Payment Reconciliation,Minimum Amount,Минимален износ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Ажурирање на готовите производи
 DocType: Workstation,per hour,на час
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Сметка за складиште (Вечен Инвентар) ќе бидат создадени во рамките на оваа сметка.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не може да биде избришан како што постои влез акции Леџер за оваа склад.
 DocType: Company,Distribution,Дистрибуција
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Уплатениот износ
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Уплатениот износ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Проект менаџер
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Испраќање
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс попуст дозволено за ставка: {0} е {1}%
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Поддршка Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компанијата се водат за исчезнати во магацини {0}
 DocType: POS Profile,Terms and Conditions,Услови и правила
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Датум треба да биде во рамките на фискалната година. Претпоставувајќи Да најдам = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Датум треба да биде во рамките на фискалната година. Претпоставувајќи Да најдам = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Овде можете да одржите висина, тежина, алергии, медицински проблеми итн"
 DocType: Leave Block List,Applies to Company,Се однесува на компанијата
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Не може да се откаже затоа што {0} постои поднесени берза Влегување
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Ве молиме внесете Набавка Разписки
 DocType: Sales Invoice,Get Advances Received,Се аванси
 DocType: Email Digest,Add/Remove Recipients,Додадете / отстраните примачи
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},Трансакцијата не е дозволено против запре производството со цел {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Поставување на дојдовен сервер за поддршка мејл ID. (На пр support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Недостаток Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
 DocType: Salary Slip,Salary Slip,Плата фиш
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Да најдам &#39;е потребен
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генерирање пакување измолкнува за пакети да бидат испорачани. Се користи за да го извести пакет број, содржината на пакетот и неговата тежина."
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Вработен евиденција.
 DocType: HR Settings,Payroll Settings,Settings Даноци
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Одговара на не-поврзани фактури и плаќања.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Поставите цел
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Поставите цел
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Корен не може да има цена центар родител
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Изберете бренд ...
 DocType: Sales Invoice,C-Form Applicable,C-Форма Применливи
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,Датум на почеток
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Распредели листови за одреден период.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Кликни тука за да се потврди
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,На сметка {0}: Вие не може да се додели како родител сметка
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,На сметка {0}: Вие не може да се додели како родител сметка
 DocType: Purchase Invoice Item,Price List Rate,Ценовник стапка
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Покажуваат &quot;Залиха&quot; или &quot;Не во парк&quot; врз основа на акции на располагање во овој склад.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Бил на материјали (BOM)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,Се очекува Почеток Датум
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Отстрани точка ако обвиненијата не се применува на таа ставка
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,На пр. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Добивате
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Добивате
 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: Employee Leave Approver,Employee Leave Approver,Вработен Остави Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} е успешно додаден во нашиот листа Билтен.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не може да се декларираат како изгубени, бидејќи цитат е направен."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купување мајстор менаџер
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Производство на налози {0} мора да се поднесе
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Производство на налози {0} мора да се поднесе
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Ве молиме одберете Start Датум и краен датум за Точка {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Главни извештаи
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,До денес не може да биде пред од денот
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Нешто не беше во ред!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Предупредување: Оставете апликација ги содржи следниве датуми блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Продај фактура {0} е веќе испратена
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Продај фактура {0} е веќе испратена
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Датум на завршување
 DocType: Purchase Invoice Item,Amount (Company Currency),Износ (Фирма валута)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Организациона единица (оддел) господар.
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,Сериски Нема договор за услуги Важи
 DocType: Item,Unit of Measure Conversion,Единица мерка конверзија
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Работникот не може да се промени
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Вие не може да кредитни и дебитни истата сметка во исто време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Вие не може да кредитни и дебитни истата сметка во исто време
 DocType: Naming Series,Help HTML,Помош HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Вкупно weightage доделени треба да биде 100%. Тоа е {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Додаток за надминување {0} преминал за Точка {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Додаток за надминување {0} преминал за Точка {1}
 DocType: Address,Name of person or organization that this address belongs to.,Име на лицето или организацијата која оваа адреса припаѓа.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Вашите добавувачи
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не може да се постави како изгубени како Продај Побарувања е направен.
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,Датум на издавање
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Од {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Ред # {0}: Постави Добавувачот за ставката {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,Веб-страница на слика {0} прилог Точка {1} Не може да се најде
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Ве молиме проверете ја опцијата Мулти Валута да им овозможи на сметки со друга валута
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Ве молиме проверете ја опцијата Мулти Валута да им овозможи на сметки со друга валута
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Точка: {0} не постои во системот
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Немате дозвола да го поставите Замрзнати вредност
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Немате дозвола да го поставите Замрзнати вредност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Земете неусогласеност записи
+DocType: Payment Reconciliation,From Invoice Date,Фактура од Датум
 DocType: Cost Center,Budgets,Буџети
-DocType: Employee,Emergency Contact Details,Итни Контакт Детали
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Што да направам?
 DocType: Delivery Note,To Warehouse,Да се Магацински
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},На сметка {0} е внесен повеќе од еднаш за фискалната година {1}
 ,Average Commission Rate,Просечната стапка на Комисијата
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Мора Сериски Не&quot; не може да биде &quot;Да&quot; за не-парк точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Мора Сериски Не&quot; не може да биде &quot;Да&quot; за не-парк точка
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Публика не можат да бидат означени за идните датуми
 DocType: Pricing Rule,Pricing Rule Help,Цените Правило Помош
 DocType: Purchase Taxes and Charges,Account Head,Сметка на главата
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Ажурирање на дополнителни трошоци за да се пресмета слета трошоците за предмети
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Електрични
 DocType: Stock Entry,Total Value Difference (Out - In),Вкупно разликата вредност (Out - Во)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Ред {0}: курс е задолжително
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Ред {0}: курс е задолжително
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID на корисникот не е поставена за вработените {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Од Гаранција побарување
 DocType: Stock Entry,Default Source Warehouse,Стандардно Извор Магацински
 DocType: Item,Customer Code,Код на клиентите
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Роденден Потсетник за {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Дена од денот на нарачка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,Акции средства
@@ -3271,7 +3301,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Завршната сметка {0} мора да биде од типот Одговорност / инвестициски фондови
 DocType: Authorization Rule,Based On,Врз основа на
 DocType: Sales Order Item,Ordered Qty,Нареди Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Ставката {0} е оневозможено
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Ставката {0} е оневозможено
 DocType: Stock Settings,Stock Frozen Upto,Акции Замрзнати до
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Период од периодот и роковите на задолжителна за периодични {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектна активност / задача.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпише Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слета Цена на ваучер
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ве молиме да се постави {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Повторете на Денот од месецот
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,Upload Публика
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Бум Производство и Кол се бара
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Стареењето опсег 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Износот
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Износот
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Бум замени
 ,Sales Analytics,Продажбата анализи
 DocType: Manufacturing Settings,Manufacturing Settings,Settings производство
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Поставување Е-пошта
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Ве молиме внесете го стандардно валута во компанијата мајстор
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Ве молиме внесете го стандардно валута во компанијата мајстор
 DocType: Stock Entry Detail,Stock Entry Detail,Акции Влегување Детална
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Дневен Потсетници
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Данок Правило Конфликтите со {0}
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,Произведената количина
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Инженер
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Барај Под собранија
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Точка законик бара во ред Нема {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Точка законик бара во ред Нема {0}
 DocType: Sales Partner,Partner Type,Тип партнер
 DocType: Purchase Taxes and Charges,Actual,Крај
 DocType: Authorization Rule,Customerwise Discount,Customerwise попуст
 DocType: Purchase Invoice,Against Expense Account,Против сметка сметка
 DocType: Production Order,Production Order,Производството со цел
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Инсталација Забелешка {0} е веќе испратена
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Инсталација Забелешка {0} е веќе испратена
 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,Прикажи Сега
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,Применливи летни Листа
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серија освежено
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Тип на излагањето е задолжително
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Тип на излагањето е задолжително
 DocType: Item,Serial Number Series,Сериски број Серија
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Складиште е задолжително за акциите Точка {0} во ред {1}
 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/public/js/setup_wizard.js +101,The First User: You,Првата Корисник: Вие
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Почеток Датум и фискалната година Крај Датум веќе се поставени во фискалната {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успешно помири
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Почеток Датум и фискалната година Крај Датум веќе се поставени во фискалната {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Успешно помири
 DocType: Production Order,Planned End Date,Планирани Крај Датум
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Каде што предмети се чуваат.
 DocType: Tax Rule,Validity,Валидноста
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,Публика
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Праќање пораки во денот и објавување време е задолжително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Праќање пораки во денот и објавување време е задолжително
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Данок дефиниција за купување трансакции.
 ,Item Prices,Точка цени
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Во Зборови ќе бидат видливи откако ќе го спаси нарачка.
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,Преглед Датум
 DocType: Purchase Invoice,Advance Payments,Аконтации
 DocType: Purchase Taxes and Charges,On Net Total,Он Нет Вкупно
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Целна магацин во ред {0} мора да биде иста како цел производство
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Целна магацин во ред {0} мора да биде иста како цел производство
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Нема дозвола за користење на плаќање алатката
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,&quot;Известување-мејл адреси не е наведен за повторување на% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Валута не може да се промени по правење записи со употреба на други валута
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,Валута не може да се промени по правење записи со употреба на други валута
 DocType: Company,Round Off Account,Заокружуваат профил
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административни трошоци
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родител група на потрошувачи
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промени
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Промени
 DocType: Purchase Invoice,Contact Email,Контакт E-mail
 DocType: Appraisal Goal,Score Earned,Резултат Заработени
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","на пример, &quot;Мојата компанија ДОО&quot;"
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,Бруто тежина на апаратот UOM
 DocType: Email Digest,Receivables / Payables,Побарувања / Обврските
 DocType: Delivery Note Item,Against Sales Invoice,Против Продај фактура
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Кредитна сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Слета Цена Точка
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Прикажи нула вредности
 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 +562,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
 DocType: Item,Default Warehouse,Стандардно Магацински
 DocType: Task,Actual End Date (via Time Logs),Крај Крај Датум (преку Време на дневници)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Буџетот не може да биде доделен од група на сметка {0}
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,План Време на дневници надвор Workstation работно време.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} е веќе испратена
 ,Items To Be Requested,Предмети да се бара
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Земете Последна Набавка стапка
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Платежна стапка врз основа на видот на активности (на час)
 DocType: Company,Company Info,Инфо за компанијата
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Компанија е-мејл ID не е пронајден, па затоа не пошта испратена"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Примена на средства (средства)
 DocType: Production Planning Tool,Filter based on item,Филтер врз основа на точка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Дебитни сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Дебитни сметка
 DocType: Fiscal Year,Year Start Date,Година Почеток Датум
 DocType: Attendance,Employee Name,Име на вработениот
 DocType: Sales Invoice,Rounded Total (Company Currency),Заоблени Вкупно (Фирма валута)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Не може да се тајните на група, бидејќи е избран тип на сметка."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Не може да се тајните на група, бидејќи е избран тип на сметка."
 DocType: Purchase Common,Purchase Common,Купување Заеднички
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,Од Можност
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Користи за вработените
 DocType: Sales Invoice,Is POS,Е ПОС
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
 DocType: Production Order,Manufactured Qty,Произведени Количина
 DocType: Purchase Receipt Item,Accepted Quantity,Прифатени Кол
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не постои
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Сметки се зголеми на клиенти.
 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 +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,Додадени {0} претплатници
 DocType: Maintenance Schedule,Schedule,Распоред
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Дефинираат Буџетот за оваа цена центар. За да го поставите на буџетот акција, видете &quot;компанијата Листа&quot;"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,Читање 3
 ,Hub,Центар
 DocType: GL Entry,Voucher Type,Ваучер Тип
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
 DocType: Expense Claim,Approved,Одобрени
 DocType: Pricing Rule,Price,Цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како &quot;Лево&quot;
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Сметководствени записи во дневникот.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Количина на располагање од магацин
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Забава / профилот не се поклопува со {1} / {2} со {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Да се создаде жиро сметка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Ве молиме внесете сметка сметка
 DocType: Account,Stock,На акции
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,Договор Крај Датум
 DocType: Sales Order,Track this Sales Order against any Project,Следење на овој Продај Побарувања против било кој проект
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Продажбата на налози се повлече (во очекување да се испорача) врз основа на горенаведените критериуми
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Од Добавувачот цитат
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Од Добавувачот цитат
 DocType: Deduction Type,Deduction Type,Одбивање Тип
 DocType: Attendance,Half Day,Половина ден
 DocType: Pricing Rule,Min Qty,Мин Количина
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,Датум на трансакција
 DocType: Production Plan Item,Planned Qty,Планирани Количина
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Вкупен данок
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,За Кол (Произведени Количина) се задолжителни
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,За Кол (Произведени Количина) се задолжителни
 DocType: Stock Entry,Default Target Warehouse,Стандардно Целна Магацински
 DocType: Purchase Invoice,Net Total (Company Currency),Нето Вкупно (Фирма валута)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Тип партија и Партијата се применува само против побарувања / Платив сметка
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,Комисијата стапка
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Направи Варијанта
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Апликации одмор блок од страна на одделот.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Кошничка е празна
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Кошничка е празна
 DocType: Production Order,Actual Operating Cost,Крај на оперативни трошоци
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Корен не може да се уредува.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Корен не може да се уредува.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Распределени износ може да не е поголема од износот unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Овозможете производството за празниците
 DocType: Sales Order,Customer's Purchase Order Date,Клиентите нарачка Датум
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизајнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Услови и правила Шаблон
 DocType: Serial No,Delivery Details,Детали за испорака
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматски се создаде материјал барањето, доколку количината паѓа под ова ниво"
 ,Item-wise Purchase Register,Точка-мудар Набавка Регистрирај се
 DocType: Batch,Expiry Date,Датумот на истекување
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да го поставите нивото редоследот точка мора да биде Набавка Точка или Производство Точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да го поставите нивото редоследот точка мора да биде Набавка Точка или Производство Точка
 ,Supplier Addresses and Contacts,Добавувачот адреси и контакти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ве молиме изберете категорија во првата
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Господар на проектот.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Полудневен)
 DocType: Supplier,Credit Days,Кредитна дена
 DocType: Leave Type,Is Carry Forward,Е пренесување
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Се предмети од бирото
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Бил на материјали
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Тип партија и Партијата е потребно за побарувања / Платив сметка {1}
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,Причина за напуштање
 DocType: Expense Claim Detail,Sanctioned Amount,Износ санкционира
 DocType: GL Entry,Is Opening,Се отвора
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Ред {0}: Дебитна влез не можат да бидат поврзани со {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,На сметка {0} не постои
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Ред {0}: Дебитна влез не можат да бидат поврзани со {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,На сметка {0} не постои
 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 f9fc521..a675f8b 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,കൺസ്യൂമർ ഉൽപ്പന്നങ്ങൾ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,പാർട്ടി ടൈപ്പ് ആദ്യം തിരഞ്ഞെടുക്കുക
 DocType: Item,Customer Items,ഉപഭോക്തൃ ഇനങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} അതെല്ലാം ഒരു ആകാൻ പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} അതെല്ലാം ഒരു ആകാൻ പാടില്ല
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com വരെ ഇനം പ്രസിദ്ധീകരിക്കുക
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,ഇമെയിൽ അറിയിപ്പുകൾ
 DocType: Item,Default Unit of Measure,അളവു സ്ഥിരസ്ഥിതി യൂണിറ്റ്
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,കസ്റ്റമർ കോൺടാക്റ്റ്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന നിന്ന്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന നിന്ന്
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ട്രീ
 DocType: Job Applicant,Job Applicant,ഇയ്യോബ് അപേക്ഷകന്
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,കൂടുതൽ ഫലങ്ങൾ ഇല്ല.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,ഈ ഓപ്ഷൻ അവരുടെ കോഡ് ഉപയോഗം അടിസ്ഥാനമാക്കി 1. ഉപഭോക്താവ് ജ്ഞാനികൾ ഐറ്റം കോഡ് നിലനിർത്താൻ അവരെ തിരയാനാകുന്ന ഉണ്ടാക്കുവാൻ
 DocType: Mode of Payment Account,Mode of Payment Account,പേയ്മെന്റ് അക്കൗണ്ട് മോഡ്
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,ഷോ രൂപഭേദങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,ക്വാണ്ടിറ്റി
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),വായ്പകൾ (ബാദ്ധ്യതകളും)
 DocType: Employee Education,Year of Passing,പാസ് ആയ വര്ഷം
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,സ്റ്റോക്കുണ്ട്
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ആരോഗ്യ പരിരക്ഷ
 DocType: Purchase Invoice,Monthly,പ്രതിമാസം
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),പേയ്മെന്റ് കാലതാമസം (ദിവസം)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,വികയപതം
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,വികയപതം
 DocType: Maintenance Schedule Item,Periodicity,ഇതേ
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ഈ - മെയില് വിലാസം
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,സാമ്പത്തിക വർഷത്തെ {0} ആവശ്യമാണ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,പ്രതിരോധ
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),സ്കോർ (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},വരി {0}: {1} {2} {3} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},വരി {0}: {1} {2} {3} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,വരി # {0}:
 DocType: Delivery Note,Vehicle No,വാഹനം ഇല്ല
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,വില ലിസ്റ്റ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,വില ലിസ്റ്റ് തിരഞ്ഞെടുക്കുക
 DocType: Production Order Operation,Work In Progress,പ്രവൃത്തി പുരോഗതിയിലാണ്
 DocType: Employee,Holiday List,ഹോളിഡേ പട്ടിക
 DocType: Time Log,Time Log,സമയം പ്രവേശിക്കുക
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ഒരേ കമ്പനി ഒന്നിലധികം തവണ നൽകുമ്പോഴുള്ള
 DocType: Employee,Married,വിവാഹിത
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} അനുവദനീയമല്ല
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
 DocType: Payment Reconciliation,Reconcile,രഞ്ജിപ്പുണ്ടാക്കണം
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,പലചരക്ക്
 DocType: Quality Inspection Reading,Reading 1,1 Reading
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ബാങ്ക് എൻട്രി നിർമ്മിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,പെൻഷൻ ഫണ്ട്
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,അക്കൗണ്ട് തരം വെയർഹൗസ് ആണ് എങ്കിൽ വെയർഹൗസ് നിർബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,അക്കൗണ്ട് തരം വെയർഹൗസ് ആണ് എങ്കിൽ വെയർഹൗസ് നിർബന്ധമാണ്
 DocType: SMS Center,All Sales Person,എല്ലാ സെയിൽസ് വ്യാക്തി
 DocType: Lead,Person Name,വ്യക്തി നാമം
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","ഓർഡർ ആവർത്തന എങ്കിൽ പരിശോധിക്കുക, ആവർത്തന നിർത്താൻ അല്ലെങ്കിൽ ശരിയായ അവസാന തീയതി സ്ഥാപിക്കേണ്ടതിന്നു അൺചെക്ക്"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,താല്പര്യം
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,മെറ്റീരിയൽ ബിൽ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,തുറക്കുന്നു
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},{0} നിന്ന് {1} വരെ
+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,എൻട്രി തുറക്കുന്നു
 DocType: Stock Entry,Additional Costs,അധിക ചെലവ്
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,നിലവിലുള്ള ഇടപാട് ഉപയോഗിച്ച് അക്കൗണ്ട് ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,നിലവിലുള്ള ഇടപാട് ഉപയോഗിച്ച് അക്കൗണ്ട് ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
 DocType: Lead,Product Enquiry,ഉൽപ്പന്ന അറിയുവാനുള്ള
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,ആദ്യം കമ്പനി നൽകുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,ടാർഗറ്റിൽ
+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 +9,Activity Log:,പ്രവർത്തന ലോഗ്:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,ഇനം {0} വ്യവസ്ഥിതിയിൽ നിലവിലില്ല അല്ലെങ്കിൽ കാലഹരണപ്പെട്ടു
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,ഇനം {0} ഒരു വാങ്ങൽ ഇനം ആയിരിക്കണം
 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 +444,Item {0} is not active or end of life has been reached,ഇനം {0} സജീവ അല്ലെങ്കിൽ ജീവിതാവസാനം അല്ല എത്തികഴിഞ്ഞു
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,ഇനം {0} സജീവ അല്ലെങ്കിൽ ജീവിതാവസാനം അല്ല എത്തികഴിഞ്ഞു
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,സെയിൽസ് ഇൻവോയിസ് സമർപ്പിച്ചു കഴിഞ്ഞാൽ അപ്ഡേറ്റ് ചെയ്യും.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,എച്ച് മൊഡ്യൂൾ വേണ്ടി ക്രമീകരണങ്ങൾ
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,പ്രവർത്തനങ്ങൾ വിശദാംശങ്ങൾ പുറത്തു കൊണ്ടുപോയി.
 DocType: Serial No,Maintenance Status,മെയിൻറനൻസ് അവസ്ഥ
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,ഇനങ്ങൾ ഉള്ളവയും
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},തീയതി നിന്നും സാമ്പത്തിക വർഷത്തെ ആയിരിക്കണം. ഈ തീയതി മുതൽ കരുതുന്നു = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},തീയതി നിന്നും സാമ്പത്തിക വർഷത്തെ ആയിരിക്കണം. ഈ തീയതി മുതൽ കരുതുന്നു = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,നിങ്ങൾ മൂല്യനിർണയം സൃഷ്ടിക്കുകയാണ് ആർക്കുവേണ്ടി ജീവനക്കാരൻ തിരഞ്ഞെടുക്കുക.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},കേന്ദ്രം {0} കോസ്റ്റ് കമ്പനി {1} സ്വന്തമല്ല
 DocType: Customer,Individual,വ്യക്തിഗത
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,ഫിനാൻസിംഗ് നിന്നുള്ള നെറ്റ് ക്യാഷ്
 DocType: Lead,Address & Contact,വിലാസം &amp; ബന്ധപ്പെടാനുള്ള
 DocType: Leave Allocation,Add unused leaves from previous allocations,മുൻ വിഹിതം നിന്ന് ഉപയോഗിക്കാത്ത ഇലകൾ ചേർക്കുക
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},അടുത്തത് ആവർത്തിക്കുന്നു {0} {1} സൃഷ്ടിക്കപ്പെടും
@@ -221,6 +222,7 @@
 ,Contact Name,കോൺടാക്റ്റ് പേര്
 DocType: Production Plan Item,SO Pending Qty,ഷൂട്ട്ഔട്ട് ശേഷിക്കുന്നു Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,മുകളിൽ സൂചിപ്പിച്ച മാനദണ്ഡങ്ങൾ ശമ്പളം സ്ലിപ്പ് തയ്യാറാക്കുന്നു.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,വിവരണം നൽകിയിട്ടില്ല
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,വാങ്ങിയതിന് അഭ്യർത്ഥന.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,മാത്രം തിരഞ്ഞെടുത്ത അനുവാദ Approver ഈ അനുവാദ ആപ്ലിക്കേഷൻ സമർപ്പിക്കാം
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,തീയതി വിടുതൽ ചേരുന്നു തീയതി വലുതായിരിക്കണം
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,ഇനം വെബ്സൈറ്റ് സ്പെസിഫിക്കേഷൻ
 DocType: Payment Tool,Reference No,റഫറൻസ് ഇല്ല
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,വിടുക തടയപ്പെട്ട
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,വാർഷിക
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ഓഹരി അനുരഞ്ജനം ഇനം
 DocType: Stock Entry,Sales Invoice No,സെയിൽസ് ഇൻവോയിസ് ഇല്ല
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,വിതരണക്കാരൻ തരം
 DocType: Item,Publish in Hub,ഹബ് ലെ പ്രസിദ്ധീകരിക്കുക
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Bank Reconciliation,Update Clearance Date,അപ്ഡേറ്റ് ക്ലിയറൻസ് തീയതി
 DocType: Item,Purchase Details,വിശദാംശങ്ങൾ വാങ്ങുക
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ഇനം {0} വാങ്ങൽ ഓർഡർ {1} ൽ &#39;അസംസ്കൃത വസ്തുക്കളുടെ നൽകിയത് മേശയിൽ കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ഇനം {0} വാങ്ങൽ ഓർഡർ {1} ൽ &#39;അസംസ്കൃത വസ്തുക്കളുടെ നൽകിയത് മേശയിൽ കണ്ടെത്തിയില്ല
 DocType: Employee,Relation,ബന്ധം
 DocType: Shipping Rule,Worldwide Shipping,ലോകമൊട്ടാകെ ഷിപ്പിംഗ്
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ഇടപാടുകാർ നിന്ന് സ്ഥിരീകരിച്ച ഓർഡറുകൾ.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,നിർദ്ദേശങ്ങൾ
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"ഈ പ്രദേശത്തിന്റെ മേൽ ഇനം ഗ്രൂപ്പ് തിരിച്ചുള്ള ബജറ്റുകൾ സജ്ജമാക്കുക. ഇതിനു പുറമേ, വിതരണം ക്റമികരിക്കുക seasonality ഉൾപ്പെടുത്താൻ കഴിയും."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},പണ്ടകശാല {0} വേണ്ടി പാരന്റ് അക്കൗണ്ട് ഗ്രൂപ്പ് നൽകുക
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} നിലവിലുള്ള തുക {2} വലുതായിരിക്കും കഴിയില്ല നേരെ പേയ്മെന്റ്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} നിലവിലുള്ള തുക {2} വലുതായിരിക്കും കഴിയില്ല നേരെ പേയ്മെന്റ്
 DocType: Supplier,Address HTML,വിലാസം എച്ച്ടിഎംഎൽ
 DocType: Lead,Mobile No.,മൊബൈൽ നമ്പർ
 DocType: Maintenance Schedule,Generate Schedule,ഷെഡ്യൂൾ ജനറേറ്റുചെയ്യൂ
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,പുതിയ
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,മാക്സ് 5 അക്ഷരങ്ങള്
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,പട്ടികയിലുള്ള ആദ്യത്തെ അനുവാദ Approver സ്വതവേയുള്ള അനുവാദ Approver സജ്ജമാക്കപ്പെടും
+apps/erpnext/erpnext/config/desktop.py +73,Learn,അറിയുക
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ജീവനക്കാർ ശതമാനം പ്രവർത്തനം ചെലവ്
 DocType: Accounts Settings,Settings for Accounts,അക്കൗണ്ടുകൾക്കുമുള്ള ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,സെയിൽസ് പേഴ്സൺ ട്രീ നിയന്ത്രിക്കുക.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,മൾട്ടി കറൻസി
 DocType: Payment Reconciliation Invoice,Invoice Type,ഇൻവോയിസ് തരം
 DocType: Sales Invoice Item,Delivery Note,ഡെലിവറി നോട്ട്
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,നികുതികൾ സജ്ജമാക്കുന്നു
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,നികുതികൾ സജ്ജമാക്കുന്നു
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,നിങ്ങൾ അതു കടിച്ചുകീറി ശേഷം പെയ്മെന്റ് എൻട്രി പരിഷ്ക്കരിച്ചു. വീണ്ടും തുടയ്ക്കുക ദയവായി.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} ഇനം നികുതി തവണ പ്രവേശിച്ചപ്പോൾ
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} ഇനം നികുതി തവണ പ്രവേശിച്ചപ്പോൾ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,ഈ ആഴ്ച തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾക്കായി ചുരുക്കം
 DocType: Workstation,Rent Cost,രെംട് ചെലവ്
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,മാസം വർഷം തിരഞ്ഞെടുക്കുക
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM ലേക്ക്, ഡെലിവറി നോട്ട്, വാങ്ങൽ ഇൻവോയിസ്, പ്രൊഡക്ഷൻ ഓർഡർ, പർച്ചേസ് ഓർഡർ, പർച്ചേസ് രസീത്, സെയിൽസ് ഇൻവോയിസ്, സെയിൽസ് ഓർഡർ, ഓഹരി എൻട്രി, Timesheet ലഭ്യം"
 DocType: Item Tax,Tax Rate,നികുതി നിരക്ക്
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,ഇനം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,ഇനം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","ഇനം: {0} ബാച്ച് തിരിച്ചുള്ള നിയന്ത്രിത, \ സ്റ്റോക്ക് അനുരഞ്ജന ഉപയോഗിച്ച് നിരന്നു കഴിയില്ല, പകരം ഓഹരി എൻട്രി ഉപയോഗിക്കുക"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,വാങ്ങൽ ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു ആണ്
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,വാങ്ങൽ ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു ആണ്
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},വരി # {0}: ബാച്ച് ഇല്ല {1} {2} അതേ ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,നോൺ-ഗ്രൂപ്പ് പരിവർത്തനം
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,പർച്ചേസ് റെസീപ്റ്റ് സമർപ്പിക്കേണ്ടതാണ്
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,മെഡിക്കൽ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,നഷ്ടപ്പെടുമെന്നു കാരണം
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,സിംഗിൾ
 DocType: Issue,Attachment,അറ്റാച്ചുമെൻറ്
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,ബജറ്റ് ഗ്രൂപ്പ് ചെലവ് കേന്ദ്രം വേണ്ടി സജ്ജമാക്കാൻ കഴിയില്ല
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,ഹോളിഡേ മാസ്റ്റർ.
 DocType: Material Request Item,Required Date,ആവശ്യമായ തീയതി
 DocType: Delivery Note,Billing Address,ബില്ലിംഗ് വിലാസം
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,ഇനം കോഡ് നൽകുക.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,ഇനം കോഡ് നൽകുക.
 DocType: BOM,Costing,ആറെണ്ണവും
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","ചെക്കുചെയ്തെങ്കിൽ ഇതിനകം പ്രിന്റ് റേറ്റ് / പ്രിന്റ് തുക ഉൾപ്പെടുത്തിയിട്ടുണ്ട് പോലെ, നികുതി തുക പരിഗണിക്കും"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,ആകെ Qty
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
 DocType: Shipping Rule,Net Weight,മൊത്തം ഭാരം
 DocType: Employee,Emergency Phone,എമർജൻസി ഫോൺ
 ,Serial No Warranty Expiry,സീരിയൽ വാറണ്ടിയില്ല കാലഹരണ
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,വർദ്ധന 0 ആയിരിക്കും കഴിയില്ല
 DocType: Production Planning Tool,Material Requirement,മെറ്റീരിയൽ ആവശ്യകതകൾ
 DocType: Company,Delete Company Transactions,കമ്പനി ഇടപാടുകൾ ഇല്ലാതാക്കുക
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,ഇനം {0} ഇനം വാങ്ങുക അല്ല
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,ഇനം {0} ഇനം വാങ്ങുക അല്ല
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} &#39;അറിയിപ്പ് \ ഇമെയിൽ വിലാസം&#39; തെറ്റായ ഇമെയിൽ വിലാസമാണ്
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,ആകെ ബില്ലിംഗ് ഈ വർഷം:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ എഡിറ്റ് നികുതികളും ചുമത്തിയിട്ടുള്ള ചേർക്കുക
 DocType: Purchase Invoice,Supplier Invoice No,വിതരണക്കമ്പനിയായ ഇൻവോയിസ് ഇല്ല
 DocType: Territory,For reference,പരിഗണനയ്ക്കായി
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","അത് സ്റ്റോക്ക് ഇടപാടുകൾ ഉപയോഗിക്കുന്ന പോലെ, {0} സീരിയൽ ഇല്ല ഇല്ലാതാക്കാൻ കഴിയില്ല"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),(CR) അടയ്ക്കുന്നു
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),(CR) അടയ്ക്കുന്നു
 DocType: Serial No,Warranty Period (Days),വാറന്റി പിരീഡ് (ദിവസം)
 DocType: Installation Note Item,Installation Note Item,ഇന്സ്റ്റലേഷന് കുറിപ്പ് ഇനം
 ,Pending Qty,തീർച്ചപ്പെടുത്തിയിട്ടില്ല Qty
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",** പ്രതിമാസ വിതരണം ** നിങ്ങളുടെ ബിസിനസ്സിൽ seasonality ഉണ്ടെങ്കിൽ മാസം ഉടനീളം നിങ്ങളുടെ ബജറ്റ് വിതരണം സഹായിക്കുന്നു. ഈ വിതരണ ഉപയോഗിച്ച് ഒരു ബജറ്റ് വിതരണം ** കോസ്റ്റ് സെന്ററിലെ ** ഈ ** പ്രതിമാസ വിതരണം സജ്ജമാക്കുന്നതിനായി **
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,ഇൻവോയിസ് പട്ടികയിൽ കണ്ടെത്തിയില്ല റെക്കോർഡുകൾ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,ഇൻവോയിസ് പട്ടികയിൽ കണ്ടെത്തിയില്ല റെക്കോർഡുകൾ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"ആദ്യം കമ്പനി, പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,ഫിനാൻഷ്യൽ / അക്കൌണ്ടിംഗ് വർഷം.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ക്ഷമിക്കണം, സീരിയൽ ഒഴിവ് ലയിപ്പിക്കാൻ കഴിയില്ല"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,പ്രോജക്ട് ടാസ്ക്
 ,Lead Id,ലീഡ് ഐഡി
 DocType: C-Form Invoice Detail,Grand Total,ആകെ തുക
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി വലുതായിരിക്കും പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി വലുതായിരിക്കും പാടില്ല
 DocType: Warranty Claim,Resolution,മിഴിവ്
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},കൈമാറി: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},കൈമാറി: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,അടയ്ക്കേണ്ട അക്കൗണ്ട്
 DocType: Sales Order,Billing and Delivery Status,"ബില്ലിംഗ്, ഡെലിവറി സ്റ്റാറ്റസ്"
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ആവർത്തിക്കുക ഇടപാടുകാർ
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,ക്വട്ടേഷൻ ചെയ്യുക
 DocType: Lead,Middle Income,മിഡിൽ ആദായ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),തുറക്കുന്നു (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,പദ്ധതി തുക നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 DocType: Purchase Order Item,Billed Amt,വസതി ശാരീരിക
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,സ്റ്റോക്ക് എൻട്രികൾ നിർമ്മിക്കുന്ന നേരെ ഒരു ലോജിക്കൽ വെയർഹൗസ്.
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,പ്രൊഡക്ഷൻ ഓർഡർ നിർബന്ധമായും
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Proposal എഴുത്ത്
 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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},{4} {5} ൽ {2} {3} ന് സംഭരണശാല {1} ൽ ഇനം {0} നെഗറ്റീവ് ഓഹരി പിശക് ({6})
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},{4} {5} ൽ {2} {3} ന് സംഭരണശാല {1} ൽ ഇനം {0} നെഗറ്റീവ് ഓഹരി പിശക് ({6})
 DocType: Fiscal Year Company,Fiscal Year Company,ധനകാര്യ വർഷം കമ്പനി
 DocType: Packing Slip Item,DN Detail,ഡിഎൻ വിശദാംശം
 DocType: Time Log,Billed,വസതി
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,സ്ഥിരസ്ഥിതി ആറെണ്ണവും റേറ്റ്
 DocType: Maintenance Schedule,Maintenance Schedule,മെയിൻറനൻസ് ഷെഡ്യൂൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","അപ്പോൾ വിലനിർണ്ണയത്തിലേക്ക് കസ്റ്റമർ, കസ്റ്റമർ ഗ്രൂപ്പ്, ടെറിട്ടറി, വിതരണക്കാരൻ, വിതരണക്കാരൻ ടൈപ്പ്, കാമ്പയിൻ, തുടങ്ങിയവ സെയിൽസ് പങ്കാളി അടിസ്ഥാനമാക്കി ഔട്ട് ഫിൽറ്റർ"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,ഇൻവെന്ററി ലെ മൊത്തം മാറ്റം
 DocType: Employee,Passport Number,പാസ്പോർട്ട് നമ്പർ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,മാനേജർ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,വാങ്ങൽ രസീത് നിന്ന്
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,ഒരേ ഇനം ഒന്നിലധികം തവണ നൽകി ചെയ്തിട്ടുണ്ട്.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,വാങ്ങൽ രസീത് നിന്ന്
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,ഒരേ ഇനം ഒന്നിലധികം തവണ നൽകി ചെയ്തിട്ടുണ്ട്.
 DocType: SMS Settings,Receiver Parameter,റിസീവർ പാരാമീറ്റർ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;അടിസ്ഥാനമാക്കി&#39; എന്നതും &#39;ഗ്രൂപ്പ് സത്യം ഒന്നുതന്നെയായിരിക്കരുത്
 DocType: Sales Person,Sales Person Targets,സെയിൽസ് വ്യാക്തി ടാർഗെറ്റ്
 DocType: Production Order Operation,In minutes,മിനിറ്റുകൾക്കുള്ളിൽ
 DocType: Issue,Resolution Date,റെസല്യൂഷൻ തീയതി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
 DocType: Selling Settings,Customer Naming By,ഉപയോക്താക്കൾക്കായി നാമകരണ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,ഗ്രൂപ്പ് പരിവർത്തനം
 DocType: Activity Cost,Activity Type,പ്രവർത്തന തരം
@@ -534,7 +538,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} ഇൻവോയിസ് വിവരങ്ങൾ ടേബിൾ കണ്ടതുമില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,മെയിൻറനൻസ് സന്ദർശിക്കുക {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
 DocType: Material Request,Material Transfer,മെറ്റീരിയൽ ട്രാൻസ്ഫർ
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,മാർക്കറ്റിംഗ്
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,വിൽപ്പന ഇനത്തെ ട്രാക്ക് അവരുടെ സീരിയൽ എണ്ണം അടിസ്ഥാനമാക്കി രേഖകൾ വാങ്ങാൻ. അതും ഉൽപ്പന്നം വാറന്റി വിശദാംശങ്ങൾ ട്രാക്കുചെയ്യുന്നതിന് ഉപയോഗിച്ച് കഴിയും ആണ്.
 DocType: Purchase Receipt Item Supplied,Current Stock,ഇപ്പോഴത്തെ സ്റ്റോക്ക്
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,നിരസിച്ച വെയർഹൗസ് regected ഇനത്തിന്റെ നേരെ നിർബന്ധമായും
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,ആകെ ബില്ലിംഗ് ഈ വർഷം
 DocType: Account,Expenses Included In Valuation,മൂലധനം ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചിലവുകൾ
 DocType: Employee,Provide email id registered in company,കമ്പനിയുടെ രജിസ്റ്റർ ഇമെയിൽ ഐഡി നൽകുക
 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 +533,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ട്രീ തരം
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 DocType: Mode of Payment Account,Default Account,സ്ഥിര അക്കൗണ്ട്
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,അവസരം ലീഡ് നിന്നും ചെയ്താൽ ലീഡ് സജ്ജമാക്കാൻ വേണം
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,പ്രതിവാര അവധി ദിവസം തിരഞ്ഞെടുക്കുക
 DocType: Production Order Operation,Planned End Time,പ്ലാൻ ചെയ്തു അവസാനിക്കുന്ന സമയം
 ,Sales Person Target Variance Item Group-Wise,സെയിൽസ് പേഴ്സൺ ടാര്ഗറ്റ് പൊരുത്തമില്ലായ്മ ഇനം ഗ്രൂപ്പ് യുക്തിമാനുമാണ്
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,നിലവിലുള്ള ഇടപാട് ഉപയോഗിച്ച് അക്കൗണ്ട് ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,നിലവിലുള്ള ഇടപാട് ഉപയോഗിച്ച് അക്കൗണ്ട് ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
 DocType: Delivery Note,Customer's Purchase Order No,കസ്റ്റമർ പർച്ചേസ് ഓർഡർ ഇല്ല
 DocType: Employee,Cell Number,സെൽ നമ്പർ
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,യാന്ത്രികമായി സൃഷ്ടിച്ചത് മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,നഷ്ടപ്പെട്ട
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,നിങ്ങൾ കോളം &#39;ജേർണൽ എൻട്രി എഗൻസ്റ്റ്&#39; നിലവിലുള്ള വൗച്ചർ നൽകുക കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,നിങ്ങൾ കോളം &#39;ജേർണൽ എൻട്രി എഗൻസ്റ്റ്&#39; നിലവിലുള്ള വൗച്ചർ നൽകുക കഴിയില്ല
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,എനർജി
 DocType: Opportunity,Opportunity From,നിന്ന് ഓപ്പർച്യൂനിറ്റി
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,പ്രതിമാസ ശമ്പളം പ്രസ്താവന.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: {1} തരത്തിലുള്ള {0} നിന്ന്
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,വരി {0}: പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,അക്കൗണ്ടിംഗ് എൻട്രികൾ ഇല നോഡുകൾ നേരെ കഴിയും. ഗ്രൂപ്പുകൾ നേരെ എൻട്രികൾ അനുവദനീയമല്ല.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,അത് മറ്റ് BOMs ബന്ധിപ്പിച്ചിരിക്കുന്നതു പോലെ BOM നിർജ്ജീവമാക്കി അല്ലെങ്കിൽ റദ്ദാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,അത് മറ്റ് BOMs ബന്ധിപ്പിച്ചിരിക്കുന്നതു പോലെ BOM നിർജ്ജീവമാക്കി അല്ലെങ്കിൽ റദ്ദാക്കാൻ കഴിയില്ല
 DocType: Opportunity,Maintenance,മെയിൻറനൻസ്
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},ഇനം {0} ആവശ്യമുള്ളതിൽ വാങ്ങൽ രസീത് എണ്ണം
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},ഇനം {0} ആവശ്യമുള്ളതിൽ വാങ്ങൽ രസീത് എണ്ണം
 DocType: Item Attribute Value,Item Attribute Value,ഇനത്തിനും മൂല്യം
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,സെയിൽസ് പ്രചാരണങ്ങൾ.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,വില പട്ടിക തിരഞ്ഞെടുത്തിട്ടില്ല
 DocType: Employee,Family Background,കുടുംബ പശ്ചാത്തലം
 DocType: Process Payroll,Send Email,ഇമെയിൽ അയയ്ക്കുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},മുന്നറിയിപ്പ്: അസാധുവായ സഹപത്രങ്ങൾ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},മുന്നറിയിപ്പ്: അസാധുവായ സഹപത്രങ്ങൾ {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,ഇല്ല അനുമതി
 DocType: Company,Default Bank Account,സ്ഥിരസ്ഥിതി ബാങ്ക് അക്കൗണ്ട്
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","പാർട്ടി അടിസ്ഥാനമാക്കി ഫിൽട്ടർ, ആദ്യം പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,ഒഴിവ്
 DocType: Item,Items with higher weightage will be shown higher,ചിത്രം വെയ്റ്റേജ് ഇനങ്ങൾ ചിത്രം കാണിക്കും
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ബാങ്ക് അനുരഞ്ജനം വിശദാംശം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,എന്റെ ഇൻവോയിസുകൾ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,എന്റെ ഇൻവോയിസുകൾ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,ജീവനക്കാരൻ കണ്ടെത്തിയില്ല
 DocType: Purchase Order,Stopped,നിർത്തി
 DocType: Item,If subcontracted to a vendor,ഒരു വെണ്ടർ വരെ subcontracted എങ്കിൽ
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ഇപ്പോൾ അയയ്ക്കുക
 ,Support Analytics,പിന്തുണ അനലിറ്റിക്സ്
 DocType: Item,Website Warehouse,വെബ്സൈറ്റ് വെയർഹൗസ്
+DocType: Payment Reconciliation,Minimum Invoice Amount,മിനിമം ഇൻവോയിസ് തുക
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ഓട്ടോ ഇൻവോയ്സ് 05, 28 തുടങ്ങിയവ ഉദാ നിർമ്മിക്കപ്പെടും ഏതെല്ലാം മാസത്തിലെ ദിവസം"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,സ്കോർ കുറവോ അല്ലെങ്കിൽ 5 വരെയോ ആയിരിക്കണം
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,സി-ഫോം റെക്കോർഡുകൾ
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;പോയിന്റ് വില്പനയ്ക്ക് എന്ന&quot; സവിശേഷതകൾ സജ്ജമാക്കുന്നതിനായി
 DocType: Bin,Moving Average Rate,മാറുന്ന ശരാശരി റേറ്റ്
 DocType: Production Planning Tool,Select Items,ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} ബിൽ {1} നേരെ {2} dated
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} ബിൽ {1} നേരെ {2} dated
 DocType: Maintenance Visit,Completion Status,പൂർത്തീകരണവും അവസ്ഥ
 DocType: Sales Invoice Item,Target Warehouse,ടാർജറ്റ് വെയർഹൗസ്
 DocType: Item,Allow over delivery or receipt upto this percent,ഈ ശതമാനം വരെ ഡെലിവറി അല്ലെങ്കിൽ രസീത് മേൽ അനുവദിക്കുക
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,യാന്ത്രികമായി ഇടപാടുകളുടെ സമർപ്പിക്കാനുള്ള സന്ദേശം എഴുതുക.
 DocType: Production Order,Item To Manufacture,നിർമ്മിക്കാനുള്ള ഇനം
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} നില {2} ആണ്
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,പെയ്മെന്റ് നയിക്കുന്ന വാങ്ങുക
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,പെയ്മെന്റ് നയിക്കുന്ന വാങ്ങുക
 DocType: Sales Order Item,Projected Qty,അനുമാനിക്കപ്പെടുന്ന Qty
 DocType: Sales Invoice,Payment Due Date,പെയ്മെന്റ് നിശ്ചിത തീയതിയിൽ
 DocType: Newsletter,Newsletter Manager,വാർത്താക്കുറിപ്പ് മാനേജർ
@@ -704,7 +709,7 @@
 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 +304,Point-of-Sale,പോയിന്റ്-ഓഫ്-വില്പനയ്ക്ക്
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","അക്കൗണ്ട് ബാലൻസ് ഇതിനകം ക്രെഡിറ്റ്, നിങ്ങൾ സജ്ജീകരിക്കാൻ അനുവദനീയമല്ല &#39;ഡെബിറ്റ്&#39; ആയി &#39;ബാലൻസ് ആയിരിക്കണം&#39;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","അക്കൗണ്ട് ബാലൻസ് ഇതിനകം ക്രെഡിറ്റ്, നിങ്ങൾ സജ്ജീകരിക്കാൻ അനുവദനീയമല്ല &#39;ഡെബിറ്റ്&#39; ആയി &#39;ബാലൻസ് ആയിരിക്കണം&#39;"
 DocType: Account,Balance must be,ബാലൻസ് ആയിരിക്കണം
 DocType: Hub Settings,Publish Pricing,പ്രൈസിങ് പ്രസിദ്ധീകരിക്കുക
 DocType: Notification Control,Expense Claim Rejected Message,ചിലവിടൽ ക്ലെയിം സന്ദേശം നിരസിച്ചു
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,നാണയ വിനിമയ നിരക്ക് മാസ്റ്റർ.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM ലേക്ക് {0} സജീവ ആയിരിക്കണം
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM ലേക്ക് {0} സജീവ ആയിരിക്കണം
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,ആദ്യം ഡോക്യുമെന്റ് തരം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ഈ മെയിൻറനൻസ് സന്ദർശനം റദ്ദാക്കുന്നതിൽ മുമ്പ് മെറ്റീരിയൽ സന്ദർശനങ്ങൾ {0} റദ്ദാക്കുക
 DocType: Salary Slip,Leave Encashment Amount,ലീവ് തുക വിടുക
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,സ്ഥിരസ്ഥിതി അടയ്ക്കേണ്ട തുക
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,ജീവനക്കാർ {0} സജീവമല്ല അല്ലെങ്കിൽ നിലവിലില്ല
 DocType: Features Setup,Item Barcode,ഇനം ബാർകോഡ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
 DocType: Quality Inspection Reading,Reading 6,6 Reading
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,വാങ്ങൽ ഇൻവോയിസ് അഡ്വാൻസ്
 DocType: Address,Shop,കട
 DocType: Hub Settings,Sync Now,ഇപ്പോൾ സമന്വയിപ്പിക്കുക
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},വരി {0}: ക്രെഡിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},വരി {0}: ക്രെഡിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ഈ മോഡ് തെരഞ്ഞെടുക്കുമ്പോഴും സ്വതേ ബാങ്ക് / ക്യാഷ് അംഗത്വം POS ൽ ഇൻവോയിസ് അപ്ഡേറ്റ് ചെയ്യും.
 DocType: Employee,Permanent Address Is,സ്ഥിര വിലാസം തന്നെയല്ലേ
 DocType: Production Order Operation,Operation completed for how many finished goods?,ഓപ്പറേഷൻ എത്ര പൂർത്തിയായി ഗുഡ്സ് പൂർത്തിയായെന്നും?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ബ്രാൻഡ്
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,{0} over- വേണ്ടി അലവൻസ് ഇനം {1} വേണ്ടി കടന്നു.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0} over- വേണ്ടി അലവൻസ് ഇനം {1} വേണ്ടി കടന്നു.
 DocType: Employee,Exit Interview Details,നിന്ന് പുറത്തുകടക്കുക അഭിമുഖം വിശദാംശങ്ങൾ
 DocType: Item,Is Purchase Item,വാങ്ങൽ ഇനം തന്നെയല്ലേ
 DocType: Journal Entry Account,Purchase Invoice,വാങ്ങൽ ഇൻവോയിസ്
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,വാക്കുകളിൽ ആകെ
 DocType: Material Request Item,Lead Time Date,ലീഡ് സമയം തീയതി
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,നിർബന്ധമാണ്. ഒരുപക്ഷേ കറൻസി എക്സ്ചേഞ്ച് റെക്കോഡ് സൃഷ്ടിച്ചു ചെയ്തിട്ടില്ല
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},വരി # {0}: ഇനം {1} വേണ്ടി സീരിയൽ ഇല്ല വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},വരി # {0}: ഇനം {1} വേണ്ടി സീരിയൽ ഇല്ല വ്യക്തമാക്കുക
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","&#39;ഉൽപ്പന്ന ബണ്ടിൽ&#39; ഇനങ്ങൾ, വെയർഹൗസ്, സീരിയൽ ഇല്ല ആൻഡ് ബാച്ച് യാതൊരു &#39;പായ്ക്കിംഗ് ലിസ്റ്റ് മേശയിൽ നിന്നും പരിഗണിക്കും. സംഭരണശാല ആൻഡ് ബാച്ച് ഇല്ല ഏതെങ്കിലും &#39;ഉൽപ്പന്ന ബണ്ടിൽ&#39; ഇനത്തിനായി എല്ലാ പാക്കിംഗ് ഇനങ്ങളും ഒരേ എങ്കിൽ, ആ മൂല്യങ്ങൾ പ്രധാന ഇനം പട്ടികയിൽ നേടിയെടുക്കുകയും ചെയ്യാം, മൂല്യങ്ങൾ &#39;പാക്കിംഗ് പട്ടിക&#39; മേശയുടെ പകർത്തുന്നു."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ഉപഭോക്താക്കൾക്ക് കയറ്റുമതി.
 DocType: Purchase Invoice Item,Purchase Order Item,വാങ്ങൽ ഓർഡർ ഇനം
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,ഭിന്നിച്ചു
 ,Company Name,കമ്പനി പേര്
 DocType: SMS Center,Total Message(s),ആകെ സന്ദേശം (ങ്ങൾ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,ട്രാൻസ്ഫർ വേണ്ടി ഇനം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,ചെക്ക് സൂക്ഷിച്ചത് എവിടെ ബാങ്കിന്റെ അക്കൗണ്ട് തല തിരഞ്ഞെടുക്കുക.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ഉപയോക്തൃ ഇടപാടുകൾ ൽ വില പട്ടിക റേറ്റ് എഡിറ്റ് ചെയ്യാൻ അനുവദിക്കുക
 DocType: Pricing Rule,Max Qty,മാക്സ് Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,കെമിക്കൽ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,എല്ലാ ഇനങ്ങളും ഇതിനകം ഈ പ്രൊഡക്ഷൻ ഓർഡർ കൈമാറ്റം ചെയ്തു.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,എല്ലാ ഇനങ്ങളും ഇതിനകം ഈ പ്രൊഡക്ഷൻ ഓർഡർ കൈമാറ്റം ചെയ്തു.
 DocType: Process Payroll,Select Payroll Year and Month,ശമ്പളപ്പട്ടിക വർഷവും മാസവും തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",തരത്തിലുള്ള) ചൈൽഡ് ചേർക്കുക ക്ലിക്ക് ചെയ്തു കൊണ്ട് (&quot;ബാങ്ക് &#39;ആവശ്യമായ ഗ്രൂപ്പ് (ഫണ്ട് സാധാരണയായി ആപ്ലിക്കേഷൻ&gt; ഇപ്പോഴത്തെ ആസ്തികൾ&gt; ബാങ്ക് അക്കൗണ്ടുകൾ പോകുക ഒരു പുതിയ അക്കൗണ്ട് സൃഷ്ടിക്കാൻ
 DocType: Workstation,Electricity Cost,വൈദ്യുതി ചെലവ്
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),എല്ലാ ലീഡ് (തുറക്കുക)
 DocType: Purchase Invoice,Get Advances Paid,അഡ്വാൻസുകളും പണം ലഭിക്കുന്നത്
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,നിങ്ങളുടെ ചിത്രം അറ്റാച്ച്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,നിർമ്മിക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,നിർമ്മിക്കുക
 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 +3,My Cart,എന്റെ വണ്ടി
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,എന്റെ വണ്ടി
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Qty തുറക്കുന്നു
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,ക്യാഷ് / ബാങ്ക് അക്കൗണ്ട്
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,അളവ് അല്ലെങ്കിൽ മൂല്യം മാറ്റമൊന്നും വരുത്താതെ ഇനങ്ങളെ നീക്കംചെയ്തു.
 DocType: Delivery Note,Delivery To,ഡെലിവറി
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
 DocType: Production Planning Tool,Get Sales Orders,സെയിൽസ് ഉത്തരവുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,ഡിസ്കൗണ്ട്
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,ഡിസ്കൗണ്ട്
 DocType: Features Setup,Purchase Discounts,ഡിസ്കൗണ്ട് വാങ്ങുക
 DocType: Workstation,Wages,വേതനം
 DocType: Time Log,Will be updated only if Time Log is 'Billable',സമയം പ്രവേശിക്കുക &#39;ബില്ലുചെയ്യാവുന്നത്&#39; മാത്രമേ അപ്ഡേറ്റ് ചെയ്യും
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,ഷിപ്പിംഗ് സ്റ്റേറ്റ്
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ഇനം ബട്ടൺ &#39;വാങ്ങൽ വരവ് നിന്നുള്ള ഇനങ്ങൾ നേടുക&#39; ഉപയോഗിച്ച് ചേർക്കണം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,സെയിൽസ് ചെലവുകൾ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,സ്റ്റാൻഡേർഡ് വാങ്ങൽ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,സ്റ്റാൻഡേർഡ് വാങ്ങൽ
 DocType: GL Entry,Against,എഗെൻസ്റ്റ്
 DocType: Item,Default Selling Cost Center,സ്ഥിരസ്ഥിതി അതേസമയം ചെലവ് കേന്ദ്രം
 DocType: Sales Partner,Implementation Partner,നടപ്പാക്കൽ പങ്കാളി
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,വിതരണക്കാരൻ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ഷോപ്പിംഗ് കാർട്ട് ഷിപ്പിംഗ് റൂൾ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,പ്രൊഡക്ഷൻ ഓർഡർ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',&#39;പ്രയോഗിക്കുക അഡീഷണൽ ഡിസ്കൌണ്ട്&#39; സജ്ജീകരിക്കുക
 ,Ordered Items To Be Billed,ബില്ല് ഉത്തരവിട്ടു ഇനങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,റേഞ്ച് നിന്നും പരിധി വരെ കുറവ് ഉണ്ട്
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,സമയം ലോഗുകൾ തിരഞ്ഞെടുത്ത് ഒരു പുതിയ സെയിൽസ് ഇൻവോയിസ് സൃഷ്ടിക്കാൻ സമർപ്പിക്കുക.
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,ഈ സമയം ലോഗ് ബാച്ച് ഈടാക്കൂ ചെയ്തു.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,ഓപ്പർച്യൂനിറ്റി സൃഷ്ടിക്കുക
 DocType: Salary Slip,Leave Without Pay,ശമ്പള ഇല്ലാതെ വിടുക
-DocType: Supplier,Communications,കമ്മ്യൂണിക്കേഷൻസ്
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,ശേഷി ആസൂത്രണ പിശക്
 ,Trial Balance for Party,പാർട്ടി ട്രയൽ ബാലൻസ്
 DocType: Lead,Consultant,ഉപദേഷ്ടാവ്
 DocType: Salary Slip,Earnings,വരുമാനം
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,ഫിനിഷ്ഡ് ഇനം {0} ഉൽപാദനം തരം എൻട്രി നൽകിയ വേണം
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,തുറക്കുന്നു അക്കൗണ്ടിംഗ് ബാലൻസ്
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,ഫിനിഷ്ഡ് ഇനം {0} ഉൽപാദനം തരം എൻട്രി നൽകിയ വേണം
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,തുറക്കുന്നു അക്കൗണ്ടിംഗ് ബാലൻസ്
 DocType: Sales Invoice Advance,Sales Invoice Advance,സെയിൽസ് ഇൻവോയിസ് അഡ്വാൻസ്
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,അഭ്യർത്ഥിക്കാൻ ഒന്നുമില്ല
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;യഥാർത്ഥ ആരംഭ തീയതി&#39; &#39;യഥാർത്ഥ അവസാന തീയതി&#39; വലുതായിരിക്കും കഴിയില്ല
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,നടപ്പ് സാമ്പത്തിക വർഷം
 DocType: Global Defaults,Disable Rounded Total,വൃത്തത്തിലുള്ള ആകെ അപ്രാപ്തമാക്കുക
 DocType: Lead,Call,കോൾ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;എൻട്രികൾ&#39; ഒഴിച്ചിടാനാവില്ല
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&#39;എൻട്രികൾ&#39; ഒഴിച്ചിടാനാവില്ല
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},{1} അതേ കൂടെ വരി {0} തനിപ്പകർപ്പെടുക്കുക
 ,Trial Balance,ട്രയൽ ബാലൻസ്
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,എംപ്ലോയീസ് സജ്ജമാക്കുന്നു
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,യൂസർ ഐഡി
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,കാണുക ലെഡ്ജർ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,പഴയവ
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group","ഒരു ഇനം ഗ്രൂപ്പ് ഇതേ പേരിലുള്ള നിലവിലുണ്ട്, ഐറ്റം പേര് മാറ്റാനോ ഐറ്റം ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി"
 DocType: Production Order,Manufacture against Sales Order,സെയിൽസ് ഓർഡർ നേരെ ഉല്പാദനം
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,ലോകം റെസ്റ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,മൊത്തം വേതനം
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},ശീതീകരിച്ച അക്കൗണ്ട് {0} എഡിറ്റുചെയ്യാൻ
 DocType: Journal Entry,Get Outstanding Invoices,മികച്ച ഇൻവോയിസുകൾ നേടുക
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,സെയിൽസ് ഓർഡർ {0} സാധുവല്ല
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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} മുതൽ ശ്രമിക്കുക
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,പുറപ്പെടുവിച്ച സ്ഥലം
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,കരാര്
 DocType: Email Digest,Add Quote,ഉദ്ധരണി ചേർക്കുക
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM വേണ്ടി ആവശ്യമായ UOM coversion ഘടകം: ഇനം ലെ {0}: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM വേണ്ടി ആവശ്യമായ UOM coversion ഘടകം: ഇനം ലെ {0}: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,പരോക്ഷമായ ചെലവുകൾ
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,വരി {0}: Qty നിർബന്ധമായും
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,കൃഷി
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,നിങ്ങളുടെ ഉല്പന്നങ്ങൾ അല്ലെങ്കിൽ സേവനങ്ങൾ
 DocType: Mode of Payment,Mode of Payment,അടക്കേണ്ട മോഡ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ഇത് ഒരു റൂട്ട് ഐറ്റം ഗ്രൂപ്പ് ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
 DocType: Journal Entry Account,Purchase Order,പർച്ചേസ് ഓർഡർ
 DocType: Warehouse,Warehouse Contact Info,വെയർഹൗസ് ബന്ധപ്പെടാനുള്ള വിവരങ്ങളും
@@ -1018,8 +1024,8 @@
 DocType: Email Digest,Annual Income,വാർഷിക വരുമാനം
 DocType: Serial No,Serial No Details,സീരിയൽ വിശദാംശങ്ങളൊന്നും
 DocType: Purchase Invoice Item,Item Tax Rate,ഇനം നിരക്ക്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0} മാത്രം ക്രെഡിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ഡെബിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry",{0} മാത്രം ക്രെഡിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ഡെബിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,ഇനം {0} ഒരു സബ് കരാറിൽ ഇനം ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ക്യാപ്പിറ്റൽ ഉപകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","പ്രൈസിങ് റൂൾ ആദ്യം ഇനം, ഇനം ഗ്രൂപ്പ് അല്ലെങ്കിൽ ബ്രാൻഡ് ആകാം വയലിലെ &#39;പുരട്ടുക&#39; അടിസ്ഥാനമാക്കി തിരഞ്ഞെടുത്തുവെന്ന്."
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,ഗോൾ
 DocType: Sales Invoice Item,Edit Description,എഡിറ്റ് വിവരണം
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി പ്ലാൻ ചെയ്തു ആരംഭ തീയതി അധികം കുറവാണ്.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,വിതരണക്കാരൻ വേണ്ടി
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,വിതരണക്കാരൻ വേണ്ടി
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,അക്കൗണ്ട് തരം സജ്ജീകരിക്കുന്നു ഇടപാടുകൾ ഈ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുന്നതിൽ സഹായിക്കുന്നു.
 DocType: Purchase Invoice,Grand Total (Company Currency),ആകെ മൊത്തം (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ആകെ അയയ്ക്കുന്ന
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,ജേർണൽ എൻട്രി
 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 +427,BOM {0} does not belong to Item {1},BOM ലേക്ക് {0} ഇനം വരെ {1} സ്വന്തമല്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,ഇത് ഈ കൂടിയ അവസാന സൃഷ്ടിച്ച ഇടപാട് എണ്ണം ആണ്
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","ബന്ധങ്ങൾ, ലീഡുകൾ ലേക്ക് ഒരു വാർത്താക്കുറിപ്പ്."
 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} ആണ്
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,ഓപ്പറേഷൻസ് ശൂന്യമാക്കിയിടാനാവില്ല ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,ഓപ്പറേഷൻസ് ശൂന്യമാക്കിയിടാനാവില്ല ചെയ്യാൻ കഴിയില്ല.
 ,Delivered Items To Be Billed,ബില്ല് രക്ഷപ്പെട്ടിരിക്കുന്നു ഇനങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,വെയർഹൗസ് സീരിയൽ നമ്പർ വേണ്ടി മാറ്റാൻ കഴിയില്ല
 DocType: Authorization Rule,Average Discount,ശരാശരി ഡിസ്ക്കൌണ്ട്
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},{0} നിന്ന് | {1} {2}
 DocType: BOM Operation,Operation Description,ഓപ്പറേഷൻ വിവരണം
 DocType: Item,Will also apply to variants,കൂടാതെ വകഭേദങ്ങളും ബാധകമാകും
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,സാമ്പത്തിക വർഷത്തെ സംരക്ഷിച്ചു ഒരിക്കൽ സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി മാറ്റാൻ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,സാമ്പത്തിക വർഷത്തെ സംരക്ഷിച്ചു ഒരിക്കൽ സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി മാറ്റാൻ കഴിയില്ല.
 DocType: Quotation,Shopping Cart,ഷോപ്പിംഗ് കാർട്ട്
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,പേർക്കുള്ള ഡെയ്ലി അയയ്ക്കുന്ന
 DocType: Pricing Rule,Campaign,കാമ്പെയ്ൻ
@@ -1100,7 +1106,8 @@
 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 +211,Stock Entries already created for Production Order ,ഇതിനകം പ്രൊഡക്ഷൻ ഓർഡർ സൃഷ്ടിച്ചു സ്റ്റോക്ക് എൻട്രികൾ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ഇതിനകം പ്രൊഡക്ഷൻ ഓർഡർ സൃഷ്ടിച്ചു സ്റ്റോക്ക് എൻട്രികൾ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,സ്ഥിര അസറ്റ് ലെ നെറ്റ് മാറ്റുക
 DocType: Leave Control Panel,Leave blank if considered for all designations,എല്ലാ തരത്തിലുള്ള വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,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 +182,Max: {0},പരമാവധി: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,അക്കൗണ്ട്സ് ചാർട്ട്
 DocType: Material Request,Terms and Conditions Content,നിബന്ധനകളും വ്യവസ്ഥകളും ഉള്ളടക്കം
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 DocType: Maintenance Visit,Unscheduled,വരണേ
 DocType: Employee,Owned,ഉടമസ്ഥതയിലുള്ളത്
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ശമ്പള പുറത്തുകടക്കാൻ ആശ്രയിച്ചിരിക്കുന്നു
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,സബ് അസംബ്ലീസ്
 DocType: Shipping Rule Condition,To Value,മൂല്യത്തിലേക്ക്
 DocType: Supplier,Stock Manager,സ്റ്റോക്ക് മാനേജർ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},ഉറവിട വെയർഹൗസ് വരി {0} നിര്ബന്ധമാണ്
+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 +581,Packing Slip,പാക്കിംഗ് സ്ലിപ്പ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ഓഫീസ് രെംട്
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,സെറ്റപ്പ് എസ്എംഎസ് ഗേറ്റ്വേ ക്രമീകരണങ്ങൾ
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ഇല്ല വിലാസം ഇതുവരെ ചേർത്തു.
 DocType: Workstation Working Hour,Workstation Working Hour,വർക്ക്സ്റ്റേഷൻ ജോലി അന്ത്യസമയം
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,അനലിസ്റ്റ്
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},വരി {0}: പദ്ധതി തുക {1} വെഞ്ച്വർ തുക {2} വരെ കുറവ് അഥവാ സമൻമാരെ ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},വരി {0}: പദ്ധതി തുക {1} വെഞ്ച്വർ തുക {2} വരെ കുറവ് അഥവാ സമൻമാരെ ആയിരിക്കണം
 DocType: Item,Inventory,ഇൻവെന്ററി
 DocType: Features Setup,"To enable ""Point of Sale"" view",&quot;പോയിന്റ് വില്പനയ്ക്ക് എന്ന&quot; കാഴ്ച സജ്ജമാക്കുന്നതിനായി
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,പേയ്മെന്റ് ശൂന്യമായ കാർട്ട് സാധിക്കില്ല
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,പേയ്മെന്റ് ശൂന്യമായ കാർട്ട് സാധിക്കില്ല
 DocType: Item,Sales Details,സെയിൽസ് വിശദാംശങ്ങൾ
 DocType: Opportunity,With Items,ഇനങ്ങൾ കൂടി
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty ൽ
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,പാരന്റ് ചെലവ് കേന്ദ്രം
 DocType: Sales Invoice,Source,ഉറവിടം
 DocType: Leave Type,Is Leave Without Pay,ശമ്പള ഇല്ലാതെ തന്നെ തന്നു
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,പേയ്മെന്റ് പട്ടികയിൽ കണ്ടെത്തിയില്ല റെക്കോർഡുകൾ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,പേയ്മെന്റ് പട്ടികയിൽ കണ്ടെത്തിയില്ല റെക്കോർഡുകൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,സാമ്പത്തിക വർഷം ആരംഭ തീയതി
 DocType: Employee External Work History,Total Experience,ആകെ അനുഭവം
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,പായ്ക്കിംഗ് ജി (കൾ) റദ്ദാക്കി
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,പായ്ക്കിംഗ് ജി (കൾ) റദ്ദാക്കി
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,നിക്ഷേപം മുതൽ ക്യാഷ് ഫ്ളോ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ചരക്കുഗതാഗതം കൈമാറലും ചുമത്തിയിട്ടുള്ള
 DocType: Material Request Item,Sales Order No,സെയിൽസ് ഓർഡർ ഇല്ല
 DocType: Item Group,Item Group Name,ഇനം ഗ്രൂപ്പ് പേര്
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,ഉല്പാദനത്തിനുള്ള മെറ്റീരിയൽസ് കൈമാറുക
 DocType: Pricing Rule,For Price List,വില ലിസ്റ്റിനായി
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,എക്സിക്യൂട്ടീവ് തിരച്ചിൽ
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ഇനത്തിനു പർച്ചേസ് നിരക്ക്: {0} കണ്ടെത്തിയില്ല, എൻട്രി (ചെലവിൽ) കണക്കിൻറെ ബുക്ക് ആവശ്യമായ. ഒരു വാങ്ങൽ വില പട്ടികയുമായി ഇനത്തിന്റെ വില സൂചിപ്പിക്കുക."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ഇനത്തിനു പർച്ചേസ് നിരക്ക്: {0} കണ്ടെത്തിയില്ല, എൻട്രി (ചെലവിൽ) കണക്കിൻറെ ബുക്ക് ആവശ്യമായ. ഒരു വാങ്ങൽ വില പട്ടികയുമായി ഇനത്തിന്റെ വില സൂചിപ്പിക്കുക."
 DocType: Maintenance Schedule,Schedules,സമയക്രമങ്ങൾ
 DocType: Purchase Invoice Item,Net Amount,ആകെ തുക
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM വിശദാംശം ഇല്ല
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),അഡീഷണൽ കിഴിവ് തുക (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},പിശക്: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},പിശക്: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,അക്കൗണ്ട്സ് ചാർട്ട് നിന്ന് പുതിയ അക്കൗണ്ട് സൃഷ്ടിക്കുക.
 DocType: Maintenance Visit,Maintenance Visit,മെയിൻറനൻസ് സന്ദർശനം
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,കസ്റ്റമർ&gt; ഉപഭോക്തൃ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,സെയിൽസ് പങ്കാളി ടാർജറ്റ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{1}: {0} മാത്രം കറൻസി കഴിയും കണക്കിൻറെ എൻട്രി
 DocType: Pricing Rule,Pricing Rule,പ്രൈസിങ് റൂൾ
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ഓർഡർ വാങ്ങാൻ മെറ്റീരിയൽ അഭ്യർത്ഥന
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ഓർഡർ വാങ്ങാൻ മെറ്റീരിയൽ അഭ്യർത്ഥന
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},വരി # {0}: റിട്ടേൺഡ് ഇനം {1} {2} {3} നിലവിലുണ്ട് ഇല്ല
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,ബാങ്ക് അക്കൗണ്ടുകൾ
 ,Bank Reconciliation Statement,ബാങ്ക് അനുരഞ്ജനം സ്റ്റേറ്റ്മെന്റ്
@@ -1225,11 +1233,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,ഓഹരി ബാലൻസ് തുറക്കുന്നു
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} ഒരിക്കൽ മാത്രമേ ദൃശ്യമാകും വേണം
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},വാങ്ങൽ ഓർഡർ {2} നേരെ {1} അധികം {0} കൂടുതൽ കൈമാറണോ അനുവദിച്ചിട്ടില്ല
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},{0} വിജയകരമായി നീക്കിവച്ചിരുന്നു ഇലകൾ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,പാക്ക് ഇനങ്ങൾ ഇല്ല
 DocType: Shipping Rule Condition,From Value,മൂല്യം നിന്നും
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,ണം ക്വാണ്ടിറ്റി നിർബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,ണം ക്വാണ്ടിറ്റി നിർബന്ധമാണ്
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,ബാങ്കിലെ ബാധകമാകുന്നില്ല അളവിൽ
 DocType: Quality Inspection Reading,Reading 4,4 Reading
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,കമ്പനി ചെലവിൽ വേണ്ടി ക്ലെയിമുകൾ.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,വിതരണക്കാരൻ ഉദ്ധരണികളും സൃഷ്ടിച്ചിട്ടില്ല ചെയ്തിട്ടുളള മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,നിങ്ങൾ അനുവാദം അപേക്ഷിക്കുന്ന ചെയ്തിട്ടുള്ള ദിവസം (ങ്ങൾ) വിശേഷദിവസങ്ങൾ ആകുന്നു. നിങ്ങൾ അനുവാദം അപേക്ഷ നല്കേണ്ടതില്ല.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,ബാർകോഡ് ഉപയോഗിച്ച് ഇനങ്ങളെ ട്രാക്കുചെയ്യുന്നതിന്. നിങ്ങൾ ഇനത്തിന്റെ ബാർകോഡ് പരിശോധന വഴി ഡെലിവറി നോട്ടും സെയിൽസ് ഇൻവോയിസ് ഇനങ്ങൾ നൽകുക കഴിയുകയും ചെയ്യും.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,കൈമാറി അടയാളപ്പെടുത്തുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,കൈമാറി അടയാളപ്പെടുത്തുക
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ക്വട്ടേഷൻ നിർമ്മിക്കുക
 DocType: Dependent Task,Dependent Task,ആശ്രിത ടാസ്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},അളവു സ്വതവേയുള്ള യൂണിറ്റ് വേണ്ടി പരിവർത്തന ഘടകം വരി 1 {0} ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,ജന്മദിന ഓർമ്മക്കുറിപ്പുകൾ നിർത്തുക
 DocType: SMS Center,Receiver List,റിസീവർ പട്ടിക
 DocType: Payment Tool Detail,Payment Amount,പേയ്മെന്റ് തുക
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ക്ഷയിച്ചിരിക്കുന്നു തുക
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} കാണുക
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} കാണുക
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,പണമായി നെറ്റ് മാറ്റുക
 DocType: Salary Structure Deduction,Salary Structure Deduction,ശമ്പളം ഘടന കിഴിച്ചുകൊണ്ടു
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,മെഷർ {0} യൂണിറ്റ് ഒരിക്കൽ പരിവർത്തന ഫാക്ടർ പട്ടികയിലെ അധികം നൽകി
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,മെഷർ {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 +185,Quantity must not be more than {0},ക്വാണ്ടിറ്റി {0} അധികം പാടില്ല
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),പ്രായം (ദിവസം)
 DocType: Quotation Item,Quotation Item,ക്വട്ടേഷൻ ഇനം
 DocType: Account,Account Name,അക്കൗണ്ട് നാമം
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,തീയതി തീയതിയെക്കുറിച്ചുള്ള വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,തീയതി തീയതിയെക്കുറിച്ചുള്ള വലുതായിരിക്കും കഴിയില്ല
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,സീരിയൽ ഇല്ല {0} അളവ് {1} ഒരു ഭാഗം ആകാൻ പാടില്ല
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,വിതരണക്കമ്പനിയായ തരം മാസ്റ്റർ.
 DocType: Purchase Order Item,Supplier Part Number,വിതരണക്കമ്പനിയായ ഭാഗം നമ്പർ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,പരിവർത്തന നിരക്ക് 0 അല്ലെങ്കിൽ 1 കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,പരിവർത്തന നിരക്ക് 0 അല്ലെങ്കിൽ 1 കഴിയില്ല
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,പർച്ചേസ് റെസീപ്റ്റ് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,പർച്ചേസ് റെസീപ്റ്റ് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 DocType: Company,Default Payable Account,സ്ഥിരസ്ഥിതി അടയ്ക്കേണ്ട അക്കൗണ്ട്
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","മുതലായ ഷിപ്പിംഗ് നിയമങ്ങൾ, വില ലിസ്റ്റ് പോലെ ഓൺലൈൻ ഷോപ്പിംഗ് കാർട്ട് ക്രമീകരണങ്ങൾ"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,ഈടാക്കൂ {0}%
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,എന്റെ പ്രശ്നങ്ങൾ
 DocType: BOM Item,BOM Item,BOM ഇനം
 DocType: Appraisal,For Employee,ജീവനക്കാർ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,വരി {0}: വിതരണക്കാരൻ നേരെ അഡ്വാൻസ് ഡെബിറ്റ് വേണം
 DocType: Company,Default Values,സ്ഥിരസ്ഥിതി മൂല്യങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,വരി {0}: പേയ്മെന്റ് തുക നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 DocType: Expense Claim,Total Amount Reimbursed,ആകെ തുക Reimbursed
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},വിതരണക്കാരൻ ഇൻവോയിസ് {0} എഗെൻസ്റ്റ് {1} dated
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},വിതരണക്കാരൻ ഇൻവോയിസ് {0} എഗെൻസ്റ്റ് {1} dated
 DocType: Customer,Default Price List,സ്ഥിരസ്ഥിതി വില പട്ടിക
 DocType: Payment Reconciliation,Payments,പേയ്മെൻറുകൾ
 DocType: Budget Detail,Budget Allocated,ബജറ്റ് അലോക്കേറ്റഡ്
 DocType: Journal Entry,Entry Type,എൻട്രി തരം
 ,Customer Credit Balance,കസ്റ്റമർ ക്രെഡിറ്റ് ബാലൻസ്
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,അടയ്ക്കേണ്ട തുക ലെ നെറ്റ് മാറ്റുക
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,നിങ്ങളുടെ ഇമെയിൽ ഐഡി സ്ഥിരീകരിക്കുന്നതിന് ദയവായി
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',&#39;Customerwise കിഴിവും&#39; ആവശ്യമുള്ളതിൽ കസ്റ്റമർ
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,ഡയറിയിലെ ബാങ്ക് പേയ്മെന്റ് തീയതികൾ അപ്ഡേറ്റ്.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കുക
 DocType: Employee,Permanent Address,സ്ഥിര വിലാസം
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,ഇനം {0} ഒരു സേവന ഇനം ആയിരിക്കണം.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",{0} {1} ആകെ മൊത്തം {2} വലിയവനല്ല \ ആകാൻ പാടില്ല നേരെ പെയ്ഡ് മുൻകൂർ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,ഐറ്റം കോഡ് തിരഞ്ഞെടുക്കുക
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),ശമ്പള (LWP) ഇല്ലാതെ അവധിക്ക് കിഴിച്ചുകൊണ്ടു കുറയ്ക്കുക
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,ഒരു ഇനത്തിന്റെ സിംഗിൾ യൂണിറ്റ്.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',സമയം ലോഗ് ബാച്ച് {0} &#39;സമർപ്പിച്ചു&#39; വേണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',സമയം ലോഗ് ബാച്ച് {0} &#39;സമർപ്പിച്ചു&#39; വേണം
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ഓരോ ഓഹരി പ്രസ്ഥാനത്തിന് വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി വരുത്തുക
 DocType: Leave Allocation,Total Leaves Allocated,അനുവദിച്ച മൊത്തം ഇലകൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},വരി ഇല്ല {0} ആവശ്യമാണ് വെയർഹൗസ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},വരി ഇല്ല {0} ആവശ്യമാണ് വെയർഹൗസ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"സാധുവായ സാമ്പത്തിക വർഷം ആരംഭ, അവസാന തീയതി നൽകുക"
 DocType: Employee,Date Of Retirement,വിരമിക്കൽ തീയതി
 DocType: Upload Attendance,Get Template,ഫലകം നേടുക
 DocType: Address,Postal,പോസ്റ്റൽ
 DocType: Item,Weightage,വെയിറ്റേജ്
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ഉപഭോക്താവിനെ ഗ്രൂപ്പ് സമാന പേരിൽ നിലവിലുണ്ട് കസ്റ്റമർ പേര് മാറ്റാനോ കസ്റ്റമർ ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,ആദ്യം {0} തിരഞ്ഞെടുക്കുക.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},ടെക്സ്റ്റ് {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,ആദ്യം {0} തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},ടെക്സ്റ്റ് {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,പുതിയ കോൺടാക്റ്റ്
 DocType: Territory,Parent Territory,പാരന്റ് ടെറിട്ടറി
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,മെറ്റീരിയൽ രസീത്
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},പാർട്ടി ടൈപ്പ് പാർട്ടി സ്വീകാ / അടയ്ക്കേണ്ട അക്കൌണ്ട് ആവശ്യമാണ് {0}
 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 +210,Quantity required for Item {0} in row {1},നിരയിൽ ഇനം {0} ആവശ്യമുള്ളതിൽ ക്വാണ്ടിറ്റി {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},നിരയിൽ ഇനം {0} ആവശ്യമുള്ളതിൽ ക്വാണ്ടിറ്റി {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},അളവ് ഇനം {1} വേണ്ടി നിലവിലുണ്ട് പോലെ വെയർഹൗസ് {0} ഇല്ലാതാക്കാൻ കഴിയില്ല
 DocType: Quotation,Order Type,ഓർഡർ തരം
 DocType: Purchase Invoice,Notification Email Address,വിജ്ഞാപന ഇമെയിൽ വിലാസം
@@ -1361,15 +1373,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,വളരെയധികം നിരകൾ. റിപ്പോർട്ട് കയറ്റുമതി ഒരു സ്പ്രെഡ്ഷീറ്റ് ആപ്ലിക്കേഷൻ ഉപയോഗിച്ച് അത് പ്രിന്റ്.
 DocType: Sales 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 +152,Main,പ്രധാന
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,പ്രധാന
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,മാറ്റമുള്ള
 DocType: Naming Series,Set prefix for numbering series on your transactions,നിങ്ങളുടെ ഇടപാടുകൾ പരമ്പര എണ്ണം പ്രിഫിക്സ് സജ്ജമാക്കുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,നിർത്തി ഓർഡർ റദ്ദാക്കാൻ സാധിക്കില്ല. റദ്ദാക്കാൻ Unstop.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,സ്വതേ BOM ({0}) ഈ ഇനം അല്ലെങ്കിൽ അതിന്റെ ടെംപ്ലേറ്റ് സജീവമാകും ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
 DocType: SMS Center,Send To,അയക്കുക
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},അനുവാദ ടൈപ്പ് {0} മതി ലീവ് ബാലൻസ് ഒന്നും ഇല്ല
 DocType: Payment Reconciliation Payment,Allocated amount,പദ്ധതി തുക
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,വെയർഹൗസ് റഫറൻസ്
 DocType: Supplier,Statutory info and other general information about your Supplier,നിയമപ്രകാരമുള്ള വിവരങ്ങളും നിങ്ങളുടെ വിതരണക്കാരൻ കുറിച്ചുള്ള മറ്റ് ജനറൽ വിവരങ്ങൾ
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,വിലാസങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,ജേർണൽ എൻട്രി {0} എഗെൻസ്റ്റ് ഏതെങ്കിലും സമാനതകളില്ലാത്ത {1} എൻട്രി ഇല്ല
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,ജേർണൽ എൻട്രി {0} എഗെൻസ്റ്റ് ഏതെങ്കിലും സമാനതകളില്ലാത്ത {1} എൻട്രി ഇല്ല
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},സീരിയൽ ഇല്ല ഇനം {0} നൽകിയ തനിപ്പകർപ്പെടുക്കുക
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ഒരു ഷിപ്പിംഗ് റൂൾ വ്യവസ്ഥ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,ഇനം പ്രൊഡക്ഷൻ ഓർഡർ ഉണ്ട് അനുവദിച്ചിട്ടില്ല.
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,അക്കൗണ്ട് കറൻസി ക്രെഡിറ്റ് തുക
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,നിർമാണ സമയം ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്.
 DocType: Item,Apply Warehouse-wise Reorder Level,വെയർഹൗസ് തിരിച്ചുള്ള പുനഃക്രമീകരിക്കുക ലെവൽ പ്രയോഗിക്കുക
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM ലേക്ക് {0} സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM ലേക്ക് {0} സമർപ്പിക്കേണ്ടതാണ്
 DocType: Authorization Control,Authorization Control,അംഗീകാര നിയന്ത്രണ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},വരി # {0}: നിരസിച്ചു വെയർഹൗസ് തള്ളിക്കളഞ്ഞ ഇനം {1} നേരെ നിർബന്ധമായും
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,ഇതുപയോഗിക്കാം സമയം ലോഗ്.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,പേയ്മെന്റ്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,പേയ്മെന്റ്
 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},പരമാവധി ഭൗതിക അഭ്യർത്ഥന {0} സെയിൽസ് ഓർഡർ {2} നേരെ ഇനം {1} വേണ്ടി കഴിയും
 DocType: Employee,Salutation,വന്ദനംപറച്ചില്
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,അസോസിയേറ്റ്
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,ഇനം {0} ഒരു സീരിയൽ ഇനം അല്ല
 DocType: SMS Center,Create Receiver List,റിസീവർ ലിസ്റ്റ് സൃഷ്ടിക്കുക
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,കാലഹരണപ്പെട്ടു
 DocType: Packing Slip,To Package No.,നമ്പർ പാക്കേജ്
 DocType: Warranty Claim,Issue Date,പുറപ്പെടുവിക്കുന്ന തീയതി
 DocType: Activity Cost,Activity Cost,പ്രവർത്തന ചെലവ്
@@ -1449,7 +1461,7 @@
 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 +65,Territory / Customer,ടെറിട്ടറി / കസ്റ്റമർ
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,ഉദാ 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,സെയിൽസ് ഇനം തന്നെയല്ലേ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,ഇനം ഗ്രൂപ്പ് ട്രീ
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} സൃഷ്ടിച്ചു
 DocType: Delivery Note Item,Against Sales Order,സെയിൽസ് എതിരായ
 ,Serial No Status,സീരിയൽ നില ഇല്ല
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,ഇനം ടേബിൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,ഇനം ടേബിൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","വരി {0}: തീയതി \ എന്നിവ തമ്മിലുള്ള വ്യത്യാസം വലിയവനോ അല്ലെങ്കിൽ {2} തുല്യമോ ആയിരിക്കണം, {1} കാലഘട്ടം സജ്ജമാക്കുന്നതിനായി"
 DocType: Pricing Rule,Selling,വിൽപ്പനയുള്ളത്
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,"കടമകൾ, നികുതി"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,റഫറൻസ് തീയതി നൽകുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,വിതരണം Qty
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,ഇന്സ്റ്റലേഷന് സമയം
 DocType: Sales Invoice,Accounting Details,അക്കൗണ്ടിംഗ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,ഈ കമ്പനി വേണ്ടി എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കുക
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,വരി # {0}: ഓപ്പറേഷൻ {1} പ്രൊഡക്ഷൻ ഓർഡർ # {3} ലെ പൂർത്തിയായി വസ്തുവിൽ {2} qty പൂർത്തിയായി ചെയ്തിട്ടില്ല. സമയം ലോഗുകൾ വഴി ഓപ്പറേഷൻ നില അപ്ഡേറ്റ് ചെയ്യുക
+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,വരി # {0}: ഓപ്പറേഷൻ {1} പ്രൊഡക്ഷൻ ഓർഡർ # {3} ലെ പൂർത്തിയായി വസ്തുവിൽ {2} qty പൂർത്തിയായി ചെയ്തിട്ടില്ല. സമയം ലോഗുകൾ വഴി ഓപ്പറേഷൻ നില അപ്ഡേറ്റ് ചെയ്യുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,നിക്ഷേപങ്ങൾ
 DocType: Issue,Resolution Details,മിഴിവ് വിശദാംശങ്ങൾ
 DocType: Quality Inspection Reading,Acceptance Criteria,സ്വീകാര്യത മാനദണ്ഡം
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,മായ്ക്കുക ടേബിൾ
 DocType: Features Setup,Brands,ബ്രാൻഡുകൾ
 DocType: C-Form Invoice Detail,Invoice No,ഇൻവോയിസ് ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,വാങ്ങൽ ഓർഡർ നിന്നും
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,വാങ്ങൽ ഓർഡർ നിന്നും
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ലീവ് ബാലൻസ് ഇതിനകം ഭാവിയിൽ ലീവ് അലോക്കേഷൻ റെക്കോർഡ് {1} ൽ കാരി മുന്നോട്ടയയ്ക്കുകയും ലീവ്, {0} മുമ്പ് റദ്ദാക്കി / പ്രയോഗിക്കാൻ കഴിയില്ല"
 DocType: Activity Cost,Costing Rate,ആറെണ്ണവും റേറ്റ്
 ,Customer Addresses And Contacts,കസ്റ്റമർ വിലാസങ്ങളും ബന്ധങ്ങൾ
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,മെയിൻറനൻസ് സമയക്രമങ്ങൾ
 ,Quotation Trends,ക്വട്ടേഷൻ ട്രെൻഡുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},ഐറ്റം {0} ഐറ്റം മാസ്റ്റർ പരാമർശിച്ചു അല്ല ഇനം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Shipping Rule Condition,Shipping Amount,ഷിപ്പിംഗ് തുക
 ,Pending Amount,തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക
 DocType: Purchase Invoice Item,Conversion Factor,പരിവർത്തന ഫാക്ടർ
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial അക്കൌണ്ടുകളുടെ ട്രീ.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,എല്ലാ ജീവനക്കാരുടെ തരം പരിഗണിക്കില്ല എങ്കിൽ ശൂന്യമായിടൂ
 DocType: Landed Cost Voucher,Distribute Charges Based On,അടിസ്ഥാനമാക്കി നിരക്കുകൾ വിതരണം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,അക്കൗണ്ട് ഇനം {1} പോലെ {0} തരത്തിലുള്ള ആയിരിക്കണം &#39;നിശ്ചിത അസറ്റ്&#39; ഒരു അസറ്റ് ഇനം ആണ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,അക്കൗണ്ട് ഇനം {1} പോലെ {0} തരത്തിലുള്ള ആയിരിക്കണം &#39;നിശ്ചിത അസറ്റ്&#39; ഒരു അസറ്റ് ഇനം ആണ്
 DocType: HR Settings,HR Settings,എച്ച് ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ചിലവിടൽ ക്ലെയിം അംഗീകാരത്തിനായി ശേഷിക്കുന്നു. മാത്രം ചിലവിടൽ Approver സ്റ്റാറ്റസ് അപ്ഡേറ്റ് ചെയ്യാം.
 DocType: Purchase Invoice,Additional Discount Amount,അധിക ഡിസ്ക്കൌണ്ട് തുക
 DocType: Leave Block List Allow,Leave Block List Allow,അനുവദിക്കുക ബ്ലോക്ക് ലിസ്റ്റ് വിടുക
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,സ്പോർട്സ്
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,യഥാർത്ഥ ആകെ
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,യൂണിറ്റ്
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ഇപ്പോൾ സ്വതവേയുള്ള ധനകാര്യ വർഷം ആണ്. പ്രാബല്യത്തിൽ മാറ്റം നിങ്ങളുടെ ബ്രൗസർ പുതുക്കുക.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ചിലവേറിയ ക്ലെയിമുകൾ
 DocType: Issue,Support,പിന്തുണ
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,കാണുക കാർട്ട്
 ,BOM Search,BOM തിരച്ചിൽ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),(+ ആകെ തുറക്കുന്നു) അടയ്ക്കുന്നു
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,കമ്പനിയിൽ കറൻസി വ്യക്തമാക്കുക
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM പരിവർത്തന ഘടകം വരി {0} ആവശ്യമാണ്
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},ക്ലിയറൻസ് തീയതി വരി {0} ചെക്ക് തീയതി മുമ്പ് ആകാൻ പാടില്ല
 DocType: Salary Slip,Deduction,കുറയ്ക്കല്
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},ഇനം വില വില പട്ടിക {1} ൽ {0} വേണ്ടി ചേർത്തു
 DocType: Address Template,Address Template,വിലാസം ഫലകം
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,ഈ വിൽപ്പന ആളിന്റെ ജീവനക്കാരന്റെ ഐഡി നൽകുക
 DocType: Territory,Classification of Customers by region,പ്രാദേശികതയും ഉപഭോക്താക്കൾക്ക് തിരിക്കൽ
 DocType: Project,% Tasks Completed,% ജോലികളും പൂർത്തിയാക്കി
 DocType: Project,Gross Margin,മൊത്തം മാർജിൻ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,പ്രൊഡക്ഷൻ ഇനം ആദ്യം നൽകുക
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,അപ്രാപ്തമാക്കിയ ഉപയോക്താവിനെ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,അപ്രാപ്തമാക്കിയ ഉപയോക്താവിനെ
 DocType: Opportunity,Quotation,ഉദ്ധരണി
 DocType: Salary Slip,Total Deduction,ആകെ കിഴിച്ചുകൊണ്ടു
 DocType: Quotation,Maintenance User,മെയിൻറനൻസ് ഉപയോക്താവ്
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
 DocType: Production Order Operation,Actual Operation Time,യഥാർത്ഥ ഓപ്പറേഷൻ സമയം
 DocType: Authorization Rule,Applicable To (User),(ഉപയോക്താവ്) ബാധകമായ
 DocType: Purchase Taxes and Charges,Deduct,കുറയ്ക്കാവുന്നതാണ്
@@ -1588,12 +1602,12 @@
 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,Approver
 ,SO Qty,ഷൂട്ട്ഔട്ട് Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ഓഹരി എൻട്രികൾ {0}, ഇവിടെനിന്നു വീണ്ടും നിയോഗിക്കുകയോ അപാകതയുണ്ട് പരിഷ്ക്കരിക്കാൻ കഴിയില്ല ഗോഡൗണിലെ നേരെ നിലവിലില്ല"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ഓഹരി എൻട്രികൾ {0}, ഇവിടെനിന്നു വീണ്ടും നിയോഗിക്കുകയോ അപാകതയുണ്ട് പരിഷ്ക്കരിക്കാൻ കഴിയില്ല ഗോഡൗണിലെ നേരെ നിലവിലില്ല"
 DocType: Appraisal,Calculate Total Score,ആകെ സ്കോർ കണക്കുകൂട്ടുക
 DocType: Supplier Quotation,Manufacturing Manager,ണം മാനേജർ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},സീരിയൽ ഇല്ല {0} {1} വരെ വാറന്റി കീഴിൽ ആണ്
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,പാക്കേജുകൾ കടന്നു ഡെലിവറി നോട്ട് വിഭജിക്കുക.
-apps/erpnext/erpnext/hooks.py +68,Shipments,കയറ്റുമതി
+apps/erpnext/erpnext/hooks.py +69,Shipments,കയറ്റുമതി
 DocType: Purchase Order Item,To be delivered to customer,ഉപഭോക്താവിന് പ്രസവം
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,സമയം ലോഗ് അവസ്ഥ സമര്പ്പിക്കണം.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,സീരിയൽ ഇല്ല {0} ഏതെങ്കിലും വെയർഹൗസ് ഭാഗമല്ല
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,കമ്പനി തിരഞ്ഞെടുക്കുക ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,എല്ലാ വകുപ്പുകളുടെയും വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","തൊഴിൽ വിവിധതരം (സ്ഥിരമായ, കരാർ, തടവുകാരി മുതലായവ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
 DocType: Currency Exchange,From Currency,കറൻസി
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","കുറഞ്ഞത് ഒരു വരിയിൽ പദ്ധതി തുക, ഇൻവോയിസ് ടൈപ്പ് ഇൻവോയിസ് നമ്പർ തിരഞ്ഞെടുക്കുക"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമായ സെയിൽസ് ഓർഡർ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","കുറഞ്ഞത് ഒരു വരിയിൽ പദ്ധതി തുക, ഇൻവോയിസ് ടൈപ്പ് ഇൻവോയിസ് നമ്പർ തിരഞ്ഞെടുക്കുക"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമായ സെയിൽസ് ഓർഡർ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,സമ്പ്രദായത്തിൽ ബാധകമാകുന്നില്ല അളവിൽ
 DocType: Purchase Invoice Item,Rate (Company Currency),നിരക്ക് (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,മറ്റുള്ളവ
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,പ്രക്രിയയിൽ
 DocType: Authorization Rule,Itemwise Discount,Itemwise ഡിസ്കൗണ്ട്
 DocType: Purchase Order Item,Reference Document Type,റഫറൻസ് ഡോക്യുമെന്റ് തരം
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} സെയിൽസ് ഓർഡർ {1} നേരെ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} സെയിൽസ് ഓർഡർ {1} നേരെ
 DocType: Account,Fixed Asset,സ്ഥിര അസറ്റ്
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,സീരിയൽ ഇൻവെന്ററി
 DocType: Activity Type,Default Billing Rate,സ്ഥിരസ്ഥിതി ബില്ലിംഗ് റേറ്റ്
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,പെയ്മെന്റ് വിൽപ്പന ഓർഡർ
 DocType: Expense Claim Detail,Expense Claim Detail,ചിലവേറിയ ക്ലെയിം വിശദാംശം
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,സമയം ലോഗുകൾ സൃഷ്ടിച്ചത്:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,ശരിയായ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,ശരിയായ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
 DocType: Item,Weight UOM,ഭാരോദ്വഹനം UOM
 DocType: Employee,Blood Group,രക്ത ഗ്രൂപ്പ്
 DocType: Purchase Invoice Item,Page Break,പേജ്
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,സമയം ചെയ്യുന്നതിനായി
 DocType: Authorization Rule,Approving Role (above authorized value),(അംഗീകൃത മൂല്യം മുകളിൽ) അംഗീകരിച്ചതിന് റോൾ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","കുട്ടി നോഡുകൾ ചേർക്കുന്നതിനായി, വൃക്ഷം പര്യവേക്ഷണം നിങ്ങൾ കൂടുതൽ നോഡുകൾ ചേർക്കാൻ ആഗ്രഹിക്കുന്ന ഏത് നോഡ് ക്ലിക്ക് ചെയ്യുക."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു അടയ്ക്കേണ്ട അക്കൗണ്ട് ആയിരിക്കണം
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM ലേക്ക് വിശകലനത്തിനുവേണ്ടിയാണീ: {0} {2} മാതാപിതാക്കൾ കുട്ടികളുടെ ആകാൻ പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു അടയ്ക്കേണ്ട അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},BOM ലേക്ക് വിശകലനത്തിനുവേണ്ടിയാണീ: {0} {2} മാതാപിതാക്കൾ കുട്ടികളുടെ ആകാൻ പാടില്ല
 DocType: Production Order Operation,Completed Qty,പൂർത്തിയാക്കി Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",{0} മാത്രം ഡെബിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ക്രെഡിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry",{0} മാത്രം ഡെബിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ക്രെഡിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,വില പട്ടിക {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
 DocType: Manufacturing Settings,Allow Overtime,അധികസമയം അനുവദിക്കുക
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,ഇനം {1} വേണ്ടി ആവശ്യമായ {0} സീരിയൽ സംഖ്യാപുസ്തകം. നിങ്ങൾ {2} നൽകിയിട്ടുള്ള.
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,കസ്റ്റമർ ഇനം കോഡുകൾ
 DocType: Opportunity,Lost Reason,നഷ്ടപ്പെട്ട കാരണം
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ഉത്തരവുകൾ അല്ലെങ്കിൽ ഇൻവോയിസുകൾ നേരെ പേയ്മെന്റ് എൻട്രികൾ സൃഷ്ടിക്കുക.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,പുതിയ വിലാസം
 DocType: Quality Inspection,Sample Size,സാമ്പിളിന്റെവലിപ്പം
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,എല്ലാ ഇനങ്ങളും ഇതിനകം invoiced ചെയ്തു
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,പ്രശ്നപരിഹാരത്തിനായി കുറഞ്ഞ കേന്ദ്രങ്ങൾ ഗ്രൂപ്പുകൾ കീഴിൽ കഴിയും പക്ഷേ എൻട്രികൾ നോൺ-ഗ്രൂപ്പുകൾ നേരെ കഴിയും
 DocType: Project,External,പുറത്തേക്കുള്ള
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,ടൂൾ പുനർനാമകരണം ചെയ്യുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,അപ്ഡേറ്റ് ചെലവ്
 DocType: Item Reorder,Item Reorder,ഇനം പുനഃക്രമീകരിക്കുക
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,മെറ്റീരിയൽ കൈമാറുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,മെറ്റീരിയൽ കൈമാറുക
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",", ഓപ്പറേഷൻസ് വ്യക്തമാക്കുക ഓപ്പറേറ്റിങ് വില നിങ്ങളുടെ പ്രവർത്തനങ്ങൾക്ക് ഒരു അതുല്യമായ ഓപ്പറേഷൻ ഒന്നും തരും."
 DocType: Purchase Invoice,Price List Currency,വില പട്ടിക കറന്സി
 DocType: Naming Series,User must always select,ഉപയോക്താവ് എപ്പോഴും തിരഞ്ഞെടുക്കണം
 DocType: Stock Settings,Allow Negative Stock,നെഗറ്റീവ് സ്റ്റോക്ക് അനുവദിക്കുക
 DocType: Installation Note,Installation Note,ഇന്സ്റ്റലേഷന് കുറിപ്പ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,നികുതികൾ ചേർക്കുക
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,ഫിനാൻസിംഗ് നിന്നുള്ള ക്യാഷ് ഫ്ളോ
 ,Financial Analytics,ഫിനാൻഷ്യൽ അനലിറ്റിക്സ്
 DocType: Quality Inspection,Verified By,പരിശോധിച്ചു
 DocType: Address,Subsidiary,സഹായകന്
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,ശമ്പളം ജി സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,ബാങ്ക് പ്രകാരം പ്രതീക്ഷിച്ച ബാലൻസ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ഫണ്ട് സ്രോതസ്സ് (ബാധ്യതകളും)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},നിരയിൽ ക്വാണ്ടിറ്റി {0} ({1}) നിർമിക്കുന്ന അളവ് {2} അതേ ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},നിരയിൽ ക്വാണ്ടിറ്റി {0} ({1}) നിർമിക്കുന്ന അളവ് {2} അതേ ആയിരിക്കണം
 DocType: Appraisal,Employee,ജീവനക്കാരുടെ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,നിന്നും ഇറക്കുമതി ഇമെയിൽ
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,ഉപയോക്താവ് ആയി ക്ഷണിക്കുക
 DocType: Features Setup,After Sale Installations,വില്പനയ്ക്ക് ഇൻസ്റ്റലേഷനുകൾ ശേഷം
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} പൂർണ്ണമായി കൊക്കുമാണ്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} പൂർണ്ണമായി കൊക്കുമാണ്
 DocType: Workstation Working Hour,End Time,അവസാനിക്കുന്ന സമയം
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,സെയിൽസ് വാങ്ങാനും സ്റ്റാൻഡേർഡ് കരാർ നിബന്ധനകൾ.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,വൗച്ചർ എന്നയാളുടെ ഗ്രൂപ്പ്
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ആവശ്യമാണ്
 DocType: Sales Invoice,Mass Mailing,മാസ് മെയിലിംഗ്
 DocType: Rename Tool,File to Rename,പേരു്മാറ്റുക ഫയൽ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമായ Purchse ഓർഡർ നമ്പർ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമായ Purchse ഓർഡർ നമ്പർ
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,പേയ്മെൻറുകൾ കാണിക്കുക
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},സൂചിപ്പിച്ചിരിക്കുന്ന BOM ലേക്ക് {0} ഇനം {1} വേണ്ടി നിലവിലില്ല
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,മെയിൻറനൻസ് ഷെഡ്യൂൾ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,സെയിൽസ് ഓർഡർ ആവശ്യമുണ്ട്
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,കസ്റ്റമർ സൃഷ്ടിക്കുക
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,മെയിൻറനൻസ് ഷെഡ്യൂൾ വിശദാംശം
 DocType: Quality Inspection Reading,Reading 9,9 Reading
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,ഉന്നയിക്കുന്ന
 DocType: Payment Tool,Payment Account,പേയ്മെന്റ് അക്കൗണ്ട്
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,തുടരാനായി കമ്പനി വ്യക്തമാക്കുക
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,അക്കൗണ്ടുകൾ സ്വീകാര്യം ലെ നെറ്റ് മാറ്റുക
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ഓഫാക്കുക നഷ്ടപരിഹാര
 DocType: Quality Inspection Reading,Accepted,സ്വീകരിച്ചു
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,ശരിക്കും ഈ കമ്പനിയുടെ എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കാൻ ആഗ്രഹിക്കുന്ന ദയവായി ഉറപ്പാക്കുക. അത് പോലെ നിങ്ങളുടെ മാസ്റ്റർ ഡാറ്റ തുടരും. ഈ പ്രവർത്തനം തിരുത്താൻ കഴിയില്ല.
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,ആകെ പേയ്മെന്റ് തുക
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
 DocType: Newsletter,Test,ടെസ്റ്റ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","നിലവിലുള്ള സ്റ്റോക്ക് ഇടപാടുകൾ ഈ ഇനത്തിന്റെ ഉണ്ട് പോലെ, \ നിങ്ങൾ &#39;സീരിയൽ നോ ഉണ്ട്&#39; മൂല്യങ്ങൾ മാറ്റാൻ കഴിയില്ല, &#39;ബാച്ച് ഇല്ല ഉണ്ട്&#39;, ഒപ്പം &#39;മൂലധനം രീതിയുടെ&#39; &#39;ഓഹരി ഇനം തന്നെയല്ലേ&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,ദ്രുത ജേർണൽ എൻട്രി
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ദ്രുത ജേർണൽ എൻട്രി
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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 +157,Please enter Planned Qty for Item {0} at row {1},വരി ചെയ്തത് ഇനം {0} ആസൂത്രണം Qty നൽകുക {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,ഇനങ്ങളുടെ വേണ്ടി അപേക്ഷ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ഓരോ നല്ല ഇനത്തിനും തീർന്നശേഷം പ്രത്യേക ഉത്പാദനം ഓർഡർ സൃഷ്ടിക്കപ്പെടും.
 DocType: Purchase Invoice,Terms and Conditions1,നിബന്ധനകളും Conditions1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,അംഗീകൃത മൂല്യം
 DocType: Contact,Enter department to which this Contact belongs,ഈ ബന്ധപ്പെടുക ഉൾക്കൊള്ളുന്ന വകുപ്പ് നൽകുക
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,ആകെ േചാദി
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,വരി ഐറ്റം അപാകതയുണ്ട് {0} മെറ്റീരിയൽ അഭ്യർത്ഥന പൊരുത്തപ്പെടുന്നില്ല
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,വരി ഐറ്റം അപാകതയുണ്ട് {0} മെറ്റീരിയൽ അഭ്യർത്ഥന പൊരുത്തപ്പെടുന്നില്ല
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,അളവുകോൽ
 DocType: Fiscal Year,Year End Date,വർഷം അവസാന തീയതി
 DocType: Task Depends On,Task Depends On,ടാസ്ക് ആശ്രയിച്ചിരിക്കുന്നു
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,കരാര് അവസാനിക്കുന്ന തീയതി ചേരുന്നു തീയതി വലുതായിരിക്കണം
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ഒരു കമ്മീഷൻ കമ്പനികൾ ഉൽപ്പന്നങ്ങൾ വിൽക്കുന്നു ഒരു മൂന്നാം കക്ഷി വിതരണക്കാരനായ / ഡീലർ / കമ്മീഷൻ ഏജന്റ് / അനുബന്ധ / റീസെല്ലറിനെ.
 DocType: Customer Group,Has Child Node,ചൈൽഡ് നോഡ് ഉണ്ട്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} വാങ്ങൽ ഓർഡർ {1} നേരെ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} വാങ്ങൽ ഓർഡർ {1} നേരെ
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","ഇവിടെ സ്റ്റാറ്റിക് URL പാരാമീറ്ററുകൾ നൽകുക (ഉദാ. അയച്ചയാളെ = ERPNext, ഉപയോക്തൃനാമം = ERPNext, പാസ്വേഡ് = 1234 മുതലായവ)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ഏതെങ്കിലും സജീവ വർഷം. കൂടുതൽ വിവരങ്ങൾക്ക് {2} പരിശോധിക്കുക.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,ഈ ERPNext നിന്നുള്ള സ്വയം സൃഷ്ടിച്ചതാണ് ഒരു ഉദാഹരണം വെബ്സൈറ്റ് ആണ്
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,Recd ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},സെയിൽസ് ഓർഡർ അളവ് {1} അധികം ഇനം {0} ഉത്പാദിപ്പിക്കാനുള്ള കഴിയുന്നില്ലേ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,ഓഹരി എൻട്രി {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,ഓഹരി എൻട്രി {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 DocType: Payment Reconciliation,Bank / Cash Account,ബാങ്ക് / ക്യാഷ് അക്കൗണ്ട്
 DocType: Tax Rule,Billing City,ബില്ലിംഗ് സിറ്റി
 DocType: Global Defaults,Hide Currency Symbol,കറൻസി ചിഹ്നം മറയ്ക്കുക
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,യൂട്ടിലിറ്റി ചെലവുകൾ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-മുകളിൽ
 DocType: Buying Settings,Default Buying Price List,സ്ഥിരസ്ഥിതി വാങ്ങൽ വില പട്ടിക
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,മുകളിൽ തിരഞ്ഞെടുത്ത മാനദണ്ഡങ്ങൾ OR ശമ്പളം സ്ലിപ്പ് വേണ്ടി ഒരു ജീവനക്കാരനും ഇതിനകം സൃഷ്ടിച്ചു
 DocType: Notification Control,Sales Order Message,സെയിൽസ് ഓർഡർ സന്ദേശം
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","കമ്പനി, കറൻസി, നടപ്പു സാമ്പത്തിക വർഷം, തുടങ്ങിയ സജ്ജമാക്കുക സ്വതേ മൂല്യങ്ങൾ"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,പേയ്മെന്റ് തരം
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",വിഭാഗം ആറെണ്ണവും ലെ &quot;മെറ്റീരിയൽസ് അടിസ്ഥാനപ്പെടുത്തിയ ഓൺ നിരക്ക്&quot; കാണുക
 DocType: Appraisal Goal,Key Responsibility Area,കീ ഉത്തരവാദിത്വം ഏരിയ
 DocType: Item Reorder,Material Request Type,മെറ്റീരിയൽ അഭ്യർത്ഥന തരം
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,വരി {0}: UOM പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,വരി {0}: UOM പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,റഫറൻസ്
 DocType: Cost Center,Cost Center,ചെലവ് കേന്ദ്രം
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,സാക്ഷപ്പെടുത്തല് #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},{1} quotation_to {0} ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,എല്ലാ വിലാസങ്ങൾ.
 DocType: Company,Stock Settings,സ്റ്റോക്ക് ക്രമീകരണങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","താഴെ പ്രോപ്പർട്ടികൾ ഇരു രേഖകളിൽ ഒരേ തന്നെയുള്ള സംയോജിപ്പിച്ചുകൊണ്ട് മാത്രമേ സാധിക്കുകയുള്ളൂ. ഗ്രൂപ്പ്, റൂട്ട് ടൈപ്പ്, കമ്പനിയാണ്"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","താഴെ പ്രോപ്പർട്ടികൾ ഇരു രേഖകളിൽ ഒരേ തന്നെയുള്ള സംയോജിപ്പിച്ചുകൊണ്ട് മാത്രമേ സാധിക്കുകയുള്ളൂ. ഗ്രൂപ്പ്, റൂട്ട് ടൈപ്പ്, കമ്പനിയാണ്"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,കസ്റ്റമർ ഗ്രൂപ്പ് ട്രീ നിയന്ത്രിക്കുക.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,പുതിയ ചെലവ് കേന്ദ്രം പേര്
 DocType: Leave Control Panel,Leave Control Panel,നിയന്ത്രണ പാനൽ വിടുക
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,പേയ്മെന്റ് ടൂൾ വിശദാംശം
 ,Sales Browser,സെയിൽസ് ബ്രൗസർ
 DocType: Journal Entry,Total Credit,ആകെ ക്രെഡിറ്റ്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},മുന്നറിയിപ്പ്: മറ്റൊരു {0} # {1} സ്റ്റോക്ക് എൻട്രി {2} നേരെ നിലവിലുണ്ട്
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,പ്രാദേശിക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},മുന്നറിയിപ്പ്: മറ്റൊരു {0} # {1} സ്റ്റോക്ക് എൻട്രി {2} നേരെ നിലവിലുണ്ട്
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,കടക്കാർ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,വലുത്
@@ -2003,7 +2022,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,എല്ലാ സെയിൽസ് ഇടപാട് ഒന്നിലധികം ** സെയിൽസ് പേഴ്സൺസ് നേരെ ടാഗ് ചെയ്യാൻ കഴിയും ** നിങ്ങൾ ലക്ഷ്യങ്ങളിലൊന്നാണ് സജ്ജമാക്കാൻ നിരീക്ഷിക്കുവാനും കഴിയും.
 ,S.O. No.,ഷൂട്ട്ഔട്ട് നമ്പർ
 DocType: Production Order Operation,Make Time Log,സമയം ലോഗ് നിർമ്മിക്കുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,പുനഃക്രമീകരിക്കുക അളവ് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,പുനഃക്രമീകരിക്കുക അളവ് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},ലീഡ് നിന്ന് {0} കസ്റ്റമർ സൃഷ്ടിക്കാൻ ദയവായി
 DocType: Price List,Applicable for Countries,രാജ്യങ്ങൾ വേണ്ടി ബാധകമായ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,കംപ്യൂട്ടർ
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,കുറഞ്ഞത് ഒരു ഐറ്റം മടക്കം പ്രമാണത്തിൽ നെഗറ്റീവ് അളവ് കടന്നു വേണം
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,ഇല്ല അഭിപ്രായപ്രകടനം
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,ഇല്ല അഭിപ്രായപ്രകടനം
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,അവധികഴിഞ്ഞ
 DocType: Account,Stock Received But Not Billed,ഓഹരി ലഭിച്ചു എന്നാൽ ഈടാക്കൂ ഒരിക്കലും പാടില്ല
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,റൂട്ട് അക്കൗണ്ട് ഒരു ഗ്രൂപ്പ് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,റൂട്ട് അക്കൗണ്ട് ഒരു ഗ്രൂപ്പ് ആയിരിക്കണം
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ഗ്രോസ് പേ + കുടിശ്ശിക തുക + എൻക്യാഷ്മെൻറും തുക - ആകെ കിഴിച്ചുകൊണ്ടു
 DocType: Monthly Distribution,Distribution Name,വിതരണ പേര്
 DocType: Features Setup,Sales and Purchase,സെയിൽസ് ആൻഡ് വാങ്ങൽ
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,പാർട്ടി ബാലൻസ്
 DocType: Sales Invoice Item,Time Log Batch,സമയം ലോഗ് ബാച്ച്
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,ഡിസ്കൌണ്ട് പ്രയോഗിക്കുക തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,ശമ്പളം ജി സൃഷ്ടിച്ചത്
 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,ഉല്പാദനത്തിനുള്ള മെറ്റീരിയൽ ട്രാൻസ്ഫർ
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,അർദ്ധവാർഷികം
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,സാമ്പത്തിക വർഷത്തെ {0} കാണാനായില്ല.
 DocType: Bank Reconciliation,Get Relevant Entries,പ്രസക്തമായ എൻട്രികൾ നേടുക
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,ഓഹരി വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,ഓഹരി വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി
 DocType: Sales Invoice,Sales Team1,സെയിൽസ് ടീം 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,ഇനം {0} നിലവിലില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,ഇനം {0} നിലവിലില്ല
 DocType: Sales Invoice,Customer Address,കസ്റ്റമർ വിലാസം
 DocType: Purchase Invoice,Apply Additional Discount On,പ്രയോഗിക്കുക അധിക ഡിസ്കൌണ്ട്
 DocType: Account,Root Type,റൂട്ട് തരം
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,പേജിന്റെ മുകളിലുള്ള ഈ സ്ലൈഡ്ഷോ കാണിക്കുക
 DocType: BOM,Item UOM,ഇനം UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ഡിസ്കൗണ്ട് തുക (കമ്പനി കറന്സി) ശേഷം നികുതിയും
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},ടാർജറ്റ് വെയർഹൗസ് വരി {0} നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},ടാർജറ്റ് വെയർഹൗസ് വരി {0} നിര്ബന്ധമാണ്
 DocType: Quality Inspection,Quality Inspection,ക്വാളിറ്റി ഇൻസ്പെക്ഷൻ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,എക്സ്ട്രാ ചെറുകിട
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,അക്കൗണ്ട് {0} മരവിച്ചു
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,സംഘടന പെടുന്ന അക്കൗണ്ടുകൾ ഒരു പ്രത്യേക ചാർട്ട് കൊണ്ട് നിയമ വിഭാഗമായാണ് / സബ്സിഡിയറി.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ഫുഡ്, ബീവറേജ് &amp; പുകയില"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,പോളണ്ട് അഥവാ ബി.എസ്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},മാത്രം unbilled {0} നേരെ തീർക്കാം കഴിയുമോ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},മാത്രം unbilled {0} നേരെ തീർക്കാം കഴിയുമോ
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,കമ്മീഷൻ നിരക്ക് 100 വലുതായിരിക്കും കഴിയില്ല
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,മിനിമം ഇൻവെന്ററി ലെവൽ
 DocType: Stock Entry,Subcontract,Subcontract
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,ഇൻകമിങ് ഗുണമേന്മയുള്ള പരിശോധന.
 DocType: Purchase Order Item,Returned Qty,മടങ്ങിയ Qty
 DocType: Employee,Exit,പുറത്ത്
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,റൂട്ട് തരം നിർബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,റൂട്ട് തരം നിർബന്ധമാണ്
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,സീരിയൽ ഇല്ല {0} സൃഷ്ടിച്ചു
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ഉപഭോക്താക്കൾക്ക് സൗകര്യത്തിനായി, ഈ കോഡുകൾ ഇൻവോയ്സുകളും ഡെലിവറി കുറിപ്പുകൾ പോലെ പ്രിന്റ് രൂപങ്ങളിലും ഉപയോഗിക്കാൻ കഴിയും"
 DocType: Employee,You can enter any date manually,"നിങ്ങൾ സ്വയം ഏതെങ്കിലും തീയതി നൽകാം,"
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,പരിശീലന കാലഖട്ടം
 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 +110,Row {0}: Advance against Customer must be credit,വരി {0}: കസ്റ്റമർ നേരെ മുൻകൂർ ക്രെഡിറ്റ് ആയിരിക്കണം
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,നൽകിയത് വാങ്ങൽ രസീത് ഇനം
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,ശമ്പള
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,ശമ്പള
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,തീയതി-ചെയ്യുന്നതിനായി
 DocType: SMS Settings,SMS Gateway URL,എസ്എംഎസ് ഗേറ്റ്വേ യുആർഎൽ
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS ഡെലിവറി നില പരിപാലിക്കുന്നതിനായി ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,പുനഃക്രമീകരിക്കുക ലെവൽ
 DocType: Attendance,Attendance Date,ഹാജർ തീയതി
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,വരുമാനമുള്ളയാളും കിഴിച്ചുകൊണ്ടു അടിസ്ഥാനമാക്കി ശമ്പളം ഖണ്ഡങ്ങളായി.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,കുട്ടി നോഡുകൾ കൊണ്ട് അക്കൗണ്ട് ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,കുട്ടി നോഡുകൾ കൊണ്ട് അക്കൗണ്ട് ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
 DocType: Address,Preferred Shipping Address,തിരഞ്ഞെടുത്ത ഷിപ്പിംഗ് വിലാസം
 DocType: Purchase Receipt Item,Accepted Warehouse,അംഗീകരിച്ച വെയർഹൗസ്
 DocType: Bank Reconciliation Detail,Posting Date,പോസ്റ്റിംഗ് തീയതി
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,സീരിയൽ ഇല്ല {0} നിലവിലില്ല
 DocType: Pricing Rule,Discount Percentage,കിഴിവും ശതമാനം
 DocType: Payment Reconciliation Invoice,Invoice Number,ഇൻവോയിസ് നമ്പർ
-apps/erpnext/erpnext/hooks.py +54,Orders,ഉത്തരവുകൾ
+apps/erpnext/erpnext/hooks.py +55,Orders,ഉത്തരവുകൾ
 DocType: Leave Control Panel,Employee Type,ജീവനക്കാരുടെ തരം
 DocType: Employee Leave Approver,Leave Approver,Approver വിടുക
 DocType: Manufacturing Settings,Material Transferred for Manufacture,ഉല്പാദനത്തിനുള്ള മാറ്റിയത് മെറ്റീരിയൽ
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,ഈ സെയിൽസ് ഓർഡർ നേരെ ഈടാക്കും വസ്തുക്കൾ%
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,കാലയളവ് സമാപന എൻട്രി
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,നിലവിലുള്ള ഇടപാടുകൾ ചെലവ് കേന്ദ്രം ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,മൂല്യശോഷണം
+DocType: Account,Depreciation,മൂല്യശോഷണം
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),വിതരണക്കമ്പനിയായ (കൾ)
 DocType: Customer,Credit Limit,വായ്പാ പരിധി
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,ഇടപാട് തരം തിരഞ്ഞെടുക്കുക
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,ഇൻവേർനോ
 DocType: Quotation Item,Against Doctype,Doctype എഗെൻസ്റ്റ്
 DocType: Delivery Note,Track this Delivery Note against any Project,ഏതെങ്കിലും പ്രോജക്ട് നേരെ ഈ ഡെലിവറി നോട്ട് ട്രാക്ക്
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,റൂട്ട് അക്കൌണ്ട് ഇല്ലാതാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,മുടക്കുന്ന നിന്നും നെറ്റ് ക്യാഷ്
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,റൂട്ട് അക്കൌണ്ട് ഇല്ലാതാക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,കാണിക്കുക സ്റ്റോക്ക് എൻട്രികളിൽ
 ,Is Primary Address,പ്രാഥമിക വിലാസം
 DocType: Production Order,Work-in-Progress Warehouse,പ്രവർത്തിക്കുക-ഇൻ-പ്രോഗ്രസ് വെയർഹൗസ്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},റഫറൻസ് # {0} {1} dated
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},റഫറൻസ് # {0} {1} dated
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,വിലാസങ്ങൾ നിയന്ത്രിക്കുക
 DocType: Pricing Rule,Item Code,ഇനം കോഡ്
 DocType: Production Planning Tool,Create Production Orders,പ്രൊഡക്ഷൻ ഓർഡറുകൾ സൃഷ്ടിക്കുക
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,ഉപയോക്താവിന്റെ അഭിപ്രായപ്പെടുക
 DocType: Lead,Market Segment,മാർക്കറ്റ് സെഗ്മെന്റ്
 DocType: Employee Internal Work History,Employee Internal Work History,ജീവനക്കാർ ആന്തരിക വർക്ക് ചരിത്രം
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),(ഡോ) അടയ്ക്കുന്നു
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),(ഡോ) അടയ്ക്കുന്നു
 DocType: Contact,Passive,നിഷ്കിയമായ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,{0} അല്ല സ്റ്റോക്ക് സീരിയൽ ഇല്ല
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,ഇടപാടുകൾ വില്ക്കുകയും നികുതി ടെംപ്ലേറ്റ്.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,ഈടാക്കൂ തുക
 DocType: Bank Reconciliation,Bank Reconciliation,ബാങ്ക് അനുരഞ്ജനം
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,അപ്ഡേറ്റുകൾ നേടുക
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,മെറ്റീരിയൽ അഭ്യർത്ഥന {0} റദ്ദാക്കി അല്ലെങ്കിൽ നിറുത്തി
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,മെറ്റീരിയൽ അഭ്യർത്ഥന {0} റദ്ദാക്കി അല്ലെങ്കിൽ നിറുത്തി
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,ഏതാനും സാമ്പിൾ റെക്കോർഡുകൾ ചേർക്കുക
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,മാനേജ്മെന്റ് വിടുക
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,അക്കൗണ്ട് വഴി ഗ്രൂപ്പ്
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","ലാഭം / നഷ്ടം ബുക്ക് ചെയ്യും ഇതിൽ ബാധ്യതാ കീഴിൽ അക്കൗണ്ട് തല,"
 DocType: Payment Tool,Against Vouchers,വൗച്ചറുകൾ എഗെൻസ്റ്റ്
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,ദ്രുത സഹായം
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},ഉറവിടം ടാർഗെറ്റ് വെയർഹൗസ് വരി {0} ഒരേ ആയിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},ഉറവിടം ടാർഗെറ്റ് വെയർഹൗസ് വരി {0} ഒരേ ആയിരിക്കും കഴിയില്ല
 DocType: Features Setup,Sales Extras,സെയിൽസ് നോട്ടൗട്ട്
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} കോസ്റ്റ് കേന്ദ്രം നേരെ അക്കൗണ്ട് ബജറ്റ് {1} {2} {3} എന്നയാൾ കവിയുമെന്നും
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',&#39;ഈ തീയതി മുതൽ&#39; &#39;തീയതി ആരംഭിക്കുന്ന&#39; ശേഷം ആയിരിക്കണം
 ,Stock Projected Qty,ഓഹരി Qty അനുമാനിക്കപ്പെടുന്ന
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},കസ്റ്റമർ {0} {1} പ്രൊജക്ട് സ്വന്തമല്ല
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},കസ്റ്റമർ {0} {1} പ്രൊജക്ട് സ്വന്തമല്ല
 DocType: Sales Order,Customer's Purchase Order,കസ്റ്റമർ പർച്ചേസ് ഓർഡർ
 DocType: Warranty Claim,From Company,കമ്പനി നിന്നും
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,മൂല്യം അഥവാ Qty
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,ബ്ലോക്ക് പട്ടിക അനുവദനീയം വിടുക
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,നിങ്ങൾ പ്രവേശിക്കാൻ അത് ഉപയോഗിക്കും
 DocType: Sales Partner,Retailer,ഫേയ്സ്
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,എല്ലാ വിതരണക്കാരൻ രീതികൾ
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,ഇനം സ്വയം നമ്പരുള്ള കാരണം ഇനം കോഡ് നിർബന്ധമാണ്
+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 +93,Quotation {0} not of type {1},{0} അല്ല തരത്തിലുള്ള ക്വട്ടേഷൻ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,മെയിൻറനൻസ് ഷെഡ്യൂൾ ഇനം
 DocType: Sales Order,%  Delivered,% കൈമാറി
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),പാക്കേജിന്റെ ആകെ ഭാരം. മൊത്തം ഭാരം + പാക്കേജിംഗ് മെറ്റീരിയൽ ഭാരം സാധാരണയായി. (പ്രിന്റ് വേണ്ടി)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ഈ പങ്ക് ഉപയോക്താക്കൾ മരവിച്ച അക്കൗണ്ടുകൾ സജ്ജമാക്കാനും സൃഷ്ടിക്കുന്നതിനും / ശീതീകരിച്ച അക്കൗണ്ടുകൾ നേരെ അക്കൗണ്ടിങ് എൻട്രികൾ പരിഷ്ക്കരിക്കുക അനുവദിച്ചിരിക്കുന്ന
 DocType: Serial No,Is Cancelled,റദ്ദാക്കി മാത്രമാവില്ലല്ലോ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,എന്റെ കയറ്റുമതി
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,എന്റെ കയറ്റുമതി
 DocType: Journal Entry,Bill Date,ബിൽ തീയതി
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","ഏറ്റവും മുന്തിയ പരിഗണന ഉപയോഗിച്ച് ഒന്നിലധികം വിലനിർണ്ണയത്തിലേക്ക് അവിടെ പോലും, പിന്നെ താഴെ ആന്തരിക പരിഗണനയാണ് ബാധകമാക്കുന്നു:"
 DocType: Supplier,Supplier Details,വിതരണക്കാരൻ വിശദാംശങ്ങൾ
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,കോളുകൾ
 DocType: Project,Total Costing Amount (via Time Logs),(ടൈം ലോഗുകൾ വഴി) ആകെ ആറെണ്ണവും തുക
 DocType: Purchase Order Item Supplied,Stock UOM,ഓഹരി UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,വാങ്ങൽ ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,വാങ്ങൽ ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,അനുമാനിക്കപ്പെടുന്ന
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},സീരിയൽ ഇല്ല {0} സംഭരണശാല {1} സ്വന്തമല്ല
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,കുറിപ്പ്: സിസ്റ്റം ഇനം വേണ്ടി ഡെലിവറി-കടന്നു-ബുക്കിങ് പരിശോധിക്കില്ല {0} അളവ് അല്ലെങ്കിൽ തുക 0 പോലെ
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,തീയതി തുറക്കുന്നു
 DocType: Journal Entry,Remark,അഭിപായപ്പെടുക
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,ബില്ലിംഗ് വേണ്ടി ബാച്ചുചെയ്ത
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,വിതരണക്കാരും ഉയര്ത്തുന്ന ബില്ലുകള്.
 DocType: POS Profile,Write Off Account,അക്കൗണ്ട് ഓഫാക്കുക എഴുതുക
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,കിഴിവും തുക
 DocType: Purchase Invoice,Return Against Purchase Invoice,വാങ്ങൽ ഇൻവോയിസ് എഗെൻസ്റ്റ് മടങ്ങുക
 DocType: Item,Warranty Period (in days),(ദിവസങ്ങളിൽ) വാറന്റി കാലാവധി
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,ഓപ്പറേഷൻസ് നിന്നുള്ള നെറ്റ് ക്യാഷ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,ഉദാ വാറ്റ്
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,ഇനം 4
 DocType: Journal Entry Account,Journal Entry Account,ജേണൽ എൻട്രി അക്കൗണ്ട്
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,വിരമിക്കുന്ന തീയതി ചേരുന്നു തീയതി വലുതായിരിക്കണം
 DocType: Sales Invoice,Against Income Account,ആദായ അക്കൗണ്ടിനെതിരായ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,കൈമാറി {0}%
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,പ്രതിമാസ വിതരണ ശതമാനം
 DocType: Territory,Territory Targets,ടെറിറ്ററി ടാർഗെറ്റ്
 DocType: Delivery Note,Transporter Info,ട്രാൻസ്പോർട്ടർ വിവരം
@@ -2421,10 +2443,10 @@
 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 +14,This is a root sales person and cannot be edited.,ഇത് ഒരു റൂട്ട് വിൽപന വ്യക്തി ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
 ,Stock Ledger,ഓഹരി ലെഡ്ജർ
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},നിരക്ക്: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},നിരക്ക്: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,ശമ്പളം ജി കിഴിച്ചുകൊണ്ടു
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,ആദ്യം ഒരു ഗ്രൂപ്പ് നോഡ് തിരഞ്ഞെടുക്കുക.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},ഉദ്ദേശ്യം {0} ഒന്നാണ് ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},ഉദ്ദേശ്യം {0} ഒന്നാണ് ആയിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,ഫോം പൂരിപ്പിച്ച് സേവ്
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,അവരുടെ പുതിയ സാധനങ്ങളും നില ഉപയോഗിച്ച് എല്ലാ അസംസ്കൃത വസ്തുക്കൾ അടങ്ങിയ റിപ്പോർട്ട് ഡൗൺലോഡ്
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,കമ്മ്യൂണിറ്റി ഫോറം
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,കമ്പനി (അല്ല കസ്റ്റമർ അല്ലെങ്കിൽ വിതരണക്കാരൻ) മാസ്റ്റർ.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',&#39;പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി&#39; നൽകുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ഡെലിവറി കുറിപ്പുകൾ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,തുക + തുക ആകെ മൊത്തം വലുതായിരിക്കും കഴിയില്ല ഓഫാക്കുക എഴുതുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},കുറിപ്പ്: വേണ്ടത്ര ലീവ് ബാലൻസ് അനുവാദ ടൈപ്പ് {0} വേണ്ടി ഇല്ല
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","കുറിപ്പ്: പേയ്മെന്റ് ഏതെങ്കിലും റഫറൻസ് നേരെ ഉണ്ടാക്കിയ എങ്കിൽ, മാനുവലായി ജേർണൽ എൻട്രി ഉണ്ടാക്കുക."
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} &#39;{1}&#39; അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ഓപ്പൺ സജ്ജമാക്കുക
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,സമർപ്പിക്കുന്നു ഇടപാടുകൾ ബന്ധങ്ങൾ ഓട്ടോമാറ്റിക് ഇമെയിലുകൾ അയയ്ക്കുക.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","വരി {0}: Qty {2} {3} ന് വെയർഹൗസ് {1} ൽ avalable അല്ല. ലഭ്യമായ Qty: {4}, Qty നീക്കുക: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ഇനം 3
 DocType: Purchase Order,Customer Contact Email,കസ്റ്റമർ കോൺടാക്റ്റ് ഇമെയിൽ
 DocType: Sales Team,Contribution (%),കോൺട്രിബ്യൂഷൻ (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,കുറിപ്പ്: &#39;ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട്&#39; വ്യക്തമാക്കിയില്ല മുതലുള്ള പേയ്മെന്റ് എൻട്രി സൃഷ്ടിച്ച ചെയ്യില്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,കുറിപ്പ്: &#39;ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട്&#39; വ്യക്തമാക്കിയില്ല മുതലുള്ള പേയ്മെന്റ് എൻട്രി സൃഷ്ടിച്ച ചെയ്യില്ല
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,ഉത്തരവാദിത്വങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,ഫലകം
 DocType: Sales Person,Sales Person Name,സെയിൽസ് വ്യക്തി നാമം
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,"നിരപ്പു മുമ്പ്,"
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ഇനം നികുതി റോ {0} ടൈപ്പ് നികുതി അഥവാ ആദായ അല്ലെങ്കിൽ ചിലവേറിയ അല്ലെങ്കിൽ ഈടാക്കുന്നതല്ല എന്ന അക്കൗണ്ട് ഉണ്ടായിരിക്കണം
 DocType: Sales Order,Partly Billed,ഭാഗികമായി ഈടാക്കൂ
 DocType: Item,Default BOM,സ്വതേ BOM ലേക്ക്
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,സ്ഥിരീകരിക്കാൻ കമ്പനിയുടെ പേര്-തരം റീ ദയവായി
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,മൊത്തം ശാരീരിക
 DocType: Time Log Batch,Total Hours,ആകെ മണിക്കൂർ
 DocType: Journal Entry,Printing Settings,അച്ചടി ക്രമീകരണങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},ആകെ ഡെബിറ്റ് ആകെ ക്രെഡിറ്റ് സമാനമോ ആയിരിക്കണം. വ്യത്യാസം {0} ആണ്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},ആകെ ഡെബിറ്റ് ആകെ ക്രെഡിറ്റ് സമാനമോ ആയിരിക്കണം. വ്യത്യാസം {0} ആണ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ഓട്ടോമോട്ടീവ്
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ഡെലിവറി നോട്ട് നിന്ന്
 DocType: Time Log,From Time,സമയം മുതൽ
 DocType: Notification Control,Custom Message,കസ്റ്റം സന്ദേശം
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,നിക്ഷേപ ബാങ്കിംഗ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് പേയ്മെന്റ് എൻട്രി നടത്തുന്നതിനുള്ള നിർബന്ധമായും
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് പേയ്മെന്റ് എൻട്രി നടത്തുന്നതിനുള്ള നിർബന്ധമായും
 DocType: Purchase Invoice,Price List Exchange Rate,വില പട്ടിക എക്സ്ചേഞ്ച് റേറ്റ്
 DocType: Purchase Invoice Item,Rate,റേറ്റ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,തടവുകാരി
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","ഒന്നിലധികം വില റൂൾ തിരയാം നിലവിലുള്ളതിനാൽ, മുൻഗണന നൽകിക്കൊണ്ട് സംഘർഷം \ പരിഹരിക്കുന്നതിന് ദയവായി. വില നിയമങ്ങൾ: {0}"
 DocType: Account,Bank,ബാങ്ക്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,എയർ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
 DocType: Material Request Item,For Warehouse,വെയർഹൗസ് വേണ്ടി
 DocType: Employee,Offer Date,ആഫര് തീയതി
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ഉദ്ധരണികളും
 DocType: Hub Settings,Access Token,അക്സസ് ടോക്കൺ
 DocType: Sales Invoice Item,Serial No,സീരിയൽ ഇല്ല
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Maintaince വിവരങ്ങൾ ആദ്യ നൽകുക
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,ഈ മാസം പ്രവർത്തി ദിവസങ്ങളിൽ അധികം വിശേഷദിവസങ്ങൾ ഉണ്ട്.
 DocType: Product Bundle Item,Product Bundle Item,ഉൽപ്പന്ന ബണ്ടിൽ ഇനം
 DocType: Sales Partner,Sales Partner Name,സെയിൽസ് പങ്കാളി പേര്
+DocType: Payment Reconciliation,Maximum Invoice Amount,പരമാവധി ഇൻവോയിസ് തുക
 DocType: Purchase Invoice Item,Image View,ചിത്രം കാണുക
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,"മൂലധനം, മൊത്ത"
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ഈ ഇനം {0} (ഫലകം) ഒരു വേരിയന്റാകുന്നു. &#39;നോ പകർത്തുക&#39; വെച്ചിരിക്കുന്നു ചെയ്തിട്ടില്ലെങ്കിൽ വിശേഷണങ്ങൾ ടെംപ്ലേറ്റ് നിന്നും മേൽ പകർത്തുന്നു
 DocType: Account,Purchase User,വാങ്ങൽ ഉപയോക്താവ്
 DocType: Notification Control,Customize the Notification,അറിയിപ്പ് ഇഷ്ടാനുസൃതമാക്കുക
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,ഓപ്പറേഷൻസ് നിന്നുള്ള ക്യാഷ് ഫ്ളോ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,സ്ഥിരസ്ഥിതി വിലാസം ഫലകം ഇല്ലാതാക്കാൻ കഴിയില്ല
 DocType: Sales Invoice,Shipping Rule,ഷിപ്പിംഗ് റൂൾ
 DocType: Journal Entry,Print Heading,പ്രിന്റ് തലക്കെട്ട്
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,അസംസ്കൃത വസ്തു
 DocType: Leave Application,Follow via Email,ഇമെയിൽ വഴി പിന്തുടരുക
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ഡിസ്കൗണ്ട് തുക ശേഷം നികുതിയും
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,ശിശു അക്കൌണ്ട് ഈ അക്കൗണ്ടിന് നിലവിലുണ്ട്. നിങ്ങൾ ഈ അക്കൗണ്ട് ഇല്ലാതാക്കാൻ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},BOM ലേക്ക് ഇനം {0} വേണ്ടി നിലവിലുണ്ട് സഹജമായ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,പോസ്റ്റിംഗ് തീയതി ആദ്യം തിരഞ്ഞെടുക്കുക
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},സീരിയൽ ഇനം {0} വേണ്ടി സീരിയൽ ഒഴിവ് ആവശ്യമുണ്ട്
 DocType: Journal Entry,Bank Entry,ബാങ്ക് എൻട്രി
 DocType: Authorization Rule,Applicable To (Designation),(തസ്തിക) ബാധകമായ
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,കാർട്ടിലേക്ക് ചേർക്കുക
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ഗ്രൂപ്പ്
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,പ്രാപ്തമാക്കുക / കറൻസിയുടെ അപ്രാപ്തമാക്കാൻ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,തപാൽ ചെലവുകൾ
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,വിനോദം &amp; ഒഴിവുസമയ
 DocType: Purchase Order,The date on which recurring order will be stop,ആവർത്തന ഓർഡർ സ്റ്റോപ്പ് ആയിരിക്കും തീയതി
 DocType: Quality Inspection,Item Serial No,ഇനം സീരിയൽ പോസ്റ്റ്
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} കുറച്ചു വേണം അല്ലെങ്കിൽ നിങ്ങൾ ഓവർഫ്ലോ ടോളറൻസ് വർദ്ധിപ്പിക്കാൻ വേണം
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} കുറച്ചു വേണം അല്ലെങ്കിൽ നിങ്ങൾ ഓവർഫ്ലോ ടോളറൻസ് വർദ്ധിപ്പിക്കാൻ വേണം
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,ആകെ നിലവിലുള്ളജാലകങ്ങള്
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,അന്ത്യസമയം
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",സീരിയൽ ഇനം {0} ഓഹരി അനുരഞ്ജന ഉപയോഗിച്ച് \ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ ട്രാന്സ്ഫര്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ ട്രാന്സ്ഫര്
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,ക്വട്ടേഷൻ സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,നിങ്ങൾ തടയുക തീയതികളിൽ ഇല അംഗീകരിക്കാൻ അംഗീകാരമില്ല
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,ഇവർ എല്ലാവരും ഇനങ്ങളും ഇതിനകം invoiced ചെയ്തു
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,ഇവർ എല്ലാവരും ഇനങ്ങളും ഇതിനകം invoiced ചെയ്തു
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} അംഗീകരിച്ച കഴിയുമോ
 DocType: Shipping Rule,Shipping Rule Conditions,ഷിപ്പിംഗ് റൂൾ അവസ്ഥകൾ
 DocType: BOM Replace Tool,The new BOM after replacement,പകരക്കാരനെ ശേഷം പുതിയ BOM
 DocType: Features Setup,Point of Sale,വിൽപ്പന പോയിന്റ്
 DocType: Account,Tax,നികുതി
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},വരി {0}: {1} സാധുവായ {2} അല്ല
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നും
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നും
 DocType: Production Planning Tool,Production Planning Tool,പ്രൊഡക്ഷൻ ആസൂത്രണ ടൂൾ
 DocType: Quality Inspection,Report Date,റിപ്പോർട്ട് തീയതി
 DocType: C-Form,Invoices,ഇൻവോയിസുകൾ
 DocType: Job Opening,Job Title,തൊഴില് പേര്
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} സ്വീകർതൃ
 DocType: Features Setup,Item Groups in Details,വിശദാംശങ്ങൾ ഐറ്റം ഗ്രൂപ്പുകൾ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,നിർമ്മിക്കാനുള്ള ക്വാണ്ടിറ്റി 0 വലുതായിരിക്കണം.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),ആരംഭ പോയിന്റ്-ഓഫ്-വില്പനയ്ക്ക് (POS)
@@ -2618,8 +2644,9 @@
 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: Pricing Rule,Customer Group,കസ്റ്റമർ ഗ്രൂപ്പ്
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},ചിലവേറിയ ഇനത്തിന്റെ {0} നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},ചിലവേറിയ ഇനത്തിന്റെ {0} നിര്ബന്ധമാണ്
 DocType: Item,Website Description,വെബ്സൈറ്റ് വിവരണം
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ഇക്വിറ്റി ലെ മൊത്തം മാറ്റം
 DocType: Serial No,AMC Expiry Date,എഎംസി കാലഹരണ തീയതി
 ,Sales Register,സെയിൽസ് രജിസ്റ്റർ
 DocType: Quotation,Quotation Lost Reason,ക്വട്ടേഷൻ ലോസ്റ്റ് കാരണം
@@ -2627,12 +2654,12 @@
 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 +108,Summary for this month and pending activities,ഈ മാസത്തെ ചുരുക്കം തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾ
 DocType: Customer Group,Customer Group Name,കസ്റ്റമർ ഗ്രൂപ്പ് പേര്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},സി-ഫോം {1} നിന്നും ഈ ഇൻവോയിസ് {0} നീക്കം ദയവായി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,വിശേഷണങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,ഇനങ്ങൾ നേടുക
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,അക്കൗണ്ട് ഓഫാക്കുക എഴുതുക നൽകുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,അക്കൗണ്ട് ഓഫാക്കുക എഴുതുക നൽകുക
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,അവസാന ഓർഡർ തീയതി
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,എക്സൈസ് ഇൻവോയിസ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},അക്കൗണ്ട് {0} കമ്പനി {1} വകയാണ് ഇല്ല
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,പ്രോജക്ട് തിരിച്ചുള്ള ഡാറ്റ ക്വട്ടേഷൻ ലഭ്യമല്ല
 DocType: Project,Expected End Date,പ്രതീക്ഷിച്ച അവസാന തീയതി
 DocType: Appraisal Template,Appraisal Template Title,അപ്രൈസൽ ഫലകം ശീർഷകം
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,ആവശ്യത്തിന്
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,ആവശ്യത്തിന്
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,പാരന്റ് ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം പാടില്ല
 DocType: Cost Center,Distribution Id,വിതരണ ഐഡി
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,ആകർഷണീയമായ സേവനങ്ങൾ
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ആട്രിബ്യൂട്ടിനായുള്ള മൂല്യം {0} {1} {3} ഇൻക്രിമെന്റുകളിൽ {2} വരെ വരെയാണ് ഉള്ളിൽ ആയിരിക്കണം
 DocType: Tax Rule,Sales,സെയിൽസ്
 DocType: Stock Entry Detail,Basic Amount,അടിസ്ഥാന തുക
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
 DocType: Leave Allocation,Unused leaves,ഉപയോഗിക്കപ്പെടാത്ത ഇല
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,കോടിയുടെ
 DocType: Customer,Default Receivable Accounts,സ്ഥിരസ്ഥിതി സ്വീകാ അക്കൗണ്ടുകൾ
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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,കോൺടാക്റ്റ് എച്ച്ടിഎംഎൽ
 DocType: Landed Cost Voucher,Purchase Receipts,വാങ്ങൽ രസീതുകൾ
-DocType: Payment Reconciliation,Maximum Amount,പരമാവധി തുക
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,എങ്ങനെ പ്രൈസിങ് റൂൾ പ്രയോഗിക്കുന്നു?
 DocType: Quality Inspection,Delivery Note No,ഡെലിവറി നോട്ട് ഇല്ല
 DocType: Company,Retail,റീട്ടെയിൽ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,കസ്റ്റമർ {0} നിലവിലില്ല
 DocType: Attendance,Absent,അസാന്നിദ്ധ്യം
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},വരി {0}: അസാധുവായ റഫറൻസ് {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},വരി {0}: അസാധുവായ റഫറൻസ് {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,നികുതി ചാർജുകളും ഫലകം വാങ്ങുക
 DocType: Upload Attendance,Download Template,ഡൗൺലോഡ് ഫലകം
 DocType: GL Entry,Remarks,അഭിപ്രായപ്രകടനം
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,പ്രതിമാസ ഹാജർ ഷീറ്റ്
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,റെക്കോർഡ് കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: കോസ്റ്റ് കേന്ദ്രം ഇനം {2} നിര്ബന്ധമാണ്
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,അക്കൗണ്ട് {0} നിഷ്ക്രിയമാണ്
 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,തീയതി ആരംഭിക്കുന്ന തീയതിയും ഹാജർ നിന്ന് ഹാജർ നിർബന്ധമാണ്
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,എൻട്രി തുറക്കുന്നു അനുവദനീയമല്ല &#39;പ്രോഫിറ്റ് നഷ്ടം ടൈപ്പ് അക്കൗണ്ട് {0}
 DocType: Features Setup,Sales Discounts,സെയിൽസ് ഡിസ്കൗണ്ട്
 DocType: Hub Settings,Seller Country,വില്പനക്കാരന്റെ രാജ്യം
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,വെബ്സൈറ്റ് ഇനങ്ങൾ പ്രസിദ്ധീകരിക്കുക
 DocType: Authorization Rule,Authorization Rule,അംഗീകാര റൂൾ
 DocType: Sales Invoice,Terms and Conditions Details,നിബന്ധനകളും വ്യവസ്ഥകളും വിവരങ്ങള്
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,വ്യതിയാനങ്ങൾ
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,സെയിൽസ് നികുതികളും ചുമത്തിയിട്ടുള്ള ഫലകം
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,അപ്പാരൽ ആക്സസ്സറികളും
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,ഓർഡർ എണ്ണം
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,ബില്ലിംഗ് തുക
 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 +18,Applications for leave.,ലീവ് അപേക്ഷകൾ.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,നിലവിലുള്ള ഇടപാട് ഉപയോഗിച്ച് അക്കൗണ്ട് ഇല്ലാതാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,നിലവിലുള്ള ഇടപാട് ഉപയോഗിച്ച് അക്കൗണ്ട് ഇല്ലാതാക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,നിയമ ചെലവുകൾ
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ഓട്ടോ ഓർഡർ 05, 28 തുടങ്ങിയവ ഉദാ നിർമ്മിക്കപ്പെടും ഏതെല്ലാം മാസത്തിലെ ദിവസം"
 DocType: Sales Invoice,Posting Time,പോസ്റ്റിംഗ് സമയം
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,പ്രവർത്തന രഹിതം
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,അക്കൗണ്ട്: {0} കറൻസി കൂടെ: {1} തിരഞ്ഞെടുത്ത ചെയ്യാൻ കഴിയില്ല
 DocType: Bank Reconciliation Detail,Cheque Date,ചെക്ക് തീയതി
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} കമ്പനി ഭാഗമല്ല: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} കമ്പനി ഭാഗമല്ല: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,വിജയകരമായി ഈ കമ്പനിയുമായി ബന്ധപ്പെട്ട എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കി!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,തീയതിയിൽ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,പരീക്ഷണകാലഘട്ടം
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,സ്ഥിരസ്ഥിതി വെയർഹൗസ് സ്റ്റോക്ക് ഇനം നിര്ബന്ധമാണ്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,സ്ഥിരസ്ഥിതി വെയർഹൗസ് സ്റ്റോക്ക് ഇനം നിര്ബന്ധമാണ്.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},മാസം {0} ശമ്പളം എന്ന പേയ്മെന്റ് ഉം വർഷം {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ഓട്ടോ insert വില പട്ടിക നിരക്ക് കാണാനില്ല എങ്കിൽ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ആകെ തുക
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),(ടൈം ലോഗുകൾ വഴി) ആകെ ബില്ലിംഗ് തുക
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,ഞങ്ങൾ ഈ ഇനം വിൽക്കാൻ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,വിതരണക്കമ്പനിയായ ഐഡി
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,ക്വാണ്ടിറ്റി 0 കൂടുതലായിരിക്കണം
 DocType: Journal Entry,Cash Entry,ക്യാഷ് എൻട്രി
 DocType: Sales Partner,Contact Desc,കോൺടാക്റ്റ് DESC
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","കാഷ്വൽ, രോഗികളെ മുതലായ ഇല തരം"
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,അക്കൗണ്ടുകൾ വാർഷിക ബജറ്റുകൾ സജ്ജീകരിക്കാൻ വരികൾ ചേർക്കുക.
 DocType: Buying Settings,Default Supplier Type,സ്ഥിരസ്ഥിതി വിതരണക്കാരൻ തരം
 DocType: Production Order,Total Operating Cost,ആകെ ഓപ്പറേറ്റിംഗ് ചെലവ്
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,കുറിപ്പ്: ഇനം {0} ഒന്നിലധികം തവണ നൽകി
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,കുറിപ്പ്: ഇനം {0} ഒന്നിലധികം തവണ നൽകി
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,എല്ലാ ബന്ധങ്ങൾ.
 DocType: Newsletter,Test Email Id,ടെസ്റ്റ് ഇമെയിൽ ഐഡി
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,കമ്പനി സംഗ്രഹ
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,എല്ലാ ഉപഭോക്തൃ ഗ്രൂപ്പുകൾ
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,നികുതി ഫലകം നിർബന്ധമാണ്.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} നിലവിലില്ല
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} നിലവിലില്ല
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),വില പട്ടിക നിരക്ക് (കമ്പനി കറൻസി)
 DocType: Account,Temporary,താൽക്കാലിക
 DocType: Address,Preferred Billing Address,തിരഞ്ഞെടുത്ത ബില്ലിംഗ് വിലാസം
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,ഇനം തിരിച്ചുള്ള വില പട്ടിക റേറ്റ്
 DocType: Purchase Order Item,Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ
 DocType: Quotation,In Words will be visible once you save the Quotation.,നിങ്ങൾ ക്വട്ടേഷൻ ലാഭിക്കാൻ ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} നിറുത്തി
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},ബാർകോഡ് {0} ഇതിനകം ഇനം {1} ഉപയോഗിക്കുന്ന
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} നിറുത്തി
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},ബാർകോഡ് {0} ഇതിനകം ഇനം {1} ഉപയോഗിക്കുന്ന
 DocType: Lead,Add to calendar on this date,ഈ തീയതി കലണ്ടർ ചേർക്കുക
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,ഷിപ്പിംഗ് ചിലവും ചേർത്ത് നിയമങ്ങൾ.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,വരാനിരിക്കുന്ന
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,ലീഡ് നിന്ന്
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,ഉത്പാദനത്തിന് പുറത്തുവിട്ട ഉത്തരവ്.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ധനകാര്യ വർഷം തിരഞ്ഞെടുക്കുക ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
 DocType: Hub Settings,Name Token,ടോക്കൺ പേര്
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,സ്റ്റാൻഡേർഡ് വിൽപ്പനയുള്ളത്
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,കുറഞ്ഞത് ഒരു പണ്ടകശാല നിർബന്ധമാണ്
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,മാറ്റിസ്ഥാപിക്കുക
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} സെയിൽസ് ഇൻവോയിസ് {1} നേരെ
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,അളവു സ്വതവേയുള്ള യൂണിറ്റ് നൽകുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} സെയിൽസ് ഇൻവോയിസ് {1} നേരെ
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,അളവു സ്വതവേയുള്ള യൂണിറ്റ് നൽകുക
 DocType: Purchase Invoice Item,Project Name,പ്രോജക്ട് പേര്
 DocType: Supplier,Mention if non-standard receivable account,സ്റ്റാൻഡേർഡ് അല്ലാത്ത സ്വീകരിക്കുന്ന അക്കൌണ്ട് എങ്കിൽ പ്രസ്താവിക്കുക
 DocType: Journal Entry Account,If Income or Expense,ആദായ അല്ലെങ്കിൽ ചിലവേറിയ ചെയ്താൽ
 DocType: Features Setup,Item Batch Nos,ഇനം ബാച്ച് ഒഴിവ്
 DocType: Stock Ledger Entry,Stock Value Difference,സ്റ്റോക്ക് മൂല്യം വ്യത്യാസം
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,മാനവ വിഭവശേഷി
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,മാനവ വിഭവശേഷി
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,പേയ്മെന്റ് അനുരഞ്ജനം പേയ്മെന്റ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,നികുതി ആസ്തികൾ
 DocType: BOM Item,BOM No,BOM ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,ജേർണൽ എൻട്രി {0} അക്കൗണ്ട് {1} അല്ലെങ്കിൽ ഇതിനകം മറ്റ് വൗച്ചർ പൊരുത്തപ്പെടും ഇല്ല
 DocType: Item,Moving Average,ശരാശരി നീക്കുന്നു
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ലേക്ക് മാറ്റിസ്ഥാപിക്കും
 DocType: Account,Debit,ഡെബിറ്റ്
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,അധിക ചെലവ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","വൗച്ചർ ഭൂഖണ്ടക്രമത്തിൽ എങ്കിൽ, വൗച്ചർ പോസ്റ്റ് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ നിർമ്മിക്കുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ നിർമ്മിക്കുക
 DocType: Quality Inspection,Incoming,ഇൻകമിംഗ്
 DocType: BOM,Materials Required (Exploded),ആവശ്യമായ മെറ്റീരിയൽസ് (പൊട്ടിത്തെറിക്കുന്ന)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),ശമ്പള (LWP) ഇല്ലാതെ അവധിക്ക് സമ്പാദിക്കുന്നത് കുറയ്ക്കുക
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},വരി # {0}: സീരിയൽ ഇല്ല {1} {2} {3} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,കാഷ്വൽ ലീവ്
 DocType: Batch,Batch ID,ബാച്ച് ഐഡി
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},കുറിപ്പ്: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},കുറിപ്പ്: {0}
 ,Delivery Note Trends,ഡെലിവറി നോട്ട് ട്രെൻഡുകൾ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ഈ ആഴ്ചത്തെ ചുരുക്കം
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} വരി {1} ഒരു വാങ്ങിയ അല്ലെങ്കിൽ സബ് ചുരുങ്ങി ഇനം ആയിരിക്കണം
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ശരാ. വാങ്ങുക റേറ്റ്
 DocType: Task,Actual Time (in Hours),(അവേഴ്സ്) യഥാർത്ഥ സമയം
 DocType: Employee,History In Company,കമ്പനിയിൽ ചരിത്രം
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,വാർത്താക്കുറിപ്പുകൾ
 DocType: Address,Shipping,ഷിപ്പിംഗ്
 DocType: Stock Ledger Entry,Stock Ledger Entry,ഓഹരി ലെഡ്ജർ എൻട്രി
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,നിലവിലെ ഓർഡറിന്റെ കാലയളവിൽ അന്ത്യം തീയതി
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ഓഫർ ലെറ്ററിന്റെ നിർമ്മിക്കുക
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,മടങ്ങിവരവ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,മോഡലിന് അളവു യൂണിറ്റ് ഫലകം അതേ ആയിരിക്കണം
 DocType: Production Order Operation,Production Order Operation,പ്രൊഡക്ഷൻ ഓർഡർ ഓപ്പറേഷൻ
 DocType: Pricing Rule,Disable,അപ്രാപ്തമാക്കുക
 DocType: Project Task,Pending Review,അവശേഷിക്കുന്ന അവലോകനം
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ഉപഭോക്തൃ ഐഡി
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,സമയാസമയങ്ങളിൽ വലുതായിരിക്കണം
 DocType: Journal Entry Account,Exchange Rate,വിനിമയ നിരക്ക്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},വെയർഹൗസ് {0}: പാരന്റ് അക്കൌണ്ട് {1} കമ്പനി {2} ലേക്ക് bolong ഇല്ല
 DocType: BOM,Last Purchase Rate,കഴിഞ്ഞ വാങ്ങൽ റേറ്റ്
 DocType: Account,Asset,അസറ്റ്
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,ഇനങ്ങൾ ക്ലാസ്സിലേക് ലഭ്യമാണ് ഓഹരി
 DocType: Item Variant,Item Variant,ഇനം മാറ്റമുള്ള
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,യാതൊരു മറ്റ് സ്വതവേ ഇല്ല സ്വതവേ ഈ വിലാസം ഫലകം ക്രമീകരിക്കുന്നത്
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ഡെബിറ്റ് ഇതിനകം അക്കൗണ്ട് ബാലൻസ്, നിങ്ങൾ &#39;ക്രെഡിറ്റ്&#39; ആയി &#39;ബാലൻസ് ആയിരിക്കണം&#39; സജ്ജീകരിക്കാൻ അനുവാദമില്ലാത്ത"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,ക്വാളിറ്റി മാനേജ്മെന്റ്
 DocType: Production Planning Tool,Filter based on customer,ഉപഭോക്താവിന്റെ അടിസ്ഥാനമാക്കിയുള്ള ഫിൽറ്റർ
 DocType: Payment Tool Detail,Against Voucher No,വൗച്ചർ ഇല്ല എഗെൻസ്റ്റ്
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,അടുത്തത് കോൺടാക്റ്റ്
 DocType: Employee,Employment Type,തൊഴിൽ തരം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,നിശ്ചിത ആസ്തികൾ
+,Cash Flow,ധനപ്രവാഹം
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,അപേക്ഷാ കാലയളവിൽ രണ്ട് alocation രേഖകള് ഉടനീളം ആകാൻ പാടില്ല
 DocType: Item Group,Default Expense Account,സ്ഥിരസ്ഥിതി ചിലവേറിയ
 DocType: Employee,Notice (days),അറിയിപ്പ് (ദിവസം)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,അബദ്ധങ്ങളും
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,പ്രിന്റ് ആൻഡ് സ്റ്റേഷനറി
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,ഗ്രൂപ്പ് നോഡ്
-DocType: Payment Reconciliation,Minimum Amount,കുറഞ്ഞ തുക
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,പൂർത്തിയായ സാധനങ്ങളുടെ അപ്ഡേറ്റ്
 DocType: Workstation,per hour,മണിക്കൂറിൽ
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,പണ്ടകശാല (നിരന്തരമുള്ള ഇൻവെന്ററി) വേണ്ടി അക്കൗണ്ട് ഈ അക്കൗണ്ട് കീഴിൽ സൃഷ്ടിക്കപ്പെടും.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,സ്റ്റോക്ക് ലെഡ്ജർ എൻട്രി ഈ വെയർഹൗസ് നിലവിലുണ്ട് പോലെ വെയർഹൗസ് ഇല്ലാതാക്കാൻ കഴിയില്ല.
 DocType: Company,Distribution,വിതരണം
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,തുക
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,തുക
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,പ്രോജക്റ്റ് മാനേജർ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,ഡിസ്പാച്ച്
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ഇനത്തിന്റെ അനുവദിച്ചിട്ടുള്ള പരമാവധി കുറഞ്ഞ: {0} ആണ് {1}%
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,പിന്തുണ Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},കമ്പനി അബദ്ധങ്ങളും {0} കാണാനില്ല
 DocType: POS Profile,Terms and Conditions,ഉപാധികളും നിബന്ധനകളും
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},തീയതി സാമ്പത്തിക വർഷത്തിൽ ആയിരിക്കണം. തീയതി = {0} ചെയ്യുക കരുതുന്നു
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},തീയതി സാമ്പത്തിക വർഷത്തിൽ ആയിരിക്കണം. തീയതി = {0} ചെയ്യുക കരുതുന്നു
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ഇവിടെ നിങ്ങൾ ഉയരം, ഭാരം, അലർജി, മെഡിക്കൽ ആശങ്കകൾ മുതലായവ നിലനിർത്താൻ കഴിയും"
 DocType: Leave Block List,Applies to Company,കമ്പനി പ്രയോഗിക്കുന്നു
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,സമർപ്പിച്ച ഓഹരി എൻട്രി {0} നിലവിലുണ്ട് കാരണം റദ്ദാക്കാൻ കഴിയില്ല
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,വാങ്ങൽ രസീതുകൾ നൽകുക
 DocType: Sales Invoice,Get Advances Received,അഡ്വാൻസുകളും സ്വീകരിച്ചു നേടുക
 DocType: Email Digest,Add/Remove Recipients,ചേർക്കുക / സ്വീകരിക്കുന്നവരെ നീക്കംചെയ്യുക
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},ഇടപാട് നിർത്തിവച്ചു പ്രൊഡക്ഷൻ ഓർഡർ {0} നേരെ അനുവദിച്ചിട്ടില്ല
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),പിന്തുണ ഇമെയിൽ ഐഡി വേണ്ടി സെറ്റപ്പ് ഇൻകമിംഗ് സെർവർ. (ഉദാ support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ദൌർലഭ്യം Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
 DocType: Salary Slip,Salary Slip,ശമ്പളം ജി
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;തീയതി ആരംഭിക്കുന്ന&#39; ആവശ്യമാണ്
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","പ്രസവം പാക്കേജുകൾ വേണ്ടി സ്ലിപ്പിൽ പാക്കിംഗ് ജനറേറ്റുചെയ്യുക. പാക്കേജ് നമ്പർ, പാക്കേജ് ഉള്ളടക്കങ്ങളുടെ അതിന്റെ ഭാരം അറിയിക്കാൻ ഉപയോഗിച്ച."
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,ജീവനക്കാരുടെ റെക്കോർഡുകൾ.
 DocType: HR Settings,Payroll Settings,ശമ്പളപ്പട്ടിക ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,നോൺ-ലിങ്ക്ഡ് ഇൻവോയ്സുകളും പേയ്മെൻറുകൾ ചേരു.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,സ്ഥല ഓർഡർ
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,സ്ഥല ഓർഡർ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,റൂട്ട് ഒരു പാരന്റ് ചെലവ് കേന്ദ്രം പാടില്ല
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ബ്രാൻഡ് തിരഞ്ഞെടുക്കുക ...
 DocType: Sales Invoice,C-Form Applicable,ബാധകമായ സി-ഫോം
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,തുടങ്ങുന്ന ദിവസം
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,ഒരു കാലയളവിൽ ഇല മതി.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,സ്ഥിരീകരിക്കുന്നതിന് ഇവിടെ ക്ലിക്ക്
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,അക്കൗണ്ട് {0}: നിങ്ങൾ പാരന്റ് അക്കൌണ്ട് സ്വയം നിശ്ചയിക്കാന് കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,അക്കൗണ്ട് {0}: നിങ്ങൾ പാരന്റ് അക്കൌണ്ട് സ്വയം നിശ്ചയിക്കാന് കഴിയില്ല
 DocType: Purchase Invoice Item,Price List Rate,വില പട്ടിക റേറ്റ്
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","ഈ ഗോഡൗണിലെ ലഭ്യമാണ് സ്റ്റോക്ക് അടിസ്ഥാനമാക്കി &#39;കണ്ടില്ലേ, ഓഹരി ലെ &quot;&quot; സ്റ്റോക്കുണ്ട് &quot;കാണിക്കുക അല്ലെങ്കിൽ."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),വസ്തുക്കളുടെ ബിൽ (DEL)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,പ്രതീക്ഷിച്ച ആരംഭ തീയതി
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,ചാർജ് ആ ഇനത്തിനും ബാധകമായ എങ്കിൽ ഇനം നീക്കം
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ഉദാ. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,സ്വീകരിക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,സ്വീകരിക്കുക
 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: Employee Leave Approver,Employee Leave Approver,ജീവനക്കാരുടെ അവധി Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} വിജയകരമായി നമ്മുടെ വാർത്താക്കുറിപ്പ് പട്ടികയിൽ ചേർത്തിരിക്കുന്നു.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","നഷ്ടപ്പെട്ട പോലെ ക്വട്ടേഷൻ വെളിപ്പെടുത്താമോ കാരണം, വർണ്ണിക്കും ചെയ്യാൻ കഴിയില്ല."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,വാങ്ങൽ മാസ്റ്റർ മാനേജർ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,പ്രൊഡക്ഷൻ ഓർഡർ {0} സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,പ്രൊഡക്ഷൻ ഓർഡർ {0} സമർപ്പിക്കേണ്ടതാണ്
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},ഇനം {0} ആരംഭ തീയതിയും അവസാന തീയതി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,പ്രധാന റിപ്പോർട്ടുകൾ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ഇന്നുവരെ തീയതി മുതൽ മുമ്പ് ആകാൻ പാടില്ല
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,വ്യവസായം തരം
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,എന്തോ കുഴപ്പം സംഭവിച്ചു!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,മുന്നറിയിപ്പ്: വിടുക അപേക്ഷ താഴെ ബ്ലോക്ക് തീയതി അടങ്ങിയിരിക്കുന്നു
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,സെയിൽസ് ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,സെയിൽസ് ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,പൂർത്തീകരണ തീയതി
 DocType: Purchase Invoice Item,Amount (Company Currency),തുക (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,ഓർഗനൈസേഷൻ യൂണിറ്റ് (വകുപ്പ്) മാസ്റ്റർ.
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,സീരിയൽ ഇല്ല സേവനം കരാര് കാലഹരണ
 DocType: Item,Unit of Measure Conversion,മെഷർ പരിവർത്തന യൂണിറ്റ്
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,ജീവനക്കാർ മാറ്റാൻ കഴിയില്ല
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,"ഒരേ സമയത്ത് ഒരേ അക്കൗണ്ട് ക്രെഡിറ്റ്, ഡെബിറ്റ് കഴിയില്ല"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,"ഒരേ സമയത്ത് ഒരേ അക്കൗണ്ട് ക്രെഡിറ്റ്, ഡെബിറ്റ് കഴിയില്ല"
 DocType: Naming Series,Help HTML,എച്ച്ടിഎംഎൽ സഹായം
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},അസൈൻ ആകെ വെയിറ്റേജ് 100% ആയിരിക്കണം. ഇത് {0} ആണ്
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},{0} over- വേണ്ടി അലവൻസ് ഇനം {1} സാധിതപ്രായമായി
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},{0} over- വേണ്ടി അലവൻസ് ഇനം {1} സാധിതപ്രായമായി
 DocType: Address,Name of person or organization that this address belongs to.,ഈ വിലാസം ഉൾപ്പെട്ടിരിക്കുന്ന വ്യക്തി അല്ലെങ്കിൽ സംഘടനയുടെ പേര്.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,നിങ്ങളുടെ വിതരണക്കാരും
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,സെയിൽസ് ഓർഡർ കഴിക്കുന്ന പോലെ ലോസ്റ്റ് ആയി സജ്ജമാക്കാൻ കഴിയില്ല.
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,പുറപ്പെടുവിച്ച തീയതി
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: {0} {1} വേണ്ടി നിന്ന്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},വരി # {0}: ഇനത്തിന്റെ വേണ്ടി സജ്ജമാക്കുക വിതരണക്കാരൻ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,വെബ്സൈറ്റ് ചിത്രം {0} ഇനം ഘടിപ്പിച്ചിരിക്കുന്ന {1} കണ്ടെത്താൻ കഴിയുന്നില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,മറ്റ് കറൻസി കൊണ്ട് അക്കൗണ്ടുകൾ അനുവദിക്കുന്നതിന് മൾട്ടി നാണയ ഓപ്ഷൻ പരിശോധിക്കുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,മറ്റ് കറൻസി കൊണ്ട് അക്കൗണ്ടുകൾ അനുവദിക്കുന്നതിന് മൾട്ടി നാണയ ഓപ്ഷൻ പരിശോധിക്കുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,ഇനം: {0} വ്യവസ്ഥിതിയിൽ നിലവിലില്ല
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,നിങ്ങൾ ശീതീകരിച്ച മൂല്യം സജ്ജീകരിക്കാൻ അംഗീകാരമില്ല
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,നിങ്ങൾ ശീതീകരിച്ച മൂല്യം സജ്ജീകരിക്കാൻ അംഗീകാരമില്ല
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled എൻട്രികൾ നേടുക
+DocType: Payment Reconciliation,From Invoice Date,ഇൻവോയിസ് തീയതി മുതൽ
 DocType: Cost Center,Budgets,പദ്ധതിയുടെ സാമ്പത്തിക
-DocType: Employee,Emergency Contact Details,എമർജൻസി കോൺടാക്റ്റ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,അത് എന്തു ചെയ്യുന്നു?
 DocType: Delivery Note,To Warehouse,വെയർഹൗസ് ചെയ്യുക
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},അക്കൗണ്ട് {0} സാമ്പത്തിക വർഷത്തെ {1} ഒരിക്കൽ അധികം നൽകി
 ,Average Commission Rate,ശരാശരി കമ്മീഷൻ നിരക്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,ഹാജർ ഭാവി തീയതി വേണ്ടി അടയാളപ്പെടുത്തും കഴിയില്ല
 DocType: Pricing Rule,Pricing Rule Help,പ്രൈസിങ് റൂൾ സഹായം
 DocType: Purchase Taxes and Charges,Account Head,അക്കൗണ്ട് ഹെഡ്
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,ഇനങ്ങളുടെ വന്നിറങ്ങി ചെലവ് കണക്കാക്കാൻ അധിക ചെലവ് അപ്ഡേറ്റ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,ഇലക്ട്രിക്കൽ
 DocType: Stock Entry,Total Value Difference (Out - In),(- ഔട്ട്) ആകെ മൂല്യം വ്യത്യാസം
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,വരി {0}: വിനിമയ നിരക്ക് നിർബന്ധമായും
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,വരി {0}: വിനിമയ നിരക്ക് നിർബന്ധമായും
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ഉപയോക്തൃ ഐഡി ജീവനക്കാരുടെ {0} വെച്ചിരിക്കുന്നു അല്ല
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,വാറന്റി ക്ലെയിം നിന്ന്
 DocType: Stock Entry,Default Source Warehouse,സ്ഥിരസ്ഥിതി ഉറവിട വെയർഹൗസ്
 DocType: Item,Customer Code,കസ്റ്റമർ കോഡ്
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},{0} വേണ്ടി ജന്മദിനം
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,കഴിഞ്ഞ ഓർഡർ നു ശേഷം ദിനങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,സ്റ്റോക്ക് അസറ്റുകൾ
@@ -3271,7 +3301,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,അക്കൗണ്ട് {0} അടയ്ക്കുന്നത് തരം ബാധ്യത / ഇക്വിറ്റി എന്ന ഉണ്ടായിരിക്കണം
 DocType: Authorization Rule,Based On,അടിസ്ഥാനപെടുത്തി
 DocType: Sales Order Item,Ordered Qty,ഉത്തരവിട്ടു Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
 DocType: Stock Settings,Stock Frozen Upto,ഓഹരി ശീതീകരിച്ച വരെ
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},നിന്നും കാലഘട്ടം {0} ആവർത്ത വേണ്ടി നിർബന്ധമായി തീയതി വരെയുള്ള
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,പ്രോജക്ട് പ്രവർത്തനം / ചുമതല.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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 താഴെ ആയിരിക്കണം
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ഓഫാക്കുക എഴുതുക തുക (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
 DocType: Landed Cost Voucher,Landed Cost Voucher,ചെലവ് വൗച്ചർ റജിസ്റ്റർ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},{0} സജ്ജീകരിക്കുക
 DocType: Purchase Invoice,Repeat on Day of Month,മാസം നാളിൽ ആവർത്തിക്കുക
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,ഹാജർ അപ്ലോഡുചെയ്യുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,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/accounts/doctype/journal_entry/journal_entry.js +446,Amount,തുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,തുക
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ലേക്ക് മാറ്റിസ്ഥാപിച്ചു
 ,Sales Analytics,സെയിൽസ് അനലിറ്റിക്സ്
 DocType: Manufacturing Settings,Manufacturing Settings,ണം ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ഇമെയിൽ സജ്ജീകരിക്കുന്നു
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,കമ്പനി മാസ്റ്റർ സ്വതവേയുള്ള കറൻസി നൽകുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,കമ്പനി മാസ്റ്റർ സ്വതവേയുള്ള കറൻസി നൽകുക
 DocType: Stock Entry Detail,Stock Entry Detail,സ്റ്റോക്ക് എൻട്രി വിശദാംശം
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,പ്രതിദിന ഓർമപ്പെടുത്തലുകൾ
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},{0} ഉപയോഗിച്ച് നികുതി നിയമം പൊരുത്തപ്പെടുന്നില്ല
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,നിർമ്മാണം ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,എഞ്ചിനീയർ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,തിരച്ചിൽ സബ് അസംബ്ലീസ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},വരി ഇല്ല {0} ആവശ്യമാണ് ഇനം കോഡ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},വരി ഇല്ല {0} ആവശ്യമാണ് ഇനം കോഡ്
 DocType: Sales Partner,Partner Type,പങ്കാളി തരം
 DocType: Purchase Taxes and Charges,Actual,യഥാർത്ഥ
 DocType: Authorization Rule,Customerwise Discount,Customerwise ഡിസ്കൗണ്ട്
 DocType: Purchase Invoice,Against Expense Account,ചിലവേറിയ എഗെൻസ്റ്റ്
 DocType: Production Order,Production Order,പ്രൊഡക്ഷൻ ഓർഡർ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,ഇന്സ്റ്റലേഷന് കുറിപ്പ് {0} ഇതിനകം സമർപ്പിച്ചു
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,ഇന്സ്റ്റലേഷന് കുറിപ്പ് {0} ഇതിനകം സമർപ്പിച്ചു
 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,ഇപ്പോൾ കാണുക
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,ഉപയുക്തമായ ഹോളിഡേ പട്ടിക
 DocType: Employee,Cheque,ചെക്ക്
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,സീരീസ് അപ്ഡേറ്റ്
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,റിപ്പോർട്ട് തരം നിർബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,റിപ്പോർട്ട് തരം നിർബന്ധമാണ്
 DocType: Item,Serial Number Series,സീരിയൽ നമ്പർ സീരീസ്
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},വെയർഹൗസ് നിരയിൽ സ്റ്റോക്ക് ഇനം {0} നിര്ബന്ധമാണ് {1}
 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/public/js/setup_wizard.js +101,The First User: You,ആദ്യം ഉപയോക്താവ്: നിങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി ഇതിനകം സാമ്പത്തിക വർഷം {0} സജ്ജമാക്കിയിരിക്കുന്നുവെങ്കിലും
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,വിജയകരമായി പൊരുത്തപ്പെട്ട
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി ഇതിനകം സാമ്പത്തിക വർഷം {0} സജ്ജമാക്കിയിരിക്കുന്നുവെങ്കിലും
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,വിജയകരമായി പൊരുത്തപ്പെട്ട
 DocType: Production Order,Planned End Date,ആസൂത്രണം ചെയ്ത അവസാന തീയതി
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,എവിടെ ഇനങ്ങളുടെ സൂക്ഷിച്ചിരിക്കുന്നു.
 DocType: Tax Rule,Validity,സാധുത
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,ഹാജർ
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,തീയതിയും പോസ്റ്റിംഗ് സമയം ചേർക്കൽ നിർബന്ധമായും
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,തീയതിയും പോസ്റ്റിംഗ് സമയം ചേർക്കൽ നിർബന്ധമായും
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,ഇടപാടുകൾ വാങ്ങിയതിന് നികുതി ടെംപ്ലേറ്റ്.
 ,Item Prices,ഇനം വിലകൾ
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,നിങ്ങൾ വാങ്ങൽ ഓർഡർ രക്ഷിക്കും ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,അവലോകന തീയതി
 DocType: Purchase Invoice,Advance Payments,പേയ്മെൻറുകൾ അഡ്വാൻസ്
 DocType: Purchase Taxes and Charges,On Net Total,നെറ്റ് ആകെ ന്
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,നിരയിൽ ടാർഗെറ്റ് വെയർഹൗസ് {0} പ്രൊഡക്ഷൻ ഓർഡർ അതേ ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,നിരയിൽ ടാർഗെറ്റ് വെയർഹൗസ് {0} പ്രൊഡക്ഷൻ ഓർഡർ അതേ ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,പേയ്മെന്റ് ടൂൾ ഉപയോഗിക്കാൻ അനുമതിയില്ല
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% S ആവർത്തന പേരിൽ വ്യക്തമാക്കാത്ത &#39;അറിയിപ്പ് ഇമെയിൽ വിലാസങ്ങൾ&#39;
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,കറൻസി മറ്റ് ചില കറൻസി ഉപയോഗിച്ച് എൻട്രികൾ ചെയ്തശേഷം മാറ്റാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,കറൻസി മറ്റ് ചില കറൻസി ഉപയോഗിച്ച് എൻട്രികൾ ചെയ്തശേഷം മാറ്റാൻ കഴിയില്ല
 DocType: Company,Round Off Account,അക്കൗണ്ട് ഓഫാക്കുക റൌണ്ട്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,അഡ്മിനിസ്ട്രേറ്റീവ് ചെലവുകൾ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,കൺസൾട്ടിംഗ്
 DocType: Customer Group,Parent Customer Group,പാരന്റ് ഉപഭോക്തൃ ഗ്രൂപ്പ്
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,മാറ്റുക
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,മാറ്റുക
 DocType: Purchase Invoice,Contact Email,കോൺടാക്റ്റ് ഇമെയിൽ
 DocType: Appraisal Goal,Score Earned,സ്കോർ നേടി
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",ഉദാ: &quot;എന്റെ കമ്പനി LLC&quot;
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,ആകെ ഭാരം UOM
 DocType: Email Digest,Receivables / Payables,Receivables / Payables
 DocType: Delivery Note Item,Against Sales Invoice,സെയിൽസ് ഇൻവോയിസ് എഗെൻസ്റ്റ്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,ക്രെഡിറ്റ് അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,ക്രെഡിറ്റ് അക്കൗണ്ട്
 DocType: Landed Cost Item,Landed Cost Item,റജിസ്റ്റർ ചെലവ് ഇനം
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,പൂജ്യം മൂല്യങ്ങൾ കാണിക്കുക
 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 +562,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
 DocType: Item,Default Warehouse,സ്ഥിരസ്ഥിതി വെയർഹൗസ്
 DocType: Task,Actual End Date (via Time Logs),(ടൈം ലോഗുകൾ വഴി) യഥാർത്ഥ അവസാന തീയതി
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},ബജറ്റ് ഗ്രൂപ്പ് അക്കൗണ്ട് {0} നേരെ നിയോഗിക്കുകയും കഴിയില്ല
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,വർക്ക്സ്റ്റേഷൻ പ്രവൃത്തി സമയത്തിന് പുറത്തുള്ള സമയം പ്രവർത്തനരേഖകൾ ആസൂത്രണം ചെയ്യുക.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ഇതിനകം സമർപ്പിച്ചു
 ,Items To Be Requested,അഭ്യർത്ഥിച്ചു ഇനങ്ങൾ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,അവസാനം വാങ്ങൽ റേറ്റ് നേടുക
 DocType: Time Log,Billing Rate based on Activity Type (per hour),ബില്ലിംഗ് നിരക്ക് (മണിക്കൂറിൽ) പ്രവർത്തന രീതി അനുസരിച്ചുളള
 DocType: Company,Company Info,കമ്പനി വിവരങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","ഇവിടെനിന്നു മെയിലും അയച്ചു അല്ല കാണാനായില്ല കമ്പനി ഇമെയിൽ ഐഡി,"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ഫണ്ട് അപേക്ഷാ (ആസ്തികൾ)
 DocType: Production Planning Tool,Filter based on item,ഇനത്തിന്റെ അടിസ്ഥാനമാക്കിയുള്ള ഫിൽറ്റർ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,ഡെബിറ്റ് അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,ഡെബിറ്റ് അക്കൗണ്ട്
 DocType: Fiscal Year,Year Start Date,വർഷം ആരംഭ തീയതി
 DocType: Attendance,Employee Name,ജീവനക്കാരുടെ പേര്
 DocType: Sales Invoice,Rounded Total (Company Currency),വൃത്തത്തിലുള്ള ആകെ (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,അക്കൗണ്ട് തരം തിരഞ്ഞെടുത്തുവെന്ന് കാരണം ഗ്രൂപ്പിലേക്ക് മറവിൽ ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,അക്കൗണ്ട് തരം തിരഞ്ഞെടുത്തുവെന്ന് കാരണം ഗ്രൂപ്പിലേക്ക് മറവിൽ ചെയ്യാൻ കഴിയില്ല.
 DocType: Purchase Common,Purchase Common,സാധാരണ വാങ്ങുക
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,ഓപ്പർച്യൂണിറ്റി നിന്ന്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ജീവനക്കാരുടെ ആനുകൂല്യങ്ങൾ
 DocType: Sales Invoice,Is POS,POS തന്നെയല്ലേ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},ചിലരാകട്ടെ അളവ് വരി {1} ൽ ഇനം {0} വേണ്ടി അളവ് ഒക്കുന്നില്ല വേണം
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},ചിലരാകട്ടെ അളവ് വരി {1} ൽ ഇനം {0} വേണ്ടി അളവ് ഒക്കുന്നില്ല വേണം
 DocType: Production Order,Manufactured Qty,മാന്യുഫാക്ച്ചേർഡ് Qty
 DocType: Purchase Receipt Item,Accepted Quantity,അംഗീകരിച്ചു ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} നിലവിലുണ്ട് ഇല്ല
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,ഉപഭോക്താക്കൾക്ക് ഉയർത്തുകയും ബില്ലുകള്.
 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 +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},വരി ഇല്ല {0}: തുക ചിലവിടൽ ക്ലെയിം {1} നേരെ തുക തീർച്ചപ്പെടുത്തിയിട്ടില്ല വലുതായിരിക്കണം കഴിയില്ല. തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക {2} ആണ്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},വരി ഇല്ല {0}: തുക ചിലവിടൽ ക്ലെയിം {1} നേരെ തുക തീർച്ചപ്പെടുത്തിയിട്ടില്ല വലുതായിരിക്കണം കഴിയില്ല. തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക {2} ആണ്
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,ചേർത്തു {0} വരിക്കാരുടെ
 DocType: Maintenance Schedule,Schedule,ഷെഡ്യൂൾ
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","ഈ കോസ്റ്റ് കേന്ദ്രം ബജറ്റിൽ നിർവചിക്കുക. ബജറ്റ് നടപടി സജ്ജമാക്കുന്നതിനായി, &quot;കമ്പനി ലിസ്റ്റ്&quot; കാണാൻ"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,ഹബ്
 DocType: GL Entry,Voucher Type,സാക്ഷപ്പെടുത്തല് തരം
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,വില പട്ടിക കണ്ടെത്തിയില്ല അല്ലെങ്കിൽ പ്രവർത്തനരഹിതമാക്കിയിട്ടില്ലെന്ന്
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,വില പട്ടിക കണ്ടെത്തിയില്ല അല്ലെങ്കിൽ പ്രവർത്തനരഹിതമാക്കിയിട്ടില്ലെന്ന്
 DocType: Expense Claim,Approved,അംഗീകരിച്ചു
 DocType: Pricing Rule,Price,വില
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',{0} &#39;ഇടത്&#39; ആയി സജ്ജമാക്കാൻ വേണം ന് ആശ്വാസമായി ജീവനക്കാരൻ
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,അക്കൗണ്ടിംഗ് എൻട്രികൾ.
 DocType: Delivery Note Item,Available Qty at From Warehouse,വെയർഹൗസിൽ നിന്ന് ലഭ്യമായ Qty
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,എംപ്ലോയീസ് റെക്കോർഡ് ആദ്യം തിരഞ്ഞെടുക്കുക.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},വരി {0}: പാർട്ടി / അക്കൗണ്ട് {3} {4} ൽ {1} / {2} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},വരി {0}: പാർട്ടി / അക്കൗണ്ട് {3} {4} ൽ {1} / {2} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,ഒരു നികുതി അക്കൗണ്ട് സൃഷ്ടിക്കാൻ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ചിലവേറിയ നൽകുക
 DocType: Account,Stock,സ്റ്റോക്ക്
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,കരാര് അവസാനിക്കുന്ന തീയതി
 DocType: Sales Order,Track this Sales Order against any Project,ഏതെങ്കിലും പ്രോജക്ട് നേരെ ഈ സെയിൽസ് ഓർഡർ ട്രാക്ക്
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,മുകളിൽ മാനദണ്ഡങ്ങൾ അടിസ്ഥാനമാക്കി വിൽപ്പന ഉത്തരവുകൾ (വിടുവിപ്പാൻ തീരുമാനിക്കപ്പെടാത്ത) വലിക്കുക
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ നിന്ന്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ നിന്ന്
 DocType: Deduction Type,Deduction Type,കിഴിച്ചുകൊണ്ടു തരം
 DocType: Attendance,Half Day,അര ദിവസം
 DocType: Pricing Rule,Min Qty,കുറഞ്ഞത് Qty
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,ഇടപാട് തീയതി
 DocType: Production Plan Item,Planned Qty,പ്ലാൻ ചെയ്തു Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,ആകെ നികുതി
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,ക്വാണ്ടിറ്റി എന്ന (Qty ഫാക്ടറി) നിർബന്ധമായും
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,ക്വാണ്ടിറ്റി എന്ന (Qty ഫാക്ടറി) നിർബന്ധമായും
 DocType: Stock Entry,Default Target Warehouse,സ്വതേ ടാര്ഗറ്റ് വെയർഹൗസ്
 DocType: Purchase Invoice,Net Total (Company Currency),അറ്റ ആകെ (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,വരി {0}: പാർട്ടി ടൈപ്പ് പാർട്ടി സ്വീകാ / അടയ്ക്കേണ്ട അക്കൌണ്ട് നേരെ മാത്രം ബാധകം
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,കമ്മീഷൻ നിരക്ക്
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,വേരിയന്റ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,വകുപ്പിന്റെ ലീവ് പ്രയോഗങ്ങൾ തടയുക.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,കാർട്ട് ശൂന്യമാണ്
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,കാർട്ട് ശൂന്യമാണ്
 DocType: Production Order,Actual Operating Cost,യഥാർത്ഥ ഓപ്പറേറ്റിംഗ് ചെലവ്
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,റൂട്ട് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,റൂട്ട് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,പദ്ധതി തുക unadusted തുക വലിയവനോ can
 DocType: Manufacturing Settings,Allow Production on Holidays,അവധിദിനങ്ങളിൽ പ്രൊഡക്ഷൻ അനുവദിക്കുക
 DocType: Sales Order,Customer's Purchase Order Date,കസ്റ്റമർ പർച്ചേസ് ഓർഡർ തീയതി
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ഡിസൈനർ
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,നിബന്ധനകളും വ്യവസ്ഥകളും ഫലകം
 DocType: Serial No,Delivery Details,ഡെലിവറി വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},കോസ്റ്റ് കേന്ദ്രം തരം {1} വേണ്ടി നികുതി പട്ടികയിലെ വരി {0} ആവശ്യമാണ്
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},കോസ്റ്റ് കേന്ദ്രം തരം {1} വേണ്ടി നികുതി പട്ടികയിലെ വരി {0} ആവശ്യമാണ്
 DocType: Item,Automatically create Material Request if quantity falls below this level,അളവ് ഈ നിലവാരത്തിനു താഴെ വീണാൽ ഓട്ടോമാറ്റിക്കായി മെറ്റീരിയൽ അഭ്യർത്ഥന സൃഷ്ടിക്കാൻ
 ,Item-wise Purchase Register,ഇനം തിരിച്ചുള്ള വാങ്ങൽ രജിസ്റ്റർ
 DocType: Batch,Expiry Date,കാലഹരണപ്പെടുന്ന തീയതി
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","പുനഃക്രമീകരിക്കുക നില സജ്ജീകരിക്കാൻ, ഇനം ഒരു പർച്ചേസ് ഇനം അല്ലെങ്കിൽ ണം ഇനം ആയിരിക്കണം"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","പുനഃക്രമീകരിക്കുക നില സജ്ജീകരിക്കാൻ, ഇനം ഒരു പർച്ചേസ് ഇനം അല്ലെങ്കിൽ ണം ഇനം ആയിരിക്കണം"
 ,Supplier Addresses and Contacts,വിതരണക്കമ്പനിയായ വിലാസങ്ങളും ബന്ധങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,ആദ്യം വർഗ്ഗം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/config/projects.py +18,Project master.,പ്രോജക്ട് മാസ്റ്റർ.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(അര ദിവസം)
 DocType: Supplier,Credit Days,ക്രെഡിറ്റ് ദിനങ്ങൾ
 DocType: Leave Type,Is Carry Forward,മുന്നോട്ട് വിലക്കുണ്ടോ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM ൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,വസ്തുക്കൾ ബിൽ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},വരി {0}: പാർട്ടി ടൈപ്പ് പാർട്ടി സ്വീകാ / അടയ്ക്കേണ്ട അക്കൌണ്ട് {1} ആവശ്യമാണ്
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,പോകാനുള്ള കാരണം
 DocType: Expense Claim Detail,Sanctioned Amount,അനുവദിക്കപ്പെട്ട തുക
 DocType: GL Entry,Is Opening,തുറക്കുകയാണ്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},വരി {0}: ഡെബിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,അക്കൗണ്ട് {0} നിലവിലില്ല
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},വരി {0}: ഡെബിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,അക്കൗണ്ട് {0} നിലവിലില്ല
 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 8b26179..7170e4c 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,ग्राहक उत्पादने
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,प्रथम पक्ष प्रकार निवडा
 DocType: Item,Customer Items,ग्राहक आयटम
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,खाते {0}: पालक खाते {1} एक खातेवही असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,खाते {0}: पालक खाते {1} एक खातेवही असू शकत नाही
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com करण्यासाठी आयटम प्रकाशित
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,ईमेल सूचना
 DocType: Item,Default Unit of Measure,माप डीफॉल्ट युनिट
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,ग्राहक संपर्क
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,साहित्य विनंती पासून
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,साहित्य विनंती पासून
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} वृक्ष
 DocType: Job Applicant,Job Applicant,ईयोब अर्जदाराचे
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,अधिक परिणाम नाहीत.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. या पर्याय चा वापर ग्राहक नुसार आयटम कोड ठेवणे आणि आयटम कोड  चा शोध करण्यासाठी करावा
 DocType: Mode of Payment Account,Mode of Payment Account,भरणा खाते मोड
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,दर्शवा रूपे
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,प्रमाण
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,प्रमाण
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),कर्ज (दायित्व)
 DocType: Employee Education,Year of Passing,उत्तीर्ण वर्ष
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,स्टॉक
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,हेल्थ केअर
 DocType: Purchase Invoice,Monthly,मासिक
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),भरणा विलंब (दिवस)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,चलन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,चलन
 DocType: Maintenance Schedule Item,Periodicity,ठराविक मुदतीने पुन: पुन्हा उगवणे
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ई-मेल पत्ता
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,आर्थिक वर्ष {0} आवश्यक आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,संरक्षण
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),धावसंख्या (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},रो {0}: {1} {2} सह जुळत नाही {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},रो {0}: {1} {2} सह जुळत नाही {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,रो # {0}:
 DocType: Delivery Note,Vehicle No,वाहन नाही
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,किंमत सूची निवडा कृपया
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,किंमत सूची निवडा कृपया
 DocType: Production Order Operation,Work In Progress,प्रगती मध्ये कार्य
 DocType: Employee,Holiday List,सुट्टी यादी
 DocType: Time Log,Time Log,वेळ लॉग
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,त्याच कंपनी एकदा पेक्षा अधिक प्रवेश केला आहे
 DocType: Employee,Married,लग्न
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},परवानगी नाही {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
 DocType: Payment Reconciliation,Reconcile,समेट
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,किराणा
 DocType: Quality Inspection Reading,Reading 1,1 वाचन
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,बँक प्रवेश करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,पेन्शन फंड्स
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,खाते प्रकार कोठार असेल तर कोठार अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,खाते प्रकार कोठार असेल तर कोठार अनिवार्य आहे
 DocType: SMS Center,All Sales Person,सर्व विक्री व्यक्ती
 DocType: Lead,Person Name,व्यक्ती नाव
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","चेक आदेश आवर्ती तर, आवर्ती थांबवू किंवा योग्य अंतिम तारीख ठेवणे अनचेक"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,इच्छुक
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,साहित्य बिल
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,उघडणे
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},पासून {0} करण्यासाठी {1}
+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,उघडणे प्रवेश
 DocType: Stock Entry,Additional Costs,अतिरिक्त खर्च
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,विद्यमान व्यवहार खाते गट रूपांतरीत केले जाऊ शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,विद्यमान व्यवहार खाते गट रूपांतरीत केले जाऊ शकत नाही.
 DocType: Lead,Product Enquiry,उत्पादन चौकशी
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,पहिल्या कंपनी प्रविष्ट करा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,लक्ष्य रोजी
+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 +9,Activity Log:,क्रियाकलाप लॉग:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,{0} आयटम प्रणाली अस्तित्वात नाही किंवा कालबाह्य झाले आहे
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,आयटम {0} खरेदी आयटम असणे आवश्यक आहे
 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 +444,Item {0} is not active or end of life has been reached,{0} आयटम सक्रिय नाही किंवा आयुष्याच्या शेवटी गाठली आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,{0} आयटम सक्रिय नाही किंवा आयुष्याच्या शेवटी गाठली आहे
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,विक्री चलन सबमिट केल्यानंतर अद्यतनित केले जाईल.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,एचआर विभाग सेटिंग्ज
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,ऑपरेशन तपशील चालते.
 DocType: Serial No,Maintenance Status,देखभाल स्थिती
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,आयटम आणि ती
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},तारीख पासून आर्थिक वर्षात आत असावे. तारीख पासून गृहीत धरून = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},तारीख पासून आर्थिक वर्षात आत असावे. तारीख पासून गृहीत धरून = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,तुम्ही मूल्यमापन तयार ज्यांच्याकडून कर्मचारी निवडा.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},केंद्र {0} कंपनी संबंधित नाही किंमत {1}
 DocType: Customer,Individual,वैयक्तिक
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,आर्थिक निव्वळ रोख
 DocType: Lead,Address & Contact,पत्ता व संपर्क
 DocType: Leave Allocation,Add unused leaves from previous allocations,मागील वाटप पासून न वापरलेल्या पाने जोडा
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},पुढील आवर्ती {0} वर तयार केले जाईल {1}
@@ -221,6 +222,7 @@
 ,Contact Name,संपर्क नाव
 DocType: Production Plan Item,SO Pending Qty,त्यामुळे प्रलंबित Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,वर उल्लेख केलेल्या निकष पगार स्लिप तयार.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,दिलेली नाही वर्णन
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,खरेदीसाठी विनंती.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा मंजुरी या रजेचा अर्ज सादर करू शकतो
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,तारीख relieving प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,आयटम वेबसाइट तपशील
 DocType: Payment Tool,Reference No,संदर्भ नाही
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,सोडा अवरोधित
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},आयटम {0} वर जीवनाची ओवरनंतर गाठली आहे {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},आयटम {0} वर जीवनाची ओवरनंतर गाठली आहे {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेअर मेळ आयटम
 DocType: Stock Entry,Sales Invoice No,विक्री चलन नाही
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,पुरवठादार प्रकार
 DocType: Item,Publish in Hub,हब मध्ये प्रकाशित
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,{0} आयटम रद्द
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,{0} आयटम रद्द
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,साहित्य विनंती
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन लाभ तारीख
 DocType: Item,Purchase Details,खरेदी तपशील
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},खरेदी करण्यासाठी &#39;कच्चा माल प्रदान&#39; टेबल आढळले नाही आयटम {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},खरेदी करण्यासाठी &#39;कच्चा माल प्रदान&#39; टेबल आढळले नाही आयटम {0} {1}
 DocType: Employee,Relation,नाते
 DocType: Shipping Rule,Worldwide Shipping,जगभरातील शिपिंग
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ग्राहक समोर ऑर्डर.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,सूचना
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,या प्रदेश सेट आयटम गट निहाय खर्चाचे अंदाजपत्रक. आपण वितरण सेट करून हंगामी समाविष्ट करू शकता.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},कोठार मूळ खाते गट प्रविष्ट करा {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},रक्कम {0} {1} शिल्लक रक्कम पेक्षा जास्त असू शकत नाही {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,वेळापत्रक व्युत्पन्न
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ताज्या
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,कमाल 5 वर्ण
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूचीतील पहिली रजा मंजुरी मुलभूत रजा मंजुरी म्हणून सेट केले जाईल
+apps/erpnext/erpnext/config/desktop.py +73,Learn,जाणून घ्या
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,कर्मचारी दर क्रियाकलाप खर्च
 DocType: Accounts Settings,Settings for Accounts,खाती सेटिंग्ज
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,विक्री व्यक्ती वृक्ष व्यवस्थापित करा.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,मल्टी चलन
 DocType: Payment Reconciliation Invoice,Invoice Type,चलन प्रकार
 DocType: Sales Invoice Item,Delivery Note,डिलिव्हरी टीप
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,कर सेट अप
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,कर सेट अप
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,तुम्ही तो धावा केल्यानंतर भरणा प्रवेश सुधारणा करण्यात आली आहे. पुन्हा तो खेचणे करा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} आयटम कर दोनदा प्रवेश केला
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} आयटम कर दोनदा प्रवेश केला
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,या आठवड्यात आणि प्रलंबित उपक्रम सारांश
 DocType: Workstation,Rent Cost,भाडे खर्च
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,महिना आणि वर्ष निवडा कृपया
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, डिलिव्हरी टीप, खरेदी चलन, उत्पादन आदेश, पर्चेस, खरेदी पावती, विक्री चलन, विक्री आदेश, शेअर प्रवेश, Timesheet उपलब्ध"
 DocType: Item Tax,Tax Rate,कर दर
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,आयटम निवडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,आयटम निवडा
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","आयटम: {0} बॅच कुशल, त्याऐवजी वापर स्टॉक प्रवेश \ शेअर मेळ वापर समेट जाऊ शकत नाही व्यवस्थापित"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,चलन {0} आधीच सादर खरेदी
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,चलन {0} आधीच सादर खरेदी
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},रो # {0}: बॅच कोणत्याही समान असणे आवश्यक आहे {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,नॉन-गट रूपांतरित करा
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,खरेदी पावती सादर करणे आवश्यक आहे
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,वैद्यकीय
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,तोट्याचा कारण
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,सिंगल
 DocType: Issue,Attachment,संलग्नक
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,अर्थसंकल्पात गट खर्च केंद्र सेट केली जाऊ शकत नाही
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवड
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,सुट्टी मास्टर.
 DocType: Material Request Item,Required Date,आवश्यक तारीख
 DocType: Delivery Note,Billing Address,बिलिंग पत्ता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,आयटम कोड प्रविष्ट करा.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,आयटम कोड प्रविष्ट करा.
 DocType: BOM,Costing,भांडवलाच्या
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","तपासल्यास आधीच प्रिंट रेट / प्रिंट रक्कम समाविष्ट म्हणून, कर रक्कम विचारात घेतली जाईल"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,एकूण Qty
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
 DocType: Shipping Rule,Net Weight,नेट वजन
 DocType: Employee,Emergency Phone,आणीबाणी फोन
 ,Serial No Warranty Expiry,सिरियल कोणतीही हमी कालावधी समाप्ती
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,बढती 0 असू शकत नाही
 DocType: Production Planning Tool,Material Requirement,साहित्य आवश्यकता
 DocType: Company,Delete Company Transactions,कंपनी व्यवहार हटवा
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,आयटम {0} खरेदी नाही आयटम
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,आयटम {0} खरेदी नाही आयटम
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} &#39;सूचना \ ई-मेल पत्ता&#39; अवैध ईमेल पत्ता आहे
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,एकूण बिलिंग हे वर्ष:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ संपादित करा कर आणि शुल्क जोडा
 DocType: Purchase Invoice,Supplier Invoice No,पुरवठादार चलन नाही
 DocType: Territory,For reference,संदर्भासाठी
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","हटवू शकत नाही सिरियल नाही {0}, तो स्टॉक व्यवहार वापरले जाते म्हणून"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),बंद (कोटी)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),बंद (कोटी)
 DocType: Serial No,Warranty Period (Days),वॉरंटी कालावधी (दिवस)
 DocType: Installation Note Item,Installation Note Item,प्रतिष्ठापन टीप आयटम
 ,Pending Qty,प्रलंबित Qty
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** मासिक वितरण ** आपल्या व्यवसायात तुम्हाला हंगामी असल्यास आपण महिने ओलांडून आपले बजेट वाटप करण्यास मदत करते. **, या वितरण वापरून कमी खर्चात वाटप ** खर्च केंद्रातील ** या ** मासिक वितरण सेट करण्यासाठी"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,चलन टेबल आढळली नाही रेकॉर्ड
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,चलन टेबल आढळली नाही रेकॉर्ड
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,पहिल्या कंपनी आणि पक्षाचे प्रकार निवडा
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,आर्थिक / लेखा वर्षी.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमस्व, सिरीयल क्रमांक विलीन करणे शक्य नाही"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,प्रकल्प कार्य
 ,Lead Id,लीड आयडी
 DocType: C-Form Invoice Detail,Grand Total,एकूण
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,आर्थिक वर्ष प्रारंभ तारीख आर्थिक वर्षाच्या शेवटी तारीख पेक्षा जास्त असू नये
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,आर्थिक वर्ष प्रारंभ तारीख आर्थिक वर्षाच्या शेवटी तारीख पेक्षा जास्त असू नये
 DocType: Warranty Claim,Resolution,ठराव
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},वितरित: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},वितरित: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,देय खाते
 DocType: Sales Order,Billing and Delivery Status,बिलिंग आणि वितरण स्थिती
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,पुन्हा करा ग्राहक
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,करण्यासाठी कोटेशन
 DocType: Lead,Middle Income,मध्यम उत्पन्न
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),उघडणे (कोटी)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,रक्कम नकारात्मक असू शकत नाही
 DocType: Purchase Order Item,Billed Amt,बिल रक्कम
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,स्टॉक नोंदी केले जातात जे विरोधात लॉजिकल वखार.
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,उत्पादन ऑर्डर अनिवार्य आहे
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,प्रस्ताव लेखन
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,आणखी विक्री व्यक्ती {0} त्याच कर्मचारी ID अस्तित्वात
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},नकारात्मक शेअर त्रुटी ({6}) आयटम साठी {0} कोठार मध्ये {1} वर {2} {3} मधील {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},नकारात्मक शेअर त्रुटी ({6}) आयटम साठी {0} कोठार मध्ये {1} वर {2} {3} मधील {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,आर्थिक वर्ष कंपनी
 DocType: Packing Slip Item,DN Detail,DN देखील तपशील
 DocType: Time Log,Billed,बिल
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,डीफॉल्ट कोटीच्या दर
 DocType: Maintenance Schedule,Maintenance Schedule,देखभाल वेळापत्रक
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","मग किंमत ठरविणे नियम इ ग्राहक, ग्राहक गट, प्रदेश पुरवठादार, पुरवठादार प्रकार, मोहीम, विक्री भागीदार आधारित बाहेर फिल्टर आहेत"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,यादी निव्वळ बदला
 DocType: Employee,Passport Number,पासपोर्ट क्रमांक
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,व्यवस्थापक
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,खरेदी पावती पासून
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,समान आयटम अनेक वेळा केलेला आहे.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,खरेदी पावती पासून
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,समान आयटम अनेक वेळा केलेला आहे.
 DocType: SMS Settings,Receiver Parameter,स्वीकारणारा मापदंड
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'आधारीत' आणि 'गट करून' समान असू शकत नाही
 DocType: Sales Person,Sales Person Targets,विक्री व्यक्ती लक्ष्य
 DocType: Production Order Operation,In minutes,मिनिटे
 DocType: Issue,Resolution Date,ठराव तारीख
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
 DocType: Selling Settings,Customer Naming By,करून ग्राहक नामांकन
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,गट रूपांतरित
 DocType: Activity Cost,Activity Type,क्रियाकलाप प्रकार
@@ -534,7 +538,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} चलन तपशील तक्ता आढळले नाही
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,देखभाल भेट द्या {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 DocType: Material Request,Material Transfer,साहित्य ट्रान्सफर
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,विपणन
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,सिरिअल नग आधारित विक्री आणि खरेदी दस्तऐवज आयटम ट्रॅक करण्यासाठी. हे देखील उत्पादन हमी तपशील ट्रॅक वापरले करू शकता.
 DocType: Purchase Receipt Item Supplied,Current Stock,वर्तमान शेअर
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,नाकारल्याचे कोठार regected आयटम विरुद्ध अनिवार्य आहे
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,या वर्षी एकूण बिलिंग
 DocType: Account,Expenses Included In Valuation,खर्च मूल्यांकन मध्ये समाविष्ट
 DocType: Employee,Provide email id registered in company,कंपनी मध्ये नोंदणीकृत ई-मेल आयडी द्या
 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 +533,Item has variants.,आयटम रूपे आहेत.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,वृक्ष प्रकार
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0} एक स्टॉक आयटम नाही
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} एक स्टॉक आयटम नाही
 DocType: Mode of Payment Account,Default Account,मुलभूत खाते
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"संधी लीड केले आहे, तर लीड सेट करणे आवश्यक आहे"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,साप्ताहिक बंद दिवस निवडा कृपया
 DocType: Production Order Operation,Planned End Time,नियोजनबद्ध समाप्ती वेळ
 ,Sales Person Target Variance Item Group-Wise,विक्री व्यक्ती लक्ष्य फरक आयटम गट निहाय
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,विद्यमान व्यवहार खाते लेजर रूपांतरीत केले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,विद्यमान व्यवहार खाते लेजर रूपांतरीत केले जाऊ शकत नाही
 DocType: Delivery Note,Customer's Purchase Order No,ग्राहक च्या पर्चेस नाही
 DocType: Employee,Cell Number,सेल क्रमांक
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ऑटो साहित्य विनंत्या व्युत्पन्न
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,गमावले
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,रकान्याच्या &#39;जर्नल प्रवेश विरुद्ध&#39; सध्याच्या व्हाउचर प्रविष्ट करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,रकान्याच्या &#39;जर्नल प्रवेश विरुद्ध&#39; सध्याच्या व्हाउचर प्रविष्ट करू शकत नाही
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,पासून संधी
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,मासिक पगार विधान.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: पासून {0} प्रकारच्या {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,रो {0}: रूपांतरण फॅक्टर अनिवार्य आहे
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,लेखा नोंदी पानांचे नोडस् विरुद्ध केले जाऊ शकते. गट विरुद्ध नोंदी परवानगी नाही.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय किंवा इतर BOMs निगडीत आहे म्हणून BOM रद्द करू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय किंवा इतर BOMs निगडीत आहे म्हणून BOM रद्द करू शकत नाही
 DocType: Opportunity,Maintenance,देखभाल
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},आयटम आवश्यक खरेदी पावती क्रमांक {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},आयटम आवश्यक खरेदी पावती क्रमांक {0}
 DocType: Item Attribute Value,Item Attribute Value,आयटम मूल्य विशेषता
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,विक्री मोहिम.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,किंमत सूची निवडलेले नाही
 DocType: Employee,Family Background,कौटुंबिक पार्श्वभूमी
 DocType: Process Payroll,Send Email,ईमेल पाठवा
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,कोणतीही परवानगी नाही
 DocType: Company,Default Bank Account,मुलभूत बँक खाते
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","पार्टी आधारित फिल्टर कर यासाठी, पयायय पार्टी पहिल्या टाइप करा"
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,क्र
 DocType: Item,Items with higher weightage will be shown higher,उच्च महत्त्व असलेला आयटम उच्च दर्शविले जाईल
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,बँक मेळ तपशील
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,माझे चलने
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,माझे चलने
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,नाही कर्मचारी आढळले
 DocType: Purchase Order,Stopped,थांबवले
 DocType: Item,If subcontracted to a vendor,विक्रेता करण्यासाठी subcontracted तर
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,आता पाठवा
 ,Support Analytics,समर्थन Analytics
 DocType: Item,Website Warehouse,वेबसाइट कोठार
+DocType: Payment Reconciliation,Minimum Invoice Amount,किमान चलन रक्कम
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ऑटो अशी यादी तयार करणे 05, 28 इत्यादी उदा निर्माण होणार महिन्याचा दिवस"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,धावसंख्या 5 या पेक्षा कमी किंवा या समान असणे आवश्यक आहे
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,सी-फॉर्म रेकॉर्ड
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;विक्री पॉइंट&quot; वैशिष्ट्ये सक्षम करण्यासाठी
 DocType: Bin,Moving Average Rate,सरासरी दर हलवित
 DocType: Production Planning Tool,Select Items,निवडा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} बिल विरुद्ध {1} दिनांक {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} बिल विरुद्ध {1} दिनांक {2}
 DocType: Maintenance Visit,Completion Status,पूर्ण स्थिती
 DocType: Sales Invoice Item,Target Warehouse,लक्ष्य कोठार
 DocType: Item,Allow over delivery or receipt upto this percent,या टक्के पर्यंत चेंडू किंवा पावती प्रती परवानगी द्या
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,स्वयंचलितपणे व्यवहार सादर संदेश तयार करा.
 DocType: Production Order,Item To Manufacture,आयटम निर्मिती करणे
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} स्थिती {2} आहे
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,भरणा करण्यासाठी खरेदी
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,भरणा करण्यासाठी खरेदी
 DocType: Sales Order Item,Projected Qty,अंदाज Qty
 DocType: Sales Invoice,Payment Due Date,पैसे भरण्याची शेवटची तारिख
 DocType: Newsletter,Newsletter Manager,वृत्तपत्र व्यवस्थापक
@@ -704,7 +709,7 @@
 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 +304,Point-of-Sale,पॉइंट-ऑफ-विक्री
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","आधीच क्रेडिट खाते शिल्लक, आपण &#39;डेबिट&#39; म्हणून &#39;शिल्लक असणे आवश्यक आहे&#39; सेट करण्याची परवानगी नाही"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","आधीच क्रेडिट खाते शिल्लक, आपण &#39;डेबिट&#39; म्हणून &#39;शिल्लक असणे आवश्यक आहे&#39; सेट करण्याची परवानगी नाही"
 DocType: Account,Balance must be,शिल्लक असणे आवश्यक आहे
 DocType: Hub Settings,Publish Pricing,किंमत प्रकाशित
 DocType: Notification Control,Expense Claim Rejected Message,खर्च हक्क नाकारला संदेश
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,चलन विनिमय दर मास्टर.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,पहिल्या दस्तऐवज प्रकार निवडा
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ही देखभाल भेट द्या रद्द आधी रद्द करा साहित्य भेटी {0}
 DocType: Salary Slip,Leave Encashment Amount,एनकॅशमेंट रक्कम सोडा
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,मुलभूत देय खाती
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} कर्मचारी सक्रिय नाही आहे किंवा अस्तित्वात नाही
 DocType: Features Setup,Item Barcode,आयटम बारकोड
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,आयटम रूपे {0} अद्ययावत
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,आयटम रूपे {0} अद्ययावत
 DocType: Quality Inspection Reading,Reading 6,6 वाचन
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चलन आगाऊ खरेदी
 DocType: Address,Shop,दुकान
 DocType: Hub Settings,Sync Now,समक्रमण आता
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},रो {0}: क्रेडिट प्रवेश दुवा साधला जाऊ शकत नाही {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},रो {0}: क्रेडिट प्रवेश दुवा साधला जाऊ शकत नाही {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,या मोडमध्ये निवडलेले असताना मुलभूत बँक / रोख खाते आपोआप पीओएस चलन अद्यतनित केले जाईल.
 DocType: Employee,Permanent Address Is,स्थायी पत्ता आहे
 DocType: Production Order Operation,Operation completed for how many finished goods?,ऑपरेशन किती तयार वस्तू पूर्ण?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ब्रँड
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,{0} आयटम साठी पार over- भत्ता {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0} आयटम साठी पार over- भत्ता {1}.
 DocType: Employee,Exit Interview Details,बाहेर पडा मुलाखत तपशील
 DocType: Item,Is Purchase Item,खरेदी आयटम आहे
 DocType: Journal Entry Account,Purchase Invoice,खरेदी चलन
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,शब्दात एकूण
 DocType: Material Request Item,Lead Time Date,आघाडी वेळ दिनांक
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,बंधनकारक आहे. कदाचित चलन विनिमय रेकॉर्ड तयार नाही
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},रो # {0}: आयटम नाही सिरियल निर्दिष्ट करा {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},रो # {0}: आयटम नाही सिरियल निर्दिष्ट करा {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","&#39;उत्पादन बंडल&#39; आयटम, कोठार, सिरीयल नाही आणि बॅच साठी नाही &#39;पॅकिंग सूची&#39; टेबल पासून विचार केला जाईल. कोठार आणि बॅच नाही कोणताही उत्पादन बंडल &#39;आयटम सर्व पॅकिंग आयटम सारखीच असतात असेल, तर त्या मूल्ये मुख्य आयटम टेबल प्रविष्ट केले जाऊ शकतात, मूल्ये टेबल&#39; यादी पॅकिंग &#39;कॉपी होईल."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ग्राहकांना निर्यात.
 DocType: Purchase Invoice Item,Purchase Order Item,ऑर्डर आयटम खरेदी
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,फरक
 ,Company Name,कंपनी नाव
 DocType: SMS Center,Total Message(s),एकूण संदेश (चे)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,चेक जमा होते जेथे बँक खाते निवडा प्रमुख.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,वापरकर्ता व्यवहार दर सूची दर संपादित करण्याची परवानगी द्या
 DocType: Pricing Rule,Max Qty,कमाल Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,रासायनिक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,सर्व आयटम आधीच या उत्पादन ऑर्डर बदल्या करण्यात आल्या आहेत.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,सर्व आयटम आधीच या उत्पादन ऑर्डर बदल्या करण्यात आल्या आहेत.
 DocType: Process Payroll,Select Payroll Year and Month,वेतनपट वर्ष आणि महिना निवडा
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",योग्य गट (सहसा निधी अर्ज&gt; वर्तमान मालमत्ता&gt; बँक खाते जा टाइप करा) बाल जोडा वर क्लिक करून (नवीन खाते तयार &quot;बँक&quot;
 DocType: Workstation,Electricity Cost,वीज खर्च
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),सर्व लीड (उघडा)
 DocType: Purchase Invoice,Get Advances Paid,अग्रिम पेड करा
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,आपले चित्र संलग्न
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,करा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,करा
 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 +3,My Cart,माझे टाका
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,माझे टाका
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Qty उघडत
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,रोख / बँक खाते
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,प्रमाणात किंवा मूल्य नाही बदल काढली आयटम.
 DocType: Delivery Note,Delivery To,वितरण
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
 DocType: Production Planning Tool,Get Sales Orders,विक्री ऑर्डर मिळवा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} नकारात्मक असू शकत नाही
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,सवलत
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,सवलत
 DocType: Features Setup,Purchase Discounts,खरेदी सवलत
 DocType: Workstation,Wages,पगार
 DocType: Time Log,Will be updated only if Time Log is 'Billable',वेळ लॉग &#39;बिल&#39; असेल तर फक्त अद्ययावत केले जाईल
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,शिपिंग राज्य
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,आयटम &#39;बटण खरेदी पावत्या आयटम मिळवा&#39; वापर करून समाविष्ट करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,विक्री खर्च
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,मानक खरेदी
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,मानक खरेदी
 DocType: GL Entry,Against,विरुद्ध
 DocType: Item,Default Selling Cost Center,मुलभूत विक्री खर्च केंद्र
 DocType: Sales Partner,Implementation Partner,अंमलबजावणी भागीदार
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,हे खरेदी सूचीत टाका शिपिंग नियम
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन ऑर्डर {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',सेट &#39;वर अतिरिक्त सवलत लागू करा&#39; करा
 ,Ordered Items To Be Billed,आदेश दिले आयटम बिल करायचे
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,श्रेणी कमी असणे आवश्यक आहे पेक्षा श्रेणी
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,वेळ नोंदी निवडा आणि एक नवीन विक्री चलन तयार करण्यासाठी सबमिट करा.
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,या वेळ लॉग बॅच बिल आले आहे.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,संधी तयार करा
 DocType: Salary Slip,Leave Without Pay,पे न करता सोडू
-DocType: Supplier,Communications,कम्युनिकेशन्स
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,क्षमता नियोजन त्रुटी
 ,Trial Balance for Party,पार्टी चाचणी शिल्लक
 DocType: Lead,Consultant,सल्लागार
 DocType: Salary Slip,Earnings,कमाई
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,पूर्ण आयटम {0} उत्पादन प्रकार नोंदणी करीता प्रविष्ट करणे आवश्यक आहे
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,उघडत लेखा शिल्लक
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,पूर्ण आयटम {0} उत्पादन प्रकार नोंदणी करीता प्रविष्ट करणे आवश्यक आहे
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,उघडत लेखा शिल्लक
 DocType: Sales Invoice Advance,Sales Invoice Advance,विक्री चलन आगाऊ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,काहीही विनंती करण्यासाठी
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','वास्तविक प्रारंभ तारीख' ही 'वास्तविक अंतिम तारीख' यापेक्षा जास्त असू शकत नाही
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,चालू आर्थिक वर्षात वर्ष
 DocType: Global Defaults,Disable Rounded Total,गोळाबेरीज एकूण अक्षम करा
 DocType: Lead,Call,कॉल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;नोंदी&#39; रिकामे असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&#39;नोंदी&#39; रिकामे असू शकत नाही
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},सह डुप्लिकेट सलग {0} त्याच {1}
 ,Trial Balance,चाचणी शिल्लक
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,कर्मचारी सेट अप
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,वापरकर्ता आयडी
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,पहा लेजर
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,लवकरात लवकर
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group","एक आयटम गट त्याच नावाने अस्तित्वात नाही, आयटम नाव बदलू किंवा आयटम गटाचे नाव कृपया"
 DocType: Production Order,Manufacture against Sales Order,विक्री ऑर्डर विरुद्ध उत्पादन
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,उर्वरित जग
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,एकूण वेतन
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},गोठविलेल्या खाते संपादित करण्यासाठी आपण अधिकृत नाही {0}
 DocType: Journal Entry,Get Outstanding Invoices,थकबाकी पावत्या मिळवा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,विक्री ऑर्डर {0} वैध नाही
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,समस्या ठिकाण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,करार
 DocType: Email Digest,Add Quote,कोट जोडा
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM आवश्यक UOM coversion घटक: {0} आयटम मध्ये: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM आवश्यक UOM coversion घटक: {0} आयटम मध्ये: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,अप्रत्यक्ष खर्च
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,रो {0}: Qty अनिवार्य आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषी
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,आपली उत्पादने किंवा सेवा
 DocType: Mode of Payment,Mode of Payment,मोड ऑफ पेमेंट्स
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,हा रूट आयटम गट आहे आणि संपादित केला जाऊ शकत नाही.
 DocType: Journal Entry Account,Purchase Order,खरेदी ऑर्डर
 DocType: Warehouse,Warehouse Contact Info,वखार संपर्क माहिती
@@ -1018,8 +1024,8 @@
 DocType: Email Digest,Annual Income,वार्षिक उत्पन्न
 DocType: Serial No,Serial No Details,सिरियल तपशील
 DocType: Purchase Invoice Item,Item Tax Rate,आयटम कराचा दर
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,आयटम {0} सब-करारबद्ध आयटम असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,कॅपिटल उपकरणे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","किंमत नियम पहिल्या आधारित निवडले आहे आयटम, आयटम गट किंवा ब्रॅण्ड असू शकते जे शेत &#39;रोजी लागू करा&#39;."
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,लक्ष्य
 DocType: Sales Invoice Item,Edit Description,वर्णन संपादित करा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,अपेक्षित वितरण तारीख नियोजनबद्ध प्रारंभ तारीख पेक्षा कमी आहे.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,पुरवठादार साठी
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,पुरवठादार साठी
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,खाते प्रकार सेट व्यवहार हे खाते निवडून मदत करते.
 DocType: Purchase Invoice,Grand Total (Company Currency),एकूण (कंपनी चलन)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,एकूण जाणारे
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,जर्नल प्रवेश
 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 +427,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,या हा प्रत्यय गेल्या निर्माण व्यवहार संख्या आहे
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","संपर्क वृत्तपत्रे, ठरतो."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,संचालन रिक्त सोडले जाऊ शकत नाही.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,संचालन रिक्त सोडले जाऊ शकत नाही.
 ,Delivered Items To Be Billed,वितरित केले आयटम बिल करायचे
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,कोठार सिरियल क्रमांक साठी बदलले जाऊ शकत नाही
 DocType: Authorization Rule,Average Discount,सरासरी सवलत
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},पासून {0} | {1} {2}
 DocType: BOM Operation,Operation Description,ऑपरेशन वर्णन
 DocType: Item,Will also apply to variants,तसेच रूपे लागू होईल
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,आर्थिक वर्ष जतन केले आहे एकदा आर्थिक वर्ष प्रारंभ तारीख आणि आर्थिक वर्ष अंतिम तारीख बदलू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,आर्थिक वर्ष जतन केले आहे एकदा आर्थिक वर्ष प्रारंभ तारीख आणि आर्थिक वर्ष अंतिम तारीख बदलू शकत नाही.
 DocType: Quotation,Shopping Cart,हे खरेदी सूचीत टाका
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,सरासरी दैनिक जाणारे
 DocType: Pricing Rule,Campaign,मोहीम
@@ -1100,7 +1106,8 @@
 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 +211,Stock Entries already created for Production Order ,आधीच उत्पादन ऑर्डर तयार स्टॉक नोंदी
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,आधीच उत्पादन ऑर्डर तयार स्टॉक नोंदी
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,मुदत मालमत्ता निव्वळ बदला
 DocType: Leave Control Panel,Leave blank if considered for all designations,सर्व पदे विचार तर रिक्त सोडा
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,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 +182,Max: {0},कमाल: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,लेखा चार्ट
 DocType: Material Request,Terms and Conditions Content,अटी आणि शर्ती सामग्री
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,मालकीचे
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,पे न करता सोडू अवलंबून
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,उप विधानसभा
 DocType: Shipping Rule Condition,To Value,मूल्य
 DocType: Supplier,Stock Manager,शेअर व्यवस्थापक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},स्रोत कोठार सलग अनिवार्य आहे {0}
+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 +581,Packing Slip,पॅकिंग स्लिप्स
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,कार्यालय भाडे
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,सेटअप एसएमएस गेटवे सेटिंग
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,नाही पत्ता अद्याप जोडले.
 DocType: Workstation Working Hour,Workstation Working Hour,वर्कस्टेशन कार्यरत तास
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,विश्लेषक
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},रो {0}: रक्कम {1} पेक्षा कमी किंवा संयुक्त रक्कम बरोबरी करणे आवश्यक आहे {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},रो {0}: रक्कम {1} पेक्षा कमी किंवा संयुक्त रक्कम बरोबरी करणे आवश्यक आहे {2}
 DocType: Item,Inventory,सूची
 DocType: Features Setup,"To enable ""Point of Sale"" view",दृश्य &quot;विक्री पॉइंट&quot; सक्षम करण्यासाठी
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,भरणा रिक्त कार्ट केले जाऊ शकत नाही
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,भरणा रिक्त कार्ट केले जाऊ शकत नाही
 DocType: Item,Sales Details,विक्री तपशील
 DocType: Opportunity,With Items,आयटम
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty मध्ये
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,पालक खर्च केंद्र
 DocType: Sales Invoice,Source,स्रोत
 DocType: Leave Type,Is Leave Without Pay,पे न करता सोडू आहे
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,भरणा टेबल आढळली नाही रेकॉर्ड
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,भरणा टेबल आढळली नाही रेकॉर्ड
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,आर्थिक वर्ष प्रारंभ तारीख
 DocType: Employee External Work History,Total Experience,एकूण अनुभव
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,रद्द पॅकिंग स्लिप (चे)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,रद्द पॅकिंग स्लिप (चे)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,गुंतवणूक रोख प्रवाह
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,वाहतुक आणि अग्रेषित शुल्क
 DocType: Material Request Item,Sales Order No,विक्री ऑर्डर नाही
 DocType: Item Group,Item Group Name,आयटम गट नाव
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,उत्पादन हस्तांतरण सामुग्री
 DocType: Pricing Rule,For Price List,किंमत सूची
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी शोध
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","आयटम खरेदी दर: {0} आढळले नाही, एकट्या नोंदणी (खर्च) बुक करणे आवश्यक आहे. एक खरेदी किंमत सूची विरुद्ध आयटम किंमत उल्लेख करा."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","आयटम खरेदी दर: {0} आढळले नाही, एकट्या नोंदणी (खर्च) बुक करणे आवश्यक आहे. एक खरेदी किंमत सूची विरुद्ध आयटम किंमत उल्लेख करा."
 DocType: Maintenance Schedule,Schedules,वेळापत्रक
 DocType: Purchase Invoice Item,Net Amount,निव्वळ रक्कम
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM तपशील नाही
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),अतिरिक्त सवलत रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},त्रुटी: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},त्रुटी: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,लेखा चार्ट नवीन खाते तयार करा.
 DocType: Maintenance Visit,Maintenance Visit,देखभाल भेट द्या
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,विक्री भागीदार लक्ष्य
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} एकट्या फक्त प्रवेश चलनात केले जाऊ शकते: {1}
 DocType: Pricing Rule,Pricing Rule,किंमत नियम
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ऑर्डर खरेदी करण्यासाठी साहित्य विनंती
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ऑर्डर खरेदी करण्यासाठी साहित्य विनंती
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},रो # {0}: परत आयटम {1} नाही विद्यमान नाही {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,बँक खाते
 ,Bank Reconciliation Statement,बँक मेळ विवरणपत्र
@@ -1225,11 +1233,11 @@
 ,POS,पीओएस
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,उघडत स्टॉक शिल्लक
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} केवळ एकदा करणे आवश्यक आहे
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},अधिक tranfer परवानगी नाही {0} पेक्षा {1} पर्चेस विरुद्ध {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},यशस्वीरित्या वाटप पाने {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,आयटम नाहीत पॅक करण्यासाठी
 DocType: Shipping Rule Condition,From Value,मूल्य
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,उत्पादन प्रमाण अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,उत्पादन प्रमाण अनिवार्य आहे
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,बँक प्रतिबिंबित नाही प्रमाणात
 DocType: Quality Inspection Reading,Reading 4,4 वाचन
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,कंपनी खर्च दावे.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,पुरवठादार अवतरणे तयार नाहीत जे साहित्य विनंत्या
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,आपण रजा अर्ज करत आहेत ज्या दिवशी (चे) सुटी आहेत. आपण रजा अर्ज गरज नाही.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,बारकोड वापरुन आयटम ट्रॅक करण्यासाठी. आपण आयटम बारकोड स्कॅनिंग करून वितरण टीप आणि विक्री चलन आयटम दाखल करण्यास सक्षम असेल.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,मार्क वितरित म्हणून
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,मार्क वितरित म्हणून
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,कोटेशन करा
 DocType: Dependent Task,Dependent Task,अवलंबित कार्य
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},माप मुलभूत युनिट रुपांतर घटक सलग 1 असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,थांबवा वाढदिवस स्मरणपत्रे
 DocType: SMS Center,Receiver List,स्वीकारणारा यादी
 DocType: Payment Tool Detail,Payment Amount,भरणा रक्कम
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,नाश रक्कम
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} पहा
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} पहा
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,रोख निव्वळ बदला
 DocType: Salary Structure Deduction,Salary Structure Deduction,वेतन संरचना कपात
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबल एकदा पेक्षा अधिक प्रविष्ट केले गेले आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {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 +185,Quantity must not be more than {0},प्रमाण जास्त असू शकत नाही {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),वय (दिवस)
 DocType: Quotation Item,Quotation Item,कोटेशन आयटम
 DocType: Account,Account Name,खाते नाव
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,तारीख तारीख करण्यासाठी पेक्षा जास्त असू शकत नाही पासून
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,तारीख तारीख करण्यासाठी पेक्षा जास्त असू शकत नाही पासून
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,सिरियल नाही {0} प्रमाणात {1} एक अपूर्णांक असू शकत नाही
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,पुरवठादार प्रकार मास्टर.
 DocType: Purchase Order Item,Supplier Part Number,पुरवठादार भाग क्रमांक
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 किंवा 1 असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 किंवा 1 असू शकत नाही
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,"खरेदी पावती {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,"खरेदी पावती {0} सबमिट केलेली नाही,"
 DocType: Company,Default Payable Account,मुलभूत देय खाते
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","जसे शिपिंग नियम, किंमत सूची इत्यादी ऑनलाइन शॉपिंग कार्ट सेटिंग्ज"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% बिल
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,माझे मुद्दे
 DocType: BOM Item,BOM Item,BOM आयटम
 DocType: Appraisal,For Employee,कर्मचारी साठी
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,रो {0}: पुरवठादार विरुद्ध आगाऊ डेबिट करणे आवश्यक आहे
 DocType: Company,Default Values,मुलभूत मुल्य
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,रो {0}: भरणा रक्कम नकारात्मक असू शकत नाही
 DocType: Expense Claim,Total Amount Reimbursed,एकूण रक्कम परत देऊन
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},पुरवठादार विरुद्ध चलन {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},पुरवठादार विरुद्ध चलन {0} दिनांक {1}
 DocType: Customer,Default Price List,मुलभूत दर सूची
 DocType: Payment Reconciliation,Payments,देयके
 DocType: Budget Detail,Budget Allocated,अर्थसंकल्प वाटप
 DocType: Journal Entry,Entry Type,प्रवेश प्रकार
 ,Customer Credit Balance,ग्राहक क्रेडिट शिल्लक
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,देय खाती निव्वळ बदल
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,आपला ई-मेल आयडी सत्यापित करा
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',&#39;Customerwise सवलत&#39; आवश्यक ग्राहक
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,नियतकालिके बँकेच्या भरणा तारखा अद्यतनित करा.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,हे खरेदी सूचीत टाका सक्षम
 DocType: Employee,Permanent Address,स्थायी पत्ता
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,आयटम {0} एक सेवा आयटम असणे आवश्यक आहे.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",एकूण पेक्षा \ {0} {1} जास्त असू शकत नाही विरुद्ध दिले आगाऊ {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,आयटम कोड निवडा
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),पे न करता सोडू साठी कपात कमी (LWP)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,एक आयटम एकच एकक.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',वेळ लॉग बॅच {0} &#39;सादर&#39; करणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',वेळ लॉग बॅच {0} &#39;सादर&#39; करणे आवश्यक आहे
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,प्रत्येक स्टॉक चळवळ एकट्या प्रवेश करा
 DocType: Leave Allocation,Total Leaves Allocated,एकूण पाने वाटप
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},रो नाही आवश्यक कोठार {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},रो नाही आवश्यक कोठार {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,वैध आर्थिक वर्ष प्रारंभ आणि शेवट तारखा प्रविष्ट करा
 DocType: Employee,Date Of Retirement,निवृत्ती तारीख
 DocType: Upload Attendance,Get Template,साचा मिळवा
 DocType: Address,Postal,पोस्टल
 DocType: Item,Weightage,वजन
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,एक ग्राहक गट तत्सम नावाने विद्यमान ग्राहक नाव बदलू किंवा ग्राहक गट नाव बदला करा
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,{0} पहिल्या निवडा.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},मजकूर {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,{0} पहिल्या निवडा.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},मजकूर {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,नवीन संपर्क
 DocType: Territory,Parent Territory,पालक प्रदेश
 DocType: Quality Inspection Reading,Reading 2,2 वाचन
 DocType: Stock Entry,Material Receipt,साहित्य पावती
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},पार्टी प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते आवश्यक आहे {0}
 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 +210,Quantity required for Item {0} in row {1},सलग आयटम {0} साठी आवश्यक त्या प्रमाणात {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},सलग आयटम {0} साठी आवश्यक त्या प्रमाणात {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},प्रमाण आयटम विद्यमान म्हणून कोठार {0} हटविले जाऊ शकत नाही {1}
 DocType: Quotation,Order Type,ऑर्डर प्रकार
 DocType: Purchase Invoice,Notification Email Address,सूचना ई-मेल पत्ता
@@ -1361,15 +1373,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बरेच स्तंभ. अहवाल निर्यात करा आणि एक स्प्रेडशीट अनुप्रयोग वापरून मुद्रित करा.
 DocType: Sales 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 +152,Main,मुख्य
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,मुख्य
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,जिच्यामध्ये variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,तुमचा व्यवहार वर मालिका संख्या सेट पूर्वपद
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,थांबवले आदेश रद्द केले जाऊ शकत नाही. रद्द करण्यासाठी बूच.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,खरेदी ऑर्डर करा
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,खरेदी ऑर्डर करा
 DocType: SMS Center,Send To,पाठवा
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
 DocType: Payment Reconciliation Payment,Allocated amount,रक्कम
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,वखार आणि संदर्भ
 DocType: Supplier,Statutory info and other general information about your Supplier,आपल्या पुरवठादार बद्दल वैधानिक माहिती आणि इतर सर्वसाधारण माहिती
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,पत्ते
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल विरुद्ध प्रवेश {0} कोणत्याही न जुळणारी {1} नोंद नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल विरुद्ध प्रवेश {0} कोणत्याही न जुळणारी {1} नोंद नाही
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},सिरियल नाही आयटम प्रविष्ट डुप्लिकेट {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,एक शिपिंग नियम एक अट
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,आयटम उत्पादन ऑर्डर आहेत करण्याची परवानगी नाही.
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,खाते चलन क्रेडिट रक्कम
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,उत्पादन वेळ नोंदी.
 DocType: Item,Apply Warehouse-wise Reorder Level,कोठार कुशल पुनर्क्रमित स्तर लागू करा
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
 DocType: Authorization Control,Authorization Control,प्राधिकृत नियंत्रण
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},रो # {0}: वखार नाकारलेले नाकारले आयटम विरुद्ध अनिवार्य आहे {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,कार्ये वेळ लॉग इन करा.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,भरणा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,भरणा
 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},जास्तीत जास्त {0} साहित्याचा विनंती {1} विक्री आदेशा आयटम साठी केले जाऊ शकते {2}
 DocType: Employee,Salutation,हा सलाम लिहीत आहे
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,सहकारी
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,{0} आयटम सिरीयलाइज आयटम नाही
 DocType: SMS Center,Create Receiver List,स्वीकारणारा यादी तयार करा
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,कालबाह्य
 DocType: Packing Slip,To Package No.,क्रमांक पॅकेज करण्यासाठी
 DocType: Warranty Claim,Issue Date,जारी केल्याचा दिनांक
 DocType: Activity Cost,Activity Cost,क्रियाकलाप खर्च
@@ -1449,7 +1461,7 @@
 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 +65,Territory / Customer,प्रदेश / ग्राहक
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,उदा 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,विक्री आयटम आहे
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,आयटम गट वृक्ष
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} तयार
 DocType: Delivery Note Item,Against Sales Order,विक्री आदेशा
 ,Serial No Status,सिरियल नाही स्थिती
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,आयटम टेबल रिक्त ठेवता येणार नाही
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,आयटम टेबल रिक्त ठेवता येणार नाही
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","रो {0}: सेट करण्यासाठी {1} ठराविक मुदतीने पुन: पुन्हा उगवणे, आणि तारीख \ दरम्यान फरक पेक्षा मोठे किंवा समान असणे आवश्यक आहे {2}"
 DocType: Pricing Rule,Selling,विक्री
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,करापोटी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,पुरवले Qty
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,प्रतिष्ठापन वेळ
 DocType: Sales Invoice,Accounting Details,लेखा माहिती
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,ही कंपनी सर्व व्यवहार हटवा
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,रो # {0}: ऑपरेशन {1} उत्पादन पूर्ण माल {2} qty पूर्ण नाही आहे ऑर्डर # {3}. वेळ नोंदी द्वारे ऑपरेशन स्थिती अद्यतनित करा
+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,रो # {0}: ऑपरेशन {1} उत्पादन पूर्ण माल {2} qty पूर्ण नाही आहे ऑर्डर # {3}. वेळ नोंदी द्वारे ऑपरेशन स्थिती अद्यतनित करा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,गुंतवणूक
 DocType: Issue,Resolution Details,ठराव तपशील
 DocType: Quality Inspection Reading,Acceptance Criteria,स्वीकृती निकष
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,साफ करा टेबल
 DocType: Features Setup,Brands,ब्रांड
 DocType: C-Form Invoice Detail,Invoice No,चलन नाही
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,खरेदी ऑर्डर पासून
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,खरेदी ऑर्डर पासून
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,भांडवलाच्या दर
 ,Customer Addresses And Contacts,ग्राहक पत्ते आणि संपर्क
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,देखभाल वेळापत्रक
 ,Quotation Trends,कोटेशन ट्रेन्ड
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},आयटम गट आयटम आयटम मास्टर उल्लेख केला नाही {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
 DocType: Shipping Rule Condition,Shipping Amount,शिपिंग रक्कम
 ,Pending Amount,प्रलंबित रक्कम
 DocType: Purchase Invoice Item,Conversion Factor,रूपांतरण फॅक्टर
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial खाती वृक्ष.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,सर्व कर्मचारी प्रकार विचार तर रिक्त सोडा
 DocType: Landed Cost Voucher,Distribute Charges Based On,वितरण शुल्क आधारित
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,आयटम {1} मालमत्ता आयटम आहे म्हणून खाते {0} &#39;मुदत मालमत्ता&#39; प्रकारच्या असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,आयटम {1} मालमत्ता आयटम आहे म्हणून खाते {0} &#39;मुदत मालमत्ता&#39; प्रकारच्या असणे आवश्यक आहे
 DocType: HR Settings,HR Settings,एचआर सेटिंग्ज
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च दावा मंजुरीसाठी प्रलंबित आहे. फक्त खर्च माफीचा साक्षीदार स्थिती अद्यतनित करू शकता.
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त सवलत रक्कम
 DocType: Leave Block List Allow,Leave Block List Allow,ब्लॉक यादी परवानगी द्या सोडा
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,क्रीडा
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,वास्तविक एकूण
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,युनिट
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} मुलभूत आर्थिक वर्ष आहे. बदल प्रभावाखाली येण्यासाठी आपल्या ब्राउझर रीफ्रेश करा.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,खर्च दावे
 DocType: Issue,Support,समर्थन
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,पहा टाका
 ,BOM Search,BOM शोध
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),बंद (+ बेरजा उघडत)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,कंपनी चलन निर्दिष्ट करा
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM रुपांतर घटक सलग आवश्यक आहे {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},निपटारा तारीख सलग चेक तारखेच्या आधी असू शकत नाही {0}
 DocType: Salary Slip,Deduction,कपात
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},आयटम किंमत जोडले {0} किंमत यादी मध्ये {1}
 DocType: Address Template,Address Template,पत्ता साचा
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,या विक्री व्यक्ती कर्मचारी आयडी प्रविष्ट करा
 DocType: Territory,Classification of Customers by region,प्रदेशानुसार ग्राहक वर्गीकरण
 DocType: Project,% Tasks Completed,% कार्ये पूर्ण
 DocType: Project,Gross Margin,एकूण मार्जिन
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,पहिल्या उत्पादन आयटम प्रविष्ट करा
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,अक्षम वापरकर्ता
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,अक्षम वापरकर्ता
 DocType: Opportunity,Quotation,कोटेशन
 DocType: Salary Slip,Total Deduction,एकूण कपात
 DocType: Quotation,Maintenance User,देखभाल सदस्य
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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,वजा
@@ -1588,12 +1602,12 @@
 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,त्यामुळे Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","शेअर नोंदी कोठार विरुद्ध अस्तित्वात {0}, त्यामुळे आपण पुन्हा-नोंदवू किंवा कोठार सुधारणा करू शकत नाही"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","शेअर नोंदी कोठार विरुद्ध अस्तित्वात {0}, त्यामुळे आपण पुन्हा-नोंदवू किंवा कोठार सुधारणा करू शकत नाही"
 DocType: Appraisal,Calculate Total Score,एकूण धावसंख्या गणना
 DocType: Supplier Quotation,Manufacturing Manager,उत्पादन व्यवस्थापक
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},सिरियल नाही {0} पर्यंत हमी अंतर्गत आहे {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,संकुल स्प्लिट वितरण टीप.
-apps/erpnext/erpnext/hooks.py +68,Shipments,निर्यात
+apps/erpnext/erpnext/hooks.py +69,Shipments,निर्यात
 DocType: Purchase Order Item,To be delivered to customer,ग्राहकाला वितरित करणे
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,वेळ लॉग स्थिती सादर करणे आवश्यक आहे.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,सिरियल नाही {0} कोणत्याही वखार संबंधित नाही
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,कंपनी निवडा ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,सर्व विभागांसाठी वाटल्यास रिक्त सोडा
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","रोजगार प्रकार (कायम, करार, हद्दीच्या इ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} आयटम अनिवार्य आहे {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} आयटम अनिवार्य आहे {1}
 DocType: Currency Exchange,From Currency,चलन पासून
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","किमान एक सलग रक्कम, चलन प्रकार आणि चलन क्रमांक निवडा"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},आयटम आवश्यक विक्री ऑर्डर {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","किमान एक सलग रक्कम, चलन प्रकार आणि चलन क्रमांक निवडा"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},आयटम आवश्यक विक्री ऑर्डर {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,प्रणाली प्रतिबिंबित नाही प्रमाणात
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी चलन)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,इतर
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,प्रक्रिया मध्ये
 DocType: Authorization Rule,Itemwise Discount,Itemwise सवलत
 DocType: Purchase Order Item,Reference Document Type,संदर्भ दस्तऐवज प्रकार
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} विक्री आदेशा {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} विक्री आदेशा {1}
 DocType: Account,Fixed Asset,निश्चित मालमत्ता
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,सिरीयलाइज यादी
 DocType: Activity Type,Default Billing Rate,डीफॉल्ट बिलिंग दर
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,भरणा करण्यासाठी विक्री आदेश
 DocType: Expense Claim Detail,Expense Claim Detail,खर्च हक्क तपशील
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,वेळ नोंदी तयार:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,योग्य खाते निवडा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,योग्य खाते निवडा
 DocType: Item,Weight UOM,वजन UOM
 DocType: Employee,Blood Group,रक्त गट
 DocType: Purchase Invoice Item,Page Break,पृष्ठ ब्रेक
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,वेळ
 DocType: Authorization Rule,Approving Role (above authorized value),(अधिकृत मूल्य वरील) भूमिका मंजूर
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","मुलाला नोडस् जोडण्यासाठी, वृक्ष अन्वेषण आणि आपण अधिक नोडस् जोडू इच्छित ज्या अंतर्गत नोड वर क्लिक करा."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,खाते क्रेडिट देय खाते असणे आवश्यक आहे
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} पालक किंवा मुलाला होऊ शकत नाही {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,खाते क्रेडिट देय खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} पालक किंवा मुलाला होऊ शकत नाही {2}
 DocType: Production Order Operation,Completed Qty,पूर्ण Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, फक्त डेबिट खाती दुसरे क्रेडिट नोंदणी लिंक जाऊ शकते"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","{0}, फक्त डेबिट खाती दुसरे क्रेडिट नोंदणी लिंक जाऊ शकते"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,किंमत सूची {0} अक्षम आहे
 DocType: Manufacturing Settings,Allow Overtime,जादा वेळ परवानगी द्या
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} आयटम आवश्यक सिरिअल क्रमांक {1}. आपण प्रदान केलेल्या {2}.
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,ग्राहक आयटम कोड
 DocType: Opportunity,Lost Reason,गमावले कारण
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ऑर्डर किंवा चलने विरुद्ध भरणा नोंदी तयार करा.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,नवीन पत्ता
 DocType: Quality Inspection,Sample Size,नमुना आकार
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,सर्व आयटम आधीच invoiced आहेत
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,पुढील खर्च केंद्रे गट अंतर्गत केले जाऊ शकते पण नोंदी नॉन-गट सुरू केले
 DocType: Project,External,बाह्य
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,साधन पुनर्नामित करा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,अद्यतन खर्च
 DocType: Item Reorder,Item Reorder,आयटम पुनर्क्रमित
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,ट्रान्सफर साहित्य
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,ट्रान्सफर साहित्य
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ऑपरेशन, ऑपरेटिंग खर्च निर्देशीत आणि आपल्या ऑपरेशन नाही एक अद्वितीय ऑपरेशन द्या."
 DocType: Purchase Invoice,Price List Currency,किंमत सूची चलन
 DocType: Naming Series,User must always select,सदस्य नेहमी निवडणे आवश्यक आहे
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक शेअर परवानगी द्या
 DocType: Installation Note,Installation Note,प्रतिष्ठापन टीप
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,कर जोडा
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,आर्थिक रोख प्रवाह
 ,Financial Analytics,आर्थिक विश्लेषण
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित केली
 DocType: Address,Subsidiary,उपकंपनी
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,पगाराच्या स्लिप्स तयार करा
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,बँक नुसार अपेक्षित शिल्लक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),निधी स्रोत (दायित्व)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},सलग प्रमाण {0} ({1}) उत्पादित प्रमाणात समान असणे आवश्यक आहे {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},सलग प्रमाण {0} ({1}) उत्पादित प्रमाणात समान असणे आवश्यक आहे {2}
 DocType: Appraisal,Employee,कर्मचारी
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,पासून आयात ईमेल
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,वापरकर्ता म्हणून आमंत्रित करा
 DocType: Features Setup,After Sale Installations,विक्री स्थापना केल्यानंतर
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} पूर्णपणे बिल आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} पूर्णपणे बिल आहे
 DocType: Workstation Working Hour,End Time,समाप्त वेळ
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,विक्री किंवा खरेदी करीता मानक करार अटी.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,व्हाउचर गट
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,आवश्यक रोजी
 DocType: Sales Invoice,Mass Mailing,मास मेलींग
 DocType: Rename Tool,File to Rename,पुनर्नामित करा फाइल
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},आयटम आवश्यक Purchse मागणी क्रमांक {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},आयटम आवश्यक Purchse मागणी क्रमांक {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,शो देयके
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},आयटम अस्तित्वात नाही निर्दिष्ट BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,देखभाल वेळापत्रक {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,विक्री ऑर्डर आवश्यक
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ग्राहक तयार करा
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,देखभाल वेळापत्रक तपशील
 DocType: Quality Inspection Reading,Reading 9,9 वाचन
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,उपस्थित
 DocType: Payment Tool,Payment Account,भरणा खाते
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,खाते प्राप्तीयोग्य निव्वळ बदला
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,भरपाई देणारा बंद
 DocType: Quality Inspection Reading,Accepted,स्वीकारले
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,आपण खरोखर या कंपनी सर्व व्यवहार हटवू इच्छिता याची खात्री करा. ती आहे म्हणून आपला मालक डेटा राहील. ही क्रिया पूर्ववत केली जाऊ शकत नाही.
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,एकूण भरणा रक्कम
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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 +204,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, बीजक ड्रॉप शिपिंग आयटम आहे."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, बीजक ड्रॉप शिपिंग आयटम आहे."
 DocType: Newsletter,Test,कसोटी
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","सध्याच्या स्टॉक व्यवहार आपण मूल्ये बदलू शकत नाही \ या आयटम, आहेत म्हणून &#39;सिरियल नाही आहे&#39; &#39;&#39; बॅच आहे नाही &#39;,&#39; शेअर आयटम आहे &#39;आणि&#39; मूल्यांकन पद्धत &#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,जलद प्रवेश जर्नल
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,जलद प्रवेश जर्नल
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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 +157,Please enter Planned Qty for Item {0} at row {1},सलग येथे आयटम {0} साठी नियोजनबद्ध Qty प्रविष्ट करा {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,"{0} {1} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,"{0} {1} सबमिट केलेली नाही,"
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,आयटम विनंती.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,स्वतंत्र उत्पादन करण्यासाठी प्रत्येक पूर्ण चांगल्या आयटम तयार केले जाईल.
 DocType: Purchase Invoice,Terms and Conditions1,अटी आणि Conditions1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,अधिकृत मूल्य
 DocType: Contact,Enter department to which this Contact belongs,या संपर्क मालकीचे जे विभाग प्रविष्ट करा
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,एकूण अनुपिस्थत
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,सलग {0} जुळत नाही सामग्री विनंती आयटम किंवा कोठार
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,सलग {0} जुळत नाही सामग्री विनंती आयटम किंवा कोठार
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,माप युनिट
 DocType: Fiscal Year,Year End Date,वर्ष अंतिम तारीख
 DocType: Task Depends On,Task Depends On,कार्य अवलंबून असते
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,कंत्राटी अंतिम तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,एक आयोग कंपन्या उत्पादने विकतो तृतीय पक्ष जो वितरक / विक्रेता / दलाल / संलग्न / विक्रेत्याशी.
 DocType: Customer Group,Has Child Node,बाल नोड आहे
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} पर्चेस विरुद्ध {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} पर्चेस विरुद्ध {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","येथे स्थिर URL मापदंड प्रविष्ट करा (उदा. प्रेषक = ERPNext, वापरकर्तानाव = ERPNext, पासवर्ड = 1234 इ)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} कोणत्याही सक्रिय आर्थिक वर्ष आहे. अधिक माहितीसाठी या तपासासाठी {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,हे नमुना वेबसाइट ERPNext पासून स्वयं-व्युत्पन्न केलेले आहे
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,Recd प्रमाण
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},विक्री ऑर्डर प्रमाणात जास्त आयटम {0} निर्मिती करू शकत नाही {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,"शेअर प्रवेश {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,"शेअर प्रवेश {0} सबमिट केलेली नाही,"
 DocType: Payment Reconciliation,Bank / Cash Account,बँक / रोख खाते
 DocType: Tax Rule,Billing City,बिलिंग शहर
 DocType: Global Defaults,Hide Currency Symbol,चलन प्रतीक लपवा
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,उपयुक्तता खर्च
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-वर
 DocType: Buying Settings,Default Buying Price List,मुलभूत खरेदी दर सूची
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.","इ कंपनी, चलन, वर्तमान आर्थिक वर्षात, जसे सेट मुलभूत मुल्य"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,भरणा प्रकार
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",पहा कोटीच्या विभाग &quot;सामुग्री आधारित रोजी दर&quot;
 DocType: Appraisal Goal,Key Responsibility Area,की जबाबदारी क्षेत्र
 DocType: Item Reorder,Material Request Type,साहित्य विनंती प्रकार
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,रो {0}: UOM रुपांतर फॅक्टर अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,रो {0}: UOM रुपांतर फॅक्टर अनिवार्य आहे
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,संदर्भ
 DocType: Cost Center,Cost Center,खर्च केंद्र
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,प्रमाणक #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},{0} quotation_to एक मूल्य निवडा {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,सर्व पत्ते.
 DocType: Company,Stock Settings,शेअर सेटिंग्ज
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","खालील गुणधर्म दोन्ही रेकॉर्ड समान आहेत तर, विलीन फक्त शक्य आहे. गट, रूट प्रकार, कंपनी आहे"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","खालील गुणधर्म दोन्ही रेकॉर्ड समान आहेत तर, विलीन फक्त शक्य आहे. गट, रूट प्रकार, कंपनी आहे"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ग्राहक गट वृक्ष व्यवस्थापित करा.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,नवी खर्च केंद्र नाव
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण पॅनेल सोडा
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,भरणा साधन तपशील
 ,Sales Browser,विक्री ब्राउझर
 DocType: Journal Entry,Total Credit,एकूण क्रेडिट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश विरुद्ध अस्तित्वात {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,स्थानिक
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश विरुद्ध अस्तित्वात {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,स्थानिक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),कर्ज मालमत्ता (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 +147,Large,मोठे
@@ -2003,7 +2022,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,आपण सेट आणि लक्ष्य निरीक्षण करू शकता जेणेकरून सर्व विक्री व्यवहार अनेक ** विक्री व्यक्ती ** विरुद्ध टॅग केले जाऊ शकते.
 ,S.O. No.,त्यामुळे क्रमांक
 DocType: Production Order Operation,Make Time Log,वेळ लॉग करा
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,पुनर्क्रमित प्रमाण सेट करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,पुनर्क्रमित प्रमाण सेट करा
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},लीड ग्राहक तयार करा {0}
 DocType: Price List,Applicable for Countries,देश साठी लागू
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,संगणक
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,किमान एक आयटम परत दस्तऐवज नकारात्मक प्रमाणात प्रवेश केला पाहिजे
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,नाही शेरा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,नाही शेरा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,मुदत संपलेला
 DocType: Account,Stock Received But Not Billed,शेअर प्राप्त पण बिल नाही
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,रूट खाते एक गट असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,रूट खाते एक गट असणे आवश्यक आहे
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,एकूण वेतन + थकबाकी रक्कम + एनकॅशमेंट रक्कम - एकूण कपात
 DocType: Monthly Distribution,Distribution Name,वितरण नाव
 DocType: Features Setup,Sales and Purchase,विक्री आणि खरेदी
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,पार्टी शिल्लक
 DocType: Sales Invoice Item,Time Log Batch,वेळ लॉग बॅच
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,सवलत लागू निवडा कृपया
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,पगाराच्या स्लिप्स तयार
 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,उत्पादन साठी साहित्य ट्रान्सफर
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,सहामाही
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,आर्थिक वर्ष {0} सापडले नाही.
 DocType: Bank Reconciliation,Get Relevant Entries,संबंधित नोंदी मिळवा
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,शेअर एकट्या प्रवेश
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,शेअर एकट्या प्रवेश
 DocType: Sales Invoice,Sales Team1,विक्री Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
 DocType: Sales Invoice,Customer Address,ग्राहक पत्ता
 DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त सवलत लागू
 DocType: Account,Root Type,रूट प्रकार
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,पृष्ठाच्या शीर्षस्थानी हा स्लाइडशो दर्शवा
 DocType: BOM,Item UOM,आयटम UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),सवलत रक्कम नंतर कर रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},लक्ष्य कोठार सलग अनिवार्य आहे {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},लक्ष्य कोठार सलग अनिवार्य आहे {0}
 DocType: Quality Inspection,Quality Inspection,गुणवत्ता तपासणी
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,अतिरिक्त लहान
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: Qty मागणी साहित्य किमान Qty पेक्षा कमी आहे
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: Qty मागणी साहित्य किमान Qty पेक्षा कमी आहे
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,खाते {0} गोठविले
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संघटना राहण्याचे लेखा स्वतंत्र चार्ट सह कायदेशीर अस्तित्व / उपकंपनी.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","अन्न, पेय आणि तंबाखू"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,पु किंवा बी.एस.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},फक्त रक्कम करू शकता बिल न केलेली {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},फक्त रक्कम करू शकता बिल न केलेली {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,आयोगाने दर पेक्षा जास्त 100 असू शकत नाही
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,किमान सूची स्तर
 DocType: Stock Entry,Subcontract,Subcontract
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,येणार्या गुणवत्ता तपासणी.
 DocType: Purchase Order Item,Returned Qty,परत Qty
 DocType: Employee,Exit,बाहेर पडा
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,रूट प्रकार अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,रूट प्रकार अनिवार्य आहे
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,{0} तयार माणे
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ग्राहकांच्या सोयीसाठी, हे कोड पावत्या आणि वितरण टिपा सारख्या प्रिंट स्वरूपात वापरले जाऊ शकते"
 DocType: Employee,You can enter any date manually,तुम्ही स्वतः तारीख प्रविष्ट करू शकता
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,प्रशिक्षणार्थी कालावधी
 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 +110,Row {0}: Advance against Customer must be credit,रो {0}: ग्राहक विरुद्ध आगाऊ क्रेडिट असणे आवश्यक आहे
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,खरेदी पावती आयटम प्रदान
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,द्या
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,द्या
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,DATETIME करण्यासाठी
 DocType: SMS Settings,SMS Gateway URL,एसएमएस गेटवे URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,एसएमएस स्थिती राखण्यासाठी नोंदी
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,पुनर्क्रमित करा स्तर
 DocType: Attendance,Attendance Date,विधान परिषदेच्या तारीख
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,कमावते आणि कपात आधारित पगार चित्रपटाने.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,मुलाला नोडस् खाते लेजर रूपांतरीत केले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,मुलाला नोडस् खाते लेजर रूपांतरीत केले जाऊ शकत नाही
 DocType: Address,Preferred Shipping Address,पसंतीचे शिपिंग पत्ता
 DocType: Purchase Receipt Item,Accepted Warehouse,स्वीकृत कोठार
 DocType: Bank Reconciliation Detail,Posting Date,पोस्टिंग तारीख
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,सिरियल नाही {0} अस्तित्वात नाही
 DocType: Pricing Rule,Discount Percentage,सवलत टक्केवारी
 DocType: Payment Reconciliation Invoice,Invoice Number,चलन क्रमांक
-apps/erpnext/erpnext/hooks.py +54,Orders,आदेश
+apps/erpnext/erpnext/hooks.py +55,Orders,आदेश
 DocType: Leave Control Panel,Employee Type,कर्मचारी प्रकार
 DocType: Employee Leave Approver,Leave Approver,माफीचा साक्षीदार सोडा
 DocType: Manufacturing Settings,Material Transferred for Manufacture,साहित्य उत्पादन साठी हस्तांतरित
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,साहित्य% या विक्री आदेशा बिल
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,कालावधी संवरण
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,विद्यमान व्यवहार खर्चाच्या केंद्र गट रूपांतरीत केले जाऊ शकत नाही
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,घसारा
+DocType: Account,Depreciation,घसारा
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),पुरवठादार (चे)
 DocType: Customer,Credit Limit,क्रेडिट मर्यादा
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,व्यवहार प्रकार निवडा
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,विनंती
 DocType: Quotation Item,Against Doctype,Doctype विरुद्ध
 DocType: Delivery Note,Track this Delivery Note against any Project,कोणत्याही प्रकल्पाच्या विरोधात या वितरण टीप मागोवा
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,रूट खाते हटविले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,गुंतवणूक निव्वळ रोख
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,रूट खाते हटविले जाऊ शकत नाही
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,दर्शवा शेअर नोंदी
 ,Is Primary Address,प्राथमिक पत्ता आहे
 DocType: Production Order,Work-in-Progress Warehouse,कार्य-इन-प्रगती कोठार
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,पत्ते व्यवस्थापित करा
 DocType: Pricing Rule,Item Code,आयटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन ऑर्डर तयार करा
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,सदस्य शेरा
 DocType: Lead,Market Segment,बाजार विभाग
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी अंतर्गत कार्य इतिहास
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),बंद (डॉ)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),बंद (डॉ)
 DocType: Contact,Passive,निष्क्रीय
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,नाही स्टॉक मध्ये सिरियल नाही {0}
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,व्यवहार विक्री कर टेम्प्लेट.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,बिल केलेली रक्कम
 DocType: Bank Reconciliation,Bank Reconciliation,बँक मेळ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,अद्यतने मिळवा
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,साहित्य विनंती {0} रद्द किंवा बंद आहे
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,साहित्य विनंती {0} रद्द किंवा बंद आहे
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,काही नमुना रेकॉर्ड जोडा
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,व्यवस्थापन सोडा
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,खाते गट
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","नफा / तोटा गुन्हा दाखल करण्यात यावा करेन दायित्व अंतर्गत खाते प्रमुख,"
 DocType: Payment Tool,Against Vouchers,कूपन विरुद्ध
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,त्वरित मदत
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},स्त्रोत आणि लक्ष्य कोठार रांगेत समान असू शकत नाही {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},स्त्रोत आणि लक्ष्य कोठार रांगेत समान असू शकत नाही {0}
 DocType: Features Setup,Sales Extras,विक्री अवांतर
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{2} खर्च केंद्र विरुद्ध खाते {1} साठी {0} बजेट करून टाकेल {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',&#39;तारीख पासून&#39; नंतर &#39;दिनांक करण्यासाठी&#39; असणे आवश्यक आहे
 ,Stock Projected Qty,शेअर Qty अंदाज
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},संबंधित नाही {0} ग्राहक प्रोजेक्ट करण्यासाठी {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},संबंधित नाही {0} ग्राहक प्रोजेक्ट करण्यासाठी {1}
 DocType: Sales Order,Customer's Purchase Order,ग्राहकाच्या पर्चेस
 DocType: Warranty Claim,From Company,कंपनी पासून
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,मूल्य किंवा Qty
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,ब्लॉक यादी परवानगी द्या
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,आपण लॉगिन करेल
 DocType: Sales Partner,Retailer,किरकोळ विक्रेता
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,खाते क्रेडिट ताळेबंद खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,खाते क्रेडिट ताळेबंद खाते असणे आवश्यक आहे
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,सर्व पुरवठादार प्रकार
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,आयटम स्वयंचलितपणे गणती केली नाही कारण आयटम कोड बंधनकारक आहे
+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 +93,Quotation {0} not of type {1},कोटेशन {0} नाही प्रकारच्या {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,देखभाल वेळापत्रक आयटम
 DocType: Sales Order,%  Delivered,% वितरण
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),संकुल एकूण वजन. सहसा निव्वळ वजन + पॅकेजिंग साहित्य वजन. (मुद्रण)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,या भूमिका वापरकर्ते गोठविलेल्या खात्यांचे विरुद्ध लेखा नोंदी गोठविलेल्या खाती सेट आणि तयार / सुधारित करण्याची अनुमती आहे
 DocType: Serial No,Is Cancelled,रद्द आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,माझे Shipments
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,माझे Shipments
 DocType: Journal Entry,Bill Date,बिल तारीख
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","सर्वोच्च प्राधान्य एकाधिक किंमत नियम आहेत जरी, तर खालील अंतर्गत प्राधान्यक्रम लागू केले आहेत:"
 DocType: Supplier,Supplier Details,पुरवठादार तपशील
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,कॉल
 DocType: Project,Total Costing Amount (via Time Logs),एकूण भांडवलाच्या रक्कम (वेळ नोंदी द्वारे)
 DocType: Purchase Order Item Supplied,Stock UOM,शेअर UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,"ऑर्डर {0} सबमिट केलेली नाही, खरेदी"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,"ऑर्डर {0} सबमिट केलेली नाही, खरेदी"
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,अंदाज
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},सिरियल नाही {0} कोठार संबंधित नाही {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,टीप: {0} प्रमाणात किंवा रक्कम 0 आहे म्हणून चेंडू-प्रती आणि-बुकिंग आयटम सिस्टम तपासा नाही
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,उघडण्याच्या तारीख
 DocType: Journal Entry,Remark,शेरा
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,बिलिंग साठी बॅच
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,पुरवठादार उपस्थित बिल.
 DocType: POS Profile,Write Off Account,खाते बंद लिहा
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,सवलत रक्कम
 DocType: Purchase Invoice,Return Against Purchase Invoice,विरुद्ध खरेदी चलन परत
 DocType: Item,Warranty Period (in days),(दिवस मध्ये) वॉरंटी कालावधी
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,ऑपरेशन्स निव्वळ रोख
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,उदा व्हॅट
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,आयटम 4
 DocType: Journal Entry Account,Journal Entry Account,जर्नल प्रवेश खाते
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,निवृत्ती तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 DocType: Sales Invoice,Against Income Account,उत्पन्न खाते विरुद्ध
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% वितरण
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,मासिक वितरण टक्केवारी
 DocType: Territory,Territory Targets,प्रदेश लक्ष्य
 DocType: Delivery Note,Transporter Info,वाहतुक माहिती
@@ -2421,10 +2443,10 @@
 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 +14,This is a root sales person and cannot be edited.,या रूट विक्री व्यक्ती आहे आणि संपादित केला जाऊ शकत नाही.
 ,Stock Ledger,शेअर लेजर
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},दर: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},दर: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,पगाराच्या स्लिप्स कपात
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,प्रथम एक गट नोड निवडा.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},हेतू एक असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},हेतू एक असणे आवश्यक आहे {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,फॉर्म भरा आणि तो जतन
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,त्यांच्या नवीनतम यादी स्थिती सर्व कच्चा माल असलेली एक अहवाल डाउनलोड करा
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,समूह
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,कंपनी (नाही ग्राहक किंवा पुरवठादार) मास्टर.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',&#39;अपेक्षित डिलिव्हरी तारीख&#39; प्रविष्ट करा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिव्हरी टिपा {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,पेड रक्कम रक्कम एकूण पेक्षा जास्त असू शकत नाही बंद लिहा +
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},टीप: रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","टीप: पैसे कोणतेही संदर्भ विरुद्ध नाही, तर स्वतः जर्नल प्रवेश करा."
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} &#39;{1}&#39; अक्षम आहे
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,म्हणून उघडा सेट
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,सादर करत आहे व्यवहार वर संपर्क स्वयंचलित ईमेल पाठवा.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","रो {0}: Qty वेअरहाऊसमध्ये avalable नाही {1} वर {2} {3}. उपलब्ध Qty: {4}, Qty हस्तांतरण: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,आयटम 3
 DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
 DocType: Sales Team,Contribution (%),योगदान (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,टीप: भरणा प्रवेश पासून तयार केले जाणार नाहीत &#39;रोख किंवा बँक खाते&#39; निर्दिष्ट नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,टीप: भरणा प्रवेश पासून तयार केले जाणार नाहीत &#39;रोख किंवा बँक खाते&#39; निर्दिष्ट नाही
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,जबाबदारी
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,साचा
 DocType: Sales Person,Sales Person Name,विक्री व्यक्ती नाव
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,समेट करण्यापूर्वी
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आयटम कर रो {0} प्रकार कर किंवा उत्पन्न किंवा खर्चाचे किंवा भार च्या खाते असणे आवश्यक आहे
 DocType: Sales Order,Partly Billed,पाऊस बिल
 DocType: Item,Default BOM,मुलभूत BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,पुन्हा-टाइप करा कंपनीचे नाव पुष्टी करा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,एकूण थकबाकी रक्कम
 DocType: Time Log Batch,Total Hours,एकूण तास
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्ज
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},एकूण डेबिट एकूण क्रेडिट समान असणे आवश्यक आहे. फरक आहे {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},एकूण डेबिट एकूण क्रेडिट समान असणे आवश्यक आहे. फरक आहे {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ऑटोमोटिव्ह
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,डिलिव्हरी टीप पासून
 DocType: Time Log,From Time,वेळ पासून
 DocType: Notification Control,Custom Message,सानुकूल संदेश
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,गुंतवणूक बँकिंग
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,रोख रक्कम किंवा बँक खाते पैसे नोंदणी करण्यासाठी अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,रोख रक्कम किंवा बँक खाते पैसे नोंदणी करण्यासाठी अनिवार्य आहे
 DocType: Purchase Invoice,Price List Exchange Rate,किंमत सूची विनिमय दर
 DocType: Purchase Invoice Item,Rate,दर
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,हद्दीच्या
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","एकापेक्षा जास्त किंमत नियम समान निकष अस्तित्वात नाही, प्राधान्य सोपवून \ विरोधाचे निराकरण करा. किंमत नियम: {0}"
 DocType: Account,Bank,बँक
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाईन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,समस्या साहित्य
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,समस्या साहित्य
 DocType: Material Request Item,For Warehouse,वखार साठी
 DocType: Employee,Offer Date,ऑफर तारीख
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,बोली
 DocType: Hub Settings,Access Token,प्रवेश टोकन
 DocType: Sales Invoice Item,Serial No,सिरियल नाही
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,पहिल्या Maintaince तपशील प्रविष्ट करा
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,कामाचे दिवस पेक्षा अधिक सुटी या महिन्यात आहेत.
 DocType: Product Bundle Item,Product Bundle Item,उत्पादन बंडल आयटम
 DocType: Sales Partner,Sales Partner Name,विक्री भागीदार नाव
+DocType: Payment Reconciliation,Maximum Invoice Amount,कमाल चलन रक्कम
 DocType: Purchase Invoice Item,Image View,प्रतिमा पहा
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन आणि एकूण
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,या आयटम {0} (साचा) एक प्रकार आहे. &#39;नाही प्रत बनवा&#39; वर सेट केले नसेल विशेषता टेम्पलेट प्रती कॉपी होईल
 DocType: Account,Purchase User,खरेदी सदस्य
 DocType: Notification Control,Customize the Notification,सूचना सानुकूलित
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,ऑपरेशन्स रोख प्रवाह
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,मुलभूत पत्ता साचा हटविले जाऊ शकत नाही
 DocType: Sales Invoice,Shipping Rule,शिपिंग नियम
 DocType: Journal Entry,Print Heading,प्रिंट शीर्षक
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,कच्चा माल
 DocType: Leave Application,Follow via Email,ईमेल द्वारे अनुसरण करा
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,सवलत रक्कम नंतर कर रक्कम
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,बाल खाते हे खाते विद्यमान आहे. आपण हे खाते हटवू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम विद्यमान {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,पहिल्या पोस्टिंग तारीख निवडा
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},सिरीयलाइज आयटम साठी सिरियल क्र आवश्यक {0}
 DocType: Journal Entry,Bank Entry,बँक प्रवेश
 DocType: Authorization Rule,Applicable To (Designation),लागू करण्यासाठी (पद)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,सूचीत टाका
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,गट
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ अक्षम चलने सक्षम करा.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,पोस्टल खर्च
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,मनोरंजन आणि फुरसतीचा वेळ
 DocType: Purchase Order,The date on which recurring order will be stop,आवर्ती ऑर्डर बंद होणार तारीख
 DocType: Quality Inspection,Item Serial No,आयटम सिरियल नाही
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} {1} किंवा आपण वाढ करावी, उतू सहिष्णुता कमी करणे आवश्यक आहे"
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} {1} किंवा आपण वाढ करावी, उतू सहिष्णुता कमी करणे आवश्यक आहे"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,एकूण उपस्थित
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,तास
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",सिरीयलाइज आयटम {0} शेअर मेळ वापरून \ अद्यतनित करणे शक्य नाही
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,पुरवठादार करण्यासाठी ह तांत रत
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,पुरवठादार करण्यासाठी ह तांत रत
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,कोटेशन तयार करा
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,आपण ब्लॉक तारखा वर पाने मंजूर करण्यासाठी अधिकृत नाही
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,या सर्व आयटम आधीच invoiced आहेत
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,या सर्व आयटम आधीच invoiced आहेत
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},मंजूर केले जाऊ शकते {0}
 DocType: Shipping Rule,Shipping Rule Conditions,शिपिंग नियम अटी
 DocType: BOM Replace Tool,The new BOM after replacement,बदली नवीन BOM
 DocType: Features Setup,Point of Sale,विक्री पॉइंट
 DocType: Account,Tax,कर
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},रो {0}: {1} एक वैध नाही {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,उत्पादन बंडल पासून
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,उत्पादन बंडल पासून
 DocType: Production Planning Tool,Production Planning Tool,उत्पादन नियोजन साधन
 DocType: Quality Inspection,Report Date,अहवाल तारीख
 DocType: C-Form,Invoices,पावत्या
 DocType: Job Opening,Job Title,कार्य शीर्षक
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} घेवप्यांची
 DocType: Features Setup,Item Groups in Details,तपशील आयटम गट
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,कारखानदार प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),प्रारंभ पॉइंट-ऑफ-विक्री (पीओएस)
@@ -2618,8 +2644,9 @@
 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: Pricing Rule,Customer Group,ग्राहक गट
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},खर्च अकांऊंट बाब अनिवार्य आहे {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},खर्च अकांऊंट बाब अनिवार्य आहे {0}
 DocType: Item,Website Description,वेबसाइट वर्णन
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,इक्विटी निव्वळ बदला
 DocType: Serial No,AMC Expiry Date,एएमसी कालावधी समाप्ती तारीख
 ,Sales Register,विक्री नोंदणी
 DocType: Quotation,Quotation Lost Reason,कोटेशन हरवले कारण
@@ -2627,12 +2654,12 @@
 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 +108,Summary for this month and pending activities,या महिन्यात आणि प्रलंबित उपक्रम सारांश
 DocType: Customer Group,Customer Group Name,ग्राहक गट नाव
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म या चलन {0} काढून टाका {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,विशेषता
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,आयटम मिळवा
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,खाते बंद लिहा प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,खाते बंद लिहा प्रविष्ट करा
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,गेल्या ऑर्डर तारीख
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,अबकारी चलन करा
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},खाते {0} नाही कंपनी मालकीचे नाही {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,प्रकल्प निहाय माहिती कोटेशन उपलब्ध नाही
 DocType: Project,Expected End Date,अपेक्षित शेवटची तारीख
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन साचा शीर्षक
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,व्यावसायिक
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,व्यावसायिक
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,पालक आयटम {0} शेअर आयटम असू शकत नाही
 DocType: Cost Center,Distribution Id,वितरण आयडी
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,अप्रतिम सेवा
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} विशेषता मूल्य श्रेणीत असणे आवश्यक आहे {1} करण्यासाठी {2} वाढ मध्ये {3}
 DocType: Tax Rule,Sales,विक्री
 DocType: Stock Entry Detail,Basic Amount,मूलभूत रक्कम
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},कोठार स्टॉक आयटम आवश्यक {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},कोठार स्टॉक आयटम आवश्यक {0}
 DocType: Leave Allocation,Unused leaves,न वापरलेले पाने
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,कोटी
 DocType: Customer,Default Receivable Accounts,प्राप्तीयोग्य खाते डीफॉल्ट
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,खरेदी पावती
-DocType: Payment Reconciliation,Maximum Amount,कमाल रक्कम
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,कसे किंमत नियम लागू आहे?
 DocType: Quality Inspection,Delivery Note No,डिलिव्हरी टीप नाही
 DocType: Company,Retail,किरकोळ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,ग्राहक {0} अस्तित्वात नाही
 DocType: Attendance,Absent,अनुपस्थित
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,उत्पादन बंडल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},रो {0}: अवैध संदर्भ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,उत्पादन बंडल
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},रो {0}: अवैध संदर्भ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,कर आणि शुल्क साचा खरेदी
 DocType: Upload Attendance,Download Template,डाउनलोड साचा
 DocType: GL Entry,Remarks,शेरा
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,मासिक हजेरी पत्रक
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,आढळले नाही रेकॉर्ड
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: खर्च केंद्र आयटम अनिवार्य आहे {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,उत्पादन बंडल आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,उत्पादन बंडल आयटम मिळवा
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,खाते {0} निष्क्रिय आहे
 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,तारीख करण्यासाठी तारीख आणि विधान परिषदेच्या पासून उपस्थिती अनिवार्य आहे
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'नफा व तोटा' प्रकार खाते {0} प्रवेशास परवानगी नाही
 DocType: Features Setup,Sales Discounts,विक्री सवलत
 DocType: Hub Settings,Seller Country,विक्रेता देश
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,वेबसाइट वर प्रकाशित आयटम
 DocType: Authorization Rule,Authorization Rule,प्राधिकृत नियम
 DocType: Sales Invoice,Terms and Conditions Details,अटी आणि शर्ती तपशील
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,वैशिष्ट्य
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,विक्री कर आणि शुल्क साचा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,तयार कपडे आणि अॅक्सेसरीज
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,ऑर्डर संख्या
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,बिलिंग रक्कम
 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 +18,Applications for leave.,निरोप साठी अनुप्रयोग.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,विद्यमान व्यवहार खाते हटविले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,विद्यमान व्यवहार खाते हटविले जाऊ शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,कायदेशीर खर्च
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ऑटो आदेश 05, 28 इत्यादी उदा निर्माण होणार महिन्याचा दिवस"
 DocType: Sales Invoice,Posting Time,पोस्टिंग वेळ
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,यंत्रातील बिघाड
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,खाते: {0} चलन: {1} निवडले जाऊ शकत नाही
 DocType: Bank Reconciliation Detail,Cheque Date,धनादेश तारीख
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: पालक खाते {1} कंपनी संबंधित नाही: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: पालक खाते {1} कंपनी संबंधित नाही: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,यशस्वीरित्या ही कंपनी संबंधित सर्व व्यवहार हटवला!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,तारखेला
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,उमेदवारीचा काळ
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,मुलभूत कोठार स्टॉक आयटम अनिवार्य आहे.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,मुलभूत कोठार स्टॉक आयटम अनिवार्य आहे.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},महिन्यात पगार भरणा {0} आणि वर्ष {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ऑटो घाला दर सूची दर गहाळ असेल तर
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,एकूण देय रक्कम
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),एकूण बिलिंग रक्कम (वेळ नोंदी द्वारे)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,आम्ही या आयटम विक्री
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,पुरवठादार आयडी
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे
 DocType: Journal Entry,Cash Entry,रोख प्रवेश
 DocType: Sales Partner,Contact Desc,संपर्क desc
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","प्रासंगिक जसे पाने प्रकार, आजारी इ"
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,खाती वार्षिक अर्थसंकल्प सेट करण्यासाठी पंक्ती जोडा.
 DocType: Buying Settings,Default Supplier Type,मुलभूत पुरवठादार प्रकार
 DocType: Production Order,Total Operating Cost,एकूण ऑपरेटिंग खर्च
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,टीप: आयटम {0} अनेक वेळा प्रवेश केला
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,टीप: आयटम {0} अनेक वेळा प्रवेश केला
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,सर्व संपर्क.
 DocType: Newsletter,Test Email Id,कसोटी ई मेल आयडी
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,कंपनी Abbreviation
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,सर्व ग्राहक गट
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,कर साचा बंधनकारक आहे.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,खाते {0}: पालक खाते {1} अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,खाते {0}: पालक खाते {1} अस्तित्वात नाही
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),किंमत सूची दर (कंपनी चलन)
 DocType: Account,Temporary,अस्थायी
 DocType: Address,Preferred Billing Address,पसंतीचे बिलिंग पत्ता
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,आयटम कुशल दर सूची दर
 DocType: Purchase Order Item,Supplier Quotation,पुरवठादार कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,तुम्ही अवतरण जतन एकदा शब्द मध्ये दृश्यमान होईल.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} बंद आहे
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} बंद आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
 DocType: Lead,Add to calendar on this date,या तारखेला कॅलेंडरमध्ये समाविष्ट करा
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,शिपिंग खर्च जोडून नियम.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,पुढील कार्यक्रम
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,लीड पासून
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,ऑर्डर उत्पादन प्रकाशीत.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,आर्थिक वर्ष निवडा ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करणे आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करणे आवश्यक
 DocType: Hub Settings,Name Token,नाव टोकन
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,मानक विक्री
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,किमान एक कोठार अनिवार्य आहे
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,बदला
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} विक्री चलन विरुद्ध {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,माप मुलभूत युनिट प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} विक्री चलन विरुद्ध {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,माप मुलभूत युनिट प्रविष्ट करा
 DocType: Purchase Invoice Item,Project Name,प्रकल्प नाव
 DocType: Supplier,Mention if non-standard receivable account,उल्लेख गैर-मानक प्राप्त खाते तर
 DocType: Journal Entry Account,If Income or Expense,उत्पन्न किंवा खर्च तर
 DocType: Features Setup,Item Batch Nos,आयटम बॅच क्र
 DocType: Stock Ledger Entry,Stock Value Difference,शेअर मूल्य फरक
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,मानव संसाधन
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,मानव संसाधन
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,भरणा मेळ भरणा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,कर मालमत्ता
 DocType: BOM Item,BOM No,BOM नाही
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रवेश {0} {1} किंवा आधीच इतर व्हाउचर जुळवले खाते नाही
 DocType: Item,Moving Average,हलवित सरासरी
 DocType: BOM Replace Tool,The BOM which will be replaced,पुनर्स्थित केले जाईल BOM
 DocType: Account,Debit,डेबिट
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त खर्च
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,आर्थिक वर्ष अंतिम तारीख
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","व्हाउचर नाही आधारित फिल्टर करू शकत नाही, व्हाउचर प्रमाणे गटात समाविष्ट केले तर"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,पुरवठादार कोटेशन करा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,पुरवठादार कोटेशन करा
 DocType: Quality Inspection,Incoming,येणार्या
 DocType: BOM,Materials Required (Exploded),साहित्य (स्फोट झाला) आवश्यक
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),पे न करता सोडू साठी मिळवून कमी (LWP)
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},रो # {0}: सिरियल नाही {1} जुळत नाही {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,प्रासंगिक रजा
 DocType: Batch,Batch ID,बॅच आयडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},टीप: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},टीप: {0}
 ,Delivery Note Trends,डिलिव्हरी टीप ट्रेन्ड
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,या आठवड्यातील सारांश
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} एकापाठोपाठ एक खरेदी किंवा उप-करारबद्ध आयटम असणे आवश्यक आहे {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,सरासरी. खरेदी दर
 DocType: Task,Actual Time (in Hours),(तास) वास्तविक वेळ
 DocType: Employee,History In Company,कंपनी मध्ये इतिहास
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,वृत्तपत्रे
 DocType: Address,Shipping,शिपिंग
 DocType: Stock Ledger Entry,Stock Ledger Entry,शेअर खतावणीत नोंद
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,चालू ऑर्डरच्या कालावधी समाप्ती तारीख
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ऑफर पत्र करा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,परत
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे
 DocType: Production Order Operation,Production Order Operation,उत्पादन ऑर्डर ऑपरेशन
 DocType: Pricing Rule,Disable,अक्षम करा
 DocType: Project Task,Pending Review,प्रलंबित पुनरावलोकन
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ग्राहक आयडी
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,वेळ वेळ पासून पेक्षा जास्त असणे आवश्यक करण्यासाठी
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},कोठार {0}: पालक खाते {1} कंपनी bolong नाही {2}
 DocType: BOM,Last Purchase Rate,गेल्या खरेदी दर
 DocType: Account,Asset,मालमत्ता
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,पॅकिंग आयटम उपलब्ध शेअर
 DocType: Item Variant,Item Variant,आयटम व्हेरियंट
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,नाही इतर मुलभूत आहे म्हणून हे मुलभूतरित्या पत्ता साचा सेट
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","आधीच डेबिट खाते शिल्लक, आपण &#39;क्रेडिट&#39; म्हणून &#39;शिल्लक असणे आवश्यक आहे&#39; सेट करण्याची परवानगी नाही"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,गुणवत्ता व्यवस्थापन
 DocType: Production Planning Tool,Filter based on customer,फिल्टर ग्राहक आधारित
 DocType: Payment Tool Detail,Against Voucher No,व्हाउचर नाही विरुद्ध
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,पुढील संपर्क
 DocType: Employee,Employment Type,रोजगार प्रकार
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,स्थिर मालमत्ता
+,Cash Flow,वित्त प्रवाह
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,अर्ज कालावधी दोन alocation रेकॉर्ड ओलांडून असू शकत नाही
 DocType: Item Group,Default Expense Account,मुलभूत खर्च खाते
 DocType: Employee,Notice (days),सूचना (दिवस)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,गोदामांची
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,प्रिंट आणि स्टेशनरी
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,गट नोड
-DocType: Payment Reconciliation,Minimum Amount,किमान रक्कम
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,अद्यतन पूर्ण वस्तू
 DocType: Workstation,per hour,प्रती तास
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,कोठार (शा्वत सूची) खाते या खाते अंतर्गत तयार करण्यात येणार आहे.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,स्टॉक खतावणीत नोंद या कोठार विद्यमान म्हणून कोठार हटविला जाऊ शकत नाही.
 DocType: Company,Distribution,वितरण
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,अदा केलेली रक्कम
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,अदा केलेली रक्कम
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,प्रकल्प व्यवस्थापक
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,पाठवणे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,आयटम परवानगी कमाल सवलतीच्या: {0} {1}% आहे
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,समर्थन Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},कंपनी गोदामांची मधिल आढळणारी {0}
 DocType: POS Profile,Terms and Conditions,अटी आणि शर्ती
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},तारीख करण्यासाठी आर्थिक वर्ष आत असावे. = तारीख करण्यासाठी गृहीत धरून {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},तारीख करण्यासाठी आर्थिक वर्ष आत असावे. = तारीख करण्यासाठी गृहीत धरून {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","येथे आपण इ उंची, वजन, अॅलर्जी, वैद्यकीय चिंता राखण्यास मदत"
 DocType: Leave Block List,Applies to Company,कंपनी लागू
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,सादर शेअर प्रवेश {0} अस्तित्वात असल्याने रद्द करू शकत नाही
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,खरेदी पावती प्रविष्ट करा
 DocType: Sales Invoice,Get Advances Received,अग्रिम प्राप्त करा
 DocType: Email Digest,Add/Remove Recipients,घेवप्यांची जोडा / काढा
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},व्यवहार बंद उत्पादन विरुद्ध परवानगी नाही ऑर्डर {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),मदत ईमेल आयडी सेटअप येणार्या सर्व्हर. (उदा support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,कमतरता Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,आयटम जिच्यामध्ये variant {0} समान गुणधर्म अस्तित्वात
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,आयटम जिच्यामध्ये variant {0} समान गुणधर्म अस्तित्वात
 DocType: Salary Slip,Salary Slip,पगाराच्या स्लिप्स
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.","संकुल वितरित करण्यासाठी स्लिप पॅकिंग व्युत्पन्न. पॅकेज संख्या, संकुल सामुग्री आणि त्याचे वजन सूचित करण्यासाठी वापरले जाते."
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,कर्मचारी रेकॉर्ड.
 DocType: HR Settings,Payroll Settings,वेतनपट सेटिंग्ज
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,नॉन-लिंक्ड पावत्या आणि देयके जुळत.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,मागणी नोंद करा
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,मागणी नोंद करा
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,रूट एक पालक खर्च केंद्र असू शकत नाही
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,निवडा ब्रँड ...
 DocType: Sales Invoice,C-Form Applicable,सी-फॉर्म लागू
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,प्रारंभ तारीख
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,एक काळ साठी पाने वाटप करा.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,सत्यापित करण्यासाठी येथे क्लिक करा
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,खाते {0}: आपण पालक खाते म्हणून स्वत: नियुक्त करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,खाते {0}: आपण पालक खाते म्हणून स्वत: नियुक्त करू शकत नाही
 DocType: Purchase Invoice Item,Price List Rate,किंमत सूची दर
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",&quot;स्टॉक&quot; किंवा या कोठार उपलब्ध स्टॉक आधारित &quot;नाही स्टॉक मध्ये&quot; दर्शवा.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),साहित्य बिल (DEL)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,अपेक्षित प्रारंभ तारीख
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,शुल्क की आयटम लागू नाही तर आयटम काढा
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,उदा. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,प्राप्त
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,प्राप्त
 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: Employee Leave Approver,Employee Leave Approver,कर्मचारी रजा मंजुरी
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} यशस्वीरित्या आमच्या वार्तापत्राचे यादीत समाविष्ट केले गेले आहे.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: एक पुनर्क्रमित अगोदरपासून या कोठार विद्यमान {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: एक पुनर्क्रमित अगोदरपासून या कोठार विद्यमान {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","कोटेशन केले आहे कारण, म्हणून गमवलेले जाहीर करू शकत नाही."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,खरेदी मास्टर व्यवस्थापक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,ऑर्डर {0} सादर करणे आवश्यक आहे उत्पादन
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,ऑर्डर {0} सादर करणे आवश्यक आहे उत्पादन
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},आयटम प्रारंभ तारीख आणि अंतिम तारीख निवडा कृपया {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,मुख्य अहवाल
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तारीख करण्यासाठी तारखेपासून आधी असू शकत नाही
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,उद्योग प्रकार
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,काहीतरी चूक झाली!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,चेतावणी: अनुप्रयोग सोडा खालील ब्लॉक तारखा समाविष्टीत आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,चलन {0} आधीच सादर केला गेला आहे विक्री
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,चलन {0} आधीच सादर केला गेला आहे विक्री
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,पूर्ण तारीख
 DocType: Purchase Invoice Item,Amount (Company Currency),रक्कम (कंपनी चलन)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,संस्था युनिट (विभाग) मास्टर.
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,सिरियल नाही सेवा करार कालावधी समाप्ती
 DocType: Item,Unit of Measure Conversion,माप रुपांतर युनिट
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,कर्मचारी बदलले जाऊ शकत नाही
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,आपण जमा आणि एकाच वेळी एकाच खाते डेबिट करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,आपण जमा आणि एकाच वेळी एकाच खाते डेबिट करू शकत नाही
 DocType: Naming Series,Help HTML,मदत HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},100% असावे नियुक्त एकूण वजन. ही सेवा विनामुल्य आहे {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},{0} आयटम साठी पार over- भत्ता {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},{0} आयटम साठी पार over- भत्ता {1}
 DocType: Address,Name of person or organization that this address belongs to.,या पत्त्यावर मालकीची व्यक्ती किंवा संस्थेच्या नाव.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,आपले पुरवठादार
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,विक्री आदेश केले आहे म्हणून गमावले म्हणून सेट करू शकत नाही.
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,समस्येच्या तारीख
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: पासून {0} साठी {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},रो # {0}: आयटम सेट करा पुरवठादार {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,आयटम {1} संलग्न वेबसाइट प्रतिमा {0} सापडू शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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.,वेबसाइट अनेक गट या आयटम यादी.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,इतर चलन खाती परवानगी मल्टी चलन पर्याय तपासा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,इतर चलन खाती परवानगी मल्टी चलन पर्याय तपासा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,आयटम: {0} प्रणाली अस्तित्वात नाही
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,आपण गोठविलेल्या मूल्य सेट करण्यासाठी अधिकृत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,आपण गोठविलेल्या मूल्य सेट करण्यासाठी अधिकृत नाही
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled नोंदी मिळवा
+DocType: Payment Reconciliation,From Invoice Date,चलन तारखेपासून
 DocType: Cost Center,Budgets,खर्चाचे अंदाजपत्रक
-DocType: Employee,Emergency Contact Details,तात्काळ संपर्क तपशील
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,ती काय करते?
 DocType: Delivery Note,To Warehouse,गुदाम
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},खाते {0} आर्थिक वर्षात एकापेक्षा अधिक प्रविष्ट केले गेले आहे {1}
 ,Average Commission Rate,सरासरी आयोग दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,&#39;होय&#39; असेल नॉन-स्टॉक आयटम शकत नाही &#39;सिरियल नाही आहे&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,&#39;होय&#39; असेल नॉन-स्टॉक आयटम शकत नाही &#39;सिरियल नाही आहे&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,विधान परिषदेच्या भविष्यात तारखा करीता चिन्हाकृत केले जाऊ शकत नाही
 DocType: Pricing Rule,Pricing Rule Help,किंमत नियम मदत
 DocType: Purchase Taxes and Charges,Account Head,खाते प्रमुख
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,आयटम उतरले किंमत काढण्यासाठी अतिरिक्त खर्च अद्यतनित करा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,इलेक्ट्रिकल
 DocType: Stock Entry,Total Value Difference (Out - In),एकूण मूल्य फरक (आउट - मध्ये)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,रो {0}: विनिमय दर अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,रो {0}: विनिमय दर अनिवार्य आहे
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},वापरकर्ता आयडी कर्मचारी साठी सेट न {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,हमी दावा पासून
 DocType: Stock Entry,Default Source Warehouse,मुलभूत स्रोत कोठार
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},साठी जन्मदिवस अनुस्मरण {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,गेल्या ऑर्डर असल्याने दिवस
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,शेअर मालमत्ता
@@ -3271,7 +3301,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,खाते {0} बंद प्रकार दायित्व / इक्विटी असणे आवश्यक आहे
 DocType: Authorization Rule,Based On,आधारित
 DocType: Sales Order Item,Ordered Qty,आदेश दिले Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,आयटम {0} अक्षम आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,आयटम {0} अक्षम आहे
 DocType: Stock Settings,Stock Frozen Upto,शेअर फ्रोजन पर्यंत
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},पासून आणि कालावधी आवर्ती बंधनकारक तारखा करण्यासाठी कालावधी {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,प्रकल्प क्रियाकलाप / कार्य.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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 पेक्षा कमी असणे आवश्यक आहे
 DocType: Purchase Invoice,Write Off Amount (Company Currency),रक्कम बंद लिहा (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
 DocType: Landed Cost Voucher,Landed Cost Voucher,उतरले खर्च व्हाउचर
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},सेट करा {0}
 DocType: Purchase Invoice,Repeat on Day of Month,महिना दिवशी पुन्हा करा
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,अपलोड करा हजेरी
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM व उत्पादन प्रमाण आवश्यक आहे
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing श्रेणी 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,रक्कम
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,रक्कम
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM बदलले
 ,Sales Analytics,विक्री Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,उत्पादन सेटिंग्ज
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ईमेल सेट अप
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,कंपनी मास्टर मध्ये डीफॉल्ट चलन प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,कंपनी मास्टर मध्ये डीफॉल्ट चलन प्रविष्ट करा
 DocType: Stock Entry Detail,Stock Entry Detail,शेअर प्रवेश तपशील
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,दैनिक स्मरणपत्रे
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},कर नियम वाद {0}
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,निर्मिती प्रमाण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,अभियंता
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,शोध उप विधानसभा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},आयटम कोड रो नाही आवश्यक {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},आयटम कोड रो नाही आवश्यक {0}
 DocType: Sales Partner,Partner Type,भागीदार प्रकार
 DocType: Purchase Taxes and Charges,Actual,वास्तविक
 DocType: Authorization Rule,Customerwise Discount,Customerwise सवलत
 DocType: Purchase Invoice,Against Expense Account,खर्चाचे खाते विरुद्ध
 DocType: Production Order,Production Order,उत्पादन ऑर्डर
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,प्रतिष्ठापन टीप {0} आधीच सादर केला गेला आहे
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,प्रतिष्ठापन टीप {0} आधीच सादर केला गेला आहे
 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,आता पहा
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,लागू सुट्टी यादी
 DocType: Employee,Cheque,धनादेश
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,मालिका अद्यतनित
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,अहवाल प्रकार अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,अहवाल प्रकार अनिवार्य आहे
 DocType: Item,Serial Number Series,अनुक्रमांक मालिका
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},कोठार सलग शेअर आयटम {0} अनिवार्य आहे {1}
 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/public/js/setup_wizard.js +101,The First User: You,प्रथम वापरकर्ता: आपण
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},आर्थिक वर्ष प्रारंभ तारीख आणि आर्थिक वर्ष अंतिम तारीख आधीच आर्थिक वर्षात सेट केल्या आहेत {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,यशस्वीरित्या समेट
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},आर्थिक वर्ष प्रारंभ तारीख आणि आर्थिक वर्ष अंतिम तारीख आधीच आर्थिक वर्षात सेट केल्या आहेत {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,यशस्वीरित्या समेट
 DocType: Production Order,Planned End Date,नियोजनबद्ध अंतिम तारीख
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,आयटम कोठे साठवले जातात.
 DocType: Tax Rule,Validity,वैधता
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,विधान परिषदेच्या
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,तारीख पोस्ट आणि वेळ पोस्ट करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,तारीख पोस्ट आणि वेळ पोस्ट करणे आवश्यक आहे
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,व्यवहार खरेदी कर टेम्प्लेट.
 ,Item Prices,आयटम किंमती
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,तुम्ही पर्चेस जतन एकदा शब्द मध्ये दृश्यमान होईल.
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,पुनरावलोकन तारीख
 DocType: Purchase Invoice,Advance Payments,आगाऊ पेमेंट
 DocType: Purchase Taxes and Charges,On Net Total,नेट एकूण रोजी
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,{0} सलग लक्ष्य कोठार उत्पादन आदेश सारखाच असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,{0} सलग लक्ष्य कोठार उत्पादन आदेश सारखाच असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,कोणतीही परवानगी नाही भरणा साधन वापरण्यास
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% S च्या आवर्ती निर्देशीत नाही &#39;सूचना ईमेल पत्ते&#39;
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,चलन काही इतर चलन वापरत नोंदी केल्यानंतर बदलले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,चलन काही इतर चलन वापरत नोंदी केल्यानंतर बदलले जाऊ शकत नाही
 DocType: Company,Round Off Account,खाते बंद फेरीत
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,प्रशासकीय खर्च
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,सल्ला
 DocType: Customer Group,Parent Customer Group,पालक ग्राहक गट
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,बदला
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,बदला
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
 DocType: Appraisal Goal,Score Earned,स्कोअर कमाई
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",उदा &quot;माझे कंपनी LLC&quot;
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,एकूण वजन UOM
 DocType: Email Digest,Receivables / Payables,Receivables / देय
 DocType: Delivery Note Item,Against Sales Invoice,विक्री चलन विरुद्ध
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,क्रेडिट खाते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,क्रेडिट खाते
 DocType: Landed Cost Item,Landed Cost Item,उतरले खर्च आयटम
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,शून्य मूल्ये दर्शवा
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,आयटम प्रमाण कच्चा माल दिलेल्या प्रमाणात repacking / उत्पादन नंतर प्राप्त
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्त / देय खाते
 DocType: Delivery Note Item,Against Sales Order Item,विक्री ऑर्डर आयटम विरुद्ध
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},विशेषतेसाठी मूल्य विशेषता निर्दिष्ट करा {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},विशेषतेसाठी मूल्य विशेषता निर्दिष्ट करा {0}
 DocType: Item,Default Warehouse,मुलभूत कोठार
 DocType: Task,Actual End Date (via Time Logs),वास्तविक समाप्ती तारीख (वेळ नोंदी द्वारे)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},अर्थसंकल्पात गट खाते विरुद्ध नियुक्त केली जाऊ शकत {0}
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,वर्कस्टेशन कार्य तासांनंतर वेळ नोंदी योजना.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} आधीच सादर केला गेला आहे
 ,Items To Be Requested,आयटम विनंती करण्यासाठी
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,गेल्या खरेदी दर मिळवा
 DocType: Time Log,Billing Rate based on Activity Type (per hour),क्रियाकलाप प्रकार आधारित बिलिंग दर (प्रती तास)
 DocType: Company,Company Info,कंपनी माहिती
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","कंपनी ईमेल आयडी आढळले नाही, त्यामुळे पाठविले नाही मेल"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),निधी मालमत्ता (assets) अर्ज
 DocType: Production Planning Tool,Filter based on item,फिल्टर आयटम आधारित
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,डेबिट खाते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,डेबिट खाते
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ तारीख
 DocType: Attendance,Employee Name,कर्मचारी नाव
 DocType: Sales Invoice,Rounded Total (Company Currency),गोळाबेरीज एकूण (कंपनी चलन)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,खाते प्रकार निवडले आहे कारण ग्रुपला गुप्त करू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,खाते प्रकार निवडले आहे कारण ग्रुपला गुप्त करू शकत नाही.
 DocType: Purchase Common,Purchase Common,खरेदी सामान्य
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,संधी पासून
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी फायदे
 DocType: Sales Invoice,Is POS,पीओएस आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} संख्या समान असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} संख्या समान असणे आवश्यक आहे {1}
 DocType: Production Order,Manufactured Qty,उत्पादित Qty
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकृत प्रमाण
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} नाही अस्तित्वात
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,ग्राहक असण्याचा बिले.
 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 +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम आहे {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम आहे {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} ग्राहक जोडले
 DocType: Maintenance Schedule,Schedule,वेळापत्रक
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","हा खर्च केंद्र अर्थसंकल्पात परिभाषित. बजेट क्रिया सेट करण्यासाठी, पाहू &quot;कंपनी यादी&quot;"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,3 वाचन
 ,Hub,हब
 DocType: GL Entry,Voucher Type,प्रमाणक प्रकार
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केले नाही
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केले नाही
 DocType: Expense Claim,Approved,मंजूर
 DocType: Pricing Rule,Price,किंमत
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',{0} असे सेट करणे आवश्यक वर मुक्त कर्मचारी लेफ्ट &#39;म्हणून
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,लेखा जर्नल नोंदी.
 DocType: Delivery Note Item,Available Qty at From Warehouse,वखार पासून वर उपलब्ध Qty
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,पहिल्या कर्मचारी नोंद निवडा.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},रो {0}: पक्ष / खात्याशी जुळत नाही {1} / {2} मधील {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,एक कर खाते तयार करणे
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
 DocType: Account,Stock,शेअर
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,करार अंतिम तारीख
 DocType: Sales Order,Track this Sales Order against any Project,कोणत्याही प्रकल्पाच्या विरोधात या विक्री ऑर्डर मागोवा
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,पुल विक्री आदेश वरील निकष आधारित (वितरीत करण्यासाठी प्रलंबित)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,पुरवठादार कोटेशन पासून
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,पुरवठादार कोटेशन पासून
 DocType: Deduction Type,Deduction Type,कपात प्रकार
 DocType: Attendance,Half Day,अर्धा दिवस
 DocType: Pricing Rule,Min Qty,किमान Qty
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,व्यवहार तारीख
 DocType: Production Plan Item,Planned Qty,नियोजनबद्ध Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,एकूण कर
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,प्रमाण साठी (Qty उत्पादित) करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,प्रमाण साठी (Qty उत्पादित) करणे आवश्यक आहे
 DocType: Stock Entry,Default Target Warehouse,मुलभूत लक्ष्य कोठार
 DocType: Purchase Invoice,Net Total (Company Currency),निव्वळ एकूण (कंपनी चलन)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते फक्त लागू आहे
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,आयोगाने दर
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,व्हेरियंट करा
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,विभागाने ब्लॉक रजा अनुप्रयोग.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,कार्ट रिक्त आहे
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,कार्ट रिक्त आहे
 DocType: Production Order,Actual Operating Cost,वास्तविक ऑपरेटिंग खर्च
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,रूट संपादित केले जाऊ शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,रूट संपादित केले जाऊ शकत नाही.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,रक्कम unadusted रक्कम अधिक करू शकता
 DocType: Manufacturing Settings,Allow Production on Holidays,सुट्टीच्या दिवशी उत्पादन परवानगी द्या
 DocType: Sales Order,Customer's Purchase Order Date,ग्राहक च्या पर्चेस तारीख
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,डिझायनर
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,अटी आणि शर्ती साचा
 DocType: Serial No,Delivery Details,वितरण तपशील
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},प्रकार करीता खर्च केंद्र सलग आवश्यक आहे {0} कर टेबल {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},प्रकार करीता खर्च केंद्र सलग आवश्यक आहे {0} कर टेबल {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"प्रमाण या पातळी खाली पडले, तर स्वयंचलितपणे साहित्य विनंती तयार"
 ,Item-wise Purchase Register,आयटम निहाय खरेदी नोंदणी
 DocType: Batch,Expiry Date,कालावधी समाप्ती तारीख
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनर्क्रमित पातळी सेट करण्यासाठी, आयटम खरेदी आयटम किंवा उत्पादन आयटम असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनर्क्रमित पातळी सेट करण्यासाठी, आयटम खरेदी आयटम किंवा उत्पादन आयटम असणे आवश्यक आहे"
 ,Supplier Addresses and Contacts,पुरवठादार पत्ते आणि संपर्क
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,पहिल्या श्रेणी निवडा
 apps/erpnext/erpnext/config/projects.py +18,Project master.,प्रकल्प मास्टर.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(अर्धा दिवस)
 DocType: Supplier,Credit Days,क्रेडिट दिवस
 DocType: Leave Type,Is Carry Forward,कॅरी फॉरवर्ड आहे
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM आयटम मिळवा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,साहित्य बिल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते आवश्यक आहे {1}
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,सोडत आहे कारण
 DocType: Expense Claim Detail,Sanctioned Amount,मंजूर रक्कम
 DocType: GL Entry,Is Opening,उघडत आहे
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},रो {0}: नावे नोंद लिंक केले जाऊ शकत नाही {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,खाते {0} अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},रो {0}: नावे नोंद लिंक केले जाऊ शकत नाही {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,खाते {0} अस्तित्वात नाही
 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 de80977..649f0ad 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produk Pengguna
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Sila pilih Jenis Parti pertama
 DocType: Item,Customer Items,Item Pelanggan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Akaun {0}: akaun Induk {1} tidak boleh merupakan satu lejar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Akaun {0}: akaun Induk {1} tidak boleh merupakan satu lejar
 DocType: Item,Publish Item to hub.erpnext.com,Terbitkan Perkara untuk hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mel Pemberitahuan
 DocType: Item,Default Unit of Measure,Unit keingkaran Langkah
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Mata wang diperlukan untuk Senarai Harga {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dikira dalam urus niaga.
 DocType: Purchase Order,Customer Contact,Pelanggan Hubungi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Dari Permintaan Bahan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Dari Permintaan Bahan
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,Pokok {0}
 DocType: Job Applicant,Job Applicant,Kerja Pemohon
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Tiada lagi hasil.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Untuk mengekalkan kod item berdasarkan pelanggan dan untuk membolehkan mereka dicari berdasarkan kod mereka, guna pilihan ini"
 DocType: Mode of Payment Account,Mode of Payment Account,Cara Pembayaran Akaun
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Show Kelainan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Kuantiti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Kuantiti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Pinjaman (Liabiliti)
 DocType: Employee Education,Year of Passing,Tahun Pemergian
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,In Stock
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Penjagaan Kesihatan
 DocType: Purchase Invoice,Monthly,Bulanan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Kelewatan dalam pembayaran (Hari)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Invois
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Invois
 DocType: Maintenance Schedule Item,Periodicity,Jangka masa
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Alamat e-mel
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Pertahanan
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} tidak sepadan dengan {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} tidak sepadan dengan {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Kenderaan Tiada
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Sila pilih Senarai Harga
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Sila pilih Senarai Harga
 DocType: Production Order Operation,Work In Progress,Kerja Dalam Kemajuan
 DocType: Employee,Holiday List,Senarai Holiday
 DocType: Time Log,Time Log,Masa Log
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Syarikat yang sama memasuki lebih daripada sekali
 DocType: Employee,Married,Berkahwin
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Tidak dibenarkan untuk {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
 DocType: Payment Reconciliation,Reconcile,Mendamaikan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Barang runcit
 DocType: Quality Inspection Reading,Reading 1,Membaca 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Buat Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Dana pencen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Gudang adalah wajib jika jenis akaun adalah Gudang
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Gudang adalah wajib jika jenis akaun adalah Gudang
 DocType: SMS Center,All Sales Person,Semua Orang Jualan
 DocType: Lead,Person Name,Nama Orang
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Periksa sama ada perintah berulang, jangan tanda supaya berhenti atau meletakkan Tarikh Akhir betul"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Berminat
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Pembukaan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Dari {0} kepada {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Dari {0} kepada {1}
 DocType: Item,Copy From Item Group,Salinan Dari Perkara Kumpulan
 DocType: Journal Entry,Opening Entry,Entry pembukaan
 DocType: Stock Entry,Additional Costs,Kos Tambahan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan.
 DocType: Lead,Product Enquiry,Pertanyaan Produk
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Sila masukkan syarikat pertama
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Sila pilih Syarikat pertama
 DocType: Employee Education,Under Graduate,Di bawah Siswazah
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Sasaran Pada
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Sasaran Pada
 DocType: BOM,Total Cost,Jumlah Kos
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Log Aktiviti:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Perkara {0} tidak wujud di dalam sistem atau telah tamat
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Perkara {0} mestilah Pembelian Item
 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 +444,Item {0} is not active or end of life has been reached,Perkara {0} tidak aktif atau akhir hayat telah dicapai
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,Perkara {0} tidak aktif atau akhir hayat telah dicapai
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Akan dikemaskinikan selepas Invois Jualan dikemukakan.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Tetapan untuk HR Modul
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Butiran operasi dijalankan.
 DocType: Serial No,Maintenance Status,Penyelenggaraan Status
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Item dan Harga
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Dari Tarikh harus berada dalam Tahun Fiskal. Dengan mengandaikan Dari Tarikh = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Dari Tarikh harus berada dalam Tahun Fiskal. Dengan mengandaikan Dari Tarikh = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Pilih Pekerja untuk siapa anda mewujudkan Penilaian.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Kos Pusat {0} bukan milik Syarikat {1}
 DocType: Customer,Individual,Individu
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Tunai bersih daripada Pembiayaan
 DocType: Lead,Address & Contact,Alamat
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan daun yang tidak digunakan dari peruntukan sebelum
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Seterusnya berulang {0} akan diwujudkan pada {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Nama Kenalan
 DocType: Production Plan Item,SO Pending Qty,SO selesai Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Mencipta slip gaji untuk kriteria yang dinyatakan di atas.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Keterangan tidak diberikan
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Meminta untuk pembelian.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Tarikh melegakan mesti lebih besar daripada Tarikh Menyertai
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Spesifikasi Item Laman Web
 DocType: Payment Tool,Reference No,Rujukan
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Tinggalkan Disekat
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Saham Penyesuaian Perkara
 DocType: Stock Entry,Sales Invoice No,Jualan Invois No
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Jenis Pembekal
 DocType: Item,Publish in Hub,Menyiarkan dalam Hab
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Perkara {0} dibatalkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Perkara {0} dibatalkan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Perhubungan
 DocType: Shipping Rule,Worldwide Shipping,Penghantaran di seluruh dunia
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Pesanan disahkan dari Pelanggan.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Cadangan
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Perkara Set Kumpulan segi belanjawan di Wilayah ini. Juga boleh bermusim dengan menetapkan Pengedaran.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Sila masukkan kumpulan akaun induk untuk gudang {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Bayaran terhadap {0} {1} tidak boleh lebih besar daripada Outstanding Jumlah {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Bayaran terhadap {0} {1} tidak boleh lebih besar daripada Outstanding Jumlah {2}
 DocType: Supplier,Address HTML,Alamat HTML
 DocType: Lead,Mobile No.,No. Telefon
 DocType: Maintenance Schedule,Generate Schedule,Menjana Jadual
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Terkini
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 aksara
 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
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Belajar
 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
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Menguruskan Orang Jualan Tree.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Mata Multi
 DocType: Payment Reconciliation Invoice,Invoice Type,Jenis invois
 DocType: Sales Invoice Item,Delivery Note,Penghantaran Nota
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Menubuhkan Cukai
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Menubuhkan Cukai
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Ringkasan untuk minggu ini dan aktiviti-aktiviti yang belum selesai
 DocType: Workstation,Rent Cost,Kos sewa
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Sila pilih bulan dan tahun
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Terdapat dalam BOM, Menghantar Nota, Invois Belian, Pesanan Pengeluaran, Pesanan Belian, Resit Pembelian, Jualan Invois, Jualan Order, Saham Masuk, Timesheet"
 DocType: Item Tax,Tax Rate,Kadar Cukai
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Pilih Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Pilih Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Perkara: {0} berjaya kelompok-bijak, tidak boleh berdamai dengan menggunakan \ Saham Perdamaian, sebaliknya menggunakan Saham Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Membeli Invois {0} telah dikemukakan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Membeli Invois {0} telah dikemukakan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No mestilah sama dengan {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Tukar ke Kumpulan bukan-
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Resit Pembelian perlu dihantar
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Perubatan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Sebab bagi kehilangan
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tarikh-tarikh berikut seperti Senarai Holiday: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Peluang
 DocType: Employee,Single,Single
 DocType: Issue,Attachment,Lampiran
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Bajet tidak boleh ditetapkan untuk PTJ Kumpulan
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,Master bercuti.
 DocType: Material Request Item,Required Date,Tarikh Diperlukan
 DocType: Delivery Note,Billing Address,Alamat Bil
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Sila masukkan Kod Item.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Sila masukkan Kod Item.
 DocType: BOM,Costing,Berharga
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Jika disemak, jumlah cukai yang akan dianggap sebagai sudah termasuk dalam Kadar Cetak / Print Amaun"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Jumlah Kuantiti
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Serial Tiada Jaminan tamat
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Perkara {0} tidak Membeli Item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Perkara {0} tidak Membeli Item
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} adalah alamat e-mel yang tidak sah dalam &#39;Pemberitahuan \ Alamat E-mel&#39;
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Jumlah Bil Tahun Ini:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Cukai dan Caj
 DocType: Purchase Invoice,Supplier Invoice No,Pembekal Invois No
 DocType: Territory,For reference,Untuk rujukan
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Penutup (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Penutup (Cr)
 DocType: Serial No,Warranty Period (Days),Tempoh Waranti (Hari)
 DocType: Installation Note Item,Installation Note Item,Pemasangan Nota Perkara
 ,Pending Qty,Menunggu Kuantiti
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Pengagihan Bulanan ** membantu anda mengagihkan bajet anda melangkaui bulan-bulan jika anda mempunyai musim dalam perniagaan anda. Untuk mengagihkan bajet yang menggunakan taburan ini, tetapkan **Pengagihan Bulanan** di **Pusat Kos** berkenaan"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Tiada rekod yang terdapat dalam jadual Invois yang
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +20,Please select Company and Party Type first,Sila pilih Syarikat dan Parti Jenis pertama
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Tahun kewangan / perakaunan.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial No tidak boleh digabungkan"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,Projek Petugas
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Jumlah Besar
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Tahun fiskal Tarikh Mula tidak seharusnya lebih besar daripada Tahun Anggaran Tarikh akhir
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Tahun fiskal Tarikh Mula tidak seharusnya lebih besar daripada Tahun Anggaran Tarikh akhir
 DocType: Warranty Claim,Resolution,Resolusi
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dihantar: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Dihantar: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Akaun Belum Bayar
 DocType: Sales Order,Billing and Delivery Status,Bil dan Status Penghantaran
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ulang Pelanggan
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,Sebutharga Untuk
 DocType: Lead,Middle Income,Pendapatan Tengah
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Jumlah yang diperuntukkan tidak boleh negatif
 DocType: Purchase Order Item,Billed Amt,Billed AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Satu Gudang maya di mana kemasukkan stok dibuat.
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Pengeluaran Pesanan adalah Mandatori
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Penulisan Cadangan
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatif Ralat Saham ({6}) untuk Perkara {0} dalam Gudang {1} pada {2} {3} dalam {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatif Ralat Saham ({6}) untuk Perkara {0} dalam Gudang {1} pada {2} {3} dalam {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Tahun Anggaran Syarikat
 DocType: Packing Slip Item,DN Detail,Detail DN
 DocType: Time Log,Billed,Dibilkan
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,Kadar Kos lalai
 DocType: Maintenance Schedule,Maintenance Schedule,Jadual Penyelenggaraan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Peraturan Kemudian Harga ditapis keluar berdasarkan Pelanggan, Kumpulan Pelanggan, Wilayah, Pembekal, Jenis Pembekal, Kempen, Rakan Jualan dan lain-lain"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Perubahan Bersih dalam Inventori
 DocType: Employee,Passport Number,Nombor Pasport
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Pengurus
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Dari Resit Pembelian
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Perkara sama telah dibuat beberapa kali.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Dari Resit Pembelian
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Perkara sama telah dibuat beberapa kali.
 DocType: SMS Settings,Receiver Parameter,Penerima Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Berdasarkan Kepada' dan 'Kumpul Mengikut' tidak boleh sama
 DocType: Sales Person,Sales Person Targets,Sasaran Orang Jualan
 DocType: Production Order Operation,In minutes,Dalam beberapa minit
 DocType: Issue,Resolution Date,Resolusi Tarikh
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
 DocType: Selling Settings,Customer Naming By,Menamakan Dengan Pelanggan
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Tukar ke Kumpulan
 DocType: Activity Cost,Activity Type,Jenis Kegiatan
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Penerbitan
 DocType: Activity Cost,Projects User,Projek pengguna
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Digunakan
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} tidak terdapat dalam jadual Butiran Invois
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} tidak terdapat dalam jadual Butiran Invois
 DocType: Company,Round Off Cost Center,Bundarkan PTJ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Lawatan penyelenggaraan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
 DocType: Material Request,Material Transfer,Pemindahan bahan
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Pemasaran
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Untuk mengesan item dalam jualan dan dokumen pembelian berdasarkan nos siri mereka. Ini juga boleh digunakan untuk mengesan butiran jaminan produk.
 DocType: Purchase Receipt Item Supplied,Current Stock,Saham Semasa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Gudang ditolak adalah wajib terhadap item regected
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Jumlah bil tahun ini
 DocType: Account,Expenses Included In Valuation,Perbelanjaan Termasuk Dalam Penilaian
 DocType: Employee,Provide email id registered in company,Menyediakan id e-mel yang berdaftar dalam syarikat
 DocType: Hub Settings,Seller City,Penjual City
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Perkara mempunyai varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Perkara mempunyai varian.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Jenis
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0} bukan perkara stok
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} bukan perkara stok
 DocType: Mode of Payment Account,Default Account,Akaun Default
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,Sila pilih hari cuti mingguan
 DocType: Production Order Operation,Planned End Time,Dirancang Akhir Masa
 ,Sales Person Target Variance Item Group-Wise,Orang Jualan Sasaran Varian Perkara Kumpulan Bijaksana
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar ke lejar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar ke lejar
 DocType: Delivery Note,Customer's Purchase Order No,Pelanggan Pesanan Pembelian No
 DocType: Employee,Cell Number,Bilangan sel
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Permintaan bahan Auto Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Hilang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak boleh memasuki baucar semasa dalam &#39;Terhadap Journal Entry&#39; ruangan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak boleh memasuki baucar semasa dalam &#39;Terhadap Journal Entry&#39; ruangan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Tenaga
 DocType: Opportunity,Opportunity From,Peluang Daripada
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Kenyataan gaji bulanan.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Dari {0} dari jenis {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor penukaran adalah wajib
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Catatan perakaunan boleh dibuat terhadap nod daun. Catatan terhadap Kumpulan adalah tidak dibenarkan.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Nombor resit pembelian diperlukan untuk Perkara {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Nombor resit pembelian diperlukan untuk Perkara {0}
 DocType: Item Attribute Value,Item Attribute Value,Perkara Atribut Nilai
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Kempen jualan.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Senarai Harga tidak dipilih
 DocType: Employee,Family Background,Latar Belakang Keluarga
 DocType: Process Payroll,Send Email,Hantar E-mel
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Tiada Kebenaran
 DocType: Company,Default Bank Account,Akaun Bank Default
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Untuk menapis berdasarkan Parti, pilih Parti Taipkan pertama"
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Item dengan wajaran yang lebih tinggi akan ditunjukkan tinggi
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Penyesuaian Bank
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Invois saya
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Invois saya
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Tiada pekerja didapati
 DocType: Purchase Order,Stopped,Berhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak kepada vendor
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Hantar Sekarang
 ,Support Analytics,Sokongan Analytics
 DocType: Item,Website Warehouse,Laman Web Gudang
+DocType: Payment Reconciliation,Minimum Invoice Amount,Amaun Invois Minimum
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Borang rekod
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Untuk membolehkan &quot;Point of Sale&quot; ciri-ciri
 DocType: Bin,Moving Average Rate,Bergerak Kadar Purata
 DocType: Production Planning Tool,Select Items,Pilih Item
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} terhadap Bil {1} bertarikh {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} terhadap Bil {1} bertarikh {2}
 DocType: Maintenance Visit,Completion Status,Siap Status
 DocType: Sales Invoice Item,Target Warehouse,Sasaran Gudang
 DocType: Item,Allow over delivery or receipt upto this percent,Membolehkan lebih penghantaran atau penerimaan hamper peratus ini
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Mengarang mesej secara automatik pada penyerahan transaksi.
 DocType: Production Order,Item To Manufacture,Perkara Untuk Pembuatan
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status adalah {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Membeli Perintah untuk Pembayaran
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Membeli Perintah untuk Pembayaran
 DocType: Sales Order Item,Projected Qty,Unjuran Qty
 DocType: Sales Invoice,Payment Due Date,Tarikh Pembayaran
 DocType: Newsletter,Newsletter Manager,Newsletter Pengurus
@@ -704,7 +709,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Tempat jualan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Baki akaun sudah dalam Kredit, anda tidak dibenarkan untuk menetapkan 'Baki Mestilah' sebagai 'debit'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Baki akaun sudah dalam Kredit, anda tidak dibenarkan untuk menetapkan 'Baki Mestilah' sebagai 'debit'"
 DocType: Account,Balance must be,Baki mestilah
 DocType: Hub Settings,Publish Pricing,Terbitkan Harga
 DocType: Notification Control,Expense Claim Rejected Message,Mesej perbelanjaan Tuntutan Ditolak
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Mata Wang Kadar pertukaran utama.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} mesti aktif
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} mesti aktif
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Sila pilih jenis dokumen pertama
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Tinggalkan Penunaian Jumlah
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,Default Akaun Belum Bayar
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Pekerja {0} tidak aktif atau tidak wujud
 DocType: Features Setup,Item Barcode,Item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Membeli Advance Invois
 DocType: Address,Shop,Kedai
 DocType: Hub Settings,Sync Now,Sync Sekarang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: kemasukan Kredit tidak boleh dikaitkan dengan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Row {0}: kemasukan Kredit tidak boleh dikaitkan dengan {1}
 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.
 DocType: Employee,Permanent Address Is,Alamat Tetap Adakah
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasi siap untuk berapa banyak barangan siap?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Jenama
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Peruntukan berlebihan {0} terlintas untuk Perkara {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Peruntukan berlebihan {0} terlintas untuk Perkara {1}.
 DocType: Employee,Exit Interview Details,Butiran Keluar Temuduga
 DocType: Item,Is Purchase Item,Adalah Pembelian Item
 DocType: Journal Entry Account,Purchase Invoice,Invois Belian
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,Jumlah dalam perkataan
 DocType: Material Request Item,Lead Time Date,Lead Tarikh Masa
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,adalah wajib. Mungkin rekod pertukaran mata wang tidak dicipta untuk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Sila nyatakan Serial No untuk Perkara {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Sila nyatakan Serial No untuk Perkara {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Untuk item &#39;Bundle Produk&#39;, Gudang, No Serial dan batch Tidak akan dipertimbangkan dari &#39;Packing List&#39; meja. Jika Gudang dan Batch No adalah sama untuk semua barangan pembungkusan untuk item apa-apa &#39;Bundle Produk&#39;, nilai-nilai boleh dimasukkan dalam jadual Perkara utama, nilai akan disalin ke &#39;Packing List&#39; meja."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Penghantaran kepada pelanggan.
 DocType: Purchase Invoice Item,Purchase Order Item,Pesanan Pembelian Item
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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 +626,Select Item for Transfer,Pilih Item Pemindahan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Membolehkan pengguna untuk mengedit Senarai Harga Kadar dalam urus niaga
 DocType: Pricing Rule,Max Qty,Max Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Pembayaran terhadap Jualan / Pesanan Belian perlu sentiasa ditandakan sebagai pendahuluan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimia
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Semua barang-barang telah dipindahkan bagi Perintah Pengeluaran ini.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Semua barang-barang telah dipindahkan bagi Perintah Pengeluaran ini.
 DocType: Process Payroll,Select Payroll Year and Month,Pilih Tahun Gaji dan Bulan
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Pergi ke kumpulan yang sesuai (biasanya Permohonan Dana&gt; Aset Semasa&gt; Akaun Bank dan membuat Akaun baru (dengan klik pada Tambah Kanak-kanak) jenis &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Kos Elektrik
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),Semua Lead (Terbuka)
 DocType: Purchase Invoice,Get Advances Paid,Mendapatkan Pendahuluan Dibayar
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Sertakan Gambar Anda
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Buat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Buat
 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 +3,My Cart,Keranjang saya
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Keranjang saya
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Membuka Qty
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,Akaun Tunai / Bank
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Jadual atribut adalah wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} tidak boleh negatif
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Diskaun
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Diskaun
 DocType: Features Setup,Purchase Discounts,Diskaun Pembelian
 DocType: Workstation,Wages,Upah
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Akan dikemas kini hanya jika Time Log adalah &#39;dapat ditaksir&#39;
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,Negeri Penghantaran
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item mesti ditambah menggunakan &#39;Dapatkan Item daripada Pembelian Resit&#39; butang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Perbelanjaan jualan
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Membeli Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Membeli Standard
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Default Jualan Kos Pusat
 DocType: Sales Partner,Implementation Partner,Rakan Pelaksanaan
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,Pengedar
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Membeli-belah Troli Penghantaran Peraturan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Pengeluaran Pesanan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Sila menetapkan &#39;Guna Diskaun tambahan On&#39;
 ,Ordered Items To Be Billed,Item Diperintah dibilkan
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Dari Range mempunyai kurang daripada Untuk Julat
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Pilih Masa balak dan Hantar untuk mewujudkan Invois Jualan baru.
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ini batch Masa Log telah ditaksir.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Cipta Peluang
 DocType: Salary Slip,Leave Without Pay,Tinggalkan Tanpa Gaji
-DocType: Supplier,Communications,Komunikasi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Kapasiti Ralat Perancangan
 ,Trial Balance for Party,Baki percubaan untuk Parti
 DocType: Lead,Consultant,Perunding
 DocType: Salary Slip,Earnings,Pendapatan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Mendapat tempat Item {0} mesti dimasukkan untuk masuk jenis Pembuatan
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Perakaunan membuka Baki
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Mendapat tempat Item {0} mesti dimasukkan untuk masuk jenis Pembuatan
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Perakaunan membuka Baki
 DocType: Sales Invoice Advance,Sales Invoice Advance,Jualan Invois Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Tiada apa-apa untuk meminta
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Tarikh Mula Sebenar' tidak boleh lebih besar daripada 'Tarikh Akhir Sebenar'
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,Fiskal Tahun Semasa
 DocType: Global Defaults,Disable Rounded Total,Melumpuhkan Bulat Jumlah
 DocType: Lead,Call,Panggilan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;Penyertaan&#39; tidak boleh kosong
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&#39;Penyertaan&#39; tidak boleh kosong
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Salinan barisan {0} dengan sama {1}
 ,Trial Balance,Imbangan Duga
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Menubuhkan Pekerja
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,ID Pengguna
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Lihat Lejar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Terawal
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Pengilangan terhadap Jualan Pesanan
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Tiada kebenaran untuk mengedit Akaun beku {0}
 DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Invois Cemerlang
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Pesanan Jualan {0} tidak sah
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,Tempat Dikeluarkan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrak
 DocType: Email Digest,Add Quote,Tambah Quote
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} dalam Perkara: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} dalam Perkara: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Perbelanjaan tidak langsung
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Produk atau Perkhidmatan anda
 DocType: Mode of Payment,Mode of Payment,Cara Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,Website Image should be a public file or website URL,Laman web Image perlu fail awam atau URL laman web
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ini adalah kumpulan item akar dan tidak boleh diedit.
 DocType: Journal Entry Account,Purchase Order,Pesanan Pembelian
 DocType: Warehouse,Warehouse Contact Info,Gudang info
@@ -1018,8 +1024,8 @@
 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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Peralatan Modal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,Matlamat
 DocType: Sales Invoice Item,Edit Description,Edit Penerangan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Jangkaan Tarikh penghantaran adalah lebih rendah daripada yang dirancang Tarikh Mula.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Untuk Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Untuk Pembekal
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Menetapkan Jenis Akaun membantu dalam memilih Akaun ini dalam urus niaga.
 DocType: Purchase Invoice,Grand Total (Company Currency),Jumlah Besar (Syarikat mata wang)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Jumlah Keluar
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,Jurnal Entry
 DocType: Workstation,Workstation Name,Nama stesen kerja
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mel Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} bukan milik Perkara {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Surat berita kepada kenalan, membawa."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operasi tidak boleh dibiarkan kosong.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operasi tidak boleh dibiarkan kosong.
 ,Delivered Items To Be Billed,Item Dihantar dikenakan caj
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Gudang tidak boleh diubah untuk No. Siri
 DocType: Authorization Rule,Average Discount,Diskaun Purata
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Dari {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operasi Penerangan
 DocType: Item,Will also apply to variants,Juga akan memohon kepada varian
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Tidak dapat ubah Tahun Fiskal Mula Tarikh dan Tahun Anggaran Tarikh akhir sekali Tahun Fiskal disimpan.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Tidak dapat ubah Tahun Fiskal Mula Tarikh dan Tahun Anggaran Tarikh akhir sekali Tahun Fiskal disimpan.
 DocType: Quotation,Shopping Cart,Troli Membeli-belah
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Purata harian Keluar
 DocType: Pricing Rule,Campaign,Kempen
@@ -1100,7 +1106,8 @@
 DocType: Sales Order Item,Planned Quantity,Dirancang Kuantiti
 DocType: Purchase Invoice Item,Item Tax Amount,Jumlah Perkara Cukai
 DocType: Item,Maintain Stock,Mengekalkan Stok
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Penyertaan Saham telah dicipta untuk Perintah Pengeluaran
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,tidak boleh lebih besar daripada 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Perkara {0} bukan Item saham
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Perkara {0} bukan Item saham
 DocType: Maintenance Visit,Unscheduled,Tidak Berjadual
 DocType: Employee,Owned,Milik
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Bergantung kepada Cuti Tanpa Gaji
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Dewan Sub
 DocType: Shipping Rule Condition,To Value,Untuk Nilai
 DocType: Supplier,Stock Manager,Pengurus saham
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk berturut-turut {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk berturut-turut {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Slip pembungkusan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Pejabat Disewa
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Tetapan gateway Persediaan SMS
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Tiada alamat ditambah lagi.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Jam Kerja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Penganalisis
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Jumlah Peruntukan {1} mesti kurang daripada atau bersamaan dengan jumlah JV {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Jumlah Peruntukan {1} mesti kurang daripada atau bersamaan dengan jumlah JV {2}
 DocType: Item,Inventory,Inventori
 DocType: Features Setup,"To enable ""Point of Sale"" view",Untuk membolehkan &quot;Point of Sale&quot; Pandangan
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Pembayaran tidak boleh dibuat untuk cart kosong
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Pembayaran tidak boleh dibuat untuk cart kosong
 DocType: Item,Sales Details,Jualan Butiran
 DocType: Opportunity,With Items,Dengan Item
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Dalam Kuantiti
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,Kos Pusat Ibu Bapa
 DocType: Sales Invoice,Source,Sumber
 DocType: Leave Type,Is Leave Without Pay,Apakah Tinggalkan Tanpa Gaji
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Tiada rekod yang terdapat dalam jadual Pembayaran
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Tiada rekod yang terdapat dalam jadual Pembayaran
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Tahun Kewangan Tarikh Mula
 DocType: Employee External Work History,Total Experience,Jumlah Pengalaman
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Slip pembungkusan (s) dibatalkan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Slip pembungkusan (s) dibatalkan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Aliran tunai daripada Pelaburan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding dan Caj
 DocType: Material Request Item,Sales Order No,Pesanan Jualan No
 DocType: Item Group,Item Group Name,Perkara Kumpulan Nama
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Bahan Pemindahan bagi Pembuatan
 DocType: Pricing Rule,For Price List,Untuk Senarai Harga
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cari Eksekutif
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kadar pembelian untuk item: {0} tidak ditemui, yang diperlukan untuk menempah kemasukan perakaunan (perbelanjaan). Sila sebutkan harga item dengan senarai harga belian."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kadar pembelian untuk item: {0} tidak ditemui, yang diperlukan untuk menempah kemasukan perakaunan (perbelanjaan). Sila sebutkan harga item dengan senarai harga belian."
 DocType: Maintenance Schedule,Schedules,Jadual
 DocType: Purchase Invoice Item,Net Amount,Jumlah Bersih
 DocType: Purchase Order Item Supplied,BOM Detail No,Detail BOM Tiada
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Jumlah Diskaun tambahan (Mata Wang Syarikat)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Ralat: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Ralat: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Sila buat akaun baru dari carta akaun.
 DocType: Maintenance Visit,Maintenance Visit,Penyelenggaraan Lawatan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,Jualan Rakan Sasaran
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kemasukan Perakaunan untuk {0} hanya boleh dibuat dalam mata wang: {1}
 DocType: Pricing Rule,Pricing Rule,Peraturan Harga
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Permintaan bahan Membeli Pesanan
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Permintaan bahan Membeli Pesanan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Dikembalikan Perkara {1} tidak wujud dalam {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Akaun Bank
 ,Bank Reconciliation Statement,Penyata Penyesuaian Bank
@@ -1225,11 +1233,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Membuka Baki Saham
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} mesti muncul hanya sekali
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Dari Nilai
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Pembuatan Kuantiti adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Pembuatan Kuantiti adalah wajib
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Amaun tidak dicerminkan dalam bank
 DocType: Quality Inspection Reading,Reading 4,Membaca 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Tuntutan perbelanjaan syarikat.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,Permintaan bahan yang mana Sebutharga Pembekal tidak dicipta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Untuk menjejaki item menggunakan kod bar. Anda akan dapat untuk memasuki perkara dalam Nota Penghantaran dan Jualan Invois dengan mengimbas kod bar barangan.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Tanda sebagai Dihantar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Tanda sebagai Dihantar
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Membuat Sebut Harga
 DocType: Dependent Task,Dependent Task,Petugas bergantung
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Penerima Senarai
 DocType: Payment Tool Detail,Payment Amount,Jumlah Bayaran
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Jumlah dimakan
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Lihat
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Lihat
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Perubahan Bersih dalam Tunai
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktur Potongan Gaji
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kos Item Dikeluarkan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Kuantiti mestilah tidak lebih daripada {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Umur (Hari)
 DocType: Quotation Item,Quotation Item,Sebut Harga Item
 DocType: Account,Account Name,Nama Akaun
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Dari Tarikh tidak boleh lebih besar daripada Dating
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Dari Tarikh tidak boleh lebih besar daripada Dating
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} kuantiti {1} tidak boleh menjadi sebahagian kecil
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,Kadar Penukaran tidak boleh menjadi 0 atau 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Kadar Penukaran tidak boleh menjadi 0 atau 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Pembelian Resit {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Pembelian Resit {0} tidak dikemukakan
 DocType: Company,Default Payable Account,Default Akaun Belum Bayar
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% dibilkan
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Isu saya
 DocType: BOM Item,BOM Item,BOM Perkara
 DocType: Appraisal,For Employee,Untuk Pekerja
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Row {0}: Advance terhadap Pembekal hendaklah mendebitkan
 DocType: Company,Default Values,Nilai lalai
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Jumlah Pembayaran tidak boleh negatif
 DocType: Expense Claim,Total Amount Reimbursed,Jumlah dibayar balik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Terhadap Pembekal Invois {0} bertarikh {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Terhadap Pembekal Invois {0} bertarikh {1}
 DocType: Customer,Default Price List,Senarai Harga Default
 DocType: Payment Reconciliation,Payments,Pembayaran
 DocType: Budget Detail,Budget Allocated,Bajet Diperuntukkan
 DocType: Journal Entry,Entry Type,Jenis Kemasukan
 ,Customer Credit Balance,Baki Pelanggan Kredit
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Perubahan Bersih dalam Akaun Belum Bayar
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Sila sahkan id e-mel anda
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Pelanggan dikehendaki untuk &#39;Customerwise Diskaun&#39;
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Update tarikh pembayaran bank dengan jurnal.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Membolehkan Troli
 DocType: Employee,Permanent Address,Alamat Tetap
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Perkara {0} mestilah Perkara Perkhidmatan.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Advance dibayar terhadap {0} {1} tidak boleh lebih besar \ daripada Jumlah Besar {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Sila pilih kod item
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Mengurangkan Potongan bagi Cuti Tanpa Gaji (LWP)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Unit tunggal Item satu.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Masa Log batch {0} mesti &#39;Dihantar&#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Masa Log batch {0} mesti &#39;Dihantar&#39;
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Gudang diperlukan semasa Row Tiada {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Gudang diperlukan semasa Row Tiada {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Pos
 DocType: Item,Weightage,Wajaran
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Satu Kumpulan Pelanggan sudah wujud dengan nama yang sama, sila tukar nama Pelanggan atau menamakan semula Kumpulan Pelanggan"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Sila pilih {0} pertama.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},teks {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Sila pilih {0} pertama.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},teks {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Kenalan Baru
 DocType: Territory,Parent Territory,Wilayah Ibu Bapa
 DocType: Quality Inspection Reading,Reading 2,Membaca 2
 DocType: Stock Entry,Material Receipt,Penerimaan Bahan
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Jenis Parti dan Parti diperlukan untuk / akaun Dibayar Terima {0}
 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 +210,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 +213,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 +85,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
@@ -1361,15 +1373,15 @@
 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: Sales Invoice Item,Batch No,Batch No
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Membenarkan pelbagai Pesanan Jualan terhadap Perintah Pembelian yang Pelanggan
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Utama
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Utama
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varian
 DocType: Naming Series,Set prefix for numbering series on your transactions,Terletak awalan untuk penomboran siri transaksi anda
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Perintah berhenti tidak boleh dibatalkan. Unstop untuk membatalkan.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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: Item,Variants,Kelainan
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Buat Pesanan Belian
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Buat Pesanan Belian
 DocType: SMS Center,Send To,Hantar Kepada
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Gudang dan Rujukan
 DocType: Supplier,Statutory info and other general information about your Supplier,Maklumat berkanun dan maklumat umum lain mengenai pembekal anda
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Alamat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Perkara yang tidak dibenarkan mempunyai Perintah Pengeluaran.
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Jumlah Kredit dalam Mata Wang Akaun
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Masa balak untuk pengeluaran.
 DocType: Item,Apply Warehouse-wise Reorder Level,Memohon Gudang-bijak Reorder Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
 DocType: Authorization Control,Authorization Control,Kawalan Kuasa
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Warehouse Telah adalah wajib terhadap Perkara ditolak {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Masa Log untuk tugas-tugas.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pembayaran
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Pembayaran
 DocType: Production Order Operation,Actual Time and Cost,Masa sebenar dan Kos
 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 maksimum {0} boleh dibuat untuk Perkara {1} terhadap Sales Order {2}
 DocType: Employee,Salutation,Salam
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Madya
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Perkara {0} bukan Item bersiri
 DocType: SMS Center,Create Receiver List,Cipta Senarai Penerima
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Tamat
 DocType: Packing Slip,To Package No.,Untuk Pakej No.
 DocType: Warranty Claim,Issue Date,Isu Tarikh
 DocType: Activity Cost,Activity Cost,Kos Aktiviti
@@ -1449,7 +1461,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Tercapai
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Wilayah / Pelanggan
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,contohnya 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Jumlah Peruntukan {1} mesti kurang daripada atau sama dengan invois Jumlah tertunggak {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Jumlah Peruntukan {1} mesti kurang daripada atau sama dengan invois Jumlah tertunggak {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Invois Jualan.
 DocType: Item,Is Sales Item,Adalah Item Jualan
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Perkara Kumpulan Tree
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} dihasilkan
 DocType: Delivery Note Item,Against Sales Order,Terhadap Perintah Jualan
 ,Serial No Status,Serial No Status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Meja Item tidak boleh kosong
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Meja Item tidak boleh kosong
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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}"
 DocType: Pricing Rule,Selling,Jualan
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Tugas dan Cukai
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Sila masukkan tarikh Rujukan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Sila masukkan tarikh Rujukan
 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} entri bayaran tidak boleh ditapis oleh {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Jadual untuk Perkara yang akan dipaparkan dalam Laman Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Dibekalkan Qty
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,Masa pemasangan
 DocType: Sales Invoice,Accounting Details,Maklumat Perakaunan
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Memadam semua Transaksi Syarikat ini
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operasi {1} tidak siap untuk {2} qty barangan siap dalam Pengeluaran Pesanan # {3}. Sila kemas kini status operasi melalui Time Logs
+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,Row # {0}: Operasi {1} tidak siap untuk {2} qty barangan siap dalam Pengeluaran Pesanan # {3}. Sila kemas kini status operasi melalui Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Pelaburan
 DocType: Issue,Resolution Details,Resolusi Butiran
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriteria Penerimaan
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,Jadual jelas
 DocType: Features Setup,Brands,Jenama
 DocType: C-Form Invoice Detail,Invoice No,Tiada invois
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Dari Pesanan Belian
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Dari Pesanan Belian
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Tinggalkan tidak boleh digunakan / dibatalkan sebelum {0}, sebagai baki cuti telah pun dibawa dikemukakan dalam rekod peruntukan cuti masa depan {1}"
 DocType: Activity Cost,Costing Rate,Kadar berharga
 ,Customer Addresses And Contacts,Alamat Pelanggan Dan Kenalan
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,Jadual Penyelenggaraan
 ,Quotation Trends,Trend Sebut Harga
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,Debit To account must be a Receivable account,Debit Untuk akaun mestilah akaun Belum Terima
 DocType: Shipping Rule Condition,Shipping Amount,Penghantaran Jumlah
 ,Pending Amount,Sementara menunggu Jumlah
 DocType: Purchase Invoice Item,Conversion Factor,Faktor penukaran
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree akaun finanial.
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Akaun {0} mestilah dari jenis &#39;Aset Tetap&#39; sebagai Item {1} adalah Perkara Aset
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Akaun {0} mestilah dari jenis &#39;Aset Tetap&#39; sebagai Item {1} adalah Perkara Aset
 DocType: HR Settings,HR Settings,Tetapan HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Perbelanjaan Tuntutan sedang menunggu kelulusan. Hanya Pelulus Perbelanjaan yang boleh mengemas kini status.
 DocType: Purchase Invoice,Additional Discount Amount,Jumlah Diskaun tambahan
 DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Sekat Senarai Benarkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sukan
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Jumlah Sebenar
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Unit
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Tuntutan perbelanjaan
 DocType: Issue,Support,Sokongan
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Lihat Troli
 ,BOM Search,BOM Search
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Penutup (Membuka Total +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Sila nyatakan mata wang dalam Syarikat
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM Penukaran diperlukan berturut-turut {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Tarikh pelepasan tidak boleh sebelum tarikh cek berturut-turut {0}
 DocType: Salary Slip,Deduction,Potongan
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Perkara Harga ditambah untuk {0} dalam senarai harga {1}
 DocType: Address Template,Address Template,Templat Alamat
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% Tugas Selesai
 DocType: Project,Gross Margin,Margin kasar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Sila masukkan Pengeluaran Perkara pertama
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,pengguna orang kurang upaya
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,pengguna orang kurang upaya
 DocType: Opportunity,Quotation,Sebut Harga
 DocType: Salary Slip,Total Deduction,Jumlah Potongan
 DocType: Quotation,Maintenance User,Penyelenggaraan pengguna
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
 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
@@ -1588,12 +1602,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Simpan Track Kempen Jualan. Jejaki Leads, Sebut Harga, Pesanan Jualan dan lain-lain daripada kempen untuk mengukur Pulangan atas Pelaburan."
 DocType: Expense Claim,Approver,Pelulus
 ,SO Qty,SO Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Penyertaan saham wujud terhadap gudang {0}, oleh itu anda tidak boleh menetapkan semula atau mengubah suai Gudang"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Penyertaan saham wujud terhadap gudang {0}, oleh itu anda tidak boleh menetapkan semula atau mengubah suai Gudang"
 DocType: Appraisal,Calculate Total Score,Kira Jumlah Skor
 DocType: Supplier Quotation,Manufacturing Manager,Pembuatan Pengurus
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Penghantaran Split Nota ke dalam pakej.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Penghantaran
+apps/erpnext/erpnext/hooks.py +69,Shipments,Penghantaran
 DocType: Purchase Order Item,To be delivered to customer,Yang akan dihantar kepada pelanggan
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Masa Log Status mesti Dihantar.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,No siri {0} bukan milik mana-mana Warehouse
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +356,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
 DocType: Currency Exchange,From Currency,Dari Mata Wang
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Sila pilih Jumlah Diperuntukkan, Jenis Invois dan Nombor Invois dalam atleast satu baris"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Pesanan Jualan diperlukan untuk Perkara {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Sila pilih Jumlah Diperuntukkan, Jenis Invois dan Nombor Invois dalam atleast satu baris"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Pesanan Jualan diperlukan untuk Perkara {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Amaun tidak dicerminkan dalam sistem
 DocType: Purchase Invoice Item,Rate (Company Currency),Kadar (Syarikat mata wang)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Lain
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,Dalam Proses
 DocType: Authorization Rule,Itemwise Discount,Itemwise Diskaun
 DocType: Purchase Order Item,Reference Document Type,Rujukan Jenis Dokumen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} terhadap Permintaan Jualan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} terhadap Permintaan Jualan {1}
 DocType: Account,Fixed Asset,Aset Tetap
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inventori bersiri
 DocType: Activity Type,Default Billing Rate,Kadar Bil lalai
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Perintah Jualan kepada Pembayaran
 DocType: Expense Claim Detail,Expense Claim Detail,Perbelanjaan Tuntutan Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Masa Log dicipta:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Sila pilih akaun yang betul
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Sila pilih akaun yang betul
 DocType: Item,Weight UOM,Berat UOM
 DocType: Employee,Blood Group,Kumpulan Darah
 DocType: Purchase Invoice Item,Page Break,Page Break
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,Untuk Masa
 DocType: Authorization Rule,Approving Role (above authorized value),Meluluskan Peranan (di atas nilai yang diberi kuasa)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Untuk menambah nod anak, meneroka pokok dan klik pada nod di mana anda mahu untuk menambah lebih banyak nod."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit Untuk akaun mestilah akaun Dibayar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Kredit Untuk akaun mestilah akaun Dibayar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},BOM rekursi: {0} tidak boleh menjadi ibu bapa atau kanak-kanak {2}
 DocType: Production Order Operation,Completed Qty,Siap Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Senarai Harga {0} adalah orang kurang upaya
 DocType: Manufacturing Settings,Allow Overtime,Benarkan kerja lebih masa
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} nombor siri yang diperlukan untuk item {1}. Anda telah menyediakan {2}.
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,Kod Item Pelanggan
 DocType: Opportunity,Lost Reason,Hilang Akal
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Buat Penyertaan Bayaran terhadap Pesanan atau Invois.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Alamat Baru
 DocType: Quality Inspection,Sample Size,Saiz Sampel
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Semua barang-barang telah diinvois
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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
 DocType: Project,External,Luar
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,Nama semula Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update Kos
 DocType: Item Reorder,Item Reorder,Perkara Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Pemindahan Bahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Pemindahan Bahan
 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."
 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
 DocType: Installation Note,Installation Note,Pemasangan Nota
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Tambah Cukai
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Aliran tunai daripada pembiayaan
 ,Financial Analytics,Analisis Kewangan
 DocType: Quality Inspection,Verified By,Disahkan oleh
 DocType: Address,Subsidiary,Anak Syarikat
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,Membuat Slip Gaji
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Keseimbangan dijangka seperti bank
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Sumber Dana (Liabiliti)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kuantiti berturut-turut {0} ({1}) mestilah sama dengan kuantiti yang dikeluarkan {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kuantiti berturut-turut {0} ({1}) mestilah sama dengan kuantiti yang dikeluarkan {2}
 DocType: Appraisal,Employee,Pekerja
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Dari E-mel
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Jemput sebagai pengguna
 DocType: Features Setup,After Sale Installations,Selepas Pemasangan Sale
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} telah dibil sepenuhnya
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} telah dibil sepenuhnya
 DocType: Workstation Working Hour,End Time,Akhir Masa
 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 +75,Group by Voucher,Kumpulan dengan Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan Pada
 DocType: Sales Invoice,Mass Mailing,Mailing massa
 DocType: Rename Tool,File to Rename,Fail untuk Namakan semula
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Nombor pesanan Purchse diperlukan untuk Perkara {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Nombor pesanan Purchse diperlukan untuk Perkara {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Show Pembayaran
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadual Penyelenggaraan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,Pesanan Jualan Diperlukan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Buat Pelanggan
 DocType: Purchase Invoice,Credit To,Kredit Untuk
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Leads aktif / Pelanggan
 DocType: Employee Education,Post Graduate,Siswazah
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Jadual Penyelenggaraan Terperinci
 DocType: Quality Inspection Reading,Reading 9,Membaca 9
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,Dibangkitkan Oleh
 DocType: Payment Tool,Payment Account,Akaun Pembayaran
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Sila nyatakan Syarikat untuk meneruskan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Perubahan Bersih dalam Akaun Belum Terima
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Pampasan Off
 DocType: Quality Inspection Reading,Accepted,Diterima
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,Jumlah Pembayaran
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
 DocType: Newsletter,Test,Ujian
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Oleh kerana terdapat transaksi saham sedia ada untuk item ini, \ anda tidak boleh menukar nilai-nilai &#39;Belum Bersiri&#39;, &#39;Mempunyai batch Tidak&#39;, &#39;Apakah Saham Perkara&#39; dan &#39;Kaedah Penilaian&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Pantas Journal Kemasukan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Pantas Journal Kemasukan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Anda tidak boleh mengubah kadar jika BOM disebut agianst sebarang perkara
 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 +157,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 +211,{0} {1} is not submitted,{0} {1} tidak diserahkan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} tidak diserahkan
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Terma dan Conditions1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,Nilai yang diberi kuasa
 DocType: Contact,Enter department to which this Contact belongs,Masukkan jabatan yang Contact ini kepunyaan
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Jumlah Tidak hadir
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Perkara atau Gudang untuk baris {0} tidak sepadan Bahan Permintaan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Perkara atau Gudang untuk baris {0} tidak sepadan Bahan Permintaan
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unit Tindakan
 DocType: Fiscal Year,Year End Date,Tahun Tarikh Akhir
 DocType: Task Depends On,Task Depends On,Petugas Bergantung Pada
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrak Tarikh Akhir mesti lebih besar daripada Tarikh Menyertai
 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.
 DocType: Customer Group,Has Child Node,Kanak-kanak mempunyai Nod
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} terhadap Permintaan Pembelian {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} terhadap Permintaan Pembelian {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Masukkan parameter url statik di sini (Eg. Penghantar = ERPNext, nama pengguna = ERPNext, kata laluan = 1234 dan lain-lain)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} tidak dalam mana-mana Tahun Fiskal aktif. Untuk maklumat lanjut daftar {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ini adalah laman contoh automatik dihasilkan daripada ERPNext
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,Recd Kuantiti
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Tidak boleh menghasilkan Perkara lebih {0} daripada kuantiti Sales Order {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Saham Entry {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Saham Entry {0} tidak dikemukakan
 DocType: Payment Reconciliation,Bank / Cash Account,Akaun Bank / Tunai
 DocType: Tax Rule,Billing City,Bandar Bil
 DocType: Global Defaults,Hide Currency Symbol,Menyembunyikan Simbol mata wang
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Perbelanjaan utiliti
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Ke atas
 DocType: Buying Settings,Default Buying Price List,Default Senarai Membeli Harga
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Tiada pekerja bagi kriteria ATAU penyata gaji dipilih di atas telah membuat
 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"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Jenis Pembayaran
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Lihat &quot;Kadar Bahan Based On&quot; dalam Seksyen Kos
 DocType: Appraisal Goal,Key Responsibility Area,Kawasan Tanggungjawab Utama
 DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Faktor Penukaran UOM adalah wajib
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,PTJ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Baucer #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Sila pilih nilai untuk {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Semua Alamat.
 DocType: Company,Stock Settings,Tetapan saham
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan hanya boleh dilakukan jika sifat berikut adalah sama dalam kedua-dua rekod. Adalah Kumpulan, Jenis Akar, Syarikat"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan hanya boleh dilakukan jika sifat berikut adalah sama dalam kedua-dua rekod. Adalah Kumpulan, Jenis Akar, Syarikat"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Menguruskan Tree Kumpulan Pelanggan.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,New Nama PTJ
 DocType: Leave Control Panel,Leave Control Panel,Tinggalkan Panel Kawalan
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Alat pembayaran Detail
 ,Sales Browser,Jualan Pelayar
 DocType: Journal Entry,Total Credit,Jumlah Kredit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Amaran: Satu lagi {0} # {1} wujud terhadap kemasukan saham {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Tempatan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Amaran: Satu lagi {0} # {1} wujud terhadap kemasukan saham {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Tempatan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Pinjaman dan Pendahuluan (Aset)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Penghutang
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Besar
@@ -2003,7 +2022,7 @@
 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.
 DocType: Production Order Operation,Make Time Log,Buat Masa Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Sila menetapkan kuantiti pesanan semula
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Sila menetapkan kuantiti pesanan semula
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Sila buat Pelanggan dari Lead {0}
 DocType: Price List,Applicable for Countries,Digunakan untuk Negara
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Komputer
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Tidak Catatan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Tidak Catatan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Tertunggak
 DocType: Account,Stock Received But Not Billed,Saham Diterima Tetapi Tidak Membilkan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Akaun root mestilah kumpulan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Akaun root mestilah kumpulan
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gaji kasar + Tunggakan Jumlah + Penunaian Jumlah - Jumlah Potongan
 DocType: Monthly Distribution,Distribution Name,Nama pengedaran
 DocType: Features Setup,Sales and Purchase,Jual Beli
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,Baki pihak
 DocType: Sales Invoice Item,Time Log Batch,Masa Log Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Sila pilih Memohon Diskaun Pada
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Slip Gaji Dibuat
 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: Stock Entry,Material Transfer for Manufacture,Pemindahan Bahan untuk Pembuatan
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,Setengah tahun
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Tahun fiskal {0} tidak dijumpai.
 DocType: Bank Reconciliation,Get Relevant Entries,Dapatkan Entri Berkaitan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Catatan Perakaunan untuk Stok
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Catatan Perakaunan untuk Stok
 DocType: Sales Invoice,Sales Team1,Team1 Jualan
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Perkara {0} tidak wujud
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Perkara {0} tidak wujud
 DocType: Sales Invoice,Customer Address,Alamat Pelanggan
 DocType: Purchase Invoice,Apply Additional Discount On,Memohon Diskaun tambahan On
 DocType: Account,Root Type,Jenis akar
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Menunjukkan tayangan gambar ini di bahagian atas halaman
 DocType: BOM,Item UOM,Perkara UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Amaun Cukai Selepas Jumlah Diskaun (Syarikat mata wang)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Gudang sasaran adalah wajib untuk berturut-turut {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Gudang sasaran adalah wajib untuk berturut-turut {0}
 DocType: Quality Inspection,Quality Inspection,Pemeriksaan Kualiti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Tambahan Kecil
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Makanan, Minuman &amp; Tembakau"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL atau BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Hanya boleh membuat pembayaran terhadap belum dibilkan {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Hanya boleh membuat pembayaran terhadap belum dibilkan {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Kadar Suruhanjaya tidak boleh lebih besar daripada 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Tahap Inventori Minimum
 DocType: Stock Entry,Subcontract,Subkontrak
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Pemeriksaan kualiti yang masuk.
 DocType: Purchase Order Item,Returned Qty,Kembali Kuantiti
 DocType: Employee,Exit,Keluar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Jenis akar adalah wajib
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Jenis akar adalah wajib
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,No siri {0} dicipta
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kemudahan pelanggan, kod-kod ini boleh digunakan dalam format cetak seperti Invois dan Nota Penghantaran"
 DocType: Employee,You can enter any date manually,Anda boleh memasuki mana-mana tarikh secara manual
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Tempoh Percubaan
 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 +110,Row {0}: Advance against Customer must be credit,Row {0}: Advance terhadap Pelanggan mesti kredit
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Resit Pembelian Item Dibekalkan
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Bayar
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Bayar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Untuk datetime
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Log bagi mengekalkan status penghantaran sms
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Pesanan semula Level
 DocType: Attendance,Attendance Date,Kehadiran Tarikh
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Perpecahan gaji berdasarkan Pendapatan dan Potongan.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Akaun dengan nod kanak-kanak tidak boleh ditukar ke lejar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Akaun dengan nod kanak-kanak tidak boleh ditukar ke lejar
 DocType: Address,Preferred Shipping Address,Pilihan Alamat Penghantaran
 DocType: Purchase Receipt Item,Accepted Warehouse,Gudang Diterima
 DocType: Bank Reconciliation Detail,Posting Date,Penempatan Tarikh
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,No siri {0} tidak wujud
 DocType: Pricing Rule,Discount Percentage,Peratus diskaun
 DocType: Payment Reconciliation Invoice,Invoice Number,Nombor invois
-apps/erpnext/erpnext/hooks.py +54,Orders,Pesanan
+apps/erpnext/erpnext/hooks.py +55,Orders,Pesanan
 DocType: Leave Control Panel,Employee Type,Jenis Pekerja
 DocType: Employee Leave Approver,Leave Approver,Tinggalkan Pelulus
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Bahan Dipindahkan untuk Pembuatan
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% bahan-bahan yang dibilkan terhadap Pesanan Jualan ini
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Kemasukan Tempoh Penutup
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Susutnilai
+DocType: Account,Depreciation,Susutnilai
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Pembekal (s)
 DocType: Customer,Credit Limit,Had Kredit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Pilih jenis transaksi
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,Diminta Untuk
 DocType: Quotation Item,Against Doctype,Terhadap DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Jejaki Penghantaran Nota ini terhadap mana-mana Projek
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Akaun akar tidak boleh dihapuskan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Tunai bersih daripada Pelaburan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Akaun akar tidak boleh dihapuskan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Show Saham Penyertaan
 ,Is Primary Address,Adakah Alamat Utama
 DocType: Production Order,Work-in-Progress Warehouse,Kerja dalam Kemajuan Gudang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Rujukan # {0} bertarikh {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Rujukan # {0} bertarikh {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Mengurus Alamat
 DocType: Pricing Rule,Item Code,Kod Item
 DocType: Production Planning Tool,Create Production Orders,Buat Pesanan Pengeluaran
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,Catatan pengguna
 DocType: Lead,Market Segment,Segmen pasaran
 DocType: Employee Internal Work History,Employee Internal Work History,Pekerja Dalam Sejarah Kerja
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Penutup (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Penutup (Dr)
 DocType: Contact,Passive,Pasif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,No siri {0} tidak dalam stok
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Template cukai untuk menjual transaksi.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,Jumlah dibilkan
 DocType: Bank Reconciliation,Bank Reconciliation,Penyesuaian Bank
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dapatkan Maklumat Terbaru
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Permintaan bahan {0} dibatalkan atau dihentikan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Permintaan bahan {0} dibatalkan atau dihentikan
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Tambah rekod sampel beberapa
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Tinggalkan Pengurusan
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Kumpulan dengan Akaun
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Ketua akaun di bawah Liabiliti, di mana Keuntungan / Kerugian akan diberikan kad"
 DocType: Payment Tool,Against Vouchers,Terhadap Baucar
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Bantuan Pantas
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Jualan Tambahan
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} bajet untuk Akaun {1} terhadap Kos Pusat {2} akan berlebihan sebanyak {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Membeli nombor Perintah diperlukan untuk Perkara {0}
 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'
 ,Stock Projected Qty,Saham Unjuran Qty
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
 DocType: Sales Order,Customer's Purchase Order,Pesanan Pelanggan
 DocType: Warranty Claim,From Company,Daripada Syarikat
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Nilai atau Qty
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Tinggalkan Sekat Senarai Dibenarkan
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Anda akan menggunakannya untuk Login
 DocType: Sales Partner,Retailer,Peruncit
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit Untuk akaun perlu menjadi akaun Kunci Kira-kira
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Semua Jenis Pembekal
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +46,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 +93,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
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Berat kasar pakej. Biasanya berat bersih + pembungkusan berat badan yang ketara. (Untuk cetak)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peranan ini dibenarkan untuk menetapkan akaun beku dan mencipta / mengubahsuai entri perakaunan terhadap akaun beku
 DocType: Serial No,Is Cancelled,Apakah Dibatalkan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Penghantaran saya
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Penghantaran saya
 DocType: Journal Entry,Bill Date,Rang Undang-Undang Tarikh
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Walaupun terdapat beberapa Peraturan Harga dengan keutamaan tertinggi, keutamaan dalaman maka berikut digunakan:"
 DocType: Supplier,Supplier Details,Butiran Pembekal
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Panggilan
 DocType: Project,Total Costing Amount (via Time Logs),Jumlah Kos (melalui Time Log)
 DocType: Purchase Order Item Supplied,Stock UOM,Saham UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Pesanan Pembelian {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Pesanan Pembelian {0} tidak dikemukakan
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Unjuran
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},No siri {0} bukan milik Gudang {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: Sistem tidak akan memeriksa terlebih penghantaran dan lebih-tempahan untuk Perkara {0} sebagai kuantiti atau jumlah adalah 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: Sistem tidak akan memeriksa terlebih penghantaran dan lebih-tempahan untuk Perkara {0} sebagai kuantiti atau jumlah adalah 0
 DocType: Notification Control,Quotation Message,Sebut Harga Mesej
 DocType: Issue,Opening Date,Tarikh pembukaan
 DocType: Journal Entry,Remark,Catatan
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,Berkumpulan untuk Billing
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Rang Undang-undang yang dibangkitkan oleh Pembekal.
 DocType: POS Profile,Write Off Account,Tulis Off Akaun
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Tunai bersih daripada Operasi
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,contohnya VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Perkara 4
 DocType: Journal Entry Account,Journal Entry Account,Akaun Entry jurnal
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Tarikh Persaraan mesti lebih besar daripada Tarikh Menyertai
 DocType: Sales Invoice,Against Income Account,Terhadap Akaun Pendapatan
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Dihantar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Sasaran Wilayah
 DocType: Delivery Note,Transporter Info,Maklumat Transporter
@@ -2421,10 +2443,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nombor batch adalah wajib bagi Perkara {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Ini adalah orang jualan akar dan tidak boleh diedit.
 ,Stock Ledger,Saham Lejar
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Kadar: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Kadar: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Gaji Slip Potongan
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Pilih nod kumpulan pertama.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Tujuan mestilah salah seorang daripada {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Tujuan mestilah salah seorang daripada {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Isi borang dan simpannya
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Muat turun laporan yang mengandungi semua bahan-bahan mentah dengan status inventori terbaru mereka
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Komuniti Forum
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Syarikat (tidak Pelanggan atau Pembekal) induk.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Sila masukkan &#39;Jangkaan Tarikh Penghantaran&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota Penghantaran {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} bukan Nombor Kumpulan sah untuk Perkara {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Nota: Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Jika bayaran tidak dibuat terhadap mana-mana rujukan, membuat Journal Kemasukan secara manual."
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' dinyahupayakan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Hantar e-mel automatik ke Kenalan ke atas urus niaga Mengemukakan.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Qty tidak avalable dalam gudang {1} pada {2} {3}. Terdapat Kuantiti: {4}, Pemindahan Kuantiti: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Perkara 3
 DocType: Purchase Order,Customer Contact Email,Pelanggan Hubungi E-mel
 DocType: Sales Team,Contribution (%),Sumbangan (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Tanggungjawab
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Template
 DocType: Sales Person,Sales Person Name,Orang Jualan Nama
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Sebelum perdamaian
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,BOM Default
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Sila taip semula nama syarikat untuk mengesahkan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Jumlah Cemerlang AMT
 DocType: Time Log Batch,Total Hours,Jumlah Jam
 DocType: Journal Entry,Printing Settings,Tetapan Percetakan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit mesti sama dengan Jumlah Kredit. Perbezaannya ialah {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit mesti sama dengan Jumlah Kredit. Perbezaannya ialah {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotif
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Dari Penghantaran Nota
 DocType: Time Log,From Time,Dari Masa
 DocType: Notification Control,Custom Message,Custom Mesej
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Perbankan Pelaburan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Tunai atau Bank Akaun adalah wajib untuk membuat catatan pembayaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Tunai atau Bank Akaun adalah wajib untuk membuat catatan pembayaran
 DocType: Purchase Invoice,Price List Exchange Rate,Senarai Harga Kadar Pertukaran
 DocType: Purchase Invoice Item,Rate,Kadar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Pelatih
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","Peraturan Harga Multiple wujud dengan kriteria yang sama, sila menyelesaikan \ konflik dengan memberikan keutamaan. Peraturan Harga: {0}"
 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 +580,Issue Material,Isu Bahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Isu Bahan
 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
 DocType: Hub Settings,Access Token,Token Akses
 DocType: Sales Invoice Item,Serial No,No siri
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Sila masukkan Maintaince Butiran pertama
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Amaun Invois maksimum
 DocType: Purchase Invoice Item,Image View,Lihat imej
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Jumlah
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Perkara ini adalah Varian {0} (Template). Sifat-sifat akan disalin lebih dari template kecuali &#39;Tiada Salinan&#39; ditetapkan
 DocType: Account,Purchase User,Pembelian Pengguna
 DocType: Notification Control,Customize the Notification,Menyesuaikan Pemberitahuan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Aliran Tunai daripada Operasi
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Templat Alamat lalai tidak boleh dipadam
 DocType: Sales Invoice,Shipping Rule,Peraturan Penghantaran
 DocType: Journal Entry,Print Heading,Cetak Kepala
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Bahan mentah
 DocType: Leave Application,Follow via Email,Ikut melalui E-mel
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Amaun Cukai Selepas Jumlah Diskaun
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Tidak lalai BOM wujud untuk Perkara {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Sila pilih Penempatan Tarikh pertama
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial No Diperlukan untuk Perkara bersiri {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Terpakai Untuk (Jawatan)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Dalam Troli
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Membolehkan / melumpuhkan mata wang.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Perbelanjaan pos
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Hiburan &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,Tarikh perintah berulang akan berhenti
 DocType: Quality Inspection,Item Serial No,Item No Serial
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mesti dikurangkan dengan {1} atau anda perlu meningkatkan toleransi limpahan
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mesti dikurangkan dengan {1} atau anda perlu meningkatkan toleransi limpahan
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Jumlah Hadir
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Jam
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Perkara bersiri {0} tidak boleh dikemaskini \ menggunakan Saham Penyesuaian
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Pemindahan Bahan kepada Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Pemindahan Bahan kepada Pembekal
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Buat Sebut Harga
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Anda tiada kebenaran untuk meluluskan daun pada Tarikh Sekat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Semua barang-barang ini telah diinvois
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Semua barang-barang ini telah diinvois
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Boleh diluluskan oleh {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Penghantaran Peraturan Syarat
 DocType: BOM Replace Tool,The new BOM after replacement,The BOM baru selepas penggantian
 DocType: Features Setup,Point of Sale,Tempat Jualan
 DocType: Account,Tax,Cukai
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} bukan sah {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Dari Fail Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Dari Fail Produk
 DocType: Production Planning Tool,Production Planning Tool,Pengeluaran Alat Perancangan
 DocType: Quality Inspection,Report Date,Laporan Tarikh
 DocType: C-Form,Invoices,Invois
 DocType: Job Opening,Job Title,Tajuk Kerja
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Penerima
 DocType: Features Setup,Item Groups in Details,Kumpulan item dalam Butiran
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Kuantiti untuk pembuatan mesti lebih besar daripada 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Mula Point-of-Sale (POS)
@@ -2618,8 +2644,9 @@
 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: Pricing Rule,Customer Group,Kumpulan pelanggan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Akaun perbelanjaan adalah wajib bagi item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Akaun perbelanjaan adalah wajib bagi item {0}
 DocType: Item,Website Description,Laman Web Penerangan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Perubahan Bersih dalam Ekuiti
 DocType: Serial No,AMC Expiry Date,AMC Tarikh Tamat
 ,Sales Register,Jualan Daftar
 DocType: Quotation,Quotation Lost Reason,Sebut Harga Hilang Akal
@@ -2627,12 +2654,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ada apa-apa untuk mengedit.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Ringkasan untuk bulan ini dan aktiviti-aktiviti yang belum selesai
 DocType: Customer Group,Customer Group Name,Nama Kumpulan Pelanggan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Sifat-sifat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Dapatkan Item
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Sila masukkan Tulis Off Akaun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Dapatkan Item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Sila masukkan Tulis Off Akaun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Lepas Tarikh Perintah
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Buat Eksais Invois
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Akaun {0} tidak dimiliki oleh syarikat {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data projek-bijak tidak tersedia untuk Sebutharga
 DocType: Project,Expected End Date,Tarikh Jangkaan Tamat
 DocType: Appraisal Template,Appraisal Template Title,Penilaian Templat Tajuk
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Perdagangan
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Perdagangan
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Ibu Bapa Perkara {0} tidak perlu menjadi item Saham
 DocType: Cost Center,Distribution Id,Id pengedaran
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Perkhidmatan Awesome
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Nilai untuk Atribut {0} mesti berada dalam lingkungan {1} kepada {2} dalam kenaikan {3}
 DocType: Tax Rule,Sales,Jualan
 DocType: Stock Entry Detail,Basic Amount,Jumlah Asas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
 DocType: Leave Allocation,Unused leaves,Daun yang tidak digunakan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default Akaun Belum Terima
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Resit Pembelian
-DocType: Payment Reconciliation,Maximum Amount,Jumlah Maksimum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Bagaimana Harga Peraturan digunakan?
 DocType: Quality Inspection,Delivery Note No,Penghantaran Nota Tiada
 DocType: Company,Retail,Runcit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Pelanggan {0} tidak wujud
 DocType: Attendance,Absent,Tidak hadir
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle Produk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: rujukan tidak sah {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle Produk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Row {0}: rujukan tidak sah {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Membeli Cukai dan Caj Template
 DocType: Upload Attendance,Download Template,Muat turun Template
 DocType: GL Entry,Remarks,Catatan
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,Lembaran Kehadiran Bulanan
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Rekod tidak dijumpai
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Pusat Kos adalah wajib bagi Perkara {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Akaun {0} tidak aktif
 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
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Untung dan Rugi' akaun jenis {0} tidak dibenarkan dalam Kemasukan Permulaan
 DocType: Features Setup,Sales Discounts,Jualan Diskaun
 DocType: Hub Settings,Seller Country,Penjual Negara
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Terbitkan Item dalam Laman Web
 DocType: Authorization Rule,Authorization Rule,Peraturan kebenaran
 DocType: Sales Invoice,Terms and Conditions Details,Terma dan Syarat Butiran
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Spesifikasi
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Jualan Cukai dan Caj Template
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Pakaian &amp; Aksesori
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Bilangan Pesanan
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,Bil Jumlah
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Kuantiti yang ditentukan tidak sah untuk item {0}. Kuantiti perlu lebih besar daripada 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Permohonan untuk kebenaran.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Akaun dengan urus niaga yang sedia ada tidak boleh dihapuskan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Akaun dengan urus niaga yang sedia ada tidak boleh dihapuskan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Perbelanjaan Undang-undang
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Hari dalam bulan perintah automatik akan dijana contohnya 05, 28 dan lain-lain"
 DocType: Sales Invoice,Posting Time,Penempatan Masa
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,Pecahan
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Akaun: {0} dengan mata wang: {1} tidak boleh dipilih
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tarikh
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Akaun {0}: akaun Induk {1} bukan milik syarikat: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Akaun {0}: akaun Induk {1} bukan milik syarikat: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Berjaya memadam semua transaksi yang berkaitan dengan syarikat ini!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Seperti pada Tarikh
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Percubaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Gudang lalai adalah wajib bagi saham Perkara.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Gudang lalai adalah wajib bagi saham Perkara.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Masukkan Auto Kadar Senarai Harga jika hilang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Jumlah Amaun Dibayar
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Jumlah Bil (melalui Time Log)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Kami menjual Perkara ini
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id Pembekal
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Kuantiti harus lebih besar daripada 0
 DocType: Journal Entry,Cash Entry,Entry Tunai
 DocType: Sales Partner,Contact Desc,Hubungi Deskripsi
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Jenis daun seperti biasa, sakit dan lain-lain"
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tambah baris untuk menetapkan belanjawan tahunan pada Akaun.
 DocType: Buying Settings,Default Supplier Type,Default Jenis Pembekal
 DocType: Production Order,Total Operating Cost,Jumlah Kos Operasi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota: Perkara {0} memasuki beberapa kali
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Nota: Perkara {0} memasuki beberapa kali
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Semua Kenalan.
 DocType: Newsletter,Test Email Id,Id Ujian E-mel
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Singkatan Syarikat
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Semua Kumpulan Pelanggan
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Template cukai adalah wajib.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Akaun {0}: akaun Induk {1} tidak wujud
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Sementara
 DocType: Address,Preferred Billing Address,Alamat Bil pilihan
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,Senarai Harga Kadar Perkara-bijak
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} telah dihentikan
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} telah dihentikan
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
 DocType: Lead,Add to calendar on this date,Tambah ke kalendar pada tarikh ini
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Peraturan untuk menambah kos penghantaran.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Acara akan datang
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,Dari Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Perintah dikeluarkan untuk pengeluaran.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
 DocType: Hub Settings,Name Token,Nama Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Jualan Standard
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast satu gudang adalah wajib
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,Daripada Waranti
 DocType: BOM Replace Tool,Replace,Ganti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} terhadap Invois Jualan  {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Sila masukkan Unit keingkaran Langkah
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} terhadap Invois Jualan  {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Sila masukkan Unit keingkaran Langkah
 DocType: Purchase Invoice Item,Project Name,Nama Projek
 DocType: Supplier,Mention if non-standard receivable account,Sebut jika akaun belum terima tidak standard
 DocType: Journal Entry Account,If Income or Expense,Jika Pendapatan atau Perbelanjaan
 DocType: Features Setup,Item Batch Nos,Perkara Batch No.
 DocType: Stock Ledger Entry,Stock Value Difference,Nilai saham Perbezaan
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Sumber Manusia
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Aset Cukai
 DocType: BOM Item,BOM No,BOM Tiada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Purata bergerak
 DocType: BOM Replace Tool,The BOM which will be replaced,The BOM yang akan digantikan
 DocType: Account,Debit,Debit
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,Kos tambahan
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Akhir Tahun Kewangan Tarikh
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Tidak boleh menapis berdasarkan Baucer Tidak, jika dikumpulkan oleh Baucar"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Membuat Sebutharga Pembekal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Membuat Sebutharga Pembekal
 DocType: Quality Inspection,Incoming,Masuk
 DocType: BOM,Materials Required (Exploded),Bahan yang diperlukan (Meletup)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Mengurangkan Pendapatan untuk Cuti Tanpa Gaji (LWP)
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: No Siri {1} tidak sepadan dengan {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Cuti kasual
 DocType: Batch,Batch ID,ID Batch
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Nota: {0}
 ,Delivery Note Trends,Trend Penghantaran Nota
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ringkasan Minggu Ini
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mesti benda  yang Dibeli atau Sub-Kontrak di baris {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Purata. Kadar Membeli
 DocType: Task,Actual Time (in Hours),Masa sebenar (dalam jam)
 DocType: Employee,History In Company,Sejarah Dalam Syarikat
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Kuantiti jumlah Terbitan / Transfer {0} dalam Bahan Permintaan {1} tidak boleh lebih besar daripada kuantiti yang diminta {2} untuk Perkara {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Surat Berita
 DocType: Address,Shipping,Penghantaran
 DocType: Stock Ledger Entry,Stock Ledger Entry,Saham Lejar Entry
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,Tarikh akhir tempoh perintah semasa
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Membuat Surat Tawaran
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Pulangan
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Unit keingkaran Langkah untuk Variant mesti sama dengan Template
 DocType: Production Order Operation,Production Order Operation,Pengeluaran Operasi Pesanan
 DocType: Pricing Rule,Disable,Melumpuhkan
 DocType: Project Task,Pending Review,Sementara menunggu Review
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id Pelanggan
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Untuk Masa mesti lebih besar daripada Dari Masa
 DocType: Journal Entry Account,Exchange Rate,Kadar pertukaran
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Gudang {0}: akaun Ibu Bapa {1} tidak Bolong kepada syarikat {2}
 DocType: BOM,Last Purchase Rate,Kadar Pembelian lalu
 DocType: Account,Asset,Aset
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,Saham tersedia untuk Item Pembungkusan
 DocType: Item Variant,Item Variant,Perkara Varian
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Menetapkan Templat Alamat ini sebagai lalai kerana tidak ada default lain
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Pengurusan Kualiti
 DocType: Production Planning Tool,Filter based on customer,Filter berdasarkan pelanggan
 DocType: Payment Tool Detail,Against Voucher No,Terhadap Baucer Tiada
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,Seterusnya Hubungi
 DocType: Employee,Employment Type,Jenis pekerjaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Aset Tetap
+,Cash Flow,Aliran tunai
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Tempoh permohonan tidak boleh di dua rekod alocation
 DocType: Item Group,Default Expense Account,Akaun Perbelanjaan Default
 DocType: Employee,Notice (days),Notis (hari)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,Gudang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Cetak dan pegun
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Node kumpulan
-DocType: Payment Reconciliation,Minimum Amount,Jumlah Minimum
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Update Mendapat tempat Barangan
 DocType: Workstation,per hour,sejam
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Akaun untuk gudang (Inventori Kekal) yang akan diwujudkan di bawah Akaun ini.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak boleh dihapuskan kerana penyertaan saham lejar wujud untuk gudang ini.
 DocType: Company,Distribution,Pengagihan
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Amaun Dibayar
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Amaun Dibayar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Pengurus Projek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max diskaun yang dibenarkan untuk item: {0} adalah {1}%
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Sokongan
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Syarikat yang hilang dalam gudang {0}
 DocType: POS Profile,Terms and Conditions,Terma dan Syarat
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Tarikh perlu berada dalam Tahun Fiskal. Dengan mengandaikan Untuk Tarikh = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Tarikh perlu berada dalam Tahun Fiskal. Dengan mengandaikan Untuk Tarikh = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Di sini anda boleh mengekalkan ketinggian, berat badan, alahan, masalah kesihatan dan lain-lain"
 DocType: Leave Block List,Applies to Company,Terpakai kepada Syarikat
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Tidak boleh membatalkan kerana dikemukakan Saham Entry {0} wujud
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Sila masukkan Pembelian Terimaan
 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 +425,Transaction not allowed against stopped Production Order {0},Transaksi tidak dibenarkan terhadap Pengeluaran berhenti Perintah {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Persediaan pelayan masuk untuk id e-mel sokongan. (Contohnya support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Kekurangan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
 DocType: Salary Slip,Salary Slip,Slip Gaji
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tarikh Hingga' diperlukan
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Menjana slip pembungkusan untuk pakej yang akan dihantar. Digunakan untuk memberitahu jumlah pakej, kandungan pakej dan berat."
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Rekod pekerja.
 DocType: HR Settings,Payroll Settings,Tetapan Gaji
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Padankan Invois tidak berkaitan dan Pembayaran.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Meletakkan pesanan
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Meletakkan pesanan
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Akar tidak boleh mempunyai pusat kos ibu bapa
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Pilih Jenama ...
 DocType: Sales Invoice,C-Form Applicable,C-Borang Berkaitan
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,Tarikh Mula
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Memperuntukkan daun untuk suatu tempoh.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik di sini untuk mengesahkan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Akaun {0}: Anda tidak boleh menetapkan ia sendiri sebagai akaun induk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Akaun {0}: Anda tidak boleh menetapkan ia sendiri sebagai akaun induk
 DocType: Purchase Invoice Item,Price List Rate,Senarai Harga Kadar
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Menunjukkan &quot;Pada Saham&quot; atau &quot;Tidak dalam Saham&quot; berdasarkan saham yang terdapat di gudang ini.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Rang Undang-Undang Bahan (BOM)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,Jangkaan Tarikh Mula
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Buang item jika caj tidak berkenaan dengan perkara yang
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Contohnya. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Menerima
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Menerima
 DocType: Maintenance Visit,Fully Completed,Siap Sepenuhnya
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Lengkap
 DocType: Employee,Educational Qualification,Kelayakan pendidikan
 DocType: Workstation,Operating Costs,Kos operasi
 DocType: Employee Leave Approver,Employee Leave Approver,Pekerja Cuti Pelulus
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} telah berjaya ditambah ke senarai surat berita kami.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Tidak boleh mengaku sebagai hilang, kerana Sebutharga telah dibuat."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pembelian Master Pengurus
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Pengeluaran Pesanan {0} hendaklah dikemukakan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Pengeluaran Pesanan {0} hendaklah dikemukakan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Sila pilih Mula Tarikh dan Tarikh Akhir untuk Perkara {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Laporan Utama
 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
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,Jenis industri
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Sesuatu telah berlaku!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Amaran: Tinggalkan permohonan mengandungi tarikh blok berikut
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Jualan Invois {0} telah diserahkan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Jualan Invois {0} telah diserahkan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Tarikh Siap
 DocType: Purchase Invoice Item,Amount (Company Currency),Jumlah (Syarikat mata wang)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unit organisasi (jabatan) induk.
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,Serial No Kontrak Perkhidmatan tamat
 DocType: Item,Unit of Measure Conversion,Unit Langkah Penukaran
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Pekerja tidak boleh diubah
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Anda tidak boleh kredit dan debit akaun sama pada masa yang sama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Anda tidak boleh kredit dan debit akaun sama pada masa yang sama
 DocType: Naming Series,Help HTML,Bantuan HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Jumlah wajaran yang diberikan harus 100%. Ia adalah {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Peruntukan berlebihan {0} terlintas untuk Perkara {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Peruntukan berlebihan {0} terlintas untuk Perkara {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nama orang atau organisasi yang alamat ini kepunyaan.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Pembekal anda
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Tidak boleh ditetapkan sebagai Kalah sebagai Sales Order dibuat.
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,Tarikh Keluaran
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Tetapkan Pembekal untuk item {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Sila semak pilihan mata Multi untuk membolehkan akaun dengan mata wang lain
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Sila semak pilihan mata Multi untuk membolehkan akaun dengan mata wang lain
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Perkara: {0} tidak wujud dalam sistem
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Anda tiada kebenaran untuk menetapkan nilai Beku
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Anda tiada kebenaran untuk menetapkan nilai Beku
 DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan belum disatukan Penyertaan
+DocType: Payment Reconciliation,From Invoice Date,Dari Invois Tarikh
 DocType: Cost Center,Budgets,Belanjawan
-DocType: Employee,Emergency Contact Details,Butiran Hubungi Kecemasan
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Apa yang ia buat?
 DocType: Delivery Note,To Warehouse,Untuk Gudang
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Akaun {0} telah memasuki lebih daripada sekali untuk tahun fiskal {1}
 ,Average Commission Rate,Purata Kadar Suruhanjaya
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'Has Serial No' can not be 'Yes' for non-stock item,'Punyai Nombor Siri' tidak boleh 'Ya' untuk  benda bukan stok
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Kehadiran tidak boleh ditandakan untuk masa hadapan
 DocType: Pricing Rule,Pricing Rule Help,Peraturan Harga Bantuan
 DocType: Purchase Taxes and Charges,Account Head,Kepala Akaun
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Kemas kini kos tambahan untuk mengira kos mendarat barangan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
 DocType: Stock Entry,Total Value Difference (Out - In),Jumlah Perbezaan Nilai (Out - Dalam)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Kadar Pertukaran adalah wajib
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Row {0}: Kadar Pertukaran adalah wajib
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID pengguna tidak ditetapkan untuk Pekerja {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Dari Waranti Tuntutan
 DocType: Stock Entry,Default Source Warehouse,Default Sumber Gudang
 DocType: Item,Customer Code,Kod Pelanggan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Peringatan hari jadi untuk {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Sejak hari Perintah lepas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aset saham
@@ -3271,7 +3301,7 @@
 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
 DocType: Authorization Rule,Based On,Berdasarkan
 DocType: Sales Order Item,Ordered Qty,Mengarahkan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Perkara {0} dilumpuhkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Perkara {0} dilumpuhkan
 DocType: Stock Settings,Stock Frozen Upto,Saham beku Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Tempoh Dari dan Musim Ke tarikh wajib untuk berulang {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Aktiviti projek / tugasan.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Tulis Off Jumlah (Syarikat Mata Wang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
 DocType: Landed Cost Voucher,Landed Cost Voucher,Baucer Kos mendarat
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Sila set {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ulangi pada hari Bulan
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,Naik Kehadiran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM dan Pembuatan Kuantiti dikehendaki
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Range Penuaan 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Jumlah
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Jumlah
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM digantikan
 ,Sales Analytics,Jualan Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Tetapan Pembuatan
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Menubuhkan E-mel
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Sila masukkan mata wang lalai dalam Syarikat Induk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Peringatan Harian
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Konflik Peraturan Cukai dengan {0}
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,Dihasilkan Kuantiti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Jurutera
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Mencari Sub Dewan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Kod Item diperlukan semasa Row Tiada {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Kod Item diperlukan semasa Row Tiada {0}
 DocType: Sales Partner,Partner Type,Rakan Jenis
 DocType: Purchase Taxes and Charges,Actual,Sebenar
 DocType: Authorization Rule,Customerwise Discount,Customerwise Diskaun
 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 +263,Installation Note {0} has already been submitted,Pemasangan Nota {0} telah diserahkan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Pemasangan Nota {0} telah diserahkan
 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
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,Senarai Holiday berkenaan
 DocType: Employee,Cheque,Cek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Siri Dikemaskini
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Jenis Laporan adalah wajib
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Jenis Laporan adalah wajib
 DocType: Item,Serial Number Series,Nombor Siri Siri
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Gudang adalah wajib bagi saham Perkara {0} berturut-turut {1}
 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/public/js/setup_wizard.js +101,The First User: You,Pengguna Pertama: Anda
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Berjaya didamaikan
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Berjaya didamaikan
 DocType: Production Order,Planned End Date,Dirancang Tarikh Akhir
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Di mana item disimpan.
 DocType: Tax Rule,Validity,Kesahan
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,Kehadiran
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Menghantar tarikh dan masa untuk menghantar adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Menghantar tarikh dan masa untuk menghantar adalah wajib
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Template cukai untuk membeli transaksi.
 ,Item Prices,Harga Item
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Pesanan Belian.
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,Tarikh Semakan
 DocType: Purchase Invoice,Advance Payments,Bayaran Pendahuluan
 DocType: Purchase Taxes and Charges,On Net Total,Di Net Jumlah
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Gudang sasaran berturut-turut {0} mestilah sama dengan Perintah Pengeluaran
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Tiada kebenaran untuk menggunakan Alat Pembayaran
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Alamat-alamat E-mel Makluman' tidak dinyatakan untuk %s yang berulang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Bundarkan Akaun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Perbelanjaan pentadbiran
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Ibu Bapa Kumpulan Pelanggan
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Perubahan
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Perubahan
 DocType: Purchase Invoice,Contact Email,Hubungi E-mel
 DocType: Appraisal Goal,Score Earned,Skor Diperoleh
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",contohnya &quot;My Syarikat LLC&quot;
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,Berat kasar UOM
 DocType: Email Digest,Receivables / Payables,Penghutang / Pemiutang
 DocType: Delivery Note Item,Against Sales Invoice,Terhadap Invois Jualan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Akaun Kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Akaun Kredit
 DocType: Landed Cost Item,Landed Cost Item,Tanah Kos Item
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Menunjukkan nilai-nilai sifar
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Kuantiti item diperolehi selepas pembuatan / pembungkusan semula daripada kuantiti diberi bahan mentah
 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 +562,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Gudang Default
 DocType: Task,Actual End Date (via Time Logs),Tarikh Tamat Sebenar (melalui Log Masa)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Bajet tidak boleh diberikan terhadap Akaun Kumpulan {0}
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Rancang log masa di luar Waktu Workstation Kerja.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} telah diserahkan
 ,Items To Be Requested,Item Akan Diminta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Dapatkan lepas Kadar Pembelian
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Kadar bil berdasarkan Jenis Aktiviti (sejam)
 DocType: Company,Company Info,Maklumat Syarikat
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Syarikat E-mel ID tidak dijumpai, maka mel tidak dihantar"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Permohonan Dana (Aset)
 DocType: Production Planning Tool,Filter based on item,Filter berdasarkan item
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Akaun Debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Akaun Debit
 DocType: Fiscal Year,Year Start Date,Tahun Tarikh Mula
 DocType: Attendance,Employee Name,Nama Pekerja
 DocType: Sales Invoice,Rounded Total (Company Currency),Bulat Jumlah (Syarikat mata wang)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Tidak boleh Covert kepada Kumpulan kerana Jenis Akaun dipilih.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,Tidak boleh Covert kepada Kumpulan kerana Jenis Akaun dipilih.
 DocType: Purchase Common,Purchase Common,Pembelian Bersama
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} telah diubah suai. Sila muat semula.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Menghentikan pengguna daripada membuat Permohonan Cuti pada hari-hari berikut.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Dari Peluang
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Manfaat Pekerja
 DocType: Sales Invoice,Is POS,Adalah POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Makan kuantiti mestilah sama dengan kuantiti untuk Perkara {0} berturut-turut {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Kuantiti Diterima
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} tidak wujud
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Bil dinaikkan kepada Pelanggan.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projek
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} pelanggan ditambah
 DocType: Maintenance Schedule,Schedule,Jadual
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Tentukan Bajet untuk PTJ ini. Untuk menetapkan tindakan bajet, lihat &quot;Senarai Syarikat&quot;"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,Membaca 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Baucer Jenis
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
 DocType: Expense Claim,Approved,Diluluskan
 DocType: Pricing Rule,Price,Harga
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Pekerja lega pada {0} mesti ditetapkan sebagai &#39;kiri&#39;
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Catatan jurnal perakaunan.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Kuantiti Boleh didapati di Dari Gudang
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Sila pilih Rakam Pekerja pertama.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Majlis / Akaun tidak sepadan dengan {1} / {2} dalam {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Majlis / Akaun tidak sepadan dengan {1} / {2} dalam {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Untuk membuat Akaun Cukai
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Sila masukkan Akaun Perbelanjaan
 DocType: Account,Stock,Saham
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,Kontrak Tarikh akhir
 DocType: Sales Order,Track this Sales Order against any Project,Jejaki Pesanan Jualan ini terhadap mana-mana Projek
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pesanan jualan Tarik (menunggu untuk menyampaikan) berdasarkan kriteria di atas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Dari Sebutharga Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Dari Sebutharga Pembekal
 DocType: Deduction Type,Deduction Type,Potongan Jenis
 DocType: Attendance,Half Day,Hari separuh
 DocType: Pricing Rule,Min Qty,Min Qty
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,Transaksi Tarikh
 DocType: Production Plan Item,Planned Qty,Dirancang Kuantiti
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Jumlah Cukai
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Untuk Kuantiti (Dikilangkan Qty) adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Untuk Kuantiti (Dikilangkan Qty) adalah wajib
 DocType: Stock Entry,Default Target Warehouse,Default Gudang Sasaran
 DocType: Purchase Invoice,Net Total (Company Currency),Jumlah bersih (Syarikat mata wang)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Jenis Parti dan Parti hanya terpakai terhadap / akaun Belum Bayar Belum Terima
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,Kadar komisen
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Membuat Varian
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Permohonan cuti blok oleh jabatan.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Troli kosong
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Troli kosong
 DocType: Production Order,Actual Operating Cost,Kos Sebenar Operasi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Akar tidak boleh diedit.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Akar tidak boleh diedit.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Jumlah yang diperuntukkan tidak boleh lebih besar daripada jumlah unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Benarkan Pengeluaran pada Cuti
 DocType: Sales Order,Customer's Purchase Order Date,Pesanan Belian Tarikh Pelanggan
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Terma dan Syarat Template
 DocType: Serial No,Delivery Details,Penghantaran Details
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},PTJ diperlukan berturut-turut {0} dalam Cukai meja untuk jenis {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},PTJ diperlukan berturut-turut {0} dalam Cukai meja untuk jenis {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Mewujudkan Bahan Permintaan secara automatik jika kuantiti jatuh di bawah paras ini
 ,Item-wise Purchase Register,Perkara-bijak Pembelian Daftar
 DocType: Batch,Expiry Date,Tarikh Luput
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk menetapkan tahap pesanan semula, item perlu menjadi Perkara Pembelian atau Manufacturing Perkara"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk menetapkan tahap pesanan semula, item perlu menjadi Perkara Pembelian atau Manufacturing Perkara"
 ,Supplier Addresses and Contacts,Alamat Pembekal dan Kenalan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Sila pilih Kategori pertama
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Induk projek.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Separuh Hari)
 DocType: Supplier,Credit Days,Hari Kredit
 DocType: Leave Type,Is Carry Forward,Apakah Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Dapatkan Item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Rang Undang-Undang Bahan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Jenis Parti dan Parti diperlukan untuk / akaun Dibayar Terima {1}
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,Sebab Berhenti
 DocType: Expense Claim Detail,Sanctioned Amount,Jumlah dibenarkan
 DocType: GL Entry,Is Opening,Adalah Membuka
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debit kemasukan tidak boleh dikaitkan dengan {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Akaun {0} tidak wujud
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debit kemasukan tidak boleh dikaitkan dengan {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Akaun {0} tidak wujud
 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 1d454e3..0169703 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,လူသုံးကုန်ထုတ်ကုန်ပစ္စည်းများ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,ပါတီ Type ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Item,Customer Items,customer ပစ္စည်းများ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} တစ်ဦးလယ်ဂျာမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} တစ်ဦးလယ်ဂျာမဖွစျနိုငျ
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.com မှ Item ထုတ်ဝေ
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,အီးမေးလ်အသိပေးချက်များ
 DocType: Item,Default Unit of Measure,တိုင်း၏ default ယူနစ်
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,customer ဆက်သွယ်ရန်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,ပစ္စည်းတောင်းဆိုမှုကနေ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,ပစ္စည်းတောင်းဆိုမှုကနေ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,ယောဘသည်လျှောက်ထားသူ
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,နောက်ထပ်ရလဒ်များမရှိပါ။
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,ဒီ option ကိုသူတို့ရဲ့ code ကိုအသုံးအပေါ်အခြေခံပြီး 1. ဖောက်သည်ပညာရှိသောသူကို item code ကိုထိန်းသိမ်းရန်နှင့်သူတို့ကိုရှာဖွေစေ
 DocType: Mode of Payment Account,Mode of Payment Account,ငွေပေးချေမှုရမည့်အကောင့်၏ Mode ကို
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Show ကို Variant
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,အရေအတွက်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,အရေအတွက်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ချေးငွေများ (စိစစ်)
 DocType: Employee Education,Year of Passing,Pass ၏တစ်နှစ်တာ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ကုန်ပစ္စည်းလက်ဝယ်ရှိ
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ကျန်းမာရေးစောင့်ရှောက်မှု
 DocType: Purchase Invoice,Monthly,လစဉ်
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ငွေပေးချေမှုအတွက်နှောင့်နှေး (နေ့ရက်များ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,ဝယ်ကုန်စာရင်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,ဝယ်ကုန်စာရင်း
 DocType: Maintenance Schedule Item,Periodicity,ကာလ
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,အီးမေးလ်လိပ်စာ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} လိုအပ်သည်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ကာကွယ်မှု
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ရမှတ် (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},row {0}: {1} {2} {3} နှင့်အတူလိုက်ဖက်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},row {0}: {1} {2} {3} နှင့်အတူလိုက်ဖက်ပါဘူး
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,row # {0}:
 DocType: Delivery Note,Vehicle No,မော်တော်ယာဉ်မရှိပါ
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,စျေးနှုန်း List ကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,စျေးနှုန်း List ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Production Order Operation,Work In Progress,တိုးတက်မှုများတွင်အလုပ်
 DocType: Employee,Holiday List,အားလပ်ရက်များစာရင်း
 DocType: Time Log,Time Log,အချိန်အထဲ
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,တူညီသော Company ကိုတစ်ကြိမ်ထက်ပိုပြီးသို့ ဝင်. ဖြစ်ပါတယ်
 DocType: Employee,Married,အိမ်ထောင်သည်
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} ဘို့ခွင့်မပြု
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
 DocType: Payment Reconciliation,Reconcile,ပြန်လည်သင့်မြတ်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ကုန်စုံ
 DocType: Quality Inspection Reading,Reading 1,1 Reading
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ဘဏ်မှ Entry &#39;ပါစေ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ပင်စင်ရန်ပုံငွေ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,အကောင့်အမျိုးအစားကိုဂိုဒေါင်လျှင်ဂိုဒေါင်မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,အကောင့်အမျိုးအစားကိုဂိုဒေါင်လျှင်ဂိုဒေါင်မသင်မနေရ
 DocType: SMS Center,All Sales Person,အားလုံးသည်အရောင်းပုဂ္ဂိုလ်
 DocType: Lead,Person Name,လူတစ်ဦးအမည်
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","အမိန့်ထပ်တလဲလဲလျှင်စစ်ဆေး, ထပ်တလဲလဲရပ်တန့်သို့မဟုတ်သင့်လျော် End Date ကိုတင် uncheck"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,စိတ်ဝင်စား
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,ပစ္စည်း၏ဘီလ်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,ဖွင့်ပွဲ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},{0} ကနေ {1} မှ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},{0} ကနေ {1} မှ
 DocType: Item,Copy From Item Group,Item အုပ်စု မှစ. မိတ္တူ
 DocType: Journal Entry,Opening Entry,Entry &#39;ဖွင့်လှစ်
 DocType: Stock Entry,Additional Costs,အပိုဆောင်းကုန်ကျစရိတ်
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုအုပ်စုအဖြစ်ပြောင်းလဲမရနိုင်ပါ။
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုအုပ်စုအဖြစ်ပြောင်းလဲမရနိုင်ပါ။
 DocType: Lead,Product Enquiry,ထုတ်ကုန်ပစ္စည်း Enquiry
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,ပထမဦးဆုံးကုမ္ပဏီတစ်ခုကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,Target ကတွင်
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target ကတွင်
 DocType: BOM,Total Cost,စုစုပေါင်းကုန်ကျစရိတ်
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,လုပ်ဆောင်ချက်အထဲ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,item {0} system ကိုအတွက်မတည်ရှိပါဘူးသို့မဟုတ်သက်တမ်း
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,item {0} တစ်ဦးဝယ်ယူ Item ဖြစ်ရမည်
 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 +444,Item {0} is not active or end of life has been reached,item {0} တက်ကြွသို့မဟုတ်အသက်၏အဆုံးသည်မဖြစ်သေးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,item {0} တက်ကြွသို့မဟုတ်အသက်၏အဆုံးသည်မဖြစ်သေးရောက်ရှိခဲ့သည်
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,အရောင်းပြေစာ Submitted ပြီးနောက် updated လိမ့်မည်။
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,HR Module သည် Settings ကို
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,ထိုစစ်ဆင်ရေး၏အသေးစိတျထုတျဆောင်သွားကြ၏။
 DocType: Serial No,Maintenance Status,ပြုပြင်ထိန်းသိမ်းမှုနဲ့ Status
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,ပစ္စည်းများနှင့်စျေးနှုန်းများ
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},နေ့စွဲကနေဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းတွင်သာဖြစ်သင့်သည်။ နေ့စွဲ မှစ. ယူဆ = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},နေ့စွဲကနေဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းတွင်သာဖြစ်သင့်သည်။ နေ့စွဲ မှစ. ယူဆ = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,သင်စိစစ်ရေးအတွက်ဘယ်သူကိုများအတွက်န်ထမ်းကိုရွေးချယ်ပါ။
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Center က {0} ကုန်ကျကုမ္ပဏီ {1} ပိုင်ပါဘူး
 DocType: Customer,Individual,တစ်ဦးချင်း
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,ဘဏ္ဍာရေးကနေ Net ကငွေ
 DocType: Lead,Address & Contact,လိပ်စာ &amp; ဆက်သွယ်ရန်
 DocType: Leave Allocation,Add unused leaves from previous allocations,ယခင်ခွဲတမ်းအနေဖြင့်အသုံးမပြုတဲ့အရွက် Add
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Next ကိုထပ်တလဲလဲ {0} {1} အပေါ်နေသူများကဖန်တီးလိမ့်မည်
@@ -221,6 +222,7 @@
 ,Contact Name,ဆက်သွယ်ရန်အမည်
 DocType: Production Plan Item,SO Pending Qty,SO Pend Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,အထက်တွင်ဖော်ပြခဲ့သောစံသတ်မှတ်ချက်များသည်လစာစလစ်ဖန်တီးပေးပါတယ်။
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,ဖော်ပြချက်ပေးအပ်မရှိပါ
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ဝယ်ယူတောင်းဆိုခြင်း။
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,ကိုသာရွေးချယ်ထားထွက်ခွာခွင့်ပြုချက်ဒီထွက်ခွာလျှောက်လွှာတင်သွင်းနိုင်
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,နေ့စွဲ Relieving အတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,item ဝက်ဘ်ဆိုက် Specification
 DocType: Payment Tool,Reference No,ကိုးကားစရာမရှိပါ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Leave Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,နှစ်ပတ်လည်
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး Item
 DocType: Stock Entry,Sales Invoice No,အရောင်းပြေစာမရှိ
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,ပေးသွင်း Type
 DocType: Item,Publish in Hub,Hub အတွက်ထုတ်ဝေ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,material တောင်းဆိုခြင်း
 DocType: Bank Reconciliation,Update Clearance Date,Update ကိုရှင်းလင်းရေးနေ့စွဲ
 DocType: Item,Purchase Details,အသေးစိတ်ဝယ်ယူ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},item {0} ဝယ်ယူခြင်းအမိန့် {1} အတွက် &#39;&#39; ကုန်ကြမ်းထောက်ပံ့ &#39;&#39; table ထဲမှာမတှေ့
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},item {0} ဝယ်ယူခြင်းအမိန့် {1} အတွက် &#39;&#39; ကုန်ကြမ်းထောက်ပံ့ &#39;&#39; table ထဲမှာမတှေ့
 DocType: Employee,Relation,ဆှေမြိုး
 DocType: Shipping Rule,Worldwide Shipping,Worldwide မှသဘောင်္တင်ခ
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Customer များအနေဖြင့်အတည်ပြုပြောဆိုသည်အမိန့်။
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,အကြံပြုချက်များ
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,ဒီနယ်မြေတွေကိုအပေါ် Item Group မှပညာဘတ်ဂျက် Set လုပ်ပါ။ ကိုလည်းသင်ဖြန့်ဖြူး setting ကြောင့်ရာသီပါဝင်နိုင်ပါသည်။
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},ဂိုဒေါင် {0} သည်မိဘအကောင့်ကိုရိုက်ထည့်ပါအုပ်စုတစ်စု ကျေးဇူးပြု.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} ထူးချွန်ပမာဏ {2} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျဆန့်ကျင်ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,ဇယား Generate
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,နောက်ဆုံး
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,max 5 ဇာတ်ကောင်
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,စာရင်းထဲတွင်ပထမဦးဆုံးထွက်ခွာခွင့်ပြုချက်ကို default ထွက်ခွာခွင့်ပြုချက်အဖြစ်သတ်မှတ်ကြလိမ့်မည်
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Learn
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ထမ်းနှုန်းဖြင့်လုပ်ဆောင်ချက်ကုန်ကျစရိတ်
 DocType: Accounts Settings,Settings for Accounts,ငွေစာရင်းသည် Settings ကို
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,အရောင်းပုဂ္ဂိုလ် Tree Manage ။
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,multi ငွေကြေးစနစ်
 DocType: Payment Reconciliation Invoice,Invoice Type,ကုန်ပို့လွှာ Type
 DocType: Sales Invoice Item,Delivery Note,Delivery မှတ်ချက်
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,အခွန်ကိုတည်ဆောက်ခြင်း
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,အခွန်ကိုတည်ဆောက်ခြင်း
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,သင်ကထွက်ခွာသွားပြီးနောက်ငွေပေးချေမှုရမည့် Entry modified သိရသည်။ တဖန်ဆွဲပေးပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,ယခုရက်သတ္တပတ်များနှင့် Pend လှုပ်ရှားမှုများအကျဉ်းချုပ်
 DocType: Workstation,Rent Cost,ငှားရန်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,လနှင့်တစ်နှစ်ကို select ကျေးဇူးပြု.
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, Delivery မှတ်ချက်, ဝယ်ယူခြင်းပြေစာ, ထုတ်လုပ်မှုအမိန့်, ဝယ်ယူခြင်းအမိန့်, ဝယ်ယူ Receipt, အရောင်းပြေစာ, အရောင်းအမိန့်, စတော့အိတ် Entry, Timesheet အတွက်ရရှိနိုင်"
 DocType: Item Tax,Tax Rate,အခွန်နှုန်း
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Item ကိုရွေးပါ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","item: {0} သုတ်ပညာစီမံခန့်ခွဲ, \ စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးကို အသုံးပြု. ပြန်. မရနိုင်ပါ, အစားစတော့အိတ် Entry &#39;ကိုသုံး"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},row # {0}: Batch မရှိပါ {1} {2} အဖြစ်အတူတူဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Non-Group ကမှ convert
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ဝယ်ယူခြင်းပြေစာတင်သွင်းရမည်
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ဆေးဘက်ဆိုင်ရာ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ဆုံးရှုံးရသည့်အကြောင်းရင်း
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation နှင့်အားလပ်ရက်များစာရင်းနှုန်းအဖြစ်အောက်ပါရက်စွဲများအပေါ်ပိတ်ထားသည်: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,အခွင့်အလမ်းများ
 DocType: Employee,Single,တခုတည်းသော
 DocType: Issue,Attachment,attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,ဘဏ္ဍာငွေအရအသုံး Group ကကုန်ကျစရိတ် Center ကမဘို့ရာခန့်မရနိုင်ပါ
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,အားလပ်ရက်မာစတာ။
 DocType: Material Request Item,Required Date,လိုအပ်သောနေ့စွဲ
 DocType: Delivery Note,Billing Address,ကျသင့်ငွေတောင်းခံလွှာပေးပို့မည့်လိပ်စာ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Item Code ကိုရိုက်ထည့်ပေးပါ။
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Item Code ကိုရိုက်ထည့်ပေးပါ။
 DocType: BOM,Costing,ကုန်ကျ
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","checked အကယ်. ထားပြီးပုံနှိပ် Rate / ပုံနှိပ်ပမာဏတွင်ထည့်သွင်းသကဲ့သို့, အခွန်ပမာဏကိုထည့်သွင်းစဉ်းစားလိမ့်မည်"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,စုစုပေါင်း Qty
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,ဂိုဒေါင်ပစ္စည်းတောင်းဆိုမှုမွောကျလိမျ့မညျအရာအဘို့အရိုက်ထည့်ပေးပါ
 DocType: Production Order,Additional Operating Cost,နောက်ထပ် Operating ကုန်ကျစရိတ်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,အလှကုန်
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
 DocType: Shipping Rule,Net Weight,အသားတင်အလေးချိန်
 DocType: Employee,Emergency Phone,အရေးပေါ်ဖုန်း
 ,Serial No Warranty Expiry,serial မရှိပါအာမခံသက်တမ်းကုန်ဆုံး
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,increment 0 င်မဖွစျနိုငျ
 DocType: Production Planning Tool,Material Requirement,ပစ္စည်းလိုအပ်ချက်
 DocType: Company,Delete Company Transactions,ကုမ္ပဏီငွေကြေးကိစ္စရှင်းလင်းမှု Delete
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,item {0} Item ဝယ်ယူမဟုတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,item {0} Item ဝယ်ယူမဟုတ်
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} &#39;&#39; အမိန့်ကြော်ငြာစာ \ Email လိပ်စာ &#39;&#39; တစ်မမှန်ကန်တဲ့အီးမေးလ်လိပ်စာဖြစ်ပါသည်
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,စုစုပေါင်း Billing ဒီတစ်နှစ်တာ:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ Edit ကိုအခွန်နှင့်စွပ်စွဲချက် Add
 DocType: Purchase Invoice,Supplier Invoice No,ပေးသွင်းပြေစာမရှိ
 DocType: Territory,For reference,ကိုးကားနိုင်ရန်
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),(Cr) ပိတ်ပစ်
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),(Cr) ပိတ်ပစ်
 DocType: Serial No,Warranty Period (Days),အာမခံကာလ (Days)
 DocType: Installation Note Item,Installation Note Item,Installation မှတ်ချက် Item
 ,Pending Qty,ဆိုင်းငံ့ထား Qty
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** လစဉ်ဖြန့်ဖြူး ** သင်သည်သင်၏စီးပွားရေးလုပ်ငန်းအတွက်ရာသီရှိပါကသင်လအတွင်းအနှံ့သင့်ရဲ့ဘတ်ဂျက်ဖြန့်ဝေကူညီပေးသည်။ , ဒီဖြန့်ဖြူးသုံးပြီးဘတ်ဂျက်ဖြန့်ဖြူးအတွက် ** ကုန်ကျစရိတ် Center မှာ ** ဒီ ** လစဉ်ဖြန့်ဖြူးတင်ထားရန် **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,ထိုပြေစာ table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,ထိုပြေစာ table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,ပထမဦးဆုံးကုမ္ပဏီနှင့်ပါတီ Type ကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,ဘဏ္ဍာရေး / စာရင်းကိုင်တစ်နှစ်။
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ဝမ်းနည်းပါတယ်, Serial အမှတ်ပေါင်းစည်းမရနိုင်ပါ"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,စီမံကိန်းရဲ့ Task
 ,Lead Id,ခဲ Id
 DocType: C-Form Invoice Detail,Grand Total,စုစုပေါင်း
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုထက် သာ. ကြီးမြတ်မဖြစ်သင့်
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုထက် သာ. ကြီးမြတ်မဖြစ်သင့်
 DocType: Warranty Claim,Resolution,resolution
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},ကယ်နှုတ်တော်မူ၏: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},ကယ်နှုတ်တော်မူ၏: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,ပေးဆောင်ရမည့်အကောင့်
 DocType: Sales Order,Billing and Delivery Status,ငွေတောင်းခံနှင့်ပေးပို့ခြင်းနဲ့ Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,repeat Customer များ
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,စျေးနှုန်းရန်
 DocType: Lead,Middle Income,အလယျပိုငျးဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ဖွင့်ပွဲ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,ခွဲဝေငွေပမာဏအနုတ်လက္ခဏာမဖြစ်နိုင်
 DocType: Purchase Order Item,Billed Amt,Bill Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,စတော့ရှယ်ယာ entries တွေကိုဖန်ဆင်းထားတဲ့ဆန့်ကျင်နေတဲ့ယုတ္တိဂိုဒေါင်။
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ထုတ်လုပ်မှုအမိန့်မသင်မနေရဖြစ်ပါသည်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,အဆိုပြုချက်ကို Writing
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,နောက်ထပ်အရောင်းပုဂ္ဂိုလ် {0} တူညီသောန်ထမ်းက id နှင့်အတူတည်ရှိ
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},{4} {5} အတွက် {2} {3} အပေါ်ဂိုဒေါင် {1} အတွက် Item {0} သည် negative စတော့အိတ်အမှား ({6})
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},{4} {5} အတွက် {2} {3} အပေါ်ဂိုဒေါင် {1} အတွက် Item {0} သည် negative စတော့အိတ်အမှား ({6})
 DocType: Fiscal Year Company,Fiscal Year Company,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကုမ္ပဏီ
 DocType: Packing Slip Item,DN Detail,ဒန Detail
 DocType: Time Log,Billed,Bill
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,Default အနေနဲ့ကုန်ကျနှုန်း
 DocType: Maintenance Schedule,Maintenance Schedule,ပြုပြင်ထိန်းသိမ်းမှုဇယား
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","ထိုအခါ Pricing နည်းဥပဒေများဖောက်သည်, ဖောက်သည်အုပ်စု, နယ်မြေတွေကို, ပေးသွင်း, ပေးသွင်းရေးထည့်ပြီးကင်ပိန်းစသည်တို့ကိုအရောင်း Partner အပေါ်အခြေခံပြီးထုတ် filtered နေကြတယ်"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Inventory ထဲမှာပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Employee,Passport Number,နိုင်ငံကူးလက်မှတ်နံပါတ်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager က
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,ဝယ်ယူခြင်းပြေစာထဲကနေ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,အလားတူတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,ဝယ်ယူခြင်းပြေစာထဲကနေ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,အလားတူတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
 DocType: SMS Settings,Receiver Parameter,receiver Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;&#39; တွင် အခြေခံ. &#39;နဲ့&#39; Group မှဖြင့် &#39;&#39; အတူတူမဖွစျနိုငျ
 DocType: Sales Person,Sales Person Targets,အရောင်းပုဂ္ဂိုလ်ပစ်မှတ်များ
 DocType: Production Order Operation,In minutes,မိနစ်
 DocType: Issue,Resolution Date,resolution နေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
 DocType: Selling Settings,Customer Naming By,အားဖြင့်ဖောက်သည် Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Group ကိုကူးပြောင်း
 DocType: Activity Cost,Activity Type,လုပ်ဆောင်ချက်ကအမျိုးအစား
@@ -534,7 +538,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} ပြေစာအသေးစိတ် table ထဲမှာမတှေ့
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} ပြေစာအသေးစိတ် table ထဲမှာမတှေ့
 DocType: Company,Round Off Cost Center,ကုန်ကျစရိတ် Center ကပိတ် round
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 DocType: Material Request,Material Transfer,ပစ္စည်းလွှဲပြောင်း
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,ရောင်းအားကို item ကိုခြေရာခံနှင့်၎င်းတို့၏အမှတ်စဉ် nos အပေါ်အခြေခံပြီးစာရွက်စာတမ်းများဝယ်ယူရန်။ ဤသည်ကိုလည်းထုတ်ကုန်၏အာမခံအသေးစိတ်အချက်အလက်များကိုခြေရာခံရန်အသုံးပြုနိုင်သည်။
 DocType: Purchase Receipt Item Supplied,Current Stock,လက်ရှိစတော့အိတ်
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,ပယ်ချဂိုဒေါင် regected တဲ့ item ကိုဆန့်ကျင်မသင်မနေရ
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Total ကုမ္ပဏီငွေတောင်းခံသည်ယခုနှစ်
 DocType: Account,Expenses Included In Valuation,အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်တွင်ထည့်သွင်းကုန်ကျစရိတ်
 DocType: Employee,Provide email id registered in company,ကုမ္ပဏီမှတ်ပုံတင်အီးမေးလ်က id ပေး
 DocType: Hub Settings,Seller City,ရောင်းချသူစီးတီး
 DocType: Email Digest,Next email will be sent on:,Next ကိုအီးမေးလ်အပေါ်ကိုစလှေတျပါလိမ့်မည်:
 DocType: Offer Letter Term,Offer Letter Term,ပေးစာ Term ကိုပူဇော်
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,item မျိုးကွဲရှိပါတယ်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,item မျိုးကွဲရှိပါတယ်။
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,သစ်ပင်ကို Type
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 DocType: Mode of Payment Account,Default Account,default အကောင့်
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,အခွင့်အလမ်းများခဲကနေလုပ်ပါကခဲသတ်မှတ်ရမည်
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,အပတ်စဉ်ထုတ်ပယ်သောနေ့ရက်ကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Production Order Operation,Planned End Time,စီစဉ်ထားသည့်အဆုံးအချိန်
 ,Sales Person Target Variance Item Group-Wise,အရောင်းပုဂ္ဂိုလ် Target ကကှဲလှဲ Item Group မှ-ပညာရှိ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုလယ်ဂျာမှပြောင်းလဲမပြနိုင်
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုလယ်ဂျာမှပြောင်းလဲမပြနိုင်
 DocType: Delivery Note,Customer's Purchase Order No,customer ရဲ့ဝယ်ယူခြင်းအမိန့်မရှိပါ
 DocType: Employee,Cell Number,cell အရေအတွက်
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,generated auto ပစ္စည်းတောင်းဆိုမှုများ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ဆုံးရှုံး
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,သင်ကကော်လံ &#39;&#39; ဂျာနယ် Entry &#39;ဆန့်ကျင်&#39; &#39;အတွက်လက်ရှိဘောက်ချာမဝင်နိုင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,သင်ကကော်လံ &#39;&#39; ဂျာနယ် Entry &#39;ဆန့်ကျင်&#39; &#39;အတွက်လက်ရှိဘောက်ချာမဝင်နိုင်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,စွမ်းအင်ဝန်ကြီးဌာန
 DocType: Opportunity,Opportunity From,မှစ. အခွင့်အလမ်း
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,လစဉ်လစာကြေငြာချက်။
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: {1} အမျိုးအစား {0} မှစ.
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,row {0}: ကူးပြောင်းခြင်း Factor မသင်မနေရ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,စာရင်းကိုင် Entries အရွက်ဆုံမှတ်များဆန့်ကျင်စေနိုင်ပါတယ်။ အဖွဲ့တွေဆန့်ကျင် entries ခွင့်ပြုမထားပေ။
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,ဒါကြောင့်အခြား BOMs နှင့်အတူဆက်စပ်အဖြစ် BOM ရပ်ဆိုင်းနိုင်သို့မဟုတ်ပယ်ဖျက်ခြင်းနိုင်ဘူး
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,ဒါကြောင့်အခြား BOMs နှင့်အတူဆက်စပ်အဖြစ် BOM ရပ်ဆိုင်းနိုင်သို့မဟုတ်ပယ်ဖျက်ခြင်းနိုင်ဘူး
 DocType: Opportunity,Maintenance,ပြုပြင်ထိန်းသိမ်းမှု
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Item {0} လိုအပ်ဝယ်ယူ Receipt နံပါတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Item {0} လိုအပ်ဝယ်ယူ Receipt နံပါတ်
 DocType: Item Attribute Value,Item Attribute Value,item Attribute Value တစ်ခု
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,အရောင်းစည်းရုံးလှုံ့ဆော်မှုများ။
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
 DocType: Employee,Family Background,မိသားစုနောက်ခံသမိုင်း
 DocType: Process Payroll,Send Email,အီးမေးလ်ပို့ပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,အဘယ်သူမျှမခွင့်ပြုချက်
 DocType: Company,Default Bank Account,default ဘဏ်မှအကောင့်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ပါတီအပေါ်အခြေခံပြီး filter မှပထမဦးဆုံးပါတီ Type ကိုရွေးပါ
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,ပိုမိုမြင့်မားသော weightage နှင့်အတူပစ္စည်းများပိုမိုမြင့်မားပြသပါလိမ့်မည်
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,ငါ့အငွေတောင်းခံလွှာ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,ငါ့အငွေတောင်းခံလွှာ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,ဝန်ထမ်းမျှမတွေ့ပါ
 DocType: Purchase Order,Stopped,ရပ်တန့်
 DocType: Item,If subcontracted to a vendor,တစ်ရောင်းချသူမှ subcontracted မယ်ဆိုရင်
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,အခုတော့ Send
 ,Support Analytics,ပံ့ပိုးမှု Analytics
 DocType: Item,Website Warehouse,website ဂိုဒေါင်
+DocType: Payment Reconciliation,Minimum Invoice Amount,နိမ့်ဆုံးပမာဏပြေစာ
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","အော်တိုကုန်ပို့လွှာ 05, 28 စသည်တို့ကိုဥပမာ generated လိမ့်မည်ဟူသောရက်နေ့တွင်လ၏နေ့"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ရမှတ်ထက်လျော့နည်းသို့မဟုတ် 5 မှတန်းတူဖြစ်ရမည်
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form တွင်မှတ်တမ်းများ
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;Point သို့ရောင်းရငွေ၏&quot; features တွေ enable လုပ်ဖို့
 DocType: Bin,Moving Average Rate,Moving ပျမ်းမျှနှုန်း
 DocType: Production Planning Tool,Select Items,ပစ္စည်းများကိုရွေးပါ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} ဘီလ် {1} ဆန့်ကျင် {2} ရက်စွဲပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} ဘီလ် {1} ဆန့်ကျင် {2} ရက်စွဲပါ
 DocType: Maintenance Visit,Completion Status,ပြီးစီးနဲ့ Status
 DocType: Sales Invoice Item,Target Warehouse,Target ကဂိုဒေါင်
 DocType: Item,Allow over delivery or receipt upto this percent,ဒီရာခိုင်နှုန်းအထိပေးပို့သို့မဟုတ်လက်ခံရရှိကျော် Allow
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,အလိုအလျှောက်ငွေကြေးလွှဲပြောင်းမှုမှာတင်သွင်းခဲ့တဲ့အပေါ်သတင်းစကား compose ။
 DocType: Production Order,Item To Manufacture,ထုတ်လုပ်ခြင်းရန် item
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} {2} အဆင့်အတန်းဖြစ်ပါသည်
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,ငွေပေးချေမှုရမည့်ရန်အမိန့်ကိုဝယ်ယူရန်
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,ငွေပေးချေမှုရမည့်ရန်အမိန့်ကိုဝယ်ယူရန်
 DocType: Sales Order Item,Projected Qty,စီမံကိန်း Qty
 DocType: Sales Invoice,Payment Due Date,ငွေပေးချေမှုရမည့်ကြောင့်နေ့စွဲ
 DocType: Newsletter,Newsletter Manager,သတင်းလွှာ Manager က
@@ -704,7 +709,7 @@
 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 တစ်ခု
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,point-of-Sale
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","အကောင့်ဖွင့်ချိန်ခွင်ပြီးသားချေးငွေအတွက်, သင်တင်ထားရန်ခွင့်မပြုခဲ့ကြပါတယ် &#39;&#39; Debit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","အကောင့်ဖွင့်ချိန်ခွင်ပြီးသားချေးငွေအတွက်, သင်တင်ထားရန်ခွင့်မပြုခဲ့ကြပါတယ် &#39;&#39; Debit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;"
 DocType: Account,Balance must be,ချိန်ခွင်ဖြစ်ရမည်
 DocType: Hub Settings,Publish Pricing,စျေးနှုန်းများထုတ်ဝေ
 DocType: Notification Control,Expense Claim Rejected Message,စရိတ်တောင်းဆိုမှုများသတင်းစကားကိုငြင်းပယ်
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,ငွေကြေးလဲလှယ်မှုနှုန်းမာစတာ။
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,ပထမဦးဆုံး Document အမျိုးအစားကိုရွေးချယ်ပါ
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ဒီ Maintenance ခရီးစဉ်ပယ်ဖျက်မီပစ္စည်းလည်ပတ်သူ {0} Cancel
 DocType: Salary Slip,Leave Encashment Amount,Encashment ငွေပမာဏ Leave
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,default ပေးဆောင် Accounts ကို
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,ဝန်ထမ်း {0} တက်ကြွမဟုတ်ပါဘူးသို့မဟုတ်မတည်ရှိပါဘူး
 DocType: Features Setup,Item Barcode,item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,item Variant {0} updated
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,item Variant {0} updated
 DocType: Quality Inspection Reading,Reading 6,6 Reading
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ဝယ်ယူခြင်းပြေစာကြိုတင်ထုတ်
 DocType: Address,Shop,ကုန်ဆိုင်
 DocType: Hub Settings,Sync Now,အခုတော့ Sync ကို
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},row {0}: Credit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},row {0}: Credit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
 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 လိမ့်မည်။
 DocType: Employee,Permanent Address Is,အမြဲတမ်းလိပ်စာ Is
 DocType: Production Order Operation,Operation completed for how many finished goods?,စစ်ဆင်ရေးမည်မျှချောကုန်ပစ္စည်းများသည်ပြီးစီးခဲ့?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,အဆိုပါအမှတ်တံဆိပ်
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,{0} over- ခွင့် Item {1} သည်ကိုကူး။
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0} over- ခွင့် Item {1} သည်ကိုကူး။
 DocType: Employee,Exit Interview Details,Exit ကိုအင်တာဗျူးအသေးစိတ်ကို
 DocType: Item,Is Purchase Item,ဝယ်ယူခြင်း Item ဖြစ်ပါတယ်
 DocType: Journal Entry Account,Purchase Invoice,ဝယ်ယူခြင်းပြေစာ
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,စကားစုစုပေါင်း
 DocType: Material Request Item,Lead Time Date,ခဲအချိန်နေ့စွဲ
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,မဖြစ်မနေဖြစ်ပါတယ်။ ဒီတစ်ခါလည်းငွေကြေးစနစ်အိတ်ချိန်းစံချိန်ဖန်တီးသည်မ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},row # {0}: Item {1} သည် Serial No ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},row # {0}: Item {1} သည် Serial No ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","&#39;&#39; ကုန်ပစ္စည်း Bundle ကို &#39;&#39; ပစ္စည်းများကို, ဂိုဒေါင်, Serial No နှင့် Batch for မရှိ &#39;&#39; List ကိုထုပ်ပိုး &#39;&#39; စားပွဲကနေစဉ်းစားကြလိမ့်မည်။ ဂိုဒေါင်နှင့် Batch မရှိဆို &#39;&#39; ကုန်ပစ္စည်း Bundle ကို &#39;&#39; တဲ့ item ပေါင်းသည်တလုံးထုပ်ပိုးပစ္စည်းများသည်အတူတူပင်ဖြစ်ကြောင်း အကယ်. အဲဒီတန်ဖိုးတွေကိုအဓိက Item table ထဲမှာသို့ဝင်နိုင်ပါတယ်, တန်ဖိုးများကို &#39;&#39; Pack များစာရင်း &#39;&#39; စားပွဲကိုမှကူးယူလိမ့်မည်။"
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ဖောက်သည်တင်ပို့ရောင်းချမှု။
 DocType: Purchase Invoice Item,Purchase Order Item,ဝယ်ယူခြင်းအမိန့် Item
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,ကှဲလှဲ
 ,Company Name,ကုမ္ပဏီအမည်
 DocType: SMS Center,Total Message(s),စုစုပေါင်း Message (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,စစ်ဆေးမှုများအနည်ရာဘဏ်အကောင့်ဖွင့်ဦးခေါင်းကိုရွေးချယ်ပါ။
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,အသုံးပြုသူငွေကြေးလွှဲပြောင်းမှုမှာစျေးနှုန်း List ကို Rate တည်းဖြတ်ရန် Allow
 DocType: Pricing Rule,Max Qty,max Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,row {0}: / ဝယ်ယူခြင်းအမိန့်ကိုအမြဲကြိုတင်အဖြစ်မှတ်သားထားသင့်အရောင်းဆန့်ကျင်ငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ဓါတုဗေဒ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,ပစ္စည်းများအားလုံးပြီးပြီဒီထုတ်လုပ်မှုအမိန့်သည်ပြောင်းရွှေ့ခဲ့တာဖြစ်ပါတယ်။
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,ပစ္စည်းများအားလုံးပြီးပြီဒီထုတ်လုပ်မှုအမိန့်သည်ပြောင်းရွှေ့ခဲ့တာဖြစ်ပါတယ်။
 DocType: Process Payroll,Select Payroll Year and Month,လစာတစ်နှစ်တာနှင့်လကိုရွေးချယ်ပါ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",အမျိုးအစား) ကလေးသူငယ် Add ကိုနှိပ်ခြင်းအားဖြင့် (&quot;Bank က&quot; သင့်လျော်သောအုပ်စု (ရန်ပုံငွေကိုပုံမှန်အားဖြင့်လျှောက်လွှာ&gt; လက်ရှိပိုင်ဆိုင်မှုများ&gt; Bank မှ Accounts ကိုသွားပြီးသစ်တစ်ခုအကောင့်ဖန်တီး
 DocType: Workstation,Electricity Cost,လျှပ်စစ်မီးကုန်ကျစရိတ်
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),အားလုံးသည်ခဲ (ပွင့်လင်း)
 DocType: Purchase Invoice,Get Advances Paid,ကြိုတင်ငွေ Paid Get
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,သင်၏ရုပ်ပုံ Attach
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,လုပ်ပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,လုပ်ပါ
 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 +3,My Cart,အကြှနျုပျ၏လှည်း
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,အကြှနျုပျ၏လှည်း
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Qty ဖွင့်လှစ်
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,ငွေသား / ဘဏ်မှအကောင့်
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,အရေအတွက်သို့မဟုတ်တန်ဖိုးမျှပြောင်းလဲမှုနှင့်အတူပစ္စည်းများကိုဖယ်ရှားခဲ့သည်။
 DocType: Delivery Note,Delivery To,ရန် Delivery
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
 DocType: Production Planning Tool,Get Sales Orders,အရောင်းအမိန့် Get
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} အနုတ်လက္ခဏာမဖြစ်နိုင်
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,လြှော့ခွငျး
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,လြှော့ခွငျး
 DocType: Features Setup,Purchase Discounts,လျော့စျေးဝယ်ယူ
 DocType: Workstation,Wages,လုပ်ခလစာ
 DocType: Time Log,Will be updated only if Time Log is 'Billable',အချိန်အထဲ &#39;&#39; Billable &#39;&#39; သည်သာလျှင် updated လိမ့်မည်
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,သဘောင်္တင်ခပြည်နယ်
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,item button ကို &#39;&#39; ဝယ်ယူလက်ခံရရှိသည့်ရက်မှပစ္စည်းများ Get &#39;&#39; ကို အသုံးပြု. ထည့်သွင်းပြောကြားခဲ့သည်ရမည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,အရောင်းအသုံးစရိတ်များ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,စံဝယ်ယူ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,စံဝယ်ယူ
 DocType: GL Entry,Against,ဆန့်ကျင်
 DocType: Item,Default Selling Cost Center,default ရောင်းချသည့်ကုန်ကျစရိတ် Center က
 DocType: Sales Partner,Implementation Partner,အကောင်အထည်ဖော်ရေး Partner
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,ဖြန့်ဖြူး
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,စျေးဝယ်တွန်းလှည်း Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,ထုတ်လုပ်မှုအမိန့် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',&#39;&#39; Apply ဖြည့်စွက်လျှော့တွင် &#39;&#39; set ကျေးဇူးပြု.
 ,Ordered Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ထုတ်ပစ္စည်းများ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Range ထဲထဲကနေ A မျိုးမျိုးရန်ထက်လျော့နည်းဖြစ်ဖို့ရှိပါတယ်
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,အချိန် Logs ကိုရွေးပြီးအသစ်တစ်ခုကိုအရောင်းပြေစာကိုဖန်တီးရန် Submit ။
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,ဒါဟာအချိန်အထဲ Batch ကြေညာခဲ့တာဖြစ်ပါတယ်။
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,အခွင့်အလမ်းကိုဖန်တီးပါ
 DocType: Salary Slip,Leave Without Pay,Pay ကိုမရှိရင် Leave
-DocType: Supplier,Communications,ဆက်သွယ်ရေးဝန်ကြီး
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,စွမ်းဆောင်ရည်မြှင့်စီမံကိန်းအမှား
 ,Trial Balance for Party,ပါတီများအတွက် trial Balance ကို
 DocType: Lead,Consultant,အကြံပေး
 DocType: Salary Slip,Earnings,င်ငွေ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,လက်စသတ် Item {0} Manufacturing အမျိုးအစား entry အဝသို့ဝင်ရမည်
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,ဖွင့်လှစ်စာရင်းကိုင် Balance
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,လက်စသတ် Item {0} Manufacturing အမျိုးအစား entry အဝသို့ဝင်ရမည်
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ဖွင့်လှစ်စာရင်းကိုင် Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,အရောင်းပြေစာကြိုတင်ထုတ်
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,တောင်းဆိုရန်ဘယ်အရာမှ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;&#39; အမှန်တကယ် Start ကိုနေ့စွဲ &#39;&#39; အမှန်တကယ် End Date ကို &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
 DocType: Global Defaults,Disable Rounded Total,Rounded စုစုပေါင်းကို disable
 DocType: Lead,Call,တယ်လီဖုန်းဆက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;&#39; Entries &#39;လွတ်နေတဲ့မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&#39;&#39; Entries &#39;လွတ်နေတဲ့မဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},{1} တူညီနှင့်အတူအတန်း {0} Duplicate
 ,Trial Balance,ရုံးတင်စစ်ဆေး Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ဝန်ထမ်းများကိုတည်ဆောက်ခြင်း
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,သုံးစွဲသူအိုင်ဒီ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,view လယ်ဂျာ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,အစောဆုံး
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
 DocType: Production Order,Manufacture against Sales Order,အရောင်းအမိန့်ဆန့်ကျင်ထုတ်လုပ်
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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 ကို
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},အေးခဲအကောင့် {0} တည်းဖြတ်ခွင့်ပြုချက်မရ
 DocType: Journal Entry,Get Outstanding Invoices,ထူးချွန်ငွေတောင်းခံလွှာကိုရယူပါ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,အရောင်းအမိန့် {0} တရားဝင်မဟုတ်
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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} ကနေကြိုးစား
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,ထုတ်ဝေသည့်နေရာ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,စာချုပ်
 DocType: Email Digest,Add Quote,Quote Add
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM လိုအပ် UOM ဖုံးလွှမ်းအချက်: Item အတွက် {0}: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM လိုအပ် UOM ဖုံးလွှမ်းအချက်: Item အတွက် {0}: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,သွယ်ဝိုက်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,row {0}: Qty မသင်မနေရ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,လယ်ယာစိုက်ပျိုးရေး
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,သင့်ရဲ့ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ
 DocType: Mode of Payment,Mode of Payment,ငွေပေးချေမှုရမည့်၏ Mode ကို
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ဒါကအမြစ်ကို item အဖွဲ့နှင့်တည်းဖြတ်မရနိုင်ပါ။
 DocType: Journal Entry Account,Purchase Order,ကုန်ပစ္စည်းအမှာစာ
 DocType: Warehouse,Warehouse Contact Info,ဂိုဒေါင် Contact Info
@@ -1018,8 +1024,8 @@
 DocType: Email Digest,Annual Income,နှစ်စဉ်ဝင်ငွေ
 DocType: Serial No,Serial No Details,serial No အသေးစိတ်ကို
 DocType: Purchase Invoice Item,Item Tax Rate,item အခွန်နှုန်း
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0} သည်ကိုသာအကြွေးအကောင့်အသစ်များ၏အခြား debit entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry",{0} သည်ကိုသာအကြွေးအကောင့်အသစ်များ၏အခြား debit entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,မြို့တော်ပစ္စည်းများ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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; အပေါ်အခြေခံပြီးရွေးချယ်ထားဖြစ်ပါတယ်။"
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,ရည်မှန်းချက်
 DocType: Sales Invoice Item,Edit Description,Edit ကိုဖော်ပြချက်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,မျှော်လင့်ထားသည့် Delivery Date ကိုစီစဉ်ထားသော Start ကိုနေ့စွဲထက်ယျဆုံးသောဖြစ်ပါတယ်။
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,ပေးသွင်းအကြောင်းမူကား
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,ပေးသွင်းအကြောင်းမူကား
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Account Type ကိုချိန်ညှိခြင်းကိစ္စများကို၌ဤအကောင့်ကိုရွေးချယ်ခြင်းအတွက်ကူညီပေးသည်။
 DocType: Purchase Invoice,Grand Total (Company Currency),က Grand စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,စုစုပေါင်းအထွက်
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,ဂျာနယ် Entry &#39;
 DocType: Workstation,Workstation Name,Workstation နှင့်အမည်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,အီးမေးလ် Digest မဂ္ဂဇင်း:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,ဤရှေ့ဆက်အတူပြီးခဲ့သည့်နေသူများကဖန်တီးအရောင်းအဝယ်အရေအတွက်သည်
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","အဆက်အသွယ်များ, စေပြီးမှသတင်းလွှာ။"
 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} သည်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,စစ်ဆင်ရေးအလွတ်ကျန်မရနိုင်ပါ။
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,စစ်ဆင်ရေးအလွတ်ကျန်မရနိုင်ပါ။
 ,Delivered Items To Be Billed,ကြေညာတဲ့ခံရဖို့ကယ်နှုတ်တော်မူ၏ပစ္စည်းများ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ဂိုဒေါင် Serial နံပါတ်သည်ပြောင်းလဲမပြနိုင်
 DocType: Authorization Rule,Average Discount,ပျမ်းမျှအားလျှော့
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},{0} ကနေ | {1} {2}
 DocType: BOM Operation,Operation Description,စစ်ဆင်ရေးဖော်ပြချက်များ
 DocType: Item,Will also apply to variants,စမျိုးကွဲလျှောက်ထားလိမ့်မည်ဟု
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ဘဏ္ဍာရေးနှစ်အတွင်းကယ်တင်ခြင်းသို့ရောက်ကြသည်တစ်ချိန်ကဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုမပြောင်းနိုင်ပါ။
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ဘဏ္ဍာရေးနှစ်အတွင်းကယ်တင်ခြင်းသို့ရောက်ကြသည်တစ်ချိန်ကဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုမပြောင်းနိုင်ပါ။
 DocType: Quotation,Shopping Cart,စျေးဝယ်တွန်းလှည်း
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,AVG Daily သတင်းစာအထွက်
 DocType: Pricing Rule,Campaign,ကင်ပိန်း
@@ -1100,7 +1106,8 @@
 DocType: Sales Order Item,Planned Quantity,စီစဉ်ထားတဲ့ပမာဏ
 DocType: Purchase Invoice Item,Item Tax Amount,item အခွန်ပမာဏ
 DocType: Item,Maintain Stock,စတော့အိတ်ထိန်းသိမ်းနည်း
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,ပြီးသားထုတ်လုပ်မှုအမိန့်ဖန်တီးစတော့အိတ် Entries
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ပြီးသားထုတ်လုပ်မှုအမိန့်ဖန်တီးစတော့အိတ် Entries
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ငွေစာရင်း၏ဇယား
 DocType: Material Request,Terms and Conditions Content,စည်းကမ်းသတ်မှတ်ချက်များအကြောင်းအရာ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,ပိုင်ဆိုင်
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Pay ကိုမရှိရင်ထွက်ခွာအပေါ်မူတည်
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,sub စညျးဝေး
 DocType: Shipping Rule Condition,To Value,Value တစ်ခုမှ
 DocType: Supplier,Stock Manager,စတော့အိတ် Manager က
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},source ဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},source ဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office ကိုငှား
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setup ကို SMS ကို gateway ဟာ setting များ
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,အဘယ်သူမျှမလိပ်စာသေးကဆက်ပြောသည်။
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation နှင့်အလုပ်အဖွဲ့ Hour
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,လေ့လာဆန်းစစ်သူ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} JV ငွေပမာဏ {2} ထက်လျော့နည်းသို့မဟုတ်နှင့်ထပ်တူဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} JV ငွေပမာဏ {2} ထက်လျော့နည်းသို့မဟုတ်နှင့်ထပ်တူဖြစ်ရပါမည်
 DocType: Item,Inventory,စာရင်း
 DocType: Features Setup,"To enable ""Point of Sale"" view",&quot;Point သို့ရောင်းရငွေ၏&quot; အမြင် enable လုပ်ဖို့
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,ငွေပေးချေမှုရမည့်အချည်းနှီးလှည်းတို့ကိုလုပ်မပြနိုင်
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,ငွေပေးချေမှုရမည့်အချည်းနှီးလှည်းတို့ကိုလုပ်မပြနိုင်
 DocType: Item,Sales Details,အရောင်းအသေးစိတ်ကို
 DocType: Opportunity,With Items,ပစ္စည်းများနှင့်အတူ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty အတွက်
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,မိဘကုန်ကျစရိတ် Center က
 DocType: Sales Invoice,Source,အရင်းအမြစ်
 DocType: Leave Type,Is Leave Without Pay,Pay ကိုမရှိရင် Leave ဖြစ်ပါတယ်
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,ထိုငွေပေးချေမှုရမည့် table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,ထိုငွေပေးချေမှုရမည့် table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: Employee External Work History,Total Experience,စုစုပေါင်းအတွေ့အကြုံ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ (s) ဖျက်သိမ်း
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ (s) ဖျက်သိမ်း
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,ရင်းနှီးမြုပ်နှံထံမှငွေကြေးစီးဆင်းမှု
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ကုန်တင်နှင့် Forwarding စွပ်စွဲချက်
 DocType: Material Request Item,Sales Order No,အရောင်းအမိန့်မရှိပါ
 DocType: Item Group,Item Group Name,item Group မှအမည်
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Manufacturing သည်ပစ္စည်းများလွှဲပြောင်း
 DocType: Pricing Rule,For Price List,စျေးနှုန်း List တွေ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,အလုပ်အမှုဆောင်ရှာရန်
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ကို item သည်ဝယ်ယူနှုန်းက: {0} မတွေ့ရှိ, entry ကို (စရိတ်) စာရင်းကိုင် book ရန်လိုအပ်သောအရာ။ တစ်ဦးဝယ်စျေးနှုန်းစာရင်းကိုဆန့်ကျင်တဲ့ item စျေးနှုန်းဖော်ပြထားခြင်းပေးပါ။"
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ကို item သည်ဝယ်ယူနှုန်းက: {0} မတွေ့ရှိ, entry ကို (စရိတ်) စာရင်းကိုင် book ရန်လိုအပ်သောအရာ။ တစ်ဦးဝယ်စျေးနှုန်းစာရင်းကိုဆန့်ကျင်တဲ့ item စျေးနှုန်းဖော်ပြထားခြင်းပေးပါ။"
 DocType: Maintenance Schedule,Schedules,အချိန်ဇယားများ
 DocType: Purchase Invoice Item,Net Amount,Net ကပမာဏ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail မရှိပါ
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),အပိုဆောင်းလျှော့ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},error: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},error: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,ငွေစာရင်း၏ Chart ဟာကနေအကောင့်သစ်ဖန်တီးပေးပါ။
 DocType: Maintenance Visit,Maintenance Visit,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ်
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ဖောက်သည်&gt; ဖောက်သည်အုပ်စု&gt; နယ်မြေတွေကို
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,အရောင်း Partner Target က
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{1}: {0} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါတယ်များအတွက်စာရင်းကိုင် Entry &#39;
 DocType: Pricing Rule,Pricing Rule,စျေးနှုန်း Rule
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,အမိန့်ကိုဝယ်ယူအသုံးပြုမှ material တောင်းဆိုခြင်း
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,အမိန့်ကိုဝယ်ယူအသုံးပြုမှ material တောင်းဆိုခြင်း
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},row # {0}: Return Item {1} {2} {3} ထဲမှာရှိနေပြီပါဘူး
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,ဘဏ်မှ Accounts ကို
 ,Bank Reconciliation Statement,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေးထုတ်ပြန်ကြေညာချက်
@@ -1225,11 +1233,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,စတော့အိတ် Balance ဖွင့်လှစ်
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} တစ်ခါသာပေါ်လာရကြမည်
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ဝယ်ယူခြင်းအမိန့် {2} ဆန့်ကျင် {1} ထက် {0} ပိုပြီး tranfer ခွင့်မပြုခဲ့
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},{0} သည်အောင်မြင်စွာကျင်းပပြီးစီးခွဲဝေရွက်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,သိမ်းဆည်းရန်ပစ္စည်းများမရှိပါ
 DocType: Shipping Rule Condition,From Value,Value တစ်ခုကနေ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,ကုန်ထုတ်လုပ်မှုပမာဏမသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,ကုန်ထုတ်လုပ်မှုပမာဏမသင်မနေရ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,ဘဏ်ထဲမှာထင်ဟပ်မဟုတ်ပမာဏ
 DocType: Quality Inspection Reading,Reading 4,4 Reading
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ကုမ္ပဏီစရိတ်များအတွက်တောင်းဆိုမှုများ။
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,ပေးသွင်းကိုးကားချက်များကိုဖန်ဆင်းသည်မဟုတ်သော material တောင်းဆို
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,သငျသညျခွင့်များအတွက်လျှောက်ထားထားတဲ့နေ့ (သို့) အားလပ်ရက်ဖြစ်ကြ၏။ သငျသညျခွင့်လျှောက်ထားစရာမလိုပေ။
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,barcode ကို အသုံးပြု. ပစ္စည်းများခြေရာခံရန်။ သင်ဟာ item ၏ barcode scan ဖတ်ခြင်းဖြင့် Delivery Note နှင့်အရောင်းပြေစာအတွက်ပစ္စည်းများဝင်နိုင်ပါလိမ့်မည်။
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,"ကယ်နှုတ်တော်မူ၏အဖြစ်, Mark"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,"ကယ်နှုတ်တော်မူ၏အဖြစ်, Mark"
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,စျေးနှုန်းလုပ်ပါ
 DocType: Dependent Task,Dependent Task,မှီခို Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,မွေးနေသတိပေးချက်များကိုရပ်တန့်
 DocType: SMS Center,Receiver List,receiver များစာရင်း
 DocType: Payment Tool Detail,Payment Amount,ငွေပေးချေမှုရမည့်ငွေပမာဏ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,စားသုံးသည့်ပမာဏ
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} ကြည့်ရန်
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} ကြည့်ရန်
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,ငွေအတွက်ပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Salary Structure Deduction,Salary Structure Deduction,လစာဖွဲ့စည်းပုံထုတ်ယူ
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
 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 +185,Quantity must not be more than {0},အရေအတွက် {0} ထက်ပိုပြီးမဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),အသက်အရွယ် (နေ့ရက်များ)
 DocType: Quotation Item,Quotation Item,စျေးနှုန်း Item
 DocType: Account,Account Name,အကောင့်အမည်
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,နေ့စွဲကနေနေ့စွဲရန်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,နေ့စွဲကနေနေ့စွဲရန်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,serial No {0} အရေအတွက် {1} တဲ့အစိတ်အပိုင်းမဖွစျနိုငျ
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,ပေးသွင်း Type မာစတာ။
 DocType: Purchase Order Item,Supplier Part Number,ပေးသွင်းအပိုင်းနံပါတ်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,ကူးပြောင်းခြင်းနှုန်းက 0 င်သို့မဟုတ် 1 မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,ကူးပြောင်းခြင်းနှုန်းက 0 င်သို့မဟုတ် 1 မဖွစျနိုငျ
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} ကိုဖျက်သိမ်းသို့မဟုတ်ရပ်တန့်နေသည်
 DocType: Accounts Settings,Credit Controller,ခရက်ဒစ် Controller
 DocType: Delivery Note,Vehicle Dispatch Date,မော်တော်ယာဉ် Dispatch နေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,ဝယ်ယူခြင်း Receipt {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,ဝယ်ယူခြင်း Receipt {0} တင်သွင်းသည်မဟုတ်
 DocType: Company,Default Payable Account,default ပေးဆောင်အကောင့်
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","ထိုကဲ့သို့သောစသည်တို့ရေကြောင်းစည်းမျဉ်းစည်းကမ်းများ, စျေးနှုန်းစာရင်းအဖြစ်အွန်လိုင်းစျေးဝယ်လှည်းသည် Settings ကို"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,ကြေညာတဲ့ {0}%
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,ငါ့အကိစ္စများ
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,န်ထမ်းများအတွက်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,row {0}: ပေးသွင်းဆန့်ကျင်ကြိုတင်ငွေကြိုပေးရမညျ
 DocType: Company,Default Values,default တန်ဖိုးများ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,row {0}: ငွေပေးချေမှုရမည့်ငွေပမာဏကိုအနုတ်လက္ခဏာမဖြစ်နိုင်
 DocType: Expense Claim,Total Amount Reimbursed,စုစုပေါင်းငွေပမာဏ Reimbursed
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},ပေးသွင်းပြေစာ {0} ဆန့်ကျင် {1} ရက်စွဲပါ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},ပေးသွင်းပြေစာ {0} ဆန့်ကျင် {1} ရက်စွဲပါ
 DocType: Customer,Default Price List,default စျေးနှုန်းများစာရင်း
 DocType: Payment Reconciliation,Payments,ငွေပေးချေမှု
 DocType: Budget Detail,Budget Allocated,ဘဏ္ဍာငွေအရအသုံးခွဲဝေ
 DocType: Journal Entry,Entry Type,entry Type အမျိုးအစား
 ,Customer Credit Balance,customer Credit Balance
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,ပေးဆောင်ရမည့်ငွေစာရင်းထဲမှာပိုက်ကွန်ကိုပြောင်းရန်
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,သင့်ရဲ့အီးမေးလ်က id အတည်ပြုရန် ကျေးဇူးပြု.
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',&#39;&#39; Customerwise လျှော့ &#39;&#39; လိုအပ် customer
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,ဂျာနယ်များနှင့်အတူဘဏ်ငွေပေးချေမှုရက်စွဲများ Update ။
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,စျေးဝယ်ခြင်းတွန်းလှည်းကို Enable
 DocType: Employee,Permanent Address,အမြဲတမ်းလိပ်စာ
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,item {0} တဲ့ဝန်ဆောင်မှု Item ဖြစ်ရမည်။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",{0} {1} က Grand စုစုပေါင်း {2} ထက် သာ. ကြီးမြတ် \ မဖွစျနိုငျဆန့်ကျင်ပေးဆောင်ကြိုတင်မဲ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,ကို item code ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Pay (LWP) မရှိရင်ထွက်ခွာသည်ထုတ်ယူကိုလျော့ချ
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,တစ်ဦး Item ၏လူပျိုယူနစ်။
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',အချိန်အထဲ Batch {0} &#39;&#39; Submitted &#39;&#39; ရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',အချိန်အထဲ Batch {0} &#39;&#39; Submitted &#39;&#39; ရမည်
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ကျွန်တော်စတော့အိတ်လပ်ြရြားမြသည်စာရင်းကိုင် Entry &#39;ပါစေ
 DocType: Leave Allocation,Total Leaves Allocated,ခွဲဝေစုစုပေါင်းရွက်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့်ဂိုဒေါင်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့်ဂိုဒေါင်
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,မမှန်ကန်ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနဲ့ End သက်ကရာဇျမဝင်ရ ကျေးဇူးပြု.
 DocType: Employee,Date Of Retirement,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲ
 DocType: Upload Attendance,Get Template,Template: Get
 DocType: Address,Postal,စာတိုက်
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,တစ်ဖောက်သည်အုပ်စုနာမည်တူနှင့်အတူတည်ရှိသုံးစွဲသူအမည်ကိုပြောင်းလဲဒါမှမဟုတ်ဖောက်သည်အုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,ပထမဦးဆုံး {0} ကို select ပေးပါ။
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},စာသားအ {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,ပထမဦးဆုံး {0} ကို select ပေးပါ။
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},စာသားအ {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,နယူးဆက်သွယ်ရန်
 DocType: Territory,Parent Territory,မိဘနယ်မြေတွေကို
 DocType: Quality Inspection Reading,Reading 2,2 Reading
 DocType: Stock Entry,Material Receipt,material Receipt
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်လိုအပ်သည် {0}
 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 +210,Quantity required for Item {0} in row {1},အတန်းအတွက် Item {0} သည်လိုအပ်သောအရေအတွက် {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},အတန်းအတွက် Item {0} သည်လိုအပ်သောအရေအတွက် {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,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,အမိန့်ကြော်ငြာစာအီးမေးလ်လိပ်စာ
@@ -1361,15 +1373,15 @@
 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: Sales Invoice Item,Batch No,batch မရှိပါ
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,တစ်ဖောက်သည်ရဲ့ဝယ်ယူမိန့်ဆန့်ကျင်မျိုးစုံအရောင်းအမိန့် Allow
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,အဓိက
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,အဓိက
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,မူကွဲ
 DocType: Naming Series,Set prefix for numbering series on your transactions,သင့်ရဲ့ငွေကြေးလွှဲပြောင်းအပေါ်စီးရီးဦးရေသည်ရှေ့ဆက် Set
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,ရပ်တန့်နိုင်ရန်ဖျက်သိမ်းမရနိုင်ပါ။ ဖျက်သိမ်းဖို့လှတျ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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: Item,Variants,မျိုးကွဲ
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
 DocType: SMS Center,Send To,ရန် Send
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},ထွက်ခွာ Type {0} လုံလောက်ခွင့်ချိန်ခွင်မရှိ
 DocType: Payment Reconciliation Payment,Allocated amount,ခွဲဝေပမာဏ
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,ဂိုဒေါင်နှင့်ကိုးကားစရာ
 DocType: Supplier,Statutory info and other general information about your Supplier,ပြဋ္ဌာန်းဥပဒေအချက်အလက်နှင့်သင်၏ပေးသွင်းအကြောင်းကိုအခြားအထွေထွေသတင်းအချက်အလက်
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,လိပ်စာများ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်မည်သည့် unmatched {1} entry ကိုမရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်မည်သည့် unmatched {1} entry ကိုမရှိပါဘူး
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,item ထုတ်လုပ်မှုအမိန့်ရှိခွင့်မပြုခဲ့တာဖြစ်ပါတယ်။
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,အကောင့်ကိုငွေကြေးစနစ်အတွက်အကြွေးပမာဏ
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,ကုန်ထုတ်လုပ်မှုသည်အချိန် Logs ။
 DocType: Item,Apply Warehouse-wise Reorder Level,ဂိုဒေါင်ပညာ Reorder အဆင့် Apply
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
 DocType: Authorization Control,Authorization Control,authorization ထိန်းချုပ်ရေး
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},row # {0}: ငြင်းပယ်ဂိုဒေါင်ပယ်ချခဲ့ Item {1} ဆန့်ကျင်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,တာဝန်များကိုအချိန်အထဲ။
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,ငွေပေးချေမှုရမည့်
 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},အများဆုံး၏ပစ္စည်းတောင်းဆိုမှု {0} အရောင်းအမိန့် {2} ဆန့်ကျင်ပစ္စည်း {1} သည်ဖန်ဆင်းနိုင်
 DocType: Employee,Salutation,နှုတ်ဆက်
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,အပေါင်းအဖေါ်
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,item {0} တဲ့နံပါတ်စဉ်အလိုက် Item မဟုတ်ပါဘူး
 DocType: SMS Center,Create Receiver List,Receiver များစာရင်း Create
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expired
 DocType: Packing Slip,To Package No.,အမှတ် Package မှ
 DocType: Warranty Claim,Issue Date,ထုတ်ပြန်ရက်စွဲ
 DocType: Activity Cost,Activity Cost,လုပ်ဆောင်ချက်ကုန်ကျစရိတ်
@@ -1449,7 +1461,7 @@
 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 +65,Territory / Customer,နယ်မြေတွေကို / ဖောက်သည်
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,ဥပမာ 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} ထက်လျော့နည်းသို့မဟုတ်ထူးချွန်ငွေပမာဏ {2} ငွေတောင်းပြေစာပို့ဖို့နဲ့ညီမျှပါတယ်ဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} ထက်လျော့နည်းသို့မဟုတ်ထူးချွန်ငွေပမာဏ {2} ငွေတောင်းပြေစာပို့ဖို့နဲ့ညီမျှပါတယ်ဖြစ်ရမည်
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,သင်အရောင်းပြေစာကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 DocType: Item,Is Sales Item,အရောင်း Item ဖြစ်ပါတယ်
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,item Group ကသစ်ပင်
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} နေသူများကဖန်တီး
 DocType: Delivery Note Item,Against Sales Order,အရောင်းအမိန့်ဆန့်ကျင်
 ,Serial No Status,serial မရှိပါနဲ့ Status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,item table ကိုအလွတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,item table ကိုအလွတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","row {0}: နေ့စွဲ \ ထဲကနေနှင့်မှအကြားခြားနားချက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {2} တန်းတူဖြစ်ရမည်, {1} ကာလကိုသတ်မှတ်ဖို့"
 DocType: Pricing Rule,Selling,အရောင်းရဆုံး
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,တာဝန်နှင့်အခွန်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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} ငွေပေးချေမှု entries တွေကို {1} ကြောင့် filtered မရနိုင်ပါ
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Web Site မှာပြထားတဲ့လိမ့်မည်ဟု Item သည်စားပွဲတင်
 DocType: Purchase Order Item Supplied,Supplied Qty,supply Qty
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,Installation လုပ်တဲ့အချိန်
 DocType: Sales Invoice,Accounting Details,စာရင်းကိုင် Details ကို
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,ဒီကုမ္ပဏီအပေါငျးတို့သငွေကြေးကိစ္စရှင်းလင်းမှု Delete
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,row # {0}: စစ်ဆင်ရေး {1} ထုတ်လုပ်မှုအမိန့် # {3} အတွက်ချောကုန်စည် {2} qty သည်ပြီးစီးသည်မဟုတ်။ အချိန် Logs ကနေတဆင့်စစ်ဆင်ရေးအဆင့်အတန်းကို update ကျေးဇူးပြု.
+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,row # {0}: စစ်ဆင်ရေး {1} ထုတ်လုပ်မှုအမိန့် # {3} အတွက်ချောကုန်စည် {2} qty သည်ပြီးစီးသည်မဟုတ်။ အချိန် Logs ကနေတဆင့်စစ်ဆင်ရေးအဆင့်အတန်းကို update ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,ရင်းနှီးမြှုပ်နှံမှုများ
 DocType: Issue,Resolution Details,resolution အသေးစိတ်ကို
 DocType: Quality Inspection Reading,Acceptance Criteria,လက်ခံမှုကိုလိုအပ်ချက်
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,Clear ကိုဇယား
 DocType: Features Setup,Brands,ကုန်အမှတ်တံဆိပ်
 DocType: C-Form Invoice Detail,Invoice No,ကုန်ပို့လွှာမရှိပါ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,ဝယ်ယူခြင်းအမိန့်ကနေ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,ဝယ်ယူခြင်းအမိန့်ကနေ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ခွင့်ချိန်ခွင်လျှာထားပြီးအနာဂတ်ခွင့်ခွဲဝေစံချိန် {1} အတွက် PPP ဖြင့်ချဉ်းကပ်-forward နိုင်သည်သိရသည်အဖြစ် Leave, {0} မီကကိုဖျက်သိမ်း / လျှောက်ထားမရနိုင်ပါ"
 DocType: Activity Cost,Costing Rate,ကုန်ကျ Rate
 ,Customer Addresses And Contacts,customer လိပ်စာနှင့်ဆက်သွယ်ရန်
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယား
 ,Quotation Trends,စျေးနှုန်းခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
 DocType: Shipping Rule Condition,Shipping Amount,သဘောင်္တင်ခပမာဏ
 ,Pending Amount,ဆိုင်းငံ့ထားသောငွေပမာဏ
 DocType: Purchase Invoice Item,Conversion Factor,ကူးပြောင်းခြင်း Factor
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,finanial အကောင့်အသစ်များ၏ပင်လည်းရှိ၏။
 DocType: Leave Control Panel,Leave blank if considered for all employee types,အားလုံးန်ထမ်းအမျိုးအစားစဉ်းစားလျှင်အလွတ် Leave
 DocType: Landed Cost Voucher,Distribute Charges Based On,တွင် အခြေခံ. စွပ်စွဲချက်ဖြန့်ဝေ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,အကောင့်ဖွင့် Item {1} အဖြစ် {0} အမျိုးအစားဖြစ်ရမည် &#39;&#39; Fixed Asset &#39;&#39; တစ်ဦး Asset Item ဖြစ်ပါတယ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,အကောင့်ဖွင့် Item {1} အဖြစ် {0} အမျိုးအစားဖြစ်ရမည် &#39;&#39; Fixed Asset &#39;&#39; တစ်ဦး Asset Item ဖြစ်ပါတယ်
 DocType: HR Settings,HR Settings,HR Settings ကို
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,စရိတ်တောင်းဆိုမှုများအတည်ပြုချက်ဆိုင်းငံ့ထားတာဖြစ်ပါတယ်။ ကိုသာသုံးစွဲမှုအတည်ပြုချက် status ကို update ပြုလုပ်နိုင်ပါသည်။
 DocType: Purchase Invoice,Additional Discount Amount,အပိုဆောင်းလျှော့ငွေပမာဏ
 DocType: Leave Block List Allow,Leave Block List Allow,Allow Block List ကို Leave
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,အားကစား
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,အမှန်တကယ်စုစုပေါင်း
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,ယူနစ်
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,စရိတ်စွပ်စွဲ
 DocType: Issue,Support,ထောက်ပံ့
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,ကြည့်ရန်လှည်း
 ,BOM Search,BOM ရှာရန်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),(+ စုစုပေါင်းမှတ်တမ်းဖွင့်လှစ်) ပိတ်ပစ်
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,ကုမ္ပဏီအတွက်ငွေကြေးသတ်မှတ် ကျေးဇူးပြု.
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM ကူးပြောင်းခြင်းအချက်အတန်း {0} အတွက်လိုအပ်သည်
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},ရှင်းလင်းရေးနေ့စွဲအတန်း {0} အတွက်စစ်ဆေးခြင်းရက်စွဲမီမဖွစျနိုငျ
 DocType: Salary Slip,Deduction,သဘောအယူအဆ
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},item စျေးနှုန်းကိုစျေးနှုန်းကိုစာရင်း {1} အတွက် {0} များအတွက်ဖြည့်စွက်
 DocType: Address Template,Address Template,လိပ်စာ Template:
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,ဒီအရောင်းလူတစ်ဦး၏န်ထမ်း Id ကိုရိုက်ထည့်ပေးပါ
 DocType: Territory,Classification of Customers by region,ဒေသအားဖြင့် Customer များ၏ခွဲခြား
 DocType: Project,% Tasks Completed,% Tasks ကို Completed
 DocType: Project,Gross Margin,gross Margin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,ထုတ်လုပ်မှု Item ပထမဦးဆုံးရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,မသန်မစွမ်းအသုံးပြုသူ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,မသန်မစွမ်းအသုံးပြုသူ
 DocType: Opportunity,Quotation,ကိုးကာချက်
 DocType: Salary Slip,Total Deduction,စုစုပေါင်းထုတ်ယူ
 DocType: Quotation,Maintenance User,ပြုပြင်ထိန်းသိမ်းမှုအသုံးပြုသူတို့၏
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 / ခဲလိပ်စာ
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
 DocType: Production Order Operation,Actual Operation Time,အမှန်တကယ်စစ်ဆင်ရေးအချိန်
 DocType: Authorization Rule,Applicable To (User),(အသုံးပြုသူ) ရန်သက်ဆိုင်သော
 DocType: Purchase Taxes and Charges,Deduct,နှုတ်ယူ
@@ -1588,12 +1602,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","အရောင်းစည်းရုံးလှုပ်ရှားမှု၏ Track အောင်ထားပါ။ ရင်းနှီးမြှုပ်နှံမှုအပေါ်သို့ပြန်သွားသည်ကိုခန့်မှန်းရန်လှုံ့ဆော်မှုများအနေဖြင့်စသည်တို့ကိုအရောင်းအမိန့်, ကိုးကားချက်များ, ခဲခြေရာခံစောင့်ရှောက်ကြလော့။"
 DocType: Expense Claim,Approver,ခွင့်ပြုချက်
 ,SO Qty,SO Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",စတော့အိတ် entries တွေကို {0} သွားတော့သင် re-assign သို့မဟုတ်ဂိုဒေါင် modify မရပါဘူးဂိုဒေါင်ဆန့်ကျင်တည်ရှိနေ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",စတော့အိတ် entries တွေကို {0} သွားတော့သင် re-assign သို့မဟုတ်ဂိုဒေါင် modify မရပါဘူးဂိုဒေါင်ဆန့်ကျင်တည်ရှိနေ
 DocType: Appraisal,Calculate Total Score,စုစုပေါင်းရမှတ်ကိုတွက်ချက်
 DocType: Supplier Quotation,Manufacturing Manager,ကုန်ထုတ်လုပ်မှု Manager က
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,packages များသို့ Delivery Note ကို Split ။
-apps/erpnext/erpnext/hooks.py +68,Shipments,တင်ပို့ရောင်းချမှု
+apps/erpnext/erpnext/hooks.py +69,Shipments,တင်ပို့ရောင်းချမှု
 DocType: Purchase Order Item,To be delivered to customer,ဖောက်သည်မှကယ်နှုတ်တော်မူ၏ခံရဖို့
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,အချိန်အထဲနဲ့ Status Submitted ရမည်။
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,serial မရှိပါ {0} ဆိုဂိုဒေါင်ပိုင်ပါဘူး
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,ကုမ္ပဏီကိုရွေးချယ်ပါ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,အားလုံးဌာနများစဉ်းစားလျှင်အလွတ် Leave
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","အလုပ်အကိုင်အခွင့်အအမျိုးအစားများ (ရာသက်ပန်, စာချုပ်, အလုပ်သင်ဆရာဝန်စသည်တို့) ။"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
 DocType: Currency Exchange,From Currency,ငွေကြေးစနစ်ကနေ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","atleast တယောက်အတန်းအတွက်ခွဲဝေငွေပမာဏ, ပြေစာ Type နှင့်ပြေစာနံပါတ်ကို select ကျေးဇူးပြု."
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Item {0} လိုအပ်အရောင်းအမိန့်
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","atleast တယောက်အတန်းအတွက်ခွဲဝေငွေပမာဏ, ပြေစာ Type နှင့်ပြေစာနံပါတ်ကို select ကျေးဇူးပြု."
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Item {0} လိုအပ်အရောင်းအမိန့်
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,စနစ်ထဲမှာထင်ဟပ်မဟုတ်ပမာဏ
 DocType: Purchase Invoice Item,Rate (Company Currency),rate (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,အခြားသူများ
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,Process ကိုအတွက်
 DocType: Authorization Rule,Itemwise Discount,Itemwise လျှော့
 DocType: Purchase Order Item,Reference Document Type,ကိုးကားစရာ Document ဖိုင် Type အမျိုးအစား
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} အရောင်းအမိန့် {1} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} အရောင်းအမိန့် {1} ဆန့်ကျင်
 DocType: Account,Fixed Asset,ပုံသေ Asset
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serial Inventory
 DocType: Activity Type,Default Billing Rate,Default အနေနဲ့ငွေတောင်းခံလွှာနှုန်း
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ငွေပေးချေမှုရမည့်မှအရောင်းအမိန့်
 DocType: Expense Claim Detail,Expense Claim Detail,စရိတ်တောင်းဆိုမှုများ Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,အချိန် Logs နေသူများကဖန်တီး:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,မှန်ကန်သောအကောင့်ကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,မှန်ကန်သောအကောင့်ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Item,Weight UOM,အလေးချိန် UOM
 DocType: Employee,Blood Group,လူအသွေး Group က
 DocType: Purchase Invoice Item,Page Break,စာမျက်နှာ Break
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,အချိန်မှ
 DocType: Authorization Rule,Approving Role (above authorized value),(ခွင့်ပြုချက် value ကိုအထက်) အတည်ပြုအခန်းက္ပ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",ကလေးဆုံမှတ်များထည့်ရန်သစ်ပင်ကိုလေ့လာစူးစမ်းခြင်းနှင့်သင်နောက်ထပ်ဆုံမှတ်များထည့်ချင်ရာအောက်တွင် node ကို click လုပ်ပါ။
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,အကောင့်ဖွင့်ရန်အကြွေးတစ်ပေးဆောင်အကောင့်ကိုရှိရမည်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} {2} ၏မိဘသို့မဟုတ်ကလေးမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,အကောင့်ဖွင့်ရန်အကြွေးတစ်ပေးဆောင်အကောင့်ကိုရှိရမည်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} {2} ၏မိဘသို့မဟုတ်ကလေးမဖွစျနိုငျ
 DocType: Production Order Operation,Completed Qty,ပြီးစီး Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0} အဘို့, သာ debit အကောင့်အသစ်များ၏အခြားအကြွေး entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","{0} အဘို့, သာ debit အကောင့်အသစ်များ၏အခြားအကြွေး entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,စျေးနှုန်းစာရင်း {0} ပိတ်ထားတယ်
 DocType: Manufacturing Settings,Allow Overtime,အချိန်ပို Allow
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,Item {1} များအတွက်လိုအပ်သော {0} Serial Number ။ သငျသညျ {2} ထောက်ပံ့ကြပါပြီ။
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,customer Item ကုဒ်တွေဟာ
 DocType: Opportunity,Lost Reason,ပျောက်ဆုံးသွားရသည့်အကြောင်းရင်း
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,အမိန့်သို့မဟုတ်ငွေတောင်းခံလွှာဆန့်ကျင်ငွေပေးချေမှုရမည့် Entries ဖန်တီးပါ။
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,နယူးလိပ်စာ
 DocType: Quality Inspection,Sample Size,နမူနာ Size အ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,ပစ္စည်းများအားလုံးပြီးသား invoiced ပြီ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,နောက်ထပ်ကုန်ကျစရိတ်စင်တာများအဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 DocType: Project,External,external
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,Tool ကို Rename
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update ကိုကုန်ကျစရိတ်
 DocType: Item Reorder,Item Reorder,item Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,ပစ္စည်းလွှဲပြောင်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,ပစ္စည်းလွှဲပြောင်း
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",အဆိုပါစစ်ဆင်ရေးကိုသတ်မှတ်မှာ operating ကုန်ကျစရိတ်နှင့်သင်တို့၏စစ်ဆင်ရေးမှတစ်မူထူးခြားစစ်ဆင်ရေးမျှမပေး။
 DocType: Purchase Invoice,Price List Currency,စျေးနှုန်း List ကိုငွေကြေးစနစ်
 DocType: Naming Series,User must always select,အသုံးပြုသူအမြဲရွေးချယ်ရမည်
 DocType: Stock Settings,Allow Negative Stock,အပြုသဘောမဆောင်သောစတော့အိတ် Allow
 DocType: Installation Note,Installation Note,Installation မှတ်ချက်
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,အခွန် Add
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,ဘဏ္ဍာရေးထံမှငွေကြေးစီးဆင်းမှု
 ,Financial Analytics,ဘဏ္ဍာရေး Analytics
 DocType: Quality Inspection,Verified By,By Verified
 DocType: Address,Subsidiary,ထောက်ခံသောကုမ္ပဏီ
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Create
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,ဘဏ်နှုန်းအဖြစ်မျှော်လင့်ထားချိန်ခွင်လျှာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ရန်ပုံငွေ၏ source (စိစစ်)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},အတန်းအတွက်အရေအတွက် {0} ({1}) ထုတ်လုပ်သောအရေအတွက် {2} အဖြစ်အတူတူသာဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},အတန်းအတွက်အရေအတွက် {0} ({1}) ထုတ်လုပ်သောအရေအတွက် {2} အဖြစ်အတူတူသာဖြစ်ရမည်
 DocType: Appraisal,Employee,လုပ်သား
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,မှစ. သွင်းကုန်အီးမေးလ်
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,အသုံးပြုသူအဖြစ် Invite
 DocType: Features Setup,After Sale Installations,အရောင်း installation ပြီးသည့်နောက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} အပြည့်အဝကြေညာတာဖြစ်ပါတယ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} အပြည့်အဝကြေညာတာဖြစ်ပါတယ်
 DocType: Workstation Working Hour,End Time,အဆုံးအချိန်
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,အရောင်းသို့မဟုတ်ဝယ်ယူခြင်းအဘို့အစံစာချုပ်ဝေါဟာရများ။
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,ဘောက်ချာအားဖြင့်အုပ်စု
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,တွင်လိုအပ်သော
 DocType: Sales Invoice,Mass Mailing,mass စာပို့
 DocType: Rename Tool,File to Rename,Rename မှ File
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Item {0} လိုအပ် Purchse အမိန့်အရေအတွက်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Item {0} လိုအပ် Purchse အမိန့်အရေအတွက်
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,ငွေပေးချေပြရန်
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},သတ်မှတ်ထားသော BOM {0} Item {1} သည်မတည်ရှိပါဘူး
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုဇယား {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,အရောင်းအမိန့်လိုအပ်ပါသည်
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ဖောက်သည် Create
 DocType: Purchase Invoice,Credit To,ခရက်ဒစ်ရန်
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Active ကိုခဲ / Customer များ
 DocType: Employee Education,Post Graduate,Post ကိုဘွဲ့လွန်
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,ပြုပြင်ထိန်းသိမ်းမှုဇယား Detail
 DocType: Quality Inspection Reading,Reading 9,9 Reading
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,By ထမြောက်စေတော်
 DocType: Payment Tool,Payment Account,ငွေပေးချေမှုရမည့်အကောင့်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Accounts ကို receiver များတွင် Net က Change ကို
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ပိတ် Compensatory
 DocType: Quality Inspection Reading,Accepted,လက်ခံထားတဲ့
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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 ပြင်. မရပါ။
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,စုစုပေါင်းငွေပေးချေမှုရမည့်ငွေပမာဏ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
 DocType: Newsletter,Test,စမ်းသပ်
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","လက်ရှိစတော့ရှယ်ယာအရောင်းအဒီအချက်ကိုသည်ရှိပါတယ်အမျှ \ သင် &#39;&#39; Serial No ရှိခြင်း &#39;&#39; ၏စံတန်ဖိုးများကိုပြောင်းလဲလို့မရဘူး, &#39;&#39; Batch မရှိပါဖူး &#39;&#39; နှင့် &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ &#39;&#39; စတော့အိတ် Item Is &#39;&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM ဆိုတဲ့ item agianst ဖော်ပြခဲ့သောဆိုရင်နှုန်းကိုမပြောင်းနိုင်ပါ
 DocType: Employee,Previous Work Experience,ယခင်လုပ်ငန်းအတွေ့အကြုံ
 DocType: Stock Entry,For Quantity,ပမာဏများအတွက်
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},အတန်းမှာ Item {0} သည်စီစဉ်ထားသော Qty ကိုရိုက်သွင်းပါ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,ပစ္စည်းများသည်တောင်းဆိုမှုများ။
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,အသီးအသီးကောင်းဆောင်းပါးတပုဒ်ကိုလက်စသတ်သည်သီးခြားထုတ်လုပ်မှုအမိန့်ကိုဖန်တီးလိမ့်မည်။
 DocType: Purchase Invoice,Terms and Conditions1,စည်းကမ်းချက်များနှင့် Conditions1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,Authorized Value ကို
 DocType: Contact,Enter department to which this Contact belongs,ဒီဆက်သွယ်ရန်ပိုငျဆိုငျသောဌာနကိုထည့်သွင်းပါ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,စုစုပေါင်းပျက်ကွက်
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,အတန်းသည် item သို့မဟုတ်ဂိုဒေါင် {0} ပစ္စည်းတောင်းဆိုမှုနှင့်ကိုက်ညီပါဘူး
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,အတန်းသည် item သို့မဟုတ်ဂိုဒေါင် {0} ပစ္စည်းတောင်းဆိုမှုနှင့်ကိုက်ညီပါဘူး
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,တိုင်း၏ယူနစ်
 DocType: Fiscal Year,Year End Date,တစ်နှစ်တာအဆုံးနေ့စွဲ
 DocType: Task Depends On,Task Depends On,Task အပေါ်မူတည်
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,စာချုပ်ကုန်ဆုံးတော့နေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ကော်မရှင်များအတွက်ကုမ္ပဏီများကထုတ်ကုန်ရောင်းချတဲ့သူတစ်ဦးကိုတတိယပါတီဖြန့်ဖြူး / အရောင်း / ကော်မရှင်အေးဂျင့် / Affiliate / ပြန်လည်ရောင်းချသူ။
 DocType: Customer Group,Has Child Node,ကလေး Node ရှိပါတယ်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} ဝယ်ယူခြင်းအမိန့် {1} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} ဝယ်ယူခြင်းအမိန့် {1} ဆန့်ကျင်
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","ဒီနေရာမှာ static နဲ့ url parameters တွေကိုရိုက်ထည့်ပါ (ဥပမာ။ ပေးပို့သူ = ERPNext, အသုံးပြုသူအမည် = ERPNext, စကားဝှက် = 1234 စသည်တို့)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} မတက်ကြွဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ။ အသေးစိတ်ကို {2} စစ်ဆေးပါ။
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,ဒါဟာ ERPNext ကနေ Auto-generated ဥပမာတစ်ခုဝက်ဆိုက်
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,Recd ပမာဏ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},အရောင်းအမိန့်အရေအတွက် {1} ထက်ပိုပစ္စည်း {0} မထုတ်လုပ်နိုင်သ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,စတော့အိတ် Entry &#39;{0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,စတော့အိတ် Entry &#39;{0} တင်သွင်းသည်မဟုတ်
 DocType: Payment Reconciliation,Bank / Cash Account,ဘဏ်မှ / ငွေအကောင့်
 DocType: Tax Rule,Billing City,ငွေတောင်းခံစီးတီး
 DocType: Global Defaults,Hide Currency Symbol,ငွေကြေးစနစ်သင်္ကေတဝှက်
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility ကိုအသုံးစရိတ်များ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-အထက်
 DocType: Buying Settings,Default Buying Price List,default ဝယ်ယူစျေးနှုန်းများစာရင်း
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,အထက်ပါရွေးချယ်ထားသောစံနှုန်းများကို OR လစာစလစ်အဘို့အဘယ်သူမျှမကန်ထမ်းပြီးသားနေသူများကဖန်တီး
 DocType: Notification Control,Sales Order Message,အရောင်းအမိန့် Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ကုမ္ပဏီ, ငွေကြေးစနစ်, လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာစသည်တို့ကိုတူ Set Default တန်ဖိုးများ"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,ငွေပေးချေမှုရမည့် Type
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ပုဒ်မကုန်ကျမှာ &quot;ပစ္စည်းများအခြေတွင်အမျိုးမျိုးနှုန်း&quot; ကိုကြည့်ပါ
 DocType: Appraisal Goal,Key Responsibility Area,Key ကိုတာဝန်သိမှုဧရိယာ
 DocType: Item Reorder,Material Request Type,material တောင်းဆိုမှုကအမျိုးအစား
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,row {0}: UOM ကူးပြောင်းခြင်း Factor နဲ့မဖြစ်မနေဖြစ်ပါသည်
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,ကုန်ကျစရိတ် Center က
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ဘောက်ချာ #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,အားလုံးသည်လိပ်စာ။
 DocType: Company,Stock Settings,စတော့အိတ် Settings ကို
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးမှတ်တမ်းများအတွက်တူညီသော အကယ်. merge သာဖြစ်နိုင်ပါတယ်။ အုပ်စု, Root Type, ကုမ္ပဏီဖြစ်ပါတယ်"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးမှတ်တမ်းများအတွက်တူညီသော အကယ်. merge သာဖြစ်နိုင်ပါတယ်။ အုပ်စု, Root Type, ကုမ္ပဏီဖြစ်ပါတယ်"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ဖောက်သည်အုပ်စု Tree Manage ။
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,နယူးကုန်ကျစရိတ် Center ကအမည်
 DocType: Leave Control Panel,Leave Control Panel,Control Panel ကို Leave
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,ငွေပေးချေမှုရမည့် Tool ကို Detail
 ,Sales Browser,အရောင်း Browser ကို
 DocType: Journal Entry,Total Credit,စုစုပေါင်းချေးငွေ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {2} ဆန့်ကျင်ရှိတယျဆိုတာကို
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,ဒေသဆိုင်ရာ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {2} ဆန့်ကျင်ရှိတယျဆိုတာကို
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,ငျြ့ရမညျအကွောငျး
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,အကြီးစား
@@ -2003,7 +2022,7 @@
 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 အမှတ်
 DocType: Production Order Operation,Make Time Log,အချိန်အထဲလုပ်ပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,reorder အအရေအတွက်သတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,reorder အအရေအတွက်သတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},ခဲထံမှ {0} ဖောက်သည်ဖန်တီး ကျေးဇူးပြု.
 DocType: Price List,Applicable for Countries,နိုင်ငံများအဘို့သက်ဆိုင်သော
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,ကွန်ပျူတာများ
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast တယောက်ကို item ပြန်လာစာရွက်စာတမ်းအတွက်အနုတ်လက္ခဏာအရေအတွက်နှင့်အတူသို့ဝင်သင့်ပါတယ်
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,အဘယ်သူမျှမမှတ်ချက်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,အဘယ်သူမျှမမှတ်ချက်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,မပွေကုနျနသော
 DocType: Account,Stock Received But Not Billed,စတော့အိတ်ရရှိထားသည့်ဒါပေမဲ့ကြေညာတဲ့မ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,အမြစ်သည်အကောင့်ကိုအဖွဲ့တစ်ဖွဲ့ဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,အမြစ်သည်အကောင့်ကိုအဖွဲ့တစ်ဖွဲ့ဖြစ်ရပါမည်
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,gross Pay ကို + ကြွေးကျန်ပမာဏ + Encashment ပမာဏ - စုစုပေါင်းထုတ်ယူ
 DocType: Monthly Distribution,Distribution Name,ဖြန့်ဖြူးအမည်
 DocType: Features Setup,Sales and Purchase,အရောင်းနှင့်ဝယ်ယူခြင်း
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,ပါတီ Balance
 DocType: Sales Invoice Item,Time Log Batch,အချိန်အထဲ Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,လျှော့တွင် Apply ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Created
 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: Stock Entry,Material Transfer for Manufacture,Manufacturing သည်ပစ္စည်းလွှဲပြောင်း
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,ဝက်နှစ်စဉ်
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မတွေ့ရဘူး။
 DocType: Bank Reconciliation,Get Relevant Entries,သက်ဆိုင်ရာလုပ်ငန်း Entries Get
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,စတော့အိတ်သည်စာရင်းကိုင် Entry &#39;
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,စတော့အိတ်သည်စာရင်းကိုင် Entry &#39;
 DocType: Sales Invoice,Sales Team1,အရောင်း Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
 DocType: Sales Invoice,Customer Address,customer လိပ်စာ
 DocType: Purchase Invoice,Apply Additional Discount On,Apply နောက်ထပ်လျှော့တွင်
 DocType: Account,Root Type,အမြစ်ကအမျိုးအစား
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,စာမျက်နှာရဲ့ထိပ်မှာဒီဆလိုက်ရှိုးပြရန်
 DocType: BOM,Item UOM,item UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),လျှော့ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်) ပြီးနောက်အခွန်ပမာဏ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target ကဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Target ကဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
 DocType: Quality Inspection,Quality Inspection,အရည်အသွေးအစစ်ဆေးရေး
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,အပိုအသေးစား
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,အကောင့်ကို {0} အေးခဲသည်
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,အဖွဲ့ပိုင်ငွေစာရင်း၏သီးခြားဇယားနှင့်အတူဥပဒေကြောင်းအရ Entity / လုပ်ငန်းခွဲများ။
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","အစားအစာ, Beverage &amp; ဆေးရွက်ကြီး"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL သို့မဟုတ် BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},သာ unbilled {0} ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},သာ unbilled {0} ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,ကော်မရှင်နှုန်းက 100 မှာထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,နိမ့်ဆုံးစာရင်းအဆင့်
 DocType: Stock Entry,Subcontract,Subcontract
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,incoming အရည်အသွေးအစစ်ဆေးခံရ။
 DocType: Purchase Order Item,Returned Qty,ပြန်လာသော Qty
 DocType: Employee,Exit,ထွက်ပေါက်
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,အမြစ်ကအမျိုးအစားမသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,အမြစ်ကအမျိုးအစားမသင်မနေရ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,serial No {0} နေသူများကဖန်တီး
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",ဖောက်သည်များအဆင်ပြေဤ codes တွေကိုငွေတောင်းခံလွှာနှင့် Delivery မှတ်စုများတူပုံနှိပ်ပုံစံများဖြင့်အသုံးပြုနိုင်
 DocType: Employee,You can enter any date manually,သင်တို့ကိုကို manually မဆိုနေ့စွဲကိုရိုက်ထည့်နိုင်ပါတယ်
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Probationary Period
 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 +110,Row {0}: Advance against Customer must be credit,row {0}: ဖောက်သည်ဆန့်ကျင်ကြိုတင်အကြွေးဖြစ်ရပါမည်
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ထောက်ပံ့ဝယ်ယူ Receipt Item
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,အခပေး
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,အခပေး
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime မှ
 DocType: SMS Settings,SMS Gateway URL,SMS ကို Gateway က URL ကို
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS ပေးပို့အဆင့်အတန်းကိုထိန်းသိမ်းသည် logs
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder အဆင့်
 DocType: Attendance,Attendance Date,တက်ရောက်သူနေ့စွဲ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ဝင်ငွေနဲ့ထုတ်ယူအပေါ်အခြေခံပြီးလစာအဖြစ်ခွဲထုတ်။
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,ကလေး nodes နဲ့အကောင့်ကိုလယ်ဂျာမှပြောင်းလဲမပြနိုင်
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,ကလေး nodes နဲ့အကောင့်ကိုလယ်ဂျာမှပြောင်းလဲမပြနိုင်
 DocType: Address,Preferred Shipping Address,ပိုဦးစားပေးသည် Shipping လိပ်စာ
 DocType: Purchase Receipt Item,Accepted Warehouse,လက်ခံထားတဲ့ဂိုဒေါင်
 DocType: Bank Reconciliation Detail,Posting Date,Post date
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,serial No {0} မတည်ရှိပါဘူး
 DocType: Pricing Rule,Discount Percentage,လျော့စျေးရာခိုင်နှုန်း
 DocType: Payment Reconciliation Invoice,Invoice Number,ကုန်ပို့လွှာနံပါတ်
-apps/erpnext/erpnext/hooks.py +54,Orders,အမိန့်
+apps/erpnext/erpnext/hooks.py +55,Orders,အမိန့်
 DocType: Leave Control Panel,Employee Type,ဝန်ထမ်းကအမျိုးအစား
 DocType: Employee Leave Approver,Leave Approver,ခွင့်ပြုချက် Leave
 DocType: Manufacturing Settings,Material Transferred for Manufacture,ထုတ်လုပ်ခြင်းများအတွက်သို့လွှဲပြောင်း material
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,ဒီအရောင်းအမိန့်ဆန့်ကျင်ကြေညာတဲ့ပစ္စည်း%
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,ကာလသင်တန်းဆင်းပွဲ Entry &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,လက်ရှိအရောင်းအနှင့်အတူကုန်ကျစရိတ် Center ကအုပ်စုအဖြစ်ပြောင်းလဲမပြနိုင်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,တန်ဖိုး
+DocType: Account,Depreciation,တန်ဖိုး
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ပေးသွင်းသူ (များ)
 DocType: Customer,Credit Limit,ခရက်ဒစ်ကန့်သတ်
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,အရောင်းအဝယ်အမျိုးအစားကိုရွေးပါ
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,အကြောင်းမူကားမေတ္တာရပ်ခံ
 DocType: Quotation Item,Against Doctype,DOCTYPE ဆန့်ကျင်
 DocType: Delivery Note,Track this Delivery Note against any Project,မည်သည့်စီမံကိန်းဆန့်ကျင်သည်ဤ Delivery Note ကိုခြေရာခံ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,root account ကိုဖျက်ပစ်မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,ရင်းနှီးမြှုပ်နှံမှုကနေ Net ကငွေ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,root account ကိုဖျက်ပစ်မရနိုင်ပါ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Show ကိုစတော့အိတ် Entries
 ,Is Primary Address,မူလတန်းလိပ်စာဖြစ်ပါသည်
 DocType: Production Order,Work-in-Progress Warehouse,အလုပ်လုပ်-In-တိုးတက်ရေးပါတီဂိုဒေါင်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},ကိုးကားစရာ # {0} {1} ရက်စွဲပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},ကိုးကားစရာ # {0} {1} ရက်စွဲပါ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,လိပ်စာ Manage
 DocType: Pricing Rule,Item Code,item Code ကို
 DocType: Production Planning Tool,Create Production Orders,ထုတ်လုပ်မှုအမိန့် Create
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,အသုံးပြုသူမှတ်ချက်
 DocType: Lead,Market Segment,Market မှာအပိုင်း
 DocType: Employee Internal Work History,Employee Internal Work History,ဝန်ထမ်းပြည်တွင်းလုပ်ငန်းခွင်သမိုင်း
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),(ဒေါက်တာ) ပိတ်ပွဲ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),(ဒေါက်တာ) ပိတ်ပွဲ
 DocType: Contact,Passive,မလှုပ်မရှားနေသော
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,{0} မစတော့ရှယ်ယာအတွက် serial No
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,အရောင်းအရောင်းချနေသည်အခွန် Simple template ။
@@ -2241,7 +2263,7 @@
 ,Billed Amount,ကြေညာတဲ့ငွေပမာဏ
 DocType: Bank Reconciliation,Bank Reconciliation,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Updates ကိုရယူပါ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,material တောင်းဆိုမှု {0} ကိုပယ်ဖျက်သို့မဟုတ်ရပ်တန့်နေသည်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,material တောင်းဆိုမှု {0} ကိုပယ်ဖျက်သို့မဟုတ်ရပ်တန့်နေသည်
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,အနည်းငယ်နမူနာမှတ်တမ်းများ Add
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,စီမံခန့်ခွဲမှု Leave
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,အကောင့်အားဖြင့်အုပ်စု
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","အမြတ်ခွန် / ပျောက်ဆုံးခြင်းကြိုတင်ဘွတ်ကင်လိမ့်မည်သည့်ဆိုက်အောက်ရှိ account ကိုဦးခေါင်း,"
 DocType: Payment Tool,Against Vouchers,ဘောက်ချာဆန့်ကျင်
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,လျင်မြန်စွာအကူအညီ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},အရင်းအမြစ်နှင့်ပစ်မှတ်ဂိုဒေါင်အတန်း {0} သည်အတူတူပင်ဖြစ်နိုင်သေး
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},အရင်းအမြစ်နှင့်ပစ်မှတ်ဂိုဒေါင်အတန်း {0} သည်အတူတူပင်ဖြစ်နိုင်သေး
 DocType: Features Setup,Sales Extras,အရောင်း Extras
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ကုန်ကျစရိတ် Center ကဆန့်ကျင်အကောင့်အတွက်ဘတ်ဂျက် {1} {2} {3} အားဖြင့်ကျော်လွန်ပါလိမ့်မယ်
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",ဒီစတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတစ်ဦးဖွင့်ပွဲ Entry ဖြစ်ပါတယ်ကတည်းကခြားနားချက်အကောင့်တစ်ခု Asset / ဆိုက်အမျိုးအစားအကောင့်ကိုရှိရမည်
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
 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; နောက်မှာဖြစ်ရပါမည်
 ,Stock Projected Qty,စတော့အိတ် Qty စီမံကိန်း
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
 DocType: Sales Order,Customer's Purchase Order,customer ရဲ့အမိန့်ကိုဝယ်ယူ
 DocType: Warranty Claim,From Company,ကုမ္ပဏီအနေဖြင့်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Value တစ်ခုသို့မဟုတ် Qty
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Block List ကို Allowed Leave
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,သင်ဟာ Login အသုံးပြုလိမ့်မည်
 DocType: Sales Partner,Retailer,လက်လီအရောင်းဆိုင်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,အကောင့်ကိုရန်အကြွေးတစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,အကောင့်ကိုရန်အကြွေးတစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,အားလုံးသည်ပေးသွင်းအမျိုးအစားများ
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Item တွေကိုအလိုအလျောက်နံပါတ်အမကဘယ်ကြောင့်ဆိုသော် item Code ကိုမသင်မနေရ
+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/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},{0} မဟုတ်အမျိုးအစားစျေးနှုန်း {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ပြုပြင်ထိန်းသိမ်းမှုဇယား Item
 DocType: Sales Order,%  Delivered,% ကယ်နှုတ်တော်မူ၏
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),အထုပ်၏စုစုပေါင်းအလေးချိန်။ ပိုက်ကွန်ကိုအလေးချိန် + ထုပ်ပိုးပစ္စည်းအလေးချိန်များသောအားဖြင့်။ (ပုံနှိပ်သည်)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ဒီအခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူများကအေးခဲအကောင့်အသစ်များ၏ ထား. ဖန်တီး / အေးစက်နေတဲ့အကောင့်အသစ်များ၏ဆန့်ကျင်စာရင်းကိုင် entries တွေကိုပြုပြင်မွမ်းမံဖို့ခွင့်ပြုနေကြတယ်
 DocType: Serial No,Is Cancelled,ဖျက်သိမ်းသည်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,ငါ့အတင်ပို့မှု
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,ငါ့အတင်ပို့မှု
 DocType: Journal Entry,Bill Date,ဘီလ်နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","အမြင့်ဆုံးဦးစားပေးနှင့်အတူမျိုးစုံစျေးနှုန်းများနည်းဥပဒေများရှိပါတယ်တောင်မှလျှင်, အောက်ပါပြည်တွင်းရေးဦးစားပေးလျှောက်ထားနေကြပါတယ်:"
 DocType: Supplier,Supplier Details,ပေးသွင်းအသေးစိတ်ကို
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,ဖုန်းခေါ်ဆိုမှု
 DocType: Project,Total Costing Amount (via Time Logs),(အချိန် Logs ကနေတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ
 DocType: Purchase Order Item Supplied,Stock UOM,စတော့အိတ် UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,ဝယ်ယူခြင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,ဝယ်ယူခြင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,စီမံကိန်း
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},serial No {0} ဂိုဒေါင် {1} ပိုင်ပါဘူး
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,မှတ်ချက်: System ကို Item သည်ပို့ဆောင်မှု-ထပ်ခါထပ်ခါ-ဘွတ်ကင်စစ်ဆေးမည်မဟုတ် {0} အရေအတွက်သို့မဟုတ်ပမာဏပါ 0 င်သည်အဖြစ်
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,မှတ်ချက်: System ကို Item သည်ပို့ဆောင်မှု-ထပ်ခါထပ်ခါ-ဘွတ်ကင်စစ်ဆေးမည်မဟုတ် {0} အရေအတွက်သို့မဟုတ်ပမာဏပါ 0 င်သည်အဖြစ်
 DocType: Notification Control,Quotation Message,စျေးနှုန်း Message
 DocType: Issue,Opening Date,နေ့စွဲဖွင့်လှစ်
 DocType: Journal Entry,Remark,ပွောဆို
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,Billing သည် Batched
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,ပေးသွင်းခြင်းဖြင့်ကြီးပြင်းဥပဒေကြမ်းများ။
 DocType: POS Profile,Write Off Account,အကောင့်ပိတ်ရေးထား
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,လျော့စျေးပမာဏ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ဝယ်ယူခြင်းပြေစာဆန့်ကျင်သို့ပြန်သွားသည်
 DocType: Item,Warranty Period (in days),(ရက်) ကိုအာမခံကာလ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,စစ်ဆင်ရေးကနေ Net ကငွေ
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,ဥပမာ VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,item 4
 DocType: Journal Entry Account,Journal Entry Account,ဂျာနယ် Entry အကောင့်
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Sales Invoice,Against Income Account,ဝင်ငွေခွန်အကောင့်ဆန့်ကျင်
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,ကယ်နှုတ်တော်မူ၏ {0}%
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
 DocType: Territory,Territory Targets,နယ်မြေတွေကိုပစ်မှတ်များ
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2421,10 +2443,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},batch အရေအတွက် Item {0} သည်မသင်မနေရ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,"ဒါကအမြစ်ရောင်းအားလူတစ်ဦးဖြစ်ပြီး, edited မရနိုင်ပါ။"
 ,Stock Ledger,စတော့အိတ်လယ်ဂျာ
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},rate: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,လစာစလစ်ဖြတ်ပိုင်းပုံစံထုတ်ယူ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,ပထမဦးဆုံးအဖွဲ့တစ်ဖွဲ့ node ကိုရွေးချယ်ပါ။
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},ရည်ရွယ်ချက် {0} တယောက်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},ရည်ရွယ်ချက် {0} တယောက်ဖြစ်ရပါမည်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,ပုံစံဖြည့်ခြင်းနှင့်ကယ်
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,သူတို့ရဲ့နောက်ဆုံးစာရင်းအဆင့်အတန်းနှင့်အတူအားလုံးကုန်ကြမ်းင်တစ်ဦးအစီရင်ခံစာ Download
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ကွန်မြူနတီဖိုရမ်၏
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,ကုမ္ပဏီ (မဖောက်သည်သို့မဟုတ်ပေးသွင်းသူ) သခင်သည်။
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',&#39;&#39; မျှော်မှန်း Delivery Date ကို &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery မှတ်စုများ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,Paid ပမာဏ + ငွေပမာဏက Grand စုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျပိတ်ရေးထား
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,Paid ပမာဏ + ငွေပမာဏက Grand စုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျပိတ်ရေးထား
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} Item {1} သည်မှန်ကန်သော Batch နံပါတ်မဟုတ်ပါဘူး
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},မှတ်ချက်: လုံလောက်တဲ့ခွင့်ချိန်ခွင်လျှာထွက်ခွာ Type {0} သည်မရှိ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","မှတ်ချက်: ငွေပေးချေမှုဆိုကိုးကားဆန့်ကျင်တော်မသည်မှန်လျှင်, ကို manually ဂျာနယ် Entry &#39;ပါစေ။"
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ပွင့်လင်းအဖြစ် Set
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,မ့အရောင်းအပေါ်ဆက်သွယ်ရန်မှအလိုအလျှောက်အီးမေးလ်များကိုပေးပို့ပါ။
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","row {0}: Qty {2} {3} အပေါ်ဂိုဒေါင် {1} အတွက် avalable မဟုတ်။ ရရှိနိုင်သည့် Qty: {4}, Qty လွှဲပြောင်း: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,item 3
 DocType: Purchase Order,Customer Contact Email,customer ဆက်သွယ်ရန်အီးမေးလ်
 DocType: Sales Team,Contribution (%),contribution (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,မှတ်ချက်: &#39;&#39; ငွေသို့မဟုတ်ဘဏ်မှအကောင့် &#39;&#39; သတ်မှတ်ထားသောမဟုတ်ခဲ့ကတည်းကငွေပေးချေမှုရမည့် Entry နေသူများကဖန်တီးမည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,မှတ်ချက်: &#39;&#39; ငွေသို့မဟုတ်ဘဏ်မှအကောင့် &#39;&#39; သတ်မှတ်ထားသောမဟုတ်ခဲ့ကတည်းကငွေပေးချေမှုရမည့် Entry နေသူများကဖန်တီးမည်မဟုတ်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,တာဝန်ဝတ္တရားများ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,template
 DocType: Sales Person,Sales Person Name,အရောင်းပုဂ္ဂိုလ်အမည်
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,ပြန်လည်သင့်မြတ်ရေးမဖြစ်မီ
 apps/erpnext/erpnext/support/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 +374,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 +383,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,တစ်စိတ်တစ်ပိုင်းကြေညာ
 DocType: Item,Default BOM,default BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,အတည်ပြုရန်ကုမ္ပဏီ၏နာမ-type ကိုပြန်လည် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,စုစုပေါင်းထူးချွန် Amt
 DocType: Time Log Batch,Total Hours,စုစုပေါင်းနာရီ
 DocType: Journal Entry,Printing Settings,ပုံနှိပ်ခြင်းက Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},စုစုပေါင်း Debit စုစုပေါင်းချေးငွေတန်းတူဖြစ်ရမည်။ အဆိုပါခြားနားချက် {0} သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},စုစုပေါင်း Debit စုစုပေါင်းချေးငွေတန်းတူဖြစ်ရမည်။ အဆိုပါခြားနားချက် {0} သည်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,မော်တော်ယာဉ်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Delivery မှတ်ချက်ထံမှ
 DocType: Time Log,From Time,အချိန်ကနေ
 DocType: Notification Control,Custom Message,custom Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ရင်းနှီးမြှုပ်နှံမှုဘဏ်လုပ်ငန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,ငွေသားသို့မဟုတ်ဘဏ်မှအကောင့်ငွေပေးချေမှု entry ကိုအောင်သည်မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,ငွေသားသို့မဟုတ်ဘဏ်မှအကောင့်ငွေပေးချေမှု entry ကိုအောင်သည်မသင်မနေရ
 DocType: Purchase Invoice,Price List Exchange Rate,စျေးနှုန်း List ကိုချိန်း Rate
 DocType: Purchase Invoice Item,Rate,rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,အလုပ်သင်ဆရာဝန်
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","အကွိမျမြားစှာစျေးနှုန်း Rule တူညီသောစံသတ်မှတ်ချက်များနှင့်အတူရှိနေတယ်, ဦးစားပေးသတ်မှတ်ခြင်းအားဖြင့်ပဋိပက္ခဖြေရှင်းရန် \ ကိုကျေးဇူးတင်ပါ။ စျေးနှုန်းနည်းဥပဒေများ: {0}"
 DocType: Account,Bank,ကမ်း
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,လကွောငျး
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,ပြဿနာပစ္စည်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,ပြဿနာပစ္စည်း
 DocType: Material Request Item,For Warehouse,ဂိုဒေါင်အကြောင်းမူကား
 DocType: Employee,Offer Date,ကမ်းလှမ်းမှုကိုနေ့စွဲ
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ကိုးကား
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,serial No
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Maintaince အသေးစိတ်ပထမဦးဆုံးရိုက်ထည့်ပေးပါ
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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 အမည်
+DocType: Payment Reconciliation,Maximum Invoice Amount,အမြင့်ဆုံးပမာဏပြေစာ
 DocType: Purchase Invoice Item,Image View,image ကိုကြည့်ရန်
 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 +553,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,ဂိုဒေါင်ထဲကနေ
 DocType: Purchase Taxes and Charges,Valuation and Total,အဘိုးပြတ်နှင့်စုစုပေါင်း
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ဒါဟာ Item {0} (Template) ၏ Variant ဖြစ်ပါတယ်။ &#39;မ Copy ကူး&#39; &#39;ကိုသတ်မှတ်ထားမဟုတ်လျှင် Attribute တွေတင်းပလိတ်ဖိုင်ကနေကော်ပီကူးပါလိမ့်မည်
 DocType: Account,Purchase User,ဝယ်ယူအသုံးပြုသူ
 DocType: Notification Control,Customize the Notification,ထိုအမိန့်ကြော်ငြာစာ Customize
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,စစ်ဆင်ရေးအနေဖြင့်ငွေသားဖြင့် Flow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,default လိပ်စာ Template ဖျက်ပြီးမရနိုင်ပါ
 DocType: Sales Invoice,Shipping Rule,သဘောင်္တင်ခ Rule
 DocType: Journal Entry,Print Heading,ပုံနှိပ် HEAD
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,ကုန်ကြမ်း
 DocType: Leave Application,Follow via Email,အီးမေးလ်ကနေတဆင့် Follow
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,လျှော့ငွေပမာဏပြီးနောက်အခွန်ပမာဏ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,ကလေးသူငယ်အကောင့်ကိုဒီအကောင့်ရှိနေပြီ။ သင်သည်ဤအကောင့်ကိုမဖျက်နိုင်ပါ။
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Post date ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Item {0} သည် serial အမှတ်လိုအပ်ပါသည်
 DocType: Journal Entry,Bank Entry,ဘဏ်မှ Entry &#39;
 DocType: Authorization Rule,Applicable To (Designation),(သတ်မှတ်ပေးထားခြင်း) ရန်သက်ဆိုင်သော
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,စျေးဝယ်ခြင်းထဲသို့ထည့်သည်
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group မှဖြင့်
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Enable / ငွေကြေးများ disable ။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,စာတိုက်အသုံးစရိတ်များ
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment က &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,ထပ်တလဲလဲအမိန့်ရပ်တန့်ဖြစ်ရလိမ့်မည်သည့်နေ့ရက်
 DocType: Quality Inspection,Item Serial No,item Serial No
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} လျှော့ချရမည်သို့မဟုတ်သင်လျတ်သည်းခံစိတ်ကိုတိုးမြှင့်သင့်ပါတယ်
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} လျှော့ချရမည်သို့မဟုတ်သင်လျတ်သည်းခံစိတ်ကိုတိုးမြှင့်သင့်ပါတယ်
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,စုစုပေါင်းလက်ရှိ
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,နာရီ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serial Item {0} စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးကို အသုံးပြု. \ updated မရနိုင်ပါ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,ပေးသွင်းဖို့ပစ္စည်းလွှဲပြောင်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,ပေးသွင်းဖို့ပစ္စည်းလွှဲပြောင်း
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,စျေးနှုန်း Create
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,သငျသညျ Block ကိုနေ့အပေါ်အရွက်အတည်ပြုခွင့်ကြသည်မဟုတ်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,အားလုံးသည်ဤပစ္စည်းများကိုပြီးသား invoiced ပြီ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,အားလုံးသည်ဤပစ္စည်းများကိုပြီးသား invoiced ပြီ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ကအတည်ပြုနိုင်ပါတယ်
 DocType: Shipping Rule,Shipping Rule Conditions,သဘောင်္တင်ခ Rule စည်းကမ်းချက်များ
 DocType: BOM Replace Tool,The new BOM after replacement,အစားထိုးပြီးနောက်အသစ် BOM
 DocType: Features Setup,Point of Sale,ရောင်းမည်၏ပွိုင့်
 DocType: Account,Tax,အခွန်
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},row {0}: {1} တရားဝင် {2} မဟုတ်ပါဘူး
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုမှသည်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုမှသည်
 DocType: Production Planning Tool,Production Planning Tool,ထုတ်လုပ်မှုစီမံကိန်း Tool ကို
 DocType: Quality Inspection,Report Date,အစီရင်ခံစာနေ့စွဲ
 DocType: C-Form,Invoices,ငွေတောင်းခံလွှာ
 DocType: Job Opening,Job Title,အလုပ်အကိုင်အမည်
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} လက်ခံရယူ
 DocType: Features Setup,Item Groups in Details,အသေးစိတ်အတွက် item အဖွဲ့များ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,ထုတ်လုပ်ခြင်းမှအရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်။
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start ကို Point-of Sale (POS)
@@ -2618,8 +2644,9 @@
 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: Pricing Rule,Customer Group,ဖောက်သည်အုပ်စု
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},စရိတ် account item ကို {0} သည်မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},စရိတ် account item ကို {0} သည်မသင်မနေရ
 DocType: Item,Website Description,website ဖော်ပြချက်များ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Equity အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Serial No,AMC Expiry Date,AMC သက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
 ,Sales Register,အရောင်းမှတ်ပုံတင်မည်
 DocType: Quotation,Quotation Lost Reason,စျေးနှုန်းပျောက်ဆုံးသွားသောအကြောင်းရင်း
@@ -2627,12 +2654,12 @@
 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 +108,Summary for this month and pending activities,ဒီလအတှကျအကျဉ်းချုပ်နှင့် Pend လှုပ်ရှားမှုများ
 DocType: Customer Group,Customer Group Name,ဖောက်သည်အုပ်စုအမည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,Attribute တွေ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,ပစ္စည်းများ Get
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,အကောင့်ပိတ်ရေးထားရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,ပစ္စည်းများ Get
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,အကောင့်ပိတ်ရေးထားရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,နောက်ဆုံးအမိန့်နေ့စွဲ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,ယစ်မျိုးပြေစာလုပ်ပါ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Project သည်ပညာ data တွေကိုစျေးနှုန်းသည်မရရှိနိုင်ပါသည်
 DocType: Project,Expected End Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲ
 DocType: Appraisal Template,Appraisal Template Title,စိစစ်ရေး Template: ခေါင်းစဉ်မရှိ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,မိဘတစ် Item {0} တစ်စတော့အိတ်ပစ္စည်းမဖြစ်ရပါမည်
 DocType: Cost Center,Distribution Id,ဖြန့်ဖြူး Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome ကိုန်ဆောင်မှုများ
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Attribute တန်ဖိုး {0} {1} {3} ၏ထပ်တိုး {2} မှများ၏အကွာအဝေးအတွင်းဖြစ်ရပါမည်
 DocType: Tax Rule,Sales,အရောင်း
 DocType: Stock Entry Detail,Basic Amount,အခြေခံပညာပမာဏ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
 DocType: Leave Allocation,Unused leaves,အသုံးမပြုသောအရွက်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,default receiver Accounts ကို
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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 ကို
 DocType: Landed Cost Voucher,Purchase Receipts,ဝယ်ယူလက်ခံ
-DocType: Payment Reconciliation,Maximum Amount,အမြင့်ဆုံးပမာဏ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,ဘယ်လိုစျေးနှုန်းများ Rule လျှောက်ထားသလဲ?
 DocType: Quality Inspection,Delivery Note No,Delivery မှတ်ချက်မရှိပါ
 DocType: Company,Retail,လက်လီ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,customer {0} မတည်ရှိပါဘူး
 DocType: Attendance,Absent,မရှိသော
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},row {0}: မမှန်ကန်ခြင်းရည်ညွှန်းကိုးကား {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},row {0}: မမှန်ကန်ခြင်းရည်ညွှန်းကိုးကား {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,အခွန်နှင့်စွပ်စွဲချက် Template ဝယ်ယူ
 DocType: Upload Attendance,Download Template,ဒေါင်းလုပ် Template:
 DocType: GL Entry,Remarks,အမှာစကား
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,လစဉ်တက်ရောက် Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,စံချိန်မျှမတွေ့ပါ
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ကုန်ကျစရိတ် Center က Item {2} သည်မသင်မနေရ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,အကောင့်ကို {0} လှုပျမရှားသည်
 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,နေ့စွဲရန်နေ့စွဲနှင့်တက်ရောက် မှစ. တက်ရောက်သူမသင်မနေရ
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Entry &#39;ဖွင့်လှစ်ခွင့်ပြုမ&#39; &#39;အကျိုးအမြတ်နှင့်ဆုံးရှုံးမှု&#39; &#39;type ကိုအကောင့်ကို {0}
 DocType: Features Setup,Sales Discounts,အရောင်းလျှော့စျေး
 DocType: Hub Settings,Seller Country,ရောင်းချသူနိုင်ငံ
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,ဝက်ဘ်ဆိုက်ပေါ်တွင်ပစ္စည်းများ Publish
 DocType: Authorization Rule,Authorization Rule,authorization Rule
 DocType: Sales Invoice,Terms and Conditions Details,စည်းကမ်းသတ်မှတ်ချက်များအသေးစိတ်ကို
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,သတ်မှတ်ချက်များ
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,အရောင်းအခွန်နှင့်စွပ်စွဲချက် Template:
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,အဝတ်အထည်နှင့်ဆက်စပ်ပစ္စည်းများ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,အမိန့်အရေအတွက်
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,ငွေတောင်းခံငွေပမာဏ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,ကို item {0} သည်သတ်မှတ်ထားသောမမှန်ကန်ခြင်းအရေအတွက်။ အရေအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်သင့်သည်။
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,ခွင့်သည်ပလီကေးရှင်း။
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုဖျက်ပစ်မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုဖျက်ပစ်မရနိုင်ပါ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ဥပဒေရေးရာအသုံးစရိတ်များ
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","အော်တိုအမိန့် 05, 28 စသည်တို့ကိုဥပမာ generated လိမ့်မည်ဟူသောရက်နေ့တွင်လ၏နေ့"
 DocType: Sales Invoice,Posting Time,posting အချိန်
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,ပျက်သည်
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,အကောင့်ဖွင်: {0} ငွေကြေးနှင့်အတူ: {1} ကိုရှေးခယျြမရနိုငျ
 DocType: Bank Reconciliation Detail,Cheque Date,Cheques နေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},အကောင့်ကို {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီပိုင်ပါဘူး: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},အကောင့်ကို {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီပိုင်ပါဘူး: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,အောင်မြင်စွာဒီကုမ္ပဏီနှင့်ဆက်စပ်သောအားလုံးအရောင်းအဖျက်ပြီး!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,နေ့စွဲအပေါ်အဖြစ်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,အစမ်းထား
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,default ဂိုဒေါင်စတော့ရှယ်ယာ Item တွေအတွက်မဖြစ်မနေဖြစ်ပါတယ်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,default ဂိုဒေါင်စတော့ရှယ်ယာ Item တွေအတွက်မဖြစ်မနေဖြစ်ပါတယ်။
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},လ {0} သည်လစာ၏ငွေပေးချေမှုရမည့်နှင့်တစ်နှစ် {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,auto INSERT စျေးနှုန်းကိုစာရင်းနှုန်းကပျောက်ဆုံးနေဆဲလျှင်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,စုစုပေါင်း Paid ငွေပမာဏ
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),(အချိန် Logs ကနေတဆင့်) စုစုပေါင်း Billing ငွေပမာဏ
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,ကျွန်ုပ်တို့သည်ဤ Item ရောင်းချ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ပေးသွင်း Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,အရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်သင့်
 DocType: Journal Entry,Cash Entry,ငွေသား Entry &#39;
 DocType: Sales Partner,Contact Desc,ဆက်သွယ်ရန် Desc
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","ကျပန်း, ဖျားနာစသည်တို့ကဲ့သို့သောအရွက်အမျိုးအစား"
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Accounts ကိုအပေါ်နှစ်စဉ်ဘတ်ဂျက်တင်ထားရန်တန်းစီထည့်ပါ။
 DocType: Buying Settings,Default Supplier Type,default ပေးသွင်း Type
 DocType: Production Order,Total Operating Cost,စုစုပေါင်း Operating ကုန်ကျစရိတ်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,မှတ်စု: Item {0} အကြိမ်ပေါင်းများစွာသို့ဝင်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,မှတ်စု: Item {0} အကြိမ်ပေါင်းများစွာသို့ဝင်
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,အားလုံးသည်ဆက်သွယ်ရန်။
 DocType: Newsletter,Test Email Id,စမ်းသပ်မှုအီးမေးလ် Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,ကုမ္ပဏီအတိုကောက်
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,အခွန် Template ကိုမဖြစ်မနေဖြစ်ပါတယ်။
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} မတည်ရှိပါဘူး
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),စျေးနှုန်း List ကို Rate (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Account,Temporary,ယာယီ
 DocType: Address,Preferred Billing Address,ပိုဦးစားပေးသည် Billing လိပ်စာ
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,item ပညာစျေးနှုန်း List ကို Rate
 DocType: Purchase Order Item,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
 DocType: Quotation,In Words will be visible once you save the Quotation.,သင်စျေးနှုန်းကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} ရပ်တန့်နေသည်
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} ရပ်တန့်နေသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
 DocType: Lead,Add to calendar on this date,ဒီနေ့စွဲအပေါ်ပြက္ခဒိန်မှ Add
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,သင်္ဘောစရိတ်ပေါင်းထည့်သည်နည်းဥပဒေများ။
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,လာမည့်အဖြစ်အပျက်များ
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,ခဲကနေ
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,ထုတ်လုပ်မှုပြန်လွှတ်ပေးခဲ့အမိန့်။
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Hub Settings,Name Token,Token အမည်
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,စံရောင်းချသည့်
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast တယောက်ဂိုဒေါင်မသင်မနေရ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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,အာမခံထဲက
 DocType: BOM Replace Tool,Replace,အစားထိုးဖို့
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} အရောင်းပြေစာ {1} ဆန့်ကျင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,တိုင်း၏ default အနေနဲ့ယူနစ်ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} အရောင်းပြေစာ {1} ဆန့်ကျင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,တိုင်း၏ default အနေနဲ့ယူနစ်ကိုရိုက်ထည့်ပေးပါ
 DocType: Purchase Invoice Item,Project Name,စီမံကိန်းအမည်
 DocType: Supplier,Mention if non-standard receivable account,Non-စံ receiver အကောင့်ကိုလျှင်ဖော်ပြထားခြင်း
 DocType: Journal Entry Account,If Income or Expense,ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုမယ်ဆိုရင်
 DocType: Features Setup,Item Batch Nos,item Batch အမှတ်
 DocType: Stock Ledger Entry,Stock Value Difference,စတော့အိတ် Value တစ်ခု Difference
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,လူ့စွမ်းအားအရင်းအမြစ်
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,လူ့စွမ်းအားအရင်းအမြစ်
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ငွေပေးချေမှုရမည့်ပြန်လည်ရင်ကြားစေ့ရေးငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,အခွန်ပိုင်ဆိုင်မှုများ
 DocType: BOM Item,BOM No,BOM မရှိပါ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,ဂျာနယ် Entry &#39;{0} အကောင့်ကို {1} များသို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,Journal Entry {0} does not have account {1} or already matched against other voucher,ဂျာနယ် Entry &#39;{0} အကောင့်ကို {1} များသို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
 DocType: Item,Moving Average,ပျမ်းမျှ Moving
 DocType: BOM Replace Tool,The BOM which will be replaced,အဆိုပါ BOM အစားထိုးခံရလိမ့်မည်ဟူသော
 DocType: Account,Debit,debit
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,အပိုဆောင်းကုန်ကျစရိတ်
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,ဘဏ္ဍာရေးတစ်နှစ်တာအဆုံးနေ့စွဲ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","ဘောက်ချာများကအုပ်စုဖွဲ့လျှင်, voucher မရှိပါအပေါ်အခြေခံပြီး filter နိုင်ဘူး"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
 DocType: Quality Inspection,Incoming,incoming
 DocType: BOM,Materials Required (Exploded),လိုအပ်သောပစ္စည်းများ (ပေါက်ကွဲ)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Pay (LWP) မရှိရင်ထွက်ခွာသည်အလုပ်လုပ်ပြီးဝင်ငွေကိုလျော့ချ
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},row # {0}: Serial မရှိပါ {1} {2} {3} နှင့်ကိုက်ညီမပါဘူး
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,ကျပန်းထွက်ခွာ
 DocType: Batch,Batch ID,batch ID ကို
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},မှတ်စု: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},မှတ်စု: {0}
 ,Delivery Note Trends,Delivery မှတ်ချက်ခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,This Week ရဲ့အကျဉ်းချုပ်
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} အတန်း {1} အတွက်ဝယ်ယူသို့မဟုတ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,AVG ။ ဝယ်ယူ Rate
 DocType: Task,Actual Time (in Hours),(နာရီအတွက်) အမှန်တကယ်အချိန်
 DocType: Employee,History In Company,ကုမ္ပဏီခုနှစ်တွင်သမိုင်းကြောင်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,သတင်းလွှာ
 DocType: Address,Shipping,သင်္ဘောဖြင့်ကုန်ပစ္စည်းပို့ခြင်း
 DocType: Stock Ledger Entry,Stock Ledger Entry,စတော့အိတ်လယ်ဂျာ Entry &#39;
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,လက်ရှိအမိန့်ရဲ့ကာလ၏အဆုံးနေ့စွဲ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ကမ်းလှမ်းချက်ပေးစာလုပ်ပါ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,ပြန်လာ
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ Template ကိုအဖြစ်အတူတူဖြစ်ရပါမည်
 DocType: Production Order Operation,Production Order Operation,ထုတ်လုပ်မှုအမိန့်စစ်ဆင်ရေး
 DocType: Pricing Rule,Disable,ကို disable
 DocType: Project Task,Pending Review,ဆိုင်းငံ့ထားပြန်လည်ဆန်းစစ်ခြင်း
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,customer Id
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,အချိန်မှအချိန် မှစ. ထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Journal Entry Account,Exchange Rate,ငွေလဲလှယ်နှုန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,အရောင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,အရောင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},ဂိုဒေါင် {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီက {2} မှ bolong ပါဘူး
 DocType: BOM,Last Purchase Rate,နောက်ဆုံးဝယ်ယူ Rate
 DocType: Account,Asset,Asset
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,ပစ္စည်းများထုပ်ပိုးရရှိနိုင်ပါသည်စတော့အိတ်
 DocType: Item Variant,Item Variant,item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,ငါမှတပါးအခြားသော default အရှိအဖြစ်ကို default အတိုင်းဤလိပ်စာ Template ပြင်ဆင်ခြင်း
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
 DocType: Production Planning Tool,Filter based on customer,ဖောက်သည်အပေါ်အခြေခံပြီး filter
 DocType: Payment Tool Detail,Against Voucher No,ဘောက်ချာမရှိဆန့်ကျင်
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,Next ကိုဆက်သွယ်ရန်
 DocType: Employee,Employment Type,အလုပ်အကိုင်အခွင့်အကအမျိုးအစား
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Fixed ပိုင်ဆိုင်မှုများ
+,Cash Flow,ငွေလည်ပတ်မှု
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,ပလီကေးရှင်းကာလအတွင်းနှစ်ဦး alocation မှတ်တမ်းများကိုဖြတ်ပြီးမဖွစျနိုငျ
 DocType: Item Group,Default Expense Account,default သုံးစွဲမှုအကောင့်
 DocType: Employee,Notice (days),အသိပေးစာ (ရက်)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,ကုနျလှောငျရုံ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,ပုံနှိပ်နှင့်စာရေး
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,အုပ်စု Node
-DocType: Payment Reconciliation,Minimum Amount,နိမ့်ဆုံးပမာဏ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Finished ကုန်စည် Update
 DocType: Workstation,per hour,တစ်နာရီကို
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,အဆိုပါကုန်လှောင်ရုံ (ထာဝရစာရင်း) ကိုအကောင့်ကိုဒီအကောင့်အောက်မှာနေသူများကဖန်တီးလိမ့်မည်။
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,စတော့ရှယ်ယာလယ်ဂျာ entry ကိုဒီကိုဂိုဒေါင်သည်တည်ရှိအဖြစ်ဂိုဒေါင်ဖျက်ပြီးမရနိုင်ပါ။
 DocType: Company,Distribution,ဖြန့်ဝေ
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Paid ငွေပမာဏ
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Paid ငွေပမာဏ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,စီမံကိန်းမန်နေဂျာ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,item တခုကိုခွင့်ပြုထား max ကိုလျှော့စျေး: {0} သည် {1}%
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ပံ့ပိုးမှု Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},ကုမ္ပဏီဂိုဒေါင် {0} ပျောက်ဆုံးနေသည်
 DocType: POS Profile,Terms and Conditions,စည်းကမ်းနှင့်သတ်မှတ်ချက်များ
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},နေ့စွဲဖို့ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းတွင်သာဖြစ်သင့်သည်။ နေ့စွဲ = {0} နိုင်ရန်ယူဆ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},နေ့စွဲဖို့ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းတွင်သာဖြစ်သင့်သည်။ နေ့စွဲ = {0} နိုင်ရန်ယူဆ
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ဒီနေရာတွင်အမြင့်, အလေးချိန်, ဓါတ်မတည်, ဆေးဘက်ဆိုင်ရာစိုးရိမ်ပူပန်မှုများစသည်တို့ကိုထိန်းသိမ်းထားနိုင်ပါတယ်"
 DocType: Leave Block List,Applies to Company,ကုမ္ပဏီသက်ဆိုင်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"တင်သွင်းစတော့အိတ် Entry &#39;{0} တည်ရှိသောကြောင့်, ဖျက်သိမ်းနိုင်ဘူး"
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,ဝယ်ယူလက်ခံရိုက်ထည့်ပေးပါ
 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 +425,Transaction not allowed against stopped Production Order {0},transaction ရပ်တန့်ထုတ်လုပ်ရေးအမိန့် {0} ဆန့်ကျင်ခွင့်မပြု
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),အထောက်အပံ့အီးမေးလ်က id သည် Setup ကိုအဝင် server ကို။ (ဥပမာ support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ပြတ်လပ်မှု Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 DocType: Salary Slip,Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;&#39; နေ့စွဲရန် &#39;&#39; လိုအပ်သည်
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ကယ်နှုတ်တော်မူ၏ခံရဖို့အစုအထုပ်ကိုတနိုင်ငံအညွန့ထုပ်ပိုး Generate ။ package ကိုနံပါတ်, package ကို contents တွေကိုနှင့်၎င်း၏အလေးချိန်အကြောင်းကြားရန်အသုံးပြုခဲ့ကြသည်။"
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,ဝန်ထမ်းမှတ်တမ်းများ။
 DocType: HR Settings,Payroll Settings,လုပ်ခလစာ Settings ကို
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Non-နှင့်ဆက်စပ်ငွေတောင်းခံလွှာနှင့်ပေးသွင်းခြင်းနှင့်ကိုက်ညီ။
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,အရပ်ဌာနအမိန့်
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,အရပ်ဌာနအမိန့်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,အမြစ်မိဘတစ်ဦးကုန်ကျစရိတ်အလယ်ဗဟိုရှိသည်မဟုတ်နိုင်
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ကုန်အမှတ်တံဆိပ်ကိုရွေးပါ ...
 DocType: Sales Invoice,C-Form Applicable,သက်ဆိုင်သည့် C-Form တွင်
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,စတင်သည့်ရက်စွဲ
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,တစ်ဦးကာလသည်အရွက်ခွဲဝေချထားပေးရန်။
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,အတည်ပြုရန်ဤနေရာကိုနှိပ်ပါ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,အကောင့်ကို {0}: သင့်မိဘအကောင့်ကိုတခုအဖြစ်သတ်မှတ်လို့မရပါဘူး
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,အကောင့်ကို {0}: သင့်မိဘအကောင့်ကိုတခုအဖြစ်သတ်မှတ်လို့မရပါဘူး
 DocType: Purchase Invoice Item,Price List Rate,စျေးနှုန်း List ကို Rate
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",ဒီကိုဂိုဒေါင်ထဲမှာရရှိနိုင်စတော့ရှယ်ယာအပေါ်အခြေခံပြီး &quot;မစတော့အိတ်အတွက်&quot; &quot;စတော့အိတ်ခုနှစ်တွင်&quot; Show သို့မဟုတ်။
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),ပစ္စည်းများ၏ဘီလ် (BOM)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,မျှော်လင့်ထားသည့် Start ကိုနေ့စွဲ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,စွဲချက်က item တခုကိုသက်ဆိုင်မဖြစ်လျှင်တဲ့ item Remove
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,eg ။ smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,လက်ခံရရှိ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,လက်ခံရရှိ
 DocType: Maintenance Visit,Fully Completed,အပြည့်အဝပြီးစီး
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,Complete {0}%
 DocType: Employee,Educational Qualification,ပညာရေးဆိုင်ရာအရည်အချင်း
 DocType: Workstation,Operating Costs,operating ကုန်ကျစရိတ်
 DocType: Employee Leave Approver,Employee Leave Approver,ဝန်ထမ်းထွက်ခွာခွင့်ပြုချက်
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} အောင်မြင်စွာကျွန်တော်တို့ရဲ့သတင်းလွှာစာရင်းတွင်ထည့်သွင်းခဲ့သည်။
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},row {0}: An Reorder entry ကိုပြီးသားဒီကိုဂိုဒေါင် {1} သည်တည်ရှိ
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","ဆုံးရှုံးအဖြစ်စျေးနှုန်းကိုဖန်ဆင်းခဲ့ပြီးကြောင့်, ကြေညာလို့မရပါဘူး။"
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ဝယ်ယူမဟာ Manager က
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,ထုတ်လုပ်မှုအမိန့် {0} တင်သွင်းရမည်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,ထုတ်လုပ်မှုအမိန့် {0} တင်သွင်းရမည်
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Item {0} သည် Start ကိုနေ့စွဲနဲ့ End Date ကို select လုပ်ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,အဓိကအစီရင်ခံစာများ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ယနေ့အထိသည့်နေ့ရက်မှခင်မဖွစျနိုငျ
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,စက်မှုဝန်ကြီး Type
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,တစ်ခုခုမှားသွားတယ်!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,သတိပေးချက်: Leave ပလီကေးရှင်းအောက်ပါလုပ်ကွက်ရက်စွဲများင်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,အရောင်းပြေစာ {0} ပြီးသားတင်သွင်းခဲ့
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,အရောင်းပြေစာ {0} ပြီးသားတင်သွင်းခဲ့
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,ပြီးစီးနေ့စွဲ
 DocType: Purchase Invoice Item,Amount (Company Currency),ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,အစည်းအရုံးယူနစ် (ဌာန၏) သခင်သည်။
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,serial No Service ကိုစာချုပ်သက်တမ်းကုန်ဆုံး
 DocType: Item,Unit of Measure Conversion,တိုင်းကူးပြောင်းခြင်း၏ယူနစ်
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,ဝန်ထမ်းမပြောင်းနိုင်ဘူး
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,သင်တစ်ချိန်တည်းမှာအတူတူအကောင့်ကိုချေးငွေနှင့်ငွေကြိုမပေးနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,သင်တစ်ချိန်တည်းမှာအတူတူအကောင့်ကိုချေးငွေနှင့်ငွေကြိုမပေးနိုငျ
 DocType: Naming Series,Help HTML,HTML ကိုကူညီပါ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},တာဝန်ပေးစုစုပေါင်း weightage 100% ဖြစ်သင့်သည်။ ဒါဟာ {0} သည်
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},{0} over- ခွင့် Item {1} သည်ကိုကူး
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},{0} over- ခွင့် Item {1} သည်ကိုကူး
 DocType: Address,Name of person or organization that this address belongs to.,ဒီလိပ်စာကိုပိုင်ဆိုင်ကြောင်းလူတစ်ဦးသို့မဟုတ်အဖွဲ့အစည်း၏အမည်ပြောပါ။
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,သင့်ရဲ့ပေးသွင်း
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,အရောင်းအမိန့်ကိုဖန်ဆင်းသည်အဖြစ်ပျောက်ဆုံးသွားသောအဖြစ်သတ်မှတ်လို့မရပါဘူး။
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,ထုတ်ဝေသည့်ရက်စွဲ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: {0} {1} သည် မှစ.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,website က Image ကို {0} ပစ္စည်းမှပူးတွဲပါ {1} မတွေ့ရှိနိုင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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 စာရင်း။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,အခြားအငွေကြေးကိုနှင့်အတူအကောင့်အသစ်များ၏ခွင့်ပြုပါရန်ဘက်စုံငွေကြေးစနစ် option ကိုစစ်ဆေးပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,အခြားအငွေကြေးကိုနှင့်အတူအကောင့်အသစ်များ၏ခွင့်ပြုပါရန်ဘက်စုံငွေကြေးစနစ် option ကိုစစ်ဆေးပါ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,item: {0} system ကိုအတွက်မတည်ရှိပါဘူး
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,သင်က Frozen တန်ဖိုးကိုသတ်မှတ်ခွင့်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,သင်က Frozen တန်ဖိုးကိုသတ်မှတ်ခွင့်မဟုတ်
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled Entries Get
+DocType: Payment Reconciliation,From Invoice Date,ပြေစာနေ့စွဲထဲကနေ
 DocType: Cost Center,Budgets,ဘတ်ဂျက်
-DocType: Employee,Emergency Contact Details,အရေးပေါ်ဆက်သွယ်ရန်အသေးစိတ်
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,ဒါကြောင့်အဘယ်သို့ပြုရပါသနည်း?
 DocType: Delivery Note,To Warehouse,ဂိုဒေါင်မှ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},အကောင့်ကို {0} ဘဏ္ဍာရေးနှစ်များအတွက် {1} တစ်ကြိမ်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
 ,Average Commission Rate,ပျမ်းမျှအားဖြင့်ကော်မရှင် Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,တက်ရောက်သူအနာဂတ်ရက်စွဲများကိုချောင်းမြောင်းမရနိုင်ပါ
 DocType: Pricing Rule,Pricing Rule Help,စျေးနှုန်း Rule အကူအညီ
 DocType: Purchase Taxes and Charges,Account Head,အကောင့်ဖွင့်ဦးခေါင်း
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,ပစ္စည်းများဆင်းသက်ကုန်ကျစရိတ်ကိုတွက်ချက်ဖို့အပိုဆောင်းကုန်ကျစရိတ်များကို Update
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,electrical
 DocType: Stock Entry,Total Value Difference (Out - In),(- ခုနှစ်တွင် Out) စုစုပေါင်းတန်ဖိုး Difference
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,row {0}: ငွေလဲနှုန်းမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,row {0}: ငွေလဲနှုန်းမဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},အသုံးပြုသူ ID န်ထမ်း {0} သည်စွဲလမ်းခြင်းမ
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,အာမခံပြောဆိုချက်ကိုထံမှ
 DocType: Stock Entry,Default Source Warehouse,default Source ကိုဂိုဒေါင်
 DocType: Item,Customer Code,customer Code ကို
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},{0} သည်မွေးနေသတိပေး
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. ရက်ပတ်လုံး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,စတော့အိတ်ပိုင်ဆိုင်မှုများ
@@ -3271,7 +3301,7 @@
 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 ၏ဖြစ်ရပါမည်
 DocType: Authorization Rule,Based On,ပေါ်အခြေခံကာ
 DocType: Sales Order Item,Ordered Qty,အမိန့် Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,item {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,item {0} ပိတ်ထားတယ်
 DocType: Stock Settings,Stock Frozen Upto,စတော့အိတ် Frozen အထိ
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},မှစ. နှင့်ကာလ {0} ထပ်တလဲလဲများအတွက်မဖြစ်မနေရက်စွဲများရန် period
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,စီမံကိန်းလှုပ်ရှားမှု / အလုပ်တစ်ခုကို။
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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 ထက်လျော့နည်းဖြစ်ရမည်
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ဟာ Off ရေးဖို့ပမာဏ (Company မှငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
 DocType: Landed Cost Voucher,Landed Cost Voucher,ကုန်ကျစရိတ်ဘောက်ချာဆင်းသက်
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},{0} set ကျေးဇူးပြု.
 DocType: Purchase Invoice,Repeat on Day of Month,Month ရဲ့နေ့တွင် Repeat
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,တက်ရောက် upload
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM နှင့်ကုန်ထုတ်လုပ်မှုပမာဏလိုအပ်သည်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,ငွေပမာဏ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,ငွေပမာဏ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM အစားထိုး
 ,Sales Analytics,အရောင်း Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,ကုန်ထုတ်လုပ်မှု Settings ကို
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,အီးမေးလ်ကိုတည်ဆောက်ခြင်း
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,ကုမ္ပဏီနှင့် Master အတွက် default အနေနဲ့ငွေကြေးရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Daily သတင်းစာသတိပေးချက်များ
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},{0} နှင့်အတူအခွန်နည်းဥပဒေပဋိပက္ခ
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,ထုတ်လုပ်ပမာဏ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,အင်ဂျင်နီယာ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ရှာဖွေရန် Sub စညျးဝေး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့် item Code ကို
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့် item Code ကို
 DocType: Sales Partner,Partner Type,partner ကအမျိုးအစား
 DocType: Purchase Taxes and Charges,Actual,အမှန်တကယ်
 DocType: Authorization Rule,Customerwise Discount,Customerwise လျှော့
 DocType: Purchase Invoice,Against Expense Account,အသုံးအကောင့်ဆန့်ကျင်
 DocType: Production Order,Production Order,ထုတ်လုပ်မှုအမိန့်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installation မှတ်ချက် {0} ပြီးသားတင်သွင်းခဲ့
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Installation မှတ်ချက် {0} ပြီးသားတင်သွင်းခဲ့
 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,အခုတော့ကြည့်ရန်
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,သက်ဆိုင်အားလပ်ရက်များစာရင်း
 DocType: Employee,Cheque,Cheques
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,စီးရီး Updated
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,အစီရင်ခံစာ Type မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,အစီရင်ခံစာ Type မသင်မနေရ
 DocType: Item,Serial Number Series,serial နံပါတ်စီးရီး
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},ဂိုဒေါင်တန်းအတွက်စတော့ရှယ်ယာ Item {0} သည်မသင်မနေရ {1}
 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/public/js/setup_wizard.js +101,The First User: You,The First အသုံးပြုသူ: သင့်
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,အောင်မြင်စွာ ပြန်.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,အောင်မြင်စွာ ပြန်.
 DocType: Production Order,Planned End Date,စီစဉ်ထားတဲ့အဆုံးနေ့စွဲ
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,အဘယ်မှာရှိပစ္စည်းများကိုသိမ်းဆည်းထားသည်။
 DocType: Tax Rule,Validity,တရားဝင်မှု
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,သွားရောက်ရှိနေခြင်း
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,ရက်စွဲနှင့် posting အချိန်များသို့တင်ပြမသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,ရက်စွဲနှင့် posting အချိန်များသို့တင်ပြမသင်မနေရ
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,အရောင်းအဝယ်သည်အခွန် Simple template ။
 ,Item Prices,item ဈေးနှုန်းများ
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,သင်ဝယ်ယူခြင်းအမိန့်ကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,ပြန်လည်ဆန်းစစ်ခြင်းနေ့စွဲ
 DocType: Purchase Invoice,Advance Payments,ငွေပေးချေရှေ့တိုး
 DocType: Purchase Taxes and Charges,On Net Total,Net ကစုစုပေါင်းတွင်
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,အတန်းအတွက်ပစ်မှတ်ဂိုဒေါင် {0} ထုတ်လုပ်မှုအမိန့်အဖြစ်အတူတူသာဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,အတန်းအတွက်ပစ်မှတ်ဂိုဒေါင် {0} ထုတ်လုပ်မှုအမိန့်အဖြစ်အတူတူသာဖြစ်ရမည်
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,ငွေပေးချေမှုရမည့် Tool ကိုအသုံးပွုဖို့မရှိပါခွင့်ပြုချက်
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% s ထပ်တလဲလဲသည်သတ်မှတ်ထားသောမဟုတ် &#39;&#39; အမိန့်ကြော်ငြာစာအီးမေးလ်လိပ်စာ &#39;&#39;
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,ငွေကြေးအချို့သောအခြားငွေကြေးသုံးပြီး entries တွေကိုချမှတ်ပြီးနောက်ပြောင်းလဲသွားမရနိုငျ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,ငွေကြေးအချို့သောအခြားငွေကြေးသုံးပြီး entries တွေကိုချမှတ်ပြီးနောက်ပြောင်းလဲသွားမရနိုငျ
 DocType: Company,Round Off Account,အကောင့်ပိတ် round
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,စီမံခန့်ခွဲရေးဆိုင်ရာအသုံးစရိတ်များ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,မိဘဖောက်သည်အုပ်စု
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,ပွောငျးလဲခွငျး
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,ပွောငျးလဲခွငျး
 DocType: Purchase Invoice,Contact Email,ဆက်သွယ်ရန်အီးမေးလ်
 DocType: Appraisal Goal,Score Earned,ရမှတ်ရရှိခဲ့သည်
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",ဥပမာ &quot;ကျနော့်ကုမ္ပဏီ LLC&quot;
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,gross အလေးချိန် UOM
 DocType: Email Digest,Receivables / Payables,receiver / ပေးဆောင်
 DocType: Delivery Note Item,Against Sales Invoice,အရောင်းပြေစာဆန့်ကျင်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,ခရက်ဒစ်အကောင့်ကို
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,ခရက်ဒစ်အကောင့်ကို
 DocType: Landed Cost Item,Landed Cost Item,ဆင်းသက်ကုန်ကျစရိတ် Item
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,သုညတန်ဖိုးများကိုပြရန်
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ကုန်ကြမ်းပေးသောပမာဏကနေ repacking / ထုတ်လုပ်ပြီးနောက်ရရှိသောတဲ့ item ၏အရေအတွက်
 DocType: Payment Reconciliation,Receivable / Payable Account,receiver / ပေးဆောင်အကောင့်
 DocType: Delivery Note Item,Against Sales Order Item,အရောင်းအမိန့် Item ဆန့်ကျင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
 DocType: Item,Default Warehouse,default ဂိုဒေါင်
 DocType: Task,Actual End Date (via Time Logs),(အချိန် Logs ကနေတဆင့်) အမှန်တကယ် End Date ကို
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},ဘဏ္ဍာငွေအရအသုံး Group မှအကောင့် {0} ဆန့်ကျင်တာဝန်ပေးမရနိုင်ပါ
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Workstation နှင့်အလုပ်အဖွဲ့နာရီပြင်ပတွင်အချိန်မှတ်တမ်းများကြိုတင်စီစဉ်ထားပါ။
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ပြီးသားတင်သွင်းခဲ့
 ,Items To Be Requested,တောင်းဆိုထားသောခံရဖို့ items
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,ပြီးခဲ့သည့်ဝယ်ယူ Rate Get
 DocType: Time Log,Billing Rate based on Activity Type (per hour),ငွေတောင်းခံနှုန်း (တစ်နာရီလျှင်) လုပ်ဆောင်ချက်ကအမျိုးအစားပေါ်အခြေခံပြီး
 DocType: Company,Company Info,ကုမ္ပဏီ Info
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","ဤအရပ်မှပို့ပေးဖို့စလှေတျတျောကိုမတှေ့မကုမ္ပဏီသည်အီးမေးလ် ID ကို,"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ရန်ပုံငွေ၏လျှောက်လွှာ (ပိုင်ဆိုင်မှုများ)
 DocType: Production Planning Tool,Filter based on item,item ကို select လုပ်ထားတဲ့အပေါ်အခြေခံပြီး filter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,debit အကောင့်ကို
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,debit အကောင့်ကို
 DocType: Fiscal Year,Year Start Date,တစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: Attendance,Employee Name,ဝန်ထမ်းအမည်
 DocType: Sales Invoice,Rounded Total (Company Currency),rounded စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Account Type ကိုရွေးချယ်သောကွောငျ့ Group ကမှရောက်မှလုံခြုံနိုင်ဘူး။
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,Account Type ကိုရွေးချယ်သောကွောငျ့ Group ကမှရောက်မှလုံခြုံနိုင်ဘူး။
 DocType: Purchase Common,Purchase Common,တူညီသည့်အယ်ယူ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} modified သိရသည်။ refresh ပေးပါ။
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,အောက်ပါရက်ထွက်ခွာ Applications ကိုအောင်ကနေအသုံးပြုသူများကိုရပ်တန့်။
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,အခွင့်အလမ်းအနေဖြင့်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
 DocType: Sales Invoice,Is POS,POS စက်ဖြစ်ပါသည်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},ထုပ်ပိုးအရေအတွက်အတန်း {1} အတွက် Item {0} သည်အရေအတွက်တူညီရမယ်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},ထုပ်ပိုးအရေအတွက်အတန်း {1} အတွက် Item {0} သည်အရေအတွက်တူညီရမယ်
 DocType: Production Order,Manufactured Qty,ထုတ်လုပ်သော Qty
 DocType: Purchase Receipt Item,Accepted Quantity,လက်ခံခဲ့သည်ပမာဏ
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} တည်ရှိပါဘူး
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Customer များကြီးပြင်းဥပဒေကြမ်းများ။
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,စီမံကိန်း Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},အတန်းမရှိ {0}: ပမာဏသုံးစွဲမှုတောင်းဆိုမှုများ {1} ဆန့်ကျင်ငွေပမာဏဆိုင်းငံ့ထားထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။ ဆိုင်းငံ့ထားသောငွေပမာဏ {2} သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},အတန်းမရှိ {0}: ပမာဏသုံးစွဲမှုတောင်းဆိုမှုများ {1} ဆန့်ကျင်ငွေပမာဏဆိုင်းငံ့ထားထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။ ဆိုင်းငံ့ထားသောငွေပမာဏ {2} သည်
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,ကဆက်ပြောသည် {0} လစဉ်ကြေး ပေး.
 DocType: Maintenance Schedule,Schedule,ဇယား
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","ဒီအကုန်ကျစရိတ်စင်တာဘဏ္ဍာငွေအရအသုံး Define ။ ဘတ်ဂျက်အရေးယူတင်ထားရန်, &quot;ကုမ္ပဏီစာရင်း&quot; ကိုကြည့်ပါ"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,3 Reading
 ,Hub,hub
 DocType: GL Entry,Voucher Type,ဘောက်ချာကအမျိုးအစား
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
 DocType: Expense Claim,Approved,Approved
 DocType: Pricing Rule,Price,စျေးနှုန်း
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',{0} &#39;&#39; လက်ဝဲ &#39;အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,စာရင်းကိုင်ဂျာနယ် entries တွေကို။
 DocType: Delivery Note Item,Available Qty at From Warehouse,ဂိုဒေါင် မှစ. မှာရရှိနိုင်တဲ့ Qty
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},row {0}: ပါတီ / အကောင့်ကို {3} {4} အတွက် {1} / {2} နှင့်ကိုက်ညီမပါဘူး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},row {0}: ပါတီ / အကောင့်ကို {3} {4} အတွက် {1} / {2} နှင့်ကိုက်ညီမပါဘူး
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,တစ်ဦးခွန်အကောင့်ကိုဖန်တီးရန်
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
 DocType: Account,Stock,စတော့အိတ်
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,စာချုပ်ကုန်ဆုံးတော့နေ့စွဲ
 DocType: Sales Order,Track this Sales Order against any Project,မည်သည့်စီမံကိန်းဆန့်ကျင်သည်ဤအရောင်းအမိန့်အားခြေရာခံ
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,အထက်ပါသတ်မှတ်ချက်များအပေါ်အခြေခံပြီးအရောင်းအမိန့် (ကယ်နှုတ်ရန်ဆိုင်းငံ့ထား) Pull
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,ပေးသွင်းစျေးနှုန်းအနေဖြင့်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,ပေးသွင်းစျေးနှုန်းအနေဖြင့်
 DocType: Deduction Type,Deduction Type,သဘောအယူအဆကအမျိုးအစား
 DocType: Attendance,Half Day,တစ်ဝက်နေ့
 DocType: Pricing Rule,Min Qty,min Qty
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,transaction နေ့စွဲ
 DocType: Production Plan Item,Planned Qty,စီစဉ်ထား Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,စုစုပေါင်းအခွန်
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,ပမာဏအတွက် (Qty ကုန်ပစ္စည်းထုတ်လုပ်) မသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,ပမာဏအတွက် (Qty ကုန်ပစ္စည်းထုတ်လုပ်) မသင်မနေရ
 DocType: Stock Entry,Default Target Warehouse,default Target ကဂိုဒေါင်
 DocType: Purchase Invoice,Net Total (Company Currency),Net ကစုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကိုဆန့်ကျင်သာသက်ဆိုင်သည်
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,ကော်မရှင် Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Variant Make
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,ဦးစီးဌာနကခွင့် applications များပိတ်ဆို့။
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,လှည်း Empty ဖြစ်ပါသည်
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,လှည်း Empty ဖြစ်ပါသည်
 DocType: Production Order,Actual Operating Cost,အမှန်တကယ် Operating ကုန်ကျစရိတ်
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,အမြစ်တည်းဖြတ်မရနိုင်ပါ။
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,အမြစ်တည်းဖြတ်မရနိုင်ပါ။
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,ခွဲဝေငွေပမာဏ unadusted ငွေပမာဏထက် သာ. ကြီးမြတ်သည်မဟုတ်နိုင်
 DocType: Manufacturing Settings,Allow Production on Holidays,အားလပ်ရက်အပေါ်ထုတ်လုပ်မှု Allow
 DocType: Sales Order,Customer's Purchase Order Date,customer ရဲ့ဝယ်ယူခြင်းအမိန့်နေ့စွဲ
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ပုံစံရေးဆှဲသူ
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,စည်းကမ်းသတ်မှတ်ချက်များ Template:
 DocType: Serial No,Delivery Details,Delivery အသေးစိတ်ကို
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
 DocType: Item,Automatically create Material Request if quantity falls below this level,အရေအတွက်ကဤအဆင့်အောက်ကျလျှင်အလိုအလျှောက်ပစ္စည်းတောင်းဆိုမှုဖန်တီး
 ,Item-wise Purchase Register,item-ပညာရှိသောသူသည်ဝယ်ယူမှတ်ပုံတင်မည်
 DocType: Batch,Expiry Date,သက်တမ်းကုန်ဆုံးရက်
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","reorder အ level ကိုတင်ထားရန်, ကို item တစ်ခုဝယ်ယူပစ္စည်းသို့မဟုတ်ထုတ်လုပ်ခြင်းပစ္စည်းဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","reorder အ level ကိုတင်ထားရန်, ကို item တစ်ခုဝယ်ယူပစ္စည်းသို့မဟုတ်ထုတ်လုပ်ခြင်းပစ္စည်းဖြစ်ရပါမည်"
 ,Supplier Addresses and Contacts,ပေးသွင်းလိပ်စာနှင့်ဆက်သွယ်ရန်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,ပထမဦးဆုံးအမျိုးအစားလိုက်ကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Project မှမာစတာ။
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(တစ်ဝက်နေ့)
 DocType: Supplier,Credit Days,ခရက်ဒစ် Days
 DocType: Leave Type,Is Carry Forward,Forward ယူသွားတာဖြစ်ပါတယ်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,ပစ္စည်းများ၏ဘီလ်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကို {1} သည်လိုအပ်သည်
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,ထွက်ခွာရသည့်အကြောင်းရင်း
 DocType: Expense Claim Detail,Sanctioned Amount,ပိတ်ဆို့ငွေပမာဏ
 DocType: GL Entry,Is Opening,ဖွင့်လှစ်တာဖြစ်ပါတယ်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},row {0}: Debit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,အကောင့်ကို {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},row {0}: Debit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,အကောင့်ကို {0} မတည်ရှိပါဘူး
 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 7cde29b..edc1b6d 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumentenproducten
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Selecteer Party Type eerste
 DocType: Item,Customer Items,Klant Items
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Rekening {0}: Bovenliggende rekening {1} kan geen grootboek zijn
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Rekening {0}: Bovenliggende rekening {1} kan geen grootboek zijn
 DocType: Item,Publish Item to hub.erpnext.com,Publiceer Item om hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mail Notificaties
 DocType: Item,Default Unit of Measure,Standaard Eenheid
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Munt is nodig voor prijslijst {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zal worden berekend in de transactie.
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Van Materiaal Aanvraag
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Van Materiaal Aanvraag
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Boom
 DocType: Job Applicant,Job Applicant,Sollicitant
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Geen andere resultaten.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Om de klantgebaseerde artikelcode te onderhouden om ze zoekbaar te maken op basis van hun code; gebruik deze optie
 DocType: Mode of Payment Account,Mode of Payment Account,Modus van Betaalrekening
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Toon Varianten
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Hoeveelheid
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Hoeveelheid
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Leningen (Passiva)
 DocType: Employee Education,Year of Passing,Voorbije Jaar
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Op Voorraad
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Gezondheidszorg
 DocType: Purchase Invoice,Monthly,Maandelijks
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Vertraging in de betaling (Dagen)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Factuur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Factuur
 DocType: Maintenance Schedule Item,Periodicity,Periodiciteit
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mailadres
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Boekjaar {0} is vereist
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensie
 DocType: Company,Abbr,Afk
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rij {0}: {1} {2} niet overeenkomt met {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Rij {0}: {1} {2} niet overeenkomt met {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Rij # {0}:
 DocType: Delivery Note,Vehicle No,Voertuig nr.
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Selecteer Prijslijst
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Selecteer Prijslijst
 DocType: Production Order Operation,Work In Progress,Onderhanden Werk
 DocType: Employee,Holiday List,Holiday Lijst
 DocType: Time Log,Time Log,Tijd Log
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Hetzelfde bedrijf is meer dan één keer ingevoerd
 DocType: Employee,Married,Getrouwd
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Niet toegestaan voor {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
 DocType: Payment Reconciliation,Reconcile,Afletteren
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Kruidenierswinkel
 DocType: Quality Inspection Reading,Reading 1,Meting 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Maak Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,pensioenfondsen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Magazijn is verplicht als het account type Warehouse
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Magazijn is verplicht als het account type Warehouse
 DocType: SMS Center,All Sales Person,Alle Sales Person
 DocType: Lead,Person Name,Persoon Naam
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Controleer of terugkerende orde, uitvinken om te stoppen met terugkerende of zet de juiste Einddatum"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Geïnteresseerd
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Stuklijst
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Opening
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Van {0} tot {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Van {0} tot {1}
 DocType: Item,Copy From Item Group,Kopiëren van Item Group
 DocType: Journal Entry,Opening Entry,Opening Entry
 DocType: Stock Entry,Additional Costs,Bijkomende kosten
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Rekening met bestaande transactie kan niet worden omgezet naar een groep .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Rekening met bestaande transactie kan niet worden omgezet naar een groep .
 DocType: Lead,Product Enquiry,Product Aanvraag
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Vul aub eerst bedrijf in
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Selecteer Company eerste
 DocType: Employee Education,Under Graduate,Onder Graduate
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Doel op
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Doel op
 DocType: BOM,Total Cost,Totale kosten
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Activiteitenlogboek:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Artikel {0} bestaat niet in het systeem of is verlopen
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Artikel {0} moet een inkoopbaar artikel zijn
 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 +444,Item {0} is not active or end of life has been reached,ARtikel {0} is niet actief of heeft einde levensduur bereikt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,ARtikel {0} is niet actief of heeft einde levensduur bereikt
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Zal worden bijgewerkt zodra verkoopfactuur is ingediend.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Instellingen voor HR Module
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Details van de uitgevoerde handelingen.
 DocType: Serial No,Maintenance Status,Onderhoud Status
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Artikelen en prijzen
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Van Datum moet binnen het boekjaar zijn. Er vanuit gaande dat Van Datum {0} is
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Van Datum moet binnen het boekjaar zijn. Er vanuit gaande dat Van Datum {0} is
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Selecteer de werknemer voor wie u de Beoordeling wilt maken.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Kostenplaats {0} behoort niet tot Bedrijf {1}
 DocType: Customer,Individual,Individueel
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,De netto kasstroom uit financieringsactiviteiten
 DocType: Lead,Address & Contact,Adres &amp; Contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Voeg ongebruikte bladeren van de vorige toewijzingen
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Volgende terugkerende {0} zal worden gemaakt op {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Contact Naam
 DocType: Production Plan Item,SO Pending Qty,VO afwachting Aantal
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Maakt salarisstrook voor de bovengenoemde criteria.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Geen beschrijving gegeven
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Inkoopaanvraag
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Ontslagdatum moet groter zijn dan datum van indiensttreding
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Artikel Website Specificatie
 DocType: Payment Tool,Reference No,Referentienummer
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Verlof Geblokkeerd
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,jaar-
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voorraad Afletteren Artikel
 DocType: Stock Entry,Sales Invoice No,Verkoopfactuur nr.
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Leverancier Type
 DocType: Item,Publish in Hub,Publiceren in Hub
 ,Terretory,Regio
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Artikel {0} is geannuleerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Artikel {0} is geannuleerd
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materiaal Aanvraag
 DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum
 DocType: Item,Purchase Details,Inkoop Details
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Relatie
 DocType: Shipping Rule,Worldwide Shipping,Wereldwijde verzending
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bevestigde orders van klanten.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Suggesties
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Item Group-wise budgetten op dit gebied. U kunt ook seizoensinvloeden door de Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Vul ouderaccount groep voor magazijn {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling tegen {0} {1} kan niet groter zijn dan openstaande bedrag te zijn {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling tegen {0} {1} kan niet groter zijn dan openstaande bedrag te zijn {2}
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Mobiel nummer
 DocType: Maintenance Schedule,Generate Schedule,Genereer Plan
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,laatst
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max. 5 tekens
 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
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Leren
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activiteit kosten per werknemer
 DocType: Accounts Settings,Settings for Accounts,Instellingen voor accounts
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Beheer Sales Person Boom .
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Factuur Type
 DocType: Sales Invoice Item,Delivery Note,Vrachtbrief
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Het opzetten van Belastingen
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Het opzetten van Belastingen
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Samenvatting voor deze week en in afwachting van activiteiten
 DocType: Workstation,Rent Cost,Huurkosten
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecteer maand en jaar
@@ -307,11 +310,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Verkrijgbaar in BOM , Delivery Note, aankoopfactuur, Productie Order , Bestelling , Kwitantie , verkoopfactuur , Sales Order , Voorraad Entry , Rooster"
 DocType: Item Tax,Tax Rate,Belastingtarief
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Selecteer Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Selecteer Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} beheerd batchgewijs, is niet te rijmen met behulp \
  Stock Verzoening, in plaats daarvan gebruik Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Converteren naar non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Aankoopbon moet worden ingediend
@@ -352,6 +355,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,medisch
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Reden voor het verliezen
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Werkstation is gesloten op de volgende data als per Holiday Lijst: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Kansen
 DocType: Employee,Single,Enkele
 DocType: Issue,Attachment,Gehechtheid
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan niet worden ingesteld voor groep kostenplaats
@@ -381,13 +385,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,Vakantie meester .
 DocType: Material Request Item,Required Date,Benodigd op datum
 DocType: Delivery Note,Billing Address,Factuuradres
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Vul Artikelcode in.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Vul Artikelcode in.
 DocType: BOM,Costing,Costing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Indien aangevinkt, zal de BTW-bedrag worden beschouwd als reeds in de Print Tarief / Print Bedrag"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totaal Aantal
@@ -420,7 +424,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetica
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Serienummer Garantie Afloop
@@ -439,16 +443,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,ARtikel {0} is geen inkoopbaar artikel
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,ARtikel {0} is geen inkoopbaar artikel
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} is een ongeldig e-mailadres in 'Notification \
  Email Address'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Totaal Billing Dit Jaar:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Toevoegen / Bewerken Belastingen en Heffingen
 DocType: Purchase Invoice,Supplier Invoice No,Factuurnr. Leverancier
 DocType: Territory,For reference,Ter referentie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan niet verwijderen Serienummer {0}, zoals het wordt gebruikt in de voorraad transacties"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Sluiten (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Sluiten (Cr)
 DocType: Serial No,Warranty Period (Days),Garantieperiode (dagen)
 DocType: Installation Note Item,Installation Note Item,Installatie Opmerking Item
 ,Pending Qty,In afwachting Aantal
@@ -463,7 +466,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Maandelijkse Verdeling** helpt u uw budget te verdelen over maanden als u seizoensgebondenheid in uw bedrijf heeft. Om een budget te verdelen met behulp van deze verdeling, stelt u deze **Maandelijkse Verdeling** in in de **Kostenplaats**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Geen records gevonden in de factuur tabel
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Geen records gevonden in de factuur tabel
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Selecteer Company en Party Type eerste
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Financiële / boekjaar .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry , serienummers kunnen niet worden samengevoegd"
@@ -471,9 +474,9 @@
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Algemeen totaal
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Boekjaar Startdatum mag niet groter zijn dan het Boekjaar Einddatum
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Boekjaar Startdatum mag niet groter zijn dan het Boekjaar Einddatum
 DocType: Warranty Claim,Resolution,Oplossing
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Levertijd: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Levertijd: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Verschuldigd Account
 DocType: Sales Order,Billing and Delivery Status,Facturering en Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Terugkerende klanten
@@ -488,7 +491,7 @@
 DocType: Quotation,Quotation To,Offerte Voor
 DocType: Lead,Middle Income,Modaal Inkomen
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Toegekende bedrag kan niet negatief zijn
 DocType: Purchase Order Item,Billed Amt,Gefactureerd Bedr
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Een logisch Magazijn waartegen voorraadboekingen worden gemaakt.
@@ -497,7 +500,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Productie Order is Verplicht
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Voorstel Schrijven
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatieve Voorraad Fout ({6}) voor Artikel {0} in Magazijn {1} op {2} {3} in {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatieve Voorraad Fout ({6}) voor Artikel {0} in Magazijn {1} op {2} {3} in {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscale Jaar Company
 DocType: Packing Slip Item,DN Detail,DN Detail
 DocType: Time Log,Billed,Gefactureerd
@@ -516,16 +519,17 @@
 DocType: Activity Type,Default Costing Rate,Standaard Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Onderhoudsschema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Dan worden prijsregels uitgefilterd op basis van Klant, Klantgroep, Regio,  Leverancier, Leverancier Type, Campagne, Verkooppartner, etc."
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Netto wijziging in Inventory
 DocType: Employee,Passport Number,Paspoortnummer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Van Ontvangstbevestiging
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Hetzelfde item is meerdere keren ingevoerd.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Van Ontvangstbevestiging
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Hetzelfde item is meerdere keren ingevoerd.
 DocType: SMS Settings,Receiver Parameter,Receiver Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Gebaseerd op' en 'Groepeer per' kunnen niet hetzelfde zijn
 DocType: Sales Person,Sales Person Targets,Verkoper Doelen
 DocType: Production Order Operation,In minutes,In minuten
 DocType: Issue,Resolution Date,Oplossing Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
 DocType: Selling Settings,Customer Naming By,Klant Naming Door
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Converteren naar Groep
 DocType: Activity Cost,Activity Type,Activiteit Type
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Projecten Gebruiker
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumed
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} niet gevonden in Factuur Details tabel
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} niet gevonden in Factuur Details tabel
 DocType: Company,Round Off Cost Center,Afronden kostenplaats
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Onderhoud Bezoek {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
 DocType: Material Request,Material Transfer,Materiaal Verplaatsing
@@ -558,13 +562,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Het bijhouden van een artikel in verkoop- en inkoopdocumenten op basis van het serienummer. U kunt hiermee ook de garantiedetails van het product bijhouden.
 DocType: Purchase Receipt Item Supplied,Current Stock,Huidige voorraad
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Afgewezen Magazijn is verplicht bij een afgewezen Artikel.
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Totaal facturering dit jaar
 DocType: Account,Expenses Included In Valuation,Kosten inbegrepen in waardering
 DocType: Employee,Provide email id registered in company,Zorg voor een bedrijfs e-mail ID
 DocType: Hub Settings,Seller City,Verkoper Stad
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Item heeft varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Item heeft varianten.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Boom Type
@@ -582,18 +586,18 @@
 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 +92,{0} is not a stock Item,{0} is geen voorraad artikel
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} is geen voorraad artikel
 DocType: Mode of Payment Account,Default Account,Standaard Rekening
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Lead moet worden ingesteld als de Opportunity is gemaakt obv een lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Selecteer wekelijkse vrije dag
 DocType: Production Order Operation,Planned End Time,Geplande Eindtijd
 ,Sales Person Target Variance Item Group-Wise,Sales Person Doel Variance Post Group - Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Rekening met bestaande transactie kan niet worden geconverteerd naar grootboek
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Rekening met bestaande transactie kan niet worden geconverteerd naar grootboek
 DocType: Delivery Note,Customer's Purchase Order No,Inkoopordernummer van Klant
 DocType: Employee,Cell Number,Mobiele nummer
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiaal Verzoeken Vernieuwd
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Je kan niet in de huidige voucher in 'Tegen Journal Entry' kolom
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Je kan niet in de huidige voucher in 'Tegen Journal Entry' kolom
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Opportunity Van
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Maandsalaris overzicht.
@@ -602,9 +606,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Van {0} van type {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rij {0}: Conversie Factor is verplicht
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Boekingen kunnen worden gemaakt tegen leaf nodes. Inzendingen tegen groepen zijn niet toegestaan.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Ontvangstbevestiging nummer vereist voor Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Ontvangstbevestiging nummer vereist voor Artikel {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atribuutwaarde
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Verkoop campagnes
 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.
@@ -662,7 +666,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prijslijst niet geselecteerd
 DocType: Employee,Family Background,Familie Achtergrond
 DocType: Process Payroll,Send Email,E-mail verzenden
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Geen toestemming
 DocType: Company,Default Bank Account,Standaard bankrekening
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Om te filteren op basis van Party, selecteer Party Typ eerst"
@@ -670,7 +674,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nrs
 DocType: Item,Items with higher weightage will be shown higher,Items met een hogere weightage hoger zal worden getoond
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Aflettering Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Mijn facturen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Mijn facturen
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Geen werknemer gevonden
 DocType: Purchase Order,Stopped,Gestopt
 DocType: Item,If subcontracted to a vendor,Als uitbesteed aan een leverancier
@@ -680,6 +684,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nu verzenden
 ,Support Analytics,Support Analyse
 DocType: Item,Website Warehouse,Website Magazijn
+DocType: Payment Reconciliation,Minimum Invoice Amount,Minimum Factuurbedrag
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C -Form records
@@ -689,7 +694,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Naar &quot;Point of Sale&quot; functies in te schakelen
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Selecteer Artikelen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} tegen Factuur {1} gedateerd {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} tegen Factuur {1} gedateerd {2}
 DocType: Maintenance Visit,Completion Status,Voltooiingsstatus
 DocType: Sales Invoice Item,Target Warehouse,Doel Magazijn
 DocType: Item,Allow over delivery or receipt upto this percent,Laat dan levering of ontvangst upto deze procent
@@ -701,7 +706,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Bericht automatisch samenstellen overlegging van transacties .
 DocType: Production Order,Item To Manufacture,Artikel te produceren
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Aanschaffen om de betaling
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Aanschaffen om de betaling
 DocType: Sales Order Item,Projected Qty,Verwachte Aantal
 DocType: Sales Invoice,Payment Due Date,Betaling Vervaldatum
 DocType: Newsletter,Newsletter Manager,Nieuwsbrief Manager
@@ -725,7 +730,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Verkooppunt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo reeds in Credit, is het niet toegestaan om 'evenwicht moet worden' als 'Debet'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo reeds in Credit, is het niet toegestaan om 'evenwicht moet worden' als 'Debet'"
 DocType: Account,Balance must be,Saldo moet worden
 DocType: Hub Settings,Publish Pricing,Publiceer Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Kostendeclaratie afgewezen Bericht
@@ -748,7 +753,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Wisselkoers stam.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,Stuklijst {0} moet actief zijn
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,Stuklijst {0} moet actief zijn
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Selecteer eerst het documenttype
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Laat inning Bedrag
@@ -766,17 +771,17 @@
 DocType: Supplier,Default Payable Accounts,Standaard Crediteuren Accounts
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Werknemer {0} is niet actief of bestaat niet
 DocType: Features Setup,Item Barcode,Artikel Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Item Varianten {0} bijgewerkt
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Item Varianten {0} bijgewerkt
 DocType: Quality Inspection Reading,Reading 6,Meting 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inkoopfactuur Voorschot
 DocType: Address,Shop,Winkelen
 DocType: Hub Settings,Sync Now,Nu synchroniseren
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Rij {0}: kan creditering niet worden gekoppeld met een {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Rij {0}: kan creditering niet worden gekoppeld met een {1}
 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.
 DocType: Employee,Permanent Address Is,Vast Adres is
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operatie afgerond voor hoeveel eindproducten?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,De Brand
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Korting voor over-{0} gekruist voor post {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Korting voor over-{0} gekruist voor post {1}.
 DocType: Employee,Exit Interview Details,Exit Gesprek Details
 DocType: Item,Is Purchase Item,Is inkoopartikel
 DocType: Journal Entry Account,Purchase Invoice,Inkoopfactuur
@@ -788,7 +793,7 @@
 DocType: Salary Slip,Total in words,Totaal in woorden
 DocType: Material Request Item,Lead Time Date,Lead Tijd Datum
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,is verplicht. Misschien is dit Valuta record niet gemaakt voor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Rij #{0}: Voer serienummer in voor artikel {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Rij #{0}: Voer serienummer in voor artikel {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Voor &#39;Product Bundel&#39; items, Warehouse, Serienummer en Batch Geen zal worden beschouwd van de &#39;Packing List&#39; tafel. Als Warehouse en Batch Geen zijn hetzelfde voor alle verpakking items voor welke &#39;Product Bundle&#39; punt, kunnen die waarden in de belangrijkste Item tafel worden ingevoerd, wordt waarden worden gekopieerd naar &quot;Packing List &#39;tafel."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Verzendingen naar klanten.
 DocType: Purchase Invoice Item,Purchase Order Item,Inkooporder Artikel
@@ -797,14 +802,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variantie
 ,Company Name,Bedrijfsnaam
 DocType: SMS Center,Total Message(s),Totaal Bericht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Kies Punt voor Overdracht
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Zodat de gebruiker te bewerken prijslijst Rate bij transacties
 DocType: Pricing Rule,Max Qty,Max Aantal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rij {0}: Betaling tegen Sales / Purchase Order moet altijd worden gemarkeerd als voorschot
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemisch
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Alle items zijn al overgebracht voor deze productieorder.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Alle items zijn al overgebracht voor deze productieorder.
 DocType: Process Payroll,Select Payroll Year and Month,Selecteer Payroll Jaar en Maand
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Ga naar de juiste groep (meestal Toepassing van fondsen&gt; Vlottende activa&gt; Bankrekeningen en maak een nieuwe account (door te klikken op Toevoegen kind) van het type &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,elektriciteitskosten
@@ -818,10 +824,10 @@
 DocType: SMS Center,All Lead (Open),Alle Leads (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get betaalde voorschotten
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Voeg uw foto toe
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Maken
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Maken
 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 +3,My Cart,Mijn winkelwagen
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mijn winkelwagen
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Opening Aantal
@@ -840,10 +846,10 @@
 DocType: POS Profile,Cash/Bank Account,Kas/Bankrekening
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Attributentabel is verplicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} kan niet negatief zijn
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Korting
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Korting
 DocType: Features Setup,Purchase Discounts,Inkoopkortingen
 DocType: Workstation,Wages,Loon
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Zullen alleen worden bijgewerkt als Time Log is &#39;Billable&#39;
@@ -868,7 +874,7 @@
 DocType: Tax Rule,Shipping State,Scheepvaart State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Het punt moet worden toegevoegd met behulp van 'Get Items uit Aankoopfacturen' knop
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Verkoopkosten
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard kopen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standard kopen
 DocType: GL Entry,Against,Tegen
 DocType: Item,Default Selling Cost Center,Standaard Verkoop kostenplaats
 DocType: Sales Partner,Implementation Partner,Implementatie Partner
@@ -910,6 +916,7 @@
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Winkelwagen Verzenden Regel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Productie Order {0} moet worden geannuleerd voor het annuleren van deze verkooporder
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Stel &#39;Solliciteer Extra Korting op&#39;
 ,Ordered Items To Be Billed,Bestelde artikelen te factureren
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Van Range moet kleiner zijn dan om het bereik
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecteer Tijd Logs en druk op Indienen om een nieuwe verkoopfactuur maken.
@@ -919,13 +926,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Deze Tijd Log Batch is gefactureerd.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Maak Opportunity
 DocType: Salary Slip,Leave Without Pay,Onbetaald verlof
-DocType: Supplier,Communications,communicatie
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacity Planning Fout
 ,Trial Balance for Party,Trial Balance voor Party
 DocType: Lead,Consultant,Consultant
 DocType: Salary Slip,Earnings,Verdiensten
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Afgewerkte product {0} moet worden ingevoerd voor het type Productie binnenkomst
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Het openen van Accounting Balance
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Afgewerkte product {0} moet worden ingevoerd voor het type Productie binnenkomst
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Het openen van Accounting Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Verkoopfactuur Voorschot
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Niets aan te vragen
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Werkelijke Startdatum' kan niet groter zijn dan 'Werkelijke Einddatum'
@@ -967,7 +973,7 @@
 DocType: Global Defaults,Current Fiscal Year,Huidige fiscale jaar
 DocType: Global Defaults,Disable Rounded Total,Deactiveer Afgerond Totaal
 DocType: Lead,Call,Bellen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Invoer' kan niet leeg zijn
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'Invoer' kan niet leeg zijn
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dubbele rij {0} met dezelfde {1}
 ,Trial Balance,Proefbalans
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Het opzetten van Werknemers
@@ -979,9 +985,9 @@
 DocType: Contact,User ID,Gebruikers-ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Bekijk Grootboek
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Vroegst
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Produceren tegen Verkooporder
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Rest van de Wereld
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -1011,7 +1017,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Niet bevoegd om bevroren rekening te bewerken {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get openstaande facturen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1024,13 +1030,13 @@
 DocType: Employee,Place of Issue,Plaats van uitgifte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contract
 DocType: Email Digest,Add Quote,Quote voegen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Eenheid Omrekeningsfactor is nodig voor eenheid: {0} in Artikel: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Eenheid Omrekeningsfactor is nodig voor eenheid: {0} in Artikel: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirecte Kosten
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Uw producten of diensten
 DocType: Mode of Payment,Mode of Payment,Wijze van betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,Website Afbeelding moet een publiek bestand of website URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Afbeelding moet een publiek bestand of website URL
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dit is een basis artikelgroep en kan niet worden bewerkt .
 DocType: Journal Entry Account,Purchase Order,Inkooporder
 DocType: Warehouse,Warehouse Contact Info,Magazijn Contact Info
@@ -1039,8 +1045,8 @@
 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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Kapitaalgoederen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1050,7 +1056,7 @@
 DocType: Appraisal Goal,Goal,Doel
 DocType: Sales Invoice Item,Edit Description,Bewerken Beschrijving
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Verwachte levertijd is minder dan gepland Start Date.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,voor Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,voor Leverancier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Instellen Account Type helpt bij het selecteren van deze account in transacties.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Munt)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Totaal Uitgaande
@@ -1063,7 +1069,7 @@
 DocType: Journal Entry,Journal Entry,Journaalpost
 DocType: Workstation,Workstation Name,Naam van werkstation
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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
@@ -1095,7 +1101,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nieuwsbrieven naar contacten, leads."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Bewerkingen kan niet leeg worden gelaten.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Bewerkingen kan niet leeg worden gelaten.
 ,Delivered Items To Be Billed,Geleverde Artikelen nog te factureren
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazijn kan niet worden gewijzigd voor Serienummer
 DocType: Authorization Rule,Average Discount,Gemiddelde korting
@@ -1110,7 +1116,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Van {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operatie Beschrijving
 DocType: Item,Will also apply to variants,Zal ook van toepassing op varianten
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Kan Boekjaar Startdatum en Boekjaar Einde Datum  niet wijzigen, als het boekjaar is opgeslagen."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Kan Boekjaar Startdatum en Boekjaar Einde Datum  niet wijzigen, als het boekjaar is opgeslagen."
 DocType: Quotation,Shopping Cart,Winkelwagen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gem Daily Uitgaande
 DocType: Pricing Rule,Campaign,Campagne
@@ -1121,7 +1127,8 @@
 DocType: Sales Order Item,Planned Quantity,Gepland Aantal
 DocType: Purchase Invoice Item,Item Tax Amount,Artikel BTW-bedrag
 DocType: Item,Maintain Stock,Handhaaf Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Stock Entries al gemaakt voor de productieorder
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1133,7 +1140,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Rekeningschema
 DocType: Material Request,Terms and Conditions Content,Algemene Voorwaarden Inhoud
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,mag niet groter zijn dan 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
 DocType: Maintenance Visit,Unscheduled,Ongeplande
 DocType: Employee,Owned,Eigendom
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhankelijk van onbetaald verlof
@@ -1171,7 +1178,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Uitbesteed werk
 DocType: Shipping Rule Condition,To Value,Tot Waarde
 DocType: Supplier,Stock Manager,Stock Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Bron magazijn is verplicht voor rij {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Bron magazijn is verplicht voor rij {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Pakbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kantoorhuur
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Instellingen SMS gateway
@@ -1179,10 +1186,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nog geen adres toegevoegd.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Werken Hour
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analist
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan JV hoeveelheid {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan JV hoeveelheid {2}
 DocType: Item,Inventory,Voorraad
 DocType: Features Setup,"To enable ""Point of Sale"" view",Inschakelen &quot;Point of Sale&quot; view
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan niet worden gemaakt voor een lege boodschappenmand
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Betaling kan niet worden gemaakt voor een lege boodschappenmand
 DocType: Item,Sales Details,Verkoop Details
 DocType: Opportunity,With Items,Met Items
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,in Aantal
@@ -1197,10 +1204,11 @@
 DocType: Cost Center,Parent Cost Center,Bovenliggende kostenplaats
 DocType: Sales Invoice,Source,Bron
 DocType: Leave Type,Is Leave Without Pay,Is onbetaald verlof
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Geen records gevonden in de betaling tabel
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Geen records gevonden in de betaling tabel
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Boekjaar Startdatum
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Pakbon(en) geannuleerd
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Pakbon(en) geannuleerd
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,De kasstroom uit investeringsactiviteiten
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Vracht-en verzendkosten
 DocType: Material Request Item,Sales Order No,Verkooporder nr.
 DocType: Item Group,Item Group Name,Artikel groepsnaam
@@ -1208,12 +1216,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Verplaats Materialen voor Productie
 DocType: Pricing Rule,For Price List,Voor Prijslijst
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Aankoopkoers voor punt: {0} niet gevonden, die nodig is om boekhoudkundige afschrijving (kosten) te boeken. Vermeld post prijs tegen een aankoopprijs lijst."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Aankoopkoers voor punt: {0} niet gevonden, die nodig is om boekhoudkundige afschrijving (kosten) te boeken. Vermeld post prijs tegen een aankoopprijs lijst."
 DocType: Maintenance Schedule,Schedules,Schema
 DocType: Purchase Invoice Item,Net Amount,Netto Bedrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stuklijst Detail nr.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Extra korting Bedrag (Company valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Fout : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Fout : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Maak nieuwe rekening van Rekeningschema.
 DocType: Maintenance Visit,Maintenance Visit,Onderhoud Bezoek
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Klant > Klantgroep > Regio
@@ -1239,7 +1247,7 @@
 DocType: Sales Partner,Sales Partner Target,Verkoop Partner Doel
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Boekhouding Entry voor {0} kan alleen worden gemaakt in valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prijsbepalingsregel
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiaal aanvragen tot Purchase Order
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiaal aanvragen tot Purchase Order
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Rij # {0}: Teruggekeerde Item {1} bestaat niet in {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankrekeningen
 ,Bank Reconciliation Statement,Bank Aflettering Statement
@@ -1247,11 +1255,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Het openen Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} mag slechts eenmaal voorkomen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Van Waarde
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Productie Aantal is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Productie Aantal is verplicht
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Bedragen die niet terug te vinden in de bank
 DocType: Quality Inspection Reading,Reading 4,Meting 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Claims voor bedrijfsonkosten
@@ -1263,33 +1271,34 @@
 ,Material Requests for which Supplier Quotations are not created,Materiaal Aanvragen waarvoor Leverancier Offertes niet zijn gemaakt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Het kunnen identificeren van artikelen mbv een streepjescode. U kunt hiermee artikelen op Vrachtbrieven en Verkoopfacturen invoeren door de streepjescode van het artikel te scannen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Markeren als geleverd
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Markeren als geleverd
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Maak Offerte
 DocType: Dependent Task,Dependent Task,Afhankelijke Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Ontvanger Lijst
 DocType: Payment Tool Detail,Payment Amount,Betaling Bedrag
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbruikte hoeveelheid
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} View
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} View
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Netto wijziging in cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salaris Structuur Aftrek
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kosten van Items Afgegeven
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Hoeveelheid mag niet meer zijn dan {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Leeftijd (dagen)
 DocType: Quotation Item,Quotation Item,Offerte Artikel
 DocType: Account,Account Name,Rekening Naam
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Vanaf de datum kan niet groter zijn dan tot nu toe
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Vanaf de datum kan niet groter zijn dan tot nu toe
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} hoeveelheid {1} moet een geheel getal zijn
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,Succespercentage kan niet 0 of 1 zijn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Succespercentage kan niet 0 of 1 zijn
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Ontvangstbevestiging {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Ontvangstbevestiging {0} is niet ingediend
 DocType: Company,Default Payable Account,Standaard Payable Account
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% gefactureerd
@@ -1301,15 +1310,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mijn Problemen
 DocType: BOM Item,BOM Item,Stuklijst Artikel
 DocType: Appraisal,For Employee,Voor Werknemer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Rij {0}: Advance tegen Leverancier worden debiteren
 DocType: Company,Default Values,Standaard Waarden
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rij {0}: Betaling bedrag kan niet negatief zijn
 DocType: Expense Claim,Total Amount Reimbursed,Totaal bedrag terug!
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Tegen Leverancier Factuur {0} gedateerd {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Tegen Leverancier Factuur {0} gedateerd {1}
 DocType: Customer,Default Price List,Standaard Prijslijst
 DocType: Payment Reconciliation,Payments,Betalingen
 DocType: Budget Detail,Budget Allocated,Budget Toegewezen
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Klant Kredietsaldo
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Netto wijziging in Accounts Payable
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Controleer uw e-id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Klant nodig voor 'Klantgebaseerde Korting'
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Bijwerken bank betaaldata met journaalposten
@@ -1330,7 +1341,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Inschakelen Winkelwagen
 DocType: Employee,Permanent Address,Vast Adres
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Artikel {0} moet een service-artikel zijn.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Voorschot betaald tegen {0} {1} kan niet groter zijn \ dan eindtotaal {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Selecteer artikelcode
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Verminderen Aftrek voor onbetaald verlof
@@ -1347,18 +1358,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Enkel stuks van een artikel.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Tijd Log Batch {0} moet worden 'Ingediend'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Tijd Log Batch {0} moet worden 'Ingediend'
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Warehouse vereist bij Row Geen {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Warehouse vereist bij Row Geen {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Post-
 DocType: Item,Weightage,Weging
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Een Klantgroep met dezelfde naam bestaat. Gelieve de naam van de Klant of de Klantgroep  wijzigen
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Selecteer eerst {0}.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Selecteer eerst {0}.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},text {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nieuw contact
 DocType: Territory,Parent Territory,Bovenliggende Regio
 DocType: Quality Inspection Reading,Reading 2,Meting 2
 DocType: Stock Entry,Material Receipt,Materiaal ontvangst
@@ -1366,7 +1378,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partij Type en Partij is nodig voor Debiteuren / Crediteuren rekening {0}
 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 +210,Quantity required for Item {0} in row {1},Benodigde hoeveelheid voor item {0} in rij {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},Benodigde hoeveelheid voor item {0} in rij {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,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
@@ -1383,15 +1395,15 @@
 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: Sales Invoice Item,Batch No,Partij nr.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Kunnen meerdere verkooporders tegen een klant bestelling
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hoofd
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Hoofd
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Instellen voorvoegsel voor nummerreeksen voor uw transacties
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Gestopte order kan niet worden geannuleerd. Terugdraaien om te annuleren .
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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,Opportunity Van veld is verplicht
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Maak inkooporder
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Maak inkooporder
 DocType: SMS Center,Send To,Verzenden naar
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1404,7 +1416,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Magazijn en Referentie
 DocType: Supplier,Statutory info and other general information about your Supplier,Wettelijke info en andere algemene informatie over uw leverancier
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adressen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item is niet toegestaan om Productieorder hebben.
@@ -1413,10 +1425,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Credit Bedrag in account Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Logs voor de productie.
 DocType: Item,Apply Warehouse-wise Reorder Level,Solliciteer Warehouse-wise Reorder Niveau
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
 DocType: Authorization Control,Authorization Control,Autorisatie controle
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rij # {0}: Afgekeurd Warehouse is verplicht tegen verworpen Item {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tijd Log voor taken.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Betaling
 DocType: Production Order Operation,Actual Time and Cost,Werkelijke Tijd en 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},Materiaal Aanvraag van maximaal {0} kan worden gemaakt voor Artikel {1} tegen Verkooporder {2}
 DocType: Employee,Salutation,Aanhef
@@ -1433,7 +1446,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,associëren
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Artikel {0} is geen seriegebonden artikel
 DocType: SMS Center,Create Receiver List,Maak Ontvanger Lijst
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Verlopen
 DocType: Packing Slip,To Package No.,Naar pakket nr
 DocType: Warranty Claim,Issue Date,Uitgiftedatum
 DocType: Activity Cost,Activity Cost,Activiteit Kosten
@@ -1471,7 +1483,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Bereikt
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Regio / Klantenservice
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,bijv. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan openstaande bedrag te factureren {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan openstaande bedrag te factureren {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,In Woorden zijn zichtbaar zodra u de Verkoopfactuur opslaat.
 DocType: Item,Is Sales Item,Is verkoopartikel
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Artikel groepstructuur
@@ -1483,7 +1495,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} aangemaakt
 DocType: Delivery Note Item,Against Sales Order,Tegen klantorder
 ,Serial No Status,Serienummer Status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Artikel tabel kan niet leeg zijn
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Artikel tabel kan niet leeg zijn
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rij {0}: Instellen {1} periodiciteit, tijdsverschil tussen begin- en einddatum \
  groter dan of gelijk aan {2}"
@@ -1493,7 +1505,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Verloopdatum kan 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 +170,Duties and Taxes,Invoerrechten en Belastingen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Vul Peildatum in
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Vul Peildatum in
 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} betaling items kunnen niet worden gefilterd door {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tafel voor post die in Web Site zal worden getoond
 DocType: Purchase Order Item Supplied,Supplied Qty,Meegeleverde Aantal
@@ -1508,7 +1520,7 @@
 DocType: Installation Note,Installation Time,Installatie Tijd
 DocType: Sales Invoice,Accounting Details,Boekhouding Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Verwijder alle transacties voor dit bedrijf
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Rij # {0}: Operation {1} is niet voltooid voor {2} aantal van afgewerkte goederen in productieorders # {3}. Gelieve operatie status bijwerken via Time Logs
+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,Rij # {0}: Operation {1} is niet voltooid voor {2} aantal van afgewerkte goederen in productieorders # {3}. Gelieve operatie status bijwerken via Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringen
 DocType: Issue,Resolution Details,Oplossing Details
 DocType: Quality Inspection Reading,Acceptance Criteria,Acceptatiecriteria
@@ -1524,7 +1536,7 @@
 DocType: Holiday List,Clear Table,Wis Tabel
 DocType: Features Setup,Brands,Merken
 DocType: C-Form Invoice Detail,Invoice No,Factuur nr.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Van Inkooporder
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Van Inkooporder
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Verlaat niet kan worden toegepast / geannuleerd voordat {0}, als verlof balans al-carry doorgestuurd in de toekomst toewijzing verlof record is {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Klant adressen en contacten
@@ -1541,7 +1553,7 @@
 ,Maintenance Schedules,Onderhoudsschema&#39;s
 ,Quotation Trends,Offerte Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
 DocType: Shipping Rule Condition,Shipping Amount,Verzendbedrag
 ,Pending Amount,In afwachting van Bedrag
 DocType: Purchase Invoice Item,Conversion Factor,Conversiefactor
@@ -1558,12 +1570,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Boom van financiële rekeningen
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Rekening {0} moet van het type 'vaste activa', omdat Artikel {1} een Activa Artikel is"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Rekening {0} moet van het type 'vaste activa', omdat Artikel {1} een Activa Artikel is"
 DocType: HR Settings,HR Settings,HR-instellingen
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Kostendeclaratie is in afwachting van goedkeuring. Alleen de Kosten Goedkeurder kan status bijwerken.
 DocType: Purchase Invoice,Additional Discount Amount,Extra korting Bedrag
 DocType: Leave Block List Allow,Leave Block List Allow,Laat Block List Laat
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totaal Werkelijke
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,eenheid
@@ -1575,6 +1587,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Declaraties
 DocType: Issue,Support,Support
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Bekijk winkelwagen
 ,BOM Search,BOM Zoeken
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Sluiting (openen + Totalen)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Omschrijf valuta Company
@@ -1586,13 +1599,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Eenheid Omrekeningsfactor is vereist in rij {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Klaring mag niet voor check datum in rij {0}
 DocType: Salary Slip,Deduction,Aftrek
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Item Prijs toegevoegd {0} in de prijslijst {1}
 DocType: Address Template,Address Template,Adres Sjabloon
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% van de taken afgerond
 DocType: Project,Gross Margin,Bruto Marge
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Vul eerst Productie Artikel in
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,Gedeactiveerde gebruiker
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Gedeactiveerde gebruiker
 DocType: Opportunity,Quotation,Offerte
 DocType: Salary Slip,Total Deduction,Totaal Aftrek
 DocType: Quotation,Maintenance User,Onderhoud Gebruiker
@@ -1601,7 +1615,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
 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
@@ -1611,12 +1625,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Blijf op de hoogte van Sales Campaigns. Blijf op de hoogte van Leads, Offertes, Sales Order etc van campagnes te meten Return on Investment."
 DocType: Expense Claim,Approver,Goedkeurder
 ,SO Qty,VO Aantal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Voorraadboekingen bestaan al voor magazijn {0}, dus u kunt het magazijn niet wijzigen of toewijzen."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Voorraadboekingen bestaan al voor magazijn {0}, dus u kunt het magazijn niet wijzigen of toewijzen."
 DocType: Appraisal,Calculate Total Score,Bereken Totaalscore
 DocType: Supplier Quotation,Manufacturing Manager,Productie Manager
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Splits Vrachtbrief in pakketten.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Zendingen
+apps/erpnext/erpnext/hooks.py +69,Shipments,Zendingen
 DocType: Purchase Order Item,To be delivered to customer,Om de klant te leveren
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tijd Log Status moet worden ingediend.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serienummer {0} niet behoren tot een Warehouse
@@ -1636,10 +1650,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"Types of employment (permanent, contract, intern etc.).","Vormen van dienstverband (permanent, contract, stage, etc. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
 DocType: Currency Exchange,From Currency,Van Valuta
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Selecteer toegewezen bedrag, Factuur Type en factuurnummer in tenminste één rij"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Verkooporder nodig voor Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Selecteer toegewezen bedrag, Factuur Type en factuurnummer in tenminste één rij"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Verkooporder nodig voor Artikel {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Bedragen die niet terug te vinden in het systeem
 DocType: Purchase Invoice Item,Rate (Company Currency),Tarief (Bedrijfsvaluta)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,anderen
@@ -1655,7 +1669,7 @@
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Artikelgebaseerde Korting
 DocType: Purchase Order Item,Reference Document Type,Referentie Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} tegen Verkooporder {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} tegen Verkooporder {1}
 DocType: Account,Fixed Asset,Vast Activum
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Geserialiseerde Inventory
 DocType: Activity Type,Default Billing Rate,Default Billing Rate
@@ -1665,7 +1679,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales om de betaling
 DocType: Expense Claim Detail,Expense Claim Detail,Kostendeclaratie Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Tijd Logs gemaakt:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Selecteer juiste account
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Selecteer juiste account
 DocType: Item,Weight UOM,Gewicht Eenheid
 DocType: Employee,Blood Group,Bloedgroep
 DocType: Purchase Invoice Item,Page Break,Pagina-einde
@@ -1696,10 +1710,10 @@
 DocType: Time Log,To Time,Tot Tijd
 DocType: Authorization Rule,Approving Role (above authorized value),Goedkeuren Rol (boven de toegestane waarde)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Om onderliggende nodes te voegen , klap de boom uit en klik op de node waaronder u meer nodes wilt toevoegen."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Om rekening moet een betalend account zijn
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},Stuklijst recursie: {0} mag niet ouder of kind zijn van {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Credit Om rekening moet een betalend account zijn
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},Stuklijst recursie: {0} mag niet ouder of kind zijn van {2}
 DocType: Production Order Operation,Completed Qty,Voltooide Aantal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Prijslijst {0} is uitgeschakeld
 DocType: Manufacturing Settings,Allow Overtime,Laat Overwerk
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummers vereist voor post {1}. U hebt verstrekt {2}.
@@ -1707,8 +1721,9 @@
 DocType: Item,Customer Item Codes,Customer Item Codes
 DocType: Opportunity,Lost Reason,Reden van verlies
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Maak Betaling Inzendingen tegen bestellingen of facturen.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nieuw adres
 DocType: Quality Inspection,Sample Size,Monster grootte
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle items zijn reeds gefactureerde
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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"
 DocType: Project,External,Extern
@@ -1764,13 +1779,14 @@
 DocType: Rename Tool,Rename Tool,Hernoem Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Kosten bijwerken
 DocType: Item Reorder,Item Reorder,Artikel opnieuw ordenen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Verplaats Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Verplaats Materiaal
 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 ."
 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
 DocType: Installation Note,Installation Note,Installatie Opmerking
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Belastingen toevoegen
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,De kasstroom uit financieringsactiviteiten
 ,Financial Analytics,Financiële Analyse
 DocType: Quality Inspection,Verified By,Geverifieerd door
 DocType: Address,Subsidiary,Dochteronderneming
@@ -1780,19 +1796,19 @@
 DocType: Process Payroll,Create Salary Slip,Maak loonstrook
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Verwacht banksaldo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Bron van Kapitaal (Passiva)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Hoeveelheid in rij {0} ({1}) moet hetzelfde zijn als geproduceerde hoeveelheid {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Hoeveelheid in rij {0} ({1}) moet hetzelfde zijn als geproduceerde hoeveelheid {2}
 DocType: Appraisal,Employee,Werknemer
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import e-mail van
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Uitnodigen als gebruiker
 DocType: Features Setup,After Sale Installations,Na Verkoop Installaties
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} is volledig gefactureerd
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} is volledig gefactureerd
 DocType: Workstation Working Hour,End Time,Eindtijd
 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 +75,Group by Voucher,Groep volgens Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Vereist op
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Rename Tool,File to Rename,Bestand naar hernoemen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Inkoopordernummer vereist voor Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Inkoopordernummer vereist voor Artikel {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Toon betalingen
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Onderhoudsschema {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
@@ -1802,6 +1818,7 @@
 DocType: Selling Settings,Sales Order Required,Verkooporder Vereist
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Maak klant
 DocType: Purchase Invoice,Credit To,Met dank aan
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Actief Leads / Klanten
 DocType: Employee Education,Post Graduate,Post Doctoraal
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Onderhoudsschema Detail
 DocType: Quality Inspection Reading,Reading 9,Meting 9
@@ -1813,6 +1830,7 @@
 DocType: Warranty Claim,Raised By,Opgevoed door
 DocType: Payment Tool,Payment Account,Betaalrekening
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Netto wijziging in Debiteuren
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compenserende Off
 DocType: Quality Inspection Reading,Accepted,Geaccepteerd
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.
@@ -1820,17 +1838,17 @@
 DocType: Payment Tool,Total Payment Amount,Verschuldigde totaalbedrag
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Omdat er bestaande voorraad transacties voor deze post, \ u de waarden van het niet kunnen veranderen &#39;Heeft Serial No&#39;, &#39;Heeft Batch Nee&#39;, &#39;Is Stock Item&#39; en &#39;Valuation Method&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,U kunt het tarief niet veranderen als een artikel Stuklijst-gerelateerd is.
 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 +157,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 +211,{0} {1} is not submitted,{0} {1} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} is niet ingediend
 apps/erpnext/erpnext/config/stock.py +18,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
 DocType: Purchase Invoice,Terms and Conditions1,Algemene Voorwaarden1
@@ -1843,7 +1861,7 @@
 DocType: Authorization Rule,Authorized Value,Authorized Value
 DocType: Contact,Enter department to which this Contact belongs,Voer afdeling in waartoe deze Contactpersoon behoort
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Totaal Afwezig
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Artikel of Magazijn voor rij {0} komt niet overeen met Materiaal Aanvraag
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Artikel of Magazijn voor rij {0} komt niet overeen met Materiaal Aanvraag
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Eenheid
 DocType: Fiscal Year,Year End Date,Jaar Einddatum
 DocType: Task Depends On,Task Depends On,Taak Hangt On
@@ -1869,7 +1887,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Contract Einddatum moet groter zijn dan datum van indiensttreding zijn
 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.
 DocType: Customer Group,Has Child Node,Heeft onderliggende node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} tegen Inkooporder {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} tegen Inkooporder {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Voer statische url parameters hier in (bijv. afzender=ERPNext, username = ERPNext, wachtwoord = 1234 enz.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} is niet in het actieve fiscale jaar. Voor meer informatie kijk {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"Dit is een voorbeeld website, automatisch gegenereerd door ERPNext"
@@ -1917,7 +1935,7 @@
  10. Toe te voegen of Trek: Of u wilt toevoegen of aftrekken van de belasting."
 DocType: Purchase Receipt Item,Recd Quantity,Benodigde hoeveelheid
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan niet meer produceren van Artikel {0} dan de Verkooporder hoeveelheid {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
 DocType: Payment Reconciliation,Bank / Cash Account,Bank- / Kasrekening
 DocType: Tax Rule,Billing City,Billing Stad
 DocType: Global Defaults,Hide Currency Symbol,Verberg Valutasymbool
@@ -1949,6 +1967,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utiliteitskosten
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Boven
 DocType: Buying Settings,Default Buying Price List,Standaard Inkoop Prijslijst
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Geen enkele werknemer voor de hierboven geselecteerde criteria of salarisstrook al gemaakt
 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."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betaling Type
@@ -1984,7 +2003,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Zie &quot;Rate Of Materials Based On&quot; in Costing Sectie
 DocType: Appraisal Goal,Key Responsibility Area,Key verantwoordelijkheid Area
 DocType: Item Reorder,Material Request Type,Materiaal Aanvraag Type
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Rij {0}: Verpakking Conversie Factor is verplicht
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Kostenplaats
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,voucher nr
@@ -2007,7 +2026,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Selecteer een waarde voor {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adressen.
 DocType: Company,Stock Settings,Voorraad Instellingen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samenvoegen kan alleen als volgende eigenschappen in beide registers. Is Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samenvoegen kan alleen als volgende eigenschappen in beide registers. Is Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Beheer Customer Group Boom .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Nieuwe Kostenplaats Naam
 DocType: Leave Control Panel,Leave Control Panel,Verlof Configuratiescherm
@@ -2027,8 +2046,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
 ,Sales Browser,Verkoop verkenner
 DocType: Journal Entry,Total Credit,Totaal Krediet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Waarschuwing: Een andere {0} # {1} bestaat tegen voorraad binnenkomst {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokaal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Waarschuwing: Een andere {0} # {1} bestaat tegen voorraad binnenkomst {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Lokaal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Leningen en voorschotten (Activa)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debiteuren
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Groot
@@ -2047,7 +2066,7 @@
 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
 DocType: Production Order Operation,Make Time Log,Maak Time Inloggen
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Stel reorder hoeveelheid
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Stel reorder hoeveelheid
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Maak Klant van Lead {0}
 DocType: Price List,Applicable for Countries,Toepasselijk voor Landen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computers
@@ -2107,10 +2126,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Geen Opmerkingen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Geen Opmerkingen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Achterstallig
 DocType: Account,Stock Received But Not Billed,Voorraad ontvangen maar nog niet gefactureerd
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root account moet een groep
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root account moet een groep
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brutoloon + achteraf Bedrag + inning Bedrag - Totaal Aftrek
 DocType: Monthly Distribution,Distribution Name,Distributie Naam
 DocType: Features Setup,Sales and Purchase,Verkoop en Inkoop
@@ -2124,6 +2143,7 @@
 DocType: Journal Entry Account,Party Balance,Partij Balans
 DocType: Sales Invoice Item,Time Log Batch,Tijd Log Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Selecteer Apply Korting op
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Loonstrook Gemaakt
 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: Stock Entry,Material Transfer for Manufacture,Materiaal Verplaatsing voor Productie
@@ -2131,9 +2151,9 @@
 DocType: Purchase Invoice,Half-yearly,Halfjaarlijks
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiscale Jaar {0} niet gevonden.
 DocType: Bank Reconciliation,Get Relevant Entries,Haal relevante gegevens op
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Boekingen voor Voorraad
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Boekingen voor Voorraad
 DocType: Sales Invoice,Sales Team1,Verkoop Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Artikel {0} bestaat niet
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Artikel {0} bestaat niet
 DocType: Sales Invoice,Customer Address,Klant Adres
 DocType: Purchase Invoice,Apply Additional Discount On,Breng Extra Korting op
 DocType: Account,Root Type,Root Type
@@ -2142,15 +2162,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Laat deze slideshow aan de bovenkant van de pagina
 DocType: BOM,Item UOM,Artikel Eenheid
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Belasting Bedrag na korting Bedrag (Company valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Doel magazijn is verplicht voor rij {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Doel magazijn is verplicht voor rij {0}
 DocType: Quality Inspection,Quality Inspection,Kwaliteitscontrole
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Voeding, Drank en Tabak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL of BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Kan alleen tegen betaling te maken ongefactureerde {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Kan alleen tegen betaling te maken ongefactureerde {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Commissietarief kan niet groter zijn dan 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum voorraadniveau
 DocType: Stock Entry,Subcontract,Subcontract
@@ -2188,7 +2208,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inkomende kwaliteitscontrole.
 DocType: Purchase Order Item,Returned Qty,Terug Aantal
 DocType: Employee,Exit,Uitgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type is verplicht
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root Type is verplicht
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serienummer {0} aangemaakt
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Voor het gemak van de klanten, kunnen deze codes worden gebruikt in gedrukte formaten zoals facturen en de leveringsbonnen"
 DocType: Employee,You can enter any date manually,U kunt elke datum handmatig ingeven
@@ -2196,8 +2216,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Proeftijd
 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 +110,Row {0}: Advance against Customer must be credit,Rij {0}: Advance tegen Klant moet krediet
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Ontvangstbevestiging Artikel geleverd
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betalen
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Betalen
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Om Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs voor het behoud van sms afleverstatus
@@ -2214,7 +2235,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Bestelniveau
 DocType: Attendance,Attendance Date,Aanwezigheid Datum
 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 +110,Account with child nodes cannot be converted to ledger,Rekening met onderliggende nodes kunnen niet worden omgezet naar grootboek
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Rekening met onderliggende nodes kunnen niet worden omgezet naar grootboek
 DocType: Address,Preferred Shipping Address,Voorkeur verzendadres
 DocType: Purchase Receipt Item,Accepted Warehouse,Geaccepteerd Magazijn
 DocType: Bank Reconciliation Detail,Posting Date,Plaatsingsdatum
@@ -2232,7 +2253,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serienummer {0} bestaat niet
 DocType: Pricing Rule,Discount Percentage,Kortingspercentage
 DocType: Payment Reconciliation Invoice,Invoice Number,Factuurnummer
-apps/erpnext/erpnext/hooks.py +54,Orders,Bestellingen
+apps/erpnext/erpnext/hooks.py +55,Orders,Bestellingen
 DocType: Leave Control Panel,Employee Type,Type werknemer
 DocType: Employee Leave Approver,Leave Approver,Verlof goedkeurder
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Overgedragen materiaal voor vervaardiging
@@ -2244,7 +2265,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% van de materialen in rekening gebracht voor deze Verkooporder
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periode sluitpost
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afschrijvingskosten
+DocType: Account,Depreciation,Afschrijvingskosten
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverancier(s)
 DocType: Customer,Credit Limit,Kredietlimiet
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selecteer type transactie
@@ -2269,11 +2290,12 @@
 DocType: Material Request,Requested For,Aangevraagd voor
 DocType: Quotation Item,Against Doctype,Tegen Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Track this Delivery Note against any Project
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-account kan niet worden verwijderd
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,De netto kasstroom uit investeringsactiviteiten
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root-account kan niet worden verwijderd
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Toon Voorraadboekingen
 ,Is Primary Address,Is Primair Adres
 DocType: Production Order,Work-in-Progress Warehouse,Onderhanden Werk Magazijn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referentie #{0} gedateerd {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referentie #{0} gedateerd {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Beheren Adressen
 DocType: Pricing Rule,Item Code,Artikelcode
 DocType: Production Planning Tool,Create Production Orders,Maak Productieorders
@@ -2281,7 +2303,7 @@
 DocType: Journal Entry,User Remark,Gebruiker Opmerking
 DocType: Lead,Market Segment,Marktsegment
 DocType: Employee Internal Work History,Employee Internal Work History,Werknemer Interne Werk Geschiedenis
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Sluiten (Db)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Sluiten (Db)
 DocType: Contact,Passive,Passief
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serienummer {0} niet op voorraad
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Belasting sjabloon voor verkooptransacties.
@@ -2297,7 +2319,7 @@
 ,Billed Amount,Gefactureerd Bedrag
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Aflettering
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Krijg Updates
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiaal Aanvraag {0} is geannuleerd of gestopt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Materiaal Aanvraag {0} is geannuleerd of gestopt
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Voeg een paar voorbeeld records toe
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Laat management
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Groeperen volgens Rekening
@@ -2306,14 +2328,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","De hoofdrekening onder Passiva, waarin Winst of Verlies zal worden geboekt"
 DocType: Payment Tool,Against Vouchers,Tegen Vouchers
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Quick Help
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Verkoop Extra's
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget voor Rekening {1} tegen kostenplaats {2} zal worden overschreden met {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
 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
 ,Stock Projected Qty,Verwachte voorraad hoeveelheid
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
 DocType: Sales Order,Customer's Purchase Order,Klant Bestelling
 DocType: Warranty Claim,From Company,Van Bedrijf
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Waarde of Aantal
@@ -2323,9 +2345,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Laat toegestaan Block List
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,U zult het gebruiken om in te loggen
 DocType: Sales Partner,Retailer,Retailer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit Om rekening moet een balansrekening zijn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Alle Leverancier Types
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +46,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 +93,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
@@ -2369,7 +2391,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Het bruto gewicht van het pakket. Meestal nettogewicht + verpakkingsmateriaal gewicht. (Voor afdrukken)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts
 DocType: Serial No,Is Cancelled,Is Geannuleerd
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mijn verzendingen
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Mijn verzendingen
 DocType: Journal Entry,Bill Date,Factuurdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Als er meerdere Prijsbepalings Regels zijn met de hoogste prioriteit, dan wordt de volgende interene prioriteit gehanteerd:"
 DocType: Supplier,Supplier Details,Leverancier Details
@@ -2390,10 +2412,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Oproepen
 DocType: Project,Total Costing Amount (via Time Logs),Totaal Costing bedrag (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Voorraad Eenheid
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Inkooporder {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Inkooporder {0} is niet ingediend
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,verwachte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serienummer {0} behoort niet tot Magazijn {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opmerking : Het systeem controleert niet over- levering en overboeking voor post {0} als hoeveelheid of bedrag 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opmerking : Het systeem controleert niet over- levering en overboeking voor post {0} als hoeveelheid of bedrag 0
 DocType: Notification Control,Quotation Message,Offerte Bericht
 DocType: Issue,Opening Date,Openingsdatum
 DocType: Journal Entry,Remark,Opmerking
@@ -2406,9 +2428,9 @@
 DocType: Time Log,Batched for Billing,Gebundeld voor facturering
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Facturen van leveranciers.
 DocType: POS Profile,Write Off Account,Afschrijvingsrekening
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,De netto kasstroom uit operationele activiteiten
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,bijv. BTW
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punt 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry Account
@@ -2449,7 +2471,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Pensioneringsdatum moet groter zijn dan Datum van Indiensttreding
 DocType: Sales Invoice,Against Income Account,Tegen Inkomstenrekening
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Geleverd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Regio Doelen
 DocType: Delivery Note,Transporter Info,Vervoerder Info
@@ -2477,10 +2499,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partij nummer is verplicht voor artikel {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dit is een basis verkoper en kan niet worden bewerkt .
 ,Stock Ledger,Voorraad Dagboek
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Rate: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Salarisstrook Aftrek
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Selecteer eerst een groep knooppunt.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Doel moet één zijn van {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Doel moet één zijn van {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Vul het formulier in en sla het op
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download een rapport met alle grondstoffen met hun laatste voorraadstatus
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
@@ -2518,7 +2540,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Bedrijf ( geen klant of leverancier ) meester.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Vul 'Verwachte leverdatum' in
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,Betaald bedrag + Afgeschreven bedrag kan niet groter zijn dan Eindtotaal
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,Betaald bedrag + Afgeschreven bedrag kan niet groter zijn dan Eindtotaal
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} is geen geldig batchnummer voor Artikel {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Opmerking: Er is niet genoeg verlofsaldo voor Verlof type {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Opmerking: Als de betaling niet is gedaan tegen elke verwijzing, handmatig maken Journal Entry."
@@ -2535,13 +2557,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Stuur automatische e-mails naar Contactpersonen op Indienen transacties.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Rij {0}: Aantal niet voorradig in magazijn {1}  op {2} {3}.
 Beschikbaar aantal: {4}, Verplaats Aantal: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punt 3
 DocType: Purchase Order,Customer Contact Email,Customer Contact E-mail
 DocType: Sales Team,Contribution (%),Bijdrage (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Verantwoordelijkheden
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Sjabloon
 DocType: Sales Person,Sales Person Name,Verkoper Naam
@@ -2552,20 +2574,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Voordat verzoening
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,Standaard Stuklijst
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Gelieve re-type bedrijfsnaam te bevestigen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totale uitstaande Amt
 DocType: Time Log Batch,Total Hours,Totaal Uren
 DocType: Journal Entry,Printing Settings,Instellingen afdrukken
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Totaal Debet moet gelijk zijn aan Totaal Credit. Het verschil is {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Totaal Debet moet gelijk zijn aan Totaal Credit. Het verschil is {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Van Vrachtbrief
 DocType: Time Log,From Time,Van Tijd
 DocType: Notification Control,Custom Message,Aangepast bericht
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Kas- of Bankrekening is verplicht om een  betaling aan te maken
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Kas- of Bankrekening is verplicht om een  betaling aan te maken
 DocType: Purchase Invoice,Price List Exchange Rate,Prijslijst Wisselkoers
 DocType: Purchase Invoice Item,Rate,Tarief
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,intern
@@ -2583,9 +2605,10 @@
 			conflict by assigning priority. Price Rules: {0}","Er bestaan meerdere prijsbepalingsregels met dezelfde criteria, los aub op \ conflict bij het toewijzen van prioriteit. Prijsbepaling Regels: {0}"
 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 +580,Issue Material,Kwestie Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Kwestie Materiaal
 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
 DocType: Hub Settings,Access Token,Toegang Token
 DocType: Sales Invoice Item,Serial No,Serienummer
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Vul eerst Onderhoudsdetails in
@@ -2599,10 +2622,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maximumfactuur Bedrag
 DocType: Purchase Invoice Item,Image View,Afbeelding Bekijken
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Waardering en Totaal
@@ -2610,6 +2635,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dit artikel is een variant van {0} (Template). Attributen zullen worden gekopieerd uit de sjabloon, tenzij 'No Copy' is ingesteld"
 DocType: Account,Purchase User,Aankoop Gebruiker
 DocType: Notification Control,Customize the Notification,Aanpassen Kennisgeving
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Kasstroom uit bedrijfsoperaties
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standaard Adres Sjabloon kan niet worden verwijderd
 DocType: Sales Invoice,Shipping Rule,Verzendregel
 DocType: Journal Entry,Print Heading,Print Kop
@@ -2620,7 +2646,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,grondstof
 DocType: Leave Application,Follow via Email,Volg via e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Belasting bedrag na korting
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,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 +335,Please select Posting Date first,Selecteer Boekingsdatum eerste
@@ -2638,6 +2664,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Volgnummers zijn vereist voor Seriegebonden Artikel {0}
 DocType: Journal Entry,Bank Entry,Bank Invoer
 DocType: Authorization Rule,Applicable To (Designation),Van toepassing zijn op (Benaming)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,In winkelwagen
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Groeperen volgens
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,In- / uitschakelen valuta .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Portokosten
@@ -2645,30 +2672,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Vrije Tijd
 DocType: Purchase Order,The date on which recurring order will be stop,De datum waarop terugkerende bestelling wordt te stoppen
 DocType: Quality Inspection,Item Serial No,Artikel Serienummer
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} moet worden verminderd met {1} of u moet de overboeking tolerantie verhogen
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} moet worden verminderd met {1} of u moet de overboeking tolerantie verhogen
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Totaal Present
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,uur
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Geserialiseerde Item {0} kan niet worden bijgewerkt \
  behulp Stock Verzoening"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transfer Material aan Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Transfer Material aan Leverancier
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Maak Offerte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,U bent niet bevoegd om te bladeren op Block Data keuren
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Al deze items zijn reeds gefactureerde
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Al deze items zijn reeds gefactureerde
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan door {0} worden goedgekeurd
 DocType: Shipping Rule,Shipping Rule Conditions,Verzendregel Voorwaarden
 DocType: BOM Replace Tool,The new BOM after replacement,De nieuwe Stuklijst na vervanging
 DocType: Features Setup,Point of Sale,Point of Sale
 DocType: Account,Tax,Belasting
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rij {0}: {1} is geen geldige {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Van product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Van product Bundle
 DocType: Production Planning Tool,Production Planning Tool,Productie Planning Tool
 DocType: Quality Inspection,Report Date,Rapport datum
 DocType: C-Form,Invoices,Facturen
 DocType: Job Opening,Job Title,Functiebenaming
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Ontvangers
 DocType: Features Setup,Item Groups in Details,Artikelgroepen in Details
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -2676,8 +2702,9 @@
 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: Pricing Rule,Customer Group,Klantengroep
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Kostenrekening is verplicht voor artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Kostenrekening is verplicht voor artikel {0}
 DocType: Item,Website Description,Website Beschrijving
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Netto wijziging in het eigen vermogen
 DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
 ,Sales Register,Verkoopregister
 DocType: Quotation,Quotation Lost Reason,Reden verlies van Offerte
@@ -2685,12 +2712,12 @@
 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/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Samenvatting voor deze maand en in afwachting van activiteiten
 DocType: Customer Group,Customer Group Name,Klant Groepsnaam
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Attributen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Get Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Voer Afschrijvingenrekening in
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Get Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Voer Afschrijvingenrekening in
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Laatste Bestel Date
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Maak Accijnzen Factuur
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Account {0} niet behoort tot bedrijf {1}
@@ -2706,7 +2733,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projectgegevens zijn niet beschikbaar voor Offertes
 DocType: Project,Expected End Date,Verwachte einddatum
 DocType: Appraisal Template,Appraisal Template Title,Beoordeling Template titel
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,commercieel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,commercieel
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Ouder Item {0} moet een Stock Item niet
 DocType: Cost Center,Distribution Id,Distributie Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
@@ -2719,7 +2746,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Waar voor Attribute {0} moet binnen het bereik van {1} tot {2} in de stappen van {3}
 DocType: Tax Rule,Sales,Verkoop
 DocType: Stock Entry Detail,Basic Amount,Basisbedrag
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
 DocType: Leave Allocation,Unused leaves,Ongebruikte bladeren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default Debiteuren
@@ -2731,16 +2758,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Aankoopfacturen
-DocType: Payment Reconciliation,Maximum Amount,Maximum Bedrag
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hoe wordt de Prijsregel toegepast?
 DocType: Quality Inspection,Delivery Note No,Vrachtbrief Nr
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Klant {0} bestaat niet
 DocType: Attendance,Absent,Afwezig
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Product Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rij {0}: Invalid referentie {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Product Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Rij {0}: Invalid referentie {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Aankoop en -heffingen Template
 DocType: Upload Attendance,Download Template,Download Template
 DocType: GL Entry,Remarks,Opmerkingen
@@ -2767,7 +2794,7 @@
 ,Monthly Attendance Sheet,Maandelijkse Aanwezigheids Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Geen record gevonden
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kostenplaats is verplicht voor Artikel {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Krijg Items uit Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Krijg Items uit Product Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Rekening {0} is niet actief
 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.
@@ -2776,8 +2803,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Winst- en verliesrekening' rekeningtype {0} niet toegestaan in Openings Invoer
 DocType: Features Setup,Sales Discounts,Verkoop kortingen
 DocType: Hub Settings,Seller Country,Verkoper Land
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Artikelen publiceren op de website
 DocType: Authorization Rule,Authorization Rule,Autorisatie Rule
 DocType: Sales Invoice,Terms and Conditions Details,Algemene Voorwaarden Details
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,specificaties
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Sales en -heffingen Template
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kleding & Toebehoren
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Aantal Bestel
@@ -2799,7 +2828,7 @@
 DocType: Time Log,Billing Amount,Billing Bedrag
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ongeldig aantal opgegeven voor artikel {0} . Hoeveelheid moet groter zijn dan 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Aanvragen voor verlof.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Rekening met bestaande transactie kan niet worden verwijderd
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Rekening met bestaande transactie kan niet worden verwijderd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridische Kosten
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","De dag van de maand waarop de automatische bestelling wordt bijvoorbeeld 05, 28 etc worden gegenereerd"
 DocType: Sales Invoice,Posting Time,Plaatsing Time
@@ -2815,11 +2844,11 @@
 DocType: Maintenance Visit,Breakdown,Storing
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Account: {0} met valuta: {1} kan niet worden geselecteerd
 DocType: Bank Reconciliation Detail,Cheque Date,Cheque Datum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Rekening {0}: Bovenliggende rekening {1} hoort niet bij bedrijf: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Rekening {0}: Bovenliggende rekening {1} hoort niet bij bedrijf: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesvol verwijderd alle transacties met betrekking tot dit bedrijf!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Op Date
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,proeftijd
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Standaard Magazijn is verplicht voor voorraadartikel .
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Standaard Magazijn is verplicht voor voorraadartikel .
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Betaling van salaris voor de maand {0} en jaar {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Prijslijst tarief als vermist
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Totale betaalde bedrag
@@ -2831,6 +2860,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Totaal factuurbedrag (via Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Wij verkopen dit artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverancier Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Hoeveelheid moet groter zijn dan 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Contact Omschr
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Type verloven zoals, buitengewoon, ziekte, etc."
@@ -2839,7 +2869,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Rijen toevoegen om jaarlijkse begrotingen op Rekeningen in te stellen.
 DocType: Buying Settings,Default Supplier Type,Standaard Leverancier Type
 DocType: Production Order,Total Operating Cost,Totale exploitatiekosten
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Opmerking : Artikel {0} meerdere keren ingevoerd
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Opmerking : Artikel {0} meerdere keren ingevoerd
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle contactpersonen.
 DocType: Newsletter,Test Email Id,Test E-mail ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Bedrijf Afkorting
@@ -2864,7 +2894,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Doelgroepen
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Belasting Template is verplicht.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Rekening {0}: Bovenliggende rekening {1} bestaat niet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Tijdelijk
 DocType: Address,Preferred Billing Address,Voorkeur Factuuradres
@@ -2882,8 +2912,8 @@
 ,Item-wise Price List Rate,Artikelgebaseerde Prijslijst Tarief
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} is gestopt
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barcode {0} is al in gebruik in post {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} is gestopt
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barcode {0} is al in gebruik in post {1}
 DocType: Lead,Add to calendar on this date,Toevoegen aan agenda op deze datum
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regels voor het toevoegen van verzendkosten.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,aankomende evenementen
@@ -2904,24 +2934,24 @@
 DocType: Customer,From Lead,Van Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Orders vrijgegeven voor productie.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selecteer boekjaar ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
 DocType: Hub Settings,Name Token,Naam Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standaard Verkoop
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Tenminste een magazijn is verplicht
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,Uit de garantie
 DocType: BOM Replace Tool,Replace,Vervang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} tegen verkoopfactuur {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Vul Standaard eenheid in
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} tegen verkoopfactuur {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Vul Standaard eenheid in
 DocType: Purchase Invoice Item,Project Name,Naam van het project
 DocType: Supplier,Mention if non-standard receivable account,Vermelden of niet-standaard te ontvangen rekening
 DocType: Journal Entry Account,If Income or Expense,Indien Inkomsten (baten) of Uitgaven (lasten)
 DocType: Features Setup,Item Batch Nos,Artikel Batchnummers
 DocType: Stock Ledger Entry,Stock Value Difference,Voorraad Waarde Verschil
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Human Resource
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Belastingvorderingen
 DocType: BOM Item,BOM No,Stuklijst nr.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,De Stuklijst die zal worden vervangen
 DocType: Account,Debit,Debet
@@ -2958,7 +2988,7 @@
 DocType: Stock Entry Detail,Additional Cost,Bijkomende kosten
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Boekjaar Einddatum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan niet filteren op basis van Vouchernummer, indien gegroepeerd per Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Maak Leverancier Offerte
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Maak Leverancier Offerte
 DocType: Quality Inspection,Incoming,Inkomend
 DocType: BOM,Materials Required (Exploded),Benodigde materialen (uitgeklapt)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Verminderen Inkomsten voor onbetaald verlof
@@ -2966,7 +2996,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Rij # {0}: Serienummer {1} komt niet overeen met {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Partij ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Opmerking : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Opmerking : {0}
 ,Delivery Note Trends,Vrachtbrief Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Samenvatting van deze week
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} moet een gekocht of uitbesteed artikel zijn in rij {1}
@@ -2981,6 +3011,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gem. Buying Rate
 DocType: Task,Actual Time (in Hours),Werkelijke tijd (in uren)
 DocType: Employee,History In Company,Geschiedenis In Bedrijf
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},De totale Uitgifte / Transfer hoeveelheid {0} in Material Request {1} kan niet groter zijn dan het gevraagde aantal zijn {2} voor post {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Nieuwsbrieven
 DocType: Address,Shipping,Logistiek
 DocType: Stock Ledger Entry,Stock Ledger Entry,Voorraad Dagboek post
@@ -3000,7 +3031,6 @@
 DocType: Purchase Order,End date of current order's period,Einddatum van de periode huidige bestelling's
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Bod uitbrengen Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Terugkeer
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Standaard maateenheid voor Variant moet hetzelfde zijn als sjabloon
 DocType: Production Order Operation,Production Order Operation,Productie Order Operatie
 DocType: Pricing Rule,Disable,Uitschakelen
 DocType: Project Task,Pending Review,In afwachting van Beoordeling
@@ -3008,7 +3038,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Customer Id
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Om tijd groter dan Van Time moet zijn
 DocType: Journal Entry Account,Exchange Rate,Wisselkoers
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazijn {0}: Bovenliggende rekening {1} behoort niet tot bedrijf {2}
 DocType: BOM,Last Purchase Rate,Laatste inkooptarief
 DocType: Account,Asset,aanwinst
@@ -3028,7 +3058,7 @@
 ,Available Stock for Packing Items,Beschikbaar voor Verpakking Items
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Dit adres Template instellen als standaard als er geen andere standaard
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo reeds in Debit, is het niet toegestaan om 'evenwicht moet worden' als 'Credit'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo reeds in Debit, is het niet toegestaan om 'evenwicht moet worden' als 'Credit'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,Filteren op basis van klant
 DocType: Payment Tool Detail,Against Voucher No,Tegen blad nr
@@ -3045,6 +3075,7 @@
 DocType: Opportunity,Next Contact,Volgende Contact
 DocType: Employee,Employment Type,Dienstverband Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Vaste Activa
+,Cash Flow,Geldstroom
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Aanvraagperiode kan niet over twee alocation platen
 DocType: Item Group,Default Expense Account,Standaard Kostenrekening
 DocType: Employee,Notice (days),Kennisgeving ( dagen )
@@ -3076,13 +3107,12 @@
 DocType: Production Order,Warehouses,Magazijnen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Kantoorartikelen
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Groeperingsnode
-DocType: Payment Reconciliation,Minimum Amount,Minimumbedrag
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Bijwerken Gereed Product
 DocType: Workstation,per hour,per uur
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Rekening voor het magazijn wordt aangemaakt onder deze rekening.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazijn kan niet worden verwijderd omdat er voorraadboekingen zijn voor dit magazijn.
 DocType: Company,Distribution,Distributie
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Betaald bedrag
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Betaald bedrag
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maximale korting toegestaan voor artikel: {0} is {1}%
@@ -3106,7 +3136,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analyse
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Bedrijf ontbreekt in magazijnen {0}
 DocType: POS Profile,Terms and Conditions,Algemene Voorwaarden
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Tot Datum moet binnen het boekjaar vallenn. Ervan uitgaande dat Tot Datum = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Tot Datum moet binnen het boekjaar vallenn. Ervan uitgaande dat Tot Datum = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hier kunt u onderhouden lengte, gewicht, allergieën, medische zorgen, enz."
 DocType: Leave Block List,Applies to Company,Geldt voor Bedrijf
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Kan niet annuleren omdat ingediende Voorraad Invoer {0} bestaat
@@ -3120,11 +3150,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Vul Aankoopfacturen
 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 +425,Transaction not allowed against stopped Production Order {0},Transactie niet toegestaan met gestopte productieorder {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup inkomende server voor ondersteuning e-id . ( b.v. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Tekort Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Item variant {0} bestaat met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Item variant {0} bestaat met dezelfde kenmerken
 DocType: Salary Slip,Salary Slip,Salarisstrook
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tot Datum' is vereist
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Genereren van pakbonnen voor pakketten te leveren. Gebruikt voor pakket nummer, inhoud van de verpakking en het gewicht te melden."
@@ -3213,7 +3243,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Werknemer regel.
 DocType: HR Settings,Payroll Settings,Loonadministratie Instellingen
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match niet-gekoppelde facturen en betalingen.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Plaats bestelling
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Plaats bestelling
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan niet een bovenliggende kostenplaats hebben
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Selecteer merk ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Toepasselijk
@@ -3228,7 +3258,7 @@
 DocType: Appraisal,Start Date,Startdatum
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Toewijzen bladeren voor een periode .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik hier om te controleren
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Rekening {0}: U kunt niet de rekening zelf toewijzen als bovenliggende rekening
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Rekening {0}: U kunt niet de rekening zelf toewijzen als bovenliggende rekening
 DocType: Purchase Invoice Item,Price List Rate,Prijslijst Tarief
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Toon &quot;Op voorraad&quot; of &quot;Niet op voorraad&quot; op basis van de beschikbare voorraad in dit magazijn.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Stuklijsten
@@ -3237,17 +3267,17 @@
 DocType: Project,Expected Start Date,Verwachte startdatum
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Artikel verwijderen als de kosten niet van toepassing zijn op dat artikel
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Bijv. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Ontvangen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Ontvangen
 DocType: Maintenance Visit,Fully Completed,Volledig afgerond
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% voltooid
 DocType: Employee,Educational Qualification,Educatieve Kwalificatie
 DocType: Workstation,Operating Costs,Bedrijfskosten
 DocType: Employee Leave Approver,Employee Leave Approver,Werknemer Verlof Fiatteur
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} is succesvol toegevoegd aan onze nieuwsbrief lijst.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Kan niet als verloren verklaren, omdat Offerte is gemaakt."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Aankoop Master Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Productie Order {0} moet worden ingediend
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Productie Order {0} moet worden ingediend
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Selecteer Start- en Einddatum voor Artikel {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Hoofdrapporten
 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
@@ -3265,7 +3295,7 @@
 DocType: Industry Type,Industry Type,Industrie Type
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Er is iets fout gegaan!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Waarschuwing: Verlof applicatie bevat volgende blok data
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Verkoopfactuur {0} is al ingediend
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Verkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Voltooiingsdatum
 DocType: Purchase Invoice Item,Amount (Company Currency),Bedrag (Company Munt)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisatie -eenheid (departement) meester.
@@ -3284,10 +3314,10 @@
 ,Serial No Service Contract Expiry,Serienummer Service Contract Afloop
 DocType: Item,Unit of Measure Conversion,Eenheid van Meet Conversie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Werknemer kan niet worden gewijzigd
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,U kunt niet hetzelfde bedrag crediteren en debiteren op hetzelfde moment
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,U kunt niet hetzelfde bedrag crediteren en debiteren op hetzelfde moment
 DocType: Naming Series,Help HTML,Help HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Totaal toegewezen gewicht moet 100% zijn. Het is {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Korting voor over-{0} gekruist voor post {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Korting voor over-{0} gekruist voor post {1}
 DocType: Address,Name of person or organization that this address belongs to.,Naam van de persoon of organisatie waartoe dit adres behoort.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Uw Leveranciers
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Kan niet als Verloren instellen, omdat er al een Verkoop Order is gemaakt."
@@ -3300,35 +3330,35 @@
 DocType: Employee,Date of Issue,Datum van afgifte
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Van {0} voor {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Rij # {0}: Stel Leverancier voor punt {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Kijk Valuta optie om rekeningen met andere valuta toestaan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Kijk Valuta optie om rekeningen met andere valuta toestaan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} bestaat niet in het systeem
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,U bent niet bevoegd om Bevroren waarde in te stellen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,U bent niet bevoegd om Bevroren waarde in te stellen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Haal onafgeletterde transacties op
+DocType: Payment Reconciliation,From Invoice Date,Na factuurdatum
 DocType: Cost Center,Budgets,Budgetten
-DocType: Employee,Emergency Contact Details,Noodgeval Contactgegevens
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Wat doet het?
 DocType: Delivery Note,To Warehouse,Tot Magazijn
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Rekening {0} is meer dan één keer ingevoerd voor het boekjaar {1}
 ,Average Commission Rate,Gemiddelde Commissie Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'Has Serial No' can not be 'Yes' for non-stock item,'Heeft Serienummer' kan niet 'ja' zijn voor niet- voorraad artikel
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Aanwezigheid kan niet aangemerkt worden voor toekomstige data
 DocType: Pricing Rule,Pricing Rule Help,Prijsbepalingsregel Help
 DocType: Purchase Taxes and Charges,Account Head,Hoofdrekening
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualiseren extra kosten voor landde kosten van artikelen te berekenen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,elektrisch
 DocType: Stock Entry,Total Value Difference (Out - In),Totale waarde Verschil (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Rij {0}: Wisselkoers is verplicht
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Rij {0}: Wisselkoers is verplicht
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Gebruikers-ID niet ingesteld voor Werknemer {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Van Garantie Claim
 DocType: Stock Entry,Default Source Warehouse,Standaard Bronmagazijn
 DocType: Item,Customer Code,Klantcode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Verjaardagsherinnering voor {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dagen sinds laatste Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Voorraad Activa
@@ -3341,7 +3371,7 @@
 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
 DocType: Authorization Rule,Based On,Gebaseerd op
 DocType: Sales Order Item,Ordered Qty,Besteld Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Punt {0} is uitgeschakeld
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Punt {0} is uitgeschakeld
 DocType: Stock Settings,Stock Frozen Upto,Voorraad Bevroren Tot
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periode Van en periode te data verplicht voor terugkerende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Project activiteit / taak.
@@ -3349,7 +3379,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Schrijf Off Bedrag (Company Munt)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
 DocType: Landed Cost Voucher,Landed Cost Voucher,Vrachtkosten Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Stel {0} in
 DocType: Purchase Invoice,Repeat on Day of Month,Herhaal dit op dag van de maand
@@ -3378,12 +3408,12 @@
 DocType: Upload Attendance,Upload Attendance,Upload Aanwezigheid
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM en Productie Hoeveelheid nodig
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Vergrijzing Range 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Bedrag
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Bedrag
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stuklijst vervangen
 ,Sales Analytics,Verkoop analyse
 DocType: Manufacturing Settings,Manufacturing Settings,Productie Instellingen
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Het opzetten van e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Vul de standaard valuta in in Bedrijfsstam
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Daily Reminders
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Belasting Regel Conflicten met {0}
@@ -3409,13 +3439,13 @@
 DocType: Sales Order Item,Produced Quantity,Geproduceerd Aantal
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingenieur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Zoeken Sub Assemblies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Artikelcode vereist bij rijnummer {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Artikelcode vereist bij rijnummer {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Werkelijk
 DocType: Authorization Rule,Customerwise Discount,Klantgebaseerde Korting
 DocType: Purchase Invoice,Against Expense Account,Tegen Kostenrekening
 DocType: Production Order,Production Order,Productieorder
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installatie Opmerking {0} is al ingediend
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Installatie Opmerking {0} is al ingediend
 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
@@ -3427,15 +3457,15 @@
 DocType: Employee,Applicable Holiday List,Toepasselijk Holiday Lijst
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Reeks bijgewerkt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapport type is verplicht
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Rapport type is verplicht
 DocType: Item,Serial Number Series,Serienummer Reeksen
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazijn is verplicht voor voorraadartikel {0} in rij {1}
 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/public/js/setup_wizard.js +101,The First User: You,De eerste gebruiker: U
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Succesvol Afgeletterd
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Succesvol Afgeletterd
 DocType: Production Order,Planned End Date,Geplande Einddatum
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Waar artikelen worden opgeslagen.
 DocType: Tax Rule,Validity,Deugdelijkheid
@@ -3443,7 +3473,7 @@
 DocType: Attendance,Attendance,Aanwezigheid
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Plaatsingsdatum en -tijd is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Plaatsingsdatum en -tijd is verplicht
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Belasting sjabloon voor inkooptransacties .
 ,Item Prices,Artikelprijzen
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,In Woorden zijn zichtbaar zodra u de Inkooporder opslaat
@@ -3452,15 +3482,15 @@
 DocType: Task,Review Date,Herzieningsdatum
 DocType: Purchase Invoice,Advance Payments,Advance Payments
 DocType: Purchase Taxes and Charges,On Net Total,Op Netto Totaal
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Doel magazijn in rij {0} moet hetzelfde zijn als productieorder
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Geen toestemming om Betaling Tool gebruiken
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Notificatie E-mailadressen' niet gespecificeerd voor terugkerende %s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Afronden Account
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administratie Kosten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Bovenliggende klantgroep
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Verandering
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Verandering
 DocType: Purchase Invoice,Contact Email,Contact E-mail
 DocType: Appraisal Goal,Score Earned,Verdiende Score
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","bijv. ""Mijn Bedrijf BV"""
@@ -3470,13 +3500,13 @@
 DocType: Packing Slip,Gross Weight UOM,Bruto Gewicht Eenheid
 DocType: Email Digest,Receivables / Payables,Debiteuren / Crediteuren
 DocType: Delivery Note Item,Against Sales Invoice,Tegen Sales Invoice
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Credit Account
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Credit Account
 DocType: Landed Cost Item,Landed Cost Item,Vrachtkosten Artikel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Toon nulwaarden
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Hoeveelheid product verkregen na productie / herverpakken van de gegeven hoeveelheden grondstoffen
 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 +562,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
 DocType: Item,Default Warehouse,Standaard Magazijn
 DocType: Task,Actual End Date (via Time Logs),Werkelijke Einddatum (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan niet tegen Group rekening worden toegewezen {0}
@@ -3512,29 +3542,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Plan tijd logs buiten Workstation Arbeidstijdenwet.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} al is ingediend
 ,Items To Be Requested,Aan te vragen artikelen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Get Laatst Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Facturering tarief gebaseerd op Activity Type (per uur)
 DocType: Company,Company Info,Bedrijfsinformatie
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Bedrijf Email-id niet gevonden, dus mail niet verzonden"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Toepassing van kapitaal (Activa)
 DocType: Production Planning Tool,Filter based on item,Filteren op basis van artikel
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Debit Account
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debit Account
 DocType: Fiscal Year,Year Start Date,Jaar Startdatum
 DocType: Attendance,Employee Name,Werknemer Naam
 DocType: Sales Invoice,Rounded Total (Company Currency),Afgerond Totaal (Bedrijfsvaluta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Kan niet verkapte naar Groep omdat Account Type is geselecteerd.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,Kan niet verkapte naar Groep omdat Account Type is geselecteerd.
 DocType: Purchase Common,Purchase Common,Inkoop Gemeenschappelijk
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} is gewijzigd. Vernieuw aub.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Weerhoud gebruikers van het maken van verlofaanvragen op de volgende dagen.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Van Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Employee Benefits
 DocType: Sales Invoice,Is POS,Is POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Verpakt hoeveelheid moet hoeveelheid die gelijk is voor post {0} in rij {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Geaccepteerd Aantal
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} bestaat niet
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Factureren aan Klanten
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnees toegevoegd
 DocType: Maintenance Schedule,Schedule,Plan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definieer begroting voor deze kostenplaats. De begroting actie, zie &quot;Company List&quot;"
@@ -3542,7 +3573,7 @@
 DocType: Quality Inspection Reading,Reading 3,Meting 3
 ,Hub,Naaf
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
 DocType: Expense Claim,Approved,Aangenomen
 DocType: Pricing Rule,Price,prijs
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Werknemer ontslagen op {0} moet worden ingesteld als 'Verlaten'
@@ -3556,7 +3587,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Journaalposten.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Aantal beschikbaar bij Van Warehouse
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Selecteer eerst Werknemer Record.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rij {0}: Party / Account komt niet overeen met {1} / {2} in {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rij {0}: Party / Account komt niet overeen met {1} / {2} in {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Een belastingrekening aanmaken
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Vul Kostenrekening in
 DocType: Account,Stock,Voorraad
@@ -3567,7 +3598,7 @@
 DocType: Employee,Contract End Date,Contract Einddatum
 DocType: Sales Order,Track this Sales Order against any Project,Volg dit Verkooporder tegen elke Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Haal verkooporders (in afwachting van levering) op basis van de bovengenoemde criteria
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Van Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Van Leverancier Offerte
 DocType: Deduction Type,Deduction Type,Aftrek Type
 DocType: Attendance,Half Day,Halve dag
 DocType: Pricing Rule,Min Qty,min Aantal
@@ -3575,7 +3606,7 @@
 DocType: GL Entry,Transaction Date,Transactie Datum
 DocType: Production Plan Item,Planned Qty,Gepland Aantal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Tax
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Voor Hoeveelheid (Geproduceerd Aantal) is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Voor Hoeveelheid (Geproduceerd Aantal) is verplicht
 DocType: Stock Entry,Default Target Warehouse,Standaard Doelmagazijn
 DocType: Purchase Invoice,Net Total (Company Currency),Netto Totaal (Bedrijfsvaluta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rij {0}: Party Type en Party is uitsluitend van toepassing tegen Debiteuren / Crediteuren rekening
@@ -3629,9 +3660,9 @@
 DocType: Customer,Commission Rate,Commissie Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Maak Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok verlaten toepassingen per afdeling.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Winkelwagen is leeg
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Winkelwagen is leeg
 DocType: Production Order,Actual Operating Cost,Werkelijke operationele kosten
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root kan niet worden bewerkt .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root kan niet worden bewerkt .
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Toegekende bedrag kan niet hoger zijn dan unadusted bedrag
 DocType: Manufacturing Settings,Allow Production on Holidays,Laat Productie op vakantie
 DocType: Sales Order,Customer's Purchase Order Date,Inkooporder datum van Klant
@@ -3642,11 +3673,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Ontwerper
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Algemene voorwaarden Template
 DocType: Serial No,Delivery Details,Levering Details
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Kostenplaats is vereist in regel {0} in Belastingen tabel voor type {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Kostenplaats is vereist in regel {0} in Belastingen tabel voor type {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Maak automatisch Materiaal aanvragen als de hoeveelheid lager niveau
 ,Item-wise Purchase Register,Artikelgebaseerde Inkoop Register
 DocType: Batch,Expiry Date,Vervaldatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Om bestelniveau stellen, moet onderdeel van een aankoop Item of Manufacturing Item zijn"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Om bestelniveau stellen, moet onderdeel van een aankoop Item of Manufacturing Item zijn"
 ,Supplier Addresses and Contacts,Leverancier Adressen en Contacten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Selecteer eerst een Categorie
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Project stam.
@@ -3654,7 +3685,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Halve Dag)
 DocType: Supplier,Credit Days,Credit Dagen
 DocType: Leave Type,Is Carry Forward,Is Forward Carry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Artikelen ophalen van Stuklijst
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rij {0}: Party Type en Party is vereist voor Debiteuren / Crediteuren rekening {1}
@@ -3662,7 +3693,7 @@
 DocType: Employee,Reason for Leaving,Reden voor vertrek
 DocType: Expense Claim Detail,Sanctioned Amount,Gesanctioneerde Bedrag
 DocType: GL Entry,Is Opening,Opent
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rij {0}: debitering niet kan worden verbonden met een {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Rekening {0} bestaat niet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Rij {0}: debitering niet kan worden verbonden met een {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Rekening {0} bestaat niet
 DocType: Account,Cash,Kas
 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 2109201..22ebd59 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Forbrukerprodukter
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vennligst velg Partiet Type først
 DocType: Item,Customer Items,Kunde Items
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Parent konto {1} kan ikke være en hovedbok
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Parent konto {1} kan ikke være en hovedbok
 DocType: Item,Publish Item to hub.erpnext.com,Publiser varen til hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-postvarsling
 DocType: Item,Default Unit of Measure,Standard måleenhet
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for Prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil bli beregnet i transaksjonen.
 DocType: Purchase Order,Customer Contact,Kundekontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Fra Material Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Fra Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} treet
 DocType: Job Applicant,Job Applicant,Jobbsøker
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ingen flere resultater.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For å opprettholde kunde kloke elementet koden og gjøre dem søkbare basert på deres bruk kode dette alternativet
 DocType: Mode of Payment Account,Mode of Payment Account,Modus for betaling konto
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Vis Varianter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Antall
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Antall
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (gjeld)
 DocType: Employee Education,Year of Passing,Year of Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På Lager
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Helsevesen
 DocType: Purchase Invoice,Monthly,Månedlig
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Forsinket betaling (dager)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodisitet
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-Post-Adresse
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Regnskapsår {0} er nødvendig
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvars
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} samsvarer ikke med {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} samsvarer ikke med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle Nei
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vennligst velg Prisliste
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Vennligst velg Prisliste
 DocType: Production Order Operation,Work In Progress,Arbeid På Går
 DocType: Employee,Holiday List,Holiday List
 DocType: Time Log,Time Log,Tid Logg
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samme firma er angitt mer enn én gang
 DocType: Employee,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ikke tillatt for {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
 DocType: Payment Reconciliation,Reconcile,Forsone
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Dagligvare
 DocType: Quality Inspection Reading,Reading 1,Lesing 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Gjør Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensjonsfondene
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Warehouse er obligatorisk hvis kontotype er Warehouse
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Warehouse er obligatorisk hvis kontotype er Warehouse
 DocType: SMS Center,All Sales Person,All Sales Person
 DocType: Lead,Person Name,Person Name
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Sjekk om tilbakevendende orden, fjern haken for å stoppe tilbakevendende eller sette riktig sluttdato"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Interessert
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Åpning
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Fra {0} til {1}
 DocType: Item,Copy From Item Group,Kopier fra varegruppe
 DocType: Journal Entry,Opening Entry,Åpning Entry
 DocType: Stock Entry,Additional Costs,Tilleggskostnader
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konto med eksisterende transaksjon kan ikke konverteres til gruppen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Konto med eksisterende transaksjon kan ikke konverteres til gruppen.
 DocType: Lead,Product Enquiry,Produkt Forespørsel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Skriv inn et selskap først
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vennligst velg selskapet først
 DocType: Employee Education,Under Graduate,Under Graduate
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target På
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target På
 DocType: BOM,Total Cost,Totalkostnad
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitetsloggen:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Element {0} finnes ikke i systemet eller er utløpt
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Elementet {0} må være et kjøp varen
 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 +444,Item {0} is not active or end of life has been reached,Element {0} er ikke aktiv eller slutten av livet er nådd
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil bli oppdatert etter Sales Faktura sendes inn.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Innstillinger for HR Module
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detaljene for operasjonen utføres.
 DocType: Serial No,Maintenance Status,Vedlikehold Status
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Elementer og priser
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato bør være innenfor regnskapsåret. Antar Fra Date = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato bør være innenfor regnskapsåret. Antar Fra Date = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Velg Employee for hvem du oppretter Appraisal.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Kostnadssteds {0} ikke tilhører selskapet {1}
 DocType: Customer,Individual,Individuell
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Netto kontantstrøm fra finansierings
 DocType: Lead,Address & Contact,Adresse og kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Legg ubrukte blader fra tidligere bevilgninger
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Neste Recurring {0} vil bli opprettet på {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Kontakt Navn
 DocType: Production Plan Item,SO Pending Qty,SO Venter Antall
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Oppretter lønn slip for ovennevnte kriterier.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ingen beskrivelse gitt
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Be for kjøp.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Lindrende Dato må være større enn tidspunktet for inntreden
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Sak Nettsted Spesifikasjon
 DocType: Payment Tool,Reference No,Referansenummer
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,La Blokkert
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Avstemming Element
 DocType: Stock Entry,Sales Invoice No,Salg Faktura Nei
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Leverandør Type
 DocType: Item,Publish in Hub,Publisere i Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Element {0} er kansellert
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Element {0} er kansellert
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Relasjon
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekreftede bestillinger fra kunder.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Forslag
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set varegruppe-messig budsjetter på dette territoriet. Du kan også inkludere sesongvariasjoner ved å sette Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Skriv inn forelder kontogruppe for lageret {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mot {0} {1} kan ikke være større enn utestående beløp {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mot {0} {1} kan ikke være større enn utestående beløp {2}
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generere Schedule
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Siste
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Maks 5 tegn
 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
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Lære
 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
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrer Sales Person treet.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Type
 DocType: Sales Invoice Item,Delivery Note,Levering Note
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Sette opp skatter
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Sette opp skatter
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Oppsummering for denne uken og ventende aktiviteter
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Velg måned og år
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Tilgjengelig i BOM, følgeseddel, fakturaen, produksjonsordre, innkjøpsordre, kvitteringen Salg Faktura, Salgsordre, Stock Entry, Timeregistrering"
 DocType: Item Tax,Tax Rate,Skattesats
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Velg element
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Velg element
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Sak: {0} klarte batch-messig, kan ikke forenes bruker \ Stock Forsoning, i stedet bruke Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Konverter til ikke-konsernet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvitteringen må sendes
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medisinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Grunnen for å tape
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er stengt på følgende datoer som per Holiday Liste: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Muligheter
 DocType: Employee,Single,Enslig
 DocType: Issue,Attachment,Vedlegg
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budsjettet kan ikke stilles for konsernet kostnadssted
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,Holiday mester.
 DocType: Material Request Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Fakturaadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Skriv inn Element Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Skriv inn Element Code.
 DocType: BOM,Costing,Costing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis det er merket, vil skattebeløpet betraktes som allerede er inkludert i Print Rate / Print Beløp"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Total Antall
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetikk
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Ingen garanti Utløpsserie
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Element {0} er ikke kjøpe varen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Element {0} er ikke kjøpe varen
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} er en ugyldig e-postadresse i «Notification \ e-postadresse &#39;
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Total Billing i år:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Legg til / Rediger skatter og avgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør Faktura Nei
 DocType: Territory,For reference,For referanse
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Lukking (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Lukking (Cr)
 DocType: Serial No,Warranty Period (Days),Garantiperioden (dager)
 DocType: Installation Note Item,Installation Note Item,Installasjon Merk Element
 ,Pending Qty,Venter Stk
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månedlig Distribution ** hjelper deg fordele budsjettet over måneder hvis du har sesongvariasjoner i din virksomhet. Å distribuere et budsjett å bruke denne fordelingen, sette dette ** Månedlig Distribution ** i ** Cost Center **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Ingen poster ble funnet i Faktura tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Ingen poster ble funnet i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vennligst velg først selskapet og Party Type
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finansiell / regnskap år.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry, kan Serial Nos ikke bli slått sammen"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,Prosjektet Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskapsår Startdato bør ikke være større enn regnskapsåret Sluttdato
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskapsår Startdato bør ikke være større enn regnskapsåret Sluttdato
 DocType: Warranty Claim,Resolution,Oppløsning
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Levering: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Levering: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Betales konto
 DocType: Sales Order,Billing and Delivery Status,Fakturering og levering Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gjenta kunder
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,Sitat Å
 DocType: Lead,Middle Income,Middle Income
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åpning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Bevilget beløpet kan ikke være negativ
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,En logisk Warehouse mot som lager oppføringer er gjort.
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produksjonsordre er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslaget Writing
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negative Stock Error ({6}) for Element {0} i Warehouse {1} {2} {3} i {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negative Stock Error ({6}) for Element {0} i Warehouse {1} {2} {3} i {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Regnskapsåret selskapet
 DocType: Packing Slip Item,DN Detail,DN Detalj
 DocType: Time Log,Billed,Fakturert
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,Standard Koster Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Vedlikeholdsplan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Da reglene for prissetting filtreres ut basert på Kunden, Kundens Group, Territory, leverandør, leverandør Type, Kampanje, Sales Partner etc."
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Netto endring i varelager
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Fra Kjøpskvittering
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Samme elementet er angitt flere ganger.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Fra Kjøpskvittering
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Samme elementet er angitt flere ganger.
 DocType: SMS Settings,Receiver Parameter,Mottaker Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Based On&quot; og &quot;Grupper etter&quot; ikke kan være det samme
 DocType: Sales Person,Sales Person Targets,Sales Person Targets
 DocType: Production Order Operation,In minutes,I løpet av minutter
 DocType: Issue,Resolution Date,Oppløsning Dato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
 DocType: Selling Settings,Customer Naming By,Kunden Naming Av
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konverter til konsernet
 DocType: Activity Cost,Activity Type,Aktivitetstype
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publisering
 DocType: Activity Cost,Projects User,Prosjekter User
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrukes
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} ble ikke funnet i Fakturadetaljer tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} ble ikke funnet i Fakturadetaljer tabellen
 DocType: Company,Round Off Cost Center,Rund av kostnadssted
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vedlikehold Besøk {0} må avbestilles før den avbryter denne salgsordre
 DocType: Material Request,Material Transfer,Material Transfer
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Markedsføring
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Å spore element i salgs- og kjøpsdokumenter basert på deres serie nos. Dette er kan også brukes til å spore detaljer om produktet garanti.
 DocType: Purchase Receipt Item Supplied,Current Stock,Nåværende Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Avvist Warehouse er obligatorisk mot regected element
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Total fakturering i år
 DocType: Account,Expenses Included In Valuation,Kostnader som inngår i verdivurderings
 DocType: Employee,Provide email id registered in company,Gi e-id registrert i selskap
 DocType: Hub Settings,Seller City,Selger by
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Elementet har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Elementet har varianter.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tre Type
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0} er ikke en lagervare
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} er ikke en lagervare
 DocType: Mode of Payment Account,Default Account,Standard konto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,Vennligst velg ukentlig off dag
 DocType: Production Order Operation,Planned End Time,Planlagt Sluttid
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Avviks varegruppe-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaksjon kan ikke konverteres til Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaksjon kan ikke konverteres til Ledger
 DocType: Delivery Note,Customer's Purchase Order No,Kundens innkjøpsordre Nei
 DocType: Employee,Cell Number,Cell Number
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiell Forespørsler Generert
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Mistet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke legge inn dagens kupong i &quot;Against Journal Entry-kolonnen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke legge inn dagens kupong i &quot;Against Journal Entry-kolonnen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Opportunity Fra
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedslønn uttalelse.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} av typen {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Regnskaps Oppføringer kan gjøres mot bladnoder. Føringer mot grupper er ikke tillatt.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Kvitteringen antall som kreves for Element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Kvitteringen antall som kreves for Element {0}
 DocType: Item Attribute Value,Item Attribute Value,Sak data Verdi
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Salgskampanjer.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familiebakgrunn
 DocType: Process Payroll,Send Email,Send E-Post
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ingen tillatelse
 DocType: Company,Default Bank Account,Standard Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Hvis du vil filtrere basert på partiet, velger partiet Skriv inn først"
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Elementer med høyere weightage vil bli vist høyere
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstemming Detalj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Mine Fakturaer
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Mine Fakturaer
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen ansatte funnet
 DocType: Purchase Order,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Dersom underleverandør til en leverandør
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send Nå
 ,Support Analytics,Støtte Analytics
 DocType: Item,Website Warehouse,Nettsted Warehouse
+DocType: Payment Reconciliation,Minimum Invoice Amount,Minimum Fakturert beløp
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form poster
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",For å aktivere &quot;Point of Sale&quot; funksjoner
 DocType: Bin,Moving Average Rate,Moving Gjennomsnittlig pris
 DocType: Production Planning Tool,Select Items,Velg Items
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} mot Bill {1} datert {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} mot Bill {1} datert {2}
 DocType: Maintenance Visit,Completion Status,Completion Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Tillat løpet levering eller mottak opp denne prosent
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Skriv melding automatisk ved innlevering av transaksjoner.
 DocType: Production Order,Item To Manufacture,Element for å produsere
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status er {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Bestilling til betaling
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Bestilling til betaling
 DocType: Sales Order Item,Projected Qty,Anslått Antall
 DocType: Sales Invoice,Payment Due Date,Betalingsfrist
 DocType: Newsletter,Newsletter Manager,Nyhetsbrev manager
@@ -704,7 +709,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Utsalgssted
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo allerede i Credit, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; debet &#39;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo allerede i Credit, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; debet &#39;"
 DocType: Account,Balance must be,Balansen må være
 DocType: Hub Settings,Publish Pricing,Publiser Priser
 DocType: Notification Control,Expense Claim Rejected Message,Expense krav Avvist Message
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} må være aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} må være aktiv
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Velg dokumenttypen først
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,La Encashment Beløp
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,Standard Leverandørgjeld
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Ansatt {0} er ikke aktiv eller ikke eksisterer
 DocType: Features Setup,Item Barcode,Sak Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Sak Varianter {0} oppdatert
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Sak Varianter {0} oppdatert
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fakturaen Advance
 DocType: Address,Shop,Butikk
 DocType: Hub Settings,Sync Now,Synkroniser nå
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Rad {0}: Credit oppføring kan ikke være knyttet til en {1}
 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.
 DocType: Employee,Permanent Address Is,Permanent Adresse Er
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasjonen gjennomført for hvor mange ferdigvarer?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,The Brand
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krysset for Element {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krysset for Element {1}.
 DocType: Employee,Exit Interview Details,Exit Intervju Detaljer
 DocType: Item,Is Purchase Item,Er Purchase Element
 DocType: Journal Entry Account,Purchase Invoice,Fakturaen
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,Totalt i ord
 DocType: Material Request Item,Lead Time Date,Lead Tid Dato
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Vennligst oppgi serienummer for varen {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Vennligst oppgi serienummer for varen {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","For &#39;Produkt Bundle&#39; elementer, Warehouse, serienummer og Batch Ingen vil bli vurdert fra &quot;Pakkeliste&quot; bord. Hvis Warehouse og Batch Ingen er lik for alle pakking elementer for noen &quot;Product Bundle &#39;elementet, kan disse verdiene legges inn i hoved Sak bordet, vil verdiene bli kopiert til&quot; Pakkeliste &quot;bord."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Forsendelser til kunder.
 DocType: Purchase Invoice Item,Purchase Order Item,Innkjøpsordre Element
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varians
 ,Company Name,Selskapsnavn
 DocType: SMS Center,Total Message(s),Total melding (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Velg elementet for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillater brukeren å redigere Prisliste Rate i transaksjoner
 DocType: Pricing Rule,Max Qty,Max Antall
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betaling mot Salg / innkjøpsordre skal alltid merkes som forskudd
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kjemisk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
 DocType: Process Payroll,Select Payroll Year and Month,Velg Lønn år og måned
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den aktuelle gruppen (vanligvis Application of Funds&gt; Omløpsmidler&gt; bankkontoer og opprette en ny konto (ved å klikke på Legg Child) av typen &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Elektrisitet Cost
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Få utbetalt forskudd
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Fest Your Picture
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Gjøre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Gjøre
 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 +3,My Cart,Handlekurv
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Handlekurv
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Antall åpne
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Attributt tabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabatt
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Rabatt
 DocType: Features Setup,Purchase Discounts,Kjøps Rabatter
 DocType: Workstation,Wages,Lønn
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Vil bli oppdatert dersom Tid Log er &#39;Fakturerbart&#39;
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,Shipping State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Elementet må legges til med &quot;Get Elementer fra innkjøps Receipts &#39;knappen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgs Utgifter
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard Kjøpe
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standard Kjøpe
 DocType: GL Entry,Against,Against
 DocType: Item,Default Selling Cost Center,Standard Selling kostnadssted
 DocType: Sales Partner,Implementation Partner,Gjennomføring Partner
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Handlevogn Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Produksjonsordre {0} må avbestilles før den avbryter denne salgsordre
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Vennligst sett &#39;Apply Ytterligere rabatt på&#39;
 ,Ordered Items To Be Billed,Bestilte varer til å bli fakturert
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Fra Range må være mindre enn til kolleksjonen
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Velg Tid Logger og Send for å opprette en ny salgsfaktura.
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Logg Batch har blitt fakturert.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Lag Opportunity
 DocType: Salary Slip,Leave Without Pay,La Uten Pay
-DocType: Supplier,Communications,Kommunikasjon
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Kapasitetsplanlegging Error
 ,Trial Balance for Party,Trial Balance for partiet
 DocType: Lead,Consultant,Konsulent
 DocType: Salary Slip,Earnings,Inntjeningen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Ferdig Element {0} må angis for Produksjon typen oppføring
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Åpning Regnskap Balanse
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Ferdig Element {0} må angis for Produksjon typen oppføring
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Åpning Regnskap Balanse
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ingenting å be om
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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;
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,Værende regnskapsår
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Avrundet Total
 DocType: Lead,Call,Call
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;Innlegg&#39; kan ikke være tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&#39;Innlegg&#39; kan ikke være tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate rad {0} med samme {1}
 ,Trial Balance,Balanse Trial
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Sette opp ansatte
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,Bruker-ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Produserer mot kundeordre
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resten Av Verden
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ikke autorisert til å redigere fryst kontoen {0}
 DocType: Journal Entry,Get Outstanding Invoices,Få utestående fakturaer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,Utstedelsessted
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakts
 DocType: Email Digest,Add Quote,Legg Sitat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Målenheter coversion faktor nødvendig for målenheter: {0} i Sak: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Målenheter coversion faktor nødvendig for målenheter: {0} i Sak: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte kostnader
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Dine produkter eller tjenester
 DocType: Mode of Payment,Mode of Payment,Modus for betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,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/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rot varegruppe og kan ikke redigeres.
 DocType: Journal Entry Account,Purchase Order,Bestilling
 DocType: Warehouse,Warehouse Contact Info,Warehouse Kontaktinfo
@@ -1018,8 +1024,8 @@
 DocType: Email Digest,Annual Income,Årsinntekt
 DocType: Serial No,Serial No Details,Serie ingen opplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Sak Skattesats
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Rediger Beskrivelse
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet Leveringsdato er mindre enn planlagt startdato.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,For Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,For Leverandør
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Stille Kontotype hjelper i å velge denne kontoen i transaksjoner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Selskap Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Utgående
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,Journal Entry
 DocType: Workstation,Workstation Name,Arbeidsstasjon Name
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-post Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhetsbrev til kontaktene, fører."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operasjoner kan ikke stå tomt.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operasjoner kan ikke stå tomt.
 ,Delivered Items To Be Billed,Leverte varer til å bli fakturert
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke endres for Serial No.
 DocType: Authorization Rule,Average Discount,Gjennomsnittlig Rabatt
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operasjon Beskrivelse
 DocType: Item,Will also apply to variants,Vil også gjelde for varianter
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke endre regnskapsåret Startdato og regnskapsår sluttdato når regnskapsåret er lagret.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke endre regnskapsåret Startdato og regnskapsår sluttdato når regnskapsåret er lagret.
 DocType: Quotation,Shopping Cart,Handlevogn
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gjennomsnittlig Daily Utgående
 DocType: Pricing Rule,Campaign,Kampanje
@@ -1100,7 +1106,8 @@
 DocType: Sales Order Item,Planned Quantity,Planlagt Antall
 DocType: Purchase Invoice Item,Item Tax Amount,Sak Skattebeløp
 DocType: Item,Maintain Stock,Oppretthold Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Arkiv Innlegg allerede opprettet for produksjonsordre
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Arkiv Innlegg allerede opprettet for produksjonsordre
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Konto
 DocType: Material Request,Terms and Conditions Content,Betingelser innhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Element {0} er ikke en lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,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 Slip Deduction,Depends on Leave Without Pay,Avhenger La Uten Pay
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,I Value
 DocType: Supplier,Stock Manager,Stock manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rad {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rad {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Pakkseddel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontor Leie
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Oppsett SMS gateway-innstillinger
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse er lagt til ennå.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeidsstasjon Working Hour
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik JV mengden {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik JV mengden {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",For å aktivere &quot;Point of Sale&quot; view
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke gjøres for tom handlevogn
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Betaling kan ikke gjøres for tom handlevogn
 DocType: Item,Sales Details,Salgs Detaljer
 DocType: Opportunity,With Items,Med Items
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antall
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,Parent kostnadssted
 DocType: Sales Invoice,Source,Source
 DocType: Leave Type,Is Leave Without Pay,Er permisjon uten Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ingen poster ble funnet i Payment tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Ingen poster ble funnet i Payment tabellen
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Regnskapsår Startdato
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Pakking Slip (s) kansellert
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Pakking Slip (s) kansellert
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Kontantstrøm fra investerings
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Spedisjons- og Kostnader
 DocType: Material Request Item,Sales Order No,Salgsordre Nei
 DocType: Item Group,Item Group Name,Sak Gruppenavn
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Materialer for produksjon
 DocType: Pricing Rule,For Price List,For Prisliste
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kjøp rate for element: {0} ikke funnet, noe som er nødvendig å bestille regnskap oppføring (regning). Vennligst oppgi vareprisen mot et kjøp prisliste."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kjøp rate for element: {0} ikke funnet, noe som er nødvendig å bestille regnskap oppføring (regning). Vennligst oppgi vareprisen mot et kjøp prisliste."
 DocType: Maintenance Schedule,Schedules,Rutetider
 DocType: Purchase Invoice Item,Net Amount,Nettobeløp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nei
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ekstra rabatt Beløp (Selskap Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Feil: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Feil: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opprett ny konto fra kontoplanen.
 DocType: Maintenance Visit,Maintenance Visit,Vedlikehold Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde&gt; Kunde Group&gt; Territory
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Regnskap Entry for {0} kan bare gjøres i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prising Rule
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materialet Request til innkjøpsordre
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materialet Request til innkjøpsordre
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Returned Element {1} ikke eksisterer i {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkontoer
 ,Bank Reconciliation Statement,Bankavstemming Statement
@@ -1225,11 +1233,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Åpning Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} må vises bare en gang
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Fra Verdi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Beløp ikke reflektert i bank
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav på bekostning av selskapet.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,Materielle Forespørsler som Leverandør Sitater ikke er opprettet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Å spore elementer ved hjelp av strekkoden. Du vil være i stand til å legge inn elementer i følgeseddel og salgsfaktura ved å skanne strekkoden på varen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Merk som Leveres
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Merk som Leveres
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Gjør sitat
 DocType: Dependent Task,Dependent Task,Avhengig Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Mottaker List
 DocType: Payment Tool Detail,Payment Amount,Betalings Beløp
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrukes Beløp
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Vis
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Netto endring i kontanter
 DocType: Salary Structure Deduction,Salary Structure Deduction,Lønn Struktur Fradrag
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost of Utstedte Items
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Antall må ikke være mer enn {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Alder (dager)
 DocType: Quotation Item,Quotation Item,Sitat Element
 DocType: Account,Account Name,Brukernavn
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Fra dato ikke kan være større enn To Date
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Fra dato ikke kan være større enn To Date
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} mengde {1} kan ikke være en brøkdel
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,Konverteringsfrekvens kan ikke være 0 eller 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Konverteringsfrekvens kan ikke være 0 eller 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Kvitteringen {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Kvitteringen {0} er ikke innsendt
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% Fakturert
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mine Issues
 DocType: BOM Item,BOM Item,BOM Element
 DocType: Appraisal,For Employee,For Employee
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Rad {0}: Advance mot Leverandøren skal belaste
 DocType: Company,Default Values,Standardverdier
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rad {0}: Betaling beløpet kan ikke være negativ
 DocType: Expense Claim,Total Amount Reimbursed,Totalbeløp Refusjon
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Mot Leverandør Faktura {0} datert {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Mot Leverandør Faktura {0} datert {1}
 DocType: Customer,Default Price List,Standard Prisliste
 DocType: Payment Reconciliation,Payments,Betalinger
 DocType: Budget Detail,Budget Allocated,Budsjett Avsatt
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Customer Credit Balance
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Netto endring i leverandørgjeld
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Bekreft e-id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kunden nødvendig for &#39;Customerwise Discount&#39;
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Oppdatere bankbetalings datoer med tidsskrifter.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Handlevogn
 DocType: Employee,Permanent Address,Permanent Adresse
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Elementet {0} må være en service varen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Advance betalt mot {0} {1} kan ikke være større \ enn Totalsum {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Velg elementet kode
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduser Fradrag for permisjon uten lønn (LWP)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Enkelt enhet av et element.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Tid Logg Batch {0} må være &quot;Skrevet&quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Tid Logg Batch {0} må være &quot;Skrevet&quot;
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Warehouse kreves ved Row Nei {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Warehouse kreves ved Row Nei {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe eksisterer med samme navn kan du endre Kundens navn eller endre navn på Kundegruppe
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vennligst velg {0} først.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},tekst {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Vennligst velg {0} først.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},tekst {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Ny kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Materialet Kvittering
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partiet Type og Party er nødvendig for fordringer / gjeld konto {0}
 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 +210,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 +213,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 +85,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
@@ -1361,15 +1373,15 @@
 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: Sales Invoice Item,Batch No,Batch No
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillat flere salgsordrer mot kundens innkjøpsordre
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hoved
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Hoved
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Still prefiks for nummerering serien på dine transaksjoner
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet rekkefølge kan ikke bli kansellert. Døves å avbryte.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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: Item,Variants,Varianter
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Gjør innkjøpsordre
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Gjør innkjøpsordre
 DocType: SMS Center,Send To,Send Til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse og Reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Lovfestet info og annen generell informasjon om din Leverandør
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Varen er ikke lov til å ha produksjonsordre.
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Credit beløp på kontoen Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Tid Logger for industrien.
 DocType: Item,Apply Warehouse-wise Reorder Level,Påfør Warehouse-messig Omgjøre nivå
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} må sendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} må sendes
 DocType: Authorization Control,Authorization Control,Autorisasjon kontroll
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Avvist Warehouse er obligatorisk mot avvist Element {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Logg for oppgaver.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Betaling
 DocType: Production Order Operation,Actual Time and Cost,Faktisk leveringstid og pris
 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},Materialet Request av maksimal {0} kan gjøres for Element {1} mot Salgsordre {2}
 DocType: Employee,Salutation,Hilsen
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Forbinder
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Element {0} er ikke en serie Element
 DocType: SMS Center,Create Receiver List,Lag Receiver List
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Utløpt
 DocType: Packing Slip,To Package No.,Å pakke No.
 DocType: Warranty Claim,Issue Date,Utgivelsesdato
 DocType: Activity Cost,Activity Cost,Aktivitet Kostnad
@@ -1449,7 +1461,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Oppnås
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territorium / Customer
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,f.eks 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik fakturere utestående beløp {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik fakturere utestående beløp {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,I Ord vil være synlig når du lagrer salgsfaktura.
 DocType: Item,Is Sales Item,Er Sales Element
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Varegruppe treet
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} opprettet
 DocType: Delivery Note Item,Against Sales Order,Mot Salgsordre
 ,Serial No Status,Serial No Status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Sak bordet kan ikke være tomt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Sak bordet kan ikke være tomt
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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}"
 DocType: Pricing Rule,Selling,Selling
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Skatter og avgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Skriv inn Reference dato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Skriv inn Reference dato
 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} oppføringer betalings kan ikke bli filtrert av {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabell for element som vil bli vist på nettsiden
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antall
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,Installasjon Tid
 DocType: Sales Invoice,Accounting Details,Regnskap Detaljer
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Slett alle transaksjoner for dette selskapet
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ikke fullført for {2} qty av ferdigvarer i Produksjonsordre # {3}. Vennligst oppdater driftsstatus via Tid Logger
+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,Row # {0}: Operation {1} er ikke fullført for {2} qty av ferdigvarer i Produksjonsordre # {3}. Vennligst oppdater driftsstatus via Tid Logger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringer
 DocType: Issue,Resolution Details,Oppløsning Detaljer
 DocType: Quality Inspection Reading,Acceptance Criteria,Akseptkriterier
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,Clear Table
 DocType: Features Setup,Brands,Merker
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nei
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Fra innkjøpsordre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Fra innkjøpsordre
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","La ikke kan brukes / kansellert før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Kunde Adresser og kontakter
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,Vedlikeholdsplaner
 ,Quotation Trends,Anførsels Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,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
 ,Pending Amount,Avventer Beløp
 DocType: Purchase Invoice Item,Conversion Factor,Omregningsfaktor
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree of finanial kontoer.
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} må være av typen &quot;Fixed Asset &#39;som Element {1} er en ressurs Element
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} må være av typen &quot;Fixed Asset &#39;som Element {1} er en ressurs Element
 DocType: HR Settings,HR Settings,HR-innstillinger
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav venter på godkjenning. Bare den Expense Godkjenner kan oppdatere status.
 DocType: Purchase Invoice,Additional Discount Amount,Ekstra rabatt Beløp
 DocType: Leave Block List Allow,Leave Block List Allow,La Block List Tillat
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Enhet
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Regninger
 DocType: Issue,Support,Support
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Se handlekurv
 ,BOM Search,BOM Søk
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Lukking (Åpning + Totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Vennligst oppgi valuta i selskapet
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Målenheter Omregningsfaktor er nødvendig i rad {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Klaring dato kan ikke være før innsjekking dato i rad {0}
 DocType: Salary Slip,Deduction,Fradrag
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Varen Pris lagt for {0} i Prisliste {1}
 DocType: Address Template,Address Template,Adresse Mal
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% Oppgaver Fullført
 DocType: Project,Gross Margin,Bruttomargin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Skriv inn Produksjon varen først
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,deaktivert bruker
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,deaktivert bruker
 DocType: Opportunity,Quotation,Sitat
 DocType: Salary Slip,Total Deduction,Total Fradrag
 DocType: Quotation,Maintenance User,Vedlikehold Bruker
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
 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
@@ -1588,12 +1602,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold orden på salgskampanjer. Hold styr på Leads, Sitater, Salgsordre etc fra kampanjer for å måle avkastning på investeringen."
 DocType: Expense Claim,Approver,Godkjenner
 ,SO Qty,SO Antall
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Arkivoppføringer finnes mot lageret {0}, dermed kan du ikke re-tildele eller endre Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Arkivoppføringer finnes mot lageret {0}, dermed kan du ikke re-tildele eller endre Warehouse"
 DocType: Appraisal,Calculate Total Score,Beregn Total Score
 DocType: Supplier Quotation,Manufacturing Manager,Produksjonssjef
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Forsendelser
+apps/erpnext/erpnext/hooks.py +69,Shipments,Forsendelser
 DocType: Purchase Order Item,To be delivered to customer,Som skal leveres til kunde
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tid Logg Status må sendes inn.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial No {0} tilhører ikke noen Warehouse
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"Types of employment (permanent, contract, intern etc.).","Typer arbeid (fast, kontrakt, lærling etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
 DocType: Currency Exchange,From Currency,Fra Valuta
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vennligst velg avsatt beløp, fakturatype og fakturanummer i minst én rad"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Salgsordre kreves for Element {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vennligst velg avsatt beløp, fakturatype og fakturanummer i minst én rad"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Salgsordre kreves for Element {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Beløp ikke reflektert i system
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Selskap Valuta)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Annet
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,Igang
 DocType: Authorization Rule,Itemwise Discount,Itemwise Rabatt
 DocType: Purchase Order Item,Reference Document Type,Reference Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} mot Salgsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} mot Salgsordre {1}
 DocType: Account,Fixed Asset,Fast Asset
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialisert Lager
 DocType: Activity Type,Default Billing Rate,Standard Billing pris
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Salgsordre til betaling
 DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detalj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Tid Logger opprettet:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Velg riktig konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Velg riktig konto
 DocType: Item,Weight UOM,Vekt målenheter
 DocType: Employee,Blood Group,Blodgruppe
 DocType: Purchase Invoice Item,Page Break,Page Break
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,Til Time
 DocType: Authorization Rule,Approving Role (above authorized value),Godkjenne Role (ovenfor autorisert verdi)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","For å legge til barnet noder, utforske treet og klikk på noden under som du vil legge til flere noder."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,BOM recursion: {0} cannot be parent or child of {2},BOM rekursjon: {0} kan ikke være forelder eller barn av {2}
 DocType: Production Order Operation,Completed Qty,Fullført Antall
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Prisliste {0} er deaktivert
 DocType: Manufacturing Settings,Allow Overtime,Tillat Overtid
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienumre som kreves for Element {1}. Du har gitt {2}.
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,Kunden element Codes
 DocType: Opportunity,Lost Reason,Mistet Reason
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Lag Betalings Entries mot bestillinger eller fakturaer.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Ny adresse
 DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle elementene er allerede blitt fakturert
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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
 DocType: Project,External,Ekstern
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Oppdater Cost
 DocType: Item Reorder,Item Reorder,Sak Omgjøre
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transfer Material
 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."
 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
 DocType: Installation Note,Installation Note,Installasjon Merk
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Legg Skatter
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Kontantstrøm fra finansierings
 ,Financial Analytics,Finansielle Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Datterselskap
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,Lag Lønn Slip
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Forventet balanse pr bank
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Source of Funds (Gjeld)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Antall på rad {0} ({1}) må være det samme som produsert mengde {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Antall på rad {0} ({1}) må være det samme som produsert mengde {2}
 DocType: Appraisal,Employee,Ansatt
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import E-post fra
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Inviter som User
 DocType: Features Setup,After Sale Installations,Etter kjøp Installasjoner
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} er fullt fakturert
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} er fullt fakturert
 DocType: Workstation Working Hour,End Time,Sluttid
 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 +75,Group by Voucher,Grupper etter Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig På
 DocType: Sales Invoice,Mass Mailing,Masseutsendelse
 DocType: Rename Tool,File to Rename,Filen til Rename
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Bestill antall som kreves for Element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Bestill antall som kreves for Element {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Vis Betalinger
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vedlikeholdsplan {0} må avbestilles før den avbryter denne salgsordre
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,Salgsordre Påkrevd
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Opprett kunde
 DocType: Purchase Invoice,Credit To,Kreditt til
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktive Ledninger / Kunder
 DocType: Employee Education,Post Graduate,Post Graduate
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Vedlikeholdsplan Detalj
 DocType: Quality Inspection Reading,Reading 9,Lese 9
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Betaling konto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Netto endring i kundefordringer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
 DocType: Quality Inspection Reading,Accepted,Akseptert
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,Total Betalingsbeløp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Råvare kan ikke være blank.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Råvare kan ikke være blank.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Ettersom det er eksisterende lagertransaksjoner for dette elementet, \ du ikke kan endre verdiene for «Har Serial No &#39;,&#39; Har Batch No &#39;,&#39; Er Stock Element&quot; og &quot;verdsettelsesmetode &#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Hurtig Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hurtig Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
 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 +157,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 +211,{0} {1} is not submitted,{0} {1} ikke er sendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} ikke er sendt
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold 1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,Autorisert Verdi
 DocType: Contact,Enter department to which this Contact belongs,Tast avdeling som denne kontakten tilhører
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for rad {0} samsvarer ikke Material Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for rad {0} samsvarer ikke Material Request
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Måleenhet
 DocType: Fiscal Year,Year End Date,År Sluttdato
 DocType: Task Depends On,Task Depends On,Task Avhenger
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontraktssluttdato må være større enn tidspunktet for inntreden
 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.
 DocType: Customer Group,Has Child Node,Har Child Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} mot innkjøpsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} mot innkjøpsordre {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Skriv inn statiske webadresseparametere her (F.eks. Avsender = ERPNext, brukernavn = ERPNext, passord = 1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noen aktiv regnskapsåret. For mer informasjon sjekk {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel nettsiden automatisk generert fra ERPNext
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,Recd Antall
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke produsere mer Element {0} enn Salgsordre kvantitet {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / minibank konto
 DocType: Tax Rule,Billing City,Fakturering By
 DocType: Global Defaults,Hide Currency Symbol,Skjule Valutasymbol
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Utgifter
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
 DocType: Buying Settings,Default Buying Price List,Standard Kjøpe Prisliste
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Ingen ansatte for de oven valgte kriterier ELLER lønn slip allerede opprettet
 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."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betalings Type
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of materialer basert på&quot; i Costing Seksjon
 DocType: Appraisal Goal,Key Responsibility Area,Key Ansvar Område
 DocType: Item Reorder,Material Request Type,Materialet Request Type
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Rad {0}: målenheter omregningsfaktor er obligatorisk
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Kostnadssted
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Kupong #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Aksje Innstillinger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenslåing er bare mulig hvis følgende egenskaper er samme i begge postene. Er Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenslåing er bare mulig hvis følgende egenskaper er samme i begge postene. Er Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrere kunde Gruppe treet.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,New kostnadssted Navn
 DocType: Leave Control Panel,Leave Control Panel,La Kontrollpanel
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Utlån (Eiendeler)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Skyldnere
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Stor
@@ -2003,7 +2022,7 @@
 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.
 DocType: Production Order Operation,Make Time Log,Gjør Tid Logg
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Vennligst sett omgjøring kvantitet
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Vennligst sett omgjøring kvantitet
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Opprett Customer fra Lead {0}
 DocType: Price List,Applicable for Countries,Gjelder for Land
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Datamaskiner
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Nei Anmerkninger
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Nei Anmerkninger
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfalt
 DocType: Account,Stock Received But Not Billed,"Stock mottatt, men ikke fakturert"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root-kontoen må være en gruppe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root-kontoen må være en gruppe
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brutto lønn + etterskudd Beløp + Encashment Beløp - Total Fradrag
 DocType: Monthly Distribution,Distribution Name,Distribusjon Name
 DocType: Features Setup,Sales and Purchase,Salg og Innkjøp
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,Fest Balance
 DocType: Sales Invoice Item,Time Log Batch,Tid Logg Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Vennligst velg Bruk rabatt på
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Lønn Slip Laget
 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: Stock Entry,Material Transfer for Manufacture,Material Transfer for Produksjon
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,Halvårs
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Regnskapsår {0} ble ikke funnet.
 DocType: Bank Reconciliation,Get Relevant Entries,Få Relevante Entries
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Regnskap Entry for Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Regnskap Entry for Stock
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Element {0} finnes ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Element {0} finnes ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Ytterligere rabatt på
 DocType: Account,Root Type,Root Type
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Vis lysbildefremvisning på toppen av siden
 DocType: BOM,Item UOM,Sak målenheter
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skattebeløp Etter Rabattbeløp (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rad {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rad {0}
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mat, drikke og tobakk"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Kommisjon kan ikke være større enn 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum lagerbeholdning
 DocType: Stock Entry,Subcontract,Underentrepriser
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Innkommende kvalitetskontroll.
 DocType: Purchase Order Item,Returned Qty,Returnerte Stk
 DocType: Employee,Exit,Utgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root Type er obligatorisk
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} opprettet
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For det lettere for kunder, kan disse kodene brukes i trykte formater som regningene og leveringssedlene"
 DocType: Employee,You can enter any date manually,Du kan legge inn noen dato manuelt
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
 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 +110,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden må være kreditt
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvitteringen Sak Leveres
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betale
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Betale
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logger for å opprettholde sms leveringsstatus
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Omgjøre nivå
 DocType: Attendance,Attendance Date,Oppmøte Dato
 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 +110,Account with child nodes cannot be converted to ledger,Konto med barnet noder kan ikke konverteres til Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Konto med barnet noder kan ikke konverteres til Ledger
 DocType: Address,Preferred Shipping Address,Foretrukne leveringsadresse
 DocType: Purchase Receipt Item,Accepted Warehouse,Akseptert Warehouse
 DocType: Bank Reconciliation Detail,Posting Date,Publiseringsdato
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial No {0} finnes ikke
 DocType: Pricing Rule,Discount Percentage,Rabatt Prosent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
-apps/erpnext/erpnext/hooks.py +54,Orders,Bestillinger
+apps/erpnext/erpnext/hooks.py +55,Orders,Bestillinger
 DocType: Leave Control Panel,Employee Type,Ansettelsesform
 DocType: Employee Leave Approver,Leave Approver,La Godkjenner
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materialet Overført for Produksjon
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Av materialer fakturert mot denne kundeordre
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periode Closing Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Avskrivninger
+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: Customer,Credit Limit,Kredittgrense
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Velg type transaksjon
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,Spurt For
 DocType: Quotation Item,Against Doctype,Mot Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette følgeseddel mot ethvert prosjekt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-kontoen kan ikke slettes
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Netto kontantstrøm fra investerings
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root-kontoen kan ikke slettes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Arkiv Entries
 ,Is Primary Address,Er Hovedadresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} datert {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Reference # {0} datert {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrer Adresser
 DocType: Pricing Rule,Item Code,Sak Kode
 DocType: Production Planning Tool,Create Production Orders,Opprett produksjonsordrer
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,Bruker Remark
 DocType: Lead,Market Segment,Markedssegment
 DocType: Employee Internal Work History,Employee Internal Work History,Ansatt Intern Work History
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Lukking (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Lukking (Dr)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} ikke på lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skatt mal for å selge transaksjoner.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,Fakturert beløp
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstemming
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Få oppdateringer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materialet Request {0} blir kansellert eller stoppet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Materialet Request {0} blir kansellert eller stoppet
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Legg et par eksempler på poster
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,La Ledelse
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupper etter Account
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontoen hodet etter Ansvar, hvor gevinst / tap vil bli bokført"
 DocType: Payment Tool,Against Vouchers,Mot Kuponger
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hurtighjelp
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Salgs Extras
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budsjett for kontoen {1} mot kostnadssted {2} vil overgå ved {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
 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;
 ,Stock Projected Qty,Lager Antall projiserte
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
 DocType: Sales Order,Customer's Purchase Order,Kundens innkjøpsordre
 DocType: Warranty Claim,From Company,Fra Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Verdi eller Stk
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,La Block List tillatt
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Du vil bruke det til innlogging
 DocType: Sales Partner,Retailer,Forhandler
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kreditt til kontoen må være en balansekonto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Alle Leverandør Typer
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +46,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 +93,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
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Totalvekten av pakken. Vanligvis nettovekt + emballasjematerialet vekt. (For utskrift)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brukere med denne rollen har lov til å sette frosne kontoer og lage / endre regnskapspostene mot frosne kontoer
 DocType: Serial No,Is Cancelled,Er Avlyst
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mine Forsendelser
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Mine Forsendelser
 DocType: Journal Entry,Bill Date,Bill Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv om det er flere Prising regler med høyest prioritet, deretter følgende interne prioriteringer til grunn:"
 DocType: Supplier,Supplier Details,Leverandør Detaljer
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Samtaler
 DocType: Project,Total Costing Amount (via Time Logs),Total koster Beløp (via Time Logger)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock målenheter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Purchase Order {0} ikke er sendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Purchase Order {0} ikke er sendt
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Prosjekterte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} tilhører ikke Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Merk: Systemet vil ikke sjekke over-levering og over-booking for Element {0} som mengde eller beløpet er 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Merk: Systemet vil ikke sjekke over-levering og over-booking for Element {0} som mengde eller beløpet er 0
 DocType: Notification Control,Quotation Message,Sitat Message
 DocType: Issue,Opening Date,Åpningsdato
 DocType: Journal Entry,Remark,Bemerkning
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,Dosert for Billing
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger oppdratt av leverandører.
 DocType: POS Profile,Write Off Account,Skriv Off konto
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Netto kontantstrøm fra driften
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,reskontroførsel
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Sak 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry konto
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Pensjoneringstidspunktet må være større enn tidspunktet for inntreden
 DocType: Sales Invoice,Against Income Account,Mot Inntekt konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Leveres
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Terri Targets
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2421,10 +2443,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Element {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dette er en grunnlegg salg person og kan ikke redigeres.
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Valuta: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Valuta: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Lønn Slip Fradrag
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Velg en gruppe node først.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Hensikten må være en av {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Hensikten må være en av {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Fyll ut skjemaet og lagre det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Last ned en rapport som inneholder alle råvarer med deres nyeste inventar status
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) mester.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Skriv inn &quot;Forventet Leveringsdato &#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig batchnummer for varen {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Merk: Det er ikke nok permisjon balanse for La Type {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Merk: Dersom betaling ikke skjer mot noen referanse, gjøre Journal Entry manuelt."
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Send automatisk e-poster til Kontakter på Sende transaksjoner.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Rad {0}: Antall ikke avalable i lageret {1} {2} {3}. Tilgjengelig Antall: {4}, Overfør Antall: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Sak 3
 DocType: Purchase Order,Customer Contact Email,Kundekontakt E-post
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvarsområder
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Mal
 DocType: Sales Person,Sales Person Name,Sales Person Name
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Før avstemming
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Vennligst re-type firmanavn for å bekrefte
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Outstanding Amt
 DocType: Time Log Batch,Total Hours,Totalt antall timer
 DocType: Journal Entry,Printing Settings,Utskriftsinnstillinger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Total debet må være lik samlet kreditt. Forskjellen er {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Total debet må være lik samlet kreditt. Forskjellen er {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
 DocType: Time Log,From Time,Fra Time
 DocType: Notification Control,Custom Message,Standard melding
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Kontanter eller bankkontoen er obligatorisk for å gjøre betaling oppføring
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Kontanter eller bankkontoen er obligatorisk for å gjøre betaling oppføring
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
 DocType: Purchase Invoice Item,Rate,Rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriteriene, kan du løse \ konflikten ved å prioritere. Pris Regler: {0}"
 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 +580,Issue Material,Issue Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Issue Material
 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
 DocType: Hub Settings,Access Token,Tilgang Token
 DocType: Sales Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Skriv inn maintaince detaljer Første
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimal Fakturert beløp
 DocType: Purchase Invoice Item,Image View,Bilde Vis
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Verdivurdering og Total
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Denne varen er en variant av {0} (Mal). Attributtene vil bli kopiert over fra malen med mindre &#39;No Copy&#39; er satt
 DocType: Account,Purchase User,Kjøp User
 DocType: Notification Control,Customize the Notification,Tilpass varslings
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Kontantstrøm fra driften
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard adresse mal kan ikke slettes
 DocType: Sales Invoice,Shipping Rule,Shipping Rule
 DocType: Journal Entry,Print Heading,Print Overskrift
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Råmateriale
 DocType: Leave Application,Follow via Email,Følg via e-post
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebeløp Etter Rabattbeløp
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Vennligst velg Publiseringsdato først
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Nødvendig for Serialisert Element {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Gjelder til (Betegnelse)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Legg til i handlevogn
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupper etter
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivere / deaktivere valutaer.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Post Utgifter
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,Datoen da gjentakende ordre vil bli stoppe
 DocType: Quality Inspection,Item Serial No,Sak Serial No
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} må reduseres med {1} eller du bør øke overløps toleranse
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} må reduseres med {1} eller du bør øke overløps toleranse
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Present
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Time
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialisert Element {0} kan ikke oppdateres \ bruker Stock Avstemming
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Overføre materialet til Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Overføre materialet til Leverandør
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Lag sitat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Du er ikke autorisert til å godkjenne blader på Block Datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alle disse elementene er allerede blitt fakturert
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Alle disse elementene er allerede blitt fakturert
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkjennes av {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Frakt Regel betingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM etter utskiftning
 DocType: Features Setup,Point of Sale,Utsalgssted
 DocType: Account,Tax,Skatte
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rad {0}: {1} er ikke en gyldig {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Fra Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Fra Product Bundle
 DocType: Production Planning Tool,Production Planning Tool,Produksjonsplanlegging Tool
 DocType: Quality Inspection,Report Date,Rapporter Date
 DocType: C-Form,Invoices,Fakturaer
 DocType: Job Opening,Job Title,Jobbtittel
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Mottakere
 DocType: Features Setup,Item Groups in Details,Varegrupper i detaljer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start-Point-of-Sale (POS)
@@ -2618,8 +2644,9 @@
 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: Pricing Rule,Customer Group,Kundegruppe
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
 DocType: Item,Website Description,Website Beskrivelse
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Netto endring i egenkapital
 DocType: Serial No,AMC Expiry Date,AMC Utløpsdato
 ,Sales Register,Salg Register
 DocType: Quotation,Quotation Lost Reason,Sitat av Lost Reason
@@ -2627,12 +2654,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det er ingenting å redigere.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Oppsummering for denne måneden og ventende aktiviteter
 DocType: Customer Group,Customer Group Name,Kundegruppenavn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Egenskaper
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Få Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Skriv inn avskrive konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Få Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Skriv inn avskrive konto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Siste Order Date
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Gjør Vesenet Faktura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} ikke tilhører selskapet {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Prosjekt-messig data er ikke tilgjengelig for prisanslag
 DocType: Project,Expected End Date,Forventet sluttdato
 DocType: Appraisal Template,Appraisal Template Title,Appraisal Mal Tittel
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Commercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Element {0} må ikke være en lagervare
 DocType: Cost Center,Distribution Id,Distribusjon Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Tjenester
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Verdi for Egenskap {0} må være innenfor rekkevidden av {1} til {2} i trinn på {3}
 DocType: Tax Rule,Sales,Salgs
 DocType: Stock Entry Detail,Basic Amount,Grunnbeløp
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
 DocType: Leave Allocation,Unused leaves,Ubrukte blader
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard Fordringer Kunde
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Kjøps Kvitteringer
-DocType: Payment Reconciliation,Maximum Amount,Rammen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan Pricing Rule er brukt?
 DocType: Quality Inspection,Delivery Note No,Levering Note Nei
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunden {0} finnes ikke
 DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produktet Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rad {0}: Ugyldig referanse {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Produktet Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Rad {0}: Ugyldig referanse {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kjøpe skatter og avgifter Mal
 DocType: Upload Attendance,Download Template,Last ned Mal
 DocType: GL Entry,Remarks,Bemerkninger
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,Månedlig Oppmøte Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen rekord funnet
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadssted er obligatorisk for Element {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} er inaktiv
 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
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Resultat &#39;type konto {0} ikke tillatt i Åpning Entry
 DocType: Features Setup,Sales Discounts,Salgs Rabatter
 DocType: Hub Settings,Seller Country,Selger Land
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publiser Elementer på nettstedet
 DocType: Authorization Rule,Authorization Rule,Autorisasjon Rule
 DocType: Sales Invoice,Terms and Conditions Details,Vilkår og betingelser Detaljer
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Spesifikasjoner
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salgs skatter og avgifter Mal
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Klær og tilbehør
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antall Bestill
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,Faktureringsbeløp
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig kvantum spesifisert for elementet {0}. Antall må være større enn 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Søknader om permisjon.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konto med eksisterende transaksjon kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Konto med eksisterende transaksjon kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Rettshjelp
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Dagen i måneden som auto ordre vil bli generert for eksempel 05, 28 osv"
 DocType: Sales Invoice,Posting Time,Postering Tid
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,Sammenbrudd
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
 DocType: Bank Reconciliation Detail,Cheque Date,Sjekk Dato
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ikke tilhører selskapet: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ikke tilhører selskapet: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Slettet alle transaksjoner knyttet til dette selskapet!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på dato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Prøvetid
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lagervare.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lagervare.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Utbetaling av lønn for måneden {0} og år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto innsats Prisliste rente hvis mangler
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Totalt innbetalt beløp
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløp (via Time Logger)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Vi selger denne vare
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverandør Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Mengden skal være større enn 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt Desc
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Type blader som casual, syke etc."
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Legg rekker å sette årlige budsjettene på Kontoer.
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
 DocType: Production Order,Total Operating Cost,Total driftskostnader
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Merk: Element {0} inngått flere ganger
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Merk: Element {0} inngått flere ganger
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Firma Forkortelse
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Skatt Mal er obligatorisk.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} finnes ikke
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Midlertidig
 DocType: Address,Preferred Billing Address,Foretrukne faktureringsadresse
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,Element-messig Prisliste Ranger
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} er stoppet
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
 DocType: Lead,Add to calendar on this date,Legg til i kalender på denne datoen
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for å legge til fraktkostnader.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende arrangementer
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Bestillinger frigitt for produksjon.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Velg regnskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
 DocType: Hub Settings,Name Token,Navn Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard Selling
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Minst én lageret er obligatorisk
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,Ut av Garanti
 DocType: BOM Replace Tool,Replace,Erstatt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Skriv inn standard måleenhet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Skriv inn standard måleenhet
 DocType: Purchase Invoice Item,Project Name,Prosjektnavn
 DocType: Supplier,Mention if non-standard receivable account,Nevn hvis ikke-standard fordring konto
 DocType: Journal Entry Account,If Income or Expense,Dersom inntekt eller kostnad
 DocType: Features Setup,Item Batch Nos,Sak Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Verdi Difference
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Menneskelig Resurs
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Skattefordel
 DocType: BOM Item,BOM No,BOM Nei
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Glidende gjennomsnitt
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM som vil bli erstattet
 DocType: Account,Debit,Debet
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,Tilleggs Cost
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Regnskapsårets slutt Dato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere basert på Voucher Nei, hvis gruppert etter Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Gjør Leverandør sitat
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Gjør Leverandør sitat
 DocType: Quality Inspection,Incoming,Innkommende
 DocType: BOM,Materials Required (Exploded),Materialer som er nødvendige (Exploded)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduser Tjene for permisjon uten lønn (LWP)
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} samsvarer ikke med {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual La
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Merk: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Merk: {0}
 ,Delivery Note Trends,Levering Note Trender
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Denne ukens oppsummering
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} må være et Kjøpt eller underleverandør til element i rad {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Kjøpe Rate
 DocType: Task,Actual Time (in Hours),Virkelig tid (i timer)
 DocType: Employee,History In Company,Historie I selskapet
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,Nyhetsbrev
 DocType: Address,Shipping,Shipping
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,Sluttdato for dagens orden periode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Gjør Tilbudsbrevet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Return
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Standard Enhet for Variant må være samme som mal
 DocType: Production Order Operation,Production Order Operation,Produksjon Bestill Operation
 DocType: Pricing Rule,Disable,Deaktiver
 DocType: Project Task,Pending Review,Avventer omtale
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunde-ID
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Å må Tid være større enn fra Time
 DocType: Journal Entry Account,Exchange Rate,Vekslingskurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Parent konto {1} ikke BOLONG til selskapet {2}
 DocType: BOM,Last Purchase Rate,Siste Purchase Rate
 DocType: Account,Asset,Asset
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,Tilgjengelig på lager for pakk gjenstander
 DocType: Item Variant,Item Variant,Sak Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Sette dette Adressemal som standard så er det ingen andre standard
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Kvalitetsstyring
 DocType: Production Planning Tool,Filter based on customer,Filter basert på kundens
 DocType: Payment Tool Detail,Against Voucher No,Mot Voucher Nei
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,Neste Kontakt
 DocType: Employee,Employment Type,Type stilling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anleggsmidler
+,Cash Flow,Cash Flow
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Tegningsperioden kan ikke være over to alocation poster
 DocType: Item Group,Default Expense Account,Standard kostnadskonto
 DocType: Employee,Notice (days),Varsel (dager)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,Næringslokaler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print og Stasjonær
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppe Node
-DocType: Payment Reconciliation,Minimum Amount,Minimumsbeløp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Oppdater ferdigvarer
 DocType: Workstation,per hour,per time
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual inventar) vil bli opprettet under denne kontoen.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse kan ikke slettes som finnes lager hovedbok oppføring for dette lageret.
 DocType: Company,Distribution,Distribusjon
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløpet Betalt
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Beløpet Betalt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Prosjektleder
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maks rabatt tillatt for element: {0} er {1}%
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Støtte Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Selskapet er mangler i varehus {0}
 DocType: POS Profile,Terms and Conditions,Vilkår og betingelser
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},To Date bør være innenfor regnskapsåret. Antar To Date = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},To Date bør være innenfor regnskapsåret. Antar To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du opprettholde høyde, vekt, allergier, medisinske bekymringer etc"
 DocType: Leave Block List,Applies to Company,Gjelder Selskapet
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke avbryte fordi innsendt Stock Entry {0} finnes
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Skriv inn kvitteringer
 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 +425,Transaction not allowed against stopped Production Order {0},Transaksjonen ikke lov mot stoppet Produksjonsordre {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Oppsett innkommende server for støtte e-id. (F.eks support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
 DocType: Salary Slip,Salary Slip,Lønn Slip
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;To Date&#39; er påkrevd
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generere pakksedler for pakker som skal leveres. Brukes til å varsle pakke nummer, innholdet i pakken og vekten."
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Medarbeider poster.
 DocType: HR Settings,Payroll Settings,Lønn Innstillinger
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Matche ikke bundet fakturaer og betalinger.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Legg inn bestilling
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Legg inn bestilling
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan ikke ha en forelder kostnadssted
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Velg merke ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Gjelder
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,Startdato
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Bevilge blader for en periode.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klikk her for å verifisere
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan ikke tildele seg selv som forelder konto
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan ikke tildele seg selv som forelder konto
 DocType: Purchase Invoice Item,Price List Rate,Prisliste Rate
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Vis &quot;på lager&quot; eller &quot;Not in Stock&quot; basert på lager tilgjengelig i dette lageret.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,Tiltredelse
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Fjern artikkel om avgifter er ikke aktuelt til dette elementet
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Motta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Motta
 DocType: Maintenance Visit,Fully Completed,Fullt Fullført
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Komplett
 DocType: Employee,Educational Qualification,Pedagogiske Kvalifikasjoner
 DocType: Workstation,Operating Costs,Driftskostnader
 DocType: Employee Leave Approver,Employee Leave Approver,Ansatt La Godkjenner
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} har blitt lagt inn i vår nyhetsbrevliste.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære som tapt, fordi tilbudet er gjort."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kjøp Master manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Produksjonsordre {0} må sendes
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Produksjonsordre {0} må sendes
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vennligst velg startdato og sluttdato for Element {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Hoved Reports
 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
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Noe gikk galt!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Advarsel: La programmet inneholder følgende blokk datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede innsendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede innsendt
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ferdigstillelse Dato
 DocType: Purchase Invoice Item,Amount (Company Currency),Beløp (Selskap Valuta)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisasjonsenhet (departement) mester.
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,Serial No Service kontraktsutløp
 DocType: Item,Unit of Measure Conversion,Måleenhet Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Arbeidstaker kan ikke endres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Du kan ikke kreditt- og debet samme konto samtidig
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Du kan ikke kreditt- og debet samme konto samtidig
 DocType: Naming Series,Help HTML,Hjelp HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Total weightage tilordnet skal være 100%. Det er {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krysset for Element {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krysset for Element {1}
 DocType: Address,Name of person or organization that this address belongs to.,Navn på person eller organisasjon som denne adressen tilhører.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Dine Leverandører
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke settes som tapt som Salgsordre er gjort.
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,Utstedelsesdato
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Vennligst sjekk Multi Valuta alternativet for å tillate kontoer med andre valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Vennligst sjekk Multi Valuta alternativet for å tillate kontoer med andre valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Sak: {0} finnes ikke i systemet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Du er ikke autorisert til å sette Frozen verdi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Du er ikke autorisert til å sette Frozen verdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få avstemte Entries
+DocType: Payment Reconciliation,From Invoice Date,Fra Fakturadato
 DocType: Cost Center,Budgets,Budsjetter
-DocType: Employee,Emergency Contact Details,Detaljer nødtelefon
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Hva gjør det?
 DocType: Delivery Note,To Warehouse,Til Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} har blitt lagt inn mer enn en gang for regnskapsåret {1}
 ,Average Commission Rate,Gjennomsnittlig kommisjon
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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/hr/doctype/attendance/attendance.py +34,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
 DocType: Purchase Taxes and Charges,Account Head,Account Leder
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Oppdater ekstra kostnader for å beregne inntakskost annonser
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Total verdi Difference (ut -)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Rad {0}: Exchange Rate er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Rad {0}: Exchange Rate er obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruker-ID ikke satt for Employee {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garantikrav
 DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
 DocType: Item,Customer Code,Kunden Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Bursdag Påminnelse for {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dager siden siste Bestill
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aksje Eiendeler
@@ -3271,7 +3301,7 @@
 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
 DocType: Authorization Rule,Based On,Basert På
 DocType: Sales Order Item,Ordered Qty,Bestilte Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Element {0} er deaktivert
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Element {0} er deaktivert
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Opp
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periode Fra og perioden Til dato obligatoriske for gjentakende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Prosjektet aktivitet / oppgave.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløp (Selskap Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Vennligst sett {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Gjenta på dag i måneden
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,Last opp Oppmøte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM og Industri Antall kreves
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Aldring Range 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Beløp
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Beløp
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
 ,Sales Analytics,Salgs Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Produksjons Innstillinger
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Sette opp e-post
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Skriv inn standardvaluta i selskapet Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Daglige påminnelser
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Skatteregel Konflikter med {0}
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,Produsert Antall
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søk Sub Assemblies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Elementkode kreves ved Row Nei {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Elementkode kreves ved Row Nei {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Faktiske
 DocType: Authorization Rule,Customerwise Discount,Customerwise Rabatt
 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 +263,Installation Note {0} has already been submitted,Installasjon Merk {0} har allerede blitt sendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Installasjon Merk {0} har allerede blitt sendt
 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å
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,Gjelder Holiday List
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serien Oppdatert
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapporter Type er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Rapporter Type er obligatorisk
 DocType: Item,Serial Number Series,Serienummer Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Element {0} i rad {1}
 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/public/js/setup_wizard.js +101,The First User: You,Den første brukeren: Du
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Vellykket Forsonet
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Vellykket Forsonet
 DocType: Production Order,Planned End Date,Planlagt sluttdato
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Hvor varene er lagret.
 DocType: Tax Rule,Validity,Gyldighet
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,Oppmøte
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Konteringsdato og legger tid er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Konteringsdato og legger tid er obligatorisk
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Skatt mal for å kjøpe transaksjoner.
 ,Item Prices,Varepriser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,I Ord vil være synlig når du lagrer innkjøpsordre.
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,Omtale Dato
 DocType: Purchase Invoice,Advance Payments,Forskudd
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rad {0} må være samme som produksjonsordre
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ingen tillatelse til å bruke Betaling Tool
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,Varslings E-postadresser som ikke er spesifisert for gjentakende% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Rund av konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrative utgifter
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Kundegruppe
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Endre
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Endre
 DocType: Purchase Invoice,Contact Email,Kontakt Epost
 DocType: Appraisal Goal,Score Earned,Resultat tjent
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",f.eks &quot;My Company LLC&quot;
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,Bruttovekt målenheter
 DocType: Email Digest,Receivables / Payables,Fordringer / gjeld
 DocType: Delivery Note Item,Against Sales Invoice,Mot Salg Faktura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Credit konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Credit konto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Element
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nullverdier
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Antall element oppnådd etter produksjon / nedpakking fra gitte mengder råvarer
 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 +562,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 DocType: Task,Actual End Date (via Time Logs),Selve Sluttdato (via Time Logger)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budsjettet kan ikke overdras mot gruppekonto {0}
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlegg tids logger utenfor arbeidsstasjon arbeidstid.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} har allerede blitt sendt
 ,Items To Be Requested,Elementer å bli forespurt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Få siste kjøp Ranger
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing pris basert på aktivitet Type (per time)
 DocType: Company,Company Info,Selskap Info
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Firma Email ID ikke funnet, derav posten sendt"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse av midler (aktiva)
 DocType: Production Planning Tool,Filter based on item,Filter basert på element
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Debet konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debet konto
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Ansattes Navn
 DocType: Sales Invoice,Rounded Total (Company Currency),Avrundet Total (Selskap Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Kan ikke covert til konsernet fordi Kontotype er valgt.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,Kan ikke covert til konsernet fordi Kontotype er valgt.
 DocType: Purchase Common,Purchase Common,Kjøp Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} har blitt endret. Vennligst oppdater.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stoppe brukere fra å gjøre La Applications på følgende dager.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fra Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Ytelser til ansatte
 DocType: Sales Invoice,Is POS,Er POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pakket mengde må være lik mengde for Element {0} i rad {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Akseptert Antall
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ikke eksisterer
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger hevet til kundene.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Prosjekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter lagt
 DocType: Maintenance Schedule,Schedule,Tidsplan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definer Budsjett for denne kostnadssted. Slik stiller budsjett handling, se &quot;Selskapet List&quot;"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Kupong Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
 DocType: Expense Claim,Approved,Godkjent
 DocType: Pricing Rule,Price,Pris
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som &quot;venstre&quot;
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskap posteringer.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgjengelig Antall på From Warehouse
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Vennligst velg Employee Record først.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / Account samsvarer ikke med {1} / {2} i {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / Account samsvarer ikke med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,For å opprette en Tax-konto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Skriv inn Expense konto
 DocType: Account,Stock,Lager
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,Kontraktssluttdato
 DocType: Sales Order,Track this Sales Order against any Project,Spor dette Salgsordre mot ethvert prosjekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (pending å levere) basert på kriteriene ovenfor
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Fra Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Fra Leverandør sitat
 DocType: Deduction Type,Deduction Type,Fradrag Type
 DocType: Attendance,Half Day,Halv Dag
 DocType: Pricing Rule,Min Qty,Min Antall
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,Transaksjonsdato
 DocType: Production Plan Item,Planned Qty,Planlagt Antall
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Skatte
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,For Mengde (Produsert Stk) er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,For Mengde (Produsert Stk) er obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Selskap Valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Party Type og Party gjelder bare mot fordringer / gjeld konto
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,Kommisjon
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Gjør Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Block permisjon applikasjoner ved avdelingen.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Handlevognen er tom
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Handlevognen er tom
 DocType: Production Order,Actual Operating Cost,Faktiske driftskostnader
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root kan ikke redigeres.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root kan ikke redigeres.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Bevilget beløp kan ikke større enn unadusted mengde
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillat Produksjonen på helligdager
 DocType: Sales Order,Customer's Purchase Order Date,Kundens Purchase Order Date
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Betingelser Mal
 DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk opprette Material Forespørsel om kvantitet faller under dette nivået
 ,Item-wise Purchase Register,Element-messig Purchase Register
 DocType: Batch,Expiry Date,Utløpsdato
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Slik stiller omgjøring nivå, må varen være en innkjøpsenhet eller Manufacturing Element"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Slik stiller omgjøring nivå, må varen være en innkjøpsenhet eller Manufacturing Element"
 ,Supplier Addresses and Contacts,Leverandør Adresser og kontakter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vennligst første velg kategori
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Prosjektet mester.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditt Days
 DocType: Leave Type,Is Carry Forward,Er fremføring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Få Elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Party Type og Party er nødvendig for fordringer / gjeld kontoen {1}
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,Grunn til å forlate
 DocType: Expense Claim Detail,Sanctioned Amount,Sanksjonert Beløp
 DocType: GL Entry,Is Opening,Er Åpnings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rad {0}: Debet oppføring kan ikke være knyttet til en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konto {0} finnes ikke
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Rad {0}: Debet oppføring kan ikke være knyttet til en {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Konto {0} finnes ikke
 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 467a71a..6d97770 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produkty konsumenckie
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Wybierz typ pierwszy Party
 DocType: Item,Customer Items,Pozycje klientów
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadrzędne konto {1} nie może być zwykłym
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadrzędne konto {1} nie może być zwykłym
 DocType: Item,Publish Item to hub.erpnext.com,Publikacja na hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Powiadomienia na e-mail
 DocType: Item,Default Unit of Measure,Domyślna jednostka miary
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Waluta jest wymagana dla Cenniku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zostanie policzony dla transakcji.
 DocType: Purchase Order,Customer Contact,Kontakt z klientem
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Od Prośby o Materiał
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Od Prośby o Materiał
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Drzewo
 DocType: Job Applicant,Job Applicant,
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Brak już następnych wyników.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,
 DocType: Mode of Payment Account,Mode of Payment Account,Konto księgowe dla tego rodzaju płatności
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Pokaż Warianty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Ilość
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Ilość
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredyty (zobowiązania)
 DocType: Employee Education,Year of Passing,
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,W magazynie
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Opieka zdrowotna
 DocType: Purchase Invoice,Monthly,Miesięcznie
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Opóźnienie w płatności (dni)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Okresowość
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adres e-mail
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Rok fiskalny {0} jest wymagane
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrona
 DocType: Company,Abbr,Skrót
 DocType: Appraisal Goal,Score (0-5),
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Wiersz {0}: {1} {2} nie zgadza się z {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Wiersz {0}: {1} {2} nie zgadza się z {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Wiersz # {0}:
 DocType: Delivery Note,Vehicle No,Nr pojazdu
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Wybierz Cennik
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Wybierz Cennik
 DocType: Production Order Operation,Work In Progress,Praca w toku
 DocType: Employee,Holiday List,Lista świąt
 DocType: Time Log,Time Log,
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama Spółka wpisana jest więcej niż jeden raz
 DocType: Employee,Married,Poślubiony
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nie dopuszczony do {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},
 DocType: Payment Reconciliation,Reconcile,Wyrównywać
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Artykuły spożywcze
 DocType: Quality Inspection Reading,Reading 1,Odczyt 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Dodaj Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundusze Emerytalne
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Magazyn jest obowiązkowe, jeżeli typ konta to Magazyn"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,"Magazyn jest obowiązkowe, jeżeli typ konta to Magazyn"
 DocType: SMS Center,All Sales Person,
 DocType: Lead,Person Name,Imię i nazwisko osoby
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Sprawdź, czy kolejność powtarzających się, usuń zaznaczenie, aby zatrzymać powtarzające się lub umieścić właściwą datę zakończenia"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Zestawienie materiałowe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otwarcie
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Skopiuj z Grupy Przedmiotów
 DocType: Journal Entry,Opening Entry,Wpis początkowy
 DocType: Stock Entry,Additional Costs,Dodatkowe koszty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konto z istniejącymi zapisami nie może być konwertowane na Grupę (konto dzielone).
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Konto z istniejącymi zapisami nie może być konwertowane na Grupę (konto dzielone).
 DocType: Lead,Product Enquiry,
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Proszę najpierw wpisać Firmę
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Najpierw wybierz firmę
 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 +22,Target On,
+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,Koszt całkowity
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dziennik aktywności:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,
@@ -165,7 +165,7 @@
 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","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 +444,Item {0} is not active or end of life has been reached,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Zostanie zaktualizowane po wysłaniu Faktury Sprzedaży
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Szczegóły dotyczące przeprowadzonych operacji.
 DocType: Serial No,Maintenance Status,Status Konserwacji
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Produkty i cennik
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},"""Data od"" powinna być w tym roku podatkowym. Przyjmując Datę od = {0}"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},"""Data od"" powinna być w tym roku podatkowym. Przyjmując Datę od = {0}"
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centrum kosztów {0} nie należy do Firmy {1}
 DocType: Customer,Individual,
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Przepływy pieniężne netto z finansowania
 DocType: Lead,Address & Contact,Adres i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj niewykorzystane urlopy z poprzednich alokacji
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Następny cykliczne {0} zostanie utworzony w dniu {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Nazwa kontaktu
 DocType: Production Plan Item,SO Pending Qty,
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Tworzy Pasek Wypłaty dla wskazanych wyżej kryteriów.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Data zwolnienia musi być większa od Daty Wstąpienia
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,
 DocType: Payment Tool,Reference No,Nr Odniesienia
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Urlop Zablokowany
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Roczny
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Uzgodnienia Stanu Pozycja
 DocType: Stock Entry,Sales Invoice No,Nr faktury sprzedażowej
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Typ dostawcy
 DocType: Item,Publish in Hub,Publikowanie w Hub
 ,Terretory,Terytorium
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Zamówienie produktu
 DocType: Bank Reconciliation,Update Clearance Date,
 DocType: Item,Purchase Details,Szczegóły zakupu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Relacja
 DocType: Shipping Rule,Worldwide Shipping,Wysyłka na całym świecie
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potwierdzone zamówienia od klientów
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Sugestie
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Proszę wprowadzić grupę konto rodzica magazynowy {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Płatność przed {0} {1} nie może być większa niż kwota kredytu pozostała {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Płatność przed {0} {1} nie może być większa niż kwota kredytu pozostała {2}
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Nr tel. Komórkowego
 DocType: Maintenance Schedule,Generate Schedule,Utwórz Harmonogram
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Ostatnie
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Maksymalnie 5 znaków
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Uczyć się
 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
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Wielu Waluta
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
 DocType: Sales Invoice Item,Delivery Note,Dowód dostawy
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Konfigurowanie podatki
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Konfigurowanie podatki
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Podsumowanie na ten tydzień i działań toczących
 DocType: Workstation,Rent Cost,Koszt Wynajmu
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Wybierz miesiąc i rok
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",
 DocType: Item Tax,Tax Rate,Stawka podatku
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Wybierz produkt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Wybierz produkt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Pozycja: {0} udało partiami, nie da się pogodzić z wykorzystaniem \
  Zdjęcie Pojednania, zamiast używać Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Przekształć w nie-Grupę
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Potwierdzenie Zakupu musi zostać wysłane
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medyczny
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Powód straty
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Stacja robocza jest zamknięta w następujących terminach wg listy wakacje: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Możliwości
 DocType: Employee,Single,Pojedynczy
 DocType: Issue,Attachment,Załącznik
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budżet nie może być ustawiony na centrum kosztów Grupy
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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,
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,
 DocType: Material Request Item,Required Date,
 DocType: Delivery Note,Billing Address,Adres Faktury
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Proszę wpisać Kod Produktu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Proszę wpisać Kod Produktu
 DocType: BOM,Costing,Zestawienie kosztów
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Razem szt
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,
 DocType: Production Order,Additional Operating Cost,Dodatkowy koszt operacyjny
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetyki
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"To merge, following properties must be same for both items",
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items",
 DocType: Shipping Rule,Net Weight,Waga netto
 DocType: Employee,Emergency Phone,Telefon bezpieczeństwa
 ,Serial No Warranty Expiry,
@@ -440,15 +444,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Przyrost nie może być 0
 DocType: Production Planning Tool,Material Requirement,
 DocType: Company,Delete Company Transactions,Usuń Transakcje Spółki
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,{0} nie jest pozycją kupowaną
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,{0} nie jest pozycją kupowaną
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} jest nieprawidłowym adresem e-mail w 'Powiadomienia \ Adres Email'
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Suma płatności w tym roku:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,
 DocType: Purchase Invoice,Supplier Invoice No,Nr faktury dostawcy
 DocType: Territory,For reference,Dla referencji
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Zamknięcie (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Zamknięcie (Cr)
 DocType: Serial No,Warranty Period (Days),Okres gwarancji (dni)
 DocType: Installation Note Item,Installation Note Item,
 ,Pending Qty,Oczekuje szt
@@ -465,7 +468,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Miesięczny Dystrybucja ** pozwala Ci zaplanować budżet w ciągu roku, jeśli w Twojej firmie występuje sezonowość.
 
  Aby rozplanować budżet w ** dystrybucji miesięcznej ** ustaw  Miesięczą dystrybucję w ** Centrum Kosztów **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nie znaleziono w tabeli faktury rekordy
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nie znaleziono w tabeli faktury rekordy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Najpierw wybierz typ firmy, a Party"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Rok finansowy / księgowy.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",
@@ -473,9 +476,9 @@
 DocType: Project Task,Project Task,Zadanie projektu
 ,Lead Id,ID Tropu
 DocType: C-Form Invoice Detail,Grand Total,Całkowita suma
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Data rozpoczęcia roku obrotowego nie powinny być większe niż data zakończenia roku obrotowego
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Data rozpoczęcia roku obrotowego nie powinny być większe niż data zakończenia roku obrotowego
 DocType: Warranty Claim,Resolution,
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dostarczone: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Dostarczone: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Konto płatności
 DocType: Sales Order,Billing and Delivery Status,Fakturowanie i dostawy status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Powtarzający się klient
@@ -490,7 +493,7 @@
 DocType: Quotation,Quotation To,Wycena dla
 DocType: Lead,Middle Income,Średni Dochód
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otwarcie (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Przydzielona kwota nie może być ujemna
 DocType: Purchase Order Item,Billed Amt,Rozliczona Ilość
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logiczny Magazyn przeciwny do zapisów.
@@ -499,7 +502,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produkcja Zamówienie jest obowiązkowe
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},
 DocType: Fiscal Year Company,Fiscal Year Company,Rok podatkowy firmy
 DocType: Packing Slip Item,DN Detail,
 DocType: Time Log,Billed,Rozliczony
@@ -518,16 +521,17 @@
 DocType: Activity Type,Default Costing Rate,Domyślnie Costing Cena
 DocType: Maintenance Schedule,Maintenance Schedule,Plan Konserwacji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Następnie wycena Zasady są filtrowane na podstawie Klienta, grupy klientów, Terytorium, dostawcy, dostawca, typu kampanii, Partner Sales itp"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Zmiana netto stanu zapasów
 DocType: Employee,Passport Number,
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Menager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Z Potwierdzenia Kupna
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Sama pozycja została wprowadzona wielokrotnie.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Z Potwierdzenia Kupna
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Sama pozycja została wprowadzona wielokrotnie.
 DocType: SMS Settings,Receiver Parameter,Parametr Odbiorcy
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Pola ""Bazuje na"" i ""Grupuj wg."" nie mogą być takie same"
 DocType: Sales Person,Sales Person Targets,
 DocType: Production Order Operation,In minutes,W ciągu kilku minut
 DocType: Issue,Resolution Date,
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla rodzaju płatności {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla rodzaju płatności {0}
 DocType: Selling Settings,Customer Naming By,
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Przekształć w Grupę
 DocType: Activity Cost,Activity Type,Rodzaj aktywności
@@ -538,7 +542,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Działalność wydawnicza
 DocType: Activity Cost,Projects User,Użytkownik projektu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Skonsumowano
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} Nie znaleziono tabeli w Szczegóły faktury
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} Nie znaleziono tabeli w Szczegóły faktury
 DocType: Company,Round Off Cost Center,Zaokrąglić centrum kosztów
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wizyta Konserwacji {0} musi być anulowana przed usunięciem nakazu sprzedaży
 DocType: Material Request,Material Transfer,Transfer materiałów
@@ -560,13 +564,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,
 DocType: Purchase Receipt Item Supplied,Current Stock,Bieżący asortyment
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Odrzucony Magazyn jest obowiązkowy dla odrzuconych przedmiotów
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Razem rozliczeniowy w tym roku
 DocType: Account,Expenses Included In Valuation,Zaksięgowane wydatki w wycenie
 DocType: Employee,Provide email id registered in company,
 DocType: Hub Settings,Seller City,Sprzedawca Miasto
 DocType: Email Digest,Next email will be sent on:,
 DocType: Offer Letter Term,Offer Letter Term,Oferta List Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Pozycja ma warianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Pozycja ma warianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,
 DocType: Bin,Stock Value,
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,
@@ -584,18 +588,18 @@
 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 +92,{0} is not a stock Item,{0} nie jest przechowywany na magazynie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nie jest przechowywany na magazynie
 DocType: Mode of Payment Account,Default Account,Domyślne konto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,
 DocType: Production Order Operation,Planned End Time,Planowany czas zakończenia
 ,Sales Person Target Variance Item Group-Wise,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konto z istniejącymi zapisami nie może być konwertowane
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Konto z istniejącymi zapisami nie może być konwertowane
 DocType: Delivery Note,Customer's Purchase Order No,Numer Zamówienia Zakupu Klienta
 DocType: Employee,Cell Number,Numer komórki
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Wnioski Auto Materiał Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Straty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,You can not enter current voucher in 'Against Journal Entry' column
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,You can not enter current voucher in 'Against Journal Entry' column
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Szansa od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Miesięczny wyciąg do wynagrodzeń.
@@ -604,9 +608,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: od {0} typu {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Wiersz {0}: Współczynnik konwersji jest obowiązkowe
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Zapisy księgowe mogą być wykonane na kontach podrzędnych. Wpisy wobec grupy kont nie są dozwolone.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Numer Potwierdzenie Zakupu wymagany dla przedmiotu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Numer Potwierdzenie Zakupu wymagany dla przedmiotu {0}
 DocType: Item Attribute Value,Item Attribute Value,Pozycja wartość atrybutu
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,
 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.
@@ -664,7 +668,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Cennik nie wybrany
 DocType: Employee,Family Background,Tło rodzinne
 DocType: Process Payroll,Send Email,
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Brak uprawnień
 DocType: Company,Default Bank Account,Domyślne konto bankowe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Aby filtrować na podstawie partii, wybierz Party Wpisz pierwsze"
@@ -672,7 +676,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Numery
 DocType: Item,Items with higher weightage will be shown higher,Produkty z wyższym weightage zostaną pokazane wyższe
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Uzgodnienia z wyciągiem bankowym - szczegóły
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Moje Faktury
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Moje Faktury
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nie znaleziono pracowników
 DocType: Purchase Order,Stopped,
 DocType: Item,If subcontracted to a vendor,Jeśli zlecona dostawcy
@@ -682,6 +686,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,
 ,Support Analytics,
 DocType: Item,Website Warehouse,Magazyn strony WWW
+DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalna kwota faktury
 DocType: Sales 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"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,
@@ -691,7 +696,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Aby włączyć &quot;punkt sprzedaży&quot; funkcje
 DocType: Bin,Moving Average Rate,
 DocType: Production Planning Tool,Select Items,Wybierz Elementy
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2}
 DocType: Maintenance Visit,Completion Status,Status ukończenia
 DocType: Sales Invoice Item,Target Warehouse,
 DocType: Item,Allow over delivery or receipt upto this percent,Pozostawić na dostawę lub odbiór zapisu do tego procent
@@ -703,7 +708,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,
 DocType: Production Order,Item To Manufacture,Rzecz do wyprodukowania
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Stan jest {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Zamówienie zakupu do płatności
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Zamówienie zakupu do płatności
 DocType: Sales Order Item,Projected Qty,Prognozowana ilość
 DocType: Sales Invoice,Payment Due Date,Termin Płatności
 DocType: Newsletter,Newsletter Manager,Biuletyn Kierownik
@@ -727,7 +732,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punkt sprzedaży
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Już Kredyty saldo konta, nie możesz ustawić ""Równowaga musi być"" za ""Debit"""
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Już Kredyty saldo konta, nie możesz ustawić ""Równowaga musi być"" za ""Debit"""
 DocType: Account,Balance must be,Bilans powinien wynosić
 DocType: Hub Settings,Publish Pricing,Opublikuj Ceny
 DocType: Notification Control,Expense Claim Rejected Message,Wiadomość o odrzuconym zwrocie wydatków
@@ -750,7 +755,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Główna wartość Wymiany walut
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} musi być aktywny
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} musi być aktywny
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Najpierw wybierz typ dokumentu
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,
 DocType: Salary Slip,Leave Encashment Amount,
@@ -768,17 +773,17 @@
 DocType: Supplier,Default Payable Accounts,Domyślne Konto Płatności
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Pracownik {0} jest nieaktywny lub nie istnieje
 DocType: Features Setup,Item Barcode,Kod kreskowy
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
 DocType: Quality Inspection Reading,Reading 6,Odczyt 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,
 DocType: Address,Shop,Sklep
 DocType: Hub Settings,Sync Now,Synchronizuj teraz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Wiersz {0}: wejście kredytowe nie mogą być powiązane z {1}
 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 / Kasa będzie automatycznie aktualizowane za fakturą POS, gdy ten tryb zostanie wybrany."
 DocType: Employee,Permanent Address Is,Stały adres to
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacja zakończona na jak wiele wyrobów gotowych?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Marka
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Zniżki dla nadmiernie {0} przeszedł na pozycję {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Zniżki dla nadmiernie {0} przeszedł na pozycję {1}.
 DocType: Employee,Exit Interview Details,Wyjdź z szczegółów wywiadu
 DocType: Item,Is Purchase Item,Jest pozycją kupowalną
 DocType: Journal Entry Account,Purchase Invoice,Faktura zakupu
@@ -790,7 +795,7 @@
 DocType: Salary Slip,Total in words,
 DocType: Material Request Item,Lead Time Date,Termin realizacji
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,jest obowiązkowe. Może rekord Wymiana walut nie jest stworzony dla
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Wiersz # {0}: Proszę podać nr seryjny dla pozycji {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Wiersz # {0}: Proszę podać nr seryjny dla pozycji {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Dla pozycji &quot;Produkt Bundle&quot;, magazyn, nr seryjny i numer partii będą rozpatrywane z &quot;packing list&quot; tabeli. Jeśli magazynowe oraz Batch Nie są takie same dla wszystkich elementów Opakowanie do pozycji każdego &quot;produkt Bundle&quot;, wartości te mogą zostać wpisane do tabeli głównej pozycji, wartości zostaną skopiowane do &quot;packing list&quot; tabeli."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Dostawy do klientów.
 DocType: Purchase Invoice Item,Purchase Order Item,Przedmiot Zamówienia Kupna
@@ -799,14 +804,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Zmienność
 ,Company Name,Nazwa firmy
 DocType: SMS Center,Total Message(s),
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Wybierz produkt Transferu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,
 DocType: Pricing Rule,Max Qty,Maks. Ilość
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Wiersz {0}: Płatność przeciwko sprzedaży / Zamówienia powinny być zawsze oznaczone jako góry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemiczny
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Dla tego zamówienia produkcji wszystkie pozycje zostały już przeniesione.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Dla tego zamówienia produkcji wszystkie pozycje zostały już przeniesione.
 DocType: Process Payroll,Select Payroll Year and Month,Wybierz Płace rok i miesiąc
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Idź do odpowiedniej grupy (zwykle wykorzystania funduszy&gt; Aktywa obrotowe&gt; rachunków bankowych i utworzyć nowe konto (klikając na Dodaj Child) typu &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Koszt energii elekrycznej
@@ -820,10 +826,10 @@
 DocType: SMS Center,All Lead (Open),
 DocType: Purchase Invoice,Get Advances Paid,Uzyskaj opłacone zaliczki
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Załącz własny obrazek (awatar)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Stwórz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Stwórz
 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 +3,My Cart,Mój koszyk
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mój koszyk
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Rodzaj zlecenia musi być jednym z {0}
 DocType: Lead,Next Contact Date,
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Ilość Otwarcia
@@ -842,10 +848,10 @@
 DocType: POS Profile,Cash/Bank Account,Konto Kasa / Bank
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Stół atrybut jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} nie może być ujemna
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Zniżka (rabat)
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Zniżka (rabat)
 DocType: Features Setup,Purchase Discounts,Zniżki zakupu
 DocType: Workstation,Wages,Zarobki
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Będą aktualizowane tylko wtedy, gdy czas Zaloguj się &quot;Naliczany&quot;"
@@ -870,7 +876,7 @@
 DocType: Tax Rule,Shipping State,Stan Shipping
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Rzecz musi być dodane za ""elementy z zakupu wpływy"" przycisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Koszty Sprzedaży
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,
 DocType: GL Entry,Against,
 DocType: Item,Default Selling Cost Center,Domyśle Centrum Kosztów Sprzedaży
 DocType: Sales Partner,Implementation Partner,
@@ -912,6 +918,7 @@
 DocType: Sales Partner,Distributor,Dystrybutor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Koszyk Wysyłka Reguła
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Proszę ustawić &quot;Zastosuj dodatkowe zniżki na &#39;
 ,Ordered Items To Be Billed,Zamówione produkty do rozliczenia
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od Zakres musi być mniejsza niż do zakresu
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,
@@ -921,13 +928,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,
 DocType: Salary Slip,Leave Without Pay,Urlop bezpłatny
-DocType: Supplier,Communications,Komunikacja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Planowanie zdolności błąd
 ,Trial Balance for Party,Trial Balance for Party
 DocType: Lead,Consultant,Konsultant
 DocType: Salary Slip,Earnings,Dochody
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Zakończone Pozycja {0} musi być wprowadzony do wejścia typu Produkcja
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Stan z bilansu otwarcia
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Zakończone Pozycja {0} musi być wprowadzony do wejścia typu Produkcja
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Stan z bilansu otwarcia
 DocType: Sales Invoice Advance,Sales Invoice Advance,
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',
@@ -969,7 +975,7 @@
 DocType: Global Defaults,Current Fiscal Year,Obecny rok fiskalny
 DocType: Global Defaults,Disable Rounded Total,Wyłącz Zaokrąglanie Sumy
 DocType: Lead,Call,Połączenie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,Pole 'Wpisy' nie może być puste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,Pole 'Wpisy' nie może być puste
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Wiersz zduplikowany {0} z tym samym {1}
 ,Trial Balance,Zestawienie obrotów i sald
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Konfigurowanie Pracownicy
@@ -981,9 +987,9 @@
 DocType: Contact,User ID,ID Użytkownika
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Podgląd księgi
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najwcześniejszy
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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.
 DocType: Production Order,Manufacture against Sales Order,
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Reszta świata
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,
 DocType: Salary Slip,Gross Pay,Płaca brutto
@@ -1013,7 +1019,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Brak autoryzacji do edycji zamrożonego Konta {0}
 DocType: Journal Entry,Get Outstanding Invoices,Uzyskaj zaległą fakturę
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1026,13 +1032,13 @@
 DocType: Employee,Place of Issue,
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
 DocType: Email Digest,Add Quote,Dodaj Cytat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Współczynnik konwersji jednostki miary jest wymagany dla jednostki miary: {0} w Przedmiocie: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Współczynnik konwersji jednostki miary jest wymagany dla jednostki miary: {0} w Przedmiocie: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Wydatki pośrednie
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Twoje Produkty lub Usługi
 DocType: Mode of Payment,Mode of Payment,Rodzaj płatności
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,Website Image should be a public file or website URL,Strona Obraz powinien być plik publiczny lub adres witryny
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,
 DocType: Journal Entry Account,Purchase Order,Zamówienie kupna
 DocType: Warehouse,Warehouse Contact Info,Dane kontaktowe dla magazynu
@@ -1041,8 +1047,8 @@
 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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Dla {0}, tylko rachunki kredytowe mogą być połączone z innym wejściem debetowej"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","Dla {0}, tylko rachunki kredytowe mogą być połączone z innym wejściem debetowej"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1052,7 +1058,7 @@
 DocType: Appraisal Goal,Goal,Cel
 DocType: Sales Invoice Item,Edit Description,Edytuj opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Oczekiwany Dostawa Data jest mniejszy niż planowane daty rozpoczęcia.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Dla dostawcy
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Dla dostawcy
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,
 DocType: Purchase Invoice,Grand Total (Company Currency),Całkowita suma (w walucie firmy)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Razem Wychodzące
@@ -1065,7 +1071,7 @@
 DocType: Journal Entry,Journal Entry,Zapis księgowy
 DocType: Workstation,Workstation Name,Nazwa stacji roboczej
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,przetwarzanie maila
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
 DocType: Sales Partner,Target Distribution,
 DocType: Salary Slip,Bank Account No.,Nr konta bankowego
 DocType: Naming Series,This is the number of the last created transaction with this prefix,
@@ -1097,7 +1103,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operacje nie może być puste.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operacje nie może być puste.
 ,Delivered Items To Be Billed,Dostarczone przedmioty oczekujące na fakturowanie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazyn nie może być zmieniony dla Nr Seryjnego
 DocType: Authorization Rule,Average Discount,
@@ -1112,7 +1118,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Opis operacji
 DocType: Item,Will also apply to variants,Stosuje się również do wariantów
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nie można zmienić Rok obrotowy Data rozpoczęcia i Data zakończenia roku obrotowego, gdy rok obrotowy jest zapisane."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nie można zmienić Rok obrotowy Data rozpoczęcia i Data zakończenia roku obrotowego, gdy rok obrotowy jest zapisane."
 DocType: Quotation,Shopping Cart,Koszyk
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Średnia dzienna Wychodzące
 DocType: Pricing Rule,Campaign,Kampania
@@ -1123,7 +1129,8 @@
 DocType: Sales Order Item,Planned Quantity,Planowana ilość
 DocType: Purchase Invoice Item,Item Tax Amount,Wysokość podatku dla tej pozycji
 DocType: Item,Maintain Stock,Utrzymanie Zapasów
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Zbiory wpisy już utworzone dla Produkcji Zakonu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Zbiory wpisy już utworzone dla Produkcji Zakonu
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
@@ -1135,7 +1142,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan Kont
 DocType: Material Request,Terms and Conditions Content,Zawartość regulaminu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nie może być większa niż 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,
 DocType: Maintenance Visit,Unscheduled,Nieplanowany
 DocType: Employee,Owned,Zawłaszczony
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Zależy od urlopu bezpłatnego
@@ -1173,7 +1180,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,
 DocType: Shipping Rule Condition,To Value,
 DocType: Supplier,Stock Manager,Kierownik magazynu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Wydatki na wynajem
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Konfiguracja ustawień bramki SMS
@@ -1181,10 +1188,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nie dodano jeszcze adresu.
 DocType: Workstation Working Hour,Workstation Working Hour,Godziny robocze Stacji Roboczej
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analityk
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa JV ilości {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa JV ilości {2}
 DocType: Item,Inventory,Inwentarz
 DocType: Features Setup,"To enable ""Point of Sale"" view",Aby włączyć &quot;punkt sprzedaży&quot; widzenia
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Płatność nie może być wykonana za pusty koszyk
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Płatność nie może być wykonana za pusty koszyk
 DocType: Item,Sales Details,Szczegóły sprzedaży
 DocType: Opportunity,With Items,Z przedmiotami
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,
@@ -1199,10 +1206,11 @@
 DocType: Cost Center,Parent Cost Center,Nadrzędny dział kalkulacji kosztów
 DocType: Sales Invoice,Source,Źródło
 DocType: Leave Type,Is Leave Without Pay,Czy urlopu bezpłatnego
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nie znaleziono rekordów w tabeli płatności
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nie znaleziono rekordów w tabeli płatności
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Data początku roku finansowego
 DocType: Employee External Work History,Total Experience,
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Przepływy środków pieniężnych z Inwestowanie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Koszty dostaw i przesyłek
 DocType: Material Request Item,Sales Order No,Nr Zlecenia Sprzedaży
 DocType: Item Group,Item Group Name,
@@ -1210,12 +1218,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiały transferowe dla Produkcja
 DocType: Pricing Rule,For Price List,Dla Listy Cen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Szukanie wykonawcze
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kurs kupna dla pozycji: {0} nie znaleziono, która jest wymagana do rezerwacji zapisów księgowych (koszty). Powołaj się na rzecz cena przed cennika skupu."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kurs kupna dla pozycji: {0} nie znaleziono, która jest wymagana do rezerwacji zapisów księgowych (koszty). Powołaj się na rzecz cena przed cennika skupu."
 DocType: Maintenance Schedule,Schedules,Harmonogramy
 DocType: Purchase Invoice Item,Net Amount,Kwota netto
 DocType: Purchase Order Item Supplied,BOM Detail No,
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatkowa kwota rabatu (waluta firmy)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Błąd: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Błąd: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,
 DocType: Maintenance Visit,Maintenance Visit,Wizyta Konserwacji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Klient >  Grupa klientów > Terytorium
@@ -1241,7 +1249,7 @@
 DocType: Sales Partner,Sales Partner Target,
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Wejście księgowe dla {0} może być dokonywane wyłącznie w walucie: {1}
 DocType: Pricing Rule,Pricing Rule,Reguła cenowa
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiał Wniosek o Zamówieniu
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiał Wniosek o Zamówieniu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Wiersz # {0}: wracającą rzecz {1} nie istnieje w {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Konta bankowe
 ,Bank Reconciliation Statement,Stan uzgodnień z wyciągami z banku
@@ -1249,11 +1257,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Saldo otwierające zapasy
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} musi pojawić się tylko raz
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Od wartości
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Kwoty nie odzwierciedlone w banku
 DocType: Quality Inspection Reading,Reading 4,Odczyt 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Zwrot wydatków
@@ -1265,33 +1273,34 @@
 ,Material Requests for which Supplier Quotations are not created,
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Oznacz jako Dostawa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Oznacz jako Dostawa
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Dodać Oferta
 DocType: Dependent Task,Dependent Task,Zadanie zależne
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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,
 DocType: SMS Center,Receiver List,Lista odbiorców
 DocType: Payment Tool Detail,Payment Amount,Kwota płatności
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Skonsumowana wartość
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Zobacz
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Zobacz
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Zmiana netto stanu środków pieniężnych
 DocType: Salary Structure Deduction,Salary Structure Deduction,
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Koszt Emitowanych Przedmiotów
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Ilość nie może być większa niż {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Wiek (dni)
 DocType: Quotation Item,Quotation Item,Przedmiot Wyceny
 DocType: Account,Account Name,Nazwa konta
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Data od - nie może być późniejsza niż Data do
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Data od - nie może być późniejsza niż Data do
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,
 DocType: Purchase Order Item,Supplier Part Number,Numer katalogowy dostawcy
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Wartością konwersji nie może być 0 ani 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Wartością konwersji nie może być 0 ani 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Potwierdzenie Zakupu {0} nie zostało wysłane
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Potwierdzenie Zakupu {0} nie zostało wysłane
 DocType: Company,Default Payable Account,Domyślnie konto płatności
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% rozliczono
@@ -1303,15 +1312,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moje problemy
 DocType: BOM Item,BOM Item,
 DocType: Appraisal,For Employee,Dla pracownika
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,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/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Wiersz {0}: kwota płatności nie może być ujemna
 DocType: Expense Claim,Total Amount Reimbursed,Całkowitej kwoty zwrotów
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Przeciwko Dostawcę faktury {0} {1} dnia
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Przeciwko Dostawcę faktury {0} {1} dnia
 DocType: Customer,Default Price List,Domyślna List Cen
 DocType: Payment Reconciliation,Payments,Płatności
 DocType: Budget Detail,Budget Allocated,
 DocType: Journal Entry,Entry Type,Rodzaj wejścia
 ,Customer Credit Balance,Saldo kredytowe klienta
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Zmiana netto stanu zobowiązań
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Proszę sprawdzić swój identyfikator e-mail
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,
@@ -1332,7 +1343,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Włącz Koszyk
 DocType: Employee,Permanent Address,Stały adres
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Zaliczki wypłaconej przed {0} {1} nie może być większa \ niż RAZEM {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Wybierz kod produktu
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Zmniejsz potrącenie za Bezpłatny Urlop
@@ -1349,18 +1360,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Jednostka produktu.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',
 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,
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Magazyn wymagany w wierszu nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Magazyn wymagany w wierszu nr {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Pocztowy
 DocType: Item,Weightage,
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa Odbiorców posiada taką nazwę - wprowadź inną nazwę Odbiorcy lub zmień nazwę Grupy
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Proszę najpierw wybrać {0}.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},tekst {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Proszę najpierw wybrać {0}.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},tekst {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nowy kontakt
 DocType: Territory,Parent Territory,Nadrzędne terytorium
 DocType: Quality Inspection Reading,Reading 2,Odczyt 2
 DocType: Stock Entry,Material Receipt,Przyjęcie materiałów
@@ -1368,7 +1380,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Strona Typ i Partia jest wymagany do otrzymania / rachunku Płatne {0}
 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,
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +213,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 +85,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,
@@ -1385,15 +1397,15 @@
 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: Sales Invoice Item,Batch No,Nr Partii
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Zezwalaj na wiele zleceń sprzedaży wobec Klienta Zamówienia
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Główny
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Główny
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Wariant
 DocType: Naming Series,Set prefix for numbering series on your transactions,
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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?,
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Szansa Od pola jest obowiązkowe
 DocType: Item,Variants,Warianty
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,
 DocType: SMS Center,Send To,
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},
 DocType: Payment Reconciliation Payment,Allocated amount,Przyznana kwota
@@ -1406,7 +1418,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Magazyn i punkt odniesienia
 DocType: Supplier,Statutory info and other general information about your Supplier,
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresy
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Zduplikowany Nr Seryjny wprowadzony dla przedmiotu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Warunkiem art wysyłka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Produkt nie może mieć produkcja na zamówienie.
@@ -1415,10 +1427,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Kwota kredytu w walucie rachunku
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Czas Logi do produkcji.
 DocType: Item,Apply Warehouse-wise Reorder Level,Zastosuj Warehouse-mądry Reorder Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} musi być złożony
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} musi być złożony
 DocType: Authorization Control,Authorization Control,
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Wiersz # {0}: Odrzucone Magazyn jest obowiązkowe przed odrzucony poz {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Płatność
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Płatność
 DocType: Production Order Operation,Actual Time and Cost,Rzeczywisty Czas i Koszt
 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},
 DocType: Employee,Salutation,
@@ -1435,7 +1448,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,
 DocType: SMS Center,Create Receiver List,Stwórz listę odbiorców
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Upłynął
 DocType: Packing Slip,To Package No.,
 DocType: Warranty Claim,Issue Date,Data zdarzenia
 DocType: Activity Cost,Activity Cost,Aktywny Koszt
@@ -1473,7 +1485,7 @@
 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
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa pozostałej kwoty faktury {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa pozostałej kwoty faktury {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,
 DocType: Item,Is Sales Item,Jest pozycją sprzedawalną
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Drzewo kategorii
@@ -1485,7 +1497,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} utworzone
 DocType: Delivery Note Item,Against Sales Order,Na podstawie zamówienia sprzedaży
 ,Serial No Status,
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: aby okresowość {1} w zależności od od i do tej pory \
  musi być większa niż lub równe {2}"
@@ -1495,7 +1507,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Podatki i cła
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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} wpisy płatności nie mogą być filtrowane przez {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabela dla pozycji, które zostaną pokazane w Witrynie"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dostarczane szt
@@ -1510,7 +1522,7 @@
 DocType: Installation Note,Installation Time,Czas instalacji
 DocType: Sales Invoice,Accounting Details,Dane księgowe
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,"Usuń wszystkie transakcje, dla tej firmy"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Wiersz # {0}: {1} operacja nie zostanie zakończona do {2} Ilość wyrobów gotowych w produkcji Zamówienie # {3}. Proszę zaktualizować stan pracy za pomocą Time Logs
+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,Wiersz # {0}: {1} operacja nie zostanie zakończona do {2} Ilość wyrobów gotowych w produkcji Zamówienie # {3}. Proszę zaktualizować stan pracy za pomocą Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,
 DocType: Issue,Resolution Details,
 DocType: Quality Inspection Reading,Acceptance Criteria,Kryteria akceptacji
@@ -1526,7 +1538,7 @@
 DocType: Holiday List,Clear Table,Wyczyść tabelę
 DocType: Features Setup,Brands,Marki
 DocType: C-Form Invoice Detail,Invoice No,Nr faktury
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Od Zamówienia Kupna
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Od Zamówienia Kupna
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Zostaw nie mogą być stosowane / anulowana przed {0}, a bilans urlopu zostało już przeniesionych przekazywane w przyszłości rekordu alokacji urlopu {1}"
 DocType: Activity Cost,Costing Rate,Wskaźnik zestawienia kosztów
 ,Customer Addresses And Contacts,
@@ -1543,7 +1555,7 @@
 ,Maintenance Schedules,Plany Konserwacji
 ,Quotation Trends,Trendy Wyceny
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,Debit To account must be a Receivable account,Debet na konto musi być rachunkiem otrzymującym
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Debet na konto musi być rachunkiem otrzymującym
 DocType: Shipping Rule Condition,Shipping Amount,Ilość dostawy
 ,Pending Amount,Kwota Oczekiwana
 DocType: Purchase Invoice Item,Conversion Factor,Współczynnik konwersji
@@ -1560,12 +1572,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Rejestr operacji gospodarczych.
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,
 DocType: HR Settings,HR Settings,Ustawienia HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Zwrot Kosztów jest w oczekiwaniu na potwierdzenie. Tylko osoba zatwierdzająca wydatki może uaktualnić status.
 DocType: Purchase Invoice,Additional Discount Amount,Kwota dodatkowego rabatu
 DocType: Leave Block List Allow,Leave Block List Allow,
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,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 +225,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Razem Rzeczywisty
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,szt.
@@ -1577,6 +1589,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Roszczenia wydatków
 DocType: Issue,Support,Wsparcie
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Zobacz Koszyk
 ,BOM Search,BOM Szukaj
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zamknięcie (otwarcie + suma)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Proszę określić walutę w Spółce
@@ -1588,13 +1601,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Współczynnik konwersji jednostki miary jest wymagany w rzędzie {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},
 DocType: Salary Slip,Deduction,Odliczenie
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Pozycja Cena dodany do {0} w Cenniku {1}
 DocType: Address Template,Address Template,Szablon Adresu
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% Zadania Zakończone
 DocType: Project,Gross Margin,Marża brutto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,Wyłączony użytkownik
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Wyłączony użytkownik
 DocType: Opportunity,Quotation,Wycena
 DocType: Salary Slip,Total Deduction,
 DocType: Quotation,Maintenance User,Użytkownik Konserwacji
@@ -1603,7 +1617,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL na przywiązanie {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL na przywiązanie {0}
 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
@@ -1613,12 +1627,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Śledź kampanię sprzedażową. Śledź Tropy, Wyceny, Zamówienia Sprzedaży etc. z kampanii by zmierzyć zwrot z inwestycji."
 DocType: Expense Claim,Approver,Osoba zatwierdzająca
 ,SO Qty,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Zbiory występować przeciwko wpisy magazynu {0}, a więc nie można ponownie przypisać lub zmienić Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Zbiory występować przeciwko wpisy magazynu {0}, a więc nie można ponownie przypisać lub zmienić Warehouse"
 DocType: Appraisal,Calculate Total Score,Oblicz całkowity wynik
 DocType: Supplier Quotation,Manufacturing Manager,Kierownik Produkcji
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,
-apps/erpnext/erpnext/hooks.py +68,Shipments,Przesyłki
+apps/erpnext/erpnext/hooks.py +69,Shipments,Przesyłki
 DocType: Purchase Order Item,To be delivered to customer,Być dostarczone do klienta
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Czas Zaloguj status musi być złożony.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Numer seryjny: {0} nie należy do żadnej Warehouse
@@ -1638,10 +1652,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"Types of employment (permanent, contract, intern etc.).",
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
 DocType: Currency Exchange,From Currency,Od Waluty
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Proszę wybrać Przyznana kwota, faktury i faktury Rodzaj numer w conajmniej jednym rzędzie"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Zlecenie Sprzedaży jest wymagane dla Elementu {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Proszę wybrać Przyznana kwota, faktury i faktury Rodzaj numer w conajmniej jednym rzędzie"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Zlecenie Sprzedaży jest wymagane dla Elementu {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Kwoty nie odzwierciedlone w systemie
 DocType: Purchase Invoice Item,Rate (Company Currency),Stawka (waluta firmy)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Inni
@@ -1657,7 +1671,7 @@
 DocType: Quality Inspection,In Process,
 DocType: Authorization Rule,Itemwise Discount,
 DocType: Purchase Order Item,Reference Document Type,Oznaczenie typu dokumentu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} przed Zleceniem Sprzedaży {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} przed Zleceniem Sprzedaży {1}
 DocType: Account,Fixed Asset,Trwała własność
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inwentaryzacja w odcinkach
 DocType: Activity Type,Default Billing Rate,Domyślnie Cena płatności
@@ -1667,7 +1681,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Płatności do zamówienia sprzedaży
 DocType: Expense Claim Detail,Expense Claim Detail,Szczegóły o zwrotach kosztów
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Czas Logi utworzone:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Proszę wybrać prawidłową konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Proszę wybrać prawidłową konto
 DocType: Item,Weight UOM,Waga jednostkowa
 DocType: Employee,Blood Group,Grupa Krwi
 DocType: Purchase Invoice Item,Page Break,Znak końca strony
@@ -1698,10 +1712,10 @@
 DocType: Time Log,To Time,
 DocType: Authorization Rule,Approving Role (above authorized value),Zatwierdzanie rolę (powyżej dopuszczonego wartości)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit To account must be a Payable account
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Credit To account must be a Payable account
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},
 DocType: Production Order Operation,Completed Qty,Ukończona wartość
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Cennik {0} jest wyłączony
 DocType: Manufacturing Settings,Allow Overtime,Pozwól Nadgodziny
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numery seryjne wymagane dla pozycji {1}. Podałeś {2}.
@@ -1709,8 +1723,9 @@
 DocType: Item,Customer Item Codes,Kody Pozycja klienta
 DocType: Opportunity,Lost Reason,
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Utwórz zapisy płatności dla Zamówień lub Faktur.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nowy adres
 DocType: Quality Inspection,Sample Size,Wielkość próby
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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"
 DocType: Project,External,Zewnętrzny
@@ -1766,13 +1781,14 @@
 DocType: Rename Tool,Rename Tool,Zmień nazwę narzędzia
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Zaktualizuj Koszt
 DocType: Item Reorder,Item Reorder,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",
 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
 DocType: Installation Note,Installation Note,
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Definiowanie podatków
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Cash Flow z finansowania
 ,Financial Analytics,Analityka finansowa
 DocType: Quality Inspection,Verified By,Zweryfikowane przez
 DocType: Address,Subsidiary,
@@ -1782,19 +1798,19 @@
 DocType: Process Payroll,Create Salary Slip,Utwórz pasek wynagrodzenia
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Oczekiwane saldo wg banków
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Pasywa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Ilość w rzędzie  {0} ({1}) musi być taka sama jak wyprodukowana ilość {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Ilość w rzędzie  {0} ({1}) musi być taka sama jak wyprodukowana ilość {2}
 DocType: Appraisal,Employee,Pracownik
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importowania wiadomości z
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Zaproś jako Użytkownik
 DocType: Features Setup,After Sale Installations,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} jest w pełni rozliczone
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} jest w pełni rozliczone
 DocType: Workstation Working Hour,End Time,Czas zakończenia
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupuj według Podstawy księgowania
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Wymagane dniu
 DocType: Sales Invoice,Mass Mailing,
 DocType: Rename Tool,File to Rename,Plik to zmiany nazwy
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Pokaż Płatności
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plan Konserwacji {0} musi być anulowany przed usunięciem tego zamówienia
@@ -1804,6 +1820,7 @@
 DocType: Selling Settings,Sales Order Required,
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Utwórz klienta
 DocType: Purchase Invoice,Credit To,
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Całość Przewody / Klienci
 DocType: Employee Education,Post Graduate,
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Szczegóły Planu Konserwacji
 DocType: Quality Inspection Reading,Reading 9,Odczyt 9
@@ -1815,6 +1832,7 @@
 DocType: Warranty Claim,Raised By,Wywołany przez
 DocType: Payment Tool,Payment Account,Konto Płatność
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Zmiana netto stanu należności
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,
 DocType: Quality Inspection Reading,Accepted,Przyjęte
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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ąć."
@@ -1822,17 +1840,17 @@
 DocType: Payment Tool,Total Payment Amount,Całkowita kwota płatności
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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,
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Surowce nie może być puste.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować akcji, faktura zawiera upuść element wysyłki."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,Surowce nie może być puste.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować akcji, faktura zawiera upuść element wysyłki."
 DocType: Newsletter,Test,
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Jak są istniejące transakcji giełdowych dla tej pozycji, \ nie można zmienić wartości &quot;Czy numer seryjny&quot;, &quot;Czy Batch Nie &#39;,&#39; Czy Pozycja Zdjęcie&quot; i &quot;Metoda wyceny&quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Szybkie Księgowanie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Szybkie Księgowanie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,
 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 +157,Please enter Planned Qty for Item {0} at row {1},
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} nie zostało dodane
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} nie zostało dodane
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Zamówienia produktów.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,
 DocType: Purchase Invoice,Terms and Conditions1,
@@ -1845,7 +1863,7 @@
 DocType: Authorization Rule,Authorized Value,Autoryzowany Wartość
 DocType: Contact,Enter department to which this Contact belongs,"Wpisz dział, to którego należy ten kontakt"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Razem Nieobecny
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Jednostka miary
 DocType: Fiscal Year,Year End Date,Data końca roku
 DocType: Task Depends On,Task Depends On,Zadanie Zależy od
@@ -1871,7 +1889,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Końcowa data kontraktu musi być większa od Daty Członkowstwa
 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."
 DocType: Customer Group,Has Child Node,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} przed Zamówieniem Zakupu  {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} przed Zamówieniem Zakupu  {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Wpisz parametry statycznego URL tutaj (np. nadawca=ERPNext, nazwa użytkownika=ERPNext, hasło=1234 itd.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nie w każdym aktywnym roku podatkowego. Aby uzyskać więcej informacji sprawdź {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,
@@ -1919,7 +1937,7 @@
  10. Dodać lub odjąć: Czy chcesz dodać lub odjąć podatek."
 DocType: Purchase Receipt Item,Recd Quantity,Zapisana Ilość
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,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 +477,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,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: Tax Rule,Billing City,Rozliczenia Miasto
 DocType: Global Defaults,Hide Currency Symbol,Ukryj symbol walutowy
@@ -1951,6 +1969,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Wydatki na usługi komunalne
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Ponad
 DocType: Buying Settings,Default Buying Price List,Domyślna Lista Cen Kupowania
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Żaden pracownik nie dla wyżej wybranych kryteriów lub specyfikacji wynagrodzenia już utworzony
 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.",
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Typ płatności
@@ -1986,7 +2005,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",
 DocType: Appraisal Goal,Key Responsibility Area,Kluczowy obszar obowiązków
 DocType: Item Reorder,Material Request Type,Typ zamówienia produktu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Wiersz {0}: JM Współczynnik konwersji jest obowiązkowe
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Centrum kosztów
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Bon #
@@ -2009,7 +2028,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Proszę wprowadzić wartość dla wyceny {0} {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Wszystkie adresy
 DocType: Company,Stock Settings,Ustawienia magazynu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"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"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"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"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Nazwa nowego Centrum Kosztów
 DocType: Leave Control Panel,Leave Control Panel,Panel do obsługi Urlopów
@@ -2029,8 +2048,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Szczegóły Narzędzia Płatności
 ,Sales Browser,
 DocType: Journal Entry,Total Credit,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Ostrzeżenie: Inny {0} # {1} istnieje we wpisie asortymentu {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokalne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Ostrzeżenie: Inny {0} # {1} istnieje we wpisie asortymentu {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Lokalne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Inwestycje finansowe i udzielone pożyczki (aktywa)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dłużnicy
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Duży
@@ -2049,7 +2068,7 @@
 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.,
 DocType: Production Order Operation,Make Time Log,Dodać do czasu Zaloguj
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Proszę ustawić ilość zmienić kolejność
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Proszę ustawić ilość zmienić kolejność
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},
 DocType: Price List,Applicable for Countries,Zastosowanie dla krajów
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Komputery
@@ -2109,10 +2128,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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,
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Brak Uwag
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Brak Uwag
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zaległy
 DocType: Account,Stock Received But Not Billed,"Przyjęte na stan, nie zapłacone (zobowiązanie)"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Konto root musi być grupą
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Konto root musi być grupą
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,
 DocType: Monthly Distribution,Distribution Name,Nazwa Dystrybucji
 DocType: Features Setup,Sales and Purchase,
@@ -2126,6 +2145,7 @@
 DocType: Journal Entry Account,Party Balance,Bilans Grupy
 DocType: Sales Invoice Item,Time Log Batch,
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Proszę wybrać Zastosuj RABAT
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Slip Wynagrodzenie Utworzono
 DocType: Company,Default Receivable Account,Domyślnie konto należności
 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: Stock Entry,Material Transfer for Manufacture,Materiał transferu dla Produkcja
@@ -2133,9 +2153,9 @@
 DocType: Purchase Invoice,Half-yearly,Półroczny
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Rok podatkowy {0} nie został znaleziony.
 DocType: Bank Reconciliation,Get Relevant Entries,Pobierz odpowiednie pozycje
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Zapis księgowy dla zapasów
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Zapis księgowy dla zapasów
 DocType: Sales Invoice,Sales Team1,
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,
 DocType: Sales Invoice,Customer Address,Adres klienta
 DocType: Purchase Invoice,Apply Additional Discount On,Zastosuj dodatkowe zniżki na
 DocType: Account,Root Type,
@@ -2144,15 +2164,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,
 DocType: BOM,Item UOM,Jednostka miary produktu
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Kwota podatku po uwzględnieniu rabatu (waluta firmy)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},
 DocType: Quality Inspection,Quality Inspection,Kontrola jakości
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Żywność, Trunki i Tytoń"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL albo BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Mogą jedynie wpłaty przed Unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Mogą jedynie wpłaty przed Unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Wartość prowizji nie może być większa niż 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalny poziom zapasów
 DocType: Stock Entry,Subcontract,Zlecenie
@@ -2190,7 +2210,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,
 DocType: Purchase Order Item,Returned Qty,Wrócił szt
 DocType: Employee,Exit,Wyjście
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Dla wygody klientów, te kody mogą być użyte w formacie drukowania jak faktury czy dowody dostawy"
 DocType: Employee,You can enter any date manually,Możesz wprowadzić jakąkolwiek datę ręcznie
@@ -2198,8 +2218,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Okres próbny
 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 +110,Row {0}: Advance against Customer must be credit,Wiersz {0}: Advance wobec Klienta musi być kredytowej
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Zapłacone
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Zapłacone
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Aby DateTime
 DocType: SMS Settings,SMS Gateway URL,Adres URL bramki SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logi do utrzymania sms stan przesyłki
@@ -2216,7 +2237,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Poziom Uporządkowania
 DocType: Attendance,Attendance Date,
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Konto grupujące inne konta nie może być konwertowane
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Konto grupujące inne konta nie może być konwertowane
 DocType: Address,Preferred Shipping Address,
 DocType: Purchase Receipt Item,Accepted Warehouse,Przyjęty Magazyn
 DocType: Bank Reconciliation Detail,Posting Date,Data publikacji
@@ -2234,7 +2255,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,
 DocType: Pricing Rule,Discount Percentage,Procent zniżki
 DocType: Payment Reconciliation Invoice,Invoice Number,Numer faktury
-apps/erpnext/erpnext/hooks.py +54,Orders,Zamówienia
+apps/erpnext/erpnext/hooks.py +55,Orders,Zamówienia
 DocType: Leave Control Panel,Employee Type,Typ pracownika
 DocType: Employee Leave Approver,Leave Approver,Zatwierdzający Urlop
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiał Przeniesione dla Produkcja
@@ -2246,7 +2267,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% materiałów rozliczonych w ramach tego zlecenia sprzedaży
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Wpis Kończący Okres
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Spadek wartości
+DocType: Account,Depreciation,Spadek wartości
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dostawca(y)
 DocType: Customer,Credit Limit,
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Wybierz rodzaj transakcji
@@ -2271,11 +2292,12 @@
 DocType: Material Request,Requested For,
 DocType: Quotation Item,Against Doctype,
 DocType: Delivery Note,Track this Delivery Note against any Project,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Przepływy pieniężne netto z inwestycji
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Pokaż zapisy stanu
 ,Is Primary Address,Czy Podstawowy Adres
 DocType: Production Order,Work-in-Progress Warehouse,Magazyn z produkcją w toku
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Odnośnik #{0} wpisano z datą {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Odnośnik #{0} wpisano z datą {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Zarządzaj adresy
 DocType: Pricing Rule,Item Code,Kod identyfikacyjny
 DocType: Production Planning Tool,Create Production Orders,Utwórz Zamówienie produkcji
@@ -2283,7 +2305,7 @@
 DocType: Journal Entry,User Remark,Spostrzeżenie Użytkownika
 DocType: Lead,Market Segment,
 DocType: Employee Internal Work History,Employee Internal Work History,Historia zatrudnienia pracownika w firmie
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Zamknięcie (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Zamknięcie (Dr)
 DocType: Contact,Passive,
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,
@@ -2299,7 +2321,7 @@
 ,Billed Amount,Ilość Rozliczenia
 DocType: Bank Reconciliation,Bank Reconciliation,Uzgodnienia z wyciągiem bankowym
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Pobierz aktualizacje
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Dodaj kilka rekordów przykładowe
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Zarządzanie urlopami
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupuj według konta
@@ -2308,14 +2330,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",
 DocType: Payment Tool,Against Vouchers,Na podstawie talonów
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Szybka pomoc
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},
 DocType: Features Setup,Sales Extras,
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Budżet dla konta {1} z MPK {2} będzie przekroczony o {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
 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'
 ,Stock Projected Qty,
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
 DocType: Sales Order,Customer's Purchase Order,Klienta Zamówienia
 DocType: Warranty Claim,From Company,Od Firmy
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Wartość albo Ilość
@@ -2325,9 +2347,9 @@
 DocType: Leave Block List,Leave Block List Allowed,
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Będzie go używać do logowania
 DocType: Sales Partner,Retailer,
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredyty na konto musi być kontem Bilans
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Kredyty na konto musi być kontem Bilans
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Typy wszystkich dostawców
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,
+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 +93,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
@@ -2371,7 +2393,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Użytkownicy z tą rolą mogą ustawiać zamrożone konta i tworzyć / modyfikować wpisy księgowe dla zamrożonych kont
 DocType: Serial No,Is Cancelled,
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje Przesyłki
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Moje Przesyłki
 DocType: Journal Entry,Bill Date,Data Rachunku
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Nawet jeśli istnieje wiele przepisów dotyczących cen o najwyższym priorytecie, a następnie następujące priorytety wewnętrznej są stosowane:"
 DocType: Supplier,Supplier Details,Szczegóły dostawcy
@@ -2392,10 +2414,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Połączenia
 DocType: Project,Total Costing Amount (via Time Logs),Całkowita ilość Costing (przez Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Jednostka
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Zamówienia Kupna {0} nie zostało wysłane
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Zamówienia Kupna {0} nie zostało wysłane
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Prognozowany
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,
 DocType: Notification Control,Quotation Message,Wiadomość Wyceny
 DocType: Issue,Opening Date,Data Otwarcia
 DocType: Journal Entry,Remark,Uwaga
@@ -2408,9 +2430,9 @@
 DocType: Time Log,Batched for Billing,
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Rachunki od dostawców.
 DocType: POS Profile,Write Off Account,Konto Odpisu
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Środki pieniężne netto z działalności operacyjnej
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,np. VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Pozycja 4
 DocType: Journal Entry Account,Journal Entry Account,Konto zapisu
@@ -2451,7 +2473,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data przejścia na emeryturę musi być większa niż Data wstąpienia
 DocType: Sales Invoice,Against Income Account,Konto przychodów
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% dostarczono
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,
 DocType: Delivery Note,Transporter Info,Informacje dotyczące przewoźnika
@@ -2479,10 +2501,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numer partii jest obowiązkowy dla produktu {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,
 ,Stock Ledger,Księga zapasów
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Cena: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Cena: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Na początku wybierz węzeł grupy.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cel musi być jednym z {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Cel musi być jednym z {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Wypełnij formularz i zapisz
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Ściągnij raport zawierający surowe dokumenty z najnowszym statusem zapasu
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Społeczność Forum
@@ -2520,7 +2542,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Uwaga: Jeżeli płatność nie posiada jakiegokolwiek odniesienia, należy ręcznie dokonać wpisu do dziennika."
@@ -2537,12 +2559,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ustaw jako Rozwinąć
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Automatycznie wysyłać e-maile do kontaktów z transakcji Zgłaszanie.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Wiersz {0}: Taka ilość nie jest dostępna w magazynie {1} w {2} {3}. Dostępna liczba to: {4}, Przenieś: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Pozycja 3
 DocType: Purchase Order,Customer Contact Email,Kontakt z klientem e-mail
 DocType: Sales Team,Contribution (%),Udział (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Obowiązki
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Szablon
 DocType: Sales Person,Sales Person Name,
@@ -2553,20 +2575,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Przed pojednania
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Do {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),
-apps/erpnext/erpnext/stock/doctype/item/item.py +374,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
+apps/erpnext/erpnext/stock/doctype/item/item.py +383,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
 DocType: Item,Default BOM,Domyślny Wykaz Materiałów
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Proszę ponownie wpisz nazwę firmy, aby potwierdzić"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Razem Najlepszy Amt
 DocType: Time Log Batch,Total Hours,
 DocType: Journal Entry,Printing Settings,Ustawienia drukowania
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od Dowodu Dostawy
 DocType: Time Log,From Time,Od czasu
 DocType: Notification Control,Custom Message,Niestandardowa wiadomość
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Konto Kasa lub Bank jest wymagane dla tworzenia zapisów Płatności
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Konto Kasa lub Bank jest wymagane dla tworzenia zapisów Płatności
 DocType: Purchase Invoice,Price List Exchange Rate,
 DocType: Purchase Invoice Item,Rate,Stawka
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,
@@ -2585,9 +2607,10 @@
  konfliktu przez wyznaczenie priorytet. Cena Zasady: {0}"
 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 +580,Issue Material,Wydanie Materiał
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Wydanie Materiał
 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
 DocType: Hub Settings,Access Token,Dostęp Reklamowe
 DocType: Sales Invoice Item,Serial No,Nr seryjny
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Proszę wprowadzić szczegóły dotyczące konserwacji
@@ -2601,10 +2624,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,
 DocType: Product Bundle Item,Product Bundle Item,Pakiet produktów Artykuł
 DocType: Sales Partner,Sales Partner Name,
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maksymalna kwota faktury
 DocType: Purchase Invoice Item,Image View,
 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,
+apps/erpnext/erpnext/stock/doctype/item/item.py +553,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,Od Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Wycena i kwota całkowita
@@ -2612,6 +2637,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Pozycja ta jest Wariant {0} (szablonu). Atrybuty zostaną skopiowane z szablonu, chyba że ""Nie Kopiuj"" jest ustawiony"
 DocType: Account,Purchase User,Zakup użytkownika
 DocType: Notification Control,Customize the Notification,Dostosuj powiadomienie
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Przepływy środków pieniężnych z działalności
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Szablon domyślny Adresu nie może być usunięty
 DocType: Sales Invoice,Shipping Rule,Zasada dostawy
 DocType: Journal Entry,Print Heading,Nagłówek do druku
@@ -2622,7 +2648,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Surowiec
 DocType: Leave Application,Follow via Email,Odpowiedz za pomocą E-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Najpierw wybierz zamieszczenia Data
@@ -2640,6 +2666,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},
 DocType: Journal Entry,Bank Entry,Wpis Banku
 DocType: Authorization Rule,Applicable To (Designation),Stosowne dla (Nominacja)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Dodaj do Koszyka
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupuj według
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Włącz/wyłącz waluty.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Wydatki pocztowe
@@ -2647,30 +2674,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Rozrywka i relaks
 DocType: Purchase Order,The date on which recurring order will be stop,Data powracającym zamówienie zostanie zatrzymać
 DocType: Quality Inspection,Item Serial No,Nr seryjny
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musi być zmniejszona o {1} lub należy zwiększyć tolerancję nadmiaru
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musi być zmniejszona o {1} lub należy zwiększyć tolerancję nadmiaru
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Razem Present
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Godzina
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Odcinkach Element {0} nie może być aktualizowana \
  Zdjęcie Pojednania za pomocą"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Przenieść materiał do dostawcy
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Przenieść materiał do dostawcy
 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,Typ Tropu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Utwórz ofertę
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Nie masz uprawnień do zatwierdzania liście na bloku Daty
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Na wszystkie te przedmioty już została wystawiona faktura
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Na wszystkie te przedmioty już została wystawiona faktura
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Może być zatwierdzone przez {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Warunki zasady dostawy
 DocType: BOM Replace Tool,The new BOM after replacement,
 DocType: Features Setup,Point of Sale,Punkt Sprzedaży (POS)
 DocType: Account,Tax,Podatek
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Wiersz {0}: {1} nie jest ważne {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle produktu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Od Bundle produktu
 DocType: Production Planning Tool,Production Planning Tool,Narzędzie do planowania produkcji
 DocType: Quality Inspection,Report Date,Data raportu
 DocType: C-Form,Invoices,Faktury
 DocType: Job Opening,Job Title,Tytuł Pracy
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} - Odbiorcy
 DocType: Features Setup,Item Groups in Details,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Rozpocznij sesję POS
@@ -2678,8 +2704,9 @@
 DocType: Stock Entry,Update Rate and Availability,Aktualizacja Cena 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.,
 DocType: Pricing Rule,Customer Group,Grupa Klientów
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Konto wydatków jest obowiązkowe dla przedmiotu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Konto wydatków jest obowiązkowe dla przedmiotu {0}
 DocType: Item,Website Description,Opis strony WWW
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Zmiana netto w kapitale własnym
 DocType: Serial No,AMC Expiry Date,
 ,Sales Register,
 DocType: Quotation,Quotation Lost Reason,Utracony Powód Wyceny
@@ -2687,12 +2714,12 @@
 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 +108,Summary for this month and pending activities,Podsumowanie dla tego miesiąca i działań toczących
 DocType: Customer Group,Customer Group Name,Nazwa Grupy Klientów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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,
 DocType: GL Entry,Against Voucher Type,Rodzaj dowodu
 DocType: Item,Attributes,Atrybuty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Pobierz produkty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Proszę zdefiniować konto odpisów (strat)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Pobierz produkty
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Proszę zdefiniować konto odpisów (strat)
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Data Ostatniego Zamówienia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} nie należy do firmy {1}
@@ -2708,7 +2735,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,
 DocType: Project,Expected End Date,Spodziewana data końcowa
 DocType: Appraisal Template,Appraisal Template Title,Tytuł szablonu oceny
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Komercyjny
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Komercyjny
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Dominująca pozycja {0} nie może być pozycja Zdjęcie
 DocType: Cost Center,Distribution Id,ID Dystrybucji
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,
@@ -2721,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Wartość atrybutu {0} musi mieścić się w zakresie {1} do {2} w przyrostach {3}
 DocType: Tax Rule,Sales,Sprzedaż
 DocType: Stock Entry Detail,Basic Amount,Kwota podstawowa
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
 DocType: Leave Allocation,Unused leaves,Niewykorzystane urlopy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Kr
 DocType: Customer,Default Receivable Accounts,Domyślne konta należności
@@ -2733,16 +2760,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0
 DocType: Journal Entry,Pay To / Recd From,
 DocType: Naming Series,Setup Series,
+DocType: Payment Reconciliation,To Invoice Date,Aby Data faktury
 DocType: Supplier,Contact HTML,HTML kontaktu
 DocType: Landed Cost Voucher,Purchase Receipts,Potwierdzenia Zakupu
-DocType: Payment Reconciliation,Maximum Amount,Maksymalna kwota
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Jak reguła jest stosowana Wycena?
 DocType: Quality Inspection,Delivery Note No,Nr dowodu dostawy
 DocType: Company,Retail,
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Klient {0} nie istnieje
 DocType: Attendance,Absent,Nieobecny
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Pakiet produktów
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Wiersz {0}: Nieprawidłowy odniesienia {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Pakiet produktów
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Wiersz {0}: Nieprawidłowy odniesienia {1}
 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: GL Entry,Remarks,Uwagi
@@ -2769,7 +2796,7 @@
 ,Monthly Attendance Sheet,
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nie znaleziono wyników
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: MPK jest obowiązkowe dla pozycji {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Elementy z Bundle produktu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Elementy z Bundle produktu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} jest nieaktywne
 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,
@@ -2778,8 +2805,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Konto typu 'Zyski i Straty' ({0}) nie może być wpisem otwierającym rok
 DocType: Features Setup,Sales Discounts,
 DocType: Hub Settings,Seller Country,Sprzedawca Kraj
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publikowanie przedmioty na stronie internetowej
 DocType: Authorization Rule,Authorization Rule,
 DocType: Sales Invoice,Terms and Conditions Details,Szczegóły regulaminu
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Podatki od sprzedaży i opłaty Szablon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Numer zlecenia
@@ -2801,7 +2830,7 @@
 DocType: Time Log,Billing Amount,Kwota Rozliczenia
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Wnioski o rezygnację
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konto z istniejącymi zapisami nie może być usunięte
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Konto z istniejącymi zapisami nie może być usunięte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Wydatki na obsługę prawną
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Dzień miesiąca, w którym zamówienie zostanie wygenerowane automatycznie np 05, 28 itd"
 DocType: Sales Invoice,Posting Time,Czas publikacji
@@ -2817,11 +2846,11 @@
 DocType: Maintenance Visit,Breakdown,
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Konto: {0} z waluty: nie można wybrać {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Data czeku
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Konto nadrzędne {1} nie należy do firmy: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Konto nadrzędne {1} nie należy do firmy: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Pomyślnie usunięte wszystkie transakcje związane z tą firmą!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,W sprawie daty
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Domyślny magazyn jest obowiązkowy dla przedmiotu z asortymentu.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Domyślny magazyn jest obowiązkowy dla przedmiotu z asortymentu.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Płatność pensji za miesiąć {0} i rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Cennik stopy wkładka auto, jeśli brakuje"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kwota całkowita Płatny
@@ -2833,6 +2862,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Łączna kwota płatności (przez Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Sprzedajemy ten przedmiot
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ID Dostawcy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Ilość powinna być większa niż 0
 DocType: Journal Entry,Cash Entry,Wpis gotówkowy
 DocType: Sales Partner,Contact Desc,Opis kontaktu
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.",
@@ -2841,7 +2871,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,
 DocType: Buying Settings,Default Supplier Type,Domyślny Typ Dostawcy
 DocType: Production Order,Total Operating Cost,Całkowity koszt operacyjny
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Uwaga: Element {0} wpisano kilka razy
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Uwaga: Element {0} wpisano kilka razy
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Wszystkie kontakty.
 DocType: Newsletter,Test Email Id,
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Nazwa skrótowa firmy
@@ -2866,7 +2896,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Wszystkie grupy klientów
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Szablon podatkowa jest obowiązkowe.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Konto nadrzędne {1} nie istnieje
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Tymczasowy
 DocType: Address,Preferred Billing Address,
@@ -2884,8 +2914,8 @@
 ,Item-wise Price List Rate,
 DocType: Purchase Order Item,Supplier Quotation,
 DocType: Quotation,In Words will be visible once you save the Quotation.,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} jest zatrzymany
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używana dla przedmiotu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} jest zatrzymany
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używana dla przedmiotu {1}
 DocType: Lead,Add to calendar on this date,Dodaj do kalendarza pod tą datą
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,nadchodzące wydarzenia
@@ -2906,24 +2936,24 @@
 DocType: Customer,From Lead,Od Tropu
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Zamówienia puszczone do produkcji.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Wybierz rok finansowy ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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 +455,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
 DocType: Hub Settings,Name Token,Nazwa jest już w użyciu
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Selling,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,
 DocType: Serial No,Out of Warranty,Poza Gwarancją
 DocType: BOM Replace Tool,Replace,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} na fakturę sprzedaży {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Proszę wpisać domyślną jednostkę miary
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} na fakturę sprzedaży {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Proszę wpisać domyślną jednostkę miary
 DocType: Purchase Invoice Item,Project Name,Nazwa projektu
 DocType: Supplier,Mention if non-standard receivable account,"Wspomnieć, jeśli nie standardowe konto należności"
 DocType: Journal Entry Account,If Income or Expense,
 DocType: Features Setup,Item Batch Nos,
 DocType: Stock Ledger Entry,Stock Value Difference,
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Zasoby Ludzkie
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Podatek należny (zwrot)
 DocType: BOM Item,BOM No,Nr zestawienia materiałowego
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,
 DocType: BOM Replace Tool,The BOM which will be replaced,
 DocType: Account,Debit,Debet
@@ -2960,7 +2990,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatkowy koszt
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data końca roku finansowego
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nie można przefiltrować wg Podstawy, jeśli pogrupowano z użyciem Podstawy"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,
 DocType: Quality Inspection,Incoming,
 DocType: BOM,Materials Required (Exploded),
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Zmniejsz wypłatę za Bezpłatny Urlop
@@ -2968,7 +2998,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,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/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Urlop okolicznościowy
 DocType: Batch,Batch ID,Identyfikator Partii
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Uwaga: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Uwaga: {0}
 ,Delivery Note Trends,Trendy Dowodów Dostawy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Podsumowanie W tym tygodniu
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},
@@ -2983,6 +3013,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Średnia. Kupno Cena
 DocType: Task,Actual Time (in Hours),Rzeczywisty czas (w godzinach)
 DocType: Employee,History In Company,Historia Firmy
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Całkowita Wydanie / Transfer ilość {0} w dziale Zapytanie {1} nie może być większa od ilości wnioskowanej dla {2} {3} Item
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Biuletyny
 DocType: Address,Shipping,Dostawa
 DocType: Stock Ledger Entry,Stock Ledger Entry,Zapis w księdze zapasów
@@ -3002,7 +3033,6 @@
 DocType: Purchase Order,End date of current order's period,Data zakończenia okresu bieżącego zlecenia
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Złóż ofertę
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Powrót
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Domyślne jednostki miary dla Variant musi być taki sam jak szablon
 DocType: Production Order Operation,Production Order Operation,Produkcja Zamówienie Praca
 DocType: Pricing Rule,Disable,Wyłącz
 DocType: Project Task,Pending Review,Czekający na rewizję
@@ -3010,7 +3040,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID klienta
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Do czasu musi być większy niż czas From
 DocType: Journal Entry Account,Exchange Rate,Kurs wymiany
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,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 +478,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazyn {0}: Konto nadrzędne {1} nie należy do firmy {2}
 DocType: BOM,Last Purchase Rate,Data Ostatniego Zakupu
 DocType: Account,Asset,Składnik aktywów
@@ -3030,7 +3060,7 @@
 ,Available Stock for Packing Items,
 DocType: Item Variant,Item Variant,Pozycja Wersja
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Ustawienie tego adresu jako domyślnego szablonu, ponieważ nie ma innej domyślnej"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stan konta już Debit, nie możesz ustawić ""waga musi być"" jako ""Kredyty"""
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stan konta już Debit, nie możesz ustawić ""waga musi być"" jako ""Kredyty"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Zarządzanie jakością
 DocType: Production Planning Tool,Filter based on customer,Filtr bazujący na kliencie
 DocType: Payment Tool Detail,Against Voucher No,Dowód nr
@@ -3047,6 +3077,7 @@
 DocType: Opportunity,Next Contact,Następnie Kontakt
 DocType: Employee,Employment Type,Typ zatrudnienia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Środki trwałe
+,Cash Flow,Cash Flow
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Okres aplikacja nie może być w dwóch zapisów alocation
 DocType: Item Group,Default Expense Account,Domyślne konto rozchodów
 DocType: Employee,Notice (days),Wymówienie (dni)
@@ -3078,13 +3109,12 @@
 DocType: Production Order,Warehouses,Magazyny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Materiały biurowe
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Węzeł Grupy
-DocType: Payment Reconciliation,Minimum Amount,Minimalna ilość
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Zaktualizuj Ukończone Dobra
 DocType: Workstation,per hour,na godzinę
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazyn nie może być skasowany tak długo jak długo istnieją zapisy w księdze stanu dla tego magazynu.
 DocType: Company,Distribution,Dystrybucja
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Kwota zapłacona
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Kwota zapłacona
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Wyślij
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksymalna zniżka pozwoliło na pozycji: {0} jest {1}%
@@ -3108,7 +3138,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Brakująca firma w magazynach {0}
 DocType: POS Profile,Terms and Conditions,Regulamin
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Aby Data powinna być w tym roku podatkowym. Zakładając To Date = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Aby Data powinna być w tym roku podatkowym. Zakładając To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",
 DocType: Leave Block List,Applies to Company,Dotyczy Firmy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,
@@ -3122,11 +3152,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Wprowadź dokumenty zakupu
 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 +425,Transaction not allowed against stopped Production Order {0},
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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'",
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Niedobór szt
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
 DocType: Salary Slip,Salary Slip,
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Do daty' jest wymaganym polem
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Utwórz paski na opakowania do dostawy. Używane do informacji o numerze opakowania, zawartości i wadze."
@@ -3215,7 +3245,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Rekordy pracownika.
 DocType: HR Settings,Payroll Settings,Ustawienia Listy Płac
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Łączenie faktur z płatnościami
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Złożyć zamówienie
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Złożyć zamówienie
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Wybierz markę ...
 DocType: Sales Invoice,C-Form Applicable,
@@ -3230,7 +3260,7 @@
 DocType: Appraisal,Start Date,
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Przydziel zwolnienia dla tego okresu.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Kliknij tutaj, aby zweryfikować"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Nie można przypisać siebie jako konta nadrzędnego
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Konto {0}: Nie można przypisać siebie jako konta nadrzędnego
 DocType: Purchase Invoice Item,Price List Rate,Wartość w cenniku
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Zestawienie materiałowe (BOM)
@@ -3239,17 +3269,17 @@
 DocType: Project,Expected Start Date,Spodziewana data startowa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Usuń element, jeśli opłata nie ma zastosowania do tej pozycji"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,np. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Odbierać
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Odbierać
 DocType: Maintenance Visit,Fully Completed,Całkowicie ukończono
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% kompletne
 DocType: Employee,Educational Qualification,Kwalifikacje edukacyjne
 DocType: Workstation,Operating Costs,Koszty operacyjne
 DocType: Employee Leave Approver,Employee Leave Approver,Zgoda na zwolnienie dla pracownika
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} został pomyślnie dodany do naszego newslettera.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.",Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Główny Menadżer Zakupów
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Raporty główne
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,
@@ -3267,7 +3297,7 @@
 DocType: Industry Type,Industry Type,
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Coś poszło nie tak!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Ostrzeżenie: Aplikacja o urlop zawiera następujące zablokowane daty
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data ukończenia
 DocType: Purchase Invoice Item,Amount (Company Currency),Kwota (Waluta firmy)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,
@@ -3286,10 +3316,10 @@
 ,Serial No Service Contract Expiry,
 DocType: Item,Unit of Measure Conversion,Jednostka miary Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Pracownik nie może być zmieniony
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,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
 DocType: Naming Series,Help HTML,
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Zniżki dla nadmiernie {0} przeszedł na pozycję {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Zniżki dla nadmiernie {0} przeszedł na pozycję {1}
 DocType: Address,Name of person or organization that this address belongs to.,Imię odoby lub organizacji do której należy adres.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Twoi Dostawcy
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,
@@ -3302,35 +3332,35 @@
 DocType: Employee,Date of Issue,Data wydania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Wiersz # {0}: Ustaw Dostawca dla pozycji {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Proszę sprawdzić multi opcji walutowych, aby umożliwić rachunki w innych walutach"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,"Proszę sprawdzić multi opcji walutowych, aby umożliwić rachunki w innych walutach"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Pozycja: {0} nie istnieje w systemie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Nie masz uprawnień do ustawienia zamrożenej wartości
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Nie masz uprawnień do ustawienia zamrożenej wartości
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pobierz Wpisy nieuzgodnione
+DocType: Payment Reconciliation,From Invoice Date,Od faktury Data
 DocType: Cost Center,Budgets,Budżety
-DocType: Employee,Emergency Contact Details,Kontakt na wypadek nieszczęśliwych wypadków - szczegóły
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Co to robi?
 DocType: Delivery Note,To Warehouse,Do magazynu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} zostało wprowadzone więcej niż raz dla roku podatkowego {1}
 ,Average Commission Rate,Średnia prowizja
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'Has Serial No' can not be 'Yes' for non-stock item,Numer seryjny nie jest dostępny dla pozycji niemagazynowych
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,
 DocType: Pricing Rule,Pricing Rule Help,Wycena Zasada Pomoc
 DocType: Purchase Taxes and Charges,Account Head,
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Zaktualizuj dodatkowe koszty do obliczenia całkowitego kosztu operacji
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektryczne
 DocType: Stock Entry,Total Value Difference (Out - In),Całkowita Wartość Różnica (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Wiersz {0}: Kurs wymiany jest obowiązkowe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Wiersz {0}: Kurs wymiany jest obowiązkowe
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID Użytkownika nie ustawiony dla Pracownika {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od Reklamacji
 DocType: Stock Entry,Default Source Warehouse,Domyślny magazyn źródłowy
 DocType: Item,Customer Code,Kod Klienta
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Przypomnienie o Urodzinach dla {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dni od ostatniego zamówienia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Obciążenie rachunku musi być kontem Bilans
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,Debit To account must be a Balance Sheet account,Obciążenie rachunku musi być kontem Bilans
 DocType: Buying Settings,Naming Series,Seria nazw
 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,Aktywa obrotowe
@@ -3343,7 +3373,7 @@
 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
 DocType: Authorization Rule,Based On,Bazujący na
 DocType: Sales Order Item,Ordered Qty,Ilość Zamówiona
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Element {0} jest wyłączony
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Element {0} jest wyłączony
 DocType: Stock Settings,Stock Frozen Upto,
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Okres Okres Od i Do dat obowiązkowych dla powtarzających {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Czynność / zadanie projektu
@@ -3351,7 +3381,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Napisz Off Kwota (Spółka Waluta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
 DocType: Landed Cost Voucher,Landed Cost Voucher,Koszt kuponu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ustaw {0}
 DocType: Purchase Invoice,Repeat on Day of Month,
@@ -3381,12 +3411,12 @@
 DocType: Upload Attendance,Upload Attendance,Prześlij Frekwencję
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM i ilości są wymagane Manufacturing
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starzenie Zakres 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Wartość
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Wartość
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,
 ,Sales Analytics,Analityka sprzedaży
 DocType: Manufacturing Settings,Manufacturing Settings,Ustawienia produkcyjne
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Konfiguracja e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Proszę dodać domyślną walutę w Głównych Ustawieniach Firmy
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Codzienne Przypomnienia
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Konflikty przepisu podatkowego z {0}
@@ -3412,13 +3442,13 @@
 DocType: Sales Order Item,Produced Quantity,Wyprodukowana ilość
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inżynier
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Zespoły Szukaj Sub
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},
 DocType: Sales Partner,Partner Type,Typ Partnera
 DocType: Purchase Taxes and Charges,Actual,Właściwy
 DocType: Authorization Rule,Customerwise Discount,Zniżka dla klienta
 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 +263,Installation Note {0} has already been submitted,
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,
 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
@@ -3430,15 +3460,15 @@
 DocType: Employee,Applicable Holiday List,Stosowna Lista Urlopów
 DocType: Employee,Cheque,Czek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Typ raportu jest wymagany
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Typ raportu jest wymagany
 DocType: Item,Serial Number Series,
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazyn jest obowiązkowy dla Przedmiotu {0} w rzędzie {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,
 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/public/js/setup_wizard.js +101,The First User: You,Pierwszy użytkownik: to Ty!
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Pomyślnie uzgodnione
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Pomyślnie uzgodnione
 DocType: Production Order,Planned End Date,Planowana data zakończenia
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Gdzie produkty są przechowywane.
 DocType: Tax Rule,Validity,Ważność
@@ -3446,7 +3476,7 @@
 DocType: Attendance,Attendance,
 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.",
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Delegowanie datę i czas delegowania jest obowiązkowe
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Delegowanie datę i czas delegowania jest obowiązkowe
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,
 ,Item Prices,Ceny
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,
@@ -3455,15 +3485,15 @@
 DocType: Task,Review Date,
 DocType: Purchase Invoice,Advance Payments,Zaliczki
 DocType: Purchase Taxes and Charges,On Net Total,Na podstawie Kwoty Netto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Brak uprawnień do korzystania z narzędzi płatności
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,Adres e-mail dla 'Powiadomień' nie został podany dla powracających %s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Konto kwot zaokrągleń
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Wydatki na podstawową działalność
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Konsulting
 DocType: Customer Group,Parent Customer Group,Nadrzędna Grupa Klientów
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Reszta
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Reszta
 DocType: Purchase Invoice,Contact Email,E-mail kontaktu
 DocType: Appraisal Goal,Score Earned,
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","np. ""Moja Firma LLC"""
@@ -3473,13 +3503,13 @@
 DocType: Packing Slip,Gross Weight UOM,
 DocType: Email Digest,Receivables / Payables,Należności / Zobowiązania
 DocType: Delivery Note Item,Against Sales Invoice,Na podstawie faktury sprzedaży
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Konto kredytowe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Konto kredytowe
 DocType: Landed Cost Item,Landed Cost Item,Koszt Przedmiotu
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Pokaż wartości zerowe
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Ilość produktu otrzymanego po produkcji / przepakowaniu z podanych ilości surowców
 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 +562,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
 DocType: Item,Default Warehouse,Domyślny magazyn
 DocType: Task,Actual End Date (via Time Logs),Rzeczywista Data zakończenia (przez Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budżet nie może być przypisany do rachunku grupy {0}
@@ -3515,29 +3545,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zaplanuj dzienniki poza godzinami Workstation Pracy.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} zostało już dodane
 ,Items To Be Requested,
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Uzyskaj stawkę z ostatniego zakupu
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Kursy rozliczeniowe na podstawie rodzajów działalności (za godzinę)
 DocType: Company,Company Info,Informacje o firmie
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Email ID Firmy nie został znaleziony, w wyniku czego e-mail nie został wysłany"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aktywa
 DocType: Production Planning Tool,Filter based on item,Filtr bazujący na Przedmiocie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Konto debetowe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Konto debetowe
 DocType: Fiscal Year,Year Start Date,Data początku roku
 DocType: Attendance,Employee Name,Nazwisko pracownika
 DocType: Sales Invoice,Rounded Total (Company Currency),Końcowa zaokrąglona kwota (waluta firmy)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Nie można konwertowanie do grupy, ponieważ jest wybrany rodzaj konta."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Nie można konwertowanie do grupy, ponieważ jest wybrany rodzaj konta."
 DocType: Purchase Common,Purchase Common,
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} został zmodyfikowany. Proszę odświeżyć.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Od Szansy
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Świadczenia pracownicze
 DocType: Sales Invoice,Is POS,
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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,
 DocType: Purchase Receipt Item,Accepted Quantity,Przyjęta Ilość
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nie istnieje
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Rachunki dla klientów.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonentów dodano
 DocType: Maintenance Schedule,Schedule,Harmonogram
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definiowanie budżetu tego centrum kosztów. Aby ustawić działania budżetu, patrz &quot;Lista Spółka&quot;"
@@ -3545,7 +3576,7 @@
 DocType: Quality Inspection Reading,Reading 3,Odczyt 3
 ,Hub,Piasta
 DocType: GL Entry,Voucher Type,Typ Podstawy
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
 DocType: Expense Claim,Approved,Zatwierdzono
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',pracownik zwalnia się na {0} musi być ustawiony jako 'opuścił'
@@ -3559,7 +3590,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Dziennik zapisów księgowych.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostępne szt co z magazynu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Proszę wybrać pierwszego pracownika
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Wiersz {0}: Party / konto nie jest zgodny z {1} / {2} w {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Wiersz {0}: Party / konto nie jest zgodny z {1} / {2} w {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Aby utworzyć konto podatkowe
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Wprowadź konto Wydatków
 DocType: Account,Stock,Asortyment
@@ -3570,7 +3601,7 @@
 DocType: Employee,Contract End Date,Data końcowa kontraktu
 DocType: Sales Order,Track this Sales Order against any Project,
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Od Wyceny Kupna
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Od Wyceny Kupna
 DocType: Deduction Type,Deduction Type,Typ odliczenia
 DocType: Attendance,Half Day,Pół Dnia
 DocType: Pricing Rule,Min Qty,Min. ilość
@@ -3578,7 +3609,7 @@
 DocType: GL Entry,Transaction Date,Data transakcji
 DocType: Production Plan Item,Planned Qty,Planowana ilość
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Razem podatkowa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Do Ilość (Wyprodukowano kopie) są obowiązkowe
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Do Ilość (Wyprodukowano kopie) są obowiązkowe
 DocType: Stock Entry,Default Target Warehouse,Domyślny magazyn docelowy
 DocType: Purchase Invoice,Net Total (Company Currency),Łączna wartość netto (waluta firmy)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Wiersz {0}: Typ i Partia Partia ma zastosowanie tylko w stosunku do otrzymania / rachunku Płatne
@@ -3632,9 +3663,9 @@
 DocType: Customer,Commission Rate,Wartość prowizji
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Bądź Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Koszyk jest pusty
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Koszyk jest pusty
 DocType: Production Order,Actual Operating Cost,Rzeczywisty koszt operacyjny
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,
 DocType: Manufacturing Settings,Allow Production on Holidays,Pozwól Produkcja na święta
 DocType: Sales Order,Customer's Purchase Order Date,Data Zamówienia Zakupu Klienta
@@ -3645,11 +3676,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Projektant
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Szablony warunków i regulaminów
 DocType: Serial No,Delivery Details,Szczegóły dostawy
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatyczne tworzenie Materiał wniosku, jeżeli ilość spada poniżej tego poziomu"
 ,Item-wise Purchase Register,
 DocType: Batch,Expiry Date,Data ważności
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Aby ustawić poziom zmienić kolejność, element musi być pozycja nabycia lub przedmiotu"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Aby ustawić poziom zmienić kolejność, element musi być pozycja nabycia lub przedmiotu"
 ,Supplier Addresses and Contacts,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Proszę najpierw wybrać kategorię
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Dyrektor projektu
@@ -3657,7 +3688,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Pół dnia)
 DocType: Supplier,Credit Days,
 DocType: Leave Type,Is Carry Forward,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Weź produkty z zestawienia materiałowego
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Zestawienie materiałów
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Wiersz {0}: Typ i Partia Partia jest wymagane w przypadku otrzymania / rachunku Płatne {1}
@@ -3665,7 +3696,7 @@
 DocType: Employee,Reason for Leaving,Powód odejścia
 DocType: Expense Claim Detail,Sanctioned Amount,
 DocType: GL Entry,Is Opening,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Wiersz {0}: Debit wpis nie może być związana z {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konto {0} nie istnieje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Wiersz {0}: Debit wpis nie może być związana z {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Konto {0} nie istnieje
 DocType: Account,Cash,Gotówka
 DocType: Employee,Short biography for website and other publications.,
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index a532827..1db914e 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produtos para o Consumidor
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, selecione Partido Tipo primeiro"
 DocType: Item,Customer Items,Itens de clientes
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Conta {0}: A Conta Pai {1} não pode ser um livro-razão
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Conta {0}: A Conta Pai {1} não pode ser um livro-razão
 DocType: Item,Publish Item to hub.erpnext.com,Publicar Item para hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Notificações de e-mail
 DocType: Item,Default Unit of Measure,Unidade de medida padrão
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},É necessário informar a Moeda na Lista de Preço {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado na transação.
 DocType: Purchase Order,Customer Contact,Contato do cliente
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Do Pedido de materiais
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Do Pedido de materiais
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árvore
 DocType: Job Applicant,Job Applicant,Candidato a emprego
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Não há mais resultados.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Para manter o código de item do cliente e para torná-los pesquisáveis com base em seu código use esta opção
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mostrar Variantes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Quantidade
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Quantidade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Empréstimos ( Passivo)
 DocType: Employee Education,Year of Passing,Ano de passagem
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Em Estoque
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Atenção à Saúde
 DocType: Purchase Invoice,Monthly,Mensal
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Atraso no pagamento (Dias)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Endereço De Email
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Ano Fiscal {0} é necessária
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defesa
 DocType: Company,Abbr,Abrev
 DocType: Appraisal Goal,Score (0-5),Pontuação (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} não corresponde com {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} não corresponde com {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,No veículo
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, selecione Lista de Preço"
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,"Por favor, selecione Lista de Preço"
 DocType: Production Order Operation,Work In Progress,Trabalho em andamento
 DocType: Employee,Holiday List,Lista de feriado
 DocType: Time Log,Time Log,Tempo Log
@@ -99,13 +99,13 @@
 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: Employee,Married,Casado
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Não permitido para {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
 DocType: Payment Reconciliation,Reconcile,conciliar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,mercearia
 DocType: Quality Inspection Reading,Reading 1,Leitura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Realizar Lançamento Bancário
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundos de Pensão
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Armazém é obrigatória se o tipo de conta é Armazém
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Armazém é obrigatória se o tipo de conta é Armazém
 DocType: SMS Center,All Sales Person,Todos os Vendedores
 DocType: Lead,Person Name,Nome Pessoa
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Verifique se a ordem recorrentes, desmarque a opção de parar recorrentes ou colocar adequada Data de Término"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Interessado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiais
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Abertura
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},A partir de {0} a {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},A partir de {0} a {1}
 DocType: Item,Copy From Item Group,Copiar do item do grupo
 DocType: Journal Entry,Opening Entry,Abertura Entry
 DocType: Stock Entry,Additional Costs,Custos adicionais
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Contas com a transações existentes não pode ser convertidas em um grupo.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Contas com a transações existentes não pode ser convertidas em um grupo.
 DocType: Lead,Product Enquiry,Consulta de Produto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Por favor insira primeira empresa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Por favor, selecione Empresa primeiro"
 DocType: Employee Education,Under Graduate,Em Graduação
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Alvo Em
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Alvo Em
 DocType: BOM,Total Cost,Custo Total
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Log de Atividade:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
@@ -165,7 +165,7 @@
 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","Baixe o Template, preencha os dados apropriados e anexe o arquivo modificado.
  Todas as datas, os empregados e suas combinações para o período selecionado viram com o modelo, incluindo os registros já existentes."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,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/stock/doctype/stock_entry/stock_entry.py +447,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
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Será atualizado após a fatura de vendas ser Submetida.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Configurações para o Módulo de RH
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Os detalhes das operações realizadas.
 DocType: Serial No,Maintenance Status,Estado da manutenção
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Itens e Preços
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de data deve estar dentro do ano fiscal. Assumindo De Date = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de data deve estar dentro do ano fiscal. Assumindo De Date = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Selecione o funcionário para quem você está criando a Avaliação.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centro de Custo {0} não pertence a Empresa {1}
 DocType: Customer,Individual,Pessoa Física
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 de produção em andamento
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Caixa Líquido de Financiamento
 DocType: Lead,Address & Contact,Endereço e Contato
 DocType: Leave Allocation,Add unused leaves from previous allocations,Acrescente as licenças não utilizadas de atribuições anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Nome do Contato
 DocType: Production Plan Item,SO Pending Qty,Qtde. pendente na OV
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria folha de pagamento para os critérios mencionados acima.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Sem descrição dada
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pedido de Compra.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Aliviar A data deve ser maior que Data de Juntando
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,Especificação do Site do Item
 DocType: Payment Tool,Reference No,Número de referência
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Licenças Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Da Reconciliação item
 DocType: Stock Entry,Sales Invoice No,Nº da Nota Fiscal de Venda
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Tipo de Fornecedor
 DocType: Item,Publish in Hub,Publicar em Hub
 ,Terretory,terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Item {0} é cancelada
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Pedido de material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data Liquidação
 DocType: Item,Purchase Details,Detalhes da compra
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} não encontrado em &#39;matérias-primas fornecidas &quot;na tabela Ordem de Compra {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} não encontrado em &#39;matérias-primas fornecidas &quot;na tabela Ordem de Compra {1}
 DocType: Employee,Relation,Relação
 DocType: Shipping Rule,Worldwide Shipping,Envio Internacional
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Pedidos confirmados de clientes.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Sugestões
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Definir orçamentos para Grupos de Itens neste território. Você também pode incluir a sazonalidade, defininda na Distribuição."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Digite grupo conta pai para armazém {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagamento contra {0} {1} não pode ser maior do que Outstanding Montante {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagamento contra {0} {1} não pode ser maior do que Outstanding Montante {2}
 DocType: Supplier,Address HTML,Endereço HTML
 DocType: Lead,Mobile No.,Telefone Celular.
 DocType: Maintenance Schedule,Generate Schedule,Gerar Agenda
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Latest
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caracteres
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,O primeiro Deixe Approver na lista vai ser definido como o Leave Approver padrão
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Aprender
 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 para contas
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Gerenciar vendedores
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Multi Moeda
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Fatura
 DocType: Sales Invoice Item,Delivery Note,Guia de Remessa
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configurando Impostos
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configurando Impostos
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumo para esta semana e atividades pendentes
 DocType: Workstation,Rent Cost,Rent Custo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecione mês e ano
@@ -307,18 +310,18 @@
 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: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponível em LDM, Nota de Entrega, Fatura de Compra, Ordem de Produção, Ordem de Compra, Recibo de compra, Nota Fiscal de Venda, Ordem de Venda, Entrada no Estoque, Quadro de Horários"
 DocType: Item Tax,Tax Rate,Taxa de Imposto
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} já  está alocado para o Empregado {1} para {2} período para {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Selecionar item
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} já  está alocado para o Empregado {1} para o período {2} até {3}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Selecionar item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} gerido por lotes, não pode ser conciliada com \
  da Reconciliação, em vez usar da Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lote n deve ser o mesmo que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converter para não-Grupo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Recibo de compra devem ser apresentados
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lote de um item.
 DocType: C-Form Invoice Detail,Invoice Date,Data da nota fiscal
-DocType: GL Entry,Debit Amount,Débito Montante
+DocType: GL Entry,Debit Amount,Total do Débito
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Seu endereço de email
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,"Por favor, veja anexo"
@@ -348,11 +351,12 @@
 ,Purchase Register,Compra Registre
 DocType: Landed Cost Item,Applicable Charges,Encargos aplicáveis
 DocType: Workstation,Consumable Cost,Custo dos consumíveis
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter papel 'Aprovador de Licenças'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter a função 'Aprovador de Licenças'
 DocType: Purchase Receipt,Vehicle Date,Veículo Data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicamentos
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motivo para perder
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation é fechado nas seguintes datas, conforme lista do feriado: {0}"
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunidades
 DocType: Employee,Single,Único
 DocType: Issue,Attachment,Anexos
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Orçamento não pode ser definido para o grupo de centro de custo
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,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 +563,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. ,Registro de empregado é criado usando o campo selecionado.
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Mestre férias .
 DocType: Material Request Item,Required Date,Data Obrigatória
 DocType: Delivery Note,Billing Address,Endereço de Cobrança
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Por favor, insira o Código Item."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Por favor, insira o Código Item."
 DocType: BOM,Costing,Custeio
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se marcado, o valor do imposto será considerado como já incluído na Impressão de Taxa / Impressão do Valor"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Qtde
@@ -421,12 +425,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazém para que Pedido de materiais serão levantados"
 DocType: Production Order,Additional Operating Cost,Custo Operacional Adicional
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
 DocType: Shipping Rule,Net Weight,Peso Líquido
 DocType: Employee,Emergency Phone,Telefone de emergência
 ,Serial No Warranty Expiry,Vencimento da Garantia com Nº de Série
 DocType: Sales Order,To Deliver,Entregar
-DocType: Purchase Invoice Item,Item,item
+DocType: Purchase Invoice Item,Item,Item
 DocType: Journal Entry,Difference (Dr - Cr),Diferença ( Dr - Cr)
 DocType: Account,Profit and Loss,Lucros e perdas
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Gerenciando Subcontratação
@@ -440,15 +444,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Incremento não pode ser 0
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Excluir Transações Companhia
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Item {0} não é comprar item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Item {0} não é comprar item
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} é um endereço de e-mail inválido em 'Endereço de Email de Notificação'
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Faturamento total este ano:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adicionar / Editar Impostos e Encargos
 DocType: Purchase Invoice,Supplier Invoice No,Fornecedor factura n
 DocType: Territory,For reference,Para referência
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível excluir Serial No {0}, como ele é usado em transações de ações"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Fechamento (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Fechamento (Cr)
 DocType: Serial No,Warranty Period (Days),Período de Garantia (Dias)
 DocType: Installation Note Item,Installation Note Item,Item da Nota de Instalação
 ,Pending Qty,Pendente Qtde
@@ -463,7 +466,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","A **Distribuição Mensal** ajuda a ratear o seu orçamento através dos meses, se você possui sazonalidade em seu negócio. Para ratear um orçamento usando esta distribuição, defina a**Distribuição Mensal** no **Centro de Custo**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, selecione Companhia e Festa Tipo primeiro"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Exercício / contabilidade.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Desculpe, os números de ordem não podem ser mescladas"
@@ -471,9 +474,9 @@
 DocType: Project Task,Project Task,Tarefa do Projeto
 ,Lead Id,Cliente em Potencial ID
 DocType: C-Form Invoice Detail,Grand Total,Total Geral
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
 DocType: Warranty Claim,Resolution,Resolução
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Entregue: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Entregue: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Conta a Pagar
 DocType: Sales Order,Billing and Delivery Status,Faturamento e Entrega Estado
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita os clientes
@@ -488,7 +491,7 @@
 DocType: Quotation,Quotation To,Cotação para
 DocType: Lead,Middle Income,Rendimento Médio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Abertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 outro UOM. Você precisará criar um novo item para usar um UOM padrão diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +711,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 outro UOM. Você precisará criar um novo item para usar um UOM padrão diferente.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Montante alocado não pode ser negativo
 DocType: Purchase Order Item,Billed Amt,Valor Faturado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um Depósito lógico contra o qual as entradas de estoque são feitas.
@@ -497,7 +500,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordem de produção é obrigatória
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Proposta Redação
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Outro Vendas Pessoa {0} existe com o mesmo ID de Employee
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Banco de Erro ( {6} ) para item {0} no Armazém {1} em {2} {3} em {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Banco de Erro ( {6} ) para item {0} no Armazém {1} em {2} {3} em {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal Empresa
 DocType: Packing Slip Item,DN Detail,Detalhe DN
 DocType: Time Log,Billed,Faturado
@@ -516,16 +519,17 @@
 DocType: Activity Type,Default Costing Rate,Preço de Custo Padrão
 DocType: Maintenance Schedule,Maintenance Schedule,Programação da Manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Então Preços Regras são filtradas com base no Cliente, Grupo de Clientes, Território, fornecedor, fornecedor Tipo, Campanha, Parceiro de vendas etc"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Mudança na Net Inventory
 DocType: Employee,Passport Number,Número do Passaporte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,De Recibo de compra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,De Recibo de compra
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
 DocType: SMS Settings,Receiver Parameter,Parâmetro do recebedor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseado em' e ' Agrupar por' não podem ser o mesmo
 DocType: Sales Person,Sales Person Targets,Metas do Vendedor
 DocType: Production Order Operation,In minutes,Em questão de minutos
 DocType: Issue,Resolution Date,Data da Resolução
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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,Cliente de nomeação
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Converter em Grupo
 DocType: Activity Cost,Activity Type,Tipo da Atividade
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Projetos de Usuário
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela Detalhes da Nota Fiscal
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela Detalhes da Nota Fiscal
 DocType: Company,Round Off Cost Center,Termine Centro de Custo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
 DocType: Material Request,Material Transfer,Transferência de material
@@ -558,13 +562,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para acompanhar o item em documentos de vendas e de compras com base em seus números de série. Isso também pode ser usado para rastrear detalhes sobre a garantia do produto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoque Atual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Armazém Rejeitado é obrigatória na rubrica regected
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Faturamento total este ano
 DocType: Account,Expenses Included In Valuation,Despesas incluídos na avaliação
 DocType: Employee,Provide email id registered in company,Fornecer Endereço de E-mail registrado na empresa
 DocType: Hub Settings,Seller City,Cidade do Vendedor
 DocType: Email Digest,Next email will be sent on:,Próximo e-mail será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Termos da Carta de Oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de árvore
@@ -582,18 +586,18 @@
 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 próxima fatura será gerada. Ele é gerado em 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 +92,{0} is not a stock Item,{0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} não é um item de estoque
 DocType: Mode of Payment Account,Default Account,Conta Padrão
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,Por favor seleccione dia de folga semanal
 DocType: Production Order Operation,Planned End Time,Planned End Time
 ,Sales Person Target Variance Item Group-Wise,Vendas Pessoa Alvo Variance item Group-wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Contas com transações existentes não pode ser convertidas em livro-razão
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Contas com transações existentes não pode ser convertidas em livro-razão
 DocType: Delivery Note,Customer's Purchase Order No,Ordem de Compra do Cliente Não
 DocType: Employee,Cell Number,Telefone Celular
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Pedidos de Materiais Auto Gerado
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perdido
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Você não pode lançar o comprovante atual na coluna 'Contra Entrada do Livro Diário'
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Você não pode lançar o comprovante atual na coluna 'Contra Entrada do Livro Diário'
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,Oportunidade De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Declaração salarial mensal.
@@ -602,9 +606,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Lançamentos contábeis podem ser feitas contra nós folha. Entradas contra grupos não são permitidos.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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: Opportunity,Maintenance,Manutenção
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Número Recibo de compra necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Número Recibo de compra necessário para item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atributo Valor
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campanhas de vendas .
 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.
@@ -662,7 +666,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Lista de Preço não selecionado
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Process Payroll,Send Email,Enviar Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nenhuma permissão
 DocType: Company,Default Bank Account,Conta Bancária Padrão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar baseado em Festa, selecione Partido Escreva primeiro"
@@ -670,8 +674,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Os itens com maior weightage será mostrado maior
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalhe da Reconciliação Bancária
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Minhas Faturas
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nenhum funcionário encontrado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Minhas Faturas
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nenhum colaborador encontrado
 DocType: Purchase Order,Stopped,Parado
 DocType: Item,If subcontracted to a vendor,Se subcontratada a um fornecedor
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Selecione BOM para começar
@@ -680,6 +684,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar agora
 ,Support Analytics,Análise de Pós-Vendas
 DocType: Item,Website Warehouse,Armazém do Site
+DocType: Payment Reconciliation,Minimum Invoice Amount,Montante Mínimo de Fatura
 DocType: Sales 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 +169,C-Form records,Registros C -Form
@@ -689,7 +694,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Para ativar &quot;Point of Sale&quot; recursos
 DocType: Bin,Moving Average Rate,Taxa da Média Móvel
 DocType: Production Planning Tool,Select Items,Selecione itens
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data {2}
 DocType: Maintenance Visit,Completion Status,Estado de Conclusão
 DocType: Sales Invoice Item,Target Warehouse,Almoxarifado de destino
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir sobre a entrega ou recebimento até esta cento
@@ -701,7 +706,7 @@
 apps/erpnext/erpnext/config/setup.py +94,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
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},O status {0} {1} é {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordem de Compra para pagamento
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ordem de Compra para pagamento
 DocType: Sales Order Item,Projected Qty,Qtde. Projetada
 DocType: Sales Invoice,Payment Due Date,Data de Vencimento
 DocType: Newsletter,Newsletter Manager,Boletim Gerente
@@ -725,7 +730,7 @@
 DocType: Sales Invoice Item,Stock Details,Detalhes da
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor do Projeto
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Ponto de venda
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","O saldo já  está em crédito, você não tem a permissão para definir 'saldo deve ser' como 'débito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","O saldo já  está em crédito, você não tem a permissão para definir 'saldo deve ser' como 'débito'"
 DocType: Account,Balance must be,O Saldo deve ser
 DocType: Hub Settings,Publish Pricing,Publicar Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Mensagem de recusa do Pedido de Reembolso de Despesas
@@ -748,7 +753,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Taxa de Câmbio Mestre
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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 +421,BOM {0} must be active,BOM {0} deve ser ativo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} deve ser ativo
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Por favor, selecione o tipo de documento primeiro"
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Valor das Licenças cobradas
@@ -766,17 +771,17 @@
 DocType: Supplier,Default Payable Accounts,Contas a Pagar Padrão
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empregado {0} não está ativo ou não existe
 DocType: Features Setup,Item Barcode,Código de barras do Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Variantes item {0} atualizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Variantes item {0} atualizado
 DocType: Quality Inspection Reading,Reading 6,Leitura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Antecipação da Nota Fiscal de Compra
 DocType: Address,Shop,Loja
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrada de crédito não pode ser ligado com uma {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrada de crédito não pode ser ligado com uma {1}
 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.
 DocType: Employee,Permanent Address Is,Endereço permanente é
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operação concluída por quantos produtos acabados?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,A Marca
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Provisão para over-{0} cruzou para item {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Provisão para over-{0} cruzou para item {1}.
 DocType: Employee,Exit Interview Details,Detalhes da Entrevista de saída
 DocType: Item,Is Purchase Item,É item de compra
 DocType: Journal Entry Account,Purchase Invoice,Nota Fiscal de Compra
@@ -788,7 +793,7 @@
 DocType: Salary Slip,Total in words,Total por extenso
 DocType: Material Request Item,Lead Time Date,Prazo de entrega
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Favor especificar Sem Serial para item {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Favor especificar Sem Serial para item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Para os itens &#39;pacote de produtos &quot;, Armazém, Serial e não há Batch Não será considerada a partir do&#39; Packing List &#39;tabela. Se Warehouse e Batch Não são as mesmas para todos os itens de embalagem para qualquer item de &#39;Bundle Produto&#39;, esses valores podem ser inseridos na tabela do item principal, os valores serão copiados para &#39;Packing List&#39; tabela."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Os embarques para os clientes.
 DocType: Purchase Invoice Item,Purchase Order Item,Item da Ordem de Compra
@@ -797,14 +802,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variação
 ,Company Name,Nome da Empresa
 DocType: SMS Center,Total Message(s),Mensagem total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Selecionar item para Transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 a Conta do banco onde o cheque foi depositado.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir ao usuário editar Taxa da Lista de Preços em transações
 DocType: Pricing Rule,Max Qty,Max Qtde
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: O pagamento contra Vendas / Ordem de Compra deve ser sempre marcado como antecedência
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,químico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
 DocType: Process Payroll,Select Payroll Year and Month,Selecione Payroll ano e mês
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Vá para o grupo apropriado (geralmente Aplicação de Fundos&gt; Ativo Circulante&gt; Contas Bancárias e criar uma nova conta (clicando em Adicionar filho) do tipo &quot;Banco&quot;
 DocType: Workstation,Electricity Cost,Custo de Energia Elétrica
@@ -818,10 +824,10 @@
 DocType: SMS Center,All Lead (Open),Todos os Clientes em Potencial em Aberto
 DocType: Purchase Invoice,Get Advances Paid,Obter adiantamentos pagos
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Anexe sua imagem
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Fazer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Fazer
 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 +3,My Cart,Meu carrinho
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Meu carrinho
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Qtde abertura
@@ -839,11 +845,11 @@
 DocType: Packing Slip Item,Packing Slip Item,Item da Guia de Remessa
 DocType: POS Profile,Cash/Bank Account,Conta do Caixa/Banco
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
-DocType: Delivery Note,Delivery To,Entregar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Tabela de atributo é obrigatório
+DocType: Delivery Note,Delivery To,Entregar para
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,A tabela de atributos é obrigatório
 DocType: Production Planning Tool,Get Sales Orders,Obter Ordens de Venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} não pode ser negativo
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Desconto
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Desconto
 DocType: Features Setup,Purchase Discounts,Descontos da compra
 DocType: Workstation,Wages,Salário
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Será atualizado apenas se Tempo Log é &quot;Billable&quot;
@@ -868,7 +874,7 @@
 DocType: Tax Rule,Shipping State,Estado Envio
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"O artigo deve ser adicionado usando ""Obter itens de recibos de compra 'botão"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Despesas com Vendas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Compra padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Compra padrão
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Venda Padrão Centro de Custo
 DocType: Sales Partner,Implementation Partner,Parceiro de implementação
@@ -892,14 +898,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +344,List a few of your suppliers. They could be organizations or individuals.,Lista de alguns de seus fornecedores. Eles podem ser empresas ou pessoas físicas.
 DocType: Company,Default Currency,Moeda padrão
 DocType: Contact,Enter designation of this Contact,Digite a designação deste contato
-DocType: Expense Claim,From Employee,De Empregado
+DocType: Expense Claim,From Employee,Do colaborador
 apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento desde montante para item {0} em {1} é zero
 DocType: Journal Entry,Make Difference Entry,Criar diferença de lançamento
 DocType: Upload Attendance,Attendance From Date,Data Inicial de Comparecimento
 DocType: Appraisal Template Goal,Key Performance Area,Área Chave de Performance
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,transporte
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,e ano:
-DocType: Email Digest,Annual Expense,Despesa anual
+DocType: Email Digest,Annual Expense,Despesa Anual
 DocType: SMS Center,Total Characters,Total de Personagens
 apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Por favor, selecione no campo BOM BOM por item {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detalhe Fatura do Formulário-C
@@ -910,6 +916,7 @@
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrinho Rule Envio
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
 ,Ordered Items To Be Billed,Itens encomendados a serem faturados
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gama tem de ser inferior à gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecione Time Logs e enviar para criar uma nova factura de venda.
@@ -919,13 +926,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Este lote Log O tempo tem sido anunciado.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Criar Oportunidade
 DocType: Salary Slip,Leave Without Pay,Licença Não Remunerada
-DocType: Supplier,Communications,Comunicações
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacidade de erro Planejamento
 ,Trial Balance for Party,Balancete para o partido
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Ganhos
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Acabou item {0} deve ser digitado para a entrada Tipo de Fabricação
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Saldo de Contabilidade
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Acabou item {0} deve ser digitado para a entrada Tipo de Fabricação
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Saldo de Contabilidade
 DocType: Sales Invoice Advance,Sales Invoice Advance,Antecipação da Nota Fiscal de Venda
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nada de pedir
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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'
@@ -967,7 +973,7 @@
 DocType: Global Defaults,Current Fiscal Year,Ano Fiscal Atual
 DocType: Global Defaults,Disable Rounded Total,Desativar total arredondado
 DocType: Lead,Call,Chamar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Entradas' não pode estar vazio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'Entradas' não pode estar vazio
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Linha duplicada {0} com o mesmo {1}
 ,Trial Balance,Balancete
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configurando Empregados
@@ -979,9 +985,9 @@
 DocType: Contact,User ID,ID de Usuário
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ver Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais antigas
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Fabricação contra a Ordem de Venda
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resto do mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
 DocType: Salary Slip,Gross Pay,Salário bruto
@@ -1011,7 +1017,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obter faturas pendentes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Ordem de Vendas {0} não é válido
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeno
 DocType: Employee,Employee Number,Número do Funcionário
 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}
@@ -1024,13 +1030,13 @@
 DocType: Employee,Place of Issue,Local de Emissão
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contrato
 DocType: Email Digest,Add Quote,Adicionar Citar
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Fator de Conversão de UDM é necessário para UDM: {0} no Item: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Fator de Conversão de UDM é necessário para UDM: {0} no Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Despesas Indiretas
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Quantidade é obrigatório
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,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 +112,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 +121,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 +31,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,Ordem de Compra
 DocType: Warehouse,Warehouse Contact Info,Informações de Contato do Almoxarifado
@@ -1039,8 +1045,8 @@
 DocType: Email Digest,Annual Income,Rendimento anual
 DocType: Serial No,Serial No Details,Detalhes do Nº de Série
 DocType: Purchase Invoice Item,Item Tax Rate,Taxa de Imposto do Item
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Guia de Remessa {0} não foi submetida
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Guia de Remessa {0} não foi submetida
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Equipamentos Capitais
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1050,7 +1056,7 @@
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data de entrega esperada é menor do que o planejado Data de Início.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,para Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,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.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grande Total (moeda da empresa)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sainte total
@@ -1063,7 +1069,7 @@
 DocType: Journal Entry,Journal Entry,Lançamento do livro Diário
 DocType: Workstation,Workstation Name,Nome da Estação de Trabalho
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},O BOM {0} não pertencem ao Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} does not belong to Item {1},O BOM {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
@@ -1082,7 +1088,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Meta do Modelo de Avaliação
 DocType: Salary Slip,Earning,Ganho
 DocType: Payment Tool,Party Account Currency,Partido Conta Moeda
-,BOM Browser,BOM Navegador
+,BOM Browser,Navegador de LDM
 DocType: Purchase Taxes and Charges,Add or Deduct,Adicionar ou Reduzir
 DocType: Company,If Yearly Budget Exceeded (for expense account),Se orçamento anual excedida (para conta de despesas)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condições sobreposição encontradas entre :
@@ -1095,7 +1101,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Email Marketing para Contatos e Clientes em Potencial.
 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 devem ser 100. É {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,A operação não pode ser deixado em branco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,A operação não pode ser deixado em branco.
 ,Delivered Items To Be Billed,Itens entregues a serem faturados
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Armazém não pode ser alterado para nº serial.
 DocType: Authorization Rule,Average Discount,Desconto Médio
@@ -1110,7 +1116,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},A partir de {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Descrição da operação
 DocType: Item,Will also apply to variants,Será também aplicável às variantes
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Não é possível alterar o Ano Fiscal Data de Início e Data de Fim Ano Fiscal uma vez que o Ano Fiscal é salvo.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Não é possível alterar o Ano Fiscal Data de Início e Data de Fim Ano Fiscal uma vez que o Ano Fiscal é salvo.
 DocType: Quotation,Shopping Cart,Carrinho de Compras
 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
 DocType: Pricing Rule,Campaign,Campanha
@@ -1121,7 +1127,8 @@
 DocType: Sales Order Item,Planned Quantity,Quantidade planejada
 DocType: Purchase Invoice Item,Item Tax Amount,Valor do Imposto do Item
 DocType: Item,Maintain Stock,Manter Estoque
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Alteração Líquida da Imobilização
 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 +517,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 +182,Max: {0},Max: {0}
@@ -1133,7 +1140,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plano de Contas
 DocType: Material Request,Terms and Conditions Content,Conteúdos dos Termos e Condições
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Item {0} não é um item de estoque
 DocType: Maintenance Visit,Unscheduled,Sem agendamento
 DocType: Employee,Owned,Pertencente
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de licença sem vencimento
@@ -1171,7 +1178,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub Assembléias
 DocType: Shipping Rule Condition,To Value,Ao Valor
 DocType: Supplier,Stock Manager,Da Gerente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Origem do Warehouse é obrigatória para a linha {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Origem do Warehouse é obrigatória para a linha {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Guia de Remessa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Aluguel do Escritório
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configurações de gateway SMS Setup
@@ -1179,10 +1186,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nenhum endereço adicionado ainda.
 DocType: Workstation Working Hour,Workstation Working Hour,Hora de Trabalho da Estação de Trabalho
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
 DocType: Item,Inventory,Inventário
 DocType: Features Setup,"To enable ""Point of Sale"" view",Para ativar &quot;Point of Sale&quot; vista
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio
 DocType: Item,Sales Details,Detalhes de Vendas
 DocType: Opportunity,With Items,Com Itens
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,No Qt
@@ -1197,10 +1204,11 @@
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
 DocType: Sales Invoice,Source,Fonte
 DocType: Leave Type,Is Leave Without Pay,É Licença Não Remunerada
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Exercício Data de Início
 DocType: Employee External Work History,Total Experience,Experiência total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Fluxo de Caixa de Investimentos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos
 DocType: Material Request Item,Sales Order No,Nº da Ordem de Venda
 DocType: Item Group,Item Group Name,Nome do Grupo de Itens
@@ -1208,12 +1216,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiais de transferência para Fabricação
 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/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Taxa de compra para o item: {0} não foi encontrado, o que é necessário para reservar a entrada de contabilidade (despesa). Por favor, mencione preço do item em uma lista de preços de compra."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Taxa de compra para o item: {0} não foi encontrado, o que é necessário para reservar a entrada de contabilidade (despesa). Por favor, mencione preço do item em uma lista de preços de compra."
 DocType: Maintenance Schedule,Schedules,Horários
 DocType: Purchase Invoice Item,Net Amount,Valor Líquido
 DocType: Purchase Order Item Supplied,BOM Detail No,Nº do detalhe da LDM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Total do Disconto adicional (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Erro: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Erro: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, crie uma nova conta de Plano de Contas ."
 DocType: Maintenance Visit,Maintenance Visit,Visita de manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Grupo Cliente> Território
@@ -1239,7 +1247,7 @@
 DocType: Sales Partner,Sales Partner Target,Metas do Parceiro de Vendas
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada Contabilidade para {0} só pode ser feito em moeda: {1}
 DocType: Pricing Rule,Pricing Rule,Regra de Preços
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Pedido de material a Ordem de Compra
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Pedido de material a Ordem de Compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Item devolvido {1} não existe em {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Contas Bancárias
 ,Bank Reconciliation Statement,Declaração de reconciliação bancária
@@ -1247,11 +1255,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Abertura da Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} deve aparecer apenas uma vez
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido o tranfer mais do que {0} {1} contra Pedido de Compra {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido o tranfer mais do que {0} {1} contra Pedido de Compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,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
 DocType: Shipping Rule Condition,From Value,De Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Manufacturing Quantidade é obrigatório
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Manufacturing Quantidade é obrigatório
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Valores não reflete em banco
 DocType: Quality Inspection Reading,Reading 4,Leitura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Os pedidos de despesa da empresa.
@@ -1263,33 +1271,34 @@
 ,Material Requests for which Supplier Quotations are not created,Os pedidos de materiais para os quais Fornecedor Quotations não são criados
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,No dia (s) em que você está se candidatando a licença são feriados. Você não precisa solicitar uma licença.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para rastrear itens usando código de barras. Você será capaz de inserir itens na Guia de Remessa e Nota Fiscal de Venda através do escaneamento do código de barras do item.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Marcar como Entregue
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Marcar como Entregue
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Faça Cotação
 DocType: Dependent Task,Dependent Task,Tarefa dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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 planear operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Parar Aniversário Lembretes
 DocType: SMS Center,Receiver List,Lista de recebedores
 DocType: Payment Tool Detail,Payment Amount,Valor do Pagamento
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantidade consumida
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Visão
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Visão
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Mudança líquida em dinheiro
 DocType: Salary Structure Deduction,Salary Structure Deduction,Dedução da Estrutura Salarial
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/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 +185,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Idade (Dias)
 DocType: Quotation Item,Quotation Item,Item da Cotação
 DocType: Account,Account Name,Nome da Conta
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,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 +194,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 +59,Supplier Type master.,Fornecedor Tipo de mestre.
 DocType: Purchase Order Item,Supplier Part Number,Número da peça do Fornecedor
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,A taxa de conversão não pode ser 0 ou 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,A taxa de conversão não pode ser 0 ou 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} é cancelado ou interrompido
 DocType: Accounts Settings,Credit Controller,Controlador de crédito
 DocType: Delivery Note,Vehicle Dispatch Date,Veículo Despacho Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
 DocType: Company,Default Payable Account,Conta a Pagar Padrão
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Definições para carrinho de compras on-line, tais como regras de navegação, lista de preços etc."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Cobrada
@@ -1300,16 +1309,18 @@
 DocType: Journal Entry Account,Debit in Company Currency,Débito em Empresa de moeda
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Meus Problemas
 DocType: BOM Item,BOM Item,Item da LDM
-DocType: Appraisal,For Employee,Para o Funcionário
+DocType: Appraisal,For Employee,Para o Colaborador
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Row {0}: Avanço contra o Fornecedor deve ser debitar
 DocType: Company,Default Values,Valores Padrão
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Valor do pagamento não pode ser negativo
 DocType: Expense Claim,Total Amount Reimbursed,Montante total reembolsado
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra Fornecedor Invoice {0} {1} datada
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Contra Fornecedor Invoice {0} {1} datada
 DocType: Customer,Default Price List,Lista de Preços padrão
 DocType: Payment Reconciliation,Payments,Pagamentos
 DocType: Budget Detail,Budget Allocated,Orçamento Alocado
 DocType: Journal Entry,Entry Type,Tipo de entrada
 ,Customer Credit Balance,Saldo de Crédito do Cliente
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Variação Líquida em contas a pagar
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Por favor, verifique seu e-mail id"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Necessário para ' Customerwise Discount ' Cliente
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Atualizar datas de pagamento bancário com livro Diário.
@@ -1330,7 +1341,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Ativar Carrinho
 DocType: Employee,Permanent Address,Endereço permanente
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Item {0} deve ser um item de serviço .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Adiantamento pago contra {0} {1} não pode ser maior do que o Total Geral {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Por favor seleccione código do item
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduzir Dedução por licença sem vencimento (LWP)
@@ -1347,18 +1358,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Pedido de material usado para fazer essa entrada de material
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unidade única de um item.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Tempo Log Batch {0} deve ser ' enviado '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Tempo Log Batch {0} deve ser ' enviado '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Faça Contabilidade entrada para cada Banco de Movimento
 DocType: Leave Allocation,Total Leaves Allocated,Total de licenças alocadas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Armazém necessário na Coluna No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Armazém necessário na Coluna No {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Por favor, indique Ano válido Financial datas inicial e final"
 DocType: Employee,Date Of Retirement,Data da aposentadoria
 DocType: Upload Attendance,Get Template,Obter Modelo
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Peso
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,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/pos/pos.js +147,Please select {0} first.,Por favor seleccione {0} primeiro.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},texto {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Por favor seleccione {0} primeiro.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},texto {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Novo contato
 DocType: Territory,Parent Territory,Território pai
 DocType: Quality Inspection Reading,Reading 2,Leitura 2
 DocType: Stock Entry,Material Receipt,Recebimento de material
@@ -1366,7 +1378,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Festa Tipo and Party é necessário para receber / pagar contas {0}
 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 ordens de venda etc."
 DocType: Lead,Next Contact By,Próximo Contato Por
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +213,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 +85,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: Quotation,Order Type,Tipo de Ordem
 DocType: Purchase Invoice,Notification Email Address,Endereço de email de notificação
@@ -1383,15 +1395,15 @@
 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: Sales Invoice Item,Batch No,Nº do Lote
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir várias ordens de venda contra a Ordem de Compra do Cliente
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para séries de numeração em suas transações
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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,Oportunidade De O campo é obrigatório
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Criar ordem de compra
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Criar ordem de compra
 DocType: SMS Center,Send To,Enviar para
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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,Quantidade atribuída
@@ -1404,7 +1416,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Armazém e referências
 DocType: Supplier,Statutory info and other general information about your Supplier,Informações estatutárias e outras informações gerais sobre o seu Fornecedor
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Endereços
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Journal Entry {0} não tem qualquer {1} entrada incomparável
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Journal Entry {0} não tem qualquer {1} entrada incomparável
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serial Não entrou para item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A condição para uma regra de Remessa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item não é permitido ter ordem de produção.
@@ -1413,10 +1425,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Montante de crédito em conta de moeda
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Logs de horário para a fabricação.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Warehouse-wise Reordenar Nível
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} deve ser apresentado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} deve ser apresentado
 DocType: Authorization Control,Authorization Control,Controle de autorização
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Rejeitado Warehouse é obrigatória contra rejeitado item {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tempo de registro para as tarefas.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pagamento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Pagamento
 DocType: Production Order Operation,Actual Time and Cost,Tempo e Custo Real
 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},Solicitação de materiais de máxima {0} pode ser feita para item {1} contra ordem de venda {2}
 DocType: Employee,Salutation,Saudação
@@ -1433,7 +1446,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Item {0} não é um item serializado
 DocType: SMS Center,Create Receiver List,Criar Lista de Receptor
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
 DocType: Packing Slip,To Package No.,Para Pacote Nº.
 DocType: Warranty Claim,Issue Date,Data da Solicitação
 DocType: Activity Cost,Activity Cost,Custo de atividade
@@ -1452,7 +1464,7 @@
 DocType: Serial No,Delivery Document No,Nº do Documento de Entrega
 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},Item {0} aparece várias vezes na lista Preço {1}
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Item {0} aparece várias vezes na Lista de Preço {1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Venda deve ser verificada, se for caso disso for selecionado como {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Item da Cotação do Fornecedor
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Desabilita a criação de logs de tempo contra ordens de produção. As operações não devem ser rastreados contra a ordem de produção
@@ -1471,7 +1483,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcançados
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Território / Cliente
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,por exemplo 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
 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.
 DocType: Item,Is Sales Item,É item de venda
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Tree grupo
@@ -1483,7 +1495,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} criado
 DocType: Delivery Note Item,Against Sales Order,Contra a Ordem de Vendas
 ,Serial No Status,Estado do Nº de Série
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Mesa Item não pode estar em branco
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Mesa Item não pode estar em branco
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"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 \
  e deve ser maior do que ou igual a {2}"
@@ -1493,7 +1505,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
 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 +170,Duties and Taxes,Impostos e Contribuições
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Por favor, indique data de referência"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,"Por favor, indique data de referência"
 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 pagamento não podem ser filtrados por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela para o item que será mostrado no Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Fornecido Qtde
@@ -1508,7 +1520,7 @@
 DocType: Installation Note,Installation Time,O tempo de Instalação
 DocType: Sales Invoice,Accounting Details,Detalhes Contabilidade
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Apagar todas as transações para esta empresa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Row # {0}: Operation {1} não for completado por {2} qty de produtos acabados na ordem de produção # {3}. Por favor, atualize o status da operação via Tempo Logs"
+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,"Row # {0}: Operation {1} não for completado por {2} qty de produtos acabados na ordem de produção # {3}. Por favor, atualize o status da operação via Tempo Logs"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investimentos
 DocType: Issue,Resolution Details,Detalhes da Resolução
 DocType: Quality Inspection Reading,Acceptance Criteria,Critérios de Aceitação
@@ -1524,7 +1536,7 @@
 DocType: Holiday List,Clear Table,Limpar Tabela
 DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,Nota Fiscal nº
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Da Ordem de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Da Ordem de Compra
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser aplicada / cancelada antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
 DocType: Activity Cost,Costing Rate,Preço de Custo
 ,Customer Addresses And Contacts,Endereços e Contatos do Cliente
@@ -1541,7 +1553,7 @@
 ,Maintenance Schedules,Horários de Manutenção
 ,Quotation Trends,Tendências de cotação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,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
 ,Pending Amount,Enquanto aguarda Valor
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
@@ -1558,12 +1570,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árvore de contas finanial .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixe em branco se considerado para todos os tipos de empregados
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir taxas sobre
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"A Conta {0} deve ser do tipo ""Ativo Fixo"" pois o item {1} é um item de ativos"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"A Conta {0} deve ser do tipo ""Ativo Fixo"" pois o item {1} é um item de ativos"
 DocType: HR Settings,HR Settings,Configurações de RH
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Despesa reivindicação está pendente de aprovação . Somente o aprovador Despesa pode atualizar status.
 DocType: Purchase Invoice,Additional Discount Amount,Total do Disconto adicional
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,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 +225,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,esportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total real
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,unidade
@@ -1575,7 +1587,8 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Os relatórios de despesas
 DocType: Issue,Support,Pós-Vendas
-,BOM Search,BOM Pesquisa
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Ver carrinho
+,BOM Search,Pesquisa de LDM
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Fechando (abertura + Totais)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique moeda in Company"
 DocType: Workstation,Wages per hour,salário por hora
@@ -1586,13 +1599,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Fator de Conversão de UDM é necessário na linha {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Apuramento data não pode ser anterior à data de verificação na linha {0}
 DocType: Salary Slip,Deduction,Dedução
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Item Preço adicionada para {0} na lista de preços {1}
 DocType: Address Template,Address Template,Modelo de endereço
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Digite Employee Id desta pessoa de vendas
 DocType: Territory,Classification of Customers by region,Classificação dos clientes por região
 DocType: Project,% Tasks Completed,% Tarefas Concluídas
 DocType: Project,Gross Margin,Margem Bruta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Por favor, indique item Produção primeiro"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,usuário desativado
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuário desativado
 DocType: Opportunity,Quotation,Cotação
 DocType: Salary Slip,Total Deduction,Dedução Total
 DocType: Quotation,Maintenance User,Manutenção do usuário
@@ -1601,7 +1615,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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)
 DocType: Purchase Taxes and Charges,Deduct,Deduzir
@@ -1611,12 +1625,12 @@
 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, Pedido de Vendas, de Campanhas e etc, para medir retorno sobre o investimento."
 DocType: Expense Claim,Approver,Aprovador
 ,SO Qty,SO Qtde
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","As entradas em existências existir contra armazém {0}, portanto, você não pode voltar a atribuir ou modificar Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","As entradas em existências existir contra armazém {0}, portanto, você não pode voltar a atribuir ou modificar Warehouse"
 DocType: Appraisal,Calculate Total Score,Calcular a Pontuação Total
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufatura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Não {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir Guia de Remessa em pacotes.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Os embarques
+apps/erpnext/erpnext/hooks.py +69,Shipments,Os embarques
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregue ao cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Estado devem ser apresentadas.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,O Serial No {0} não pertence a nenhum Warehouse
@@ -1636,10 +1650,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Selecione 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 +95,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego ( permanente , contrato, etc estagiário ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
 DocType: Currency Exchange,From Currency,De Moeda
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"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/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordem de venda necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Ordem de venda necessário para item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Valores não reflete em sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Preço (moeda da empresa)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Outros
@@ -1655,7 +1669,7 @@
 DocType: Quality Inspection,In Process,Em Processo
 DocType: Authorization Rule,Itemwise Discount,Desconto relativo ao Item
 DocType: Purchase Order Item,Reference Document Type,Referência Tipo de Documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contra a Ordem de Venda {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} contra a Ordem de Venda {1}
 DocType: Account,Fixed Asset,ativos Fixos
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inventário Serialized
 DocType: Activity Type,Default Billing Rate,Preço de Faturamento Padrão
@@ -1665,7 +1679,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Pedido de Vendas para pagamento
 DocType: Expense Claim Detail,Expense Claim Detail,Detalhe do Pedido de Reembolso de Despesas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs criado:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,"Por favor, selecione conta correta"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,"Por favor, selecione conta correta"
 DocType: Item,Weight UOM,UDM de Peso
 DocType: Employee,Blood Group,Grupo sanguíneo
 DocType: Purchase Invoice Item,Page Break,Quebra de página
@@ -1694,12 +1708,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Gerar Pedidos de Materiais (MRP) e ordens de produção.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total facturado Amt
 DocType: Time Log,To Time,Para Tempo
-DocType: Authorization Rule,Approving Role (above authorized value),Aprovando Papel (acima do valor autorizado)
+DocType: Authorization Rule,Approving Role (above authorized value),Função de Aprovador ( para autorização de valo r excedente )
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Para adicionar nós filho, explorar árvore e clique no nó em que você deseja adicionar mais nós."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,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 +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Preço de {0} está desativado
 DocType: Manufacturing Settings,Allow Overtime,Permitir Overtime
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} número de série é necessário para item {1}. Você forneceu {2}.
@@ -1707,8 +1721,9 @@
 DocType: Item,Customer Item Codes,Item de cliente Códigos
 DocType: Opportunity,Lost Reason,Razão da perda
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Criar registro de pagamento para as Ordens ou Faturas.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Novo endereço
 DocType: Quality Inspection,Sample Size,Tamanho da amostra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Todos os itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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 válido &#39;De Caso No.&#39;"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
 DocType: Project,External,Externo
@@ -1764,13 +1779,14 @@
 DocType: Rename Tool,Rename Tool,Ferramenta de Renomear
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Atualize o custo
 DocType: Item Reorder,Item Reorder,Item Reordenar
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,transferência de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,transferência de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações , custos operacionais e dar uma operação única não às suas operações."
 DocType: Purchase Invoice,Price List Currency,Moeda da Lista de Preços
 DocType: Naming Series,User must always select,O Usuário deve sempre selecionar
 DocType: Stock Settings,Allow Negative Stock,Permitir Estoque Negativo
 DocType: Installation Note,Installation Note,Nota de Instalação
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Adicionar Impostos
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Fluxo de Caixa de Financiamento
 ,Financial Analytics,Análise Financeira
 DocType: Quality Inspection,Verified By,Verificado Por
 DocType: Address,Subsidiary,Subsidiário
@@ -1780,19 +1796,19 @@
 DocType: Process Payroll,Create Salary Slip,Criar Folha de Pagamento
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Equilíbrio esperado como por banco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fonte de Recursos ( Passivo)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantidade em linha {0} ( {1} ) deve ser a mesma quantidade fabricada {2}
-DocType: Appraisal,Employee,Funcionário
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantidade em linha {0} ( {1} ) deve ser a mesma quantidade fabricada {2}
+DocType: Appraisal,Employee,Colaborador
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar e-mail do
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Convidar como Usuário
 DocType: Features Setup,After Sale Installations,Instalações Pós-Venda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} está totalmente faturado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} está totalmente faturado
 DocType: Workstation Working Hour,End Time,End Time
 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 +75,Group by Voucher,Grupo pela Vale
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obrigatório On
 DocType: Sales Invoice,Mass Mailing,Divulgação em massa
 DocType: Rename Tool,File to Rename,Arquivo para renomear
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagamentos
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Especificada BOM {0} não existe para item {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
@@ -1802,6 +1818,7 @@
 DocType: Selling Settings,Sales Order Required,Ordem de Venda Obrigatória
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Criar Cliente
 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
 DocType: Employee Education,Post Graduate,Pós-Graduação
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalhe da Programação da Manutenção
 DocType: Quality Inspection Reading,Reading 9,Leitura 9
@@ -1813,6 +1830,7 @@
 DocType: Warranty Claim,Raised By,Levantadas por
 DocType: Payment Tool,Payment Account,Conta de Pagamento
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Variação Líquida em Contas a Receber
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
 DocType: Quality Inspection Reading,Accepted,Aceito
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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."
@@ -1820,17 +1838,17 @@
 DocType: Payment Tool,Total Payment Amount,Valor Total Pagamento
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
 DocType: Newsletter,Test,Teste
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Como existem transações com ações existentes para este item, \ não é possível alterar os valores de &#39;não tem Serial&#39;, &#39;Tem Lote n&#39;, &#39;é Stock item &quot;e&quot; Método de avaliação&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Breve Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Breve Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Você não pode alterar a taxa de se BOM mencionado 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 +157,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique Planned Qt para item {0} na linha {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} não foi enviado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} não foi enviado
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Condições
@@ -1843,7 +1861,7 @@
 DocType: Authorization Rule,Authorized Value,Valor Autorizado
 DocType: Contact,Enter department to which this Contact belongs,Entre com o departamento a que este contato pertence
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total de Faltas
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unidade de Medida
 DocType: Fiscal Year,Year End Date,Data final do ano
 DocType: Task Depends On,Task Depends On,Tarefa depende de
@@ -1869,7 +1887,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data de Encerramento do Contrato deve ser maior que Data de Inicio
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Um distribuidor de terceiros / revendedor / comissão do agente / filial / revendedor que vende os produtos de empresas de uma comissão.
 DocType: Customer Group,Has Child Node,Tem nó filho
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Digite os parâmetros da URL estática aqui (por exemplo remetente=ERPNext, usuario=ERPNext, senha=1234, etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} não consta em nenhum Ano Fiscal Ativo. Para mais detalhes consulte {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
@@ -1917,7 +1935,7 @@
  10. Adicionar ou deduzir: Se você quer adicionar ou deduzir o imposto."
 DocType: Purchase Receipt Item,Recd Quantity,Quantidade Recebida
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais item {0} do que a quantidade Ordem de Vendas {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
 DocType: Payment Reconciliation,Bank / Cash Account,Banco / Conta Caixa
 DocType: Tax Rule,Billing City,Faturamento Cidade
 DocType: Global Defaults,Hide Currency Symbol,Ocultar Símbolo de Moeda
@@ -1949,6 +1967,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Despesas com Serviços Públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Acima de 90
 DocType: Buying Settings,Default Buying Price List,Lista de preço de compra padrão
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Nenhum funcionário para os critérios acima selecionado ou folha de salário já criado
 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 Company, de moeda, Atual Exercício , etc"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tipo de pagamento
@@ -1984,7 +2003,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte &quot;taxa de materiais baseados em&quot; no Custeio Seção
 DocType: Appraisal Goal,Key Responsibility Area,Área Chave de Responsabilidade
 DocType: Item Reorder,Material Request Type,Tipo de solicitação de material
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Fator de Conversão UOM é obrigatória
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Fator de Conversão UOM é obrigatória
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Reference
 DocType: Cost Center,Cost Center,Centro de Custos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,vale #
@@ -2007,7 +2026,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Por favor seleccione um valor para {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todos os Endereços.
 DocType: Company,Stock Settings,Configurações da
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gerenciar grupos de clientes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Novo Centro de Custo Nome
 DocType: Leave Control Panel,Leave Control Panel,Painel de Controle de Licenças
@@ -2027,8 +2046,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Detalhe ferramenta de pagamento
 ,Sales Browser,Navegador de Vendas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Empréstimos e Adiantamentos (Ativo )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Devedores
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
@@ -2047,7 +2066,7 @@
 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 de S.O.
 DocType: Production Order Operation,Make Time Log,Make Time Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,"Por favor, defina a quantidade de reabastecimento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,"Por favor, defina a quantidade de reabastecimento"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computadores
@@ -2107,10 +2126,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Pelo menos um item deve ser inserido com quantidade negativa no documento de devolução
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operação {0} mais do que as horas de trabalho disponíveis na estação de trabalho {1}, quebrar a operação em várias operações"
 ,Requested,solicitado
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Não Observações
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Não Observações
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Vencido
 DocType: Account,Stock Received But Not Billed,"Banco recebido, mas não faturados"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Conta raiz deve ser um grupo
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Conta raiz deve ser um grupo
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salário bruto + Valor em atraso + Valor de cobrança - Dedução Total
 DocType: Monthly Distribution,Distribution Name,Nome da distribuição
 DocType: Features Setup,Sales and Purchase,Vendas e Compra
@@ -2124,6 +2143,7 @@
 DocType: Journal Entry Account,Party Balance,Balance Partido
 DocType: Sales Invoice Item,Time Log Batch,Tempo Batch Log
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Por favor, selecione Aplicar Discount On"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Deslizamento Salário Criado
 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 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 de Fabricação
@@ -2131,9 +2151,9 @@
 DocType: Purchase Invoice,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Ano Fiscal {0} não foi encontrado.
 DocType: Bank Reconciliation,Get Relevant Entries,Obter entradas relevantes
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Lançamento Contábil de Estoque
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Lançamento Contábil de Estoque
 DocType: Sales Invoice,Sales Team1,Equipe de Vendas 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do Cliente
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar desconto adicional em
 DocType: Account,Root Type,Tipo de Raiz
@@ -2142,15 +2162,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Mostrar esta apresentação de slides no topo da página
 DocType: BOM,Item UOM,UDM do Item
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Valor do imposto Valor Depois de desconto (Companhia de moeda)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Destino do Warehouse é obrigatória para a linha {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Destino do Warehouse é obrigatória para a linha {0}
 DocType: Quality Inspection,Quality Inspection,Inspeção de Qualidade
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: Quantidade de material solicitado é menor do que a ordem mínima
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: Quantidade de material solicitado é menor do que a ordem mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Fumo"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ou BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Taxa de comissão não pode ser maior do que 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nível Mínimo Inventory
 DocType: Stock Entry,Subcontract,Subcontratar
@@ -2188,7 +2208,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspeção de qualidade de entrada.
 DocType: Purchase Order Item,Returned Qty,Devolvido Qtde
 DocType: Employee,Exit,Saída
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Tipo de Raiz é obrigatório
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Tipo de Raiz é obrigatório
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Não {0} criado
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a comodidade dos clientes, estes códigos podem ser usados em formatos de impressão, como Notas Fiscais e Guias de Remessa"
 DocType: Employee,You can enter any date manually,Você pode entrar qualquer data manualmente
@@ -2196,8 +2216,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Período Probatório
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Somente nós-folha são permitidos em transações
 DocType: Expense Claim,Expense Approver,Despesa Approver
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +110,Row {0}: Advance against Customer must be credit,Row {0}: Avanço contra o Cliente deve estar de crédito
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Item do Recibo de Compra Fornecido
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagar
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Datetime
 DocType: SMS Settings,SMS Gateway URL,URL de Gateway para SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs para a manutenção de status de entrega sms
@@ -2214,7 +2235,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordenar Nível
 DocType: Attendance,Attendance Date,Data de Comparecimento
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Separação Salário com base em salário e dedução.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Contas com nós filhos não podem ser convertidas em um livro-razão
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Contas com nós filhos não podem ser convertidas em um livro-razão
 DocType: Address,Preferred Shipping Address,Endereço para envio preferido
 DocType: Purchase Receipt Item,Accepted Warehouse,Almoxarifado Aceito
 DocType: Bank Reconciliation Detail,Posting Date,Data da Postagem
@@ -2232,7 +2253,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Não {0} não existe
 DocType: Pricing Rule,Discount Percentage,Percentagem de Desconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Número da Fatura
-apps/erpnext/erpnext/hooks.py +54,Orders,Encomendas
+apps/erpnext/erpnext/hooks.py +55,Orders,Encomendas
 DocType: Leave Control Panel,Employee Type,Tipo de empregado
 DocType: Employee Leave Approver,Leave Approver,Aprovador de Licenças
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para Fabricação
@@ -2244,7 +2265,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% do material faturado contra esta Ordem de Venda
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Entrada de encerramento do período
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,depreciação
+DocType: Account,Depreciation,depreciação
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornecedor (s)
 DocType: Customer,Credit Limit,Limite de Crédito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selecione o tipo de transação
@@ -2269,11 +2290,12 @@
 DocType: Material Request,Requested For,solicitadas para
 DocType: Quotation Item,Against Doctype,Contra o Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Acompanhar este Guia de Remessa contra qualquer projeto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Conta root não pode ser excluído
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Caixa Líquido de Investimentos
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Conta root não pode ser excluído
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar Banco de Entradas
 ,Is Primary Address,É primário Endereço
 DocType: Production Order,Work-in-Progress Warehouse,Armazém Work-in-Progress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referência # {0} {1} datado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referência # {0} {1} datado
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gerenciar endereços
 DocType: Pricing Rule,Item Code,Código do Item
 DocType: Production Planning Tool,Create Production Orders,Criar Ordens de Produção
@@ -2281,7 +2303,7 @@
 DocType: Journal Entry,User Remark,Observação do Usuário
 DocType: Lead,Market Segment,Segmento de mercado
 DocType: Employee Internal Work History,Employee Internal Work History,Histórico de trabalho interno do Funcionário
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Fechamento (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Fechamento (Dr)
 DocType: Contact,Passive,Indiferente
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Não {0} não em estoque
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modelo imposto pela venda de transações.
@@ -2297,7 +2319,7 @@
 ,Billed Amount,valor faturado
 DocType: Bank Reconciliation,Bank Reconciliation,Reconciliação Bancária
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obter atualizações
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Adicione alguns registros de exemplo
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Gestão de Licenças
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupo por Conta
@@ -2306,14 +2328,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","O chefe conta com Responsabilidade , no qual Lucro / Prejuízo será reservado"
 DocType: Payment Tool,Against Vouchers,Contra Vouchers
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ajuda Rápida
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Extras de Vendas
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Orçamento {0} para conta {1} contra Centro de Custo {2} excederá por {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,Purchase Order number required for Item {0},Número do pedido requerido para 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'
 ,Stock Projected Qty,Banco Projetada Qtde
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
 DocType: Sales Order,Customer's Purchase Order,Ordem de Compra do Cliente
 DocType: Warranty Claim,From Company,Da Empresa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor ou Quantidade
@@ -2323,9 +2345,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Deixe Lista de Bloqueios admitidos
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Você usará isso para o Login
 DocType: Sales Partner,Retailer,Varejista
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos os Tipos de Fornecedores
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +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/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Ítem da Programação da Manutenção
 DocType: Sales Order,%  Delivered,% Entregue
@@ -2369,7 +2391,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),O peso bruto do pacote. Normalmente peso líquido + peso do material de embalagem. (Para impressão)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Os usuários com esta função são autorizados a estabelecer contas congeladas e criar / modificar lançamentos contábeis contra contas congeladas
 DocType: Serial No,Is Cancelled,É cancelado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Minhas remessas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Minhas remessas
 DocType: Journal Entry,Bill Date,Data de Faturamento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Mesmo se houver várias regras de preços com maior prioridade, então seguintes prioridades internas são aplicadas:"
 DocType: Supplier,Supplier Details,Detalhes do Fornecedor
@@ -2390,10 +2412,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,chamadas
 DocType: Project,Total Costing Amount (via Time Logs),Montante Custeio Total (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,UDM do Estoque
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,projetado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Não {0} não pertence ao Armazém {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
 DocType: Notification Control,Quotation Message,Mensagem da Cotação
 DocType: Issue,Opening Date,Data de abertura
 DocType: Journal Entry,Remark,Observação
@@ -2406,9 +2428,9 @@
 DocType: Time Log,Batched for Billing,Agrupadas para Faturamento
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Faturas levantada por Fornecedores.
 DocType: POS Profile,Write Off Account,Eliminar Conta
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Montante do Desconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Regresso contra factura de compra
 DocType: Item,Warranty Period (in days),Período de Garantia (em dias)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Caixa Líquido de Operações
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,por exemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
 DocType: Journal Entry Account,Journal Entry Account,Conta Journal Entry
@@ -2449,7 +2471,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Efetivação
 DocType: Sales Invoice,Against Income Account,Contra a Conta de Rendimentos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Entregue
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no Item).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no 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
@@ -2477,10 +2499,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número do lote é obrigatória para item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Esta é uma pessoa de vendas de raiz e não pode ser editado .
 ,Stock Ledger,Livro de Inventário
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Classificação: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Classificação: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Dedução da folha de pagamento
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Selecione um nó de grupo em primeiro lugar.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Objetivo deve ser um dos {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Objetivo deve ser um dos {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Preencha o formulário e salvá-lo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Baixar um relatório contendo todas as matérias-primas com o seu estado mais recente do inventário
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
@@ -2495,7 +2517,7 @@
 DocType: Time Log,Operation ID,Operação ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Identificação do usuário do sistema (login). Se for marcado, ele vai se tornar padrão para todos os formulários de RH."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: A partir de {1}
-DocType: Task,depends_on,depende de
+DocType: Task,depends_on,depende_de
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Oportunidade perdida
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Campos de desconto estarão disponíveis em Ordem de Compra, Recibo de Compra, Nota Fiscal de Compra"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +211,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nome da nova conta. Nota: Por favor, não criar contas para Clientes e Fornecedores"
@@ -2513,12 +2535,12 @@
 DocType: Serial No,Out of AMC,Fora do CAM
 DocType: Purchase Order Item,Material Request Detail No,Detalhe materiais Pedido Não
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Criar visita de manutenção
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com o usuário que tem Vendas Mestre Gerente {0} papel"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com um usuário que tem a função {0} Gerente Superior de Vendas"
 DocType: Company,Default Cash Account,Conta Caixa padrão
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,"Empresa  (a própria companhia, não se refere ao cliente, nem ao fornecedor)"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,Valor pago + Write Off Valor não pode ser maior do que o total geral
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,Valor pago + Write Off Valor não pode ser maior do que o total geral
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} não é um número de lote válido para o item {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Se o pagamento não é feito contra qualquer referência, fazer Journal Entry manualmente."
@@ -2535,13 +2557,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' é desativada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Definir como Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar e-mails automáticos para Contatos sobre transações de enviar.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Quantidade não avalable no armazém {1} em {2} {3}.
  Disponível Qtde: {4}, Quantidade de transferência: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Item 3
 DocType: Purchase Order,Customer Contact Email,Cliente Fale Email
 DocType: Sales Team,Contribution (%),Contribuição (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,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
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modelo
 DocType: Sales Person,Sales Person Name,Nome do Vendedor
@@ -2552,20 +2574,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliação
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e taxas Adicionado (Moeda Company)
-apps/erpnext/erpnext/stock/doctype/item/item.py +374,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 +383,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
 DocType: Sales Order,Partly Billed,Parcialmente faturado
-DocType: Item,Default BOM,LDM padrão
+DocType: Item,Default BOM,LDM Padrão
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, re-tipo o nome da empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total de Outstanding Amt
 DocType: Time Log Batch,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Configurações de impressão
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,automotivo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De Nota de Entrega
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Mensagem personalizada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investimento Bancário
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
 DocType: Purchase Invoice,Price List Exchange Rate,Taxa de Câmbio da Lista de Preços
 DocType: Purchase Invoice Item,Rate,Preço
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,internar
@@ -2584,9 +2606,10 @@
  conflito, atribuindo prioridade. Regras Preço: {0}"
 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 +580,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Para Almoxarifado
 DocType: Employee,Offer Date,Oferta Data
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cotações
 DocType: Hub Settings,Access Token,Token de Acesso
 DocType: Sales Invoice Item,Serial No,Nº de Série
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Por favor, indique Maintaince Detalhes primeiro"
@@ -2600,10 +2623,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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,Produto Bundle item
 DocType: Sales Partner,Sales Partner Name,Nome do Parceiro de Vendas
+DocType: Payment Reconciliation,Maximum Invoice Amount,Montante Máximo Invoice
 DocType: Purchase Invoice Item,Image View,Ver imagem
 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/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 +553,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidade de medida padrão para a variante &#39;{0}&#39; deve ser o mesmo que no modelo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Do Armazém
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorização e Total
@@ -2611,6 +2636,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Este artigo é um Variant de {0} (modelo). Atributos serão copiados a partir do modelo, a menos que 'No Copy' é definido"
 DocType: Account,Purchase User,Compra de Usuário
 DocType: Notification Control,Customize the Notification,Personalize a Notificação
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Fluxo de Caixa das Operações
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Template endereço padrão não pode ser excluído
 DocType: Sales Invoice,Shipping Rule,Regra de envio
 DocType: Journal Entry,Print Heading,Cabeçalho de impressão
@@ -2621,9 +2647,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Matéria-prima
 DocType: Leave Application,Follow via Email,Siga por e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois Montante do Desconto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Conta Criança existe para esta conta. Você não pode excluir esta conta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,Child account exists for this account. You can not delete this account.,Conta Criança existe 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 +452,No default BOM exists for Item {0},No BOM padrão existe para item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,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 +335,Please select Posting Date first,"Por favor, selecione Data de lançamento primeiro"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Abrindo data deve ser antes da Data de Fechamento
 DocType: Leave Control Panel,Carry Forward,Encaminhar
@@ -2639,6 +2665,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Obrigatório para Serialized item {0}
 DocType: Journal Entry,Bank Entry,Banco Entry
 DocType: Authorization Rule,Applicable To (Designation),Aplicável Para (Designação)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Adicionar ao carrinho
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Ativar / desativar moedas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Despesas Postais
@@ -2646,30 +2673,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
 DocType: Purchase Order,The date on which recurring order will be stop,A data em que ordem recorrente será parar
 DocType: Quality Inspection,Item Serial No,Nº de série do Item
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve ser reduzido em {1} ou você deve aumentar a tolerância ao excesso
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve ser reduzido em {1} ou você deve aumentar a tolerância ao excesso
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Presente total
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Item Serialized {0} não pode ser atualizado utilizando \
  da Reconciliação"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferência de material para Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Transferência de material para Fornecedor
 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 Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
 DocType: Lead,Lead Type,Tipo de Cliente em Potencial
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Criar Orçamento
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,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 +311,All these items have already been invoiced,Todos esses itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Todos esses itens já foram faturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado pelo {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Regra Condições de envio
 DocType: BOM Replace Tool,The new BOM after replacement,A nova LDM após substituição
 DocType: Features Setup,Point of Sale,Ponto de Venda
 DocType: Account,Tax,Imposto
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} não é um válido {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,De Bundle Produto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,De Bundle Produto
 DocType: Production Planning Tool,Production Planning Tool,Ferramenta de Planejamento da Produção
 DocType: Quality Inspection,Report Date,Data do Relatório
 DocType: C-Form,Invoices,Faturas
 DocType: Job Opening,Job Title,Cargo
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatários
 DocType: Features Setup,Item Groups in Details,Detalhes dos Grupos de Itens
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -2677,8 +2703,9 @@
 DocType: Stock Entry,Update Rate and Availability,Taxa de atualização 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."
 DocType: Pricing Rule,Customer Group,Grupo de Clientes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
 DocType: Item,Website Description,Descrição do site
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Mudança no Patrimônio Líquido
 DocType: Serial No,AMC Expiry Date,Data de Validade do CAM
 ,Sales Register,Vendas Registrar
 DocType: Quotation,Quotation Lost Reason,Razão da perda da Cotação
@@ -2686,12 +2713,12 @@
 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/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resumo para este mês e atividades pendentes
 DocType: Customer Group,Customer Group Name,Nome do Grupo de Clientes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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
 DocType: Item,Attributes,Atributos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obter itens
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Obter itens
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Última data do pedido
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Criar imposto de fatura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Conta {0} não pertence à empresa {1}
@@ -2707,7 +2734,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dados do projecto -wise não está disponível para Cotação
 DocType: Project,Expected End Date,Data Final prevista
 DocType: Appraisal Template,Appraisal Template Title,Título do Modelo de Avaliação
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Pai item {0} não deve ser um item da
 DocType: Cost Center,Distribution Id,Id da distribuição
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Principais Serviços
@@ -2720,7 +2747,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor para o atributo {0} deve estar dentro da gama de {1} a {2} nos incrementos de {3}
 DocType: Tax Rule,Sales,Vendas
 DocType: Stock Entry Detail,Basic Amount,Montante base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Armazém necessário para o ítem do estoque {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,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
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Padrão Contas a Receber
@@ -2732,16 +2759,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
+DocType: Payment Reconciliation,To Invoice Date,Para Data da fatura
 DocType: Supplier,Contact HTML,Contato HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de compra
-DocType: Payment Reconciliation,Maximum Amount,Montante Máximo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Como regra de preços é aplicada?
 DocType: Quality Inspection,Delivery Note No,Nº da Guia de Remessa
 DocType: Company,Retail,Varejo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Cliente {0} não existe
 DocType: Attendance,Absent,Ausente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle produto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Referência inválida {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle produto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Row {0}: Referência inválida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Comprar Impostos e Taxas Template
 DocType: Upload Attendance,Download Template,Baixar o Modelo
 DocType: GL Entry,Remarks,Observações
@@ -2768,7 +2795,7 @@
 ,Monthly Attendance Sheet,Folha de Presença Mensal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nenhum registro encontrado
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Custo é obrigatória para item {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Obter Itens de Bundle Produto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Obter Itens de Bundle Produto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,A Conta {0} está inativa
 DocType: GL Entry,Is Advance,É antecipado
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Data de Início do Comparecimento e Data Final de Comparecimento é obrigatória
@@ -2777,8 +2804,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,A conta {0} tipo 'Lucros e Perdas' não é permitida na Abertura do Período
 DocType: Features Setup,Sales Discounts,Descontos de Vendas
 DocType: Hub Settings,Seller Country,País do Vendedor
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publicar Itens no site
 DocType: Authorization Rule,Authorization Rule,Regra de autorização
 DocType: Sales Invoice,Terms and Conditions Details,Detalhes dos Termos e Condições
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,especificações
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos de vendas e de modelo Encargos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de Ordem
@@ -2793,14 +2822,14 @@
 DocType: Tax Rule,Billing Country,País de faturamento
 ,Customers Not Buying Since Long Time,Os clientes não compra desde há muito tempo
 DocType: Production Order,Expected Delivery Date,Data de entrega prevista
-apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Débito e Crédito é igual para {0} # {1}. A diferença é {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,O Débito e 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 +93,Entertainment Expenses,despesas de representação
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Idade
 DocType: Time Log,Billing Amount,Faturamento Montante
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantidade inválido especificado para o item {0} . Quantidade deve ser maior do que 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Pedidos de licença.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Contas com transações existentes não pode ser excluídas
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Contas com transações existentes não pode ser excluídas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,despesas legais
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","O dia do mês em que ordem auto será gerado por exemplo, 05, 28, etc"
 DocType: Sales Invoice,Posting Time,Horário da Postagem
@@ -2816,11 +2845,11 @@
 DocType: Maintenance Visit,Breakdown,Colapso
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,A Conta: {0} com moeda: {1} não pode ser selecionada
 DocType: Bank Reconciliation Detail,Cheque Date,Data do Cheque
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: A Conta Pai {1} não pertence à empresa: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: A Conta Pai {1} não pertence à empresa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Excluído com sucesso todas as transacções relacionadas com esta empresa!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como em Data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,provação
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserir automaticamente o preço na lista de preço se não houver nenhum.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montante total pago
@@ -2832,6 +2861,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Valor Total do faturamento (via Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Nós vendemos este item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fornecedor Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,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 +135,"Type of leaves like casual, sick etc.","Tipo de licenças como casual, doença, etc."
@@ -2840,7 +2870,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adicione linhas para definir orçamentos anuais nas Contas.
 DocType: Buying Settings,Default Supplier Type,Padrão de Tipo de Fornecedor
 DocType: Production Order,Total Operating Cost,Custo de Operacional Total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos os Contatos.
 DocType: Newsletter,Test Email Id,Endereço de Email de Teste
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Sigla da Empresa
@@ -2865,7 +2895,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Template imposto é obrigatório.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Conta {0}: A Conta Pai {1} não existe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,Conta {0}: A Conta Pai {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preço Taxa List (moeda da empresa)
 DocType: Account,Temporary,Temporário
 DocType: Address,Preferred Billing Address,Preferred Endereço de Cobrança
@@ -2883,8 +2913,8 @@
 ,Item-wise Price List Rate,-Item sábio Preço de Taxa
 DocType: Purchase Order Item,Supplier Quotation,Cotação do Fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Por extenso será visível quando você salvar a cotação.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} está parado
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} está parado
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
 DocType: Lead,Add to calendar on this date,Adicionar ao calendário nesta data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regras para adicionar os custos de envio .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Próximos Eventos
@@ -2905,24 +2935,24 @@
 DocType: Customer,From Lead,Do Cliente em Potencial
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordens liberadas para produção.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selecione o ano fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
 DocType: Hub Settings,Name Token,Nome do token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,venda padrão
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Pelo menos um almoxarifado é obrigatório
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Selling,venda padrão
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Pelo menos um almoxarifado é obrigatório
 DocType: Serial No,Out of Warranty,Fora de Garantia
 DocType: BOM Replace Tool,Replace,Substituir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra Nota Fiscal de Vendas {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} contra Nota Fiscal de Vendas {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
 DocType: Purchase Invoice Item,Project Name,Nome do Projeto
 DocType: Supplier,Mention if non-standard receivable account,Mencione se não padronizado conta a receber
 DocType: Journal Entry Account,If Income or Expense,Se a renda ou Despesa
 DocType: Features Setup,Item Batch Nos,Nº do Lote do Item
 DocType: Stock Ledger Entry,Stock Value Difference,Banco de Valor Diferença
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Recursos Humanos
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,Recursos Humanos
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliação Pagamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Ativo Fiscal
 DocType: BOM Item,BOM No,Nº da LDM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} não tem conta {1} ou já comparado com outro comprovante
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} não tem conta {1} ou já comparado com outro comprovante
 DocType: Item,Moving Average,Média móvel
 DocType: BOM Replace Tool,The BOM which will be replaced,A LDM que será substituída
 DocType: Account,Debit,Débito
@@ -2959,7 +2989,7 @@
 DocType: Stock Entry Detail,Additional Cost,Custo adicional
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Encerramento do Exercício Social Data
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Não é possível filtrar com base no Comprovante Não, se agrupados por voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Criar cotação com fornecedor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Criar cotação com fornecedor
 DocType: Quality Inspection,Incoming,Entrada
 DocType: BOM,Materials Required (Exploded),Materiais necessários (explodida)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzir a Geração de Renda para sair sem pagar (LWP)
@@ -2967,7 +2997,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Número de ordem {1} não coincide com {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Deixar
 DocType: Batch,Batch ID,ID do Lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota de entrega Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumo da Semana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve ser um item comprado ou subcontratado na linha {1}
@@ -2982,6 +3012,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Méd. Taxa de Compra
 DocType: Task,Actual Time (in Hours),Tempo real (em horas)
 DocType: Employee,History In Company,Histórico na Empresa
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},A quantidade total de Emissão / Transferência {0} no Pedido de Material {1} não pode ser maior do que a quantidade pedida {2} do número {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletters
 DocType: Address,Shipping,Expedição
 DocType: Stock Ledger Entry,Stock Ledger Entry,Lançamento do Livro de Inventário
@@ -3001,7 +3032,6 @@
 DocType: Purchase Order,End date of current order's period,A data de término do período da ordem atual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Faça uma carta de oferta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorna
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
 DocType: Production Order Operation,Production Order Operation,Ordem de produção Operation
 DocType: Pricing Rule,Disable,Desativar
 DocType: Project Task,Pending Review,Revisão pendente
@@ -3009,7 +3039,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id do Cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Para Tempo deve ser maior From Time
 DocType: Journal Entry Account,Exchange Rate,Taxa de Câmbio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Armazém {0}: Conta Mestre {1} não pertence à empresa {2}
 DocType: BOM,Last Purchase Rate,Valor da última compra
 DocType: Account,Asset,Ativo
@@ -3029,7 +3059,7 @@
 ,Available Stock for Packing Items,Estoque disponível para o empacotamento de Itens
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"A definição desse modelo de endereço como padrão, pois não há outro padrão"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo já está em débito, você não tem permissão para definir 'saldo deve ser' como 'crédito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo já está em débito, você não tem permissão para definir 'saldo deve ser' como 'crédito'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
 DocType: Production Planning Tool,Filter based on customer,Filtrar baseado em cliente
 DocType: Payment Tool Detail,Against Voucher No,Contra a folha no
@@ -3046,6 +3076,7 @@
 DocType: Opportunity,Next Contact,Próximo Contato
 DocType: Employee,Employment Type,Tipo de emprego
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Imobilizado
+,Cash Flow,Fluxo de caixa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Período de aplicação não pode ser através de dois registros de alocação
 DocType: Item Group,Default Expense Account,Conta Padrão de Despesa
 DocType: Employee,Notice (days),Aviso Prévio ( dias)
@@ -3077,13 +3108,12 @@
 DocType: Production Order,Warehouses,Armazéns
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Imprimir e estacionária
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Grupo de nós
-DocType: Payment Reconciliation,Minimum Amount,Valor mínimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Atualizar Produtos Acabados
 DocType: Workstation,per hour,por hora
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Conta para o armazém ( inventário permanente ) será criado nessa conta.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Armazém não pode ser excluído pois existe entrada de material para este armazém.
 DocType: Company,Distribution,Distribuição
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Valor pago
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Valor pago
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,expedição
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}%
@@ -3101,13 +3131,13 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,pedido
 DocType: Warehouse,Warehouse Name,Nome do Almoxarifado
 DocType: Naming Series,Select Transaction,Selecione a Transação
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, indique Aprovando Papel ou aprovar Usuário"
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, indique Função Aprovadora ou Usuário Aprovador"
 DocType: Journal Entry,Write Off Entry,Escrever Off Entry
 DocType: BOM,Rate Of Materials Based On,Taxa de materiais com base em
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Análise de Pós-Vendas
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Não exite uma empresa relacionada nos armazéns {0}
 DocType: POS Profile,Terms and Conditions,Termos e Condições
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Para data deve ser dentro do exercício social. Assumindo Para Date = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Para data deve ser dentro do exercício social. Assumindo Para Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aqui você pode manter a altura, peso, alergias, preocupações médica, etc"
 DocType: Leave Block List,Applies to Company,Aplica-se a Empresa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar por causa da entrada submetido {0} existe
@@ -3121,11 +3151,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Digite recibos de compra
 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 +425,Transaction not allowed against stopped Production Order {0},Transação não é permitido contra parou Ordem de produção {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,Transaction not allowed against stopped Production Order {0},Transação não é permitido contra parou Ordem de produção {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 definir esse Ano Fiscal como padrão , clique em ' Definir como padrão '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuração do servidor de entrada de emails para suporte. ( por exemplo pos-vendas@examplo.com.br )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Escassez Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Salary Slip,Salary Slip,Folha de pagamento
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Data Final' é necessária
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gerar deslizamentos de embalagem para os pacotes a serem entregues. Usado para notificar número do pacote, o conteúdo do pacote e seu peso."
@@ -3214,7 +3244,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Registros de funcionários.
 DocType: HR Settings,Payroll Settings,Configurações da folha de pagamento
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Combinar Faturas e Pagamentos não relacionados.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Faça a encomenda
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Faça a encomenda
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root não pode ter um centro de custos pai
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Selecione o cadastro ...
 DocType: Sales Invoice,C-Form Applicable,Formulário-C Aplicável
@@ -3229,7 +3259,7 @@
 DocType: Appraisal,Start Date,Data de Início
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Alocar licenças por um período.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Clique aqui para verificar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Conta {0}: Você não pode definir ela mesma como uma conta principal
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Conta {0}: Você não pode definir ela mesma como uma conta principal
 DocType: Purchase Invoice Item,Price List Rate,Taxa de Lista de Preços
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Mostrar &quot;Em Stock&quot; ou &quot;Fora de Estoque&quot; baseado no estoque disponível neste almoxarifado.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Lista de Materiais (LDM)
@@ -3238,17 +3268,17 @@
 DocType: Project,Expected Start Date,Data Inicial prevista
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Remover item, se as cargas não é aplicável a esse elemento"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Por exemplo: smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Receber
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Receber
 DocType: Maintenance Visit,Fully Completed,Totalmente concluída
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% concluída
 DocType: Employee,Educational Qualification,Qualificação Educacional
 DocType: Workstation,Operating Costs,Custos Operacionais
 DocType: Employee Leave Approver,Employee Leave Approver,Licença do Funcionário Aprovada
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} foi adicionada com sucesso à nossa lista Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Não pode declarar como perdido , porque Cotação foi feita."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Compra Mestre Gerente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Ordem de produção {0} deve ser apresentado
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Ordem de produção {0} deve ser apresentado
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Por favor seleccione Data de início e data de término do item {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Relatórios principais
 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
@@ -3266,7 +3296,7 @@
 DocType: Industry Type,Industry Type,Tipo de indústria
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Algo deu errado!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Aviso: pedido de férias contém as datas de intervalos
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data de Conclusão
 DocType: Purchase Invoice Item,Amount (Company Currency),Amount (Moeda Company)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organização unidade (departamento) mestre.
@@ -3285,10 +3315,10 @@
 ,Serial No Service Contract Expiry,Vencimento do Contrato de Serviço com Nº de Série
 DocType: Item,Unit of Measure Conversion,Unidade de Conversão de Medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empregado não pode ser alterado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Você não pode ter débito e crédito na mesma conta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Você não pode ter débito e crédito na mesma conta
 DocType: Naming Series,Help HTML,Ajuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total atribuído deve ser de 100 %. É {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nome da pessoa ou organização a que este endereço pertence.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Seus Fornecedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Não é possível definir como perdida como ordem de venda é feita.
@@ -3301,35 +3331,35 @@
 DocType: Employee,Date of Issue,Data de Emissão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: A partir de {0} para {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
 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 no site.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,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/accounts/doctype/journal_entry/journal_entry.py +295,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 +62,Item: {0} does not exist in the system,Item: {0} não existe no sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Você não está autorizado para definir o valor congelado
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,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 Unreconciled Entradas
+DocType: Payment Reconciliation,From Invoice Date,A partir de Data de Fatura
 DocType: Cost Center,Budgets,Orçamentos
-DocType: Employee,Emergency Contact Details,Detalhes do Contato de Emergência
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,O que isto faz ?
 DocType: Delivery Note,To Warehouse,Para Almoxarifado
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},A Conta {0} foi inserida mais de uma vez para o ano fiscal {1}
 ,Average Commission Rate,Taxa de Comissão Média
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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 +34,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
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Atualize custos adicionais para calcular o custo desembarcado de itens
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,elétrico
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença Valor Total (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID do usuário não definido para Funcionário {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,A partir da solicitação de garantia
 DocType: Stock Entry,Default Source Warehouse,Almoxarifado da origem padrão
 DocType: Item,Customer Code,Código do Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Lembrete de aniversário para {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dias desde a última ordem
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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,Séries nomeadas
 DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ativos estoque
@@ -3342,7 +3372,7 @@
 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
 DocType: Authorization Rule,Based On,Baseado em
 DocType: Sales Order Item,Ordered Qty,ordenada Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Item {0} está desativada
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Item {0} está desativada
 DocType: Stock Settings,Stock Frozen Upto,Estoque congelado até
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Período Do período Para datas e obrigatórias para os recorrentes {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Atividade / tarefa do projeto.
@@ -3350,7 +3380,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escrever Off Montante (Companhia de moeda)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,"Row # {0}: Por favor, defina a quantidade de reabastecimento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,"Row # {0}: Por favor, defina a quantidade de reabastecimento"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Comprovante Custo
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Defina {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Repita no Dia do Mês
@@ -3378,14 +3408,14 @@
 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.","Exemplo:. ABCD ##### 
  Se série é ajustada e número de série não é mencionado em transações, número de série, em seguida automática será criado com base nesta série. Se você sempre quis mencionar explicitamente Serial Nos para este item. deixe em branco."
 DocType: Upload Attendance,Upload Attendance,Enviar Presenças
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM e Manufatura Quantidade são obrigatórios
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,A LDM e a Quantidade para Fabricação são obrigatórios
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Faixa Envelhecimento 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Quantidade
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Quantidade
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,LDM substituída
 ,Sales Analytics,Analítico de Vendas
 DocType: Manufacturing Settings,Manufacturing Settings,Configurações de Fabricação
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurando Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,"Por favor, indique moeda padrão in Company Mestre"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,"Por favor, indique moeda padrão in Company Mestre"
 DocType: Stock Entry Detail,Stock Entry Detail,Detalhe do lançamento no Estoque
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Lembretes diários
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflitos regra fiscal com {0}
@@ -3395,7 +3425,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,atendimento ao cliente
 DocType: Item,Thumbnail,Miniatura
 DocType: Item Customer Detail,Item Customer Detail,Detalhe do Cliente do Item
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirme Seu Email
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirme seu e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta candidato a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Solicitar e-mail no envio da
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Total de folhas alocados são mais do que dias no período
@@ -3411,13 +3441,13 @@
 DocType: Sales Order Item,Produced Quantity,Quantidade produzida
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,engenheiro
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Pesquisa subconjuntos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Código do item exigido no Row Não {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Código do item exigido no Row Não {0}
 DocType: Sales Partner,Partner Type,Tipo de parceiro
 DocType: Purchase Taxes and Charges,Actual,Atual
 DocType: Authorization Rule,Customerwise Discount,Desconto referente ao Cliente
 DocType: Purchase Invoice,Against Expense Account,Contra a Conta de Despesas
 DocType: Production Order,Production Order,Ordem de Produção
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
 DocType: Quotation Item,Against Docname,Contra o Docname
 DocType: SMS Center,All Employee (Active),Todos os Empregados (Ativos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Agora
@@ -3429,15 +3459,15 @@
 DocType: Employee,Applicable Holiday List,Lista de Férias Aplicável
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Série Atualizado
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Tipo de relatório é obrigatória
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Tipo de relatório é obrigatória
 DocType: Item,Serial Number Series,Serial Series Número
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Armazém é obrigatória para stock o item {0} na linha {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
 DocType: Issue,First Responded On,Primeira resposta em
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Listagem cruzada dos produtos que pertencem à vários grupos
 apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,O primeiro usuário : Você
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ano Fiscal Data de Início e Término do Exercício Social Data já estão definidos no ano fiscal de {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliados com sucesso
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ano Fiscal Data de Início e Término do Exercício Social Data já estão definidos no ano fiscal de {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Reconciliados com sucesso
 DocType: Production Order,Planned End Date,Planejado Data de Término
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Onde os itens são armazenados.
 DocType: Tax Rule,Validity,Validade
@@ -3445,7 +3475,7 @@
 DocType: Attendance,Attendance,Comparecimento
 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 controlada, a lista deverá ser adicionado a cada departamento onde tem de ser aplicado."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Data e postagem Posting tempo é obrigatório
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Data e postagem Posting tempo é obrigatório
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Modelo de impostos para a compra de transações.
 ,Item Prices,Preços de itens
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Por extenso será visível quando você salvar a Ordem de Compra.
@@ -3454,15 +3484,15 @@
 DocType: Task,Review Date,Data da Revisão
 DocType: Purchase Invoice,Advance Payments,Adiantamentos
 DocType: Purchase Taxes and Charges,On Net Total,No Total Líquido
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,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/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/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Sem permissão para usar ferramenta de pagamento
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,O 'Endereço de Email para Notificação' não foi especificado para %s recorrente
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Termine Conta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,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 pai
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Mudança
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Alteração
 DocType: Purchase Invoice,Contact Email,E-mail do Contato
 DocType: Appraisal Goal,Score Earned,Pontuação Obtida
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","por exemplo "" My Company LLC"""
@@ -3472,13 +3502,13 @@
 DocType: Packing Slip,Gross Weight UOM,UDM do Peso Bruto
 DocType: Email Digest,Receivables / Payables,Contas a receber / contas a pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra a Nota Fiscal de Venda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Conta de crédito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Conta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Custo de desembarque do Item
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores de zero
 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,Receber Conta / Payable
 DocType: Delivery Note Item,Against Sales Order Item,Contra a Ordem de venda do item
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
 DocType: Item,Default Warehouse,Armazém padrão
 DocType: Task,Actual End Date (via Time Logs),Data de Encerramento Real (via Registros de Tempo)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Orçamento não pode ser atribuído contra a conta de grupo {0}
@@ -3505,7 +3535,7 @@
 DocType: Purchase Invoice,Total Advance,Antecipação Total
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Processamento de folha de pagamento
 DocType: Opportunity Item,Basic Rate,Taxa Básica
-DocType: GL Entry,Credit Amount,Quantidade de crédito
+DocType: GL Entry,Credit Amount,Total de crédito
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Definir como perdida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,O pagamento Recibo Nota
 DocType: Customer,Credit Days Based On,Dias crédito com base em
@@ -3514,29 +3544,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planejar logs de tempo fora do horário de trabalho estação de trabalho.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} já foi enviado
 ,Items To Be Requested,Itens a ser solicitado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Obter Valor da Última Compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Preço para Facturação com base no tipo de atividade (por hora)
 DocType: Company,Company Info,Informações da Empresa
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","E-mail ID da Empresa não foi encontrado , portanto o e-mail não pode ser enviado"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Fundos de Aplicação ( Ativos )
 DocType: Production Planning Tool,Filter based on item,Filtrar baseado no item
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Conta de debito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Conta de Débito
 DocType: Fiscal Year,Year Start Date,Data do início do ano
 DocType: Attendance,Employee Name,Nome do Funcionário
 DocType: Sales Invoice,Rounded Total (Company Currency),Total arredondado (Moeda Company)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Não é possível converter para o Grupo, pois o tipo de conta é selecionado."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Não é possível converter para o Grupo, pois o tipo de conta é selecionado."
 DocType: Purchase Common,Purchase Common,Compras comum
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} foi modificado . Por favor, atualize ."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Pare de usuários de fazer aplicações deixam nos dias seguintes.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,De Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefícios a Empregados
 DocType: Sales Invoice,Is POS,É PDV
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
 DocType: Production Order,Manufactured Qty,Qtde. fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceita
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} não existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Faturas levantdas para Clientes.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projeto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} assinantes acrescentados
 DocType: Maintenance Schedule,Schedule,Agendar
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definir orçamento para este centro de custo. Para definir a ação orçamento, consulte &quot;Lista de Empresas&quot;"
@@ -3544,7 +3575,7 @@
 DocType: Quality Inspection Reading,Reading 3,Leitura 3
 ,Hub,Cubo
 DocType: GL Entry,Voucher Type,Tipo de comprovante
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
 DocType: Expense Claim,Approved,Aprovado
 DocType: Pricing Rule,Price,Preço
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda'
@@ -3558,7 +3589,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Lançamentos no livro Diário.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Quantidade disponível no Armazém A partir de
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / conta não coincide com {1} / {2} em {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / conta não coincide com {1} / {2} em {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para criar uma conta de impostos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Por favor insira Conta Despesa
 DocType: Account,Stock,Estoque
@@ -3569,7 +3600,7 @@
 DocType: Employee,Contract End Date,Data Final do contrato
 DocType: Sales Order,Track this Sales Order against any Project,Acompanhar este Ordem de Venda contra qualquer projeto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Puxar as Ordens de Venda (pendentes de entrega) com base nos critérios acima
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,De Fornecedor Cotação
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,De Fornecedor Cotação
 DocType: Deduction Type,Deduction Type,Tipo de dedução
 DocType: Attendance,Half Day,Parcial
 DocType: Pricing Rule,Min Qty,Quantidade mínima
@@ -3577,7 +3608,7 @@
 DocType: GL Entry,Transaction Date,Data da Transação
 DocType: Production Plan Item,Planned Qty,Qtde. planejada
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Fiscal total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Para Quantidade (fabricado Qtde) é obrigatório
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Para Quantidade (fabricado Qtde) é obrigatório
 DocType: Stock Entry,Default Target Warehouse,Almoxarifado de destino padrão
 DocType: Purchase Invoice,Net Total (Company Currency),Total Líquido (Moeda Company)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tipo e partido só é aplicável contra a receber / a pagar contas
@@ -3631,9 +3662,9 @@
 DocType: Customer,Commission Rate,Taxa de Comissão
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Faça Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquear licenças por departamento.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Carrinho está vazio
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,O carrinho está vazio
 DocType: Production Order,Actual Operating Cost,Custo Operacional Real
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root não pode ser editado .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root não pode ser editado .
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Montante atribuído não pode superior à quantia não ajustada
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir a produção em feriados
 DocType: Sales Order,Customer's Purchase Order Date,Do Cliente Ordem de Compra Data
@@ -3644,11 +3675,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,estilista
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Modelo de Termos e Condições
 DocType: Serial No,Delivery Details,Detalhes da entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Criar automaticamente um pedido de material se a quantidade for inferior a este nível
 ,Item-wise Purchase Register,Item-wise Compra Register
 DocType: Batch,Expiry Date,Data de validade
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
 ,Supplier Addresses and Contacts,Fornecedor Endereços e contatos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Por favor seleccione Categoria primeira
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Cadastro de Projeto.
@@ -3656,15 +3687,15 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Meio Dia)
 DocType: Supplier,Credit Days,Dias de Crédito
 DocType: Leave Type,Is Carry Forward,É encaminhado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obter itens de BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Obter itens de BOM
 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/config/manufacturing.py +120,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Lista de Materiais
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tipo e partido é necessário para receber / pagar conta {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motivo da saída
 DocType: Expense Claim Detail,Sanctioned Amount,Quantidade sancionada
 DocType: GL Entry,Is Opening,É abertura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débito entrada não pode ser ligado a uma {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,A Conta {0} não existe
-DocType: Account,Cash,Numerário
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débito entrada não pode ser ligado a uma {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,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 3486ee8..85e76ce 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,produtos para o Consumidor
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, selecione Partido Tipo primeiro"
 DocType: Item,Customer Items,Itens de clientes
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Conta {0}: conta principal {1} não pode ser um livro
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Conta {0}: conta principal {1} não pode ser um livro
 DocType: Item,Publish Item to hub.erpnext.com,Publicar Item para hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Notificações de e-mail
 DocType: Item,Default Unit of Measure,Unidade de medida padrão
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Moeda é necessário para Preço de {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado na transação.
 DocType: Purchase Order,Customer Contact,Contato do cliente
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Van Materiaal Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Van Materiaal Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árvore
 DocType: Job Applicant,Job Applicant,Candidato a emprego
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Não há mais resultados.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Usar esta opção para manter o código do item a nível de clientes e para torná-los pesquisáveis com base em seu código
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mostrar Variantes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Quantidade
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Quantidade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Empréstimos ( Passivo)
 DocType: Employee Education,Year of Passing,Ano de Passagem
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Em Estoque
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Cuidados de Saúde
 DocType: Purchase Invoice,Monthly,Mensal
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Atraso no pagamento (Dias)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Endereço De Email
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Ano Fiscal {0} é necessária
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,defesa
 DocType: Company,Abbr,Abrv
 DocType: Appraisal Goal,Score (0-5),Pontuação (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} não corresponde com {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} não corresponde com {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,No veículo
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, selecione Lista de Preço"
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,"Por favor, selecione Lista de Preço"
 DocType: Production Order Operation,Work In Progress,Trabalho em andamento
 DocType: Employee,Holiday List,Lista de Feriados
 DocType: Time Log,Time Log,Tempo Log
@@ -99,13 +99,13 @@
 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: Employee,Married,Casado
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Não permitido para {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
 DocType: Payment Reconciliation,Reconcile,conciliar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Mercearia
 DocType: Quality Inspection Reading,Reading 1,Leitura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Faça Banco Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundos de Pensão
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Warehouse é obrigatória se o tipo de conta é Warehouse
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Warehouse é obrigatória se o tipo de conta é Warehouse
 DocType: SMS Center,All Sales Person,Todos os vendedores
 DocType: Lead,Person Name,Nome Pessoa
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Verifique se a ordem recorrentes, desmarque a opção de parar recorrentes ou colocar adequada Data de Término"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Interessado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiais
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Abertura
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},A partir de {0} a {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},A partir de {0} a {1}
 DocType: Item,Copy From Item Group,Copiar do item do grupo
 DocType: Journal Entry,Opening Entry,Abertura Entry
 DocType: Stock Entry,Additional Costs,Custos adicionais
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Conta com a transação existente não pode ser convertido em grupo.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Conta com a transação existente não pode ser convertido em grupo.
 DocType: Lead,Product Enquiry,Produto Inquérito
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Gelieve eerst in bedrijf
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Por favor, selecione Empresa primeiro"
 DocType: Employee Education,Under Graduate,Sob graduação
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Custo Total
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Atividade:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
@@ -165,7 +165,7 @@
 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","Baixe o Template, preencha os dados apropriados e anexe o arquivo modificado.
  Todas as datas e empregado combinação no período selecionado virá no modelo, com registros de freqüência existentes"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,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/stock/doctype/stock_entry/stock_entry.py +447,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
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Será atualizado após a factura de venda é submetido.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Configurações para o Módulo HR
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Os detalhes das operações realizadas.
 DocType: Serial No,Maintenance Status,Estado de manutenção
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Itens e Preços
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de data deve estar dentro do ano fiscal. Assumindo De Date = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de data deve estar dentro do ano fiscal. Assumindo De Date = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Selecione o funcionário para quem você está criando a Avaliação.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centro de Custo {0} não pertence a Empresa {1}
 DocType: Customer,Individual,Individual
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Vul Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra Vendas Nota Fiscal do Item
 ,Production Orders in Progress,Productieorders in Progress
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Caixa Líquido de Financiamento
 DocType: Lead,Address & Contact,Endereço e contacto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Acrescente as folhas não utilizadas de atribuições anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Nome de Contato
 DocType: Production Plan Item,SO Pending Qty,Está pendente de Qtde
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria folha de salário para os critérios acima mencionados.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Sem descrição dada
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pedido de compra.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Aliviar A data deve ser maior que Data de Juntando
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,Especificação Site item
 DocType: Payment Tool,Reference No,Número de referência
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Deixe Bloqueados
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Da Reconciliação item
 DocType: Stock Entry,Sales Invoice No,Vendas factura n
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Tipo de fornecedor
 DocType: Item,Publish in Hub,Publicar em Hub
 ,Terretory,terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Item {0} é cancelada
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Pedido de material
 DocType: Bank Reconciliation,Update Clearance Date,Atualize Data Liquidação
 DocType: Item,Purchase Details,Detalhes de compra
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} não encontrado em &#39;matérias-primas fornecidas &quot;na tabela Ordem de Compra {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} não encontrado em &#39;matérias-primas fornecidas &quot;na tabela Ordem de Compra {1}
 DocType: Employee,Relation,Relação
 DocType: Shipping Rule,Worldwide Shipping,Envio para todo o planeta
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Confirmado encomendas de clientes.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Sugestões
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Definir item Group-wise orçamentos sobre este território. Você também pode incluir sazonalidade, definindo a distribuição."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Digite grupo conta pai para armazém {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagamento contra {0} {1} não pode ser maior do que Outstanding Montante {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagamento contra {0} {1} não pode ser maior do que Outstanding Montante {2}
 DocType: Supplier,Address HTML,Endereço HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Gerar Agende
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Último
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caracteres
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,O primeiro Deixe Approver na lista vai ser definido como o Leave Approver padrão
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Aprender
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Custo atividade por Funcionário
 DocType: Accounts Settings,Settings for Accounts,Definições para contas
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Gerenciar Vendas Pessoa Tree.
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Multi Moeda
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Fatura
 DocType: Sales Invoice Item,Delivery Note,Guia de remessa
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configurando Impostos
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configurando Impostos
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} entrou duas vezes no item Imposto
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} entrou duas vezes no item Imposto
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumo para esta semana e atividades pendentes
 DocType: Workstation,Rent Cost,Kosten huur
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecione mês e ano
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponível em BOM, nota de entrega , factura de compra , ordem de produção , ordem de compra , Recibo de compra , nota fiscal de venda , ordem de venda , Stock entrada , quadro de horários"
 DocType: Item Tax,Tax Rate,Taxa de Imposto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} já alocado para Employee {1} para {2} período para {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Selecionar item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Selecionar item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} gerido por lotes, não pode ser conciliada com \
  da Reconciliação, em vez usar da Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lote n deve ser o mesmo que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converter para não-Grupo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Recibo de compra devem ser apresentados
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,médico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Reden voor het verliezen
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation é fechado nas seguintes datas, conforme lista do feriado: {0}"
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunidades
 DocType: Employee,Single,Único
 DocType: Issue,Attachment,Acessório
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Orçamento não pode ser definido para o grupo de centro de custo
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 Upto
 DocType: SMS Log,Sent On,Enviado em
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,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 +563,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. ,Registro de empregado é criado usando o campo selecionado.
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Férias Principais.
 DocType: Material Request Item,Required Date,Data Obrigatória
 DocType: Delivery Note,Billing Address,Endereço de Cobrança
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Vul Item Code .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Vul Item Code .
 DocType: BOM,Costing,Custeio
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se selecionado, o valor do imposto será considerado como já incluído na tarifa Impressão / Quantidade de impressão"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Qtde
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Vul Warehouse waarvoor Materiaal Request zal worden verhoogd
 DocType: Production Order,Additional Operating Cost,Custo Operacional adicionais
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"To merge, following properties must be same for both items","Te fuseren , moeten volgende eigenschappen hetzelfde zijn voor beide posten"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","Te fuseren , moeten volgende eigenschappen hetzelfde zijn voor beide posten"
 DocType: Shipping Rule,Net Weight,Peso Líquido
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Caducidade Não Serial Garantia
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Incremento não pode ser 0
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Excluir Transações Companhia
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Item {0} não é comprar item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Item {0} não é comprar item
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} é um endereço de e-mail inválido em 'Notificação \
  o endereço de email"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Faturamento total este ano:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adicionar / Editar Impostos e Taxas
 DocType: Purchase Invoice,Supplier Invoice No,Fornecedor factura n
 DocType: Territory,For reference,Para referência
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível excluir Serial No {0}, como ele é usado em transações de ações"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Fechamento (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Fechamento (Cr)
 DocType: Serial No,Warranty Period (Days),Período de Garantia (Dias)
 DocType: Installation Note Item,Installation Note Item,Item Nota de Instalação
 ,Pending Qty,Pendente Qtde
@@ -466,7 +469,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribuição Mensal** ajuda a distribuir o seu orçamento durante meses, se você tem a sazonalidade em seu negócio.
 
  Para distribuir um orçamento usando esta distribuição, introduzir o campo **Distribuição Mensal** no **Centro de Custo **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, selecione Companhia e Festa Tipo primeiro"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Exercício / contabilidade.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry , kan de serienummers niet worden samengevoegd"
@@ -474,9 +477,9 @@
 DocType: Project Task,Project Task,Projeto Tarefa
 ,Lead Id,lead Id
 DocType: C-Form Invoice Detail,Grand Total,Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
 DocType: Warranty Claim,Resolution,Resolução
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Entregue: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Entregue: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Conta a Pagar
 DocType: Sales Order,Billing and Delivery Status,Faturamento e Entrega Estado
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita os clientes
@@ -491,7 +494,7 @@
 DocType: Quotation,Quotation To,Orçamento Para
 DocType: Lead,Middle Income,Rendimento Médio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Abertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 outro UOM. Você precisará criar um novo item para usar um UOM padrão diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +711,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 outro UOM. Você precisará criar um novo item para usar um UOM padrão diferente.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Montante atribuído não pode ser negativo
 DocType: Purchase Order Item,Billed Amt,Faturado Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um armazém lógico contra o qual as entradas em existências são feitas.
@@ -500,7 +503,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordem de produção é obrigatória
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Proposta Redação
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Outro Vendas Pessoa {0} existe com o mesmo ID de Employee
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Banco de Erro ( {6} ) para item {0} no Armazém {1} em {2} {3} em {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Banco de Erro ( {6} ) para item {0} no Armazém {1} em {2} {3} em {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal Empresa
 DocType: Packing Slip Item,DN Detail,Detalhe DN
 DocType: Time Log,Billed,Faturado
@@ -519,16 +522,17 @@
 DocType: Activity Type,Default Costing Rate,A taxa de custeio padrão
 DocType: Maintenance Schedule,Maintenance Schedule,Programação de Manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Então Preços Regras são filtradas com base no Cliente, Grupo de Clientes, Território, fornecedor, fornecedor Tipo, Campanha, Parceiro de vendas etc"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Mudança na Net Inventory
 DocType: Employee,Passport Number,Número do Passaporte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,gerente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,De Recibo de compra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,De Recibo de compra
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
 DocType: SMS Settings,Receiver Parameter,Parâmetro receptor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseado em' e ' Agrupado por ' não pode ser o mesmo
 DocType: Sales Person,Sales Person Targets,Metas de vendas Pessoa
 DocType: Production Order Operation,In minutes,Em questão de minutos
 DocType: Issue,Resolution Date,Data resolução
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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,Cliente de nomeação
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Converteren naar Groep
 DocType: Activity Cost,Activity Type,Tipo de Atividade
@@ -539,7 +543,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Projetos de Usuário
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela detalhes da fatura.
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela detalhes da fatura.
 DocType: Company,Round Off Cost Center,Termine Centro de Custo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenção Visita {0} deve ser cancelado antes de cancelar esta ordem de venda
 DocType: Material Request,Material Transfer,Transferência de Material
@@ -561,13 +565,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para acompanhar o item em documentos de vendas e de compras com base em seus números de ordem. Este é também pode ser usada para rastrear detalhes sobre a garantia do produto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock atual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Verworpen Warehouse is verplicht tegen regected post
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Faturamento total este ano
 DocType: Account,Expenses Included In Valuation,Despesas incluídos na avaliação
 DocType: Employee,Provide email id registered in company,Fornecer ID e-mail registrado na empresa
 DocType: Hub Settings,Seller City,Vendedor Cidade
 DocType: Email Digest,Next email will be sent on:,Próximo e-mail será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Oferecer Carta Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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 da
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,boom Type
@@ -585,18 +589,18 @@
 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 próxima fatura será gerada. Ele é gerado em 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 +92,{0} is not a stock Item,{0} não é um item de stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} não é um item de stock
 DocType: Mode of Payment Account,Default Account,Conta Padrão
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Fila deve ser definido se Opportunity é feito de chumbo
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Por favor seleccione dia de folga semanal
 DocType: Production Order Operation,Planned End Time,Planned End Time
 ,Sales Person Target Variance Item Group-Wise,Vendas Pessoa Alvo Variance item Group-wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Conta com a transação existente não pode ser convertido em livro
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Conta com a transação existente não pode ser convertido em livro
 DocType: Delivery Note,Customer's Purchase Order No,Ordem de Compra do Cliente Não
 DocType: Employee,Cell Number,Número de células
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Pedidos de Materiais Auto Gerado
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Você não pode entrar comprovante atual em 'Against Journal Entry' coluna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Você não pode entrar comprovante atual em 'Against Journal Entry' coluna
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,Oportunidade De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Declaração salário mensal.
@@ -605,9 +609,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Lançamentos contábeis podem ser feitas contra nós folha. Entradas contra grupos não são permitidos.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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: Opportunity,Maintenance,Manutenção
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Número Recibo de compra necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Número Recibo de compra necessário para item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atributo Valor
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campanhas de vendas .
 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.
@@ -665,7 +669,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Lista de Preço não selecionado
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Process Payroll,Send Email,Enviar E-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nenhuma permissão
 DocType: Company,Default Bank Account,Conta Bancária Padrão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar baseado em Festa, selecione Partido Escreva primeiro"
@@ -673,7 +677,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Os itens com maior weightage será mostrado maior
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banco Detalhe Reconciliação
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Minhas Faturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Minhas Faturas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nenhum funcionário encontrado
 DocType: Purchase Order,Stopped,Parado
 DocType: Item,If subcontracted to a vendor,Se subcontratada a um fornecedor
@@ -683,6 +687,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nu verzenden
 ,Support Analytics,Analytics apoio
 DocType: Item,Website Warehouse,Armazém site
+DocType: Payment Reconciliation,Minimum Invoice Amount,Montante Mínimo de Fatura
 DocType: Sales 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,Score moet lager dan of gelijk aan 5 zijn
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C -Form platen
@@ -692,7 +697,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Para ativar &quot;Point of Sale&quot; recursos
 DocType: Bin,Moving Average Rate,Movendo Taxa Média
 DocType: Production Planning Tool,Select Items,Selecione itens
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra conta {1} com a data de {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} contra conta {1} com a data de {2}
 DocType: Maintenance Visit,Completion Status,Status de conclusão
 DocType: Sales Invoice Item,Target Warehouse,Armazém alvo
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir sobre a entrega ou recebimento até esta cento
@@ -704,7 +709,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compor automaticamente mensagem na apresentação de transações.
 DocType: Production Order,Item To Manufacture,Item Para Fabricação
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} estatuto é {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordem de Compra para pagamento
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ordem de Compra para pagamento
 DocType: Sales Order Item,Projected Qty,Qtde Projetada
 DocType: Sales Invoice,Payment Due Date,Betaling Due Date
 DocType: Newsletter,Newsletter Manager,Boletim Gerente
@@ -728,7 +733,7 @@
 DocType: Sales Invoice Item,Stock Details,Detalhes da
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor do projeto
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Ponto de venda
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo já em crédito, você não tem permissão para definir 'saldo deve ser' como 'débito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo já em crédito, você não tem permissão para definir 'saldo deve ser' como 'débito'"
 DocType: Account,Balance must be,Equilíbrio deve ser
 DocType: Hub Settings,Publish Pricing,Publicar Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Relatório de Despesas Rejeitado Mensagem
@@ -751,7 +756,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Mestre taxa de câmbio .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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 +421,BOM {0} must be active,BOM {0} deve ser ativo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} deve ser ativo
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Por favor, selecione o tipo de documento primeiro"
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Deixe Quantidade cobrança
@@ -769,17 +774,17 @@
 DocType: Supplier,Default Payable Accounts,Contas a Pagar Padrão
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empregado {0} não está ativo ou não existe
 DocType: Features Setup,Item Barcode,Código de barras do item
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Variantes item {0} atualizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Variantes item {0} atualizado
 DocType: Quality Inspection Reading,Reading 6,Leitura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Compra Antecipada Fatura
 DocType: Address,Shop,Loja
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrada de crédito não pode ser ligado com uma {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrada de crédito não pode ser ligado com uma {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conta padrão Banco / Cash será atualizado automaticamente na fatura POS quando este modo for selecionado.
 DocType: Employee,Permanent Address Is,Vast adres
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operação concluída por quantos produtos acabados?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,A Marca
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Provisão para over-{0} cruzou para item {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Provisão para over-{0} cruzou para item {1}.
 DocType: Employee,Exit Interview Details,Sair Detalhes Entrevista
 DocType: Item,Is Purchase Item,É item de compra
 DocType: Journal Entry Account,Purchase Invoice,Compre Fatura
@@ -791,7 +796,7 @@
 DocType: Salary Slip,Total in words,Total em palavras
 DocType: Material Request Item,Lead Time Date,Chumbo Data Hora
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,é mandatório. Talvez recorde de câmbios não é criado para
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Favor especificar Sem Serial para item {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Favor especificar Sem Serial para item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Para os itens &#39;pacote de produtos &quot;, Armazém, Serial e não há Batch Não será considerada a partir do&#39; Packing List &#39;tabela. Se Warehouse e Batch Não são as mesmas para todos os itens de embalagem para qualquer item de &#39;Bundle Produto&#39;, esses valores podem ser inseridos na tabela do item principal, os valores serão copiados para &#39;Packing List&#39; tabela."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Os embarques para os clientes.
 DocType: Purchase Invoice Item,Purchase Order Item,Comprar item Ordem
@@ -800,14 +805,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variação
 ,Company Name,Nome da empresa
 DocType: SMS Center,Total Message(s),Mensagem total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Selecionar item para Transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 cabeça conta do banco onde cheque foi depositado.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir ao utilizador editar Taxa de Lista de Preços em transações
 DocType: Pricing Rule,Max Qty,Max Qtde
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: O pagamento contra Vendas / Ordem de Compra deve ser sempre marcado como antecedência
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,químico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
 DocType: Process Payroll,Select Payroll Year and Month,Selecione Payroll ano e mês
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Vá para o grupo apropriado (geralmente Aplicação de Fundos&gt; Ativo Circulante&gt; Contas Bancárias e criar uma nova conta (clicando em Adicionar filho) do tipo &quot;Banco&quot;
 DocType: Workstation,Electricity Cost,elektriciteitskosten
@@ -821,10 +827,10 @@
 DocType: SMS Center,All Lead (Open),Todos chumbo (Aberto)
 DocType: Purchase Invoice,Get Advances Paid,Obter adiantamentos pagos
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Anexar a sua imagem
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Fazer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Fazer
 DocType: Journal Entry,Total Amount in Words,Valor Total em Palavras
 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 je niet hebt opgeslagen het formulier . Neem dan contact support@erpnext.com als het probleem aanhoudt .
-apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Meu carrinho
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Meu carrinho
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tipo de Ordem deve ser uma das {0}
 DocType: Lead,Next Contact Date,Data Contato próximo
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Opening Aantal
@@ -843,10 +849,10 @@
 DocType: POS Profile,Cash/Bank Account,Caixa / Banco Conta
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
 DocType: Delivery Note,Delivery To,Entrega
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Tabela de atributo é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,Tabela de atributo é obrigatório
 DocType: Production Planning Tool,Get Sales Orders,Obter Ordem de Vendas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} não pode ser negativo
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Desconto
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Desconto
 DocType: Features Setup,Purchase Discounts,Descontos de compra
 DocType: Workstation,Wages,Salário
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Será atualizado apenas se Tempo Log é &quot;Billable&quot;
@@ -871,7 +877,7 @@
 DocType: Tax Rule,Shipping State,Estado Envio
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"O artigo deve ser adicionado usando ""Obter itens de recibos de compra 'botão"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Despesas com Vendas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Compra padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Compra padrão
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Venda Padrão Centro de Custo
 DocType: Sales Partner,Implementation Partner,Parceiro de implementação
@@ -913,6 +919,7 @@
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrinho Rule Envio
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
 ,Ordered Items To Be Billed,Itens ordenados a ser cobrado
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gama tem de ser inferior à gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecione Time Logs e enviar para criar uma nova factura de venda.
@@ -922,13 +929,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Este lote Log O tempo tem sido anunciado.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Maak Opportunity
 DocType: Salary Slip,Leave Without Pay,Licença sem vencimento
-DocType: Supplier,Communications,communicatie
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacidade de erro Planejamento
 ,Trial Balance for Party,Balancete para o partido
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Ganhos
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Acabou item {0} deve ser digitado para a entrada Tipo de Fabricação
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Saldo de Contabilidade
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Acabou item {0} deve ser digitado para a entrada Tipo de Fabricação
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Saldo de Contabilidade
 DocType: Sales Invoice Advance,Sales Invoice Advance,Vendas antecipadas Fatura
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Niets aan te vragen
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' Data de início' não pode ser maior que 'Data Final '
@@ -970,7 +976,7 @@
 DocType: Global Defaults,Current Fiscal Year,Atual Exercício
 DocType: Global Defaults,Disable Rounded Total,Desativar total arredondado
 DocType: Lead,Call,Chamar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' Entradas ' não pode estar vazio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,' Entradas ' não pode estar vazio
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Linha duplicada {0} com o mesmo {1}
 ,Trial Balance,Balancete
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configurando Empregados
@@ -982,9 +988,9 @@
 DocType: Contact,User ID,ID de utilizador
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ver Diário
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais Cedo
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 mudar o nome do grupo de itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +444,"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 mudar o nome do grupo de itens"
 DocType: Production Order,Manufacture against Sales Order,Fabricação contra a Ordem de Vendas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resto do mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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 Variance Orçamento
 DocType: Salary Slip,Gross Pay,Salário bruto
@@ -1014,7 +1020,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obter Facturas Pendentes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Ordem de Vendas {0} não é válido
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeno
 DocType: Employee,Employee Number,Número de empregado
 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}
@@ -1027,13 +1033,13 @@
 DocType: Employee,Place of Issue,Local de Emissão
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,contrato
 DocType: Email Digest,Add Quote,Adicionar Citar
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Fator coversion UOM necessário para UOM: {0} no Item: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Fator coversion UOM necessário para UOM: {0} no Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Despesas Indiretas
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Quantidade é obrigatório
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,Uw producten of diensten
 DocType: Mode of Payment,Mode of Payment,Modo de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,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 +31,This is a root item group and cannot be edited.,Dit is een hoofditem groep en kan niet worden bewerkt .
 DocType: Journal Entry Account,Purchase Order,Ordem de Compra
 DocType: Warehouse,Warehouse Contact Info,Armazém Informações de Contato
@@ -1042,8 +1048,8 @@
 DocType: Email Digest,Annual Income,Rendimento anual
 DocType: Serial No,Serial No Details,Serial Detalhes Nenhum
 DocType: Purchase Invoice Item,Item Tax Rate,Taxa de Imposto item
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Entrega Nota {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Entrega Nota {0} não é submetido
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Equipamentos Capitais
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1053,7 +1059,7 @@
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data de entrega esperada é menor do que o planejado Data de Início.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,voor Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,voor Leverancier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Tipo de conta Definir ajuda na seleção desta conta em transações.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grande Total (moeda da empresa)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sainte total
@@ -1066,7 +1072,7 @@
 DocType: Journal Entry,Journal Entry,Diário de entradas
 DocType: Workstation,Workstation Name,Nome da Estação de Trabalho
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},O BOM {0} não pertencem ao Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} does not belong to Item {1},O BOM {0} não pertencem ao Item {1}
 DocType: Sales Partner,Target Distribution,Distribuição alvo
 DocType: Salary Slip,Bank Account No.,Banco Conta N º
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este é o número da última transacção criados com este prefixo
@@ -1098,7 +1104,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Newsletters para contatos, leva."
 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 devem ser 100. É {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,A operação não pode ser deixado em branco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,A operação não pode ser deixado em branco.
 ,Delivered Items To Be Billed,Itens entregues a ser cobrado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazijn kan niet worden gewijzigd voor Serienummer
 DocType: Authorization Rule,Average Discount,Desconto médio
@@ -1113,7 +1119,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},A partir de {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Descrição da operação
 DocType: Item,Will also apply to variants,Será também aplicável às variantes
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Não é possível alterar o Ano Fiscal Data de Início e Data de Fim Ano Fiscal uma vez que o Ano Fiscal é salvo.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Não é possível alterar o Ano Fiscal Data de Início e Data de Fim Ano Fiscal uma vez que o Ano Fiscal é salvo.
 DocType: Quotation,Shopping Cart,Carrinho de Compras
 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
 DocType: Pricing Rule,Campaign,Campanha
@@ -1124,7 +1130,8 @@
 DocType: Sales Order Item,Planned Quantity,Quantidade planejada
 DocType: Purchase Invoice Item,Item Tax Amount,Valor do imposto item
 DocType: Item,Maintain Stock,Manter da
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Alteração Líquida da Imobilização
 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 +517,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 +182,Max: {0},Max: {0}
@@ -1136,7 +1143,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plano de Contas
 DocType: Material Request,Terms and Conditions Content,Termos e Condições conteúdo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Item {0} não é um item de estoque
 DocType: Maintenance Visit,Unscheduled,Sem marcação
 DocType: Employee,Owned,Possuído
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de licença sem vencimento
@@ -1174,7 +1181,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub Assembléias
 DocType: Shipping Rule Condition,To Value,Ao Valor
 DocType: Supplier,Stock Manager,Da Gerente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Origem do Warehouse é obrigatória para a linha {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Origem do Warehouse é obrigatória para a linha {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Embalagem deslizamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,alugar escritório
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configurações de gateway SMS Setup
@@ -1182,10 +1189,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nenhum endereço adicionado ainda.
 DocType: Workstation Working Hour,Workstation Working Hour,Hora de Trabalho Workstation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
 DocType: Item,Inventory,Inventário
 DocType: Features Setup,"To enable ""Point of Sale"" view",Para ativar &quot;Point of Sale&quot; vista
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio
 DocType: Item,Sales Details,Detalhes de vendas
 DocType: Opportunity,With Items,Com Itens
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,in Aantal
@@ -1200,10 +1207,11 @@
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
 DocType: Sales Invoice,Source,Fonte
 DocType: Leave Type,Is Leave Without Pay,É licença sem vencimento
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Exercício Data de Início
 DocType: Employee External Work History,Total Experience,Experiência total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Fluxo de Caixa de Investimentos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos
 DocType: Material Request Item,Sales Order No,Vendas decreto n º
 DocType: Item Group,Item Group Name,Nome do Grupo item
@@ -1211,12 +1219,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiais de transferência para Fabricação
 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/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Taxa de compra para o item: {0} não foi encontrado, o que é necessário para reservar a entrada de contabilidade (despesa). Por favor, mencione preço do item em uma lista de preços de compra."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Taxa de compra para o item: {0} não foi encontrado, o que é necessário para reservar a entrada de contabilidade (despesa). Por favor, mencione preço do item em uma lista de preços de compra."
 DocType: Maintenance Schedule,Schedules,Horários
 DocType: Purchase Invoice Item,Net Amount,Valor Líquido
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM nenhum detalhe
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montante desconto adicional (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Erro: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Erro: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, crie uma nova conta do Plano de Contas ."
 DocType: Maintenance Visit,Maintenance Visit,Visita de manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Grupo Cliente> Território
@@ -1242,7 +1250,7 @@
 DocType: Sales Partner,Sales Partner Target,Vendas Alvo Parceiro
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada Contabilidade para {0} só pode ser feito em moeda: {1}
 DocType: Pricing Rule,Pricing Rule,Regra de Preços
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Pedido de material a Ordem de Compra
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Pedido de material a Ordem de Compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Item devolvido {1} não existe em {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,bankrekeningen
 ,Bank Reconciliation Statement,Declaração de reconciliação bancária
@@ -1250,11 +1258,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Abertura da Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} deve aparecer apenas uma vez
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido o tranfer mais do que {0} {1} contra Pedido de Compra {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido o tranfer mais do que {0} {1} contra Pedido de Compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,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
 DocType: Shipping Rule Condition,From Value,De Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Manufacturing Kwantiteit is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Manufacturing Kwantiteit is verplicht
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Valores não reflete em banco
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Os pedidos de despesa da empresa.
@@ -1266,33 +1274,34 @@
 ,Material Requests for which Supplier Quotations are not created,Materiaal Verzoeken waarvoor Leverancier Offertes worden niet gemaakt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,No dia (s) em que você está se candidatando a licença são feriados. Você não precisa solicitar uma licença.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para rastrear itens usando código de barras. Você será capaz de inserir itens na nota de entrega e nota fiscal de venda pela digitalização de código de barras do item.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Marcar como Proferido
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Marcar como Proferido
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Faça Cotação
 DocType: Dependent Task,Dependent Task,Tarefa dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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 planear operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardagsherinneringen
 DocType: SMS Center,Receiver List,Lista de receptor
 DocType: Payment Tool Detail,Payment Amount,Valor do Pagamento
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantidade consumida
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vista
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Vista
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Mudança líquida em dinheiro
 DocType: Salary Structure Deduction,Salary Structure Deduction,Dedução Estrutura Salarial
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserido mais de uma vez na Tabela de Conversão de Fator
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserido mais de uma vez na Tabela de Conversão de Fator
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo de itens emitidos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Idade (Dias)
 DocType: Quotation Item,Quotation Item,Item de Orçamento
 DocType: Account,Account Name,Nome da conta
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,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 +194,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 +59,Supplier Type master.,Fornecedor Tipo de mestre.
 DocType: Purchase Order Item,Supplier Part Number,Número da peça de fornecedor
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,A taxa de conversão não pode ser 0 ou 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,A taxa de conversão não pode ser 0 ou 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} é cancelado ou interrompido
 DocType: Accounts Settings,Credit Controller,Controlador de crédito
 DocType: Delivery Note,Vehicle Dispatch Date,Veículo Despacho Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
 DocType: Company,Default Payable Account,Conta a Pagar Padrão
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Definições para carrinho de compras on-line, tais como regras de navegação, lista de preços etc."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Tida
@@ -1304,15 +1313,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Meus Problemas
 DocType: BOM Item,BOM Item,Item BOM
 DocType: Appraisal,For Employee,Para Empregado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Row {0}: Avanço contra o Fornecedor deve ser debitar
 DocType: Company,Default Values,Valores Padrão
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Valor do pagamento não pode ser negativo
 DocType: Expense Claim,Total Amount Reimbursed,Montante total reembolsado
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra Fatura de Fornecedor {0} {1} datada
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Contra Fatura de Fornecedor {0} {1} datada
 DocType: Customer,Default Price List,Lista de Preços padrão
 DocType: Payment Reconciliation,Payments,Pagamentos
 DocType: Budget Detail,Budget Allocated,Orçamento alocado
 DocType: Journal Entry,Entry Type,Tipo de entrada
 ,Customer Credit Balance,Saldo de crédito do cliente
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Variação Líquida em contas a pagar
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Por favor, verifique seu e-mail id"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Necessário para ' Customerwise Discount ' Cliente
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Atualização de pagamento bancário com data do diário.
@@ -1333,7 +1344,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Ativar Carrinho
 DocType: Employee,Permanent Address,Endereço permanente
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Item {0} deve ser um item de serviço .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Adiantamento pago contra {0} {1} não pode ser maior \ do total geral {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Por favor seleccione código do item
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduzir Dedução por licença sem vencimento (LWP)
@@ -1350,18 +1361,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Pedido de material usado para fazer isto Stock Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Única unidade de um item.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Tempo Log Batch {0} deve ser ' enviado '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Tempo Log Batch {0} deve ser ' enviado '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Maak boekhoudkundige afschrijving voor elke Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Folhas total atribuído
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Armazém necessária no Row Nenhuma {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Armazém necessária no Row Nenhuma {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Por favor, indique Ano válido Financial datas inicial e final"
 DocType: Employee,Date Of Retirement,Data da aposentadoria
 DocType: Upload Attendance,Get Template,Obter modelo
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Um grupo de clientes existente com o mesmo nome, por favor altere o nome do cliente ou renomear o grupo de clientes"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Por favor seleccione {0} primeiro.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},texto {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Por favor seleccione {0} primeiro.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},texto {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Novo contato
 DocType: Territory,Parent Territory,Território pai
 DocType: Quality Inspection Reading,Reading 2,Leitura 2
 DocType: Stock Entry,Material Receipt,Recebimento de materiais
@@ -1369,7 +1381,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Festa Tipo and Party é necessário para receber / pagar contas {0}
 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 ordens de venda etc."
 DocType: Lead,Next Contact By,Contato Próxima Por
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +213,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 +85,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 Ordem
 DocType: Purchase Invoice,Notification Email Address,Endereço de email de notificação
@@ -1386,15 +1398,15 @@
 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: Sales Invoice Item,Batch No,No lote
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir várias ordens de venda contra a Ordem de Compra do Cliente
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,principal
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
 DocType: Employee,Leave Encashed?,Deixe cobradas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunidade De O campo é obrigatório
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Maak Bestelling
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Maak Bestelling
 DocType: SMS Center,Send To,Enviar para
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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 atribuído
@@ -1407,7 +1419,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Armazém e Referência
 DocType: Supplier,Statutory info and other general information about your Supplier,Informações legais e outras informações gerais sobre o seu Fornecedor
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Endereços
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diário {0} não tem qualquer {1} entrada incomparável
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diário {0} não tem qualquer {1} entrada incomparável
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serial Não entrou para item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A condição para uma regra de envio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item não é permitido ter ordem de produção.
@@ -1416,10 +1428,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Montante de crédito em conta de moeda
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Logs de horário para a fabricação.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Warehouse-wise Reordenar Nível
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} deve ser apresentado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} deve ser apresentado
 DocType: Authorization Control,Authorization Control,Controle de autorização
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Rejeitado Warehouse é obrigatória contra rejeitado item {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tempo de registro para as tarefas.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pagamento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Pagamento
 DocType: Production Order Operation,Actual Time and Cost,Tempo atual e custo
 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},Solicitação de materiais de máxima {0} pode ser feita para item {1} contra ordem de venda {2}
 DocType: Employee,Salutation,Saudação
@@ -1436,7 +1449,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Item {0} não é um item serializado
 DocType: SMS Center,Create Receiver List,Criar Lista de Receptor
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
 DocType: Packing Slip,To Package No.,Para empacotar Não.
 DocType: Warranty Claim,Issue Date,Data de Emissão
 DocType: Activity Cost,Activity Cost,Atividade Custo
@@ -1474,7 +1486,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcançados
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Grondgebied / Klantenservice
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,por exemplo 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Em Palavras será visível quando você salvar a nota fiscal de venda.
 DocType: Item,Is Sales Item,É item de vendas
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Punt Groepsstructuur
@@ -1486,7 +1498,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} criado
 DocType: Delivery Note Item,Against Sales Order,Contra Ordem de Venda
 ,Serial No Status,No Estado de série
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Item tabel kan niet leeg zijn
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Item tabel kan niet leeg zijn
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"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 \
  e deve ser maior do que ou igual a {2}"
@@ -1496,7 +1508,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
 DocType: Website Item Group,Website Item Group,Grupo Item site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Impostos e Contribuições
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Por favor, indique data de referência"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,"Por favor, indique data de referência"
 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 pagamento não podem ser filtrados por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela para o item que será mostrado no Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Fornecido Qtde
@@ -1511,7 +1523,7 @@
 DocType: Installation Note,Installation Time,O tempo de instalação
 DocType: Sales Invoice,Accounting Details,Detalhes Contabilidade
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Apagar todas as transações para esta empresa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Row # {0}: Operation {1} não for completado por {2} qty de produtos acabados na ordem de produção # {3}. Por favor, atualize o status da operação via Tempo Logs"
+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,"Row # {0}: Operation {1} não for completado por {2} qty de produtos acabados na ordem de produção # {3}. Por favor, atualize o status da operação via Tempo Logs"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investimentos
 DocType: Issue,Resolution Details,Detalhes de Resolução
 DocType: Quality Inspection Reading,Acceptance Criteria,Critérios de Aceitação
@@ -1527,7 +1539,7 @@
 DocType: Holiday List,Clear Table,Tabela clara
 DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,A factura n º
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Da Ordem de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Da Ordem de Compra
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser aplicada / cancelada antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
 DocType: Activity Cost,Costing Rate,Custando Classificação
 ,Customer Addresses And Contacts,Endereços e contatos de clientes
@@ -1544,7 +1556,7 @@
 ,Maintenance Schedules,Horários de Manutenção
 ,Quotation Trends,Tendências cotação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,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
 ,Pending Amount,In afwachting van Bedrag
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
@@ -1561,12 +1573,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árvore de contas financeiras.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixe em branco se considerado para todos os tipos de empregados
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir taxas sobre
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Conta {0} deve ser do tipo "" Ativo Fixo "" como item {1} é um item de ativos"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Conta {0} deve ser do tipo "" Ativo Fixo "" como item {1} é um item de ativos"
 DocType: HR Settings,HR Settings,Configurações RH
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Declaratie is in afwachting van goedkeuring . Alleen de Expense Approver kan status bijwerken .
 DocType: Purchase Invoice,Additional Discount Amount,Montante desconto adicional
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,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 +225,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,esportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total real
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,unidade
@@ -1578,6 +1590,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} é agora o padrão Ano Fiscal. Por favor, atualize seu navegador para que a alteração tenha efeito."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Os relatórios de despesas
 DocType: Issue,Support,Apoiar
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Ver carrinho
 ,BOM Search,BOM Pesquisa
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Fechando (abertura + Totais)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique moeda in Company"
@@ -1589,13 +1602,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM fator de conversão é necessária na linha {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Apuramento data não pode ser anterior à data de verificação na linha {0}
 DocType: Salary Slip,Deduction,Dedução
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Item Preço adicionada para {0} na lista de preços {1}
 DocType: Address Template,Address Template,Modelo de endereço
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Digite Employee Id desta pessoa de vendas
 DocType: Territory,Classification of Customers by region,Classificação dos clientes por região
 DocType: Project,% Tasks Completed,% Tarefas Concluídas
 DocType: Project,Gross Margin,Margem Bruta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Vul Productie Item eerste
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,usuário desativado
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuário desativado
 DocType: Opportunity,Quotation,Orçamento
 DocType: Salary Slip,Total Deduction,Dedução Total
 DocType: Quotation,Maintenance User,Manutenção do usuário
@@ -1604,7 +1618,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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**.,** Ano Fiscal ** representa um exercício financeiro. Todos os lançamentos contábeis e outras transações principais são rastreadas contra ** Ano Fiscal **.
 DocType: Opportunity,Customer / Lead Address,Klant / Lead Adres
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
 DocType: Production Order Operation,Actual Operation Time,Actual Tempo Operação
 DocType: Authorization Rule,Applicable To (User),Para aplicável (Utilizador)
 DocType: Purchase Taxes and Charges,Deduct,Subtrair
@@ -1614,12 +1628,12 @@
 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 Leads, cotações, Pedido de Vendas etc de Campanhas para medir retorno sobre o investimento."
 DocType: Expense Claim,Approver,Aprovador
 ,SO Qty,SO Aantal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","As entradas em existências existir contra armazém {0}, portanto, você não pode voltar a atribuir ou modificar Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","As entradas em existências existir contra armazém {0}, portanto, você não pode voltar a atribuir ou modificar Warehouse"
 DocType: Appraisal,Calculate Total Score,Calcular a pontuação total
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufatura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Não {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Nota de Entrega dividir em pacotes.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Os embarques
+apps/erpnext/erpnext/hooks.py +69,Shipments,Os embarques
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregue ao cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Estado devem ser apresentadas.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,O Serial No {0} não pertence a nenhum Warehouse
@@ -1639,10 +1653,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Selecione 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 +95,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego ( permanente , contrato, etc estagiário ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} é obrigatório para item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} é obrigatório para item {1}
 DocType: Currency Exchange,From Currency,De Moeda
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"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/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordem de venda necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Ordem de venda necessário para item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Valores não reflete em sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (moeda da empresa)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,outros
@@ -1658,7 +1672,7 @@
 DocType: Quality Inspection,In Process,Em Processo
 DocType: Authorization Rule,Itemwise Discount,Desconto Itemwise
 DocType: Purchase Order Item,Reference Document Type,Referência Tipo de Documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contra a Ordem de Vendas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} contra a Ordem de Vendas {1}
 DocType: Account,Fixed Asset,Activos Fixos
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inventário Serialized
 DocType: Activity Type,Default Billing Rate,Faturamento Taxa de Inadimplência
@@ -1668,7 +1682,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Pedido de Vendas para pagamento
 DocType: Expense Claim Detail,Expense Claim Detail,Detalhe de Despesas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs criado:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,"Por favor, selecione conta correta"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,"Por favor, selecione conta correta"
 DocType: Item,Weight UOM,Peso UOM
 DocType: Employee,Blood Group,Grupo sanguíneo
 DocType: Purchase Invoice Item,Page Break,Quebra de página
@@ -1699,10 +1713,10 @@
 DocType: Time Log,To Time,Para Tempo
 DocType: Authorization Rule,Approving Role (above authorized value),Aprovando Papel (acima do valor autorizado)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Om onderliggende nodes te voegen , te verkennen boom en klik op het knooppunt waar u wilt meer knooppunten toe te voegen ."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crédito em conta deve ser uma conta a pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM recursão: {0} não pode ser pai ou filho de {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Crédito em conta deve ser uma conta a pagar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},BOM recursão: {0} não pode ser pai ou filho de {2}
 DocType: Production Order Operation,Completed Qty,Concluído Qtde
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Preço de {0} está desativado
 DocType: Manufacturing Settings,Allow Overtime,Permitir Overtime
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} números de série necessários para item {1}. Forneceu {2}.
@@ -1710,8 +1724,9 @@
 DocType: Item,Customer Item Codes,Item de cliente Códigos
 DocType: Opportunity,Lost Reason,Razão perdido
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Criar entradas de pagamento contra as ordens ou Faturas.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Novo endereço
 DocType: Quality Inspection,Sample Size,Tamanho da amostra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Todos os itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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 válido &#39;De Caso No.&#39;"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
 DocType: Project,External,Externo
@@ -1767,13 +1782,14 @@
 DocType: Rename Tool,Rename Tool,Renomear Ferramenta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Kosten bijwerken
 DocType: Item Reorder,Item Reorder,Item Reordenar
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transfer Materiaal
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Geef de operaties , operationele kosten en geven een unieke operatie niet aan uw activiteiten ."
 DocType: Purchase Invoice,Price List Currency,Moeda da Lista de Preços
 DocType: Naming Series,User must always select,O usuário deve sempre escolher
 DocType: Stock Settings,Allow Negative Stock,Permitir stock negativo
 DocType: Installation Note,Installation Note,Nota de Instalação
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Adicionar impostos
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Fluxo de Caixa de Financiamento
 ,Financial Analytics,Análise Financeira
 DocType: Quality Inspection,Verified By,Verificado Por
 DocType: Address,Subsidiary,Subsidiário
@@ -1783,19 +1799,19 @@
 DocType: Process Payroll,Create Salary Slip,Criar folha de salário
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Equilíbrio esperado como por banco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fonte de Recursos ( Passivo)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantidade em linha {0} ( {1} ) deve ser a mesma quantidade fabricada {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantidade em linha {0} ( {1} ) deve ser a mesma quantidade fabricada {2}
 DocType: Appraisal,Employee,Empregado
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar e-mail do
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Convidar como Usuário
 DocType: Features Setup,After Sale Installations,Após instalações Venda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} está totalmente faturado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} está totalmente faturado
 DocType: Workstation Working Hour,End Time,End Time
 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 +75,Group by Voucher,Grupo pela Vale
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obrigatório On
 DocType: Sales Invoice,Mass Mailing,Divulgação em massa
 DocType: Rename Tool,File to Rename,Arquivo para renomear
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagamentos
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Especificada BOM {0} não existe para item {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
@@ -1805,6 +1821,7 @@
 DocType: Selling Settings,Sales Order Required,Ordem vendas Obrigatório
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Maak de klant
 DocType: Purchase Invoice,Credit To,Para crédito
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Leads ativo / Clientes
 DocType: Employee Education,Post Graduate,Pós-Graduação
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalhe Programa de Manutenção
 DocType: Quality Inspection Reading,Reading 9,Leitura 9
@@ -1816,6 +1833,7 @@
 DocType: Warranty Claim,Raised By,Levantadas por
 DocType: Payment Tool,Payment Account,Conta de Pagamento
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Variação Líquida em Contas a Receber
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
 DocType: Quality Inspection Reading,Accepted,Aceite
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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."
@@ -1823,17 +1841,17 @@
 DocType: Payment Tool,Total Payment Amount,Valor Total Pagamento
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) não pode ser maior do que a quantidade  pré estabelecida ({2}) na ordem de produção {3}
 DocType: Shipping Rule,Shipping Rule Label,Regra envio Rótulo
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
 DocType: Newsletter,Test,Teste
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Como existem transações com ações existentes para este item, \ não é possível alterar os valores de &#39;não tem Serial&#39;, &#39;Tem Lote n&#39;, &#39;é Stock item &quot;e&quot; Método de avaliação&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Breve Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Breve Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,U kunt geen koers veranderen als BOM agianst een item genoemd
 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 +157,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique Planned Qt para item {0} na linha {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} não foi submetido
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} não foi submetido
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Os pedidos de itens.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ordem de produção separado será criado para cada item acabado.
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Conditions1
@@ -1846,7 +1864,7 @@
 DocType: Authorization Rule,Authorized Value,Valor Autorizado
 DocType: Contact,Enter department to which this Contact belongs,Entre com o departamento a que pertence este contato
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total de Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unidade de Medida
 DocType: Fiscal Year,Year End Date,Data de Fim de Ano
 DocType: Task Depends On,Task Depends On,Tarefa depende de
@@ -1872,7 +1890,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data Contrato Final deve ser maior que Data de Participar
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Um distribuidor de terceiros / revendedor / comissão do agente / filial / revendedor que vende os produtos de empresas de uma comissão.
 DocType: Customer Group,Has Child Node,Tem nó filho
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Digite os parâmetros URL estática aqui (por exemplo remetente = ERPNext, username = ERPNext, password = 1234, etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} não em qualquer ano fiscal ativa. Para mais detalhes consulte {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
@@ -1920,7 +1938,7 @@
  10. Adicionar ou deduzir: Se você quer adicionar ou deduzir o imposto."
 DocType: Purchase Receipt Item,Recd Quantity,Quantidade RECD
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais item {0} do que a quantidade Ordem de Vendas {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
 DocType: Payment Reconciliation,Bank / Cash Account,Banco / Conta Caixa
 DocType: Tax Rule,Billing City,Faturamento Cidade
 DocType: Global Defaults,Hide Currency Symbol,Ocultar Símbolo de Moeda
@@ -1952,6 +1970,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Despesas de Utilidade
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Acima de 90
 DocType: Buying Settings,Default Buying Price List,Standaard Buying Prijslijst
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Nenhum funcionário para os critérios acima selecionado ou folha de salário já criado
 DocType: Notification Control,Sales Order Message,Vendas Mensagem Ordem
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Definir valores padrão , como Company, de moeda, Atual Exercício , etc"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,betaling Type
@@ -1987,7 +2006,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte &quot;taxa de materiais baseados em&quot; no Custeio Seção
 DocType: Appraisal Goal,Key Responsibility Area,Responsabilidade de Área chave
 DocType: Item Reorder,Material Request Type,Tipo de solicitação de material
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Fator de Conversão UOM é obrigatória
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Fator de Conversão UOM é obrigatória
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Centro de Custos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,voucher #
@@ -2010,7 +2029,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Por favor seleccione um valor para {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todos os endereços.
 DocType: Company,Stock Settings,Configurações da
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gerenciar Grupo Cliente Tree.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Nome de NOvo Centro de Custo
 DocType: Leave Control Panel,Leave Control Panel,Deixe Painel de Controle
@@ -2030,8 +2049,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Detalhe ferramenta de pagamento
 ,Sales Browser,Navegador Vendas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Empréstimos e Adiantamentos (Ativo )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Devedores
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
@@ -2050,7 +2069,7 @@
 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.,S.O. Nee.
 DocType: Production Order Operation,Make Time Log,Make Time Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,"Por favor, defina a quantidade de reabastecimento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,"Por favor, defina a quantidade de reabastecimento"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, crie Cliente de chumbo {0}"
 DocType: Price List,Applicable for Countries,Aplicável para os Países
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,informática
@@ -2110,10 +2129,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Pelo menos um item deve ser inserido com quantidade negativa no documento de devolução
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operação {0} mais do que as horas de trabalho disponíveis na estação de trabalho {1}, quebrar a operação em várias operações"
 ,Requested,gevraagd
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Não Observações
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Não Observações
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Vencido
 DocType: Account,Stock Received But Not Billed,"Banco recebido, mas não faturados"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Conta raiz deve ser um grupo
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Conta raiz deve ser um grupo
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salário bruto + Valor + Valor vencido cobrança - Dedução Total
 DocType: Monthly Distribution,Distribution Name,Nome de distribuição
 DocType: Features Setup,Sales and Purchase,Vendas e Compras
@@ -2127,6 +2146,7 @@
 DocType: Journal Entry Account,Party Balance,Balance Partido
 DocType: Sales Invoice Item,Time Log Batch,Tempo Batch Log
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Por favor, selecione Aplicar Discount On"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Deslizamento Salário Criado
 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 Banco de entrada para o salário total pago pelos critérios acima selecionados
 DocType: Stock Entry,Material Transfer for Manufacture,Transferência de Material de Fabricação
@@ -2134,9 +2154,9 @@
 DocType: Purchase Invoice,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Ano Fiscal {0} não foi encontrado.
 DocType: Bank Reconciliation,Get Relevant Entries,Obter entradas relevantes
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Entrada de Contabilidade da
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Entrada de Contabilidade da
 DocType: Sales Invoice,Sales Team1,Vendas team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do cliente
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar desconto adicional em
 DocType: Account,Root Type,Tipo de Raiz
@@ -2145,15 +2165,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Mostrar esta slideshow no topo da página
 DocType: BOM,Item UOM,Item UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Valor do imposto Valor Depois de desconto (Companhia de moeda)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Destino do Warehouse é obrigatória para a linha {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Destino do Warehouse é obrigatória para a linha {0}
 DocType: Quality Inspection,Quality Inspection,Inspeção de Qualidade
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing : Materiaal gevraagde Aantal minder dan Minimum afname
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing : Materiaal gevraagde Aantal minder dan Minimum afname
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Tabaco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL of BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Taxa de comissão não pode ser maior do que 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nível Mínimo Inventory
 DocType: Stock Entry,Subcontract,Subcontratar
@@ -2191,7 +2211,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspeção de qualidade de entrada.
 DocType: Purchase Order Item,Returned Qty,Devolvido Qtde
 DocType: Employee,Exit,Sair
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Tipo de Raiz é obrigatório
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Tipo de Raiz é obrigatório
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Não {0} criado
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a comodidade dos clientes, estes códigos podem ser usados em formatos de impressão, como facturas e guias de entrega"
 DocType: Employee,You can enter any date manually,Você pode entrar em qualquer data manualmente
@@ -2199,8 +2219,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Período Probatório
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Nós folha apenas são permitidos em operação
 DocType: Expense Claim,Expense Approver,Despesa Approver
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +110,Row {0}: Advance against Customer must be credit,Row {0}: Avanço contra o Cliente deve estar de crédito
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de compra do item em actualização
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagar
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway de URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs para a manutenção de status de entrega sms
@@ -2217,7 +2238,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordenar Nível
 DocType: Attendance,Attendance Date,Data de atendimento
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Separação Salário com base em salário e dedução.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Conta com nós filhos não pode ser convertido em livro
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Conta com nós filhos não pode ser convertido em livro
 DocType: Address,Preferred Shipping Address,Endereço para envio preferido
 DocType: Purchase Receipt Item,Accepted Warehouse,Armazém Aceite
 DocType: Bank Reconciliation Detail,Posting Date,Data da Publicação
@@ -2235,7 +2256,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Não {0} não existe
 DocType: Pricing Rule,Discount Percentage,Percentagem de Desconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Número da fatura
-apps/erpnext/erpnext/hooks.py +54,Orders,Encomendas
+apps/erpnext/erpnext/hooks.py +55,Orders,Encomendas
 DocType: Leave Control Panel,Employee Type,Tipo de empregado
 DocType: Employee Leave Approver,Leave Approver,Deixe Aprovador
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para Fabricação
@@ -2247,7 +2268,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% de materiais faturado contra esta Ordem de Vendas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Entrada de encerramento do período
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,depreciação
+DocType: Account,Depreciation,depreciação
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornecedor (s)
 DocType: Customer,Credit Limit,Limite de Crédito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selecione o tipo de transação
@@ -2272,11 +2293,12 @@
 DocType: Material Request,Requested For,gevraagd voor
 DocType: Quotation Item,Against Doctype,Contra Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Acompanhar este Nota de Entrega contra qualquer projeto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Conta root não pode ser excluído
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Caixa Líquido de Investimentos
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Conta root não pode ser excluído
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar Banco de Entradas
 ,Is Primary Address,É primário Endereço
 DocType: Production Order,Work-in-Progress Warehouse,Armazém Work-in-Progress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referência # {0} {1} datado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referência # {0} {1} datado
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gerenciar endereços
 DocType: Pricing Rule,Item Code,Código do artigo
 DocType: Production Planning Tool,Create Production Orders,Criar ordens de produção
@@ -2284,7 +2306,7 @@
 DocType: Journal Entry,User Remark,Observação de usuário
 DocType: Lead,Market Segment,Segmento de mercado
 DocType: Employee Internal Work History,Employee Internal Work History,Empregado História Trabalho Interno
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Fechamento (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Fechamento (Dr)
 DocType: Contact,Passive,Passiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Não {0} não em estoque
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modelo imposto pela venda de transações.
@@ -2300,7 +2322,7 @@
 ,Billed Amount,gefactureerde bedrag
 DocType: Bank Reconciliation,Bank Reconciliation,Banco Reconciliação
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obter atualizações
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Adicione alguns registros de exemplo
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Deixar de Gestão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupo por Conta
@@ -2309,14 +2331,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","De rekening hoofd onder Aansprakelijkheid , waarin Winst / verlies zal worden geboekt"
 DocType: Payment Tool,Against Vouchers,Contra Vales
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Quick Help
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Extras de vendas
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} orçamento para conta {1} contra Centro de Custo {2} excederá por {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,Purchase Order number required for Item {0},Número do pedido requerido para 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 de ' deve ser depois de ' Para Data '
 ,Stock Projected Qty,Verwachte voorraad Aantal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
 DocType: Sales Order,Customer's Purchase Order,Ordem de Compra do Cliente
 DocType: Warranty Claim,From Company,Da Empresa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor ou Quantidade
@@ -2326,9 +2348,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Deixe Lista de Bloqueios admitidos
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Você vai usá-lo para o Login
 DocType: Sales Partner,Retailer,Varejista
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos os tipos de fornecedores
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +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/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Item Programa de Manutenção
 DocType: Sales Order,%  Delivered,% Entregue
@@ -2372,7 +2394,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),O peso bruto do pacote. Normalmente peso líquido + peso do material de embalagem. (Para impressão)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gebruikers met deze rol mogen bevroren accounts en maak / boekingen tegen bevroren rekeningen wijzigen
 DocType: Serial No,Is Cancelled,É cancelado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Minhas remessas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Minhas remessas
 DocType: Journal Entry,Bill Date,Data Bill
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Mesmo se houver várias regras de preços com maior prioridade, então seguintes prioridades internas são aplicadas:"
 DocType: Supplier,Supplier Details,Detalhes fornecedor
@@ -2393,10 +2415,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,chamadas
 DocType: Project,Total Costing Amount (via Time Logs),Montante Custeio Total (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Estoque UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,verwachte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Não {0} não pertence ao Armazém {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
 DocType: Notification Control,Quotation Message,Mensagem de Orçamento
 DocType: Issue,Opening Date,Data de abertura
 DocType: Journal Entry,Remark,Observação
@@ -2409,9 +2431,9 @@
 DocType: Time Log,Batched for Billing,Agrupadas para Billing
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Contas levantada por Fornecedores.
 DocType: POS Profile,Write Off Account,Escreva Off Conta
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Montante do Desconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Regresso contra factura de compra
 DocType: Item,Warranty Period (in days),Período de Garantia (em dias)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Caixa Líquido de Operações
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,por exemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
 DocType: Journal Entry Account,Journal Entry Account,Conta Diário de entrada
@@ -2452,7 +2474,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Juntando
 DocType: Sales Invoice,Against Income Account,Contra Conta a Receber
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Proferido
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no Item).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribuição percentual mensal
 DocType: Territory,Territory Targets,Metas território
 DocType: Delivery Note,Transporter Info,Informações Transporter
@@ -2480,10 +2502,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número do lote é obrigatória para item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dit is een wortel verkoper en kan niet worden bewerkt .
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Classificação: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Classificação: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Dedução folha de salário
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Selecione um nó de grupo em primeiro lugar.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Objetivo deve ser um dos {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Objetivo deve ser um dos {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Preencha o formulário e guarde-o
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Baixe um relatório contendo todas as matérias-primas com o seu estado mais recente inventário
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
@@ -2521,7 +2543,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company ( não cliente ou fornecedor ) mestre.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,Valor pago + Write Off Valor não pode ser maior do que o total geral
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,Valor pago + Write Off Valor não pode ser maior do que o total geral
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} não é um número de lote válido por item {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Se o pagamento não é feito contra qualquer referência, crie manualmente uma entrada no diário."
@@ -2538,13 +2560,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' está desativada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Definir como Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar e-mails automáticos para Contatos sobre transações de enviar.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Quantidade não avalable no armazém {1} em {2} {3}.
  Disponível Qtde: {4}, Quantidade de transferência: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Item 3
 DocType: Purchase Order,Customer Contact Email,Cliente Fale Email
 DocType: Sales Team,Contribution (%),Contribuição (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,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
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modelo
 DocType: Sales Person,Sales Person Name,Vendas Nome Pessoa
@@ -2555,20 +2577,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliação
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e taxas Adicionado (Moeda Company)
-apps/erpnext/erpnext/stock/doctype/item/item.py +374,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 +383,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
 DocType: Sales Order,Partly Billed,Parcialmente faturado
 DocType: Item,Default BOM,BOM padrão
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, re-tipo o nome da empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total de Outstanding Amt
 DocType: Time Log Batch,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Configurações de impressão
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,automotivo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De Nota de Entrega
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Mensagem personalizada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca de Investimento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
 DocType: Purchase Invoice,Price List Exchange Rate,Preço Lista de Taxa de Câmbio
 DocType: Purchase Invoice Item,Rate,Taxa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,internar
@@ -2587,9 +2609,10 @@
  conflito, atribuindo prioridade. Regras Preço: {0}"
 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 +580,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Para Armazém
 DocType: Employee,Offer Date,aanbieding Datum
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cotações
 DocType: Hub Settings,Access Token,Token de Acesso
 DocType: Sales Invoice Item,Serial No,N º de Série
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Por favor, indique Maintaince Detalhes primeiro"
@@ -2603,10 +2626,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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,Produto Bundle item
 DocType: Sales Partner,Sales Partner Name,Vendas Nome do parceiro
+DocType: Payment Reconciliation,Maximum Invoice Amount,Montante Máximo Invoice
 DocType: Purchase Invoice Item,Image View,Ver imagem
 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,De e datas necessárias
 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 +553,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidade de medida padrão para a variante &#39;{0}&#39; deve ser o mesmo que no modelo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Do Armazém
 DocType: Purchase Taxes and Charges,Valuation and Total,Avaliação e Total
@@ -2614,6 +2639,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Este artigo é um Variant de {0} (modelo). Atributos serão copiados a partir do modelo, a menos que 'No Copy' é definido"
 DocType: Account,Purchase User,Compra de Usuário
 DocType: Notification Control,Customize the Notification,Personalize a Notificação
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Fluxo de Caixa das Operações
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Template endereço padrão não pode ser excluído
 DocType: Sales Invoice,Shipping Rule,Regra de envio
 DocType: Journal Entry,Print Heading,Imprimir título
@@ -2624,7 +2650,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Matéria-prima
 DocType: Leave Application,Follow via Email,Enviar por e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois Montante do Desconto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Conta Criança existe para esta conta. Você não pode excluir esta conta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,Child account exists for this account. You can not delete this account.,Conta Criança existe 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,Valores de Qtd Alvo ou montante alvo são obrigatórios
 apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},No BOM padrão existe para item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Por favor, selecione Data de lançamento primeiro"
@@ -2642,6 +2668,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Obrigatório para Serialized item {0}
 DocType: Journal Entry,Bank Entry,Banco Entry
 DocType: Authorization Rule,Applicable To (Designation),Para aplicável (Designação)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Adicionar ao carrinho de compras
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Ativar / desativar moedas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,despesas postais
@@ -2649,30 +2676,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
 DocType: Purchase Order,The date on which recurring order will be stop,A data em que ordem recorrente será parar
 DocType: Quality Inspection,Item Serial No,No item de série
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve ser reduzido em {1} ou você deve aumentar a tolerância ao excesso
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve ser reduzido em {1} ou você deve aumentar a tolerância ao excesso
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Presente total
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Item Serialized {0} não pode ser atualizado utilizando \
  da Reconciliação"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferência de material para Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Transferência de material para Fornecedor
 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 Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
 DocType: Lead,Lead Type,Chumbo Tipo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Maak Offerte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,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 +311,All these items have already been invoiced,Todos esses itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Todos esses itens já foram faturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado por {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Regra Condições de envio
 DocType: BOM Replace Tool,The new BOM after replacement,O BOM novo após substituição
 DocType: Features Setup,Point of Sale,Ponto de Venda
 DocType: Account,Tax,Imposto
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} não é um válido {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,De Bundle Produto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,De Bundle Produto
 DocType: Production Planning Tool,Production Planning Tool,Ferramenta de Planejamento da Produção
 DocType: Quality Inspection,Report Date,Relatório Data
 DocType: C-Form,Invoices,Faturas
 DocType: Job Opening,Job Title,Cargo
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatários
 DocType: Features Setup,Item Groups in Details,Grupos de itens em Detalhes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -2680,8 +2706,9 @@
 DocType: Stock Entry,Update Rate and Availability,Taxa de atualização 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."
 DocType: Pricing Rule,Customer Group,Grupo de Clientes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
 DocType: Item,Website Description,Descrição do site
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Mudança no Patrimônio Líquido
 DocType: Serial No,AMC Expiry Date,AMC Data de Validade
 ,Sales Register,Vendas Registrar
 DocType: Quotation,Quotation Lost Reason,Cotação Perdeu Razão
@@ -2689,12 +2716,12 @@
 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/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resumo para este mês e atividades pendentes
 DocType: Customer Group,Customer Group Name,Nome do grupo de clientes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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 seleccione Carry Forward se você também quer incluir equilíbrio ano fiscal anterior deixa para este ano fiscal
 DocType: GL Entry,Against Voucher Type,Tipo contra Vale
 DocType: Item,Attributes,Atributos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obter itens
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Obter itens
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Última data do pedido
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Maak Accijnzen Factuur
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Conta {0} não pertence à empresa {1}
@@ -2710,7 +2737,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dados do projecto -wise não está disponível para Cotação
 DocType: Project,Expected End Date,Data final esperado
 DocType: Appraisal Template,Appraisal Template Title,Título do modelo de avaliação
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Pai item {0} não deve ser um item da
 DocType: Cost Center,Distribution Id,Id distribuição
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serviços impressionante
@@ -2723,7 +2750,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor para o atributo {0} deve estar dentro da gama de {1} a {2} nos incrementos de {3}
 DocType: Tax Rule,Sales,Vendas
 DocType: Stock Entry Detail,Basic Amount,Montante de base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Armazém necessário para stock o item {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Armazém necessário para stock o item {0}
 DocType: Leave Allocation,Unused leaves,Folhas não utilizadas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Padrão Contas a Receber
@@ -2735,16 +2762,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
 DocType: Journal Entry,Pay To / Recd From,Para pagar / RECD De
 DocType: Naming Series,Setup Series,Série de configuração
+DocType: Payment Reconciliation,To Invoice Date,Para Data da fatura
 DocType: Supplier,Contact HTML,Contato HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de compra
-DocType: Payment Reconciliation,Maximum Amount,Montante Máximo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Como é aplicado a regra de preços?
 DocType: Quality Inspection,Delivery Note No,Nota de Entrega Não
 DocType: Company,Retail,Varejo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Cliente {0} não existe
 DocType: Attendance,Absent,Ausente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle produto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Referência inválida {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle produto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Row {0}: Referência inválida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Comprar Impostos e Taxas Template
 DocType: Upload Attendance,Download Template,Baixe Template
 DocType: GL Entry,Remarks,Observações
@@ -2771,7 +2798,7 @@
 ,Monthly Attendance Sheet,Folha de Presença Mensal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nenhum registro encontrado
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Custo é obrigatória para item {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Obter Itens de Bundle Produto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Obter Itens de Bundle Produto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Conta {0} está inativa
 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,Aanwezigheid Van Datum en tot op heden opkomst is verplicht
@@ -2780,8 +2807,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Lucros e Perdas "" tipo de conta {0} não é permitido na abertura de entrada"
 DocType: Features Setup,Sales Discounts,Descontos de vendas
 DocType: Hub Settings,Seller Country,Vendedor País
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publicar Itens no site
 DocType: Authorization Rule,Authorization Rule,Regra autorização
 DocType: Sales Invoice,Terms and Conditions Details,Termos e Condições Detalhes
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,especificações
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos de vendas e de modelo Encargos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de Ordem
@@ -2803,7 +2832,7 @@
 DocType: Time Log,Billing Amount,Faturamento Montante
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantidade inválido especificado para o item {0} . Quantidade deve ser maior do que 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Os pedidos de licença.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Conta com a transação existente não pode ser excluído
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Conta com a transação existente não pode ser excluído
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,despesas legais
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","O dia do mês em que ordem auto será gerado por exemplo, 05, 28, etc"
 DocType: Sales Invoice,Posting Time,Postagem Tempo
@@ -2819,11 +2848,11 @@
 DocType: Maintenance Visit,Breakdown,Colapso
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Conta: {0} com moeda: {1} não pode ser seleccionado
 DocType: Bank Reconciliation Detail,Cheque Date,Data Cheque
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: conta principal {1} não pertence à empresa: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: conta principal {1} não pertence à empresa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Excluído com sucesso todas as transacções relacionadas com esta empresa!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como em Data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,provação
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserção automática taxa de lista de preços se ausente
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montante total pago
@@ -2835,6 +2864,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Valor Total do faturamento (via Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Nós vendemos este item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fornecedor Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,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,Contato Descr
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Tipo de folhas como etc, casual doente"
@@ -2843,7 +2873,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adicionar linhas para definir orçamentos anuais nas contas.
 DocType: Buying Settings,Default Supplier Type,Tipo de fornecedor padrão
 DocType: Production Order,Total Operating Cost,Custo Operacional Total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos os contactos.
 DocType: Newsletter,Test Email Id,Email Id teste
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,bedrijf Afkorting
@@ -2868,7 +2898,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez recorde Câmbios não é criado para {1} de {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template imposto é obrigatório.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Conta {0}: conta principal {1} não existe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,Conta {0}: conta principal {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preço Taxa List (moeda da empresa)
 DocType: Account,Temporary,Temporário
 DocType: Address,Preferred Billing Address,Preferred Endereço de Cobrança
@@ -2886,8 +2916,8 @@
 ,Item-wise Price List Rate,Item- wise Prijslijst Rate
 DocType: Purchase Order Item,Supplier Quotation,Cotação fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Em Palavras será visível quando você salvar a cotação.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} está parado
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barcode {0} já utilizado em item {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} está parado
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barcode {0} já utilizado em item {1}
 DocType: Lead,Add to calendar on this date,Adicionar ao calendário nesta data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regras para adicionar os custos de envio .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,próximos eventos
@@ -2908,24 +2938,24 @@
 DocType: Customer,From Lead,De Chumbo
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordens liberado para produção.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selecione o ano fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
 DocType: Hub Settings,Name Token,Nome do token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,venda padrão
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Pelo menos um armazém é obrigatório
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: BOM Replace Tool,Replace,Substituir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra Faturas {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} contra Faturas {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
 DocType: Purchase Invoice Item,Project Name,Nome do projeto
 DocType: Supplier,Mention if non-standard receivable account,Mencione se não padronizado conta a receber
 DocType: Journal Entry Account,If Income or Expense,Se a renda ou Despesa
 DocType: Features Setup,Item Batch Nos,Lote n item
 DocType: Stock Ledger Entry,Stock Value Difference,Banco de Valor Diferença
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Recursos Humanos
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,Recursos Humanos
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliação Pagamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Ativo Fiscal
 DocType: BOM Item,BOM No,BOM Não
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Diário de entrada {0} não tem conta {1} ou já comparado com outro comprovante
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,Journal Entry {0} does not have account {1} or already matched against other voucher,Diário de entrada {0} não tem conta {1} ou já comparado com outro comprovante
 DocType: Item,Moving Average,Média móvel
 DocType: BOM Replace Tool,The BOM which will be replaced,O BOM que será substituído
 DocType: Account,Debit,Débito
@@ -2962,7 +2992,7 @@
 DocType: Stock Entry Detail,Additional Cost,Custo adicional
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Encerramento do Exercício Social Data
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan niet filteren op basis van Voucher Nee, als gegroepeerd per Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Maak Leverancier Offerte
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Maak Leverancier Offerte
 DocType: Quality Inspection,Incoming,Entrada
 DocType: BOM,Materials Required (Exploded),Materiais necessários (explodida)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzir a Geração de Renda para sair sem pagar (LWP)
@@ -2970,7 +3000,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Número de ordem {1} não coincide com {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Deixar
 DocType: Batch,Batch ID,Lote ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota de entrega Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumo da Semana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve ser um item comprado ou subcontratadas na linha {1}
@@ -2985,6 +3015,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Méd. Taxa de Compra
 DocType: Task,Actual Time (in Hours),Tempo real (em horas)
 DocType: Employee,History In Company,Historial na Empresa
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},A quantidade total de Emissão / Transferência {0} no Pedido de Material {1} não pode ser maior do que a quantidade pedida {2} do número {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletters
 DocType: Address,Shipping,Expedição
 DocType: Stock Ledger Entry,Stock Ledger Entry,Entrada da Razão
@@ -3004,7 +3035,6 @@
 DocType: Purchase Order,End date of current order's period,A data de término do período da ordem atual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Faça uma oferta Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorna
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
 DocType: Production Order Operation,Production Order Operation,Ordem de produção Operation
 DocType: Pricing Rule,Disable,incapacitar
 DocType: Project Task,Pending Review,Revisão pendente
@@ -3012,7 +3042,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id Cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Para Tempo deve ser maior From Time
 DocType: Journal Entry Account,Exchange Rate,Taxa de Câmbio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Armazém {0}: conta Parent {1} não Bolong à empresa {2}
 DocType: BOM,Last Purchase Rate,Compra de última
 DocType: Account,Asset,ativos
@@ -3032,7 +3062,7 @@
 ,Available Stock for Packing Items,Stock disponível para items embalados
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"A definição desse modelo de endereço como padrão, pois não há outro padrão"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo já em débito, não tem permissão para definir 'saldo deve ser' como 'crédito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo já em débito, não tem permissão para definir 'saldo deve ser' como 'crédito'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
 DocType: Production Planning Tool,Filter based on customer,Filtrar baseado em cliente
 DocType: Payment Tool Detail,Against Voucher No,Contra a folha nº
@@ -3049,6 +3079,7 @@
 DocType: Opportunity,Next Contact,Próximo Contato
 DocType: Employee,Employment Type,Tipo de emprego
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Imobilizado
+,Cash Flow,Fluxo de caixa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Período de aplicação não pode ser através de dois registros de alocação
 DocType: Item Group,Default Expense Account,Conta Despesa padrão
 DocType: Employee,Notice (days),Notice ( dagen )
@@ -3080,13 +3111,12 @@
 DocType: Production Order,Warehouses,Armazéns
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Imprimir e estacionária
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Grupo de nós
-DocType: Payment Reconciliation,Minimum Amount,Montante Mínimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Afgewerkt update Goederen
 DocType: Workstation,per hour,por hora
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Uma conta para o armazém ( Perpetual Inventory ) será criada tendo como base esta conta.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse não pode ser excluído como existe entrada de material de contabilidade para este armazém.
 DocType: Company,Distribution,Distribuição
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Valor pago
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Valor pago
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,expedição
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}%
@@ -3110,7 +3140,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ondersteuning Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Empresa está em falta nos armazéns {0}
 DocType: POS Profile,Terms and Conditions,Termos e Condições
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Para data deve ser dentro do exercício social. Assumindo Para Date = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Para data deve ser dentro do exercício social. Assumindo Para Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aqui você pode manter a altura, peso, alergias, etc preocupações médica"
 DocType: Leave Block List,Applies to Company,Aplica-se a Empresa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar por causa da entrada submetido {0} existe
@@ -3124,11 +3154,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Digite recibos de compra
 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 +425,Transaction not allowed against stopped Production Order {0},Transação não é permitido contra parou Ordem de produção {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,Transaction not allowed against stopped Production Order {0},Transação não é permitido contra parou Ordem de produção {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 fiscale jaar ingesteld als standaard , klik op ' Als standaard instellen '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuração do servidor de entrada para suporte e-mail id . ( por exemplo support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Escassez Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Salary Slip,Salary Slip,Folha de salário
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' O campo Para Data ' é necessária
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gerar deslizamentos de embalagem para os pacotes a serem entregues. Usado para notificar número do pacote, o conteúdo do pacote e seu peso."
@@ -3217,7 +3247,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Registros de funcionários.
 DocType: HR Settings,Payroll Settings,payroll -instellingen
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Combinar não vinculados faturas e pagamentos.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Faça a encomenda
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Faça a encomenda
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root não pode ter um centro de custos pai
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Selecione o cadastro ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Aplicável
@@ -3232,7 +3262,7 @@
 DocType: Appraisal,Start Date,Data de Início
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Atribuír licenças por um período .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Clique aqui para verificar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Conta {0}: Você não pode atribuir-se como conta principal
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Conta {0}: Você não pode atribuir-se como conta principal
 DocType: Purchase Invoice Item,Price List Rate,Taxa de Lista de Preços
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Show &quot;Em Stock&quot; ou &quot;não em estoque&quot;, baseado em stock disponível neste armazém."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Lista de Materiais (BOM)
@@ -3241,17 +3271,17 @@
 DocType: Project,Expected Start Date,Data de Início do esperado
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Remover item, se as cargas não é aplicável a esse elemento"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ex:. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Receber
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Receber
 DocType: Maintenance Visit,Fully Completed,Totalmente concluída
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% concluído
 DocType: Employee,Educational Qualification,Qualificação Educacional
 DocType: Workstation,Operating Costs,Custos Operacionais
 DocType: Employee Leave Approver,Employee Leave Approver,Empregado Leave Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} foi adicionada com sucesso à nossa lista Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan niet verklaren als verloren , omdat Offerte is gemaakt."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Compra Mestre Gerente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Ordem de produção {0} deve ser apresentado
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Ordem de produção {0} deve ser apresentado
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Por favor seleccione Data de início e data de término do item {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Relatórios principais
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tot op heden kan niet eerder worden vanaf datum
@@ -3269,7 +3299,7 @@
 DocType: Industry Type,Industry Type,Tipo indústria
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Algo deu errado!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Atenção: Deixe o aplicativo contém seguintes datas bloco
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data de Conclusão
 DocType: Purchase Invoice Item,Amount (Company Currency),Quantidade (Moeda da Empresa)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organização unidade (departamento) mestre.
@@ -3288,10 +3318,10 @@
 ,Serial No Service Contract Expiry,N º de Série Vencimento Contrato de Serviço
 DocType: Item,Unit of Measure Conversion,Unidade de Conversão de Medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empregado não pode ser alterado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Você não pode de crédito e débito mesma conta ao mesmo tempo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Você não pode de crédito e débito mesma conta ao mesmo tempo
 DocType: Naming Series,Help HTML,Ajuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total atribuído deve ser de 100 %. É {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nome da pessoa ou organização que este endereço pertence.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,uw Leveranciers
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan niet ingesteld als Lost als Sales Order wordt gemaakt .
@@ -3304,35 +3334,35 @@
 DocType: Employee,Date of Issue,Data de Emissão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: A partir de {0} para {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
 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.,Lista este item em vários grupos no site.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,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/accounts/doctype/journal_entry/journal_entry.py +295,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 +62,Item: {0} does not exist in the system,Item: {0} não existe no sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,U bent niet bevoegd om Frozen waarde in te stellen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,U bent niet bevoegd om Frozen waarde in te stellen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Entradas não reconciliadas
+DocType: Payment Reconciliation,From Invoice Date,A partir de Data de Fatura
 DocType: Cost Center,Budgets,Orçamentos
-DocType: Employee,Emergency Contact Details,Detalhes de contato de emergência
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Wat doet het?
 DocType: Delivery Note,To Warehouse,Para Armazém
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Conta {0} foi inserida mais de uma vez para o ano fiscal {1}
 ,Average Commission Rate,Taxa de Comissão Média
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,'Tem número de série ' não pode ser 'Sim' para o item sem stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,'Tem número de série ' não pode ser 'Sim' para o item sem stock
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Atendimento 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 principal
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Atualize custos adicionais para calcular o custo desembarcado de itens
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,elétrico
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença Valor Total (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID do usuário não definido para Employee {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,A partir da solicitação de garantia
 DocType: Stock Entry,Default Source Warehouse,Armazém da fonte padrão
 DocType: Item,Customer Code,Código Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Lembrete de aniversário para {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dagen sinds vorige Bestel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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,Nomeando Series
 DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock activo
@@ -3345,7 +3375,7 @@
 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
 DocType: Authorization Rule,Based On,Baseado em
 DocType: Sales Order Item,Ordered Qty,bestelde Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Item {0} está desativada
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Item {0} está desativada
 DocType: Stock Settings,Stock Frozen Upto,Fotografia congelada Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Período Do período Para datas e obrigatórias para os recorrentes {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Atividade de projeto / tarefa.
@@ -3353,7 +3383,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra deve ser verificada, se for caso disso for selecionado 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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escrever Off Montante (Companhia de moeda)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,"Row # {0}: Por favor, defina a quantidade de reabastecimento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,"Row # {0}: Por favor, defina a quantidade de reabastecimento"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Comprovante Custo
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Defina {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Repita no Dia do Mês
@@ -3383,12 +3413,12 @@
 DocType: Upload Attendance,Upload Attendance,Envie Atendimento
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM e Manufatura Quantidade são obrigatórios
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Faixa Envelhecimento 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Quantidade
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Quantidade
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM substituído
 ,Sales Analytics,Sales Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Configurações de Fabricação
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurando Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,"Por favor, indique moeda padrão in Company Mestre"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,"Por favor, indique moeda padrão in Company Mestre"
 DocType: Stock Entry Detail,Stock Entry Detail,Detalhe Entrada stock
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Lembretes diários
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflitos regra fiscal com {0}
@@ -3414,13 +3444,13 @@
 DocType: Sales Order Item,Produced Quantity,Quantidade produzida
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,engenheiro
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Pesquisa subconjuntos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Código do item exigido no Row Não {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Código do item exigido no Row Não {0}
 DocType: Sales Partner,Partner Type,Tipo de parceiro
 DocType: Purchase Taxes and Charges,Actual,Atual
 DocType: Authorization Rule,Customerwise Discount,Desconto Customerwise
 DocType: Purchase Invoice,Against Expense Account,Contra a conta de despesas
 DocType: Production Order,Production Order,Ordem de Produção
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
 DocType: Quotation Item,Against Docname,Contra Docname
 DocType: SMS Center,All Employee (Active),Todos os Empregados (Ativo)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Já
@@ -3432,15 +3462,15 @@
 DocType: Employee,Applicable Holiday List,Lista de férias aplicável
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Série Atualizado
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Tipo de relatório é obrigatória
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Tipo de relatório é obrigatória
 DocType: Item,Serial Number Series,Serienummer Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Armazém é obrigatória para stock o item {0} na linha {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
 DocType: Issue,First Responded On,Primeiro respondeu em
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz de Listagem do item em vários grupos
 apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,De eerste gebruiker : U
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ano Fiscal Data de Início e Término do Exercício Social Data já estão definidos no ano fiscal de {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliados com sucesso
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ano Fiscal Data de Início e Término do Exercício Social Data já estão definidos no ano fiscal de {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Reconciliados com sucesso
 DocType: Production Order,Planned End Date,Planejado Data de Término
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Onde os itens são armazenados.
 DocType: Tax Rule,Validity,Validade
@@ -3448,7 +3478,7 @@
 DocType: Attendance,Attendance,Comparecimento
 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 controlada, a lista deverá ser adicionado a cada departamento onde tem de ser aplicado."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Data e postagem Posting tempo é obrigatório
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Data e postagem Posting tempo é obrigatório
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Modelo de impostos para a compra de transações.
 ,Item Prices,Preços de itens
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Em Palavras será visível quando você salvar a Ordem de Compra.
@@ -3457,15 +3487,15 @@
 DocType: Task,Review Date,Comente Data
 DocType: Purchase Invoice,Advance Payments,Adiantamentos
 DocType: Purchase Taxes and Charges,On Net Total,Em Líquida Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,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/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/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Sem permissão para usar ferramenta de pagamento
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"'Notificação Endereços de e-mail"" não especificado para o recorrente %s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Termine Conta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despesas Administrativas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,consultor
 DocType: Customer Group,Parent Customer Group,Grupo de Clientes pai
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Mudança
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Mudança
 DocType: Purchase Invoice,Contact Email,Contato E-mail
 DocType: Appraisal Goal,Score Earned,Pontuação Agregado
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","por exemplo "" My Company LLC"""
@@ -3475,13 +3505,13 @@
 DocType: Packing Slip,Gross Weight UOM,UOM Peso Bruto
 DocType: Email Digest,Receivables / Payables,Contas a receber / contas a pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra a nota fiscal de venda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Conta de crédito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Conta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Item de custo Landed
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores de zero
 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 de determinadas quantidades de matérias-primas
 DocType: Payment Reconciliation,Receivable / Payable Account,Receber Conta / Payable
 DocType: Delivery Note Item,Against Sales Order Item,Contra a Ordem de venda do item
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
 DocType: Item,Default Warehouse,Armazém padrão
 DocType: Task,Actual End Date (via Time Logs),Data Real End (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Orçamento não pode ser atribuído contra a conta de grupo {0}
@@ -3517,29 +3547,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planejar logs de tempo fora do horário de trabalho estação de trabalho.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} já foi apresentado
 ,Items To Be Requested,Items worden aangevraagd
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Obter Última Tarifa de Compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Taxa de facturação com base no tipo de atividade (por hora)
 DocType: Company,Company Info,Informações da empresa
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Empresa E-mail ID não foi encontrado , daí mail não enviado"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicações de Recursos ( Ativos )
 DocType: Production Planning Tool,Filter based on item,Filtrar com base no item
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Conta de debito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Conta de debito
 DocType: Fiscal Year,Year Start Date,Data de início do ano
 DocType: Attendance,Employee Name,Nome do Funcionário
 DocType: Sales Invoice,Rounded Total (Company Currency),Total arredondado (Moeda Company)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Não é possível converter para o Grupo, pois o tipo de conta é selecionado."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Não é possível converter para o Grupo, pois o tipo de conta é selecionado."
 DocType: Purchase Common,Purchase Common,Compre comum
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} foi modificado . Por favor, atualize ."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Pare de usuários de fazer aplicações deixam nos dias seguintes.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,van Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefícios a Empregados
 DocType: Sales Invoice,Is POS,É POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
 DocType: Production Order,Manufactured Qty,Qtde fabricados
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceite
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} não existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Contas levantou a Clientes.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projeto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} assinantes acrescentado
 DocType: Maintenance Schedule,Schedule,Programar
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definir orçamento para este centro de custo. Para definir a ação orçamento, consulte &quot;Lista de Empresas&quot;"
@@ -3547,7 +3578,7 @@
 DocType: Quality Inspection Reading,Reading 3,Leitura 3
 ,Hub,Cubo
 DocType: GL Entry,Voucher Type,Tipo de Vale
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
 DocType: Expense Claim,Approved,Aprovado
 DocType: Pricing Rule,Price,Preço
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda'
@@ -3561,7 +3592,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Lançamentos contábeis em diários
 DocType: Delivery Note Item,Available Qty at From Warehouse,Quantidade disponível no Armazém A partir de
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / conta não coincide com {1} / {2} em {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / conta não coincide com {1} / {2} em {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para criar uma conta de impostos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Por favor insira Conta Despesa
 DocType: Account,Stock,Stock
@@ -3572,7 +3603,7 @@
 DocType: Employee,Contract End Date,Data final do contrato
 DocType: Sales Order,Track this Sales Order against any Project,Acompanhar este Ordem de vendas contra qualquer projeto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Puxe pedidos de vendas pendentes (de entregar) com base nos critérios acima
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Do Orçamento de Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Do Orçamento de Fornecedor
 DocType: Deduction Type,Deduction Type,Tipo de dedução
 DocType: Attendance,Half Day,Meio Dia
 DocType: Pricing Rule,Min Qty,min Qty
@@ -3580,7 +3611,7 @@
 DocType: GL Entry,Transaction Date,Data Transação
 DocType: Production Plan Item,Planned Qty,Qtde planejada
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Fiscal total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Para Quantidade (fabricado Qtde) é obrigatório
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Para Quantidade (fabricado Qtde) é obrigatório
 DocType: Stock Entry,Default Target Warehouse,Armazém alvo padrão
 DocType: Purchase Invoice,Net Total (Company Currency),Total Líquido (Moeda Company)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tipo e partido só é aplicável contra a receber / a pagar contas
@@ -3634,9 +3665,9 @@
 DocType: Customer,Commission Rate,Taxa de Comissão
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Faça Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquear deixar aplicações por departamento.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Carrinho está vazio
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Carrinho está vazio
 DocType: Production Order,Actual Operating Cost,Custo operacional real
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root não pode ser editado .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root não pode ser editado .
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Montante atribuído não pode ser superior à quantia desasjustada
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir a produção aos feriados
 DocType: Sales Order,Customer's Purchase Order Date,Do Cliente Ordem de Compra Data
@@ -3647,11 +3678,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,estilista
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termos e Condições de modelo
 DocType: Serial No,Delivery Details,Detalhes da entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Criar automaticamente um pedido de material se a quantidade for inferior a este nível
 ,Item-wise Purchase Register,Item-wise Compra Register
 DocType: Batch,Expiry Date,Data de validade
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
 ,Supplier Addresses and Contacts,Leverancier Adressen en Contacten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Selecteer Categorie eerst
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projeto mestre.
@@ -3659,7 +3690,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Meio Dia)
 DocType: Supplier,Credit Days,Dias de crédito
 DocType: Leave Type,Is Carry Forward,É Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obter itens da Lista de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Obter itens da Lista de Material
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Levar dias Tempo
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tipo e partido é necessário para receber / pagar conta {1}
@@ -3667,7 +3698,7 @@
 DocType: Employee,Reason for Leaving,Motivo da saída
 DocType: Expense Claim Detail,Sanctioned Amount,Quantidade sancionada
 DocType: GL Entry,Is Opening,Está abrindo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débito entrada não pode ser ligado a uma {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Conta {0} não existe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débito entrada não pode ser ligado a uma {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Conta {0} não existe
 DocType: Account,Cash,Numerário
 DocType: Employee,Short biography for website and other publications.,Breve biografia para o site e outras publicações.
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index bd986cc..4f446ec 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produse consumator
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vă rugăm să selectați Party Type primul
 DocType: Item,Customer Items,Articole clientului
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Contul {0}: cont Părinte {1} nu poate fi un registru
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Contul {0}: cont Părinte {1} nu poate fi un registru
 DocType: Item,Publish Item to hub.erpnext.com,Publica Postul de hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Notificări Email
 DocType: Item,Default Unit of Measure,Unitatea de Măsură Implicita
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Moneda este necesară pentru lista de prețuri {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Va fi calculat în cadrul tranzacției.
 DocType: Purchase Order,Customer Contact,Clientul A lua legatura
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Din Cerere de Material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Din Cerere de Material
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} arbore
 DocType: Job Applicant,Job Applicant,Solicitant loc de muncă
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nu mai multe rezultate.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 Pentru a menține codul de client element înțelept și pentru a le face pe baza utilizării lor cod de această opțiune
 DocType: Mode of Payment Account,Mode of Payment Account,Modul de cont de plăți
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Arată Variante
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Cantitate
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Cantitate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Imprumuturi (Raspunderi)
 DocType: Employee Education,Year of Passing,Ani de la promovarea
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,În Stoc
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Servicii de Sanatate
 DocType: Purchase Invoice,Monthly,Lunar
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Întârziere de plată (zile)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Factură
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Factură
 DocType: Maintenance Schedule Item,Periodicity,Periodicitate
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adresa De E-Mail
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Anul fiscal {0} este necesară
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Apărare
 DocType: Company,Abbr,Presc
 DocType: Appraisal Goal,Score (0-5),Scor (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rând {0}: {1} {2} nu se potrivește cu {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Rând {0}: {1} {2} nu se potrivește cu {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,
 DocType: Delivery Note,Vehicle No,Vehicul Nici
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vă rugăm să selectați lista de prețuri
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Vă rugăm să selectați lista de prețuri
 DocType: Production Order Operation,Work In Progress,Lucrări în curs
 DocType: Employee,Holiday List,Lista de Vacanță
 DocType: Time Log,Time Log,Timp Conectare
@@ -98,13 +98,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Aceeași societate este înscris de mai multe ori
 DocType: Employee,Married,Căsătorit
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nu este permisă {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
 DocType: Payment Reconciliation,Reconcile,Reconcilierea
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Băcănie
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,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/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Depozit este obligatorie dacă tipul de cont este de depozit
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Depozit este obligatorie dacă tipul de cont este de depozit
 DocType: SMS Center,All Sales Person,Toate persoanele de vânzăril
 DocType: Lead,Person Name,Nume persoană
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Verificați dacă comanda recurente, debifați pentru a opri recurente sau încearcă propriu Data de încheiere"
@@ -125,16 +125,16 @@
 DocType: Lead,Interested,Interesat
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Factură de material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Deschidere
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},De la {0} {1} la
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},De la {0} {1} la
 DocType: Item,Copy From Item Group,Copiere din Grupul de Articole
 DocType: Journal Entry,Opening Entry,Deschiderea de intrare
 DocType: Stock Entry,Additional Costs,Costuri suplimentare
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Un cont cu tranzacții existente nu poate fi transformat în grup.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Un cont cu tranzacții existente nu poate fi transformat în grup.
 DocType: Lead,Product Enquiry,Intrebare produs
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Va rugam sa introduceti prima companie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vă rugăm să selectați Company primul
 DocType: Employee Education,Under Graduate,Sub Absolvent
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Țintă pe
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Țintă pe
 DocType: BOM,Total Cost,Cost total
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Jurnal Activitati:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Articolul {0} nu există în sistem sau a expirat
@@ -164,7 +164,7 @@
 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","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 +444,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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vor fi actualizate după Factura Vanzare este prezentat.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Setările pentru modul HR
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detalii privind operațiunile efectuate.
 DocType: Serial No,Maintenance Status,Stare Mentenanta
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Articole și Prețuri
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},De la data trebuie să fie în anul fiscal. Presupunând că la data = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},De la data trebuie să fie în anul fiscal. Presupunând că la data = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Selectați angajatul pentru care doriți să creați de evaluare.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centrul de Cost {0} nu aparține Companiei {1}
 DocType: Customer,Individual,Individual
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Numerar net din Finantare
 DocType: Lead,Address & Contact,Adresă și contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Adauga frunze neutilizate de alocări anterioare
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Urmatoarea recurent {0} va fi creat pe {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Nume Persoana de Contact
 DocType: Production Plan Item,SO Pending Qty,SO așteptare Cantitate
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Creare fluturas de salariu pentru criteriile mentionate mai sus.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Nici o descriere dat
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Cere pentru cumpărare.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Alinarea Data trebuie să fie mai mare decât Data aderării
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Specificație Site Articol
 DocType: Payment Tool,Reference No,De referință nr
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Concediu Blocat
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,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/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock reconciliere Articol
 DocType: Stock Entry,Sales Invoice No,Factură de vânzări Nu
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Furnizor Tip
 DocType: Item,Publish in Hub,Publica in Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Articolul {0} este anulat
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Articolul {0} este anulat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Relație
 DocType: Shipping Rule,Worldwide Shipping,Expediere
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Comenzi confirmate de la clienți.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Sugestii
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Set bugetelor Grupa înțelept Articol de pe acest teritoriu. Puteți include, de asemenea, sezonier prin setarea distribuție."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Va rugam sa introduceti grup considerare mamă pentru depozit {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plata împotriva {0} {1} nu poate fi mai mare decât Impresionant Suma {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plata împotriva {0} {1} nu poate fi mai mare decât Impresionant Suma {2}
 DocType: Supplier,Address HTML,Adresă HTML
 DocType: Lead,Mobile No.,Mobil Nu.
 DocType: Maintenance Schedule,Generate Schedule,Generează orar
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Ultimul
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caractere
 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
+apps/erpnext/erpnext/config/desktop.py +73,Learn,A invata
 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/config/crm.py +90,Manage Sales Person Tree.,Gestioneaza Ramificatiile Persoanei responsabila cu Vanzarile
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Multi valutar
 DocType: Payment Reconciliation Invoice,Invoice Type,Factura Tip
 DocType: Sales Invoice Item,Delivery Note,Nota de Livrare
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configurarea Impozite
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configurarea Impozite
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +105,Summary for this week and pending activities,Rezumat pentru această săptămână și a activităților în curs
 DocType: Workstation,Rent Cost,Chirie Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vă rugăm selectați luna și anul
@@ -307,11 +310,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponibil în BOM, nota de livrare, factura de cumparare, comanda de producție, comanda de cumparare, chitanţa de cumpărare, factura de vânzare,comanda de vânzare, intrare de stoc, pontaj"
 DocType: Item Tax,Tax Rate,Cota de impozitare
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Selectați articol
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Selectați articol
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Postul: {0} în șarje, nu pot fi reconciliate cu ajutorul \
  stoc reconciliere, utilizați în schimb stoc intrare gestionate"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Converti la non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Primirea cumparare trebuie depuse
@@ -352,6 +355,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medical
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motiv pentru a pierde
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation este închis la următoarele date ca pe lista de vacanta: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunitati
 DocType: Employee,Single,Celibatar
 DocType: Issue,Attachment,Atașament
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Buget nu poate fi setat pentru cost Center Group
@@ -381,13 +385,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,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 +563,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 +140,Holiday master.,Maestru de vacanta.
 DocType: Material Request Item,Required Date,Date necesare
 DocType: Delivery Note,Billing Address,Adresa de facturare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
 DocType: BOM,Costing,Cost
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","In cazul in care se bifeaza, suma taxelor va fi considerată ca fiind deja inclusa în Rata de Imprimare / Suma de Imprimare"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Raport Cantitate
@@ -420,7 +424,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetică
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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ță
 ,Serial No Warranty Expiry,Serial Nu Garantie pana
@@ -439,15 +443,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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 Company
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Articolul {0} nu este Articol de Cumparare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Articolul {0} nu este Articol de Cumparare
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} este o adresă de email invalidă în ""Notificare \ Adrese de email"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adaugaţi / editaţi taxe și cheltuieli
 DocType: Purchase Invoice,Supplier Invoice No,Furnizor Factura Nu
 DocType: Territory,For reference,Pentru referință
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),De închidere (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),De închidere (Cr)
 DocType: Serial No,Warranty Period (Days),Perioada de garanție (zile)
 DocType: Installation Note Item,Installation Note Item,Instalare Notă Postul
 ,Pending Qty,Așteptare Cantitate
@@ -462,7 +465,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribuție lunară** vă ajută să vă distribuiți bugetul pe luni, dacă aveți sezonalitate în afacerea dvs. Pentru a distribui un buget folosind această distribuție, configurați această **distribuție lunară** în **centrul de cost**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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.py +126,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 +20,Please select Company and Party Type first,Vă rugăm să selectați Company și Partidul Tip primul
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,An financiar / contabil.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Ne pare rău, Serial nr nu se pot uni"
@@ -470,9 +473,9 @@
 DocType: Project Task,Project Task,Proiect Sarcina
 ,Lead Id,Id Conducere
 DocType: C-Form Invoice Detail,Grand Total,Total general
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Anul fiscal Data începerii nu trebuie să fie mai mare decât anul fiscal Data de încheiere
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Anul fiscal Data începerii nu trebuie să fie mai mare decât anul fiscal Data de încheiere
 DocType: Warranty Claim,Resolution,Rezolutie
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Livrate: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Livrate: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Contul furnizori
 DocType: Sales Order,Billing and Delivery Status,Facturare și de livrare Starea
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clienții repetate
@@ -487,7 +490,7 @@
 DocType: Quotation,Quotation To,Citat Pentru a
 DocType: Lead,Middle Income,Venituri medii
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Deschidere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Suma alocată nu poate fi negativă
 DocType: Purchase Order Item,Billed Amt,Suma facturată
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un depozit logic față de care se efectuează înregistrări de stoc.
@@ -496,7 +499,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Producția Comanda este obligatorie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Propunere de scriere
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Eroare negativ Stock ({6}) pentru postul {0} în Depozit {1} la {2} {3} în {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Eroare negativ Stock ({6}) pentru postul {0} în Depozit {1} la {2} {3} în {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Anul fiscal companie
 DocType: Packing Slip Item,DN Detail,Detaliu DN
 DocType: Time Log,Billed,Facturat
@@ -515,16 +518,17 @@
 DocType: Activity Type,Default Costing Rate,Implicit Rata Costing
 DocType: Maintenance Schedule,Maintenance Schedule,Program Mentenanta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Apoi normelor privind prețurile sunt filtrate pe baza Customer, Client Group, Territory, furnizor, furnizor de tip, Campania, Vanzari Partener etc"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Schimbarea net în inventar
 DocType: Employee,Passport Number,Numărul de pașaport
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Din Chitanta de Cumparare
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Same articol a fost introdus de mai multe ori.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Din Chitanta de Cumparare
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Same articol a fost introdus de mai multe ori.
 DocType: SMS Settings,Receiver Parameter,Receptor Parametru
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Bazat pe' și 'Grupat dupa' nu pot fi identice
 DocType: Sales Person,Sales Person Targets,Obiective de vânzări Persoana
 DocType: Production Order Operation,In minutes,In cateva minute
 DocType: Issue,Resolution Date,Data rezoluție
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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}
 DocType: Selling Settings,Customer Naming By,Numire Client de catre
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Transforma in grup
 DocType: Activity Cost,Activity Type,Tip Activitate
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Editare
 DocType: Activity Cost,Projects User,Proiecte de utilizare
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} nu a fost găsit în tabelul detalii factură
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vizita de Mentenanta {0} trebuie sa fie anulată înainte de a anula această Comandă de Vânzări
 DocType: Material Request,Material Transfer,Transfer de material
@@ -557,13 +561,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Pentru a urmări element în vânzări și a documentelor de achiziție, pe baza lor de serie nr. Acest lucru se poate, de asemenea, utilizat pentru a urmări detalii de garanție ale produsului."
 DocType: Purchase Receipt Item Supplied,Current Stock,Stoc curent
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Warehouse respins este obligatorie împotriva articol regected
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Facturare totală în acest an
 DocType: Account,Expenses Included In Valuation,Cheltuieli Incluse în Evaluare
 DocType: Employee,Provide email id registered in company,Furnizarea id-ul de e-mail înregistrată în societate
 DocType: Hub Settings,Seller City,Vânzător oraș
 DocType: Email Digest,Next email will be sent on:,E-mail viitor va fi trimis la:
 DocType: Offer Letter Term,Offer Letter Term,Oferta Scrisoare Termen
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Element are variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Element are variante.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Arbore Tip
@@ -581,18 +585,18 @@
 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 +92,{0} is not a stock Item,{0} nu este un articol de stoc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nu este un articol de stoc
 DocType: Mode of Payment Account,Default Account,Cont Implicit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,Vă rugăm să selectați zi liberă pe săptămână
 DocType: Production Order Operation,Planned End Time,Planificate End Time
 ,Sales Person Target Variance Item Group-Wise,Persoana de vânzări țintă varianță Articol Grupa Înțelept
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Un cont cu tranzacții existente nu poate fi transformat în registru contabil
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Un cont cu tranzacții existente nu poate fi transformat în registru contabil
 DocType: Delivery Note,Customer's Purchase Order No,Nr. Comanda de Aprovizionare Client
 DocType: Employee,Cell Number,Număr Celula
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Cereri materiale Auto Generat
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Pierdut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Nu puteți introduce voucher curent în ""Împotriva Jurnalul intrare"" coloană"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"Nu puteți introduce voucher curent în ""Împotriva Jurnalul intrare"" coloană"
 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 +33,Monthly salary statement.,Declarația salariu lunar.
@@ -601,9 +605,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: de la {0} de tipul {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rând {0}: Factorul de conversie este obligatorie
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Intrările contabile pot fi create comparativ nodurilor frunză. Intrările comparativ grupurilor nu sunt permise.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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ţă
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Număr Primirea de achiziție necesar pentru postul {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Număr Primirea de achiziție necesar pentru postul {0}
 DocType: Item Attribute Value,Item Attribute Value,Postul caracteristicii Valoarea
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campanii de vanzari.
 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.
@@ -661,7 +665,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Lista de prețuri nu selectat
 DocType: Employee,Family Background,Context familial
 DocType: Process Payroll,Send Email,Trimiteți-ne email
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nici o permisiune
 DocType: Company,Default Bank Account,Cont Bancar Implicit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Pentru a filtra pe baza Party, selectați Party Tip primul"
@@ -669,7 +673,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Articole cu weightage mare va fi afișat mai mare
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detaliu reconciliere bancară
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Facturile mele
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Facturile mele
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nu a fost gasit angajat
 DocType: Purchase Order,Stopped,Oprita
 DocType: Item,If subcontracted to a vendor,Dacă subcontractat la un furnizor
@@ -679,6 +683,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Trimite Acum
 ,Support Analytics,Suport Analytics
 DocType: Item,Website Warehouse,Site-ul Warehouse
+DocType: Payment Reconciliation,Minimum Invoice Amount,Factură cantitate minimă
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Înregistrări formular-C
@@ -688,7 +693,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Pentru a activa &quot;punct de vânzare&quot; caracteristici
 DocType: Bin,Moving Average Rate,Rata medie mobilă
 DocType: Production Planning Tool,Select Items,Selectați Elemente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} din data de {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} din data de {2}
 DocType: Maintenance Visit,Completion Status,Stare Finalizare
 DocType: Sales Invoice Item,Target Warehouse,Țintă Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Permiteți peste livrare sau primire pana la acest procent
@@ -700,7 +705,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compune în mod automat un mesaj la introducere de tranzacții.
 DocType: Production Order,Item To Manufacture,Articol pentru Fabricare
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statusul este {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Comandă de aprovizionare de plata
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Comandă de aprovizionare de plata
 DocType: Sales Order Item,Projected Qty,Proiectat Cantitate
 DocType: Sales Invoice,Payment Due Date,Data scadentă de plată
 DocType: Newsletter,Newsletter Manager,Newsletter Director
@@ -724,7 +729,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punct de vânzare
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Debit""."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Debit""."
 DocType: Account,Balance must be,Bilanţul trebuie să fie
 DocType: Hub Settings,Publish Pricing,Publica Prețuri
 DocType: Notification Control,Expense Claim Rejected Message,Mesaj Respingere Revendicare Cheltuieli
@@ -747,7 +752,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Maestru cursului de schimb valutar.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} trebuie să fie activ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} trebuie să fie activ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vă rugăm să selectați tipul de document primul
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Suma Incasare Concediu
@@ -765,17 +770,17 @@
 DocType: Supplier,Default Payable Accounts,Implicit conturi de plătit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Angajatul {0} nu este activ sau nu există
 DocType: Features Setup,Item Barcode,Element de coduri de bare
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Postul variante {0} actualizat
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Postul variante {0} actualizat
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de cumpărare în avans
 DocType: Address,Shop,Magazin
 DocType: Hub Settings,Sync Now,Sincronizare acum
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Rând {0}: intrare de credit nu poate fi legat de o {1}
 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.
 DocType: Employee,Permanent Address Is,Adresa permanentă este
 DocType: Production Order Operation,Operation completed for how many finished goods?,Funcționare completat de cât de multe bunuri finite?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Marca
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Alocație mai mare decât -{0} anulată pentru articolul {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Alocație mai mare decât -{0} anulată pentru articolul {1}.
 DocType: Employee,Exit Interview Details,Detalii Interviu de Iesire
 DocType: Item,Is Purchase Item,Este de cumparare Articol
 DocType: Journal Entry Account,Purchase Invoice,Factura de cumpărare
@@ -787,7 +792,7 @@
 DocType: Salary Slip,Total in words,Total în cuvinte
 DocType: Material Request Item,Lead Time Date,Data Timp Conducere
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,este obligatorie. Poate înregistrarea de schimb valutar nu este creeatã pentru
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Rând # {0}: Vă rugăm să specificați Nu serial pentru postul {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Rând # {0}: Vă rugăm să specificați Nu serial pentru postul {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Pentru elementele &quot;produse Bundle&quot;, Warehouse, Serial No și lot nr vor fi luate în considerare de la &quot;ambalare List&quot; masa. Dacă Warehouse și Lot nr sunt aceleași pentru toate elementele de ambalaj pentru produs orice &quot;Bundle produs&quot;, aceste valori pot fi introduse în tabelul de punctul principal, valorile vor fi copiate &quot;de ambalare Lista&quot; masă."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Transporturile către clienți.
 DocType: Purchase Invoice Item,Purchase Order Item,Comandă de aprovizionare Articol
@@ -796,14 +801,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variație
 ,Company Name,Denumire Companie
 DocType: SMS Center,Total Message(s),Total mesaj(e)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Selectați Element de Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permiteţi utilizatorului să editeze lista ratelor preturilor din tranzacții
 DocType: Pricing Rule,Max Qty,Max Cantitate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rând {0}: Plata împotriva Vânzări / Ordinului de Procurare ar trebui să fie întotdeauna marcate ca avans
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chimic
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Toate articolele acestei comenzi de producție au fost deja transferate.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Toate articolele acestei comenzi de producție au fost deja transferate.
 DocType: Process Payroll,Select Payroll Year and Month,Selectați Salarizare anul și luna
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Du-te la grupul corespunzător (de obicei, de aplicare fondurilor&gt; Active curente&gt; Conturi bancare și de a crea un nou cont (făcând clic pe Adăugați pentru copii) de tip &quot;Banca&quot;"
 DocType: Workstation,Electricity Cost,Cost energie electrică
@@ -817,10 +823,10 @@
 DocType: SMS Center,All Lead (Open),Toate articolele de top (deschise)
 DocType: Purchase Invoice,Get Advances Paid,Obtine Avansurile Achitate
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Atașați imaginea dvs.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Realizare
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Realizare
 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.,Nu a fost o eroare. Un motiv probabil ar putea fi că nu ați salvat formularul. Vă rugăm să contactați support@erpnext.com dacă problema persistă.
-apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Cosul meu
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Cosul meu
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Deschiderea Cantitate
@@ -839,10 +845,10 @@
 DocType: POS Profile,Cash/Bank Account,Numerar/Cont Bancar
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Tabelul atribut este obligatoriu
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} nu poate fi negativ
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Reducere
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Reducere
 DocType: Features Setup,Purchase Discounts,Cumpărare Reduceri
 DocType: Workstation,Wages,Salarizare
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Va fi actualizată doar dacă Timpul Log este &quot;facturabil&quot;
@@ -867,7 +873,7 @@
 DocType: Tax Rule,Shipping State,Stat de transport maritim
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Postul trebuie să fie adăugate folosind ""obține elemente din Cumpără Încasări"" buton"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Cheltuieli de vânzare
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Cumpararea Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Cumpararea Standard
 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
@@ -909,6 +915,7 @@
 DocType: Sales Partner,Distributor,Distribuitor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Cosul de cumparaturi Articolul Transport
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Producția de Ordine {0} trebuie anulată înainte de a anula această comandă de vânzări
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Vă rugăm să setați &quot;Aplicați discount suplimentar pe&quot;
 ,Ordered Items To Be Billed,Comandat de Articole Pentru a fi facturat
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Din Gama trebuie să fie mai mică de la gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selectați Timp Busteni Trimite pentru a crea o nouă factură de vânzare.
@@ -918,13 +925,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Acest lot Timpul Log a fost facturat.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Creare Oportunitate
 DocType: Salary Slip,Leave Without Pay,Concediu Fără Plată
-DocType: Supplier,Communications,Comunicari
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacitate de eroare de planificare
 ,Trial Balance for Party,Trial Balance pentru Party
 DocType: Lead,Consultant,Consultant
 DocType: Salary Slip,Earnings,Câștiguri
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Postul terminat {0} trebuie să fie introdusă de intrare de tip fabricarea
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Sold Contabilitate
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Postul terminat {0} trebuie să fie introdusă de intrare de tip fabricarea
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Sold Contabilitate
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Vanzare Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nimic de a solicita
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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'
@@ -966,7 +972,7 @@
 DocType: Global Defaults,Current Fiscal Year,An Fiscal Curent
 DocType: Global Defaults,Disable Rounded Total,Dezactivati Totalul Rotunjit
 DocType: Lead,Call,Apelaţi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Intrările' nu pot fi vide
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'Intrările' nu pot fi vide
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Inregistrare {0} este duplicata cu aceeași {1}
 ,Trial Balance,Balanta
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configurarea angajati
@@ -978,9 +984,9 @@
 DocType: Contact,User ID,ID-ul de utilizator
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vezi Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Cel mai devreme
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Fabricarea de comandă de vânzări
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Restul lumii
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -1010,7 +1016,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Nu este autorizat pentru a edita contul congelate {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtine Facturi Neachitate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1023,13 +1029,13 @@
 DocType: Employee,Place of Issue,Locul eliberării
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contract
 DocType: Email Digest,Add Quote,Adaugă Citat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Factor coversion UOM UOM necesare pentru: {0} in articol: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Factor coversion UOM UOM necesare pentru: {0} in articol: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Cheltuieli indirecte
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Produsele sau serviciile dvs.
 DocType: Mode of Payment,Mode of Payment,Mod de plata
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,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/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Acesta este un grup element rădăcină și nu pot fi editate.
 DocType: Journal Entry Account,Purchase Order,Comandă de aprovizionare
 DocType: Warehouse,Warehouse Contact Info,Date de contact depozit
@@ -1038,8 +1044,8 @@
 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/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Echipamente de Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1049,7 +1055,7 @@
 DocType: Appraisal Goal,Goal,Obiectiv
 DocType: Sales Invoice Item,Edit Description,Edit Descriere
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Așteptat Data de livrare este mai mică decât era planificat Începere Data.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Pentru furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Pentru furnizor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Setarea Tipul de cont ajută în selectarea acest cont în tranzacții.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total general (Valuta Companie)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Raport de ieșire
@@ -1062,7 +1068,7 @@
 DocType: Journal Entry,Journal Entry,Intrare în jurnal
 DocType: Workstation,Workstation Name,Stație de lucru Nume
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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
@@ -1094,7 +1100,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Buletine de contacte, conduce."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operațiunile nu poate fi lasat necompletat.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operațiunile nu poate fi lasat necompletat.
 ,Delivered Items To Be Billed,Produse Livrate Pentru a fi Facturate
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depozit nu poate fi schimbat pentru Serial No.
 DocType: Authorization Rule,Average Discount,Discount mediiu
@@ -1109,7 +1115,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},De la {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operație Descriere
 DocType: Item,Will also apply to variants,"Va aplică, de asemenea variante"
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Nu se poate schimba anul fiscal Data de începere și se termină anul fiscal Data odată ce anul fiscal este salvată.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Nu se poate schimba anul fiscal Data de începere și se termină anul fiscal Data odată ce anul fiscal este salvată.
 DocType: Quotation,Shopping Cart,Cosul de cumparaturi
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Ieșire zilnică medie
 DocType: Pricing Rule,Campaign,Campanie
@@ -1120,7 +1126,8 @@
 DocType: Sales Order Item,Planned Quantity,Planificate Cantitate
 DocType: Purchase Invoice Item,Item Tax Amount,Suma Taxa Articol
 DocType: Item,Maintain Stock,Menține Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1132,7 +1139,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,nu poate fi mai mare de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,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 Slip Deduction,Depends on Leave Without Pay,Depinde de concediu fără plată
@@ -1170,7 +1177,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,La valoarea
 DocType: Supplier,Stock Manager,Stock Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Depozit sursă este obligatorie pentru rând {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Depozit sursă este obligatorie pentru rând {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Slip de ambalare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Birou inchiriat
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setări de configurare SMS gateway-ul
@@ -1180,7 +1187,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analist
 DocType: Item,Inventory,Inventarierea
 DocType: Features Setup,"To enable ""Point of Sale"" view",Pentru a activa &quot;punct de vânzare&quot; vedere
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plata nu se poate face pentru cart gol
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Plata nu se poate face pentru cart gol
 DocType: Item,Sales Details,Detalii vânzări
 DocType: Opportunity,With Items,Cu articole
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,În Cantitate
@@ -1195,10 +1202,11 @@
 DocType: Cost Center,Parent Cost Center,Părinte Cost Center
 DocType: Sales Invoice,Source,Sursă
 DocType: Leave Type,Is Leave Without Pay,Este concediu fără plată
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nu sunt găsite în tabelul de plăți înregistrări
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nu sunt găsite în tabelul de plăți înregistrări
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Data de Inceput An Financiar
 DocType: Employee External Work History,Total Experience,Experiența totală
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Slip de ambalare (e) anulate
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Slip de ambalare (e) anulate
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow de la Investiții
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Incarcatura și Taxe de Expediere
 DocType: Material Request Item,Sales Order No,Vânzări Ordinul nr
 DocType: Item Group,Item Group Name,Denumire Grup Articol
@@ -1206,12 +1214,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiale de transfer de Fabricare
 DocType: Pricing Rule,For Price List,Pentru Lista de Preturi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cautare Executiva
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Rata de cumparare pentru articol: {0} nu a fost găsit, care este necesară pentru a face rezervarea intrare contabilitate (cheltuieli). Va rugam mentionati preț articol de o listă de prețuri de cumpărare."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Rata de cumparare pentru articol: {0} nu a fost găsit, care este necesară pentru a face rezervarea intrare contabilitate (cheltuieli). Va rugam mentionati preț articol de o listă de prețuri de cumpărare."
 DocType: Maintenance Schedule,Schedules,Orarele
 DocType: Purchase Invoice Item,Net Amount,Cantitate netă
 DocType: Purchase Order Item Supplied,BOM Detail No,Detaliu BOM nr.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Discount suplimentar Suma (companie de valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Eroare: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Eroare: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Vă rugăm să creați un cont nou de Planul de conturi.
 DocType: Maintenance Visit,Maintenance Visit,Vizita Mentenanta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Client Group> Teritoriul
@@ -1237,18 +1245,18 @@
 DocType: Sales Partner,Sales Partner Target,Vânzări Partner țintă
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Intrarea contabilitate pentru {0} se poate face numai în valută: {1}
 DocType: Pricing Rule,Pricing Rule,Regula de stabilire a prețurilor
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Cerere de material de cumpărare Ordine
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Cerere de material de cumpărare Ordine
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Conturi bancare
 ,Bank Reconciliation Statement,Extras de cont reconciliere bancară
 DocType: Address,Lead Name,Nume Conducere
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Sold Stock
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} trebuie să apară doar o singură dată
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Din Valoare
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Cantitatea de fabricație este obligatorie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Cantitatea de fabricație este obligatorie
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Sumele nu sunt corespunzătoare cu banca
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Cererile pentru cheltuieli companie.
@@ -1260,33 +1268,34 @@
 ,Material Requests for which Supplier Quotations are not created,Cererile de materiale pentru care nu sunt create Cotațiile Furnizor
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Pentru a urmări elemente utilizând coduri de bare. Va fi capabil de a intra articole în nota de livrare și factură de vânzare prin scanarea codului de bare de element.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Mark livrate
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Mark livrate
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Face ofertă
 DocType: Dependent Task,Dependent Task,Sarcina dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Receptor Lista
 DocType: Payment Tool Detail,Payment Amount,Plata Suma
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumat Suma
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vezi
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Vezi
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Schimbarea net în numerar
 DocType: Salary Structure Deduction,Salary Structure Deduction,Structura Salariul Deducerea
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costul de articole emise
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Cantitatea nu trebuie să fie mai mare de {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Vârstă (zile)
 DocType: Quotation Item,Quotation Item,Citat Articol
 DocType: Account,Account Name,Numele Contului
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,De la data nu poate fi mai mare decât la data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,De la data nu poate fi mai mare decât la data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial Nu {0} {1} cantitate nu poate fi o fracțiune
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,Rata de conversie nu poate fi 0 sau 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Rata de conversie nu poate fi 0 sau 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Primirea de cumpărare {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Primirea de cumpărare {0} nu este prezentat
 DocType: Company,Default Payable Account,Implicit cont furnizori
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% Taxat
@@ -1298,15 +1307,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Problemele mele
 DocType: BOM Item,BOM Item,Articol BOM
 DocType: Appraisal,For Employee,Pentru Angajat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,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/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rând {0}: Suma de plată nu poate fi negativ
 DocType: Expense Claim,Total Amount Reimbursed,Total suma rambursată
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Comparativ facturii furnizorului {0} din data {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Comparativ facturii furnizorului {0} din data {1}
 DocType: Customer,Default Price List,Lista de Prețuri Implicita
 DocType: Payment Reconciliation,Payments,Plăți
 DocType: Budget Detail,Budget Allocated,Buget alocat
 DocType: Journal Entry,Entry Type,Tipul de intrare
 ,Customer Credit Balance,Balanța Clienți credit
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Schimbarea net în conturi de plătit
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Vă rugăm să verificați ID-ul dvs. de e-mail
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Client necesar pentru 'Reducere Client'
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Actualizați datele de plată bancar cu reviste.
@@ -1327,7 +1338,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Activați cosul de cumparaturi
 DocType: Employee,Permanent Address,Permanent Adresa
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Articolul {0} trebuie să fie un Articol de Service.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Avansul plătit împotriva {0} {1} nu poate fi mai mare \ decât Grand total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vă rugăm să selectați codul de articol
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduce Deducerea pentru concediu fără plată (LWP)
@@ -1344,18 +1355,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Unitate unică a unui articol.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',"Ora Log Lot {0} trebuie să fie ""Înscris"""
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"Ora Log Lot {0} trebuie să fie ""Înscris"""
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Depozit necesar la Row Nu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Depozit necesar la Row Nu {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Poștal
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Există un grup de clienți cu același nume vă rugăm să schimbați numele clientului sau să redenumiți grupul de clienți
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vă rugăm să selectați {0} primul.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Textul {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Vă rugăm să selectați {0} primul.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},Textul {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Contact nou
 DocType: Territory,Parent Territory,Teritoriul părinte
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Primirea de material
@@ -1363,7 +1375,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partidul Tipul și Partidul este necesar pentru creanțe / cont plateste {0}
 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 +210,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 +213,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 +85,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
@@ -1380,15 +1392,15 @@
 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: Sales Invoice Item,Batch No,Lot nr.
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variantă
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix pentru seria de numerotare pe tranzacțiile dvs.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Pentru a opri nu pot fi anulate. Unstop pentru a anula.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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: Item,Variants,Variante
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Realizeaza Comanda de Cumparare
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Realizeaza Comanda de Cumparare
 DocType: SMS Center,Send To,Trimite la
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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ă
@@ -1401,7 +1413,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Depozit și referință
 DocType: Supplier,Statutory info and other general information about your Supplier,Info statutar și alte informații generale despre dvs. de Furnizor
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adrese
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Postul nu este permis să aibă producție comandă.
@@ -1410,10 +1422,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Suma de credit în cont valutar
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Timp Busteni pentru productie.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicați nivel de reorganizare tip depozit
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
 DocType: Authorization Control,Authorization Control,Control de autorizare
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Respins Warehouse este obligatorie împotriva postul respins {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Log timp de sarcini.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Plată
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Plată
 DocType: Production Order Operation,Actual Time and Cost,Timp și cost efective
 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},Cerere de material de maximum {0} se poate face pentru postul {1} împotriva comandă de vânzări {2}
 DocType: Employee,Salutation,Salut
@@ -1430,7 +1443,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Asociaţi
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Articolul {0} nu este un articol serializat
 DocType: SMS Center,Create Receiver List,Creare Lista Recipienti
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirat
 DocType: Packing Slip,To Package No.,La pachetul Nr
 DocType: Warranty Claim,Issue Date,Data emiterii
 DocType: Activity Cost,Activity Cost,Cost activitate
@@ -1479,7 +1491,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creat
 DocType: Delivery Note Item,Against Sales Order,Comparativ comenzii de vânzări
 ,Serial No Status,Serial Nu Statut
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Tabelul Articolului nu poate fi vid
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Tabelul Articolului nu poate fi vid
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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}"
 DocType: Pricing Rule,Selling,De vânzare
@@ -1488,7 +1500,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Impozite și taxe
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Vă rugăm să introduceți data de referință
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Vă rugăm să introduceți data de referință
 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} înregistrări de plată nu pot fi filtrate de {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabelul pentru postul care va fi afișat în site-ul
 DocType: Purchase Order Item Supplied,Supplied Qty,Furnizat Cantitate
@@ -1503,7 +1515,7 @@
 DocType: Installation Note,Installation Time,Timp de instalare
 DocType: Sales Invoice,Accounting Details,Contabilitate Detalii
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Ștergeți toate tranzacțiile de acest companie
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Rând # {0}: {1} Funcționare nu este finalizată pentru {2} cantitate de produse finite în Producție Comanda # {3}. Vă rugăm să actualizați starea de funcționare prin timp Busteni
+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,Rând # {0}: {1} Funcționare nu este finalizată pentru {2} cantitate de produse finite în Producție Comanda # {3}. Vă rugăm să actualizați starea de funcționare prin timp Busteni
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investiții
 DocType: Issue,Resolution Details,Rezoluția Detalii
 DocType: Quality Inspection Reading,Acceptance Criteria,Criteriile de receptie
@@ -1519,7 +1531,7 @@
 DocType: Holiday List,Clear Table,Sterge Masa
 DocType: Features Setup,Brands,Mărci
 DocType: C-Form Invoice Detail,Invoice No,Factura Nu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Din Ordinul de Comanda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Din Ordinul de Comanda
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lasă nu poate fi aplicat / anulata pana la {0}, ca echilibru concediu a fost deja carry transmise în viitor înregistrarea alocare concediu {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Adrese de clienți și Contacte
@@ -1536,7 +1548,7 @@
 ,Maintenance Schedules,Program Mentenanta
 ,Quotation Trends,Cotație Tendințe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,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
 ,Pending Amount,În așteptarea Suma
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversie
@@ -1553,12 +1565,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Arborele de conturi finanial.
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Contul {0} trebuie să fie de tipul 'valoare stabilită' deoarece articolul {1} este un articol de valoare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Contul {0} trebuie să fie de tipul 'valoare stabilită' deoarece articolul {1} este un articol de valoare
 DocType: HR Settings,HR Settings,Setări Resurse Umane
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Revendicarea Cheltuielilor este în curs de aprobare. Doar Aprobatorul de Cheltuieli poate actualiza statusul.
 DocType: Purchase Invoice,Additional Discount Amount,Reducere suplimentară Suma
 DocType: Leave Block List Allow,Leave Block List Allow,Permite Lista Concedii Blocate
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Raport real
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Unitate
@@ -1570,6 +1582,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} este acum implicit anul fiscal. Vă rugăm să reîmprospătați browser-ul dvs. pentru ca modificarea să aibă efect.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Creanțe cheltuieli
 DocType: Issue,Support,Suport
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Vizualizare coș
 ,BOM Search,BOM Căutare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Închiderea (deschidere + Totaluri)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Vă rugăm să specificați în valută companie
@@ -1580,13 +1593,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Factor UOM de conversie este necesară în rândul {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Data Aprobare nu poate fi anterioara datei de verificare pentru inregistrarea {0}
 DocType: Salary Slip,Deduction,Deducere
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Articol Preț adăugată pentru {0} în lista de prețuri {1}
 DocType: Address Template,Address Template,Model adresă
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% Sarcini finalizate
 DocType: Project,Gross Margin,Marja Brută
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Va rugam sa introduceti de producție Articol întâi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,utilizator dezactivat
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utilizator dezactivat
 DocType: Opportunity,Quotation,Citat
 DocType: Salary Slip,Total Deduction,Total de deducere
 DocType: Quotation,Maintenance User,Întreținere utilizator
@@ -1595,7 +1609,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
 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
@@ -1605,12 +1619,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Păstra Tractor de campanii de vanzari. Țineți evidența de afaceri, Cotațiile, comandă de vânzări, etc de la Campanii pentru a evalua Return on Investment."
 DocType: Expense Claim,Approver,Aprobator
 ,SO Qty,SO Cantitate
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Intrări din stocul exista împotriva depozit {0}, deci nu puteți re-atribui sau modifica Depozit"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Intrări din stocul exista împotriva depozit {0}, deci nu puteți re-atribui sau modifica Depozit"
 DocType: Appraisal,Calculate Total Score,Calculaţi scor total
 DocType: Supplier Quotation,Manufacturing Manager,Manufacturing Manager de
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Împărțit de livrare Notă în pachete.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Transporturile
+apps/erpnext/erpnext/hooks.py +69,Shipments,Transporturile
 DocType: Purchase Order Item,To be delivered to customer,Pentru a fi livrat clientului
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Ora Log Starea trebuie să fie prezentate.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial nr {0} nu apartine nici unei Warehouse
@@ -1630,10 +1644,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +356,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
 DocType: Currency Exchange,From Currency,Din moneda
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vă rugăm să selectați suma alocată, de tip Factură și factură Numărul din atleast rând una"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordinul de vânzări necesar pentru postul {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vă rugăm să selectați suma alocată, de tip Factură și factură Numărul din atleast rând una"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Ordinul de vânzări necesar pentru postul {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Sumele nu sunt corespunzătoare cu sistemul
 DocType: Purchase Invoice Item,Rate (Company Currency),Rata de (Compania de valuta)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Altel
@@ -1649,7 +1663,7 @@
 DocType: Quality Inspection,In Process,În procesul de
 DocType: Authorization Rule,Itemwise Discount,Reducere Articol-Avizat
 DocType: Purchase Order Item,Reference Document Type,Referință Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} comparativ cu comanda de vânzări {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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 +278,Serialized Inventory,Inventarul serializat
 DocType: Activity Type,Default Billing Rate,Rata de facturare implicit
@@ -1659,7 +1673,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Comanda de vânzări la plată
 DocType: Expense Claim Detail,Expense Claim Detail,Detaliu Revendicare Cheltuieli
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Timp Busteni creat:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Vă rugăm să selectați contul corect
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Vă rugăm să selectați contul corect
 DocType: Item,Weight UOM,Greutate UOM
 DocType: Employee,Blood Group,Grupă de sânge
 DocType: Purchase Invoice Item,Page Break,Page Break
@@ -1690,10 +1704,10 @@
 DocType: Time Log,To Time,La timp
 DocType: Authorization Rule,Approving Role (above authorized value),Aprobarea Rol (mai mare decât valoarea autorizată)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Pentru a adăuga noduri copil, explora copac și faceți clic pe nodul în care doriți să adăugați mai multe noduri."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,BOM recursion: {0} cannot be parent or child of {2},Recursivitate FDM: {0} nu poate fi parinte sau copil lui {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,BOM recursion: {0} cannot be parent or child of {2},Recursivitate FDM: {0} nu poate fi parinte sau copil lui {2}
 DocType: Production Order Operation,Completed Qty,Cantitate Finalizata
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Lista de prețuri {0} este dezactivat
 DocType: Manufacturing Settings,Allow Overtime,Permiteți ore suplimentare
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numere de serie necesare pentru postul {1}. Ați furnizat {2}.
@@ -1701,8 +1715,9 @@
 DocType: Item,Customer Item Codes,Coduri client Postul
 DocType: Opportunity,Lost Reason,Motiv Pierdere
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Creați Intrările de plată împotriva comenzi sau facturi.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Adresa noua
 DocType: Quality Inspection,Sample Size,Eșantionul de dimensiune
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Toate articolele au fost deja facturate
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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"
 DocType: Project,External,Extern
@@ -1758,13 +1773,14 @@
 DocType: Rename Tool,Rename Tool,Redenumirea Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualizare Cost
 DocType: Item Reorder,Item Reorder,Reordonare Articol
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Material de transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Material de transfer
 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ă."
 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
 DocType: Installation Note,Installation Note,Instalare Notă
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Adăugaţi Taxe
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Cash Flow de la finanțarea
 ,Financial Analytics,Analitica Financiara
 DocType: Quality Inspection,Verified By,Verificate de
 DocType: Address,Subsidiary,Filială
@@ -1774,19 +1790,19 @@
 DocType: Process Payroll,Create Salary Slip,Crea Fluturasul de Salariul
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Sold estimat ca pe bancă
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Sursa fondurilor (pasive)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Cantitatea în rândul {0} ({1}), trebuie să fie aceeași ca și cantitatea produsă {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Cantitatea în rândul {0} ({1}), trebuie să fie aceeași ca și cantitatea produsă {2}"
 DocType: Appraisal,Employee,Angajat
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email la
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Invitați ca utilizator
 DocType: Features Setup,After Sale Installations,Echipamente premergătoare vânzării
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} este complet facturat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} este complet facturat
 DocType: Workstation Working Hour,End Time,End Time
 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 +75,Group by Voucher,Grup in functie de Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obligatoriu pe
 DocType: Sales Invoice,Mass Mailing,Corespondență în masă
 DocType: Rename Tool,File to Rename,Fișier de Redenumiți
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Număr de ordine Purchse necesar pentru postul {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Număr de ordine Purchse necesar pentru postul {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Afiseaza Plati
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,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
@@ -1796,6 +1812,7 @@
 DocType: Selling Settings,Sales Order Required,Comandă de vânzări obligatorii
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Creare Client
 DocType: Purchase Invoice,Credit To,De Creditat catre
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Anunturi active / Clienți
 DocType: Employee Education,Post Graduate,Postuniversitar
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalii Program Mentenanta
 DocType: Quality Inspection Reading,Reading 9,Lectură 9
@@ -1807,6 +1824,7 @@
 DocType: Warranty Claim,Raised By,Ridicate de
 DocType: Payment Tool,Payment Account,Cont de plăți
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Vă rugăm să specificați companiei pentru a continua
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Schimbarea net în conturile de creanțe
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Fara Masuri Compensatorii
 DocType: Quality Inspection Reading,Accepted,Acceptat
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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ă.
@@ -1814,17 +1832,17 @@
 DocType: Payment Tool,Total Payment Amount,Raport de plată Suma
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Nu a putut fi actualizat stoc, factura conține drop de transport maritim."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Deoarece există tranzacții bursiere existente pentru acest element, \ nu puteți schimba valorile &quot;nu are nici o serie&quot;, &quot;are lot nr&quot;, &quot;Este Piesa&quot; și &quot;Metoda de evaluare&quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Quick Jurnal de intrare
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Jurnal de intrare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
 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 +157,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 +211,{0} {1} is not submitted,{0} {1} nu este introdus
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} nu este introdus
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Termeni și Conditions1
@@ -1837,7 +1855,7 @@
 DocType: Authorization Rule,Authorized Value,Valoarea autorizată
 DocType: Contact,Enter department to which this Contact belongs,Introduceti departamentul de care apartine acest Contact
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Raport Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Articolul sau Depozitul aferent inregistrariii {0} nu se potrivește cu Cererea de Material
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Articolul sau Depozitul aferent inregistrariii {0} nu se potrivește cu Cererea de Material
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unitate de măsură
 DocType: Fiscal Year,Year End Date,Anul Data de încheiere
 DocType: Task Depends On,Task Depends On,Sarcina Depinde
@@ -1863,7 +1881,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data de Incheiere Contract trebuie să fie ulterioara Datei Aderării
 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.
 DocType: Customer Group,Has Child Node,Are nod fiu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} comparativ cu comanda de cumpărare {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} comparativ cu comanda de cumpărare {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduceți parametrii url statici aici (de exemplu, expeditor = ERPNext, numele de utilizator = ERPNext, parola = 1234, etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nu este in nici un an fiscal activ. Pentru mai multe detalii verifica {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Acesta este un site web exemplu auto-generat de ERPNext
@@ -1911,7 +1929,7 @@
  10. Adăugați sau deduce: Fie că doriți să adăugați sau deduce taxa."
 DocType: Purchase Receipt Item,Recd Quantity,Recd Cantitate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nu se pot produce mai multe Articole {0} decât cantitatea din Ordinul de Vânzări {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
 DocType: Payment Reconciliation,Bank / Cash Account,Cont bancă / numerar
 DocType: Tax Rule,Billing City,Oraș de facturare
 DocType: Global Defaults,Hide Currency Symbol,Ascunde simbol moneda
@@ -1943,6 +1961,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Cheltuieli de utilitate
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-sus
 DocType: Buying Settings,Default Buying Price List,Lista de POrețuri de Cumparare Implicita
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Nici un angajat pentru criteriile de mai sus selectate sau biletul de salariu deja creat
 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"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tip de plată
@@ -1978,7 +1997,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","A se vedea ""Rate de materiale bazate pe"" în Costing Secțiunea"
 DocType: Appraisal Goal,Key Responsibility Area,Domeni de Responsabilitate Cheie
 DocType: Item Reorder,Material Request Type,Material Cerere tip
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Factorul de conversie UOM este obligatorie
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Re
 DocType: Cost Center,Cost Center,Centrul de cost
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -2001,7 +2020,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vă rugăm să selectați o valoare de {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Toate adresele.
 DocType: Company,Stock Settings,Setări stoc
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Fuziune este posibilă numai în cazul în care următoarele proprietăți sunt aceleași în ambele registre. Este Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Fuziune este posibilă numai în cazul în care următoarele proprietăți sunt aceleași în ambele registre. Este Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gestioneaza Ramificatiile de Group a Clientului.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Numele noului centru de cost
 DocType: Leave Control Panel,Leave Control Panel,Panou de Control Concediu
@@ -2021,8 +2040,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Plata Instrumentul Detalii
 ,Sales Browser,Vânzări Browser
 DocType: Journal Entry,Total Credit,Total credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Împrumuturi și Avansuri (Active)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorii
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Mare
@@ -2041,7 +2060,7 @@
 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 Nu.
 DocType: Production Order Operation,Make Time Log,Fa-ti timp Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Vă rugăm să setați cantitatea reordona
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Vă rugăm să setați cantitatea reordona
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Vă rugăm să creați client de plumb {0}
 DocType: Price List,Applicable for Countries,Aplicabile pentru țările
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
@@ -2101,10 +2120,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Nu Observații
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Nu Observații
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Întârziat
 DocType: Account,Stock Received But Not Billed,"Stock primite, dar nu Considerat"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Contul de root trebuie să fie un grup
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Contul de root trebuie să fie un grup
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brut Suma de plată + restante Suma + încasări - Total Deducerea
 DocType: Monthly Distribution,Distribution Name,Denumire Distribuție
 DocType: Features Setup,Sales and Purchase,Vanzari si cumparare
@@ -2118,6 +2137,7 @@
 DocType: Journal Entry Account,Party Balance,Balanța Party
 DocType: Sales Invoice Item,Time Log Batch,Timp Log lot
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Vă rugăm să selectați Aplicați Discount On
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Salariu Slip Creat
 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: Stock Entry,Material Transfer for Manufacture,Transfer de material pentru fabricarea
@@ -2125,9 +2145,9 @@
 DocType: Purchase Invoice,Half-yearly,Semestrial
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Anul fiscal {0} nu a fost găsit.
 DocType: Bank Reconciliation,Get Relevant Entries,Obține intrările relevante
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Intrare contabilitate pentru stoc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Intrare contabilitate pentru stoc
 DocType: Sales Invoice,Sales Team1,Vânzări TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Articolul {0} nu există
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Articolul {0} nu există
 DocType: Sales Invoice,Customer Address,Adresă client
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicați Discount suplimentare La
 DocType: Account,Root Type,Rădăcină Tip
@@ -2136,15 +2156,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Arată această prezentare în partea de sus a paginii
 DocType: BOM,Item UOM,Articol FDM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma impozitului pe urma Discount Suma (companie de valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Depozit țintă este obligatorie pentru rând {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Depozit țintă este obligatorie pentru rând {0}
 DocType: Quality Inspection,Quality Inspection,Inspecție de calitate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Produse Alimentare, Bauturi si Tutun"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL sau BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Poate face doar plata împotriva facturată {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Poate face doar plata împotriva facturată {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Rata de comision nu poate fi mai mare decat 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivelul minim Inventarul
 DocType: Stock Entry,Subcontract,Subcontract
@@ -2181,7 +2201,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Control de calitate de intrare.
 DocType: Purchase Order Item,Returned Qty,Întors Cantitate
 DocType: Employee,Exit,Iesire
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Rădăcină de tip este obligatorie
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Rădăcină de tip este obligatorie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Nu {0} a creat
 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"
 DocType: Employee,You can enter any date manually,Puteți introduce manual orice dată
@@ -2189,8 +2209,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Perioadă De Probă
 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 +110,Row {0}: Advance against Customer must be credit,Row {0}: avans Clientul trebuie să fie de credit
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Primirea de cumpărare Articol Livrat
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Plăti
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Plăti
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Pentru a Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Busteni pentru menținerea statutului de livrare sms
@@ -2207,7 +2228,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordonare nivel
 DocType: Attendance,Attendance Date,Dată prezenţă
 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 +110,Account with child nodes cannot be converted to ledger,Un cont cu noduri copil nu poate fi transformat în registru contabil
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Un cont cu noduri copil nu poate fi transformat în registru contabil
 DocType: Address,Preferred Shipping Address,Preferat Adresa Shipping
 DocType: Purchase Receipt Item,Accepted Warehouse,Depozit Acceptat
 DocType: Bank Reconciliation Detail,Posting Date,Dată postare
@@ -2225,7 +2246,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Nu {0} nu există
 DocType: Pricing Rule,Discount Percentage,Procentul de Reducere
 DocType: Payment Reconciliation Invoice,Invoice Number,Numar factura
-apps/erpnext/erpnext/hooks.py +54,Orders,Comenzi
+apps/erpnext/erpnext/hooks.py +55,Orders,Comenzi
 DocType: Leave Control Panel,Employee Type,Tip angajat
 DocType: Employee Leave Approver,Leave Approver,Aprobator Concediu
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Transferat pentru fabricarea
@@ -2237,7 +2258,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% din materialele facturate comparativ cu această comandă de vânzări
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Intrarea Perioada de închidere
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciere
+DocType: Account,Depreciation,Depreciere
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizor (e)
 DocType: Customer,Credit Limit,Limita de Credit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selectați tipul de tranzacție
@@ -2262,11 +2283,12 @@
 DocType: Material Request,Requested For,Pentru a solicitat
 DocType: Quotation Item,Against Doctype,Comparativ tipului documentului
 DocType: Delivery Note,Track this Delivery Note against any Project,Urmareste acest Livrare Note împotriva oricărui proiect
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Contul de root nu pot fi șterse
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Numerar net din Investiții
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Contul de root nu pot fi șterse
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Arată stoc Entries
 ,Is Primary Address,Este primar Adresa
 DocType: Production Order,Work-in-Progress Warehouse,De lucru-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} din {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Reference # {0} din {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gestionați Adrese
 DocType: Pricing Rule,Item Code,Cod articol
 DocType: Production Planning Tool,Create Production Orders,Creare Comenzi de Producție
@@ -2274,7 +2296,7 @@
 DocType: Journal Entry,User Remark,Observație utilizator
 DocType: Lead,Market Segment,Segmentul de piață
 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 +223,Closing (Dr),De închidere (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),De închidere (Dr)
 DocType: Contact,Passive,Pasiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Nu {0} nu este în stoc
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Șablon impozit pentru tranzacțiile de vânzare.
@@ -2290,7 +2312,7 @@
 ,Billed Amount,Sumă facturată
 DocType: Bank Reconciliation,Bank Reconciliation,Reconciliere bancară
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obțineți actualizări
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Cerere de material {0} este anulată sau oprită
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Cerere de material {0} este anulată sau oprită
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Adaugă câteva înregistrări eșantion
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lasă Managementul
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grup in functie de Cont
@@ -2299,14 +2321,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Contul capul sub răspunderii, în care Profit / pierdere va fi rezervat"
 DocType: Payment Tool,Against Vouchers,Comparativ voucherului
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ajutor rapid
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Extras de vânzare
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},bugetul {0} pentru contul {1} comparativ centrului de cost {2} va fi depășit cu {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
 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'
 ,Stock Projected Qty,Stoc proiectată Cantitate
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
 DocType: Sales Order,Customer's Purchase Order,Comandă clientului
 DocType: Warranty Claim,From Company,De la Compania
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valoare sau Cantitate
@@ -2316,9 +2338,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Lista Concedii Blocate Permise
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Îl veti folosi pentru autentificare
 DocType: Sales Partner,Retailer,Vânzător cu amănuntul
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit în contul trebuie să fie un cont de bilanț
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Toate tipurile de furnizor
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +46,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 +93,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
@@ -2362,7 +2384,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"Greutatea brută a pachetului. Greutate + ambalare, de obicei, greutate netă de material. (Pentru imprimare)"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Utilizatorii cu acest rol li se permite să stabilească în conturile înghețate și de a crea / modifica intrări contabile împotriva conturile înghețate
 DocType: Serial No,Is Cancelled,Este anulat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Livrările mele
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Livrările mele
 DocType: Journal Entry,Bill Date,Dată factură
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Chiar dacă există mai multe reguli de stabilire a prețurilor, cu cea mai mare prioritate, se aplică apoi următoarele priorități interne:"
 DocType: Supplier,Supplier Details,Detalii furnizor
@@ -2383,10 +2405,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Apeluri
 DocType: Project,Total Costing Amount (via Time Logs),Suma totală Costing (prin timp Busteni)
 DocType: Purchase Order Item Supplied,Stock UOM,Stoc UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Comandă {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Comandă {0} nu este prezentat
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Proiectat
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Nu {0} nu apartine Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Notă: Sistemul nu va verifica peste, livrare și supra-rezervări pentru postul {0} ca și cantitatea sau valoarea este 0"
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Notă: Sistemul nu va verifica peste, livrare și supra-rezervări pentru postul {0} ca și cantitatea sau valoarea este 0"
 DocType: Notification Control,Quotation Message,Citat Mesaj
 DocType: Issue,Opening Date,Data deschiderii
 DocType: Journal Entry,Remark,Remarcă
@@ -2399,9 +2421,9 @@
 DocType: Time Log,Batched for Billing,Transformat în lot pentru facturare
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Facturi cu valoarea ridicată de către furnizori.
 DocType: POS Profile,Write Off Account,Scrie Off cont
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Numerar net din operațiuni
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,"de exemplu, TVA"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punctul 4
 DocType: Journal Entry Account,Journal Entry Account,Jurnal de cont intrare
@@ -2469,10 +2491,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numărul aferent lotului este obligatoriu pentru articolul {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Aceasta este o persoană de vânzări rădăcină și nu pot fi editate.
 ,Stock Ledger,Stoc Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Evaluare: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Evaluare: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Salariul Slip Deducerea
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Selectați un nod grup prim.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Scopul trebuie să fie una dintre {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Scopul trebuie să fie una dintre {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Completați formularul și salvați-l
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descărcati un raport care conține toate materiile prime cu ultimul lor status de inventar
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
@@ -2622,7 +2644,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Directorul Companiei(nu al Clientului sau al Furnizorui).
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Vă rugăm să introduceți ""Data de livrare așteptată"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nu este un număr de lot valid aferent articolului {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Notă: Nu este echilibrul concediu suficient pentru concediul de tip {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Notă: În cazul în care plata nu se face împotriva oricărei referire, face manual Jurnal intrare."
@@ -2639,13 +2661,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Trimite prin email automate de contact pe tranzacțiile Depunerea.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Rând {0}: Cant nu avalable în depozit {1} în {2} {3}.
  Disponibil Cantitate: {4}, Transfer Cantitate: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punctul 3
 DocType: Purchase Order,Customer Contact Email,Contact Email client
 DocType: Sales Team,Contribution (%),Contribuție (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitati
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Șablon
 DocType: Sales Person,Sales Person Name,Sales Person Nume
@@ -2656,20 +2678,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Premergător reconcilierii
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,FDM Implicit
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Vă rugăm să re-tip numele companiei pentru a confirma
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totală restantă Amt
 DocType: Time Log Batch,Total Hours,Total ore
 DocType: Journal Entry,Printing Settings,Setări de imprimare
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Totală de debit trebuie să fie egal cu total Credit. Diferența este {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Totală de debit trebuie să fie egal cu total Credit. Diferența este {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Autopropulsat
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Din Nota de Livrare
 DocType: Time Log,From Time,Din Time
 DocType: Notification Control,Custom Message,Mesaj Personalizat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Pentru a face o inregistrare de plată este obligatoriu numerar sau cont bancar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Pentru a face o inregistrare de plată este obligatoriu numerar sau cont bancar
 DocType: Purchase Invoice,Price List Exchange Rate,Lista de prețuri Cursul de schimb
 DocType: Purchase Invoice Item,Rate,
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interna
@@ -2688,9 +2710,10 @@
  prin atribuirea prioritate. Reguli Pret: {0}"
 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 +580,Issue Material,Eliberarea Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Eliberarea Material
 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
 DocType: Hub Settings,Access Token,Acces Token
 DocType: Sales Invoice Item,Serial No,Nr. serie
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Va rugam sa introduceti maintaince detaliile prima
@@ -2704,10 +2727,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Factură maxim Suma
 DocType: Purchase Invoice Item,Image View,Imagine Vizualizare
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Evaluare și Total
@@ -2715,6 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Acest post este o variantă de {0} (Template). Atributele vor fi copiate pe de modelul cu excepția cazului este setat ""Nu Copy"""
 DocType: Account,Purchase User,Cumpărare de utilizare
 DocType: Notification Control,Customize the Notification,Personalizare Notificare
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cash Flow din Operațiuni
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Format implicit Adresa nu poate fi șters
 DocType: Sales Invoice,Shipping Rule,Regula de transport maritim
 DocType: Journal Entry,Print Heading,Imprimare Titlu
@@ -2725,7 +2751,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Material brut
 DocType: Leave Application,Follow via Email,Urmați prin e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma taxa După Discount Suma
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Vă rugăm să selectați postarea Data primei
@@ -2743,6 +2769,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial nr necesare pentru postul serializat {0}
 DocType: Journal Entry,Bank Entry,Intrare bancară
 DocType: Authorization Rule,Applicable To (Designation),Aplicabil pentru (destinaţie)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Adăugaţi în Coş
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupul De
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Activare / dezactivare valute.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Cheltuieli poștale
@@ -2750,30 +2777,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Divertisment & Relaxare
 DocType: Purchase Order,The date on which recurring order will be stop,Data la care comanda recurent va fi opri
 DocType: Quality Inspection,Item Serial No,Nr. de Serie Articol
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} trebuie să fie redus cu {1} sau dvs. ar trebui să incrementați toleranța în exces
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} trebuie să fie redus cu {1} sau dvs. ar trebui să incrementați toleranța în exces
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Raport Prezent
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Oră
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Postul serializate {0} nu poate fi actualizat \
  folosind stoc Reconciliere"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transfer de material la furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Transfer de material la furnizor
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Creare Ofertă
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Tu nu sunt autorizate să aprobe frunze pe bloc Perioada
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Toate aceste articole au fost deja facturate
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Toate aceste articole au fost deja facturate
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Poate fi aprobat/a de către {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Condiții Regula de transport maritim
 DocType: BOM Replace Tool,The new BOM after replacement,Noul BOM după înlocuirea
 DocType: Features Setup,Point of Sale,Point of Sale
 DocType: Account,Tax,Impozite
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rând {0}: {1} nu este valid {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,De la Bundle produs
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,De la Bundle produs
 DocType: Production Planning Tool,Production Planning Tool,Producție instrument de planificare
 DocType: Quality Inspection,Report Date,Data raportului
 DocType: C-Form,Invoices,Facturi
 DocType: Job Opening,Job Title,Denumire post
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatari
 DocType: Features Setup,Item Groups in Details,Grup Articol în Detalii
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Cantitatea să Fabricare trebuie sa fie mai mare decât 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start la punctul de vânzare (POS)
@@ -2781,8 +2807,9 @@
 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: Pricing Rule,Customer Group,Grup Client
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Cont de cheltuieli este obligatoriu pentru articolul {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Cont de cheltuieli este obligatoriu pentru articolul {0}
 DocType: Item,Website Description,Site-ul Descriere
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Schimbarea net în capitaluri proprii
 DocType: Serial No,AMC Expiry Date,Dată expirare AMC
 ,Sales Register,Vânzări Inregistrare
 DocType: Quotation,Quotation Lost Reason,Citat pierdut rațiunea
@@ -2790,12 +2817,12 @@
 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/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Rezumat pentru această lună și activități în așteptarea
 DocType: Customer Group,Customer Group Name,Nume Group Client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Atribute
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obtine Articole
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Va rugam sa introduceti Scrie Off cont
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Obtine Articole
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Va rugam sa introduceti Scrie Off cont
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Ultima comandă Data
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Realizeaza Factura de Accize
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Contul {0} nu aparține companiei {1}
@@ -2811,7 +2838,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Date proiect-înțelept nu este disponibilă pentru ofertă
 DocType: Project,Expected End Date,Data de Incheiere Preconizata
 DocType: Appraisal Template,Appraisal Template Title,Titlu model expertivă
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Postul părinte {0} nu trebuie să fie un articol stoc
 DocType: Cost Center,Distribution Id,Id distribuție
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicii extraordinare
@@ -2824,7 +2851,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valoare pentru Atribut {0} trebuie să fie în intervalul de {1} la {2} în trepte de {3}
 DocType: Tax Rule,Sales,Vânzări
 DocType: Stock Entry Detail,Basic Amount,Suma de bază
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
 DocType: Leave Allocation,Unused leaves,Frunze neutilizate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Implicit Conturi creanțe
@@ -2836,15 +2863,15 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Încasări de cumparare
-DocType: Payment Reconciliation,Maximum Amount,Suma maximă
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Cum se aplică regula pret?
 DocType: Quality Inspection,Delivery Note No,Nr. Nota de Livrare
 DocType: Company,Retail,Cu amănuntul
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Clientul {0} nu există
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle produs
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle produs
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Achiziționa impozite și taxe Template
 DocType: Upload Attendance,Download Template,Descărcați Sablon
 DocType: GL Entry,Remarks,Remarci
@@ -2871,7 +2898,7 @@
 ,Monthly Attendance Sheet,Lunar foaia de prezență
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nu s-au găsit înregistrări
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Center de Cost este obligatoriu pentru articolul {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Obține elemente din Bundle produse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Obține elemente din Bundle produse
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Contul {0} este inactiv
 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
@@ -2880,8 +2907,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"'Tipul de cont 'Profit și pierdere' {0} nu este permis în intrarea de deschidere"""
 DocType: Features Setup,Sales Discounts,Reduceri de vânzare
 DocType: Hub Settings,Seller Country,Vânzător Țară
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publica Articole pe site-ul
 DocType: Authorization Rule,Authorization Rule,Regulă de autorizare
 DocType: Sales Invoice,Terms and Conditions Details,Termeni și condiții Detalii
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Specificaţii:
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impozite vânzări și șabloane Taxe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Îmbrăcăminte și accesorii
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Numărul de comandă
@@ -2903,7 +2932,7 @@
 DocType: Time Log,Billing Amount,Suma de facturare
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Cantitate nevalidă specificată pentru element {0}. Cantitatea ar trebui să fie mai mare decât 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Cererile de concediu.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Un cont cu tranzacții existente nu poate fi șters
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Un cont cu tranzacții existente nu poate fi șters
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Cheltuieli Juridice
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Zi a lunii în care comanda automat va fi generat de exemplu 05, 28 etc"
 DocType: Sales Invoice,Posting Time,Postarea de timp
@@ -2919,11 +2948,11 @@
 DocType: Maintenance Visit,Breakdown,Avarie
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Contul: {0} cu moneda: {1} nu poate fi selectat
 DocType: Bank Reconciliation Detail,Cheque Date,Data Cec
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Contul {0}: cont Părinte {1} nu apartine companiei: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Contul {0}: cont Părinte {1} nu apartine companiei: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Șters cu succes toate tranzacțiile legate de aceasta companie!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Ca pe data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probă
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Depozitul Implicit este obligatoriu pentru articol din stoc.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Depozitul Implicit este obligatoriu pentru articol din stoc.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Plata salariului pentru luna {0} și {1 an}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Inserați Auto rata Lista de prețuri, dacă lipsește"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Total Suma plătită
@@ -2935,6 +2964,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Suma totală de facturare (prin timp Busteni)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Vindem acest articol
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Furnizor Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Cantitatea trebuie sa fie mai mare decât 0
 DocType: Journal Entry,Cash Entry,Cash intrare
 DocType: Sales Partner,Contact Desc,Persoana de Contact Desc
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Tip de frunze, cum ar fi casual, bolnavi, etc"
@@ -2943,7 +2973,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adaugaţi rânduri pentru a stabili bugete anuale pentru Conturi.
 DocType: Buying Settings,Default Supplier Type,Tip Furnizor Implicit
 DocType: Production Order,Total Operating Cost,Cost total de operare
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Notă: Articolul {0} a intrat de mai multe ori
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Notă: Articolul {0} a intrat de mai multe ori
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Toate contactele.
 DocType: Newsletter,Test Email Id,Test de e-mail Id-ul
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abreviere Companie
@@ -2968,7 +2998,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Toate grupurile de clienți
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Format de impozitare este obligatorie.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Contul {0}: cont părinte {1} nu există
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Temporar
 DocType: Address,Preferred Billing Address,Adresa de facturare preferat
@@ -2986,8 +3016,8 @@
 ,Item-wise Price List Rate,Rata Lista de Pret Articol-Avizat
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} este oprit
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} este oprit
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
 DocType: Lead,Add to calendar on this date,Adăugaţi în calendar la această dată
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reguli pentru a adăuga costurile de transport maritim.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,evenimente viitoare
@@ -3008,24 +3038,24 @@
 DocType: Customer,From Lead,Din Conducere
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Comenzi lansat pentru producție.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selectați anul fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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 +455,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
 DocType: Hub Settings,Name Token,Numele Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Vanzarea Standard
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Cel puţin un depozit este obligatoriu
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,Ieșit din garanție
 DocType: BOM Replace Tool,Replace,Înlocuirea
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} comparativ cu factura de vânzări {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Va rugam sa introduceti Unitatea de măsură prestabilită
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} comparativ cu factura de vânzări {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Va rugam sa introduceti Unitatea de măsură prestabilită
 DocType: Purchase Invoice Item,Project Name,Denumirea proiectului
 DocType: Supplier,Mention if non-standard receivable account,Mentionati daca non-standard cont de primit
 DocType: Journal Entry Account,If Income or Expense,In cazul Veniturilor sau Cheltuielilor
 DocType: Features Setup,Item Batch Nos,Lot nr element
 DocType: Stock Ledger Entry,Stock Value Difference,Valoarea Stock Diferența
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Resurse Umane
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Active fiscale
 DocType: BOM Item,BOM No,Nr. BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Mutarea medie
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM care va fi înlocuit
 DocType: Account,Debit,Debitare
@@ -3062,14 +3092,14 @@
 DocType: Stock Entry Detail,Additional Cost,Cost aditional
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data de Incheiere An Financiar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nu se poate filtra pe baza voucher Nr., în cazul gruparii in functie de Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Realizeaza Ofertă Furnizor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Realizeaza Ofertă Furnizor
 DocType: Quality Inspection,Incoming,Primite
 DocType: BOM,Materials Required (Exploded),Materiale necesare (explodat)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduce Câștigul salarial de concediu fără plată (LWP)
 apps/erpnext/erpnext/public/js/setup_wizard.js +274,"Add users to your organization, other than yourself","Adăugați utilizatori la organizația dvs., altele decât tine"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Concediu Aleator
 DocType: Batch,Batch ID,ID-ul lotului
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Notă: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Notă: {0}
 ,Delivery Note Trends,Tendințe Nota de Livrare
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Rezumat această săptămână
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} trebuie sa fie un articol cumpărat sau subcontractat în rândul {1}
@@ -3103,7 +3133,6 @@
 DocType: Purchase Order,End date of current order's period,Data de încheiere a perioadei ordin curent
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Face Scrisoare Oferta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Întoarcere
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Unitatea implicit de măsură pentru Variant trebuie să fie aceeași ca șablon
 DocType: Production Order Operation,Production Order Operation,Producția Comanda Funcționare
 DocType: Pricing Rule,Disable,Dezactivati
 DocType: Project Task,Pending Review,Revizuirea în curs
@@ -3111,7 +3140,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Clienți Id
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,A timpului trebuie să fie mai mare decât la timp
 DocType: Journal Entry Account,Exchange Rate,Rata de schimb
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,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 +478,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Depozit {0}: contul părinte {1} nu apartine  companiei {2}
 DocType: BOM,Last Purchase Rate,Ultima Rate de Cumparare
 DocType: Account,Asset,Valoare
@@ -3131,7 +3160,7 @@
 ,Available Stock for Packing Items,Stoc disponibil pentru articole destinate împachetării
 DocType: Item Variant,Item Variant,Postul Varianta
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Setarea acestei Format Adresa implicit ca nu exista nici un alt implicit
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Managementul calității
 DocType: Production Planning Tool,Filter based on customer,Filtru bazat pe client
 DocType: Payment Tool Detail,Against Voucher No,Comparativ voucherului nr
@@ -3148,6 +3177,7 @@
 DocType: Opportunity,Next Contact,Următor Contact
 DocType: Employee,Employment Type,Tip angajare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Active Fixe
+,Cash Flow,Fluxul de numerar
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Perioada de aplicare nu poate fi peste două înregistrări alocation
 DocType: Item Group,Default Expense Account,Cont de Cheltuieli Implicit
 DocType: Employee,Notice (days),Preaviz (zile)
@@ -3179,13 +3209,12 @@
 DocType: Production Order,Warehouses,Depozite
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Imprimare și staționare
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Nod Group
-DocType: Payment Reconciliation,Minimum Amount,Suma minima
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Marfuri actualizare finite
 DocType: Workstation,per hour,pe oră
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Contul aferent depozitului (Inventar Permanent) va fi creat in cadrul acest Cont.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depozit nu pot fi șterse ca exista intrare stoc registrul pentru acest depozit.
 DocType: Company,Distribution,Distribuire
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Sumă plătită
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Sumă plătită
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Manager de Proiect
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Expediere
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Discount maxim permis pentru articol: {0} este {1}%
@@ -3209,7 +3238,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suport
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Compania lipsește din depozitul {0}
 DocType: POS Profile,Terms and Conditions,Termeni şi condiţii
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Pentru a Data ar trebui să fie în anul fiscal. Presupunând Pentru a Data = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Pentru a Data ar trebui să fie în anul fiscal. Presupunând Pentru a Data = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aici puteți stoca informatii despre inaltime, greutate, alergii, probleme medicale etc"
 DocType: Leave Block List,Applies to Company,Se aplică companiei
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Nu pot anula, deoarece a prezentat Bursa de intrare {0} există"
@@ -3223,11 +3252,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Va rugam sa introduceti cumparare Încasări
 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 +425,Transaction not allowed against stopped Production Order {0},Tranzacție nu este permis împotriva oprit comandă de producție {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configurare de server de intrare pentru suport de e-mail id. (De exemplu support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Lipsă Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
 DocType: Salary Slip,Salary Slip,Salariul Slip
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Până la data' este necesară
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generarea de ambalare slip pentru pachetele de a fi livrate. Folosit pentru a notifica numărul pachet, conținutul pachetului și greutatea sa."
@@ -3316,7 +3345,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Înregistrări angajat.
 DocType: HR Settings,Payroll Settings,Setări de salarizare
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Potrivesc Facturi non-legate și plăți.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Locul de comandă
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Locul de comandă
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Rădăcină nu poate avea un centru de cost părinte
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Selectați Marca ...
 DocType: Sales Invoice,C-Form Applicable,Formular-C aplicabil
@@ -3331,7 +3360,7 @@
 DocType: Appraisal,Start Date,Data începerii
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Alocaţi concedii pentru o perioadă.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Click aici pentru a verifica
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Contul {0}: nu puteți atribui contului în sine calitatea de cont părinte
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Contul {0}: nu puteți atribui contului în sine calitatea de cont părinte
 DocType: Purchase Invoice Item,Price List Rate,Lista de prețuri Rate
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Arata ""Pe stoc"" sau ""nu este pe stoc"", bazat pe stoc disponibil în acest depozit."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Factură de materiale (BOM)
@@ -3340,17 +3369,17 @@
 DocType: Project,Expected Start Date,Data de Incepere Preconizata
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Eliminați element cazul în care costurile nu se aplică în acest element
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,De exemplu. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Primi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Primi
 DocType: Maintenance Visit,Fully Completed,Completat in Intregime
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% complet
 DocType: Employee,Educational Qualification,Detalii Calificare de Învățământ
 DocType: Workstation,Operating Costs,Costuri de operare
 DocType: Employee Leave Approver,Employee Leave Approver,Aprobator Concediu Angajat
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} a fost adăugat cu succes la lista noastră Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Nu se poate declara pierdut, pentru că Oferta a fost realizata."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Cumpărare Maestru de Management
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Producția de Ordine {0} trebuie să fie prezentate
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Producția de Ordine {0} trebuie să fie prezentate
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +136,Main Reports,Rapoarte Principale
 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
@@ -3368,7 +3397,7 @@
 DocType: Industry Type,Industry Type,Industrie Tip
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Ceva a mers prost!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Atenție: Lăsați aplicație conține următoarele date de bloc
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Factură de vânzări {0} a fost deja prezentat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Factură de vânzări {0} a fost deja prezentat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data Finalizare
 DocType: Purchase Invoice Item,Amount (Company Currency),Sumă (monedă companie)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unitate de organizare (departament) maestru.
@@ -3387,10 +3416,10 @@
 ,Serial No Service Contract Expiry,Serial Nu Service Contract de expirare
 DocType: Item,Unit of Measure Conversion,Unitate de măsură de conversie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Angajat nu poate fi schimbat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,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,"
 DocType: Naming Series,Help HTML,Ajutor HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total alocat este de 100%. Este {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Alocație mai mare decât -{0} anulată pentru articolul {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Alocație mai mare decât -{0} anulată pentru articolul {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nume de persoană sau organizație care această adresă aparține.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Furnizorii dumneavoastră
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nu se poate seta pierdut deoarece se intocmeste comandă de vânzări.
@@ -3403,35 +3432,35 @@
 DocType: Employee,Date of Issue,Data Problemei
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: de la {0} pentru {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Set Furnizor de produs {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.\
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Vă rugăm să verificați Multi opțiune de valuta pentru a permite conturi cu altă valută
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Vă rugăm să verificați Multi opțiune de valuta pentru a permite conturi cu altă valută
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Postul: {0} nu există în sistemul
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Nu esti autorizat pentru a configura valoarea Congelat
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Nu esti autorizat pentru a configura valoarea Congelat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Ia nereconciliate Entries
+DocType: Payment Reconciliation,From Invoice Date,De la data facturii
 DocType: Cost Center,Budgets,Bugete
-DocType: Employee,Emergency Contact Details,Detalii Contact de Urgență
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Ce face?
 DocType: Delivery Note,To Warehouse,Pentru Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Contul {0} a fost introdus de mai multe ori pentru anul fiscal {1}
 ,Average Commission Rate,Rată de comision medie
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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/hr/doctype/attendance/attendance.py +34,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
 DocType: Purchase Taxes and Charges,Account Head,Titularul Contului
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualizati costuri suplimentare pentru a calcula costul aterizat de articole
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Electric
 DocType: Stock Entry,Total Value Difference (Out - In),Diferența Valoarea totală (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate este obligatorie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate este obligatorie
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID-ul de utilizator nu este setat pentru Angajat {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De la garanție revendicarea
 DocType: Stock Entry,Default Source Warehouse,Depozit Sursa Implicit
 DocType: Item,Customer Code,Cod client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Memento dată naştere pentru {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Zile de la ultima comandă
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Active stoc
@@ -3444,7 +3473,7 @@
 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
 DocType: Authorization Rule,Based On,Bazat pe
 DocType: Sales Order Item,Ordered Qty,Ordonat Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Postul {0} este dezactivat
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Postul {0} este dezactivat
 DocType: Stock Settings,Stock Frozen Upto,Stoc Frozen Până la
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Perioada de la si perioadă la datele obligatorii pentru recurente {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activitatea de proiect / sarcină.
@@ -3452,7 +3481,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrie Off Suma (Compania de valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Cost Landed
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Vă rugăm să setați {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Repetați în ziua de Luna
@@ -3482,12 +3511,12 @@
 DocType: Upload Attendance,Upload Attendance,Încărcați Spectatori
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM și cantitatea de producție sunt necesare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Clasă de uzură 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Sumă
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Sumă
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM înlocuit
 ,Sales Analytics,Analytics de vânzare
 DocType: Manufacturing Settings,Manufacturing Settings,Setări de fabricație
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurarea e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Va rugam sa introduceti moneda implicit în Compania de Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Memento de zi cu zi
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflicte normă fiscală cu {0}
@@ -3513,13 +3542,13 @@
 DocType: Sales Order Item,Produced Quantity,Produs Cantitate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inginer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Căutare subansambluri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Cod Articol necesar la inregistrarea Nr. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Cod Articol necesar la inregistrarea Nr. {0}
 DocType: Sales Partner,Partner Type,Tip partener
 DocType: Purchase Taxes and Charges,Actual,Efectiv
 DocType: Authorization Rule,Customerwise Discount,Reducere Client
 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 +263,Installation Note {0} has already been submitted,Instalarea Nota {0} a fost deja prezentat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Instalarea Nota {0} a fost deja prezentat
 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
@@ -3531,15 +3560,15 @@
 DocType: Employee,Applicable Holiday List,Listă de concedii aplicabile
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seria Actualizat
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Tip de raport este obligatorie
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Tip de raport este obligatorie
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,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/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/public/js/setup_wizard.js +101,The First User: You,Primul utilizator:
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Împăcați cu succes
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Împăcați cu succes
 DocType: Production Order,Planned End Date,Planificate Data de încheiere
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,În cazul în care elementele sunt stocate.
 DocType: Tax Rule,Validity,Valabilitate
@@ -3547,7 +3576,7 @@
 DocType: Attendance,Attendance,Prezență
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Data postării și postarea de timp este obligatorie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Data postării și postarea de timp este obligatorie
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Șablon taxa pentru tranzacțiilor de cumpărare.
 ,Item Prices,Preturi Articol
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,În cuvinte va fi vizibil după ce a salva Ordinul de cumparare.
@@ -3556,15 +3585,15 @@
 DocType: Task,Review Date,Data Comentariului
 DocType: Purchase Invoice,Advance Payments,Plățile în avans
 DocType: Purchase Taxes and Charges,On Net Total,Pe net total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,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ă
+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ă
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nu permisiunea de a utiliza plată Tool
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"'Adresele de email pentru notificari', nespecificate pentru factura recurenta %s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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ă
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Rotunji cont
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,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
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Schimbare
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Schimbare
 DocType: Purchase Invoice,Contact Email,Email Persoana de Contact
 DocType: Appraisal Goal,Score Earned,Scor Earned
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","de exemplu ""My Company LLC """
@@ -3574,13 +3603,13 @@
 DocType: Packing Slip,Gross Weight UOM,Greutate Brută UOM
 DocType: Email Digest,Receivables / Payables,Creanțe / Datorii
 DocType: Delivery Note Item,Against Sales Invoice,Comparativ facturii de vânzări
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Cont de credit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Cont de credit
 DocType: Landed Cost Item,Landed Cost Item,Cost Final Articol
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Afiseaza valorile nule
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantitatea de produs obținut după fabricarea / reambalare de la cantități date de materii prime
 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 +562,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 +572,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
 DocType: Item,Default Warehouse,Depozit Implicit
 DocType: Task,Actual End Date (via Time Logs),Dată efectivă de sfârşit (prin Jurnale de Timp)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Buget nu pot fi atribuite în Grupa Contul {0}
@@ -3616,29 +3645,30 @@
 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/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} a fost deja introdus
 ,Items To Be Requested,Articole care vor fi solicitate
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Obtine Ultima Rate de Cumparare
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Rata de facturare bazat pe activitatea de tip (pe oră)
 DocType: Company,Company Info,Informatii Companie
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","ID-ul de e-mail al Companiei nu a fost găsit, prin urmare, e-mail nu a fost trimis"
 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)
 DocType: Production Planning Tool,Filter based on item,Filtru bazata pe articol
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Contul debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Contul debit
 DocType: Fiscal Year,Year Start Date,An Data începerii
 DocType: Attendance,Employee Name,Nume angajat
 DocType: Sales Invoice,Rounded Total (Company Currency),Rotunjite total (Compania de valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,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/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,Nu se poate sub acoperire la Grupul pentru că este selectată Tip cont.
 DocType: Purchase Common,Purchase Common,Cumpărare comună
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} a fost modificat. Vă rugăm să reîmprospătați.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Opri utilizatorii de la a face aplicații concediu pentru următoarele zile.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Din Oportunitate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficiile angajatului
 DocType: Sales Invoice,Is POS,Este POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Cantitatea Acceptata
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nu există
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Facturi cu valoarea ridicată pentru clienți.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id-ul proiectului
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonați adăugați
 DocType: Maintenance Schedule,Schedule,Program
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definirea Bugetul pentru acest centru de cost. Pentru a seta o acțiune buget, consultați &quot;Lista Firme&quot;"
@@ -3646,7 +3676,7 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Butuc
 DocType: GL Entry,Voucher Type,Tip Voucher
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
 DocType: Expense Claim,Approved,Aprobat
 DocType: Pricing Rule,Price,Preț
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat'
@@ -3670,7 +3700,7 @@
 DocType: Employee,Contract End Date,Data de Incheiere Contract
 DocType: Sales Order,Track this Sales Order against any Project,Urmareste acest Ordin de vânzări față de orice proiect
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Trage comenzi de vânzări (în curs de a livra), pe baza criteriilor de mai sus"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Din Furnizor de Ofertă
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Din Furnizor de Ofertă
 DocType: Deduction Type,Deduction Type,Tip Deducerea
 DocType: Attendance,Half Day,Jumătate de zi
 DocType: Pricing Rule,Min Qty,Min Cantitate
@@ -3678,7 +3708,7 @@
 DocType: GL Entry,Transaction Date,Data tranzacției
 DocType: Production Plan Item,Planned Qty,Planificate Cantitate
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Taxa totală
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Pentru Cantitate (fabricat Cant) este obligatorie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Pentru Cantitate (fabricat Cant) este obligatorie
 DocType: Stock Entry,Default Target Warehouse,Depozit Tinta Implicit
 DocType: Purchase Invoice,Net Total (Company Currency),Net total (Compania de valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partidul Tip și Partidul se aplică numai împotriva creanțe / cont de plati
@@ -3732,9 +3762,9 @@
 DocType: Customer,Commission Rate,Rata de Comision
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Face Varianta
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blocaţi cereri de concediu pe departamente.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Coșul este gol
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Coșul este gol
 DocType: Production Order,Actual Operating Cost,Cost efectiv de operare
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Rădăcină nu poate fi editat.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Rădăcină nu poate fi editat.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Suma alocată nu poate mai mare decât valoarea neajustată
 DocType: Manufacturing Settings,Allow Production on Holidays,Permiteţi operaţii de producție pe durata sărbătorilor
 DocType: Sales Order,Customer's Purchase Order Date,Data Comanda de Aprovizionare Client
@@ -3745,11 +3775,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Proiectant
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termeni și condiții Format
 DocType: Serial No,Delivery Details,Detalii Livrare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centrul de Cost este necesar pentru inregistrarea {0} din tabelul Taxe pentru tipul {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Centrul de Cost este necesar pentru inregistrarea {0} din tabelul Taxe pentru tipul {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Crea automat Material Cerere dacă cantitate scade sub acest nivel
 ,Item-wise Purchase Register,Registru Achizitii Articol-Avizat
 DocType: Batch,Expiry Date,Data expirării
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pentru a seta nivelul de reordona, element trebuie să fie un articol de cumparare sau de fabricație Postul"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pentru a seta nivelul de reordona, element trebuie să fie un articol de cumparare sau de fabricație Postul"
 ,Supplier Addresses and Contacts,Adrese furnizorului și de Contacte
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vă rugăm să selectați categoria întâi
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Maestru proiect.
@@ -3757,7 +3787,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Jumatate de zi)
 DocType: Supplier,Credit Days,Zile de Credit
 DocType: Leave Type,Is Carry Forward,Este Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obține articole din FDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Proiect de lege de materiale
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,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}
@@ -3765,7 +3795,7 @@
 DocType: Employee,Reason for Leaving,Motiv pentru Lăsând
 DocType: Expense Claim Detail,Sanctioned Amount,Sancționate Suma
 DocType: GL Entry,Is Opening,Se deschide
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rând {0}: debit de intrare nu poate fi legat de o {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Contul {0} nu există
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Rând {0}: debit de intrare nu poate fi legat de o {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Contul {0} nu există
 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 b97c768..7cd46a7 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Потребительские товары
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Пожалуйста, выберите партии первого типа"
 DocType: Item,Customer Items,Предметы клиентов
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Счет {0}: Родительский счет {1} не может быть регистром
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Счет {0}: Родительский счет {1} не может быть регистром
 DocType: Item,Publish Item to hub.erpnext.com,Опубликовать деталь к hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Уведомления электронной почты
 DocType: Item,Default Unit of Measure,По умолчанию Единица измерения
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,Контакты с клиентами
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Из материалов запрос
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Из материалов запрос
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дерево
 DocType: Job Applicant,Job Applicant,Соискатель работы
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нет больше результатов.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Используйте данную опцию для поддержания клиентско-удобных кодов и для возможности удобного поиска по ним
 DocType: Mode of Payment Account,Mode of Payment Account,Форма оплаты счета
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Показать варианты
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Количество
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Количество
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредиты (обязательства)
 DocType: Employee Education,Year of Passing,Год Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В Наличии
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Здравоохранение
 DocType: Purchase Invoice,Monthly,Ежемесячно
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Задержка в оплате (дни)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Счет-фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Счет-фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичность
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Адрес Электронной Почты
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Финансовый год {0} требуется
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Оборона
 DocType: Company,Abbr,Аббревиатура
 DocType: Appraisal Goal,Score (0-5),Оценка (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не соответствует {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не соответствует {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Ряд # {0}:
 DocType: Delivery Note,Vehicle No,Автомобиль №
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Пожалуйста, выберите прайс-лист"
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,"Пожалуйста, выберите прайс-лист"
 DocType: Production Order Operation,Work In Progress,Работа продолжается
 DocType: Employee,Holiday List,Список праздников
 DocType: Time Log,Time Log,Журнал учета времени
@@ -81,7 +81,7 @@
 DocType: Company,Phone No,Номер телефона
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Журнал деятельность, осуществляемая пользователей от задач, которые могут быть использованы для отслеживания времени, биллинга."
 apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Новый {0}: # {1}
-,Sales Partners Commission,Партнеры по сбыту Комиссия
+,Sales Partners Commission,Комиссионные Партнеров по продажам
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Аббревиатура не может иметь более 5 символов
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Атрибут Значение {0} не может быть удалена из {1} в качестве пункта Варианты \ существуют с этим атрибутом.
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,То же компания вошла более чем один раз
 DocType: Employee,Married,Замужем
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не допускается для {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 DocType: Payment Reconciliation,Reconcile,Согласовать
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Продуктовый
 DocType: Quality Inspection Reading,Reading 1,Чтение 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Сделать Банк Стажер
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионные фонды
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Склад является обязательным, если тип учетной записи: Склад"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,"Склад является обязательным, если тип учетной записи: Склад"
 DocType: SMS Center,All Sales Person,Все менеджеры по продажам
 DocType: Lead,Person Name,Имя лица
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Убедитесь в том, повторяющихся порядок, снимите, чтобы остановить повторяющихся или поставить правильное Дата окончания"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Заинтересованный
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Накладная на материалы
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Открытие
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},От {0} до {1}
+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,Открытие запись
 DocType: Stock Entry,Additional Costs,Дополнительные расходы
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Счет существующей проводки не может быть преобразован в группу.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Счет существующей проводки не может быть преобразован в группу.
 DocType: Lead,Product Enquiry,Product Enquiry
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Пожалуйста, введите компанию первой"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Пожалуйста, введите название первой Компании"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,Целевая На
+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 +9,Activity Log:,Журнал активности:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
@@ -159,13 +159,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Показать журналы Время
 DocType: Journal Entry Account,Credit in Company Currency,Кредит в валюте компании
 DocType: Delivery Note,Installation Status,Состояние установки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Кол-во Принято + Отклоненные должно быть равно полученному количеству по пункту {0}
 DocType: Item,Supply Raw Materials for Purchase,Поставка сырья для покупки
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Пункт {0} должен быть Покупка товара
 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 +444,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Будет обновлена после Расходная накладная представляется.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Настройки для модуля HR
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Информация о выполненных операциях.
 DocType: Serial No,Maintenance Status,Техническое обслуживание Статус
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Предметы и Цены
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},С даты должно быть в пределах финансового года. Предполагая С даты = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},С даты должно быть в пределах финансового года. Предполагая С даты = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Выберите Employee, для которых вы создаете оценки."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},МВЗ {0} не принадлежит компании {1}
 DocType: Customer,Individual,Индивидуальная
@@ -193,7 +193,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Дата установки не может быть до даты доставки для Пункт {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Скидка на Прайс-лист ставка (%)
 DocType: Offer Letter,Select Terms and Conditions,Выберите Сроки и условия
-DocType: Production Planning Tool,Sales Orders,Заказы
+DocType: Production Planning Tool,Sales Orders,Заказы клиентов
 DocType: Purchase Taxes and Charges,Valuation,Оценка
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Установить по умолчанию
 ,Purchase Order Trends,Заказ на покупку Тенденции
@@ -212,9 +212,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,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 +41,Please enter Company,"Пожалуйста, введите Компания"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Чистые денежные средства от финансовой
 DocType: Lead,Address & Contact,Адрес и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добавить неиспользуемые листья от предыдущих ассигнований
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Следующая Периодическая {0} будет создан на {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Имя Контакта
 DocType: Production Plan Item,SO Pending Qty,ТАК В ожидании Кол-во
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Создает ведомость расчета зарплаты за вышеуказанные критерии.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Не введено описание
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Запрос на покупку.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
@@ -233,10 +235,10 @@
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Спецификация
 DocType: Payment Tool,Reference No,Ссылка Нет
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Оставьте Заблокированные
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,За год
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Фото Примирение товара
-DocType: Stock Entry,Sales Invoice No,Счет Продажи Нет
+DocType: Stock Entry,Sales Invoice No,Номер Счета Продажи
 DocType: Material Request Item,Min Order Qty,Минимальный заказ Кол-во
 DocType: Lead,Do Not Contact,Не обращайтесь
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Уникальный идентификатор для отслеживания все повторяющиеся счетов-фактур. Он создается на представить.
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Тип поставщика
 DocType: Item,Publish in Hub,Опубликовать в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Пункт {0} отменяется
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Заказ материалов
 DocType: Bank Reconciliation,Update Clearance Date,Обновление просвет Дата
 DocType: Item,Purchase Details,Покупка Подробности
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} не найден в &quot;давальческое сырье&quot; таблицы в Заказе {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} не найден в &quot;давальческое сырье&quot; таблицы в Заказе {1}
 DocType: Employee,Relation,Relation
 DocType: Shipping Rule,Worldwide Shipping,Доставка по всему миру
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Подтвержденные заказы от клиентов.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Предложения
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Установите группу товаров стрелке бюджеты на этой территории. Вы можете также включить сезонность, установив распределение."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Пожалуйста, введите родительскую группу счета для склада {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата с {0} {1} не может быть больше, чем суммы задолженности {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,Создать расписание
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Последние
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Макс 5 символов
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Оставить утверждающий в списке будет установлен по умолчанию Оставить утверждающего
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Учить
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Деятельность Стоимость одного работника
 DocType: Accounts Settings,Settings for Accounts,Настройки для счетов
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Управление менеджера по продажам дерево.
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Мульти валюта
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип счета
 DocType: Sales Invoice Item,Delivery Note,· Отметки о доставке
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Настройка Налоги
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Настройка Налоги
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запись была изменена после того, как вытащил его. Пожалуйста, вытащить его снова."
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} вводится дважды в пункт налог
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} вводится дважды в пункт налог
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Резюме на этой неделе и в ожидании деятельности
 DocType: Workstation,Rent Cost,Стоимость аренды
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Пожалуйста, выберите месяц и год"
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Доступный в спецификации, накладной, счете-фактуре, производственного заказа, заказа на поставку, покупка получение, счет-фактура, заказ клиента, фондовой въезда, расписания"
 DocType: Item Tax,Tax Rate,Размер налога
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Выбрать пункт
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Выбрать пункт
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Пункт: {0} удалось порционно, не могут быть согласованы с помощью \
  со примирения, вместо этого использовать со запись"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетное Нет должно быть таким же, как {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Преобразовать в негрупповой
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Покупка Получение должны быть представлены
@@ -353,13 +356,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медицинский
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина потери
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,Единственный
 DocType: Issue,Attachment,Привязанность
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Бюджет не может быть установлен для группы МВЗ
 DocType: Account,Cost of Goods Sold,Себестоимость проданного товара
 DocType: Purchase Invoice,Yearly,Ежегодно
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Пожалуйста, введите МВЗ"
-DocType: Journal Entry Account,Sales Order,Заказ на продажу
+DocType: Journal Entry Account,Sales Order,Заказ клиента
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Ср. Курс продажи
 DocType: Purchase Order,Start date of current order's period,Дату периода текущего заказа Начните
 apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Количество не может быть фракция в строке {0}
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбрано несколько раз в таблице атрибутов
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,Мастер отдыха.
 DocType: Material Request Item,Required Date,Требуется Дата
 DocType: Delivery Note,Billing Address,Адрес для выставления счетов
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Пожалуйста, введите Код товара."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Пожалуйста, введите Код товара."
 DocType: BOM,Costing,Стоимость
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Если флажок установлен, сумма налога будет считаться уже включены в Печать Оценить / Количество печати"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Всего Кол-во
@@ -421,11 +425,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
 DocType: Shipping Rule,Net Weight,Вес нетто
 DocType: Employee,Emergency Phone,В случае чрезвычайных ситуаций
 ,Serial No Warranty Expiry,не Серийный Нет Гарантия Срок
-DocType: Sales Order,To Deliver,Доставлять
+DocType: Sales Order,To Deliver,Для доставки
 DocType: Purchase Invoice Item,Item,Элемент
 DocType: Journal Entry,Difference (Dr - Cr),Отличия (д-р - Cr)
 DocType: Account,Profit and Loss,Прибыль и убытки
@@ -440,15 +444,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Прирост не может быть 0
 DocType: Production Planning Tool,Material Requirement,Потребности в материалах
 DocType: Company,Delete Company Transactions,Удалить Сделки Компания
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Пункт {0} не Приобретите товар
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Пункт {0} не Приобретите товар
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} неправильный адрес электронной почты в ""Уведомление \ адрес электронной почты"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Всего счетов в этом году:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавить / Изменить Налоги и сборы
 DocType: Purchase Invoice,Supplier Invoice No,Поставщик Счет Нет
 DocType: Territory,For reference,Для справки
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не удается удалить Серийный номер {0}, так как он используется в сделках с акциями"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Закрытие (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Закрытие (Cr)
 DocType: Serial No,Warranty Period (Days),Гарантийный срок (дней)
 DocType: Installation Note Item,Installation Note Item,Установка Примечание Пункт
 ,Pending Qty,В ожидании Кол-во
@@ -458,14 +461,14 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
 DocType: Pricing Rule,Valid From,Действительно с
 DocType: Sales Invoice,Total Commission,Всего комиссия
-DocType: Pricing Rule,Sales Partner,Торговый партнер
+DocType: Pricing Rule,Sales Partner,Партнер по продажам
 DocType: Buying Settings,Purchase Receipt Required,Покупка Получение необходимое
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Ежемесячная абонентская распространения ** помогает распространять свой бюджет через месяцев, если у вас есть сезонность в вашем бизнесе.
 
  Чтобы распределить бюджет с помощью этого распределения, установите этот ** ежемесячное распределение ** в ** МВЗ **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Не записи не найдено в таблице счетов
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Не записи не найдено в таблице счетов
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Пожалуйста, выберите компании и партийных первого типа"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Финансовый / отчетного года.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","К сожалению, серийные номера не могут быть объединены"
@@ -473,14 +476,14 @@
 DocType: Project Task,Project Task,Проект Задача
 ,Lead Id,ID лида
 DocType: C-Form Invoice Detail,Grand Total,Общий итог
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,"Финансовый год Дата начала не должен быть больше, чем финансовый год Дата окончания"
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,"Финансовый год Дата начала не должен быть больше, чем финансовый год Дата окончания"
 DocType: Warranty Claim,Resolution,Разрешение
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Поставляется: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Поставляется: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Оплачивается аккаунт
 DocType: Sales Order,Billing and Delivery Status,Биллинг и доставка Статус
 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/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продажи Вернуться
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Возвраты с продаж
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Выберите Заказы из которого вы хотите создать производственных заказов.
 DocType: Item,Delivered by Supplier (Drop Ship),Поставляется Поставщиком (Drop кораблей)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Зарплата компоненты.
@@ -490,7 +493,7 @@
 DocType: Quotation,Quotation To,Цитата Для
 DocType: Lead,Middle Income,Средний доход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Выделенные сумма не может быть отрицательным
 DocType: Purchase Order Item,Billed Amt,Счетов выдано кол-во
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логика Склада,по которому сделаны складские записи"
@@ -499,13 +502,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Заказ продукции является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Предложение Написание
 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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Отрицательный Ошибка со ({6}) по пункту {0} в Склад {1} на {2} {3} в {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Отрицательный Ошибка со ({6}) по пункту {0} в Склад {1} на {2} {3} в {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Финансовый год компании
 DocType: Packing Slip Item,DN Detail,DN Деталь
 DocType: Time Log,Billed,Выдавать счета
 DocType: Batch,Batch Description,Партия Описание
 DocType: Delivery Note,Time at which items were delivered from warehouse,"Момент, в который предметы были доставлены со склада"
-DocType: Sales Invoice,Sales Taxes and Charges,Продажи Налоги и сборы
+DocType: Sales Invoice,Sales Taxes and Charges,Налоги и сборы с продаж
 DocType: Employee,Organization Profile,Профиль организации
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,"Пожалуйста, установите нумерация серии для Посещаемость через Настройка> нумерации серии"
 DocType: Employee,Reason for Resignation,Причиной отставки
@@ -518,16 +521,17 @@
 DocType: Activity Type,Default Costing Rate,По умолчанию Калькуляция Оценить
 DocType: Maintenance Schedule,Maintenance Schedule,График технического обслуживания
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тогда ценообразование Правила отфильтровываются на основе Заказчика, Группа клиентов, Территория, поставщиков, Тип Поставщик, Кампания, Партнеры по сбыту и т.д."
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Чистое изменение в инвентаризации
 DocType: Employee,Passport Number,Номер паспорта
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Менеджер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,От купли получении
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Такой же деталь был введен несколько раз.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,От купли получении
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Такой же деталь был введен несколько раз.
 DocType: SMS Settings,Receiver Parameter,Приемник Параметр
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основании"" и ""Группировка по"" не могут быть одинаковыми"
-DocType: Sales Person,Sales Person Targets,Менеджера по продажам Цели
+DocType: Sales Person,Sales Person Targets,Цели продавца
 DocType: Production Order Operation,In minutes,Через несколько минут
 DocType: Issue,Resolution Date,Разрешение Дата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 DocType: Selling Settings,Customer Naming By,Именование клиентов По
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Преобразовать в группе
 DocType: Activity Cost,Activity Type,Тип активности
@@ -538,7 +542,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0} {1} не найден в  таблице счета
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
 DocType: Material Request,Material Transfer,О передаче материала
@@ -560,13 +564,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Чтобы отслеживать пункт в купли-продажи документов по их серийных NOS. Это также может использоваться для отслеживания гарантийные детали продукта.
 DocType: Purchase Receipt Item Supplied,Current Stock,Наличие на складе
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Отклонен Склад является обязательным против regected пункта
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Всего счетов в этом году
 DocType: Account,Expenses Included In Valuation,"Затрат, включаемых в оценке"
 DocType: Employee,Provide email id registered in company,Обеспечить электронный идентификатор зарегистрирован в компании
 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 +533,Item has variants.,Пункт имеет варианты.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дерево Тип
@@ -577,25 +581,25 @@
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","На ваучере Тип должен быть одним из заказа клиента, накладная или Запись в журнале"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Авиационно-космический
 DocType: Journal Entry,Credit Card Entry,Вступление Кредитная карта
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Тема Задача
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Тема Задачи
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,"Товары, полученные от поставщиков."
 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 +92,{0} is not a stock Item,{0} не является складской позицией
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} не является складской позицией
 DocType: Mode of Payment Account,Default Account,По умолчанию учетная запись
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен, если Возможность сделан из свинца"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Пожалуйста, выберите в неделю выходной"
 DocType: Production Order Operation,Planned End Time,Планируемые Время окончания
 ,Sales Person Target Variance Item Group-Wise,Лицо продаж Целевая Разница Пункт Группа Мудрого
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Счет существующей проводки не может быть преобразован в регистр
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Счет существующей проводки не может быть преобразован в регистр
 DocType: Delivery Note,Customer's Purchase Order No,Клиентам Заказ Нет
 DocType: Employee,Cell Number,Количество звонков
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,"Запросы Авто материал, полученный"
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Поражений
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Вы не можете ввести текущий ваучер в «Против Запись в журнале 'колонке
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Вы не можете ввести текущий ваучер в «Против Запись в журнале 'колонке
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Энергоэффективность
 DocType: Opportunity,Opportunity From,Возможность От
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Ежемесячная выписка зарплата.
@@ -604,9 +608,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: С {0} типа {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования является обязательным
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Бухгалтерские записи можно с листовыми узлами. Записи против групп не допускаются.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете отключить или отменить спецификации, как она связана с другими спецификациями"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете отключить или отменить спецификации, как она связана с другими спецификациями"
 DocType: Opportunity,Maintenance,Обслуживание
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},"Покупка Получение число, необходимое для Пункт {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},"Покупка Получение число, необходимое для Пункт {0}"
 DocType: Item Attribute Value,Item Attribute Value,Пункт Значение атрибута
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Кампании по продажам.
 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.
@@ -664,7 +668,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Семья Фон
 DocType: Process Payroll,Send Email,Отправить e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Внимание: Неверный Приложение {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Внимание: Неверный Приложение {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Нет разрешения
 DocType: Company,Default Bank Account,По умолчанию Банковский счет
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Чтобы отфильтровать на основе партии, выберите партия первого типа"
@@ -672,7 +676,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,кол-во
 DocType: Item,Items with higher weightage will be shown higher,"Элементы с более высокой weightage будет показано выше,"
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банковская сверка подробно
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Мои Счета
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Мои Счета
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Сотрудник не найден
 DocType: Purchase Order,Stopped,Приостановлено
 DocType: Item,If subcontracted to a vendor,Если по субподряду поставщика
@@ -682,6 +686,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Отправить Сейчас
 ,Support Analytics,Поддержка Аналитика
 DocType: Item,Website Warehouse,Сайт Склад
+DocType: Payment Reconciliation,Minimum Invoice Amount,Минимальная Сумма счета
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","День месяца, в который автоматически счет-фактура будет создан, например, 05, 28 и т.д."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Оценка должна быть меньше или равна 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,С-форма записи
@@ -691,7 +696,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Чтобы включить &quot;Точки продаж&quot; Особенности
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Выберите товары
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} по Счету {1} от {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} по Счету {1} от {2}
 DocType: Maintenance Visit,Completion Status,Статус завершения
 DocType: Sales Invoice Item,Target Warehouse,Целевая Склад
 DocType: Item,Allow over delivery or receipt upto this percent,Разрешить доставку на получение или Шифрование до этого процента
@@ -703,7 +708,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок.
 DocType: Production Order,Item To Manufacture,Элемент Производство
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Заказ на Оплата
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Заказ на Оплата
 DocType: Sales Order Item,Projected Qty,Прогнозируемый Количество
 DocType: Sales Invoice,Payment Due Date,Дата платежа
 DocType: Newsletter,Newsletter Manager,Рассылка менеджер
@@ -727,7 +732,7 @@
 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 +304,Point-of-Sale,Торговая точка
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс счета в Кредите, запрещена установка 'Баланс должен быть' как 'Дебет'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс счета в Кредите, запрещена установка 'Баланс должен быть' как 'Дебет'"
 DocType: Account,Balance must be,Баланс должен быть
 DocType: Hub Settings,Publish Pricing,Опубликовать Цены
 DocType: Notification Control,Expense Claim Rejected Message,Расходов претензии Отклонен Сообщение
@@ -750,7 +755,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Мастер Валютный курс.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} должен быть активным
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} должен быть активным
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Пожалуйста, выберите тип документа сначала"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
 DocType: Salary Slip,Leave Encashment Amount,Оставьте Инкассация Количество
@@ -760,7 +765,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Интернет издания
 DocType: Production Planning Tool,Production Orders,Производственные заказы
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Валюта баланса
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажи Прайс-лист
+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 +131,Please mention Round Off Account in Company,"Пожалуйста, укажите округлить счет в компании"
@@ -768,17 +773,17 @@
 DocType: Supplier,Default Payable Accounts,По умолчанию задолженность Кредиторская
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Features Setup,Item Barcode,Пункт Штрих
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Пункт Варианты {0} обновляются
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Пункт Варианты {0} обновляются
 DocType: Quality Inspection Reading,Reading 6,Чтение 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Счета-фактуры Advance
 DocType: Address,Shop,Магазин
 DocType: Hub Settings,Sync Now,Синхронизировать сейчас
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитная запись не может быть связан с {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитная запись не может быть связан с {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,По умолчанию Счет в банке / Наличные будут автоматически обновляться в POS фактуре когда выбран этот режим.
 DocType: Employee,Permanent Address Is,Постоянный адрес Является
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операция выполнена На сколько готовой продукции?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Марка
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Учет по-{0} скрещенными за Пункт {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Учет по-{0} скрещенными за Пункт {1}.
 DocType: Employee,Exit Interview Details,Выход Интервью Подробности
 DocType: Item,Is Purchase Item,Является Покупка товара
 DocType: Journal Entry Account,Purchase Invoice,Покупка Счет
@@ -790,7 +795,7 @@
 DocType: Salary Slip,Total in words,Всего в словах
 DocType: Material Request Item,Lead Time Date,Время выполнения Дата
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,"является обязательным. Может быть, Обмен валюты запись не создана для"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Пожалуйста, сформулируйте Серийный номер для Пункт {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Пожалуйста, сформулируйте Серийный номер для Пункт {1}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Для элементов &quot;продукта&quot; Bundle, склад, серийный номер и серия № будет рассматриваться с &quot;упаковочный лист &#39;таблицы. Если Склад и пакетная Нет являются одинаковыми для всех упаковочных деталей для любой &quot;продукта&quot; Bundle пункта, эти значения могут быть введены в основной таблице Item, значения будут скопированы в &quot;список упаковки&quot; таблицу."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Поставки клиентам.
 DocType: Purchase Invoice Item,Purchase Order Item,Заказ товара
@@ -799,14 +804,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Дисперсия
 ,Company Name,Название компании
 DocType: SMS Center,Total Message(s),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Выбрать пункт трансфера
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,"Выберите учетную запись глава банка, в котором проверка была размещена."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Разрешить пользователю редактировать Прайс-лист Оценить в сделках
 DocType: Pricing Rule,Max Qty,Макс Кол-во
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,Химический
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Все детали уже были переданы для этого производственного заказа.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Все детали уже были переданы для этого производственного заказа.
 DocType: Process Payroll,Select Payroll Year and Month,Выберите Payroll год и месяц
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Перейти к соответствующей группе (обычно использования средств&gt; Текущие активы&gt; Банковские счета и создать новый аккаунт (нажав на Добавить Ребенка) типа &quot;банк&quot;
 DocType: Workstation,Electricity Cost,Стоимость электроэнергии
@@ -820,10 +826,10 @@
 DocType: SMS Center,All Lead (Open),Все лиды (Открыть)
 DocType: Purchase Invoice,Get Advances Paid,Получить авансы выданные
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Прикрепите свою фотографию
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Сделать
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Сделать
 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 +3,My Cart,Моя корзина
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Моя корзина
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Открытие Кол-во
@@ -842,10 +848,10 @@
 DocType: POS Profile,Cash/Bank Account,Наличные / Банковский счет
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Атрибут стол является обязательным
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,Атрибут стол является обязательным
 DocType: Production Planning Tool,Get Sales Orders,Получить заказов клиента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не может быть отрицательным
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Скидка
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Скидка
 DocType: Features Setup,Purchase Discounts,Покупка Скидки
 DocType: Workstation,Wages,Заработная плата
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Будет обновляться только если время входа является &quot;Платежные&quot;
@@ -861,7 +867,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Вы Утверждающий Расходы для этой записи. Пожалуйста, Обновите ""Статус"" и Сохраните"
 DocType: Serial No,Creation Document No,Создание документа Нет
 DocType: Issue,Issue,Проблема
-apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Счет не соответствует с Компанией
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Счет не соответствует этой Компании
 apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Атрибуты для товара Variant. например, размер, цвет и т.д."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Склад
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
@@ -870,11 +876,11 @@
 DocType: Tax Rule,Shipping State,Государственный Доставка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Товар должен быть добавлены с помощью ""Получить товары от покупки ПОСТУПЛЕНИЯ кнопку '"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Расходы на продажи
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Стандартный Покупка
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Стандартный Покупка
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Реализация Партнер
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Продажи Заказать {0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Заказ клиента {0} {1}
 DocType: Opportunity,Contact Info,Контактная информация
 apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Создание изображения в дневнике
 DocType: Packing Slip,Net Weight UOM,Вес нетто единица измерения
@@ -891,7 +897,7 @@
 DocType: Time Log Batch,updated via Time Logs,обновляется через журналы Time
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Средний возраст
 DocType: Opportunity,Your sales person who will contact the customer in future,"Ваш продавец, который свяжется с клиентом в будущем"
-apps/erpnext/erpnext/public/js/setup_wizard.js +344,List a few of your suppliers. They could be organizations or individuals.,Перечислите несколько ваших поставщиков. Они могут быть организации или частные лица.
+apps/erpnext/erpnext/public/js/setup_wizard.js +344,List a few of your suppliers. They could be organizations or individuals.,Список несколько ваших поставщиков. Они могут быть организациями или частными лицами.
 DocType: Company,Default Currency,Базовая валюта
 DocType: Contact,Enter designation of this Contact,Введите обозначение этому контактному
 DocType: Expense Claim,From Employee,От работника
@@ -912,6 +918,7 @@
 DocType: Sales Partner,Distributor,Дистрибьютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корзина Правило Доставка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',"Пожалуйста, установите &quot;Применить Дополнительная Скидка On &#39;"
 ,Ordered Items To Be Billed,"Заказал пунктов, которые будут Объявленный"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"С Диапазон должен быть меньше, чем диапазон"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Выберите Журналы время и предоставить для создания нового счета-фактуры.
@@ -921,14 +928,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Это Пакетная Время Лог был объявлен.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Создание Возможность
 DocType: Salary Slip,Leave Without Pay,Отпуск без сохранения содержания
-DocType: Supplier,Communications,Связь
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Планирование мощностей Ошибка
 ,Trial Balance for Party,Пробный баланс для партии
 DocType: Lead,Consultant,Консультант
 DocType: Salary Slip,Earnings,Прибыль
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Готовые товара {0} должен быть введен для вступления типа Производство
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Открытие бухгалтерский баланс
-DocType: Sales Invoice Advance,Sales Invoice Advance,Расходная накладная Advance
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Готовые товара {0} должен быть введен для вступления типа Производство
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Открытие бухгалтерский баланс
+DocType: Sales Invoice Advance,Sales Invoice Advance,Счет Продажи предварительный
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ничего просить
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Фактическая Дата начала"" не может быть больше, чем ""Фактическая Дата завершения"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Управление
@@ -969,7 +975,7 @@
 DocType: Global Defaults,Current Fiscal Year,Текущий финансовый год
 DocType: Global Defaults,Disable Rounded Total,Отключение закругленными Итого
 DocType: Lead,Call,Звонок
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Записи"" не могут быть пустыми"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,"""Записи"" не могут быть пустыми"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 ,Trial Balance,Пробный баланс
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Настройка сотрудников
@@ -981,14 +987,14 @@
 DocType: Contact,User ID,ID пользователя
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Посмотреть Леджер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Старейшие
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем, пожалуйста, измените имя элемента или переименовать группу товаров"
 DocType: Production Order,Manufacture against Sales Order,Производство против заказ клиента
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,Зарплата до вычетов
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,"Дивиденды, выплачиваемые"
-apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Учет книга
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Главная книга
 DocType: Stock Reconciliation,Difference Amount,Разница Сумма
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Нераспределенная Прибыль
 DocType: BOM Item,Item Description,Описание позиции
@@ -1009,11 +1015,11 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Пункт {0} должно быть продажи товара
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,для
 DocType: Item,Lead Time in days,Время в днях
-,Accounts Payable Summary,Кредиторская задолженность Основная
+,Accounts Payable Summary,Сводка кредиторской задолженности
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 DocType: Journal Entry,Get Outstanding Invoices,Получить неоплаченных счетов-фактур
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1026,13 +1032,13 @@
 DocType: Employee,Place of Issue,Место выдачи
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Контракт
 DocType: Email Digest,Add Quote,Добавить Цитата
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Единица измерения фактором Конверсия требуется для UOM: {0} в пункте: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Единица измерения фактором Конверсия требуется для UOM: {0} в пункте: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Косвенные расходы
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ряд {0}: Кол-во является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сельское хозяйство
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,Ваши продукты или услуги
 DocType: Mode of Payment,Mode of Payment,Способ оплаты
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Это корень группу товаров и не могут быть изменены.
 DocType: Journal Entry Account,Purchase Order,Заказ на покупку
 DocType: Warehouse,Warehouse Contact Info,Склад Контактная информация
@@ -1041,8 +1047,8 @@
 DocType: Email Digest,Annual Income,Годовой доход
 DocType: Serial No,Serial No Details,Серийный номер подробнее
 DocType: Purchase Invoice Item,Item Tax Rate,Пункт Налоговая ставка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с другой дебету"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с другой дебету"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитальные оборудование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цены Правило сначала выбирается на основе ""Применить На"" поле, которое может быть Пункт, Пункт Группа или Марка."
@@ -1052,7 +1058,7 @@
 DocType: Appraisal Goal,Goal,Цель
 DocType: Sales Invoice Item,Edit Description,Редактировать описание
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Ожидаемая дата поставки меньше, чем Запланированная дата начала."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Для поставщиков
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Для поставщиков
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Установка Тип аккаунта помогает в выборе этого счет в сделках.
 DocType: Purchase Invoice,Grand Total (Company Currency),Общий итог (Компания Валюта)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Всего Исходящие
@@ -1065,7 +1071,7 @@
 DocType: Journal Entry,Journal Entry,Запись в дневнике
 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 +427,BOM {0} does not belong to Item {1},BOM {0} не принадлежит к пункту {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,Это число последнего созданного сделки с этим префиксом
@@ -1097,7 +1103,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Бюллетени для контактов, приводит."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,"Операции, не может быть пустым."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,"Операции, не может быть пустым."
 ,Delivered Items To Be Billed,Поставленные товары быть выставлен счет
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не может быть изменен для серийный номер
 DocType: Authorization Rule,Average Discount,Средняя скидка
@@ -1112,7 +1118,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},С {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Операция Описание
 DocType: Item,Will also apply to variants,Будут также применяться к вариантам
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Невозможно изменить финансовый год Дата начала и финансовый год Дата окончания сразу финансовый год будет сохранен.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Невозможно изменить финансовый год Дата начала и финансовый год Дата окончания сразу финансовый год будет сохранен.
 DocType: Quotation,Shopping Cart,Корзина
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Среднее Daily Исходящие
 DocType: Pricing Rule,Campaign,Кампания
@@ -1123,7 +1129,8 @@
 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 +211,Stock Entries already created for Production Order ,Сток записи уже созданные для производственного заказа
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Сток записи уже созданные для производственного заказа
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Чистое изменение в основных фондов
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставьте пустым, если рассматривать для всех обозначений"
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
@@ -1135,7 +1142,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,План счетов
 DocType: Material Request,Terms and Conditions Content,Условия Содержимое
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,"не может быть больше, чем 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Незапланированный
 DocType: Employee,Owned,Присвоено
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависит от отпуска без сохранения заработной платы
@@ -1173,7 +1180,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub сборки
 DocType: Shipping Rule Condition,To Value,Произвести оценку
 DocType: Supplier,Stock Manager,Фото менеджер
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
+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 +581,Packing Slip,Упаковочный лист
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Аренда площади для офиса
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Настройки Настройка SMS Gateway
@@ -1181,10 +1188,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Адрес не добавлено ни.
 DocType: Workstation Working Hour,Workstation Working Hour,Рабочая станция Рабочие часы
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Аналитик
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Строка {0}: С номером количество {1} должен быть меньше или равен количеству СП {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Строка {0}: С номером количество {1} должен быть меньше или равен количеству СП {2}
 DocType: Item,Inventory,Инвентаризация
 DocType: Features Setup,"To enable ""Point of Sale"" view",Чтобы включить &quot;Точка зрения&quot; Продажа
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Оплата не может быть сделано для пустого корзину
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Оплата не может быть сделано для пустого корзину
 DocType: Item,Sales Details,Продажи Подробности
 DocType: Opportunity,With Items,С элементами
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,В Кол-во
@@ -1199,23 +1206,24 @@
 DocType: Cost Center,Parent Cost Center,Родитель МВЗ
 DocType: Sales Invoice,Source,Источник
 DocType: Leave Type,Is Leave Without Pay,Является отпуск без
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Не записи не найдено в таблице оплаты
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Не записи не найдено в таблице оплаты
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Начало финансового периода
 DocType: Employee External Work History,Total Experience,Суммарный опыт
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Поток денежных средств от инвестиционной
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
-DocType: Material Request Item,Sales Order No,Заказ на продажу Нет
+DocType: Material Request Item,Sales Order No,Номер Заказа клиента
 DocType: Item Group,Item Group Name,Пункт Название группы
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятый
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Передача материалов для производства
 DocType: Pricing Rule,For Price List,Для Прейскурантом
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Курс покупки по пункту: {0} не найден, который необходим для ведения бухгалтерского учета запись (счет). Пожалуйста, укажите цена товара против цены покупки списке."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Курс покупки по пункту: {0} не найден, который необходим для ведения бухгалтерского учета запись (счет). Пожалуйста, укажите цена товара против цены покупки списке."
 DocType: Maintenance Schedule,Schedules,Расписание
 DocType: Purchase Invoice Item,Net Amount,Чистая сумма
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM детали №
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Дополнительная скидка Сумма (валюта компании)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Ошибка: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Ошибка: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Пожалуйста, создайте новую учетную запись с Планом счетов бухгалтерского учета."
 DocType: Maintenance Visit,Maintenance Visit,Техническое обслуживание Посетить
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Клиент> Группа клиентов> Территория
@@ -1223,7 +1231,7 @@
 DocType: Time Log Batch Detail,Time Log Batch Detail,Время входа Пакетная Подробно
 DocType: Landed Cost Voucher,Landed Cost Help,Земельные Стоимость Помощь
 DocType: Leave Block List,Block Holidays on important days.,Блок Отдых на важных дней.
-,Accounts Receivable Summary,Дебиторская задолженность Резюме
+,Accounts Receivable Summary,Сводка дебиторской задолженности
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Пожалуйста, установите поле идентификатора пользователя в Сотрудника Запись, чтобы настроить Employee роль"
 DocType: UOM,UOM Name,Имя единица измерения
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Вклад Сумма
@@ -1238,10 +1246,10 @@
 DocType: Monthly Distribution,Monthly Distribution,Ежемесячно дистрибуция
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Приемник Список пуст. Пожалуйста, создайте приемник Список"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производственный план по продажам Заказать
-DocType: Sales Partner,Sales Partner Target,Партнеры по сбыту целям
+DocType: Sales Partner,Sales Partner Target,Цели Партнера по продажам
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Учет Вход для {0} могут быть сделаны только в валюте: {1}
 DocType: Pricing Rule,Pricing Rule,Цены Правило
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материал Заказать орденом
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Материал Заказать орденом
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ряд # {0}: возвращенный деталь {1} не существует в {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банковские счета
 ,Bank Reconciliation Statement,Банковская сверка состояние
@@ -1249,11 +1257,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Открытие акции Остаток
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} должен появиться только один раз
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Не разрешается Tranfer более {0}, чем {1} против Заказа {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},Листья Выделенные Успешно для {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нет объектов для упаковки
 DocType: Shipping Rule Condition,From Value,От стоимости
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Производство Количество является обязательным
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Производство Количество является обязательным
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Суммы не отражается в банке
 DocType: Quality Inspection Reading,Reading 4,Чтение 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Претензии по счет компании.
@@ -1265,33 +1273,34 @@
 ,Material Requests for which Supplier Quotations are not created,"Материал Запросы, для которых Поставщик Котировки не создаются"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"На следующий день (с), на которой вы подаете заявление на отпуск праздники. Вам не нужно обратиться за разрешением."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Чтобы отслеживать предметы, используя штрих-код. Вы сможете ввести элементы в накладной и счет-фактуру путем сканирования штрих-кода товара."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Отметить как при поставке
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Отметить как при поставке
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Сделать цитаты
 DocType: Dependent Task,Dependent Task,Зависит Задача
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,Стоп День рождения Напоминания
 DocType: SMS Center,Receiver List,Приемник Список
 DocType: Payment Tool Detail,Payment Amount,Сумма платежа
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Израсходованное количество
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Просмотр
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Просмотр
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Чистое изменение денежных средств
 DocType: Salary Structure Deduction,Salary Structure Deduction,Зарплата Структура Вычет
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 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 +185,Quantity must not be more than {0},Количество должно быть не более {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Возраст (дней)
 DocType: Quotation Item,Quotation Item,Цитата Пункт
 DocType: Account,Account Name,Имя Учетной Записи
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,"С даты не может быть больше, чем к дате"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,"С даты не может быть больше, чем к дате"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Серийный номер {0} количество {1} не может быть фракция
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Тип Поставщик мастер.
 DocType: Purchase Order Item,Supplier Part Number,Поставщик Номер детали
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
 DocType: Company,Default Payable Account,По умолчанию оплачивается аккаунт
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки для онлайн корзины, такие как правилами перевозок, прайс-лист и т.д."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Объявленный
@@ -1303,15 +1312,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Мои вопросы
 DocType: BOM Item,BOM Item,Позиция BOM
 DocType: Appraisal,For Employee,Требуются
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Ряд {0}: Предварительная против Поставщика должны быть дебет
 DocType: Company,Default Values,Значения По Умолчанию
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Ряд {0}: Сумма платежа не может быть отрицательным
 DocType: Expense Claim,Total Amount Reimbursed,Общая сумма возмещаются
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Против поставщика счет-фактура {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Против поставщика счет-фактура {0} от {1}
 DocType: Customer,Default Price List,По умолчанию Прайс-лист
 DocType: Payment Reconciliation,Payments,Оплата
 DocType: Budget Detail,Budget Allocated,"Бюджет, выделенный"
 DocType: Journal Entry,Entry Type,Тип записи
 ,Customer Credit Balance,Заказчик Кредитный Баланс
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Чистое изменение кредиторской задолженности
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Пожалуйста, проверьте ваш электронный идентификатор"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Клиент требуется для ""Customerwise Скидка"""
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Обновление банк платежные даты с журналов.
@@ -1332,7 +1343,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Включить Корзина
 DocType: Employee,Permanent Address,Постоянный адрес
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Пункт {0} должен быть Service Элемент.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","Advance платный против {0} {1} не может быть больше \, чем общий итог {2}"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Пожалуйста, выберите элемент кода"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Уменьшите вычет для отпуска без сохранения (LWP)
@@ -1349,18 +1360,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Одно устройство элемента.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Время входа Пакетная {0} должен быть 'Представленные'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Время входа Пакетная {0} должен быть 'Представленные'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Сделать учета запись для каждого фондовой Движения
 DocType: Leave Allocation,Total Leaves Allocated,Всего Листья Выделенные
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Склад требуется в строке Нет {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Склад требуется в строке Нет {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Пожалуйста, введите действительный финансовый год даты начала и окончания"
 DocType: Employee,Date Of Retirement,Дата выбытия
 DocType: Upload Attendance,Get Template,Получить шаблон
 DocType: Address,Postal,Почтовый
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов с таким именем уже существует. Пожалуйста, измените имя клиента или имя группы клиентов"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Пожалуйста, выберите {0} в первую очередь."
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Текст {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,"Пожалуйста, выберите {0} в первую очередь."
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},Текст {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Новый контакт
 DocType: Territory,Parent Territory,Родитель Территория
 DocType: Quality Inspection Reading,Reading 2,Чтение 2
 DocType: Stock Entry,Material Receipt,Материал Поступление
@@ -1368,7 +1380,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Партия Тип и Сторона обязана в течение / дебиторская задолженность внимание {0}
 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 +210,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,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 адрес для уведомлений
@@ -1385,15 +1397,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Слишком много столбцов. Экспорт отчета и распечатать его с помощью приложения электронной таблицы.
 DocType: Sales 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 +152,Main,Основные
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Основные
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Установить префикс для нумерации серии на ваших сделок
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Приостановленный заказ не может быть отменен. Снимите с заказа статус ""Приостановлено"" для отмены"
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Сделать Заказ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Сделать Заказ
 DocType: SMS Center,Send To,Отправить
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Выделенная сумма
@@ -1406,19 +1418,20 @@
 DocType: Purchase Order Item,Warehouse and Reference,Склад и справочники
 DocType: Supplier,Statutory info and other general information about your Supplier,Уставный информации и другие общие сведения о вашем Поставщик
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адреса
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Против Запись в журнале {0} не имеет никакого непревзойденную {1} запись
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Против Запись в журнале {0} не имеет никакого непревзойденную {1} запись
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условия для правил перевозки
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Деталь не разрешается иметь производственного заказа.
 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: Sales Order,To Deliver and Bill,Для доставки и оплаты
 DocType: GL Entry,Credit Amount in Account Currency,Сумма кредита в валюте счета
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Журналы Время для изготовления.
 DocType: Item,Apply Warehouse-wise Reorder Level,Применить Склад-накрест Reorder уровень
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} должны быть представлены
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} должны быть представлены
 DocType: Authorization Control,Authorization Control,Авторизация управления
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Отклонено Склад является обязательным в отношении отклонил Пункт {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Время входа для задач.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Оплата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Оплата
 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},Материал Запрос максимума {0} могут быть сделаны для Пункт {1} против Заказ на продажу {2}
 DocType: Employee,Salutation,Обращение
@@ -1435,7 +1448,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Помощник
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
 DocType: SMS Center,Create Receiver List,Создание приемника Список
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Истек срок действия
 DocType: Packing Slip,To Package No.,Для пакета №
 DocType: Warranty Claim,Issue Date,Дата выдачи
 DocType: Activity Cost,Activity Cost,Стоимость активность
@@ -1473,7 +1485,7 @@
 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 +65,Territory / Customer,Область / клиентов
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,"например, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,Является продаж товара
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Пункт Group Tree
@@ -1485,7 +1497,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} создан
 DocType: Delivery Note Item,Against Sales Order,Против заказ клиента
 ,Serial No Status,Серийный номер статус
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Пункт таблице не может быть пустым
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Пункт таблице не может быть пустым
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Строка {0}: Для установки {1} периодичности, разница между от и до настоящего времени \
  должно быть больше или равно {2}"
@@ -1495,7 +1507,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Пошлины и налоги
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,Поставляется Кол-во
@@ -1510,7 +1522,7 @@
 DocType: Installation Note,Installation Time,Время установки
 DocType: Sales Invoice,Accounting Details,Учет Подробнее
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Удалить все транзакции этой компании
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Ряд # {0}: Режим {1} не завершены {2} Кол-во готовой продукции в производстве Приказ № {3}. Пожалуйста, обновите статус работы через журнал времени"
+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,"Ряд # {0}: Режим {1} не завершены {2} Кол-во готовой продукции в производстве Приказ № {3}. Пожалуйста, обновите статус работы через журнал времени"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Инвестиции
 DocType: Issue,Resolution Details,Разрешение Подробнее
 DocType: Quality Inspection Reading,Acceptance Criteria,Критерий приемлемости
@@ -1526,7 +1538,7 @@
 DocType: Holiday List,Clear Table,Очистить таблицу
 DocType: Features Setup,Brands,Бренды
 DocType: C-Form Invoice Detail,Invoice No,Счет-фактура Нет
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,От Заказа
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,От Заказа
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,Калькуляция Оценить
 ,Customer Addresses And Contacts,Адреса клиентов и Контакты
@@ -1543,7 +1555,7 @@
 ,Maintenance Schedules,Графики технического обслуживания
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Пункт Группа не упоминается в мастера пункт по пункту {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Количество
 ,Pending Amount,В ожидании Сумма
 DocType: Purchase Invoice Item,Conversion Factor,Коэффициент преобразования
@@ -1560,12 +1572,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дерево finanial счетов.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Оставьте пустым, если считать для всех типов сотрудников"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Распределите плату на основе
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Счет {0} должен быть типа 'Основные средства', товар {1} является активом"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Счет {0} должен быть типа 'Основные средства', товар {1} является активом"
 DocType: HR Settings,HR Settings,Настройки HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходов претензии ожидает одобрения. Только расходов утверждающий можете обновить статус.
 DocType: Purchase Invoice,Additional Discount Amount,Дополнительная скидка Сумма
 DocType: Leave Block List Allow,Leave Block List Allow,Оставьте Черный список Разрешить
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Общий фактический
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Единица
@@ -1577,6 +1589,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} теперь используется как основной Фискальный Год. Пожалуйста, обновите страницу в браузере, чтобы изменения вступили в силу."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Расходные Претензии
 DocType: Issue,Support,Поддержка
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Корзина
 ,BOM Search,Спецификация Поиск
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Закрытие (открытие + Итоги)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Пожалуйста, сформулируйте валюту в обществе"
@@ -1588,13 +1601,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Фактор Единица измерения преобразования требуется в строке {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Дата просвет не может быть до даты регистрации в строке {0}
 DocType: Salary Slip,Deduction,Вычет
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Цена товара добавляется для {0} в Прейскуранте {1}
 DocType: Address Template,Address Template,Шаблон адреса
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,"Пожалуйста, введите Employee Id этого менеджера по продажам"
 DocType: Territory,Classification of Customers by region,Классификация клиентов по регионам
 DocType: Project,% Tasks Completed,% Задач выполнено
 DocType: Project,Gross Margin,Валовая прибыль
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Пожалуйста, введите выпуска изделия сначала"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,отключенный пользователь
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,отключенный пользователь
 DocType: Opportunity,Quotation,Расценки
 DocType: Salary Slip,Total Deduction,Всего Вычет
 DocType: Quotation,Maintenance User,Уход за инструментом
@@ -1603,7 +1617,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL на привязанности {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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,Вычеты €
@@ -1613,12 +1627,12 @@
 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,ТАК Кол-во
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток есть записи с склада {0}, следовательно, вы не сможете повторно назначить или изменить Склад"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток есть записи с склада {0}, следовательно, вы не сможете повторно назначить или изменить Склад"
 DocType: Appraisal,Calculate Total Score,Рассчитать общую сумму
 DocType: Supplier Quotation,Manufacturing Manager,Производство менеджер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Сплит Delivery Note в пакеты.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Поставки
+apps/erpnext/erpnext/hooks.py +69,Shipments,Поставки
 DocType: Purchase Order Item,To be delivered to customer,Для поставляться заказчику
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Время входа Статус должен быть представлен.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серийный номер {0} не принадлежит ни к одной Склад
@@ -1638,10 +1652,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Выберите компанию ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставьте пустым, если рассматривать для всех отделов"
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная, контракт, стажер и т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Currency Exchange,From Currency,Из валюты
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Пожалуйста, выберите выделенной суммы, счет-фактура Тип и номер счета-фактуры в по крайней мере одном ряду"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Пожалуйста, выберите выделенной суммы, счет-фактура Тип и номер счета-фактуры в по крайней мере одном ряду"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Заказ клиента требуется для позиции {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Суммы не отражается в системе
 DocType: Purchase Invoice Item,Rate (Company Currency),Тариф (Компания Валюта)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Другое
@@ -1657,17 +1671,17 @@
 DocType: Quality Inspection,In Process,В процессе
 DocType: Authorization Rule,Itemwise Discount,Itemwise Скидка
 DocType: Purchase Order Item,Reference Document Type,Ссылка Тип документа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} против заказов клиентов {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} против заказов клиентов {1}
 DocType: Account,Fixed Asset,Исправлена активами
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Серийный Инвентарь
 DocType: Activity Type,Default Billing Rate,По умолчанию Платежная Оценить
 DocType: Time Log Batch,Total Billing Amount,Всего счетов Сумма
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Дебиторская задолженность аккаунт
 ,Stock Balance,Баланс запасов
-apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продажи Приказ Оплата
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Заказ клиента в оплату
 DocType: Expense Claim Detail,Expense Claim Detail,Расходов претензии Подробно
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Журналы Время создания:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,"Пожалуйста, выберите правильный счет"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,"Пожалуйста, выберите правильный счет"
 DocType: Item,Weight UOM,Вес Единица измерения
 DocType: Employee,Blood Group,Группа крови
 DocType: Purchase Invoice Item,Page Break,Разрыв страницы
@@ -1698,10 +1712,10 @@
 DocType: Time Log,To Time,Чтобы время
 DocType: Authorization Rule,Approving Role (above authorized value),Утверждении роль (выше уставного стоимости)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Чтобы добавить дочерние узлы, изучить дерево и нажмите на узле, при которых вы хотите добавить больше узлов."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на счету должно быть оплачивается счет
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не может быть родитель или ребенок {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Кредит на счету должно быть оплачивается счет
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,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 +116,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, только дебетовые счета могут быть связаны с другой кредитной вступления"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, только дебетовые счета могут быть связаны с другой кредитной вступления"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Прайс-лист {0} отключена
 DocType: Manufacturing Settings,Allow Overtime,Разрешить Овертайм
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} Серийные номера, необходимые для Пункт {1}. Вы предоставили {2}."
@@ -1709,8 +1723,9 @@
 DocType: Item,Customer Item Codes,Заказчик Предмет коды
 DocType: Opportunity,Lost Reason,Забыли Причина
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Создание записей оплаты по заказам или счетов-фактур.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Новый адрес
 DocType: Quality Inspection,Sample Size,Размер выборки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,На все товары уже выставлены счета
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,"Дальнейшие МВЗ можно сделать под групп, но записи могут быть сделаны в отношении не-групп"
 DocType: Project,External,Внешний  GPS с RS232
@@ -1766,13 +1781,14 @@
 DocType: Rename Tool,Rename Tool,Переименование файлов
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Обновление Стоимость
 DocType: Item Reorder,Item Reorder,Пункт Переупоряд
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,О передаче материала
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,О передаче материала
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","не Укажите операции, эксплуатационные расходы и дать уникальную операцию не в вашей деятельности."
 DocType: Purchase Invoice,Price List Currency,Прайс-лист валют
 DocType: Naming Series,User must always select,Пользователь всегда должен выбирать
 DocType: Stock Settings,Allow Negative Stock,Разрешить негативных складе
 DocType: Installation Note,Installation Note,Установка Примечание
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Добавить налоги
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Поток денежных средств от финансовой
 ,Financial Analytics,Финансовая аналитика
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Филиал
@@ -1782,28 +1798,29 @@
 DocType: Process Payroll,Create Salary Slip,Создание Зарплата Слип
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Ожидаемое сальдо по состоянию на банк
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Источник финансирования (обязательства)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ({1}) должна быть такой же, как изготавливается количество {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ({1}) должна быть такой же, как изготавливается количество {2}"
 DocType: Appraisal,Employee,Сотрудник
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Импорт E-mail С
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Пригласить в пользователя
 DocType: Features Setup,After Sale Installations,После продажи установок
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} полностью выставлен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} полностью выставлен
 DocType: Workstation Working Hour,End Time,Время окончания
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартные условия договора для продажи или покупки.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Группа по ваучером
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обязательно На
 DocType: Sales Invoice,Mass Mailing,Массовая рассылка
 DocType: Rename Tool,File to Rename,Файл Переименовать
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Показать платежи
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Указано BOM {0} не существует для п {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
 DocType: Notification Control,Expense Claim Approved,Расходов претензии Утверждено
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,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: Selling Settings,Sales Order Required,Требования Заказа клиента
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Создание клиентов
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,График технического обслуживания Подробно
 DocType: Quality Inspection Reading,Reading 9,Чтение 9
@@ -1815,6 +1832,7 @@
 DocType: Warranty Claim,Raised By,Поднятый По
 DocType: Payment Tool,Payment Account,Оплата счета
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Чистое изменение дебиторской задолженности
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
 DocType: Quality Inspection Reading,Accepted,Принято
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,"Пожалуйста, убедитесь, что вы действительно хотите удалить все транзакции для компании. Ваши основные данные останется, как есть. Это действие не может быть отменено."
@@ -1822,17 +1840,17 @@
 DocType: Payment Tool,Total Payment Amount,Общая сумма оплаты
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Сырье не может быть пустым.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,Сырье не может быть пустым.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Как есть существующие биржевые операции по этому пункту, \ вы не можете изменить значения &#39;Имеет серийный номер &quot;,&quot; Имеет Batch Нет »,« Является ли со Пункт &quot;и&quot; Оценка Метод &quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Быстрый журнал запись
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Быстрый журнал запись
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить скорость, если спецификации упоминается agianst любого элемента"
 DocType: Employee,Previous Work Experience,Предыдущий опыт работы
 DocType: Stock Entry,For Quantity,Для Количество
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} не проведен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} не проведен
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Запросы на предметы.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отдельный производственный заказ будет создан для каждого готового хорошего пункта.
 DocType: Purchase Invoice,Terms and Conditions1,Сроки и условиях1
@@ -1845,7 +1863,7 @@
 DocType: Authorization Rule,Authorized Value,Уставный Значение
 DocType: Contact,Enter department to which this Contact belongs,"Введите отдел, к которому принадлежит этого контакт"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Всего Отсутствует
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Единица Измерения
 DocType: Fiscal Year,Year End Date,Дата окончания года
 DocType: Task Depends On,Task Depends On,Задачи зависит от
@@ -1869,9 +1887,9 @@
 DocType: Campaign,Campaign-.####,Кампания-.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следующие шаги
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Третья сторона дистрибьютор / дилер / комиссионер / филиал / реселлера, который продает продукты компании для комиссии."
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Третья сторона дистрибьютор / дилер / комиссионер / филиал / реселлер, который продает продукты компании за комиссионное вознаграждение."
 DocType: Customer Group,Has Child Node,Имеет дочерний узел
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} против Заказа {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} против Заказа {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Введите статические параметры адрес здесь (Например отправитель = ERPNext, имя пользователя = ERPNext, пароль = 1234 и т.д.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1}, ни в каком-либо активном финансовом году. Для более подробной информации проверить {2}."
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
@@ -1919,7 +1937,7 @@
  10. Добавить или вычесть: Если вы хотите, чтобы добавить или вычесть налог."
 DocType: Purchase Receipt Item,Recd Quantity,RECD Количество
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0}, чем количество продаж Заказать {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Фото Элемент {0} не представлены
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Фото Элемент {0} не представлены
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / Расчетный счет
 DocType: Tax Rule,Billing City,Биллинг Город
 DocType: Global Defaults,Hide Currency Symbol,Скрыть Символ Валюты
@@ -1951,7 +1969,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Коммунальные расходы
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Над
 DocType: Buying Settings,Default Buying Price List,По умолчанию Покупка Прайс-лист
-DocType: Notification Control,Sales Order Message,Заказ на продажу Сообщение
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.","Установить значения по умолчанию, как Болгарии, Валюта, текущий финансовый год и т.д."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Вид оплаты
 DocType: Process Payroll,Select Employees,Выберите Сотрудники
@@ -1986,7 +2005,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","См. ""Оценить материалов на основе"" в калькуляции раздел"
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Ответственность Площадь
 DocType: Item Reorder,Material Request Type,Материал Тип запроса
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования Единица измерения является обязательным
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования Единица измерения является обязательным
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,N
 DocType: Cost Center,Cost Center,Центр учета затрат
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
@@ -2009,7 +2028,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Все адреса.
 DocType: Company,Stock Settings,Акции Настройки
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Объединение возможно только, если следующие свойства такие же, как в отчетах. Есть группа, корневого типа, компания"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Объединение возможно только, если следующие свойства такие же, как в отчетах. Есть группа, корневого типа, компания"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управление групповой клиентов дерево.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Новый Центр Стоимость Имя
 DocType: Leave Control Panel,Leave Control Panel,Оставьте панели управления
@@ -2029,8 +2048,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,"Деталь платежный инструмент,"
 ,Sales Browser,Браузер по продажам
 DocType: Journal Entry,Total Credit,Всего очков
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Внимание: Еще {0} # {1} существует против вступления фондовой {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Локальные
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Внимание: Еще {0} # {1} существует против вступления фондовой {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,Должники
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Большой
@@ -2049,7 +2068,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Все сделок купли-продажи могут быть помечены против нескольких ** продавцы ** так что вы можете устанавливать и контролировать цели.
 ,S.O. No.,КО №
 DocType: Production Order Operation,Make Time Log,Сделать временной лаг
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,"Пожалуйста, установите количество тональный"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,"Пожалуйста, установите количество тональный"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
 DocType: Price List,Applicable for Countries,Применимо для стран
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Компьютеры
@@ -2109,23 +2128,24 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,По крайней мере один элемент должен быть введен с отрицательным количеством в обратном документа
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Нет Замечания
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Нет Замечания
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Просроченный
 DocType: Account,Stock Received But Not Billed,"Фото со получен, но не Объявленный"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Корень аккаунт должна быть группа
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Корень аккаунт должна быть группа
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Валовой Платное + просроченной задолженности суммы + Инкассация Сумма - Всего Вычет
 DocType: Monthly Distribution,Distribution Name,Распределение Имя
-DocType: Features Setup,Sales and Purchase,Купли-продажи
+DocType: Features Setup,Sales and Purchase,Продажи и закупки
 DocType: Supplier Quotation Item,Material Request No,Материал Запрос Нет
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},"Контроль качества, необходимые для Пункт {0}"
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Скорость, с которой валюта клиента превращается в базовой валюте компании"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} успешно отписались от этого списка.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Чистая скорость (Компания валют)
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Управление Территория дерево.
-DocType: Journal Entry Account,Sales Invoice,Счет по продажам
+DocType: Journal Entry Account,Sales Invoice,Счет Продажи
 DocType: Journal Entry Account,Party Balance,Баланс партия
 DocType: Sales Invoice Item,Time Log Batch,Время входа Пакетный
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Пожалуйста, выберите Применить скидки на"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Зарплата скольжения Создано
 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,Материал Передача для производства
@@ -2133,9 +2153,9 @@
 DocType: Purchase Invoice,Half-yearly,Раз в полгода
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Финансовый год {0} не найден.
 DocType: Bank Reconciliation,Get Relevant Entries,Получить соответствующие записи
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Бухгалтерский учет Вход для запасе
-DocType: Sales Invoice,Sales Team1,Команда1 продаж
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Бухгалтерский учет Вход для запасе
+DocType: Sales Invoice,Sales Team1,Продажи Команда1
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Клиент Адрес
 DocType: Purchase Invoice,Apply Additional Discount On,Применить Дополнительная скидка на
 DocType: Account,Root Type,Корневая Тип
@@ -2144,21 +2164,21 @@
 DocType: Item Group,Show this slideshow at the top of the page,Показать этот слайд-шоу в верхней части страницы
 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 +149,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
 DocType: Quality Inspection,Quality Inspection,Контроль качества
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Очень Маленький
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридическое лицо / Вспомогательный с отдельным Планом счетов бухгалтерского учета, принадлежащего Организации."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Продукты питания, напитки и табак"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL или BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Могу только осуществить платеж против нефактурированных {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Могу только осуществить платеж против нефактурированных {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимальный уровень запасов
 DocType: Stock Entry,Subcontract,Субподряд
 apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Пожалуйста, введите {0} в первую очередь"
 DocType: Production Planning Tool,Get Items From Sales Orders,Получить элементов из заказов клиента
-DocType: Production Order Operation,Actual End Time,Фактическая Время окончания
+DocType: Production Order Operation,Actual End Time,Фактическое Время окончания
 DocType: Production Planning Tool,Download Materials Required,Скачать Необходимые материалы
 DocType: Item,Manufacturer Part Number,Номенклатурный код производителя
 DocType: Production Order Operation,Estimated Time and Cost,Расчетное время и стоимость
@@ -2190,7 +2210,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Входной контроль качества.
 DocType: Purchase Order Item,Returned Qty,Вернулся Кол-во
 DocType: Employee,Exit,Выход
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Корневая Тип является обязательным
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Корневая Тип является обязательным
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Серийный номер {0} создан
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Для удобства клиентов, эти коды могут быть использованы в печатных форматов, таких как счета-фактуры и накладных"
 DocType: Employee,You can enter any date manually,Вы можете ввести любую дату вручную
@@ -2198,8 +2218,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Испытательный Срок
 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 +110,Row {0}: Advance against Customer must be credit,Ряд {0}: Предварительная отношении Клиента должен быть кредит
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Покупка Получение товара Поставляется
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Платить
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Платить
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Для DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Журналы для просмотра статуса доставки смс
@@ -2216,7 +2237,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Изменить порядок Уровень
 DocType: Attendance,Attendance Date,Посещаемость Дата
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Зарплата распада на основе Заработок и дедукции.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Счет с дочерних узлов не может быть преобразован в регистр
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Счет с дочерних узлов не может быть преобразован в регистр
 DocType: Address,Preferred Shipping Address,Популярные Адрес доставки
 DocType: Purchase Receipt Item,Accepted Warehouse,Принимающий склад
 DocType: Bank Reconciliation Detail,Posting Date,Дата публикации
@@ -2234,11 +2255,11 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Серийный номер {0} не существует
 DocType: Pricing Rule,Discount Percentage,Скидка в процентах
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер накладной
-apps/erpnext/erpnext/hooks.py +54,Orders,Заказы
+apps/erpnext/erpnext/hooks.py +55,Orders,Заказы
 DocType: Leave Control Panel,Employee Type,Сотрудник Тип
 DocType: Employee Leave Approver,Leave Approver,Оставьте утверждающего
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Материал, переданный для производства"
-DocType: Expense Claim,"A user with ""Expense Approver"" role","Пользователь с ""Расходы утверждающий"" роли"
+DocType: Expense Claim,"A user with ""Expense Approver"" role","Пользователь с ролью ""Расходы утверждающий"""
 ,Issued Items Against Production Order,Выпущенные товары против производственного заказа
 DocType: Pricing Rule,Purchase Manager,Менеджер по закупкам
 DocType: Payment Tool,Payment Tool,Оплата Tool
@@ -2246,7 +2267,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% материалов выставлено по данному Заказу
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Период закрытия входа
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,МВЗ с существующими сделок не могут быть преобразованы в группе
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизация
+DocType: Account,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Поставщик (и)
 DocType: Customer,Credit Limit,{0}{/0} {1}Кредитный лимит {/1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Выберите тип сделки
@@ -2271,11 +2292,12 @@
 DocType: Material Request,Requested For,Запрашиваемая Для
 DocType: Quotation Item,Against Doctype,Против Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Подписка на Delivery Note против любого проекта
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Корневая учетная запись не может быть удалена
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Чистые денежные средства от инвестиционной
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Корневая учетная запись не может быть удалена
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Показать изображения в дневнике
 ,Is Primary Address,Является первичным Адрес
 DocType: Production Order,Work-in-Progress Warehouse,Работа-в-Прогресс Склад
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Ссылка # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управление адресов
 DocType: Pricing Rule,Item Code,Код элемента
 DocType: Production Planning Tool,Create Production Orders,Создание производственных заказов
@@ -2283,7 +2305,7 @@
 DocType: Journal Entry,User Remark,Примечание Пользователь
 DocType: Lead,Market Segment,Сегмент рынка
 DocType: Employee Internal Work History,Employee Internal Work History,Сотрудник внутреннего Работа История
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Закрытие (д-р)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Закрытие (д-р)
 DocType: Contact,Passive,Пассивный
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Серийный номер {0} не в наличии
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Налоговый шаблон для продажи сделок.
@@ -2299,7 +2321,7 @@
 ,Billed Amount,Счетов выдано количество
 DocType: Bank Reconciliation,Bank Reconciliation,Банковская сверка
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Получить обновления
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Добавить несколько пробных записей
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Оставить управления
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Группа по Счет
@@ -2308,14 +2330,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Счет голову под ответственности, в котором Прибыль / убыток будут забронированы"
 DocType: Payment Tool,Against Vouchers,На ваучеры
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Быстрая помощь
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
-DocType: Features Setup,Sales Extras,Продажи Дополнительно
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
+DocType: Features Setup,Sales Extras,Дополнительные расходы в продажах
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} к МВЗ {2} будет превышать {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',"Поле ""С даты"" должно быть после ""До даты"""
 ,Stock Projected Qty,Фото со Прогнозируемый Количество
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Sales Order,Customer's Purchase Order,Заказ клиента
 DocType: Warranty Claim,From Company,От компании
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Значение или Кол-во
@@ -2325,9 +2347,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Оставьте Черный список животных
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Вы будете использовать его в Вход
 DocType: Sales Partner,Retailer,Розничный торговец
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на счету должен быть баланс счета
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Кредит на счету должен быть баланс счета
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Все типы поставщиков
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
+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 +93,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График обслуживания позиции
 DocType: Sales Order,%  Delivered,% Доставлен
@@ -2371,7 +2393,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Общий вес пакета. Обычно вес нетто + упаковочный материал вес. (Для печати)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Пользователи с этой ролью могут замороживать счета, а также создавать / изменять бухгалтерские проводки замороженных счетов"
 DocType: Serial No,Is Cancelled,Является Отмененные
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Мои заказы
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Мои заказы
 DocType: Journal Entry,Bill Date,Дата оплаты
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Даже если есть несколько правил ценообразования с наивысшим приоритетом, то следующие внутренние приоритеты применяются:"
 DocType: Supplier,Supplier Details,Подробная информация о поставщике
@@ -2392,10 +2414,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Звонки
 DocType: Project,Total Costing Amount (via Time Logs),Всего Калькуляция Сумма (с помощью журналов Time)
 DocType: Purchase Order Item Supplied,Stock UOM,Фото со UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Заказ на {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Заказ на {0} не представлено
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Проектированный
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по-доставки и избыточного бронирования по пункту {0} как количестве 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,Открытие Дата
 DocType: Journal Entry,Remark,Примечание
@@ -2408,15 +2430,15 @@
 DocType: Time Log,Batched for Billing,Укомплектовать для выставления счета
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Законопроекты, поднятые поставщиков."
 DocType: POS Profile,Write Off Account,Списание счет
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Сумма скидки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Вернуться против счет покупки
 DocType: Item,Warranty Period (in days),Гарантийный срок (в днях)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Чистые денежные средства от операционной
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,"например, НДС"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Пункт 4
 DocType: Journal Entry Account,Journal Entry Account,Запись в журнале аккаунт
 DocType: Shopping Cart Settings,Quotation Series,Цитата серии
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0}), пожалуйста, измените название группы или переименовать пункт"
-DocType: Sales Order Item,Sales Order Date,Продажи Порядок Дата
+DocType: Sales Order Item,Sales Order Date,Дата Заказа клиента
 DocType: Sales Invoice Item,Delivered Qty,Поставляется Кол-во
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Склад {0}: Компания является обязательным
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Перейти к соответствующей группе (обычно источник средств&gt; Краткосрочные обязательства&gt; налогам и сборам и создать новую учетную запись (нажав на Добавить Ребенка) типа &quot;Налог&quot; и упоминают ставка налога.
@@ -2438,7 +2460,7 @@
 DocType: Installation Note,Installation Date,Дата установки
 DocType: Employee,Confirmation Date,Дата подтверждения
 DocType: C-Form,Total Invoiced Amount,Всего Сумма по счетам
-DocType: Account,Sales User,Продажи пользователя
+DocType: Account,Sales User,Пользователь Продажи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,"Мин Кол-во не может быть больше, чем максимальное Кол-во"
 DocType: Stock Entry,Customer or Supplier Details,Заказчик или Поставщик Подробности
 DocType: Lead,Lead Owner,Ведущий Владелец
@@ -2451,7 +2473,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
 DocType: Sales Invoice,Against Income Account,Против ДОХОДОВ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Поставляется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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 информация
@@ -2479,10 +2501,10 @@
 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 +14,This is a root sales person and cannot be edited.,Это корень продавец и не могут быть изменены.
 ,Stock Ledger,Книга учета акций
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Оценить: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Оценить: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Зарплата скольжения Вычет
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Выберите узел группы в первую очередь.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Цель должна быть одна из {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Цель должна быть одна из {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Заполните форму и сохранить его
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Скачать отчет содержащий все материал со статусом  последней инвентаризации
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форум
@@ -2520,7 +2542,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компания (не клиента или поставщика) хозяин.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Пожалуйста, введите 'ожидаемой даты поставки """
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Примечание: Если оплата не будет произведена в отношении какой-либо ссылки, чтобы запись журнала вручную."
@@ -2537,16 +2559,16 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' отключен
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Установить как Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Отправить автоматические письма на Контакты О представлении операций.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Ряд {0}: Кол-во не Имеющийся на складе {1} {2} {3}.
  Доступно Кол-во: {4}, трансфер Количество: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Пункт 3
 DocType: Purchase Order,Customer Contact Email,Контакты с клиентами E-mail
 DocType: Sales Team,Contribution (%),Вклад (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана, так как ""Наличные или Банковский счет"" не был указан"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана, так как ""Наличные или Банковский счет"" не был указан"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Обязанности
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
-DocType: Sales Person,Sales Person Name,Человек по продажам Имя
+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/public/js/setup_wizard.js +273,Add Users,Добавить пользователей
 DocType: Pricing Rule,Item Group,Пункт Группа
@@ -2554,20 +2576,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Перед примирения
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Небольшая Объявленный
 DocType: Item,Default BOM,По умолчанию BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Пожалуйста, повторите ввод название компании, чтобы подтвердить"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Общая сумма задолженности по Amt
 DocType: Time Log Batch,Total Hours,Общее количество часов
 DocType: Journal Entry,Printing Settings,Настройки печати
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},"Всего Дебет должна быть равна общей выработке. Разница в том, {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},"Всего Дебет должна быть равна общей выработке. Разница в том, {0}"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилестроение
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Из накладной
 DocType: Time Log,From Time,От времени
 DocType: Notification Control,Custom Message,Текст сообщения
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестиционно-банковская деятельность
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
 DocType: Purchase Invoice,Price List Exchange Rate,Прайс-лист валютный курс
 DocType: Purchase Invoice Item,Rate,Оценить
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Стажер
@@ -2586,9 +2608,10 @@
  конфликта отдавая приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банк:
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиалиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Материал Выпуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Материал Выпуск
 DocType: Material Request Item,For Warehouse,Для Склада
 DocType: Employee,Offer Date,Предложение Дата
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитаты
 DocType: Hub Settings,Access Token,Маркер доступа
 DocType: Sales Invoice Item,Serial No,Серийный номер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Пожалуйста, введите Maintaince Подробности"
@@ -2601,11 +2624,13 @@
 DocType: Process Payroll,Process Payroll,Процесс расчета заработной платы
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,"Есть больше праздников, чем рабочих дней в этом месяце."
 DocType: Product Bundle Item,Product Bundle Item,Продукт Связка товара
-DocType: Sales Partner,Sales Partner Name,Партнер по продажам Имя
+DocType: Sales Partner,Sales Partner Name,Имя Партнера по продажам
+DocType: Payment Reconciliation,Maximum Invoice Amount,Максимальная Сумма счета
 DocType: Purchase Invoice Item,Image View,Просмотр изображения
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,Оценка и Всего
@@ -2613,6 +2638,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Этот деталь Вариант {0} (шаблон). Атрибуты будет скопирован из шаблона, если ""не копировать"" не установлен"
 DocType: Account,Purchase User,Покупка пользователя
 DocType: Notification Control,Customize the Notification,Настроить уведомления
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Поток денежных средств от операций
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Адрес по умолчанию шаблона не может быть удален
 DocType: Sales Invoice,Shipping Rule,Правило Доставка
 DocType: Journal Entry,Print Heading,Распечатать Заголовок
@@ -2623,7 +2649,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Спецификации сырья
 DocType: Leave Application,Follow via Email,Следуйте по электронной почте
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сумма налога После скидка сумма
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи. Вы не можете удалить этот аккаунт.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Пожалуйста, выберите проводки Дата первого"
@@ -2641,6 +2667,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Серийный Нос Требуется для сериализованный элемент {0}
 DocType: Journal Entry,Bank Entry,Банк Стажер
 DocType: Authorization Rule,Applicable To (Designation),Применимо к (Обозначение)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Добавить в корзину
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Включение / отключение валюты.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Почтовые расходы
@@ -2648,30 +2675,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Развлечения и досуг
 DocType: Purchase Order,The date on which recurring order will be stop,"Дата, на которую повторяющееся заказ будет остановить"
 DocType: Quality Inspection,Item Serial No,Пункт Серийный номер
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} должен быть уменьшен на {1} или вы должны увеличить толерантность переполнения
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} должен быть уменьшен на {1} или вы должны увеличить толерантность переполнения
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Итого Текущая
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серийный товара {0} не может быть обновлен \
  использованием Stock примирения"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Перевести Материал Поставщику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Перевести Материал Поставщику
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Создание цитаты
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Вы не уполномочен утверждать листья на Блок Сроки
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Все эти предметы уже выставлен счет
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Все эти предметы уже выставлен счет
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Может быть одобрено {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Правило Доставка Условия
 DocType: BOM Replace Tool,The new BOM after replacement,Новая спецификация после замены
 DocType: Features Setup,Point of Sale,Точки продаж
 DocType: Account,Tax,Налог
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Ряд {0}: {1} не является допустимым {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,От Bundle продукта
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,От Bundle продукта
 DocType: Production Planning Tool,Production Planning Tool,Планирование производства инструмента
 DocType: Quality Inspection,Report Date,Дата отчета
 DocType: C-Form,Invoices,Счета
 DocType: Job Opening,Job Title,Должность
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Получатели
 DocType: Features Setup,Item Groups in Details,Группы товаров в деталях
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Количество, Изготовление должны быть больше, чем 0."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Начальная точка-оф-продажи (POS)
@@ -2679,21 +2705,22 @@
 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: Pricing Rule,Customer Group,Группа клиентов
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: Item,Website Description,Описание
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Чистое изменение в капитале
 DocType: Serial No,AMC Expiry Date,КУА срок действия
-,Sales Register,Продажи Зарегистрироваться
+,Sales Register,Книга продаж
 DocType: Quotation,Quotation Lost Reason,Цитата Забыли Причина
 DocType: Address,Plant,Завод
 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 +108,Summary for this month and pending activities,Резюме для этого месяца и в ожидании деятельности
 DocType: Customer Group,Customer Group Name,Группа Имя клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,Атрибуты
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Получить товары
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Пожалуйста, введите списать счет"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Получить товары
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Последняя дата заказа
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Сделать акцизного счет-фактура
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Счет {0} не принадлежит компании {1}
@@ -2709,7 +2736,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
 DocType: Project,Expected End Date,Ожидаемая дата завершения
 DocType: Appraisal Template,Appraisal Template Title,Оценка шаблона Название
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Коммерческий сектор
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Коммерческий сектор
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родитель товара {0} не должны быть со пункт
 DocType: Cost Center,Distribution Id,Распределение Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
@@ -2720,9 +2747,9 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Серия является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансовые услуги
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Соответствие атрибутов {0} должно быть в пределах {1} до {2} в приращений {3}
-DocType: Tax Rule,Sales,Скидки
+DocType: Tax Rule,Sales,Продажи
 DocType: Stock Entry Detail,Basic Amount,Основное количество
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
 DocType: Leave Allocation,Unused leaves,Неиспользованные листья
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,По умолчанию Дебиторская задолженность
@@ -2734,16 +2761,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Покупка Поступления
-DocType: Payment Reconciliation,Maximum Amount,Максимальная сумма
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Как Ценообразование Правило применяется?
 DocType: Quality Inspection,Delivery Note No,Доставка Примечание Нет
 DocType: Company,Retail,Розничная торговля
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Клиент {0} не существует
 DocType: Attendance,Absent,Отсутствует
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Связка товаров
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ряд {0}: Недопустимая ссылка {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Связка товаров
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Ряд {0}: Недопустимая ссылка {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купить налоги и сборы шаблон
 DocType: Upload Attendance,Download Template,Скачать шаблон
 DocType: GL Entry,Remarks,Примечания
@@ -2770,7 +2797,7 @@
 ,Monthly Attendance Sheet,Ежемесячная посещаемость Лист
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Не запись не найдено
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: МВЗ является обязательным для п. {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Получить элементов из комплекта продукта
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Получить элементов из комплекта продукта
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Счет {0} неактивен
 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,Посещаемость С Дата и посещаемости на сегодняшний день является обязательным
@@ -2779,8 +2806,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Учетной записи типа {0} не позволено открытие ""Прибыль и Убытки"""
 DocType: Features Setup,Sales Discounts,Продажи Купоны
 DocType: Hub Settings,Seller Country,Продавец Страна
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Опубликовать товары на сайте
 DocType: Authorization Rule,Authorization Rule,Авторизация Правило
 DocType: Sales Invoice,Terms and Conditions Details,Условия Подробности
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Спецификации
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажи Налоги и сборы шаблона
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Одежда и аксессуары
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Номер заказа
@@ -2797,12 +2826,12 @@
 DocType: Production Order,Expected Delivery Date,Ожидаемая дата поставки
 apps/erpnext/erpnext/accounts/general_ledger.py +121,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 +93,Entertainment Expenses,Представительские расходы
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Счет Продажи {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Счет Продажи {0} должно быть отменен до отмены этого Заказа клиента
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Возраст
 DocType: Time Log,Billing Amount,Биллинг Сумма
 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 +18,Applications for leave.,Заявки на отпуск.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Счет существующей проводки не может быть удален
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Счет существующей проводки не может быть удален
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Судебные издержки
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","День месяца, в который автоматически заказ формируется например 05, 28 и т.д."
 DocType: Sales Invoice,Posting Time,Средняя Время
@@ -2818,11 +2847,11 @@
 DocType: Maintenance Visit,Breakdown,Разбивка
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Счет: {0} с валютой: {1} не может быть выбран
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Счет {0}: Родитель счета {1} не принадлежит компании: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Счет {0}: Родитель счета {1} не принадлежит компании: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Успешно удален все сделки, связанные с этой компанией!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,По состоянию на Дата
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Испытательный срок
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Скорость Цены, если не хватает"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Всего уплаченной суммы
@@ -2834,6 +2863,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Всего счетов Сумма (с помощью журналов Time)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Мы продаем этот товар
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Поставщик Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,"Количество должно быть больше, чем 0"
 DocType: Journal Entry,Cash Entry,Денежные запись
 DocType: Sales Partner,Contact Desc,Связаться Описание изделия
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Тип листьев, как случайный, больным и т.д."
@@ -2842,14 +2872,14 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Добавьте строки, чтобы установить годовые бюджеты на счетах."
 DocType: Buying Settings,Default Supplier Type,По умолчанию Тип Поставщик
 DocType: Production Order,Total Operating Cost,Общие эксплуатационные расходы
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Примечание: Пункт {0} имеет несколько вхождений
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Примечание: Пункт {0} имеет несколько вхождений
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Все контакты.
 DocType: Newsletter,Test Email Id,Тест электронный идентификатор
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Аббревиатура компании
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Если вы будете следовать осмотра качества. Разрешает Item требуется и QA QA Нет в ТОВАРНЫЙ ЧЕК
 DocType: GL Entry,Party Type,Партия Тип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,"Сырье не может быть такой же, как главный пункт"
-DocType: Item Attribute Value,Abbreviation,Сокращение
+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 +115,Salary template master.,Шаблоном Зарплата.
 DocType: Leave Type,Max Days Leave Allowed,Максимальное количество дней отпуска разрешены
@@ -2867,7 +2897,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Налоговый шаблона является обязательным.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Счет {0}: Родитель счета {1} не существует
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,Счет {0}: Родитель счета {1} не существует
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Прайс-лист Тариф (Компания Валюта)
 DocType: Account,Temporary,Временный
 DocType: Address,Preferred Billing Address,Популярные Адрес для выставления счета
@@ -2885,8 +2915,8 @@
 ,Item-wise Price List Rate,Пункт мудрый Прайс-лист Оценить
 DocType: Purchase Order Item,Supplier Quotation,Поставщик цитаты
 DocType: Quotation,In Words will be visible once you save the Quotation.,По словам будет виден только вы сохраните цитаты.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} остановлен
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} остановлен
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
 DocType: Lead,Add to calendar on this date,Добавить в календарь в этот день
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила для добавления стоимости доставки.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстоящие События
@@ -2907,24 +2937,24 @@
 DocType: Customer,From Lead,От Ведущий
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,"Заказы, выпущенные для производства."
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Выберите финансовый год ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
 DocType: Hub Settings,Name Token,Имя маркера
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Стандартный Продажа
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,"По крайней мере, один склад является обязательным"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,Заменить
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} против чека {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} против чека {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
 DocType: Purchase Invoice Item,Project Name,Название проекта
 DocType: Supplier,Mention if non-standard receivable account,Упоминание если нестандартная задолженность счет
 DocType: Journal Entry Account,If Income or Expense,Если доходов или расходов
 DocType: Features Setup,Item Batch Nos,Пункт Пакетное Нос
 DocType: Stock Ledger Entry,Stock Value Difference,Фото Значение Разница
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Человеческими ресурсами
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,Человеческими ресурсами
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Оплата Примирение Оплата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Налоговые активы
 DocType: BOM Item,BOM No,BOM №
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,Запись в журнале {0} не имеете учет {1} или уже сравнивается с другой ваучер
 DocType: Item,Moving Average,Скользящее среднее
 DocType: BOM Replace Tool,The BOM which will be replaced,"В спецификации, которые будут заменены"
 DocType: Account,Debit,Дебет
@@ -2961,7 +2991,7 @@
 DocType: Stock Entry Detail,Additional Cost,Дополнительная стоимость
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Окончание финансового периода
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фильтровать на основе ваучером Нет, если сгруппированы по ваучером"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Сделать Поставщик цитаты
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Сделать Поставщик цитаты
 DocType: Quality Inspection,Incoming,Входящий
 DocType: BOM,Materials Required (Exploded),Необходимые материалы (в разобранном)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Уменьшите Набор для отпуска без сохранения (LWP)
@@ -2969,7 +2999,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серийный номер {1}, не соответствует {2} {3}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
 DocType: Batch,Batch ID,ID партии
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Примечание: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Доставка Примечание тенденции
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Резюме этой недели
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} позиция должна быть куплена или получена на основе субподряда в строке {1}
@@ -2984,6 +3014,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ср. Покупка Оценить
 DocType: Task,Actual Time (in Hours),Фактическое время (в часах)
 DocType: Employee,History In Company,История В компании
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,Рассылка
 DocType: Address,Shipping,Доставка
 DocType: Stock Ledger Entry,Stock Ledger Entry,Фото со Ledger Entry
@@ -2991,10 +3022,10 @@
 DocType: Customer,Tax ID,ИНН
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не установка для серийные номера колонке должно быть пустым
 DocType: Accounts Settings,Accounts Settings,Настройки аккаунта
-DocType: Customer,Sales Partner and Commission,Партнер и Комиссия по продажам
+DocType: Customer,Sales Partner and Commission,Партнеры по продажам и комиссия
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Сооружения и оборудование
 DocType: Sales Partner,Partner's Website,Сайт партнера
-DocType: Opportunity,To Discuss,Для Обсудить
+DocType: Opportunity,To Discuss,Для обсуждения
 DocType: SMS Settings,SMS Settings,Настройки SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Временные счета
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Черный
@@ -3003,7 +3034,6 @@
 DocType: Purchase Order,End date of current order's period,Дата окончания периода текущего заказа
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Сделать предложение письмо
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Возвращение
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,"По умолчанию Единица измерения для варианта должны быть такими же, как шаблон"
 DocType: Production Order Operation,Production Order Operation,Производство Порядок работы
 DocType: Pricing Rule,Disable,Отключить
 DocType: Project Task,Pending Review,В ожидании отзыв
@@ -3011,7 +3041,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Идентификатор клиента
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"Времени должен быть больше, чем от времени"
 DocType: Journal Entry Account,Exchange Rate,Курс обмена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Склад {0}: Родитель счета {1} не Bolong компании {2}
 DocType: BOM,Last Purchase Rate,Последний Покупка Оценить
 DocType: Account,Asset,Актив
@@ -3031,7 +3061,7 @@
 ,Available Stock for Packing Items,Доступные Stock для упаковки товаров
 DocType: Item Variant,Item Variant,Пункт Вариант
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Установка этого Адрес шаблон по умолчанию, поскольку нет никакого другого умолчанию"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс счета в Дебете, запрещена установка 'Баланс должен быть' как 'Кредит'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Управление качеством
 DocType: Production Planning Tool,Filter based on customer,Фильтр на основе клиента
 DocType: Payment Tool Detail,Against Voucher No,На Сертификаты Нет
@@ -3048,10 +3078,11 @@
 DocType: Opportunity,Next Contact,Следующая Контактные
 DocType: Employee,Employment Type,Вид занятости
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Капитальные активы
+,Cash Flow,Поток наличных денег
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Срок подачи заявлений не может быть по двум alocation записей
 DocType: Item Group,Default Expense Account,По умолчанию расходов счета
 DocType: Employee,Notice (days),Уведомление (дней)
-DocType: Tax Rule,Sales Tax Template,Налог с продаж шаблона
+DocType: Tax Rule,Sales Tax Template,Шаблон Налога с продаж
 DocType: Employee,Encashment Date,Инкассация Дата
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","На ваучере Тип должен быть одним из Заказа, накладная или Запись в журнале"
 DocType: Account,Stock Adjustment,Регулирование запасов
@@ -3079,13 +3110,12 @@
 DocType: Production Order,Warehouses,Склады
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Печать и стационарное
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Узел Группа
-DocType: Payment Reconciliation,Minimum Amount,Минимальная сумма
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Обновление Готовые изделия
 DocType: Workstation,per hour,в час
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Счет для склада (непрерывной инвентаризации) будет создан для этого счета.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада.
 DocType: Company,Distribution,Распределение
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Выплачиваемая сумма
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Выплачиваемая сумма
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Руководитель проекта
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Отправка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс скидка позволило пункта: {0} {1}%
@@ -3109,7 +3139,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Поддержка Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компания на складах отсутствует {0}
 DocType: POS Profile,Terms and Conditions,Правила и условия
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Чтобы Дата должна быть в пределах финансового года. Предполагая To Date = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Чтобы Дата должна быть в пределах финансового года. Предполагая To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Здесь вы можете поддерживать рост, вес, аллергии, медицинские проблемы и т.д."
 DocType: Leave Block List,Applies to Company,Относится к компании
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить, потому что представляется со Вступление {0} существует"
@@ -3123,15 +3153,15 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Пожалуйста, введите покупке расписок"
 DocType: Sales Invoice,Get Advances Received,Получить авансы полученные
 DocType: Email Digest,Add/Remove Recipients,Добавить / Удалить получателей
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},Сделка не допускается в отношении остановил производство ордена {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Настройка сервера входящей для поддержки электронный идентификатор. (Например support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Нехватка Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
 DocType: Salary Slip,Salary Slip,Зарплата скольжения
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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: Sales Invoice Item,Sales Order Item,Позиция в Заказе клиента
 DocType: Salary Slip,Payment Days,Платежные дней
 DocType: BOM,Manage cost of operations,Управление стоимость операций
 DocType: Features Setup,Item Advanced,Пункт Расширенный
@@ -3216,7 +3246,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Сотрудник записей.
 DocType: HR Settings,Payroll Settings,Настройки по заработной плате
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,"Подходим, не связанных Счета и платежи."
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Разместить заказ
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Разместить заказ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Корневая не может иметь родителей МВЗ
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Выберите бренд ...
 DocType: Sales Invoice,C-Form Applicable,C-образный Применимо
@@ -3231,7 +3261,7 @@
 DocType: Appraisal,Start Date,Дата Начала
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Выделите листья на определенный срок.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Нажмите здесь, чтобы проверить,"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Счет {0}: Вы не можете назначить себя как родительским счетом
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Счет {0}: Вы не можете назначить себя как родительским счетом
 DocType: Purchase Invoice Item,Price List Rate,Прайс-лист Оценить
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Показать ""На складе"" или ""нет на складе"", основанный на складе имеющейся в этом складе."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Ведомость материалов (BOM)
@@ -3240,17 +3270,17 @@
 DocType: Project,Expected Start Date,Ожидаемая дата начала
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Удалить элемент, если обвинения не относится к этому пункту"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Например. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Получать
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Получать
 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: Employee Leave Approver,Employee Leave Approver,Сотрудник Оставить утверждающий
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} был успешно добавлен в список наших новостей.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не можете объявить как потерял, потому что цитаты было сделано."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Мастер-менеджер
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Основные отчеты
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сегодняшний день не может быть раньше от даты
@@ -3268,7 +3298,7 @@
 DocType: Industry Type,Industry Type,Промышленность Тип
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Что-то пошло не так!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Предупреждение: Оставьте приложение содержит следующие даты блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже проведен
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Дата завершения
 DocType: Purchase Invoice Item,Amount (Company Currency),Сумма (Компания Валюта)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Название подразделения (департамент) хозяин.
@@ -3287,10 +3317,10 @@
 ,Serial No Service Contract Expiry,Серийный номер Сервисный контракт Срок
 DocType: Item,Unit of Measure Conversion,Единица измерения конверсии
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Сотрудник не может быть изменен
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Вы не можете кредитные и дебетовые же учетную запись в то же время
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Вы не можете кредитные и дебетовые же учетную запись в то же время
 DocType: Naming Series,Help HTML,Помощь HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100%. Это {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Учет по-{0} скрещенными за Пункт {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Учет по-{0} скрещенными за Пункт {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Имя лица или организации, что этот адрес принадлежит."
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Ваши Поставщики
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Невозможно установить, как Остаться в живых, как заказ клиента производится."
@@ -3303,35 +3333,35 @@
 DocType: Employee,Date of Issue,Дата выдачи
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: С {0} для {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Ряд # {0}: Установить Поставщик по пункту {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,Сайт изображения {0} прикреплен к пункту {1} не может быть найден
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Пожалуйста, проверьте мультивалютный вариант, позволяющий счета другой валюте"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,"Пожалуйста, проверьте мультивалютный вариант, позволяющий счета другой валюте"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Состояние: {0} не существует в системе
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Ваши настройки доступа не позволяют замораживать значения
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Ваши настройки доступа не позволяют замораживать значения
 DocType: Payment Reconciliation,Get Unreconciled Entries,Получить непримиримыми Записи
+DocType: Payment Reconciliation,From Invoice Date,От Накладная Дата
 DocType: Cost Center,Budgets,Бюджеты
-DocType: Employee,Emergency Contact Details,Аварийный Контактные данные
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Что оно делает?
 DocType: Delivery Note,To Warehouse,Для Склад
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Счет {0} был введен более чем один раз в течение финансового года {1}
 ,Average Commission Rate,Средний Комиссия курс
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Посещаемость не могут быть отмечены для будущих дат
 DocType: Pricing Rule,Pricing Rule Help,Цены Правило Помощь
 DocType: Purchase Taxes and Charges,Account Head,Основной счет
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Обновление дополнительных затрат для расчета приземлился стоимость товаров
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Электрический
 DocType: Stock Entry,Total Value Difference (Out - In),Общая стоимость Разница (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс является обязательным
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс является обязательным
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID пользователя не установлен для сотрудника {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,От претензий по гарантии
 DocType: Stock Entry,Default Source Warehouse,По умолчанию Источник Склад
 DocType: Item,Customer Code,Код клиента
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Напоминание о дне рождения для {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Дни с последнего Заказать
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,Капитал запасов
@@ -3344,7 +3374,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Закрытие счета {0} должен быть типа ответственностью / собственный капитал
 DocType: Authorization Rule,Based On,На основании
 DocType: Sales Order Item,Ordered Qty,Заказал Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Пункт {0} отключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Пункт {0} отключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Замороженные До
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Период с Период и датам обязательных для повторяющихся {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектная деятельность / задачи.
@@ -3352,7 +3382,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списание Сумма (Компания валют)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Земельные стоимости путевки
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Пожалуйста, установите {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторите с Днем Ежемесячно
@@ -3382,12 +3412,12 @@
 DocType: Upload Attendance,Upload Attendance,Добавить посещаемости
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Спецификация и производство Количество требуется
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старение Диапазон 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Сумма
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Сумма
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM заменить
-,Sales Analytics,Продажи Аналитика
+,Sales Analytics,Аналитика продаж
 DocType: Manufacturing Settings,Manufacturing Settings,Настройки Производство
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Настройка e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,"Пожалуйста, введите валюту по умолчанию в компании Master"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Ежедневные напоминания
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Налоговый Правило конфликты с {0}
@@ -3413,13 +3443,13 @@
 DocType: Sales Order Item,Produced Quantity,Добытое количество
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Инженер
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Поиск Sub сборки
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
 DocType: Sales Partner,Partner Type,Тип Партнер
 DocType: Purchase Taxes and Charges,Actual,Фактически
 DocType: Authorization Rule,Customerwise Discount,Customerwise Скидка
 DocType: Purchase Invoice,Against Expense Account,Против Expense Счет
 DocType: Production Order,Production Order,Производственный заказ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
 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,Просмотр сейчас
@@ -3431,15 +3461,15 @@
 DocType: Employee,Applicable Holiday List,Применимо Список праздников
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серия Обновлено
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Тип отчета является обязательным
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Тип отчета является обязательным
 DocType: Item,Serial Number Series,Серийный Номер серии
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для складе Пункт {0} в строке {1}
 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/public/js/setup_wizard.js +101,The First User: You,Первый пользователя: Вы
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Финансовый год Дата начала и финансовый год Дата окончания уже установлены в финансовый год {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успешно Примирение
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Финансовый год Дата начала и финансовый год Дата окончания уже установлены в финансовый год {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Успешно Примирение
 DocType: Production Order,Planned End Date,Планируемая Дата завершения
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Где элементы хранятся.
 DocType: Tax Rule,Validity,Период действия
@@ -3447,7 +3477,7 @@
 DocType: Attendance,Attendance,Посещаемость
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Дата публикации и размещения время является обязательным
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Дата публикации и размещения время является обязательным
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Налоговый шаблон для покупки сделок.
 ,Item Prices,Предмет цены
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,По словам будет виден только вы сохраните заказ на поставку.
@@ -3456,15 +3486,15 @@
 DocType: Task,Review Date,Дата пересмотра
 DocType: Purchase Invoice,Advance Payments,Авансовые платежи
 DocType: Purchase Taxes and Charges,On Net Total,On Net Всего
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же, как производственного заказа"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же, как производственного заказа"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Нет разрешения на использование платежного инструмента
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""Email адрес для уведомлений"" не указан для повторяющихся %s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,"Валюта не может быть изменена после внесения записи, используя другой валюты"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,"Валюта не может быть изменена после внесения записи, используя другой валюты"
 DocType: Company,Round Off Account,Округление аккаунт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административные затраты
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родительский клиент Группа
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Изменение
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Изменение
 DocType: Purchase Invoice,Contact Email,Эл. адрес
 DocType: Appraisal Goal,Score Earned,Оценка Заработано
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","например ""Моя компания ООО """
@@ -3474,13 +3504,13 @@
 DocType: Packing Slip,Gross Weight UOM,Вес брутто Единица измерения
 DocType: Email Digest,Receivables / Payables,Кредиторской / дебиторской задолженности
 DocType: Delivery Note Item,Against Sales Invoice,Против продаж счета-фактуры
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Кредитный счет
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Кредитный счет
 DocType: Landed Cost Item,Landed Cost Item,Посадка Статьи затрат
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Показать нулевые значения
 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,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
 DocType: Item,Default Warehouse,По умолчанию Склад
 DocType: Task,Actual End Date (via Time Logs),Фактическая Дата окончания (через журналы Time)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Бюджет не может быть назначен на учетную запись группы {0}
@@ -3497,7 +3527,7 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Не истек
 DocType: Journal Entry,Total Debit,Всего Дебет
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,По умолчанию склад готовой продукции
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Человек по продажам
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Продавец
 DocType: Sales Invoice,Cold Calling,Холодная Вызов
 DocType: SMS Parameter,SMS Parameter,SMS Параметр
 DocType: Maintenance Schedule Item,Half Yearly,Половина года
@@ -3516,29 +3546,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планировать время журналы за пределами рабочего времени рабочих станций.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} уже проведен
 ,Items To Be Requested,"Предметы, будет предложено"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Получить последнюю покупку Оценить
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Платежная Оценить на основе вида деятельности (за час)
 DocType: Company,Company Info,Информация о компании
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Не найден e-mail ID предприятия, поэтому почта не отправляется"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств (активов)
 DocType: Production Planning Tool,Filter based on item,Фильтр на основе пункта
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Дебетовый счет
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Дебетовый счет
 DocType: Fiscal Year,Year Start Date,Дата начала года
 DocType: Attendance,Employee Name,Имя Сотрудника
 DocType: Sales Invoice,Rounded Total (Company Currency),Округлые Всего (Компания Валюта)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Не можете скрытой в группу, потому что выбран Тип аккаунта."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Не можете скрытой в группу, потому что выбран Тип аккаунта."
 DocType: Purchase Common,Purchase Common,Покупка Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} был изменен. Пожалуйста, обновите."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Остановить пользователям вносить Leave приложений на последующие дни.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Из возможностей
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Вознаграждения работникам
 DocType: Sales Invoice,Is POS,Является POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Изготовлено Кол-во
 DocType: Purchase Receipt Item,Accepted Quantity,Принято Количество
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не существует
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,"Законопроекты, поднятые для клиентов."
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Нет {0}: Сумма не может быть больше, чем ожидании Сумма против Расход претензии {1}. В ожидании сумма {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Нет {0}: Сумма не может быть больше, чем ожидании Сумма против Расход претензии {1}. В ожидании сумма {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} подписчики добавлены
 DocType: Maintenance Schedule,Schedule,Расписание
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",Определить бюджет для этого МВЗ. Чтобы установить бюджета действие см &quot;Список компании&quot;
@@ -3546,7 +3577,7 @@
 DocType: Quality Inspection Reading,Reading 3,Чтение 3
 ,Hub,Концентратор
 DocType: GL Entry,Voucher Type,Ваучер Тип
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Прайс-лист не найден или отключен
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Прайс-лист не найден или отключен
 DocType: Expense Claim,Approved,Утверждено
 DocType: Pricing Rule,Price,Цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как ""левые"""
@@ -3560,7 +3591,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Журнал бухгалтерских записей.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кол-во на со склада
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партия / счета не соответствует {1} / {2} в {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Чтобы создать налоговый учет
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Пожалуйста, введите Expense счет"
 DocType: Account,Stock,Склад
@@ -3571,7 +3602,7 @@
 DocType: Employee,Contract End Date,Конец контракта Дата
 DocType: Sales Order,Track this Sales Order against any Project,Подписка на заказ клиента против любого проекта
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Потяните заказы на продажу (в ожидании, чтобы доставить) на основе вышеуказанных критериев"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,От поставщика цитаты
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,От поставщика цитаты
 DocType: Deduction Type,Deduction Type,Вычет Тип
 DocType: Attendance,Half Day,Полдня
 DocType: Pricing Rule,Min Qty,Мин Кол-во
@@ -3579,12 +3610,12 @@
 DocType: GL Entry,Transaction Date,Сделка Дата
 DocType: Production Plan Item,Planned Qty,Планируемые Кол-во
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Совокупная налоговая
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Для Количество (Изготовитель Количество) является обязательным
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Для Количество (Изготовитель Количество) является обязательным
 DocType: Stock Entry,Default Target Warehouse,Цель по умолчанию Склад
 DocType: Purchase Invoice,Net Total (Company Currency),Чистая Всего (Компания Валюта)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ряд {0}: Партия Тип и партия применяется только в отношении / дебиторская задолженность счет
 DocType: Notification Control,Purchase Receipt Message,Покупка Получение Сообщение
-DocType: Production Order,Actual Start Date,Фактическое Дата начала
+DocType: Production Order,Actual Start Date,Фактическая Дата начала
 DocType: Sales Order,% of materials delivered against this Sales Order,% материалов доставлено по данному Заказу
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Запись движений предмета.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Рассылка подписчика
@@ -3633,9 +3664,9 @@
 DocType: Customer,Commission Rate,Комиссия
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Сделать Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Блок отпуска приложений отделом.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Корзина Пусто
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Корзина Пусто
 DocType: Production Order,Actual Operating Cost,Фактическая Эксплуатационные расходы
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Корневая не могут быть изменены.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Корневая не могут быть изменены.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Выделенные количество не может превышать unadusted сумму
 DocType: Manufacturing Settings,Allow Production on Holidays,Позволяют производить на праздниках
 DocType: Sales Order,Customer's Purchase Order Date,Клиентам Дата Заказ
@@ -3646,11 +3677,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Условия шаблона
 DocType: Serial No,Delivery Details,Подробности доставки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматическое создание материала Запрос если количество падает ниже этого уровня,"
 ,Item-wise Purchase Register,Пункт мудрый Покупка Зарегистрироваться
 DocType: Batch,Expiry Date,Срок годности:
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Чтобы установить уровень повторного заказа, деталь должна быть Покупка товара или товара Производство"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Чтобы установить уровень повторного заказа, деталь должна быть Покупка товара или товара Производство"
 ,Supplier Addresses and Contacts,Поставщик Адреса и контакты
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Пожалуйста, выберите категорию первый"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Мастер проекта.
@@ -3658,7 +3689,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Полдня)
 DocType: Supplier,Credit Days,Кредитные дней
 DocType: Leave Type,Is Carry Forward,Является ли переносить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Получить элементов из спецификации
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Ведомость материалов
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партия Тип и партия необходима для / дебиторская задолженность внимание {1}
@@ -3666,7 +3697,7 @@
 DocType: Employee,Reason for Leaving,Причина увольнения
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционированный Количество
 DocType: GL Entry,Is Opening,Открывает
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запись не может быть связан с {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Аккаунт {0} не существует
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запись не может быть связан с {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Аккаунт {0} не существует
 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 7235863..cbcab6e 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Spotřební zboží
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Prosím, vyberte typ Party prvý"
 DocType: Item,Customer Items,Zákazník položky
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
 DocType: Item,Publish Item to hub.erpnext.com,Publikování položku do hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mailová upozornění
 DocType: Item,Default Unit of Measure,Výchozí Měrná jednotka
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude vypočítané v transakcii.
 DocType: Purchase Order,Customer Contact,Kontakt so zákazníkmi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Z materiálu Poptávka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Z materiálu Poptávka
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Strom
 DocType: Job Applicant,Job Applicant,Job Žadatel
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Žádné další výsledky.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1.Chcete-li zachovat zákazníkovo produktové číslo a také podle něj vyhledávat, použijte tuto možnost"
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Zobraziť Varianty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Množství
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Množství
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Úvěry (závazky)
 DocType: Employee Education,Year of Passing,Rok Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na skladě
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Péče o zdraví
 DocType: Purchase Invoice,Monthly,Měsíčně
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Oneskorenie s platbou (dni)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktúra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Faktúra
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mailová adresa
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,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
 DocType: Company,Abbr,Zkr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Řádek # {0}:
 DocType: Delivery Note,Vehicle No,Vozidle
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Prosím, vyberte Ceník"
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,"Prosím, vyberte Ceník"
 DocType: Production Order Operation,Work In Progress,Work in Progress
 DocType: Employee,Holiday List,Dovolená Seznam
 DocType: Time Log,Time Log,Time Log
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Rovnaký Spoločnosť je zapísaná viac ako raz
 DocType: Employee,Married,Ženatý
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nie je dovolené {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 DocType: Payment Reconciliation,Reconcile,Srovnat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Proveďte Bank Vstup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Penzijní fondy
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
 DocType: Lead,Person Name,Osoba Meno
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Zkontrolujte, zda je opakující se, zrušte zaškrtnutí políčka zastavit opakované nebo dát správné datum ukončení"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Zájemci
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of materiálu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopírovat z bodu Group
 DocType: Journal Entry,Opening Entry,Otevření Entry
 DocType: Stock Entry,Additional Costs,Dodatočné náklady
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
 DocType: Lead,Product Enquiry,Dotaz Product
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Prosím, nejprave zadejte společnost"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Prosím, vyberte první firma"
 DocType: Employee Education,Under Graduate,Za absolventa
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivita Log:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
@@ -165,7 +165,7 @@
 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","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 +444,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bude aktualizováno po odeslání faktury.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Nastavenie modulu HR
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Podrobnosti o prováděných operací.
 DocType: Serial No,Maintenance Status,Status Maintenance
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Položky a Ceny
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},"Od data by měla být v rámci fiskálního roku. Za předpokladu, že od data = {0}"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},"Od data by měla být v rámci fiskálního roku. Za předpokladu, že od data = {0}"
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vyberte zaměstnance, pro kterého vytváříte hodnocení."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Náklady Center {0} nepatří do společnosti {1}
 DocType: Customer,Individual,Individuální
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Čistý peňažný tok z financovania
 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
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Kontakt Meno
 DocType: Production Plan Item,SO Pending Qty,SO Pending Množství
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Vytvoří výplatní pásku na výše uvedených kritérií.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,No vzhledem k tomu popis
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Žádost o koupi.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 DocType: Payment Tool,Reference No,Referenční číslo
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Nechte Blokováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Item,Publish in Hub,Publikovat v Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Položka {0} je zrušená
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Položka {0} je zrušená
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Vztah
 DocType: Shipping Rule,Worldwide Shipping,Celosvetovo doprava
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potvrzené objednávky od zákazníků.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Návrhy
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Položka Skupina-moudrý rozpočty na tomto území. Můžete také sezónnosti nastavením distribuce.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Prosím, zadejte mateřskou skupinu účtu pro sklad {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemôže byť väčšia ako dlžnej čiastky {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemôže byť väčšia ako dlžnej čiastky {2}
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generování plán
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Nejnovější
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 znaků
 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
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Učiť sa
 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
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Správa obchodník strom.
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Viac mien
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktúry
 DocType: Sales Invoice Item,Delivery Note,Dodací list
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Nastavenie Dane
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Nastavenie Dane
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} vložené dvakrát v Daňovej Položke
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +105,Summary for this week and pending activities,Zhrnutie pre tento týždeň a prebiehajúcim činnostiam
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vyberte měsíc a rok
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","K dispozici v BOM, dodací list, fakturu, výrobní zakázky, objednávky, doklad o koupi, prodejní faktury odběratele, Stock vstupu, časový rozvrh"
 DocType: Item Tax,Tax Rate,Sadzba dane
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Select Položka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Select Položka
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} podařilo dávkové, nemůže být v souladu s použitím \
  Stock usmíření, použijte Reklamní Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Previesť na non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Příjmka musí být odeslána
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Lékařský
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Důvod ztráty
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Príležitosti
 DocType: Employee,Single,Jednolůžkový
 DocType: Issue,Attachment,Príloha
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Rozpočet nie je možné nastaviť pre skupinu nákladového strediska
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,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 +563,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. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday master.
 DocType: Material Request Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Prosím, zadejte kód položky."
 DocType: BOM,Costing,Rozpočet
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Je-li zaškrtnuto, bude částka daně považovat za již zahrnuty v tisku Rate / Tisk Částka"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Celkem Množství
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Pořadové č záruční lhůty
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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ť transakcií Company
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Položka {0} není Nákup položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Položka {0} není Nákup položky
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} je neplatná e-mailová adresa v ""Oznámenie \
  E-mailová adresa"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Celkem Billing Tento rok:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
 DocType: Purchase Invoice,Supplier Invoice No,Dodávateľská faktúra č
 DocType: Territory,For reference,Pro srovnání
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Uzavření (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Uzavření (Cr)
 DocType: Serial No,Warranty Period (Days),Záruční doba (dny)
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 ,Pending Qty,Čakajúci Množstvo
@@ -464,7 +467,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Mesačné rozloženie** vám pomôže rozložiť váš rozpočet do vviac mesiacov, ak vaše podnikanie ovplyvňuje sezónnosť. Ak chcete rozložiť rozpočet pomocou tohto rozdelenia, nastavte toto ** mesačné rozloženie ** v ** nákladovom stredisku **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
@@ -472,9 +475,9 @@
 DocType: Project Task,Project Task,Úloha Project
 ,Lead Id,Id Obchodnej iniciatívy
 DocType: C-Form Invoice Detail,Grand Total,Celkem
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Datum zahájení Fiskálního roku by nemělo být větší než datum ukončení
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Datum zahájení Fiskálního roku by nemělo být větší než datum ukončení
 DocType: Warranty Claim,Resolution,Řešení
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dodáva: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Dodáva: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Splatnost účtu
 DocType: Sales Order,Billing and Delivery Status,Fakturácie a Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Opakujte zákazníci
@@ -489,7 +492,7 @@
 DocType: Quotation,Quotation To,Ponuka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
@@ -498,7 +501,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Výrobní zakázka je povinné
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Návrh Psaní
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativní Sklad Error ({6}) k bodu {0} ve skladu {1} na {2} {3} v {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativní Sklad Error ({6}) k bodu {0} ve skladu {1} na {2} {3} v {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskální rok Společnosti
 DocType: Packing Slip Item,DN Detail,DN Detail
 DocType: Time Log,Billed,Fakturováno
@@ -517,16 +520,17 @@
 DocType: Activity Type,Default Costing Rate,Predvolené kalkulácie Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Plán údržby
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pak se pravidla pro tvorbu cen jsou odfiltrovány založeny na zákazníka, skupiny zákazníků, území, dodavatel, dodavatel typ, kampaň, obchodní partner atd"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Čistá Zmena stavu zásob
 DocType: Employee,Passport Number,Číslo pasu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manažer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Z příjemky
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Z příjemky
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
 DocType: SMS Settings,Receiver Parameter,Přijímač parametrů
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založené na"" a ""Zoskupené podľa"", nemôžu byť rovnaké"
 DocType: Sales Person,Sales Person Targets,Obchodník cíle
 DocType: Production Order Operation,In minutes,V minutách
 DocType: Issue,Resolution Date,Rozlišení Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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}
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Převést do skupiny
 DocType: Activity Cost,Activity Type,Druh činnosti
@@ -537,7 +541,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publikování
 DocType: Activity Cost,Projects User,Projekty uživatele
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Spotřeba
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nenájdené v tabuľke Podrobnosti Faktúry
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} nenájdené v tabuľke Podrobnosti Faktúry
 DocType: Company,Round Off Cost Center,Zaokrúhliť nákladové stredisko
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
 DocType: Material Request,Material Transfer,Přesun materiálu
@@ -559,13 +563,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Chcete-li sledovat položky v oblasti prodeje a nákupu dokumentů na základě jejich sériových čísel. To je možné také použít ke sledování detailů produktu záruční.
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Celkom fakturácia tento rok
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 DocType: Employee,Provide email id registered in company,Poskytnout e-mail id zapsané ve firmě
 DocType: Hub Settings,Seller City,Prodejce City
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Položka má varianty.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -583,18 +587,18 @@
 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 +92,{0} is not a stock Item,{0} nie je skladová položka
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nie je skladová položka
 DocType: Mode of Payment Account,Default Account,Výchozí účet
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Vedoucí musí být nastavena pokud Opportunity je vyrobena z olova
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Prosím, vyberte týdenní off den"
 DocType: Production Order Operation,Planned End Time,Plánované End Time
 ,Sales Person Target Variance Item Group-Wise,Prodej Osoba Cílová Odchylka Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
 DocType: Delivery Note,Customer's Purchase Order No,Zákazníka Objednávka No
 DocType: Employee,Cell Number,Číslo buňky
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Žiadosti Auto materiál vygenerovaný
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
 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 +33,Monthly salary statement.,Měsíční plat prohlášení.
@@ -603,9 +607,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} typu {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Účtovné Prihlášky možno proti koncovej uzly. Záznamy proti skupinám nie sú povolené.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
 DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodej kampaně.
 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.
@@ -663,7 +667,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ceník není zvolen
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Process Payroll,Send Email,Odeslat email
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nemáte oprávnění
 DocType: Company,Default Bank Account,Výchozí Bankovní účet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Ak chcete filtrovať na základe Party, vyberte typ Party prvý"
@@ -671,7 +675,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budú zobrazené vyššie
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Odsouhlasení Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Moje Faktúry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Moje Faktúry
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Žádný zaměstnanec nalezeno
 DocType: Purchase Order,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Ak sa subdodávky na dodávateľa
@@ -681,6 +685,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Odeslat nyní
 ,Support Analytics,Podpora Analytics
 DocType: Item,Website Warehouse,Sklad pro web
+DocType: Payment Reconciliation,Minimum Invoice Amount,Minimálna suma faktúry
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form záznamy
@@ -690,7 +695,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Ak chcete povoliť &quot;Point of Sale&quot; predstavuje
 DocType: Bin,Moving Average Rate,Klouzavý průměr
 DocType: Production Planning Tool,Select Items,Vyberte položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} proti účtu {1} z dňa {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} proti účtu {1} z dňa {2}
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Nechajte cez dodávku alebo príjem aľ tohto percenta
@@ -702,7 +707,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
 DocType: Production Order,Item To Manufacture,Bod K výrobě
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} stav je {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Objednávka na platobné
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Objednávka na platobné
 DocType: Sales Order Item,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatno dne
 DocType: Newsletter,Newsletter Manager,Newsletter Manažér
@@ -726,7 +731,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Mieste predaja
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
 DocType: Account,Balance must be,Zůstatek musí být
 DocType: Hub Settings,Publish Pricing,Publikovat Ceník
 DocType: Notification Control,Expense Claim Rejected Message,Zpráva o zamítnutí úhrady výdajů
@@ -749,7 +754,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Devizový kurz master.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} musí být aktivní
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} musí být aktivní
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vyberte první typ dokumentu
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Nechte inkasa Částka
@@ -767,17 +772,17 @@
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Features Setup,Item Barcode,Položka Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Varianty Položky {0} aktualizované
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Varianty Položky {0} aktualizované
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
 DocType: Address,Shop,Obchod
 DocType: Hub Settings,Sync Now,Sync teď
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
 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."
 DocType: Employee,Permanent Address Is,Trvalé bydliště je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Provoz dokončeno kolika hotových výrobků?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Značka
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
 DocType: Employee,Exit Interview Details,Exit Rozhovor Podrobnosti
 DocType: Item,Is Purchase Item,je Nákupní Položka
 DocType: Journal Entry Account,Purchase Invoice,Přijatá faktura
@@ -789,7 +794,7 @@
 DocType: Salary Slip,Total in words,Celkem slovy
 DocType: Material Request Item,Lead Time Date,Čas a Dátum Obchodnej iniciatívy
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,"je povinné. Možno, Zmenáreň záznam nie je vytvorená pre"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Pre &quot;produktom Bundle predmety, sklad, sériové číslo a dávkové No bude považovaná zo&quot; Balenie zoznam &#39;tabuľky. Ak Warehouse a Batch No sú rovnaké pre všetky balenia položky pre akúkoľvek &quot;Výrobok balík&quot; položky, tieto hodnoty môžu byť zapísané do hlavnej tabuľky položky, budú hodnoty skopírované do &quot;Balenie zoznam&quot; tabuľku."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Zásilky zákazníkům.
 DocType: Purchase Invoice Item,Purchase Order Item,Položka vydané objednávky
@@ -798,14 +803,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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 +626,Select Item for Transfer,Vybrať položku pre prevod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 nápovedy videí
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vyberte účet šéf banky, kde byla uložena kontrola."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Povolit uživateli upravovat Ceník Cena při transakcích
 DocType: Pricing Rule,Max Qty,Max Množství
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemický
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
 DocType: Process Payroll,Select Payroll Year and Month,Vyberte Payroll rok a mesiac
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Prejdite na príslušnej skupiny (zvyčajne využitia finančných prostriedkov&gt; obežných aktív&gt; bankových účtov a vytvoriť nový účet (kliknutím na Pridať dieťa) typu &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Cena elektřiny
@@ -819,10 +825,10 @@
 DocType: SMS Center,All Lead (Open),Všetky Iniciatívy (Otvorené)
 DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Pripojiť svoj obrázok
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Dělat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Dělat
 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 +3,My Cart,Môj košík
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Môj košík
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Otevření POČET
@@ -841,10 +847,10 @@
 DocType: POS Profile,Cash/Bank Account,Hotovostní / Bankovní účet
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Atribút tabuľka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} nemôže byť záporné
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Sleva
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Sleva
 DocType: Features Setup,Purchase Discounts,Nákup Slevy
 DocType: Workstation,Wages,Mzdy
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Bude aktualizovaná iba v prípade, Time Log je &quot;Fakturovateľná&quot;"
@@ -869,7 +875,7 @@
 DocType: Tax Rule,Shipping State,Prepravné State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodejní náklady
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standardní Nakupování
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standardní Nakupování
 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
@@ -911,6 +917,7 @@
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použiť dodatočnú zľavu On&quot;
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"Z rozsahu, musí byť nižšia ako na Range"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vyberte Time protokolů a předložit k vytvoření nové prodejní faktury.
@@ -920,13 +927,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,To Batch Time Log bylo účtováno.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Vytvořit příležitost
 DocType: Salary Slip,Leave Without Pay,Nechat bez nároku na mzdu
-DocType: Supplier,Communications,Komunikace
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Plánovanie kapacít Chyba
 ,Trial Balance for Party,Trial váhy pre stranu
 DocType: Lead,Consultant,Konzultant
 DocType: Salary Slip,Earnings,Výdělek
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Dokončené Položka {0} musí byť zadaný pre vstup typu Výroba
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Otvorenie účtovníctva Balance
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Dokončené Položka {0} musí byť zadaný pre vstup typu Výroba
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otvorenie účtovníctva Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nic požadovat
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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"""
@@ -968,7 +974,7 @@
 DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
 DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem
 DocType: Lead,Call,Volání
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Položky"" nemôžu býť prázdne"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,"""Položky"" nemôžu býť prázdne"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicitný riadok {0} s rovnakým {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Nastavenia pre modul Zamestnanci
@@ -980,9 +986,9 @@
 DocType: Contact,User ID,User ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Výroba na odběratele
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -1012,7 +1018,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
 DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"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 +159,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1025,13 +1031,13 @@
 DocType: Employee,Place of Issue,Místo vydání
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Smlouva
 DocType: Email Digest,Add Quote,Pridať ponuku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Vaše Produkty nebo Služby
 DocType: Mode of Payment,Mode of Payment,Způsob platby
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,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/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
 DocType: Journal Entry Account,Purchase Order,Vydaná objednávka
 DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
@@ -1040,8 +1046,8 @@
 DocType: Email Digest,Annual Income,Ročný príjem
 DocType: Serial No,Serial No Details,Serial No Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Sazba daně položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Kapitálové Vybavení
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1051,7 +1057,7 @@
 DocType: Appraisal Goal,Goal,Cieľ
 DocType: Sales Invoice Item,Edit Description,Upraviť popis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očakávané dátum dodania je menšia ako plánovaný dátum začatia.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Pro Dodavatele
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavení typu účtu pomáhá při výběru tohoto účtu v transakcích.
 DocType: Purchase Invoice,Grand Total (Company Currency),Celkový součet (Měna společnosti)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Celkem Odchozí
@@ -1064,7 +1070,7 @@
 DocType: Journal Entry,Journal Entry,Zápis do deníku
 DocType: Workstation,Workstation Name,Meno pracovnej stanice
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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
@@ -1096,7 +1102,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter kontaktom a obchodným iniciatívam
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operace nemůže být prázdné.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operace nemůže být prázdné.
 ,Delivered Items To Be Billed,Dodávaných výrobků fakturovaných
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
 DocType: Authorization Rule,Average Discount,Průměrná sleva
@@ -1111,7 +1117,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operace Popis
 DocType: Item,Will also apply to variants,Bude sa vzťahovať aj na varianty
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nelze měnit Fiskální rok Datum zahájení a fiskální rok datum ukončení, jakmile fiskální rok se uloží."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nelze měnit Fiskální rok Datum zahájení a fiskální rok datum ukončení, jakmile fiskální rok se uloží."
 DocType: Quotation,Shopping Cart,Nákupní vozík
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odchozí
 DocType: Pricing Rule,Campaign,Kampaň
@@ -1122,7 +1128,8 @@
 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žiavať Zásoby
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Čistá zmena v stálych aktív
 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 +517,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 +182,Max: {0},Max: {0}
@@ -1134,7 +1141,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,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 Slip Deduction,Depends on Leave Without Pay,Závisí na dovolenke bez nároku na mzdu
@@ -1172,7 +1179,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Podsestavy
 DocType: Shipping Rule Condition,To Value,Chcete-li hodnota
 DocType: Supplier,Stock Manager,Reklamný manažér
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Balení Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Pronájem kanceláře
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Nastavenie SMS brány
@@ -1180,10 +1187,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytik
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
 DocType: Item,Inventory,Inventář
 DocType: Features Setup,"To enable ""Point of Sale"" view",Ak chcete povoliť &quot;Point of Sale&quot; pohľadu
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
 DocType: Item,Sales Details,Prodejní Podrobnosti
 DocType: Opportunity,With Items,S položkami
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Množství
@@ -1198,10 +1205,11 @@
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
 DocType: Sales Invoice,Source,Zdroj
 DocType: Leave Type,Is Leave Without Pay,Je odísť bez Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Finanční rok Datum zahájení
 DocType: Employee External Work History,Total Experience,Celková zkušenost
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Peňažný tok z investičných
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Material Request Item,Sales Order No,Prodejní objednávky No
 DocType: Item Group,Item Group Name,Položka Název skupiny
@@ -1209,12 +1217,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Přenos Materiály pro výrobu
 DocType: Pricing Rule,For Price List,Pro Ceník
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Cena při platbě za položku: {0} nebyl nalezen, který je povinen si účetní položka (náklady). Prosím, uveďte zboží Cena podle seznamu kupní cenou."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Cena při platbě za položku: {0} nebyl nalezen, který je povinen si účetní položka (náklady). Prosím, uveďte zboží Cena podle seznamu kupní cenou."
 DocType: Maintenance Schedule,Schedules,Plány
 DocType: Purchase Invoice Item,Net Amount,Čistá suma
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatočná zľava Suma (Mena Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Chyba: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Chyba: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
 DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Zákazník> Zákazník Group> Territory
@@ -1240,7 +1248,7 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Účtovný záznam pre {0} možno vykonávať iba v mene: {1}
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiál Žiadosť o príkaze k nákupu
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiál Žiadosť o príkaze k nákupu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Riadok # {0}: vrátenej položky {1} neexistuje v {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankové účty
 ,Bank Reconciliation Statement,Bank Odsouhlasení prohlášení
@@ -1248,11 +1256,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Otvorenie Sklad Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} môže byť uvedené iba raz
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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í
 DocType: Shipping Rule Condition,From Value,Od hodnoty
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Výrobní množství je povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Výrobní množství je povinné
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Částky nezohledněny v bance
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Nároky na náklady firmy.
@@ -1264,33 +1272,34 @@
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Chcete-li sledovat položky pomocí čárového kódu. Budete mít možnost zadat položky dodacího listu a prodejní faktury snímáním čárového kódu položky.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Označiť ako Dodáva
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Označiť ako Dodáva
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Značka Citácia
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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,Zastavit připomenutí narozenin
 DocType: SMS Center,Receiver List,Přijímač Seznam
 DocType: Payment Tool Detail,Payment Amount,Částka platby
 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/public/js/pos/pos.js +491,{0} View,{0} Zobraziť
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Zobraziť
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Čistá zmena v hotovosti
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plat Struktura Odpočet
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Množství nesmí být větší než {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Staroba (dni)
 DocType: Quotation Item,Quotation Item,Položka ponuky
 DocType: Account,Account Name,Název účtu
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Pořadové číslo {0} {1} množství nemůže být zlomek
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
 DocType: Company,Default Payable Account,Výchozí Splatnost účtu
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% fakturované
@@ -1302,15 +1311,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moje problémy
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,Pro zaměstnance
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,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/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Částka platby nemůže být záporný
 DocType: Expense Claim,Total Amount Reimbursed,Celkovej sumy vyplatenej
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
 DocType: Payment Reconciliation,Payments,Platby
 DocType: Budget Detail,Budget Allocated,Přidělený Rozpočet
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Zákazník Credit Balance
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Čistá Zmena účty záväzkov
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Overte prosím svoju e-mailovú id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Zákazník požadoval pro 'Customerwise sleva """
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
@@ -1331,7 +1342,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Povolit Nákupní košík
 DocType: Employee,Permanent Address,Trvalé bydliště
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Položka {0} musí být služba položky.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Vyplatená záloha proti {0} {1} nemôže byť väčšia \ než Grand Celkom {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Prosím, vyberte položku kód"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Snížit Odpočet o dovolenou bez nároku na odměnu (LWP)
@@ -1348,18 +1359,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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,Materiál Žádost používá k výrobě této populace Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Single jednotka položky.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Warehouse vyžadované pri Row No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Warehouse vyžadované pri Row No {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Zadajte platnú finančný rok dátum začatia a ukončenia
 DocType: Employee,Date Of Retirement,Datum odchodu do důchodu
 DocType: Upload Attendance,Get Template,Získat šablonu
 DocType: Address,Postal,Poštovní
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,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/public/js/pos/pos.js +147,Please select {0} first.,"Prosím, vyberte {0} jako první."
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Text {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,"Prosím, vyberte {0} jako první."
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},Text {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nový kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
 DocType: Stock Entry,Material Receipt,Příjem materiálu
@@ -1367,7 +1379,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Zadejte Party Party a je nutné pro pohledávky / závazky na účtu {0}
 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 +210,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 +213,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 +85,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
@@ -1384,15 +1396,15 @@
 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: Sales Invoice Item,Batch No,Č. šarže
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povoliť viac Predajné objednávky proti Zákazníka Objednávky
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hlavné
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Hlavné
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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: Item,Variants,Varianty
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1405,7 +1417,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Sklad a reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutární info a další obecné informace o váš dodavatel
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresy
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Položka nesmie mať výrobné zákazky.
@@ -1414,10 +1426,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Kreditné Čiastka v mene účtu
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Čas Protokoly pre výrobu.
 DocType: Item,Apply Warehouse-wise Reorder Level,Použít Skladovací-moudrý Seřadit sezn Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} musí být předloženy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} musí být předloženy
 DocType: Authorization Control,Authorization Control,Autorizace Control
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Riadok # {0}: zamietnutie Warehouse je povinná proti zamietnutej bodu {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Time Log pro úkoly.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Splátka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Splátka
 DocType: Production Order Operation,Actual Time and Cost,Skutečný Čas a Náklady
 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},Materiál Žádost maximálně {0} lze k bodu {1} na odběratele {2}
 DocType: Employee,Salutation,Oslovení
@@ -1434,7 +1447,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Spolupracovník
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,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
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Vypršela
 DocType: Packing Slip,To Package No.,Balit No.
 DocType: Warranty Claim,Issue Date,Datum vydání
 DocType: Activity Cost,Activity Cost,Náklady Aktivita
@@ -1472,7 +1484,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dosažená
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territory / Customer
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,napríklad 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Ve slovech budou viditelné, jakmile uložíte prodejní faktury."
 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
@@ -1484,7 +1496,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} vytvoril
 DocType: Delivery Note Item,Against Sales Order,Proti přijaté objednávce
 ,Serial No Status,Serial No Status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Tabulka Položka nemůže být prázdný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Tabulka Položka nemůže být prázdný
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Řádek {0}: Pro nastavení {1} periodicita, rozdíl mezi z a aktuální \
  musí být větší než nebo rovno {2}"
@@ -1494,7 +1506,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Odvody a dane
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Prosím, zadejte Referenční den"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,"Prosím, zadejte Referenční den"
 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} platobné položky nemôžu byť filtrované podľa {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabulka k bodu, který se zobrazí na webových stránkách"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané Množstvo
@@ -1509,7 +1521,7 @@
 DocType: Installation Note,Installation Time,Instalace Time
 DocType: Sales Invoice,Accounting Details,Účtovné Podrobnosti
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Odstráňte všetky transakcie pre túto spoločnosť
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} není dokončen {2} Množství hotových výrobků ve výrobním procesu objednávky # {3}. Prosím aktualizujte provozní stav přes čas protokoly
+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,Row # {0}: Operation {1} není dokončen {2} Množství hotových výrobků ve výrobním procesu objednávky # {3}. Prosím aktualizujte provozní stav přes čas protokoly
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investice
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
 DocType: Quality Inspection Reading,Acceptance Criteria,Kritéria přijetí
@@ -1525,7 +1537,7 @@
 DocType: Holiday List,Clear Table,Clear Table
 DocType: Features Setup,Brands,Značky
 DocType: C-Form Invoice Detail,Invoice No,Faktúra č.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Z vydané objednávky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Z vydané objednávky
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Nechajte nemožno aplikovať / zrušená pred {0}, pretože rovnováha dovolenky už bolo carry-odovzdávané v budúcej pridelenie dovolenku záznamu {1}"
 DocType: Activity Cost,Costing Rate,Kalkulácie Rate
 ,Customer Addresses And Contacts,Adresy zákazníkov a kontakty
@@ -1542,7 +1554,7 @@
 ,Maintenance Schedules,Plány údržby
 ,Quotation Trends,Vývoje ponúk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,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,Přepravní Částka
 ,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
@@ -1559,12 +1571,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Strom finanial účtů.
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Účet {0} musí být typu ""dlouhodobého majetku"", protože položka {1} je majetková položka"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Účet {0} musí být typu ""dlouhodobého majetku"", protože položka {1} je majetková položka"
 DocType: HR Settings,HR Settings,Nastavení HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Úhrada výdajů čeká na schválení. Pouze schalovatel výdajů může aktualizovat stav.
 DocType: Purchase Invoice,Additional Discount Amount,Dodatočná zľava Suma
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Celkem Aktuální
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Jednotka
@@ -1576,6 +1588,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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 se prejavili zmeny."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Nákladové Pohľadávky
 DocType: Issue,Support,Podpora
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Prezrieť košík
 ,BOM Search,BOM Search
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Uzavretie (Otvorenie + súčty)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
@@ -1587,13 +1600,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Datum vůle nemůže být před přihlášením dnem v řadě {0}
 DocType: Salary Slip,Deduction,Dedukce
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Položka Cena pridaný pre {0} v Cenníku {1}
 DocType: Address Template,Address Template,Šablona adresy
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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ů
 DocType: Project,% Tasks Completed,% splnených úloh
 DocType: Project,Gross Margin,Hrubá marža
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,zakázané uživatelské
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,zakázané uživatelské
 DocType: Opportunity,Quotation,Ponuka
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
 DocType: Quotation,Maintenance User,Údržba uživatele
@@ -1602,7 +1616,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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,Zákazník / Iniciatíva Adresa
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
 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
@@ -1612,12 +1626,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic."
 DocType: Expense Claim,Approver,Schvalovatel
 ,SO Qty,SO Množství
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
 DocType: Appraisal,Calculate Total Score,Vypočítat Celková skóre
 DocType: Supplier Quotation,Manufacturing Manager,Výrobní ředitel
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Zásielky
+apps/erpnext/erpnext/hooks.py +69,Shipments,Zásielky
 DocType: Purchase Order Item,To be delivered to customer,Ak chcete byť doručený zákazníkovi
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log Status musí být předloženy.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,"Poradové číslo {0} nepatrí do skladu,"
@@ -1637,10 +1651,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +356,{0} is mandatory for Item {1},{0} je povinná k položke {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} je povinná k položke {1}
 DocType: Currency Exchange,From Currency,Od Měny
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Částky nejsou zohledněny v systému
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Ostatní
@@ -1656,7 +1670,7 @@
 DocType: Quality Inspection,In Process,V procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Sleva
 DocType: Purchase Order Item,Reference Document Type,Referenčná Typ dokumentu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} proti Predajnej Objednávke {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} proti Predajnej Objednávke {1}
 DocType: Account,Fixed Asset,Základní Jmění
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialized Zásoby
 DocType: Activity Type,Default Billing Rate,Predvolené fakturácia Rate
@@ -1666,7 +1680,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Predajné objednávky na platby
 DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Čas Záznamy vytvořil:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,"Prosím, vyberte správny účet"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,"Prosím, vyberte správny účet"
 DocType: Item,Weight UOM,Hmotnostná MJ
 DocType: Employee,Blood Group,Krevní Skupina
 DocType: Purchase Invoice Item,Page Break,Zalomení stránky
@@ -1697,10 +1711,10 @@
 DocType: Time Log,To Time,Chcete-li čas
 DocType: Authorization Rule,Approving Role (above authorized value),Schválenie role (nad oprávnenej hodnoty)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Chcete-li přidat podřízené uzly, prozkoumat stromu a klepněte na položku, pod kterou chcete přidat více uzlů."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
 DocType: Production Order Operation,Completed Qty,Dokončené Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Ceník {0} je zakázána
 DocType: Manufacturing Settings,Allow Overtime,Povoliť Nadčasy
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériové čísla požadované pre položku {1}. Poskytli ste {2}.
@@ -1708,8 +1722,9 @@
 DocType: Item,Customer Item Codes,Zákazník Položka Kódy
 DocType: Opportunity,Lost Reason,Ztracené Důvod
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Vytvořte Platební záznamy proti objednávky nebo faktury.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nová adresa
 DocType: Quality Inspection,Sample Size,Velikost vzorku
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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"
 DocType: Project,External,Externí
@@ -1765,13 +1780,14 @@
 DocType: Rename Tool,Rename Tool,Přejmenování
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Aktualizace Cost
 DocType: Item Reorder,Item Reorder,Položka Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Přenos materiálu
 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."
 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
 DocType: Installation Note,Installation Note,Poznámka k instalaci
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Pridajte dane
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Peňažný tok z finančnej
 ,Financial Analytics,Finanční Analýza
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Dceřiný
@@ -1781,19 +1797,19 @@
 DocType: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Očekávaný zůstatek podle banky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
 DocType: Appraisal,Employee,Zaměstnanec
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importovať e-maily z
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Pozvať ako Užívateľ
 DocType: Features Setup,After Sale Installations,Po prodeji instalací
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} je úplne fakturované
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} je úplne fakturované
 DocType: Workstation Working Hour,End Time,End Time
 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 +75,Group by Voucher,Seskupit podle Poukazu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Sales Invoice,Mass Mailing,Hromadné emaily
 DocType: Rename Tool,File to Rename,Súbor premenovať
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Zobraziť Platby
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,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
@@ -1803,6 +1819,7 @@
 DocType: Selling Settings,Sales Order Required,Prodejní objednávky Povinné
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Vytvořit zákazníka
 DocType: Purchase Invoice,Credit To,Kredit:
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktívny Leads / Zákazníci
 DocType: Employee Education,Post Graduate,Postgraduální
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Plán údržby Detail
 DocType: Quality Inspection Reading,Reading 9,Čtení 9
@@ -1814,6 +1831,7 @@
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Tool,Payment Account,Platební účet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Čistá zmena objemu pohľadávok
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
 DocType: Quality Inspection Reading,Accepted,Přijato
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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äť."
@@ -1821,17 +1839,17 @@
 DocType: Payment Tool,Total Payment Amount,Celková Částka platby
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Nie je možné aktualizovať zásob, faktúra obsahuje pokles lodnej dopravy tovaru."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Ako tam sú existujúce skladové transakcie pre túto položku, \ nemôžete zmeniť hodnoty &quot;Má sériové číslo&quot;, &quot;má Batch Nie&quot;, &quot;Je skladom&quot; a &quot;ocenenie Method&quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Rýchly vstup Journal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Rýchly vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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: 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 +157,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 +211,{0} {1} is not submitted,{0} {1} nie je odoslané
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} nie je odoslané
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
@@ -1844,7 +1862,7 @@
 DocType: Authorization Rule,Authorized Value,Autorizovaný Hodnota
 DocType: Contact,Enter department to which this Contact belongs,"Zadejte útvar, který tento kontaktní patří"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Celkem Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Měrná jednotka
 DocType: Fiscal Year,Year End Date,Dátum konca roka
 DocType: Task Depends On,Task Depends On,Úloha je závislá na
@@ -1870,7 +1888,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 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."
 DocType: Customer Group,Has Child Node,Má děti Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} proti Objednávke {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} proti Objednávke {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Zadejte statické parametry url zde (Např odesílatel = ERPNext, username = ERPNext, password. = 1234 atd.),"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nie je v žiadnom aktívnom Fiškálnom roku. Pre viac informácií pozrite {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
@@ -1918,7 +1936,7 @@
  10. Přidat nebo odečítat: Ať už chcete přidat nebo odečíst daň."
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,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 +477,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 DocType: Tax Rule,Billing City,Fakturácia City
 DocType: Global Defaults,Hide Currency Symbol,Skrýt symbol měny
@@ -1950,6 +1968,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Náklady
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Nad
 DocType: Buying Settings,Default Buying Price List,Výchozí Nákup Ceník
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Žiadny zamestnanec pre vyššie zvolených kritérií alebo výplatnej páske už vytvorili
 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"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Typ platby
@@ -1985,7 +2004,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Riadok {0}: Konverzný faktor MJ je povinný
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Nákladové středisko
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -2008,7 +2027,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Všechny adresy.
 DocType: Company,Stock Settings,Nastavenie Skladu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojenie je možné len vtedy, ak tieto vlastnosti sú rovnaké v oboch záznamoch. Je Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojenie je možné len vtedy, ak tieto vlastnosti sú rovnaké v oboch záznamoch. Je Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Jméno Nového Nákladového Střediska
 DocType: Leave Control Panel,Leave Control Panel,Nechte Ovládací panely
@@ -2028,8 +2047,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Detail platební nástroj
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Celkový Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Upozornenie: Ďalším {0} # {1} existuje proti akciovej vstupu {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Místní
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Upozornenie: Ďalším {0} # {1} existuje proti akciovej vstupu {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Místní
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěrů a půjček (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Veľký
@@ -2048,7 +2067,7 @@
 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.
 DocType: Production Order Operation,Make Time Log,Udělejte si čas Přihlásit
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Prosím nastavte množstvo objednávacie
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Prosím nastavte množstvo objednávacie
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Prosím vytvorte Zákazníka z Obchodnej iniciatívy {0}
 DocType: Price List,Applicable for Countries,Pre krajiny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Počítače
@@ -2108,10 +2127,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Aspon jedna položka by mala byť zadaná s negatívnym množstvo vo vratnom dokumente
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Žádné poznámky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Žádné poznámky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zpožděný
 DocType: Account,Stock Received But Not Billed,Sklad nepřijali Účtovaný
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root účet musí byť skupina
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root účet musí byť skupina
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + nedoplatek Částka + Inkaso Částka - Total Odpočet
 DocType: Monthly Distribution,Distribution Name,Distribuce Name
 DocType: Features Setup,Sales and Purchase,Prodej a nákup
@@ -2125,6 +2144,7 @@
 DocType: Journal Entry Account,Party Balance,Balance Party
 DocType: Sales Invoice Item,Time Log Batch,Time Log Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Prosím, vyberte Použiť Zľava na"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Plat Slip Vytvorené
 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: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
@@ -2132,9 +2152,9 @@
 DocType: Purchase Invoice,Half-yearly,Pololetní
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskální rok {0} nebyl nalezen.
 DocType: Bank Reconciliation,Get Relevant Entries,Získat příslušné zápisy
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Účetní položka na skladě
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 DocType: Purchase Invoice,Apply Additional Discount On,Použiť dodatočné Zľava na
 DocType: Account,Root Type,Root Type
@@ -2143,15 +2163,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Zobrazit tuto prezentaci v horní části stránky
 DocType: BOM,Item UOM,MJ položky
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma dane po zľave Suma (Company meny)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
 DocType: Quality Inspection,Quality Inspection,Kontrola kvality
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL nebo BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Možno vykonať len platbu proti nevyfakturované {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Možno vykonať len platbu proti nevyfakturované {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimální úroveň zásob
 DocType: Stock Entry,Subcontract,Subdodávka
@@ -2189,7 +2209,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Vstupní kontrola jakosti.
 DocType: Purchase Order Item,Returned Qty,Vrátené Množstvo
 DocType: Employee,Exit,Východ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type je povinné
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root Type je povinné
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Pořadové číslo {0} vytvořil
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
 DocType: Employee,You can enter any date manually,Můžete zadat datum ručně
@@ -2197,8 +2217,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Skúšobná doba
 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 +110,Row {0}: Advance against Customer must be credit,Riadok {0}: Advance proti zákazník musí byť úver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Doklad o koupi Item Dodávané
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Platiť
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Platiť
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Chcete-li datetime
 DocType: SMS Settings,SMS Gateway URL,SMS brána URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokoly pre udržanie stavu doručenia sms
@@ -2215,7 +2236,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Změna pořadí Level
 DocType: Attendance,Attendance Date,Účast Datum
 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 +110,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
 DocType: Address,Preferred Shipping Address,Preferovaná dodací adresa
 DocType: Purchase Receipt Item,Accepted Warehouse,Schválené Sklad
 DocType: Bank Reconciliation Detail,Posting Date,Datum zveřejnění
@@ -2233,7 +2254,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
 DocType: Pricing Rule,Discount Percentage,Sleva v procentech
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktúry
-apps/erpnext/erpnext/hooks.py +54,Orders,Objednávky
+apps/erpnext/erpnext/hooks.py +55,Orders,Objednávky
 DocType: Leave Control Panel,Employee Type,Type zaměstnanců
 DocType: Employee Leave Approver,Leave Approver,Nechte schvalovač
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Prevádza jadrový materiál pre Výroba
@@ -2245,7 +2266,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Materiálov fakturovaných proti tejto Predajnej objednávke
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Období Uzávěrka Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Znehodnocení
+DocType: Account,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
 DocType: Customer,Credit Limit,Úvěrový limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vyberte typ transakce
@@ -2270,11 +2291,12 @@
 DocType: Material Request,Requested For,Požadovaných pro
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledovat tento dodacím listu proti jakémukoli projektu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root účet nemůže být smazán
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Čistý peňažný tok z investičnej
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root účet nemůže být smazán
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Zobrazit Stock Příspěvky
 ,Is Primary Address,Je Hlavný adresa
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress sklad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} ze dne {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Správa adries
 DocType: Pricing Rule,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
@@ -2282,7 +2304,7 @@
 DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
 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 +223,Closing (Dr),Uzavření (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Uzavření (Dr)
 DocType: Contact,Passive,Pasivní
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Pořadové číslo {0} není skladem
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Daňové šablona na prodej transakce.
@@ -2298,7 +2320,7 @@
 ,Billed Amount,Fakturovaná částka
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Získať aktualizácie
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Pridať niekoľko ukážkových záznamov
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Nechajte Správa
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Seskupit podle účtu
@@ -2307,14 +2329,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Účet hlavu pod odpovědnosti, ve kterém se bude Zisk / ztráta rezervovali"
 DocType: Payment Tool,Against Vouchers,Proti Poukázky
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Rychlá pomoc
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Prodejní Extras
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} rozpočet pre účet {1} proti nákladovému stredisku {2} prekročí o {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
 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"""
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Hodnota nebo Množství
@@ -2324,9 +2346,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Nechte Block List povolena
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Budete ho používat k přihlášení
 DocType: Sales Partner,Retailer,Maloobchodník
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Pripísať na účet musí byť účtu Súvaha
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Všechny typy Dodavatele
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +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/selling/doctype/sales_order/sales_order.py +93,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
@@ -2370,7 +2392,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
 DocType: Serial No,Is Cancelled,Je zrušené
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje dodávky
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Moje dodávky
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","I když existuje více pravidla pro tvorbu cen s nejvyšší prioritou, pak následující interní priority jsou použity:"
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
@@ -2391,10 +2413,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Volá
 DocType: Project,Total Costing Amount (via Time Logs),Celková kalkulácie Čiastka (cez Time Záznamy)
 DocType: Purchase Order Item Supplied,Stock UOM,Skladová MJ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Plánovaná
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
 DocType: Notification Control,Quotation Message,Správa k ponuke
 DocType: Issue,Opening Date,Datum otevření
 DocType: Journal Entry,Remark,Poznámka
@@ -2407,9 +2429,9 @@
 DocType: Time Log,Batched for Billing,Zarazeno pro fakturaci
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Směnky vznesené dodavately
 DocType: POS Profile,Write Off Account,Odepsat účet
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Čistý peňažný tok z prevádzkovej
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,napríklad DPH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Bod 4
 DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
@@ -2450,7 +2472,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% dodané
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2478,10 +2500,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To je kořen prodejní člověk a nelze upravovat.
 ,Stock Ledger,Reklamní Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Sadzba: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Sadzba: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plat Slip Odpočet
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Vyberte první uzel skupinu.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cíl musí být jedním z {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Cíl musí být jedním z {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Vyplňte formulář a uložte jej
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Stáhněte si zprávu, která obsahuje všechny suroviny s jejich aktuální stav zásob"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
@@ -2519,7 +2541,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než Grand Total
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než 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} nie je platné číslo Šarže pre Položku {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Poznámka: Není-li platba provedena proti jakémukoli rozhodnutí, jak položka deníku ručně."
@@ -2536,13 +2558,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastaviť ako Otvoriť
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Množství nejsou dostupné iv skladu {1} na {2} {3}.
  Dispozici Množství: {4}, transfer Množství: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Položka 3
 DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktný e-mail
 DocType: Sales Team,Contribution (%),Příspěvek (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Zodpovednosť
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Šablona
 DocType: Sales Person,Sales Person Name,Prodej Osoba Name
@@ -2553,20 +2575,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Pred zmierenie
 apps/erpnext/erpnext/support/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 +374,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 +383,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ý
 DocType: Item,Default BOM,Výchozí BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prosím re-typ názov spoločnosti na potvrdenie
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Celkem Vynikající Amt
 DocType: Time Log Batch,Total Hours,Celkem hodin
 DocType: Journal Entry,Printing Settings,Nastavenie tlače
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilový
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Z Dodacího Listu
 DocType: Time Log,From Time,Času od
 DocType: Notification Control,Custom Message,Custom Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investiční bankovnictví
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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
 DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rate
 DocType: Purchase Invoice Item,Rate,Sadzba
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Internovat
@@ -2585,9 +2607,10 @@
  konflikt přiřazením prioritu. Cena Pravidla: {0}"
 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 +580,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Vydání Material
 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,Citácie
 DocType: Hub Settings,Access Token,Přístupový Token
 DocType: Sales Invoice Item,Serial No,Výrobní číslo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
@@ -2601,10 +2624,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maximálna suma faktúry
 DocType: Purchase Invoice Item,Image View,Image View
 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 +553,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čítat založené na
 DocType: Delivery Note Item,From Warehouse,Zo skladu
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
@@ -2612,6 +2637,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tento bod je varianta {0} (šablony). Atributy budou zkopírovány z šablony, pokud je nastaveno ""No Copy"""
 DocType: Account,Purchase User,Nákup Uživatel
 DocType: Notification Control,Customize the Notification,Přizpůsobit oznámení
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cash flow z prevádzkových činností
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
 DocType: Sales Invoice,Shipping Rule,Přepravní Pravidlo
 DocType: Journal Entry,Print Heading,Tisk záhlaví
@@ -2622,7 +2648,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledovat e-mailem
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Prosím, vyberte najprv Dátum zverejnenia"
@@ -2640,6 +2666,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Přidat do košíku
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Seskupit podle
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Povolit / zakázat měny.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštovní náklady
@@ -2647,30 +2674,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Datum, ke kterému se opakující objednávka bude zastaví"
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí byť znížený o {1} alebo by ste mali zvýšiť toleranciu presahu
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí byť znížený o {1} alebo by ste mali zvýšiť toleranciu presahu
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Celkem Present
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Hodina
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
  pomocí Reklamní Odsouhlasení"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Preneste materiál Dodávateľovi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Preneste materiál Dodávateľovi
 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,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Vytvoriť Ponuku
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Nie ste oprávnení schvaľovať lístie na bloku Termíny
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
 DocType: BOM Replace Tool,The new BOM after replacement,Nový BOM po výměně
 DocType: Features Setup,Point of Sale,Místo Prodeje
 DocType: Account,Tax,Daň
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Řádek {0}: {1} není platný {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle tovar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Od Bundle tovar
 DocType: Production Planning Tool,Production Planning Tool,Plánování výroby Tool
 DocType: Quality Inspection,Report Date,Datum Reportu
 DocType: C-Form,Invoices,Faktúry
 DocType: Job Opening,Job Title,Název pozice
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} príjemcov
 DocType: Features Setup,Item Groups in Details,Položka skupiny v detailech
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Množstvo, ktoré má výroba musí byť väčšia ako 0 ° C."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -2678,8 +2704,9 @@
 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.,"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: Pricing Rule,Customer Group,Zákazník Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: Item,Website Description,Popis webu
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Čistá zmena vo vlastnom imaní
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
 ,Sales Register,Sales Register
 DocType: Quotation,Quotation Lost Reason,Dôvod neúspešnej ponuky
@@ -2687,12 +2714,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Zhrnutie pre tento mesiac a prebiehajúcim činnostiam
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Atribúty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Získat položky
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Získat položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Posledná Dátum objednávky
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Proveďte Spotřební faktury
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Účet {0} nie je patria spoločnosti {1}
@@ -2708,7 +2735,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
 DocType: Project,Expected End Date,Očekávané datum ukončení
 DocType: Appraisal Template,Appraisal Template Title,Posouzení Template Název
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Obchodní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Obchodní
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmie byť skladom
 DocType: Cost Center,Distribution Id,Distribuce Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
@@ -2721,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Pomer atribút {0} musí byť v rozmedzí od {1} až {2} v krokoch po {3}
 DocType: Tax Rule,Sales,Prodej
 DocType: Stock Entry Detail,Basic Amount,Základná čiastka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Výchozí pohledávka účty
@@ -2733,16 +2760,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Příjmky
-DocType: Payment Reconciliation,Maximum Amount,Maximální částka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Jak Ceny pravidlo platí?
 DocType: Quality Inspection,Delivery Note No,Dodacího listu
 DocType: Company,Retail,Maloobchodní
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Zákazník {0} neexistuje
 DocType: Attendance,Absent,Nepřítomný
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle Product
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Riadok {0}: Neplatné referencie {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Riadok {0}: Neplatné referencie {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kúpte Dane a poplatky šablóny
 DocType: Upload Attendance,Download Template,Stáhnout šablonu
 DocType: GL Entry,Remarks,Poznámky
@@ -2769,7 +2796,7 @@
 ,Monthly Attendance Sheet,Měsíční Účast Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nebyl nalezen žádný záznam
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové stredisko je povinné pre položku {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Získať predmety z Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Získať predmety z Bundle Product
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Účet {0} je neaktivní
 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á
@@ -2778,8 +2805,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Výkaz zisku a straty"" typ účtu {0} nie je privilegovaný pre Sprístupnenie Údajov"
 DocType: Features Setup,Sales Discounts,Prodejní Slevy
 DocType: Hub Settings,Seller Country,Prodejce Country
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publikovať položky na webových stránkach
 DocType: Authorization Rule,Authorization Rule,Autorizační pravidlo
 DocType: Sales Invoice,Terms and Conditions Details,Podmínky podrobnosti
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Specifikace
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Predaj Dane a poplatky šablóny
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Číslo objednávky
@@ -2801,7 +2830,7 @@
 DocType: Time Log,Billing Amount,Fakturácia Suma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Neplatný množství uvedené na položku {0}. Množství by mělo být větší než 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Žádosti o dovolenou.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Výdaje na právní služby
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto objednávka bude generován například 05, 28 atd"
 DocType: Sales Invoice,Posting Time,Čas zadání
@@ -2817,11 +2846,11 @@
 DocType: Maintenance Visit,Breakdown,Rozbor
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Účet: {0} s menou: {1} nemožno vybrať
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Úspešne vypúšťa všetky transakcie súvisiace s týmto spoločnosti!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Rovnako ako u Date
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Zkouška
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto vložka Cenník miera, ak chýba"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Celkem uhrazené částky
@@ -2833,6 +2862,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Celkom Billing Suma (cez Time Záznamy)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Táto položka je na predaj
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dodavatel Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Množstvo by mala byť väčšia ako 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt Popis
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Typ ponechává jako neformální, nevolnosti atd."
@@ -2841,7 +2871,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Přidat řádky stanovit roční rozpočty na účtech.
 DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
 DocType: Production Order,Total Operating Cost,Celkové provozní náklady
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Všechny kontakty.
 DocType: Newsletter,Test Email Id,Testovací Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Zkratka Company
@@ -2866,7 +2896,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Daňová šablóna je povinné.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Dočasný
 DocType: Address,Preferred Billing Address,Preferovaná Fakturační Adresa
@@ -2884,8 +2914,8 @@
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zastavený
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} je zastavený
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
 DocType: Lead,Add to calendar on this date,Přidat do kalendáře k tomuto datu
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Pripravované akcie
@@ -2906,24 +2936,24 @@
 DocType: Customer,From Lead,Od Obchodnej iniciatívy
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
 DocType: Hub Settings,Name Token,Jméno Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standardní prodejní
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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ý
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Replace Tool,Replace,Vyměnit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} proti Predajnej Faktúre {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} proti Predajnej Faktúre {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
 DocType: Purchase Invoice Item,Project Name,Název projektu
 DocType: Supplier,Mention if non-standard receivable account,Zmienka v prípade neštandardnej pohľadávky účet
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
 DocType: Features Setup,Item Batch Nos,Položka Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Reklamní Value Rozdíl
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Ľudské Zdroje
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Daňové Aktiva
 DocType: BOM Item,BOM No,BOM No
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Klouzavý průměr
 DocType: BOM Replace Tool,The BOM which will be replaced,"BOM, který bude nahrazen"
 DocType: Account,Debit,Debet
@@ -2960,7 +2990,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatočné náklady
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Finanční rok Datum ukončení
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Vytvořit nabídku dodavatele
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Vytvořit nabídku dodavatele
 DocType: Quality Inspection,Incoming,Přicházející
 DocType: BOM,Materials Required (Exploded),Potřebný materiál (Rozložený)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Snížit Zisk na vstup bez nároku na mzdu (LWP)
@@ -2968,7 +2998,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Riadok # {0}: Výrobné číslo {1} nezodpovedá {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Šarže ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Poznámka: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Tento týždeň Zhrnutie
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} musí byť Kúpená, alebo Subdodávateľská položka v riadku {1}"
@@ -2983,6 +3013,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Task,Actual Time (in Hours),Skutočná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Množstvo celkovej emisii / prenosu {0} v hmotnej Request {1} nemôže byť väčšia ako množstvo požadované v {2} pre položku {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Spravodajcu
 DocType: Address,Shipping,Lodní
 DocType: Stock Ledger Entry,Stock Ledger Entry,Reklamní Ledger Entry
@@ -3002,7 +3033,6 @@
 DocType: Purchase Order,End date of current order's period,Datum ukončení doby aktuální objednávky
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Vytvorte ponuku Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Spiatočná
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Východzí merná jednotka varianty musia byť rovnaké ako šablónu
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
 DocType: Project Task,Pending Review,Čeká Review
@@ -3010,7 +3040,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Zákazník Id
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Ak chcete čas musí byť väčší ako From Time
 DocType: Journal Entry Account,Exchange Rate,Výmenný kurz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
 DocType: BOM,Last Purchase Rate,Last Cena při platbě
 DocType: Account,Asset,Majetek
@@ -3030,7 +3060,7 @@
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 DocType: Item Variant,Item Variant,Variant Položky
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Nastavení Tato adresa šablonu jako výchozí, protože není jiná výchozí"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Řízení kvality
 DocType: Production Planning Tool,Filter based on customer,Filtr dle zákazníka
 DocType: Payment Tool Detail,Against Voucher No,Proti poukaz č
@@ -3047,6 +3077,7 @@
 DocType: Opportunity,Next Contact,Nasledujúce Kontakt
 DocType: Employee,Employment Type,Typ zaměstnání
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dlouhodobý majetek
+,Cash Flow,Cash Flow
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Obdobie podávania žiadostí nemôže byť na dvoch alokácie záznamy
 DocType: Item Group,Default Expense Account,Výchozí výdajového účtu
 DocType: Employee,Notice (days),Oznámení (dny)
@@ -3078,13 +3109,12 @@
 DocType: Production Order,Warehouses,Sklady
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print a Stacionární
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
-DocType: Payment Reconciliation,Minimum Amount,Minimální částka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Dokončení aktualizace zboží
 DocType: Workstation,per hour,za hodinu
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Účet pro skladu (průběžné inventarizace), bude vytvořena v rámci tohoto účtu."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
 DocType: Company,Distribution,Distribuce
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zaplacené částky
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Zaplacené částky
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
@@ -3108,7 +3138,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Společnost chybí ve skladech {0}
 DocType: POS Profile,Terms and Conditions,Podmínky
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Chcete-li data by měla být v rámci fiskálního roku. Za předpokladu, že To Date = {0}"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},"Chcete-li data by měla být v rámci fiskálního roku. Za předpokladu, že To Date = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Zde si můžete udržet výšku, váhu, alergie, zdravotní problémy atd"
 DocType: Leave Block List,Applies to Company,Platí pre firmu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
@@ -3122,11 +3152,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Prosím, zadejte Nákup Příjmy"
 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 +425,Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Nastavenie serveru prichádzajúcej pošty pre email podpory. (Napríklad podpora@priklad.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,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 +577,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
 DocType: Salary Slip,Salary Slip,Plat Slip
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Datum Do"" je povinný"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generování balení pásky pro obaly mají být dodány. Používá se k oznámit číslo balíku, obsah balení a jeho hmotnost."
@@ -3215,7 +3245,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Zaměstnanecké záznamy.
 DocType: HR Settings,Payroll Settings,Nastavení Mzdové
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Objednať
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Objednať
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root nemůže mít rodič nákladové středisko
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Select Brand ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Použitelné
@@ -3230,7 +3260,7 @@
 DocType: Appraisal,Start Date,Datum zahájení
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Přidělit listy dobu.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Kliknite tu pre overenie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
 DocType: Purchase Invoice Item,Price List Rate,Ceník Rate
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Zobrazit ""Skladem"" nebo ""Není skladem"" na základě skladem k dispozici v tomto skladu."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
@@ -3239,17 +3269,17 @@
 DocType: Project,Expected Start Date,Očekávané datum zahájení
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Odebrat pokud poplatků není pro tuto položku
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Príjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Príjem
 DocType: Maintenance Visit,Fully Completed,Plně Dokončeno
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Hotovo
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} bol úspešne pridaný do nášho zoznamu noviniek.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +136,Main Reports,Hlavné správy
 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
@@ -3267,7 +3297,7 @@
 DocType: Industry Type,Industry Type,Typ Průmyslu
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Něco se pokazilo!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Dokončení Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Částka (Měna Společnosti)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizace jednotka (departement) master.
@@ -3286,10 +3316,10 @@
 ,Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti
 DocType: Item,Unit of Measure Conversion,Jednotka miery konverzie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaměstnanec nemůže být změněn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,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.
 DocType: Naming Series,Help HTML,Nápověda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,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/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Meno osoby alebo organizácie, ktorej patrí táto adresa."
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Vaši Dodávatelia
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
@@ -3302,35 +3332,35 @@
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Riadok # {0}: Nastavte Dodávateľ pre položku {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Prosím, skontrolujte viac mien možnosť povoliť účty s inú menu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,"Prosím, skontrolujte viac mien možnosť povoliť účty s inú menu"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
+DocType: Payment Reconciliation,From Invoice Date,Z faktúry Dátum
 DocType: Cost Center,Budgets,Rozpočty
-DocType: Employee,Emergency Contact Details,Nouzové kontaktní údaje
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Čo to robí?
 DocType: Delivery Note,To Warehouse,Do skladu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Účet {0} byl zadán více než jednou za fiskální rok {1}
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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/hr/doctype/attendance/attendance.py +34,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
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Aktualizace dodatečné náklady pro výpočet vyložené náklady položek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrický
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Riadok {0}: Exchange Rate je povinné
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Riadok {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}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od reklamačnímu
 DocType: Stock Entry,Default Source Warehouse,Výchozí zdroj Warehouse
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Narozeninová připomínka pro {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Počet dnů od poslední objednávky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
 DocType: Buying Settings,Naming Series,Číselné řady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
@@ -3343,7 +3373,7 @@
 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
 DocType: Authorization Rule,Based On,Založeno na
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Položka {0} je zakázaná
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Položka {0} je zakázaná
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},"Obdobie od a obdobia, k dátam povinné pre opakované {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektová činnost / úkol.
@@ -3351,7 +3381,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odpísať Suma (Company meny)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Prosím nastavte {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Opakujte na den v měsíci
@@ -3381,12 +3411,12 @@
 DocType: Upload Attendance,Upload Attendance,Nahrát Návštěvnost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM a výroba množstva sú povinné
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Částka
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Částka
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nahradil
 ,Sales Analytics,Prodejní Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Nastavenia Výroby
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Nastavenia pre e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
 DocType: Stock Entry Detail,Stock Entry Detail,Reklamní Entry Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Denná Upomienky
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Daňové Pravidlo Konflikty s {0}
@@ -3412,13 +3442,13 @@
 DocType: Sales Order Item,Produced Quantity,Produkoval Množství
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inženýr
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Vyhľadávanie Sub Assemblies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Aktuální
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
 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 +263,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
 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í
@@ -3430,15 +3460,15 @@
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
 DocType: Employee,Cheque,Šek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Řada Aktualizováno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Report Type je povinné
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
 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/public/js/setup_wizard.js +101,The First User: You,První Uživatel: Vy
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Úspěšně smířeni
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Úspěšně smířeni
 DocType: Production Order,Planned End Date,Plánované datum ukončení
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,"Tam, kde jsou uloženy předměty."
 DocType: Tax Rule,Validity,Platnosť
@@ -3446,7 +3476,7 @@
 DocType: Attendance,Attendance,Účast
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Datum a čas zadání je povinný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Datum a čas zadání je povinný
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
 ,Item Prices,Ceny Položek
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Ve slovech budou viditelné, jakmile uložíte objednávce."
@@ -3455,15 +3485,15 @@
 DocType: Task,Review Date,Review Datum
 DocType: Purchase Invoice,Advance Payments,Zálohové platby
 DocType: Purchase Taxes and Charges,On Net Total,On Net Celkem
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,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
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pre oznámenie"" nie sú uvedené pre odpovedanie %s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Mena nemôže byť zmenený po vykonaní položky pomocou inej mene
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Zaokrúhliť účet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativní náklady
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Zmena
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Zmena
 DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","napríklad ""Moja spoločnosť LLC """
@@ -3473,13 +3503,13 @@
 DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnosť MJ
 DocType: Email Digest,Receivables / Payables,Pohledávky / Závazky
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodejní faktuře
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Úverový účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Úverový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Ukázat nulové hodnoty
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Množství položky získané po výrobě / přebalení z daných množství surovin
 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 +562,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 DocType: Task,Actual End Date (via Time Logs),Skutočné Dátum ukončenia (cez Time Záznamy)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Rozpočet nemôže byť priradená na skupinový účet {0}
@@ -3515,29 +3545,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Naplánujte čas protokoly mimo Workstation pracovných hodín.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} už bolo odoslané
 ,Items To Be Requested,Položky se budou vyžadovat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Účtovaná sadzba založená na typ aktivity (za hodinu)
 DocType: Company,Company Info,Informácie o spoločnosti
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 DocType: Production Planning Tool,Filter based on item,Filtr dle položek
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Debetné účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debetné účet
 DocType: Fiscal Year,Year Start Date,Dátom začiatku roka
 DocType: Attendance,Employee Name,Jméno zaměstnance
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaoblený Total (Company Měna)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
 DocType: Purchase Common,Purchase Common,Nákup Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} bol zmenený. Prosím aktualizujte.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Od Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Zamestnanecké benefity
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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í
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množství
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Směnky vznesené zákazníkům.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} odberateľov pridaných
 DocType: Maintenance Schedule,Schedule,Plán
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definovať rozpočtu pre tento nákladového strediska. Ak chcete nastaviť rozpočet akcie, pozri &quot;Zoznam firiem&quot;"
@@ -3545,7 +3576,7 @@
 DocType: Quality Inspection Reading,Reading 3,Čtení 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Expense Claim,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
@@ -3559,7 +3590,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Zápisy v účetním deníku.
 DocType: Delivery Note Item,Available Qty at From Warehouse,K dispozícii Množstvo na Od Warehouse
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Prosím, vyberte zamestnanca záznam prvý."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riadok {0}: Party / Account nezhoduje s {1} / {2} do {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riadok {0}: Party / Account nezhoduje s {1} / {2} do {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Chcete-li vytvořit daňovém účtu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
 DocType: Account,Stock,Sklad
@@ -3570,7 +3601,7 @@
 DocType: Employee,Contract End Date,Smlouva Datum ukončení
 DocType: Sales Order,Track this Sales Order against any Project,Sledovat tento prodejní objednávky na jakýkoli projekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodejní Pull zakázky (čeká dodat), na základě výše uvedených kritérií"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Z ponuky dodávateľa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Z ponuky dodávateľa
 DocType: Deduction Type,Deduction Type,Odpočet Type
 DocType: Attendance,Half Day,Půl den
 DocType: Pricing Rule,Min Qty,Min Množství
@@ -3578,7 +3609,7 @@
 DocType: GL Entry,Transaction Date,Transakce Datum
 DocType: Production Plan Item,Planned Qty,Plánované Množství
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Tax
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Pre Množstvo (Vyrobené ks) je povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Pre Množstvo (Vyrobené ks) je povinné
 DocType: Stock Entry,Default Target Warehouse,Výchozí Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riadok {0}: Typ Party Party a je použiteľná len proti pohľadávky / záväzky účtu
@@ -3632,9 +3663,9 @@
 DocType: Customer,Commission Rate,Výše provize
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Vytvoriť Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Košík je prázdny
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košík je prázdny
 DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root nelze upravovat.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root nelze upravovat.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Přidělená částka nemůže vyšší než částka unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Povolit Výrobu při dovolené
 DocType: Sales Order,Customer's Purchase Order Date,Zákazníka Objednávka Datum
@@ -3645,11 +3676,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Návrhář
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatické vytvorenie Materiál žiadosti, pokiaľ množstvo klesne pod túto úroveň"
 ,Item-wise Purchase Register,Item-moudrý Nákup Register
 DocType: Batch,Expiry Date,Datum vypršení platnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Ak chcete nastaviť úroveň objednávacie, položka musí byť Nákup položka alebo výrobné položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Ak chcete nastaviť úroveň objednávacie, položka musí byť Nákup položka alebo výrobné položky"
 ,Supplier Addresses and Contacts,Dodavatel Adresy a kontakty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Nejdřív vyberte kategorii
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Master Project.
@@ -3657,7 +3688,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Pol dňa)
 DocType: Supplier,Credit Days,Úvěrové dny
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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,Lead Time Days
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Kusovník
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riadok {0}: Typ Party Party a je nutné pre pohľadávky / záväzky na účte {1}
@@ -3665,7 +3696,7 @@
 DocType: Employee,Reason for Leaving,Důvod Leaving
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
 DocType: GL Entry,Is Opening,Se otevírá
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Účet {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Účet {0} neexistuje
 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 8f86bd6..2a08763 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Izberite Party Vrsta najprej
 DocType: Item,Customer Items,Točke strank
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Račun {0}: Matično račun {1} ne more biti knjiga
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Račun {0}: Matično račun {1} ne more biti knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavite element na hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-poštna obvestila
 DocType: Item,Default Unit of Measure,Privzeto mersko enoto
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potrebna za tečajnico {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bo izračunana v transakciji.
 DocType: Purchase Order,Customer Contact,Stranka Kontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Od Material zahtevo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Od Material zahtevo
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Predlagatelj
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ni več zadetkov.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Da bi ohranili stranke pametno Koda in da bi jim iskanje, ki temelji na njihovi kode uporabite to možnost"
 DocType: Mode of Payment Account,Mode of Payment Account,Način plačilnega računa
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Prikaži Variante
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Količina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Posojili (obveznosti)
 DocType: Employee Education,Year of Passing,"Leto, ki poteka"
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na zalogi
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Skrb za zdravje
 DocType: Purchase Invoice,Monthly,Mesečni
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Zamuda pri plačilu (dnevi)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Račun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Račun
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Email naslov
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Poslovno leto {0} je potrebno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obramba
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Ocena (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Vrstica {0}: {1} {2} ne ujema s {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Vrstica {0}: {1} {2} ne ujema s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Vrstica # {0}:
 DocType: Delivery Note,Vehicle No,Nobeno vozilo
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Izberite Cenik
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Izberite Cenik
 DocType: Production Order Operation,Work In Progress,V razvoju
 DocType: Employee,Holiday List,Holiday Seznam
 DocType: Time Log,Time Log,Čas Log
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista družba je vpisana več kot enkrat
 DocType: Employee,Married,Poročen
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ni dovoljeno za {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
-DocType: Payment Reconciliation,Reconcile,Uskladite
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
+DocType: Payment Reconciliation,Reconcile,Uskladitev
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina z živili
 DocType: Quality Inspection Reading,Reading 1,Branje 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Naredite Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pokojninski skladi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Skladišče je obvezna, če tip račun skladišče"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,"Skladišče je obvezna, če tip račun skladišče"
 DocType: SMS Center,All Sales Person,Vse Sales oseba
 DocType: Lead,Person Name,Ime oseba
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Preverite, če ponavljajoče se naročilo, počistite ustaviti ponavljajoče se ali dati ustrezno End Date"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Zanima
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Kosovnica
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvoritev
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopiranje iz postavke skupine
 DocType: Journal Entry,Opening Entry,Otvoritev Začetek
 DocType: Stock Entry,Additional Costs,Dodatni stroški
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Račun z obstoječim poslom ni mogoče pretvoriti v skupini.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Račun z obstoječim poslom ni mogoče pretvoriti v skupini.
 DocType: Lead,Product Enquiry,Povpraševanje izdelek
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Prosimo, da najprej vnesete podjetje"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Prosimo, izberite Company najprej"
 DocType: Employee Education,Under Graduate,Pod Graduate
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Ciljna Na
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Ciljna Na
 DocType: BOM,Total Cost,Skupni stroški
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dnevnik aktivnosti:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Element {0} ne obstaja v sistemu ali je potekla
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Postavka {0} mora biti Nakup postavka
 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 +444,Item {0} is not active or end of life has been reached,Postavka {0} ni aktiven ali je bil dosežen konec življenja
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,Postavka {0} ni aktiven ali je bil dosežen konec življenja
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bo treba posodobiti po Sales predložen račun.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Nastavitve za HR modula
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Podrobnosti o poslovanju izvajajo.
 DocType: Serial No,Maintenance Status,Status vzdrževanje
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Predmeti in Pricing
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma mora biti v poslovnem letu. Ob predpostavki Od datuma = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma mora biti v poslovnem letu. Ob predpostavki Od datuma = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Izberite zaposlenega, za katerega ste ustvarili cenitve."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Stalo Center {0} ne pripada družbi {1}
 DocType: Customer,Individual,Individualno
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Neto denarni tokovi pri financiranju
 DocType: Lead,Address & Contact,Naslov in kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neuporabljene liste iz prejšnjih dodelitev
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Naslednja Ponavljajoči {0} se bo ustvaril na {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Kontaktno ime
 DocType: Production Plan Item,SO Pending Qty,SO Do Kol
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ustvari plačilni list za zgoraj omenjenih kriterijev.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Opis ni dana
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zaprosi za nakup.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Lajšanje Datum mora biti večja od Datum pridružitve
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Element Spletna stran Specifikacija
 DocType: Payment Tool,Reference No,Referenčna številka
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Pustite blokiranih
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Letno
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sprava Postavka
 DocType: Stock Entry,Sales Invoice No,Prodaja Račun Ne
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Dobavitelj Type
 DocType: Item,Publish in Hub,Objavite v Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Postavka {0} je odpovedan
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Postavka {0} je odpovedan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Material Zahteva
 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 +321,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}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Razmerje
 DocType: Shipping Rule,Worldwide Shipping,Dostava po celem svetu
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potrjeni naročila od strank.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Predlogi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Postavka proračuni Skupina pametno na tem ozemlju. Lahko tudi sezonske z nastavitvijo Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Vnesite matično skupino računa za skladišče {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plačilo pred {0} {1} ne sme biti večja od neporavnanega zneska {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plačilo pred {0} {1} ne sme biti večja od neporavnanega zneska {2}
 DocType: Supplier,Address HTML,Naslov HTML
 DocType: Lead,Mobile No.,Mobilni No.
 DocType: Maintenance Schedule,Generate Schedule,Ustvarjajo Urnik
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Zadnje
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 znakov
 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"
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Naučite
 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
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Upravljanje prodaje oseba drevo.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Račun Type
 DocType: Sales Invoice Item,Delivery Note,Poročilo o dostavi
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Postavitev Davki
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Postavitev Davki
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Povzetek za ta teden in ki potekajo dejavnosti
 DocType: Workstation,Rent Cost,Najem Stroški
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Prosimo, izberite mesec in leto"
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Na voljo v BOM, dobavnica, računu o nakupu, proizvodnje reda, narocilo, Potrdilo o nakupu, prodajni fakturi, Sales Order, Stock vstopu, Timesheet"
 DocType: Item Tax,Tax Rate,Davčna stopnja
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Izberite Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Izberite Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Postavka: {0} je uspelo šaržno, ni mogoče uskladiti z uporabo \ zaloge sprave, namesto tega uporabite zaloge Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,"Pretvarjanje, da non-Group"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Potrdilo o nakupu je treba predložiti
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medical
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog za izgubo
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zaprt na naslednje datume kot na Holiday Seznam: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Priložnosti
 DocType: Employee,Single,Samski
 DocType: Issue,Attachment,Attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Proračun ni mogoče nastaviti za stroškovno mesto skupine
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,Holiday gospodar.
 DocType: Material Request Item,Required Date,Zahtevani Datum
 DocType: Delivery Note,Billing Address,Naslov za pošiljanje računa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Vnesite Koda.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Vnesite Koda.
 DocType: BOM,Costing,Stanejo
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Če je omogočeno, se bo štela za znesek davka, kot je že vključena v Print Oceni / Print Znesek"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Skupaj Kol
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Zaporedna številka Garancija preteka
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Postavka {0} ni Nakup Item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Postavka {0} ni Nakup Item
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} je neveljaven e-poštni naslov v &quot;Obvestilo \ e-poštni naslov &#39;
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Skupaj plačevanja To leto:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / Uredi davkov in dajatev
 DocType: Purchase Invoice,Supplier Invoice No,Dobavitelj Račun Ne
 DocType: Territory,For reference,Za sklic
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Zapiranje (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Zapiranje (Cr)
 DocType: Serial No,Warranty Period (Days),Garancijski rok (dni)
 DocType: Installation Note Item,Installation Note Item,Namestitev Opomba Postavka
 ,Pending Qty,Pending Kol
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Mesečni Distribution ** vam pomaga pri razporejanju proračuna po mesecih, če imate sezonskost v vašem podjetju. Distribuirati proračun z uporabo te distribucije, nastavite to ** mesečnim izplačilom ** v ** Center stroškov **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Ni najdenih v tabeli računa zapisov
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Ni najdenih v tabeli računa zapisov
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Izberite podjetja in Zabava Vrsta najprej
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finančni / računovodstvo leto.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Oprostite, Serijska št ni mogoče združiti"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Svinec Id
 DocType: C-Form Invoice Detail,Grand Total,Skupna vsota
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskalna Leto Datum začetka ne sme biti večja od poslovnega leta End Datum
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskalna Leto Datum začetka ne sme biti večja od poslovnega leta End Datum
 DocType: Warranty Claim,Resolution,Ločljivost
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dobava: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Dobava: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Plačljivo račun
 DocType: Sales Order,Billing and Delivery Status,Zaračunavanje in Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Stranke
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,Kotacija Da
 DocType: Lead,Middle Income,Bližnji Prihodki
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Odprtino (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Dodeljen znesek ne more biti negativna
 DocType: Purchase Order Item,Billed Amt,Bremenjenega Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logično Warehouse, zoper katerega so narejeni vnosov zalog."
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Proizvodnja naročilo je Obvezno
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Predlog Pisanje
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativno Stock Error ({6}) za postavko {0} v skladišču {1} na {2} {3} v {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativno Stock Error ({6}) za postavko {0} v skladišču {1} na {2} {3} v {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna Leto Company
 DocType: Packing Slip Item,DN Detail,DN Detail
 DocType: Time Log,Billed,Zaračunavajo
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,Privzeto Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Vzdrževanje Urnik
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Potem Označevanje cen Pravila se filtrirajo temeljijo na stranke, skupine kupcev, ozemlje, dobavitelja, dobavitelj Type, kampanje, prodajnemu partnerju itd"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Neto sprememba v popisu
 DocType: Employee,Passport Number,Številka potnega lista
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Od Potrdilo o nakupu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Enako postavka je bila vpisana večkrat.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Od Potrdilo o nakupu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Enako postavka je bila vpisana večkrat.
 DocType: SMS Settings,Receiver Parameter,Sprejemnik Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"&quot;Na podlagi&quot; in &quot;skupina, ki jo&quot; ne more biti enaka"
 DocType: Sales Person,Sales Person Targets,Prodaja Osebni cilji
 DocType: Production Order Operation,In minutes,V minutah
 DocType: Issue,Resolution Date,Resolucija Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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}"
 DocType: Selling Settings,Customer Naming By,Stranka Imenovanje Z
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Pretvarjanje skupini
 DocType: Activity Cost,Activity Type,Vrsta dejavnosti
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Založništvo
 DocType: Activity Cost,Projects User,Projekti Uporabnik
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Porabljeno
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} ni mogoče najti v računa Podrobnosti tabeli
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} ni mogoče najti v računa Podrobnosti tabeli
 DocType: Company,Round Off Cost Center,Zaokrožijo stroškovni center
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vzdrževanje obisk {0} je treba odpovedati pred preklicem te Sales Order
 DocType: Material Request,Material Transfer,Prenos materialov
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Trženje
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Slediti element pri prodaji in nakupu listin, ki temelji na njihovih serijskih nos. To je mogoče uporabiti tudi za sledenje podrobnosti garancijske izdelka."
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutna zaloga
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Zavrnjeno Skladišče je obvezna proti regected postavki
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Skupaj obračun letos
 DocType: Account,Expenses Included In Valuation,Stroški Vključeno v vrednotenju
 DocType: Employee,Provide email id registered in company,"Zagotovite email id, registrirano v družbi"
 DocType: Hub Settings,Seller City,Prodajalec Mesto
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Element ima variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Element ima variante.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0} ni zaloge Item
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ni zaloge Item
 DocType: Mode of Payment Account,Default Account,Privzeti račun
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,"Prosimo, izberite tedensko off dan"
 DocType: Production Order Operation,Planned End Time,Načrtovano Končni čas
 ,Sales Person Target Variance Item Group-Wise,Prodaja Oseba Target Varianca Postavka Group-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Račun z obstoječim poslom ni mogoče pretvoriti v knjigo terjatev
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Račun z obstoječim poslom ni mogoče pretvoriti v knjigo terjatev
 DocType: Delivery Note,Customer's Purchase Order No,Stranke Naročilo Ne
 DocType: Employee,Cell Number,Število celic
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Material Zahteve Izdelano
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Lost
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Ne, ne more vstopiti trenutno bon v &quot;Proti listu vstopa&quot; stolpcu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"Ne, ne more vstopiti trenutno bon v &quot;Proti listu vstopa&quot; stolpcu"
 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 +33,Monthly salary statement.,Mesečno poročilo o izplačanih plačah.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} tipa {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Vknjižbe se lahko izvede pred listnimi vozlišč. Vpisi zoper skupin niso dovoljeni.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Potrdilo o nakupu številka potreben za postavko {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Potrdilo o nakupu številka potreben za postavko {0}
 DocType: Item Attribute Value,Item Attribute Value,Postavka Lastnost Vrednost
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodajne akcije.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Cenik ni izbrana
 DocType: Employee,Family Background,Družina Ozadje
 DocType: Process Payroll,Send Email,Pošlji e-pošto
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ne Dovoljenje
 DocType: Company,Default Bank Account,Privzeti bančni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Za filtriranje, ki temelji na stranke, da izberete Party Vnesite prvi"
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Postavke z višjo weightage bo prikazan višje
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Sprava Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Moji računi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Moji računi
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Najdenih ni delavec
 DocType: Purchase Order,Stopped,Ustavljen
 DocType: Item,If subcontracted to a vendor,Če podizvajanje prodajalca
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošlji Zdaj
 ,Support Analytics,Podpora Analytics
 DocType: Item,Website Warehouse,Spletna stran Skladišče
+DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalna Znesek računa
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Zapisi C-Form
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Da bi omogočili &quot;prodajno mesto&quot; funkcije
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Izberite Items
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} proti Bill {1} dne {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} proti Bill {1} dne {2}
 DocType: Maintenance Visit,Completion Status,Zaključek Status
 DocType: Sales Invoice Item,Target Warehouse,Ciljna Skladišče
 DocType: Item,Allow over delivery or receipt upto this percent,Dovoli nad dostavo ali prejem upto tem odstotkov
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Samodejno sestavite sporočilo o predložitvi transakcij.
 DocType: Production Order,Item To Manufacture,Postavka za izdelavo
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Nakup naročila do plačila
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Nakup naročila do plačila
 DocType: Sales Order Item,Projected Qty,Predvidoma Kol
 DocType: Sales Invoice,Payment Due Date,Plačilo Zaradi Datum
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
@@ -704,7 +709,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Prodajno mesto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje na računu že v kreditu, ki vam ni dovoljeno, da nastavite &quot;Stanje mora biti&quot; kot &quot;bremenitev&quot;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje na računu že v kreditu, ki vam ni dovoljeno, da nastavite &quot;Stanje mora biti&quot; kot &quot;bremenitev&quot;"
 DocType: Account,Balance must be,Ravnotežju mora biti
 DocType: Hub Settings,Publish Pricing,Objavite Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Expense zahtevek zavrnjen Sporočilo
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Menjalnega tečaja valute gospodar.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} mora biti aktiven
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} mora biti aktiven
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Prosimo, najprej izberite vrsto dokumenta"
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Pustite unovčitve Znesek
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,Privzete plačuje računov
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} ni aktiven ali pa ne obstaja
 DocType: Features Setup,Item Barcode,Postavka Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Postavka Variante {0} posodobljen
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Postavka Variante {0} posodobljen
 DocType: Quality Inspection Reading,Reading 6,Branje 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Nakup računa Advance
 DocType: Address,Shop,Trgovina
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Vrstica {0}: Credit vnos ni mogoče povezati z {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Vrstica {0}: Credit vnos ni mogoče povezati z {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Privzeto Bank / Cash račun bo samodejno posodobi v POS računa, ko je izbrana ta način."
 DocType: Employee,Permanent Address Is,Stalni naslov je
 DocType: Production Order Operation,Operation completed for how many finished goods?,"Operacija zaključena, za koliko končnih izdelkov?"
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Dodatek za prekomerno {0} prečkal za postavko {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Dodatek za prekomerno {0} prečkal za postavko {1}.
 DocType: Employee,Exit Interview Details,Exit Intervju Podrobnosti
 DocType: Item,Is Purchase Item,Je Nakup Postavka
 DocType: Journal Entry Account,Purchase Invoice,Nakup Račun
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,Skupaj z besedami
 DocType: Material Request Item,Lead Time Date,Lead Time Datum
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,je obvezna. Mogoče je Menjalni zapis ni ustvarjen za
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Vrstica # {0}: Navedite Zaporedna številka za postavko {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Vrstica # {0}: Navedite Zaporedna številka za postavko {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Za &quot;izdelek Bundle &#39;predmetov, skladišče, serijska številka in serijska se ne šteje od&quot; seznam vsebine &quot;mizo. Če so skladišča in serija ni enaka za vso embalažo postavke za kakršno koli &quot;izdelek Bundle &#39;postavko, lahko te vrednosti je treba vnesti v glavnem Element tabele, bodo vrednosti, ki se kopira na&quot; seznam vsebine &quot;mizo."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Pošiljke strankam.
 DocType: Purchase Invoice Item,Purchase Order Item,Naročilnica item
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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 +626,Select Item for Transfer,Izberite Postavka za prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,"Dovoli uporabniku, da uredite Cenik Ocenite v transakcijah"
 DocType: Pricing Rule,Max Qty,Max Kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Vrstica {0}: morala Plačilo proti prodaja / narocilo vedno označen kot vnaprej
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemical
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Vsi predmeti so že prenesli za to Production Order.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Vsi predmeti so že prenesli za to Production Order.
 DocType: Process Payroll,Select Payroll Year and Month,Izberite Payroll leto in mesec
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Pojdi na ustrezno skupino (običajno uporabo sredstev&gt; obratnih sredstev&gt; bančnih računov in ustvarite nov račun (s klikom na Dodaj Child) tipa &quot;banka&quot;
 DocType: Workstation,Electricity Cost,Stroški električne energije
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),Vse Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get plačanih predplačil
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Priložite svojo sliko
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Poskrbite
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Poskrbite
 DocType: Journal Entry,Total Amount in Words,Skupni znesek v besedi
 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 +3,My Cart,Košarica
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Košarica
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Odpiranje Količina
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,Gotovina / bančni račun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Lastnost miza je obvezna
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} ne more biti negativna
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Popust
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Popust
 DocType: Features Setup,Purchase Discounts,Odkupne Popusti
 DocType: Workstation,Wages,Plače
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Bo treba posodobiti le, če je čas Prijava je &quot;Odgovorni&quot;"
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,Dostava država
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Postavka je treba dodati uporabo &quot;dobili predmetov iz nakupu prejemki&quot; gumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodajna Stroški
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standardna Nakup
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standardna Nakup
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Privzeto Center Prodajni Stroški
 DocType: Sales Partner,Implementation Partner,Izvajanje Partner
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Dostava Pravilo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja naročite {0} je treba preklicati pred preklicem te Sales Order
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Prosim nastavite &quot;Uporabi dodatni popust na &#39;
 ,Ordered Items To Be Billed,Naročeno Postavke placevali
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od mora biti manj Razpon kot gibala
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Izberite Time Dnevniki in predložiti ustvariti nov prodajni fakturi.
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log Serija je bila zaračunavajo.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Ustvarite priložnost
 DocType: Salary Slip,Leave Without Pay,Leave brez plačila
-DocType: Supplier,Communications,Communications
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Kapaciteta Napaka Načrtovanje
 ,Trial Balance for Party,Trial Balance za stranke
 DocType: Lead,Consultant,Svetovalec
 DocType: Salary Slip,Earnings,Zaslužek
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Končano Postavka {0} je treba vpisati za vpis tipa Proizvodnja
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Odpiranje Računovodstvo Bilanca
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Končano Postavka {0} je treba vpisati za vpis tipa Proizvodnja
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Odpiranje Računovodstvo Bilanca
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodaja Račun Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nič zahtevati
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Dejanski datum začetka&quot; ne more biti večja od &quot;dejanskim koncem Datum&quot;
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,Tekočem proračunskem letu
 DocType: Global Defaults,Disable Rounded Total,Onemogoči Zaobljeni Skupaj
 DocType: Lead,Call,Call
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&quot;Navedbe&quot; ne more biti prazna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&quot;Navedbe&quot; ne more biti prazna
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dvojnik vrstica {0} z enako {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Postavitev Zaposleni
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,Uporabniško ime
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ogled Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najzgodnejša
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Izdelava zoper Sales Order
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Ostali svet
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ne smejo urejati zamrznjeni račun {0}
 DocType: Journal Entry,Get Outstanding Invoices,Pridobite neplačanih računov
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} ni veljaven
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,Kraj izdaje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Naročilo
 DocType: Email Digest,Add Quote,Dodaj Citiraj
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},"UOM coversion dejavnik, potreben za UOM: {0} v postavki: {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},"UOM coversion dejavnik, potreben za UOM: {0} v postavki: {1}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Posredni stroški
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Svoje izdelke ali storitve
 DocType: Mode of Payment,Mode of Payment,Način plačila
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,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/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,"To je skupina, root element in ga ni mogoče urejati."
 DocType: Journal Entry Account,Purchase Order,Naročilnica
 DocType: Warehouse,Warehouse Contact Info,Skladišče Kontakt Info
@@ -1018,8 +1024,8 @@
 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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Kapitalski Oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Pričakuje Dobavni rok je manj od načrtovanega začetni datum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Za dobavitelja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Za dobavitelja
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavitev Vrsta računa pomaga pri izbiri ta račun v transakcijah.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (družba Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Skupaj Odhodni
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,Vnos v dnevnik
 DocType: Workstation,Workstation Name,Workstation Name
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Glasila do stikov, vodi."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operacije ne sme ostati prazen.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operacije ne sme ostati prazen.
 ,Delivered Items To Be Billed,Dobavljeni artikli placevali
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladišče ni mogoče spremeniti za Serial No.
 DocType: Authorization Rule,Average Discount,Povprečen Popust
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operacija Opis
 DocType: Item,Will also apply to variants,Bo veljalo tudi za variante
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Ne more spremeniti poslovno leto začetni datum in fiskalnem letu End Datum, ko je poslovno leto shranjen."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Ne more spremeniti poslovno leto začetni datum in fiskalnem letu End Datum, ko je poslovno leto shranjen."
 DocType: Quotation,Shopping Cart,Nakupovalni voziček
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odhodni
 DocType: Pricing Rule,Campaign,Kampanja
@@ -1100,7 +1106,8 @@
 DocType: Sales Order Item,Planned Quantity,Načrtovana Količina
 DocType: Purchase Invoice Item,Item Tax Amount,Postavka Znesek davka
 DocType: Item,Maintain Stock,Ohraniti park
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Zaloga Vpisi že ustvarjene za proizvodnjo red
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontnem
 DocType: Material Request,Terms and Conditions Content,Pogoji in vsebina
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne more biti večja kot 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
 DocType: Maintenance Visit,Unscheduled,Nenačrtovana
 DocType: Employee,Owned,Lasti
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Odvisno od dopusta brez plačila
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sklope
 DocType: Shipping Rule Condition,To Value,Do vrednosti
 DocType: Supplier,Stock Manager,Stock Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Vir skladišče je obvezna za vrstico {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Vir skladišče je obvezna za vrstico {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Pakiranje listek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Urad za najem
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Nastavitve Setup SMS gateway
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Še ni naslov dodal.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation delovno uro
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analitik
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka JV znesku {2}"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka JV znesku {2}"
 DocType: Item,Inventory,Popis
 DocType: Features Setup,"To enable ""Point of Sale"" view",Da bi omogočili &quot;prodajno mesto&quot; pogled
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plačilo ne more biti narejen za prazen voziček
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Plačilo ne more biti narejen za prazen voziček
 DocType: Item,Sales Details,Prodajna Podrobnosti
 DocType: Opportunity,With Items,Z Items
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Kol
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,Parent Center Stroški
 DocType: Sales Invoice,Source,Vir
 DocType: Leave Type,Is Leave Without Pay,Se Leave brez plačila
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ni najdenih v tabeli plačil zapisov
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Ni najdenih v tabeli plačil zapisov
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Proračunsko leto Start Date
 DocType: Employee External Work History,Total Experience,Skupaj Izkušnje
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Dobavnico (e) odpovedan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Dobavnico (e) odpovedan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Denarni tokovi iz naložbenja
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Tovorni in Forwarding Stroški
 DocType: Material Request Item,Sales Order No,Prodaja Zaporedna številka
 DocType: Item Group,Item Group Name,Item Name Group
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferji Materiali za Izdelava
 DocType: Pricing Rule,For Price List,Za cenik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Nakupni tečaj za postavko: {0} ni mogoče najti, ki je potrebna za rezervacijo knjižbo (odhodki). Navedite ceno artikla proti seznama za nakupno ceno."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Nakupni tečaj za postavko: {0} ni mogoče najti, ki je potrebna za rezervacijo knjižbo (odhodki). Navedite ceno artikla proti seznama za nakupno ceno."
 DocType: Maintenance Schedule,Schedules,Urniki
 DocType: Purchase Invoice Item,Net Amount,Neto znesek
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Ne
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Znesek (Valuta Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Napaka: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Napaka: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosimo, ustvarite nov račun iz kontnega načrta."
 DocType: Maintenance Visit,Maintenance Visit,Vzdrževanje obisk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Stranka&gt; Skupina Customer&gt; Territory
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,Prodaja Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Računovodstvo Vstop za {0} se lahko izvede samo v valuti: {1}
 DocType: Pricing Rule,Pricing Rule,Cen Pravilo
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Material Zahteva za narocilo
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Material Zahteva za narocilo
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Vrstica # {0}: Vrnjeno Postavka {1} ne obstaja v {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bančni računi
 ,Bank Reconciliation Statement,Izjava Bank Sprava
@@ -1225,11 +1233,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Odpiranje Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} se morajo pojaviti le enkrat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Od vrednosti
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezna
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,"Zneski, ki se ne odraža v banki"
 DocType: Quality Inspection Reading,Reading 4,Branje 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Terjatve za račun družbe.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,Material Prošnje za katere so Dobavitelj Citati ni ustvaril
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Za sledenje predmetov s pomočjo črtne kode. Morda ne boste mogli vnesti elemente v dobavnice in prodajne fakture s skeniranjem črtne kode elementa.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Označi kot Delivered
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Označi kot Delivered
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Naredite predračun
 DocType: Dependent Task,Dependent Task,Odvisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Sprejemnik Seznam
 DocType: Payment Tool Detail,Payment Amount,Plačilo Znesek
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Porabljeni znesek
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Pogled
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Pogled
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Neto sprememba v gotovini
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plača Struktura Odbitek
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Strošek izdanih postavk
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Količina ne sme biti več kot {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Starost (dnevi)
 DocType: Quotation Item,Quotation Item,Kotacija Postavka
 DocType: Account,Account Name,Ime računa
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Od datum ne more biti večja kot doslej
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Od datum ne more biti večja kot doslej
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serijska št {0} količina {1} ne more biti del
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,Menjalno razmerje ne more biti 0 ali 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Menjalno razmerje ne more biti 0 ali 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} je odpovedan ali ustavi
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Potrdilo o nakupu {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Potrdilo o nakupu {0} ni predložila
 DocType: Company,Default Payable Account,Privzeto plačljivo račun
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% zaračunali
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moja vprašanja
 DocType: BOM Item,BOM Item,BOM Postavka
 DocType: Appraisal,For Employee,Za zaposlenega
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,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/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Vrstica {0}: Znesek plačila ne more biti negativna
 DocType: Expense Claim,Total Amount Reimbursed,"Skupnega zneska, povrnjenega"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Zoper dobavitelja Račun {0} dne {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Zoper dobavitelja Račun {0} dne {1}
 DocType: Customer,Default Price List,Privzeto Cenik
 DocType: Payment Reconciliation,Payments,Plačila
 DocType: Budget Detail,Budget Allocated,Proračun Dodeljena
 DocType: Journal Entry,Entry Type,Začetek Type
 ,Customer Credit Balance,Stranka Credit Balance
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Neto sprememba obveznosti do dobaviteljev
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Prosimo, preverite svoj email id"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Stranka zahteva za &quot;Customerwise popust&quot;
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Posodobite rok plačila banka s revijah.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Omogoči Košarica
 DocType: Employee,Permanent Address,stalni naslov
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Postavka {0} mora biti Service postavka.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Izplačano predplačilo proti {0} {1} ne more biti večja \ kot Grand Total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Prosimo, izberite postavko kodo"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Zmanjšajte Odbitek za dopust brez plačila (md)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Enotni enota točke.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Čas Log Serija {0} je treba &quot;Submitted&quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Čas Log Serija {0} je treba &quot;Submitted&quot;
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Skladišče zahteva pri Row št {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Skladišče zahteva pri Row št {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"A Skupina kupcev obstaja z istim imenom, prosimo spremenite ime stranke ali preimenovati skupino odjemalcev"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Prosimo, izberite {0} prvi."
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Besedilo {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,"Prosimo, izberite {0} prvi."
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},Besedilo {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,New Kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Branje 2
 DocType: Stock Entry,Material Receipt,Material Prejem
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},"Vrsta stranka in stranka, ki je potrebna za terjatve / obveznosti račun {0}"
 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 +210,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 +213,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 +85,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
@@ -1357,32 +1369,32 @@
 DocType: Job Applicant,Applicant for a Job,Kandidat za službo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ni Proizvodne Naročila ustvarjena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +153,Salary Slip of employee {0} already created for this month,Plača listek delavca {0} že ustvarjena za ta mesec
-DocType: Stock Reconciliation,Reconciliation JSON,Sprava JSON
+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: Sales Invoice Item,Batch No,Serija Ne
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dovoli več prodajnih nalogov zoper naročnikovo narocilo
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavite predpona za številčenje serij na vaše transakcije
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Ustavil naročila ni mogoče preklicati. Odčepiti preklicati.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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: Item,Variants,Variante
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Naredite narocilo
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Naredite narocilo
 DocType: SMS Center,Send To,Pošlji
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
 DocType: Sales Team,Contribution to Net Total,Prispevek k Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Koda artikla stranke
-DocType: Stock Reconciliation,Stock Reconciliation,Stock Sprava
+DocType: Stock Reconciliation,Stock Reconciliation,Uskladitev zalog
 DocType: Territory,Territory Name,Territory Name
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Work-in-Progress Warehouse je pred potreben Submit
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Kandidat za službo.
 DocType: Purchase Order Item,Warehouse and Reference,Skladišče in Reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutarna info in druge splošne informacije o vašem dobavitelju
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Naslovi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Proti listu Začetek {0} nima neprimerljivo {1} vnos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Proti listu Začetek {0} nima neprimerljivo {1} vnos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Točka ni dovoljeno imeti Production Order.
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Credit Znesek v Valuta računa
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Čas Hlodi za proizvodnjo.
 DocType: Item,Apply Warehouse-wise Reorder Level,Uporabi skladišča pametno preuredite Raven
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} je treba predložiti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} je treba predložiti
 DocType: Authorization Control,Authorization Control,Pooblastilo za nadzor
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Vrstica # {0}: zavrnitev Skladišče je obvezno proti zavrnil postavki {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Čas Prijava za naloge.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Plačilo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Plačilo
 DocType: Production Order Operation,Actual Time and Cost,Dejanski čas in stroški
 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},Material Zahteva za največ {0} se lahko izvede za postavko {1} proti Sales Order {2}
 DocType: Employee,Salutation,Pozdrav
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Sodelavec
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Postavka {0} ni serialized postavka
 DocType: SMS Center,Create Receiver List,Ustvarite sprejemnik seznam
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Potekel
 DocType: Packing Slip,To Package No.,Če želite Paket No.
 DocType: Warranty Claim,Issue Date,Datum izdaje
 DocType: Activity Cost,Activity Cost,Stroški dejavnost
@@ -1449,7 +1461,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Doseženi
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territory / Stranka
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,na primer 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka zaračunati neodplačanega {2}"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka zaračunati neodplačanega {2}"
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"V besedi bo viden, ko boste prihranili prodajni fakturi."
 DocType: Item,Is Sales Item,Je Sales Postavka
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Element Group Tree
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} ustvaril
 DocType: Delivery Note Item,Against Sales Order,Proti Sales Order
 ,Serial No Status,Serijska Status Ne
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Postavka miza ne more biti prazno
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Postavka miza ne more biti prazno
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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}"
 DocType: Pricing Rule,Selling,Prodajanje
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Dajatve in davki
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Vnesite Referenčni datum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Vnesite Referenčni datum
 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} vnosov plačil ni mogoče filtrirati s {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabela za postavko, ki bo prikazana na spletni strani"
 DocType: Purchase Order Item Supplied,Supplied Qty,Priložena Kol
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,Namestitev čas
 DocType: Sales Invoice,Accounting Details,Računovodstvo Podrobnosti
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Izbriši vse transakcije za to družbo
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Vrstica # {0}: Operacija {1} ni končana, za {2} Kol končnih izdelkov v proizvodnji naročite # {3}. Prosimo, posodobite statusa delovanja preko Čas Dnevniki"
+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,"Vrstica # {0}: Operacija {1} ni končana, za {2} Kol končnih izdelkov v proizvodnji naročite # {3}. Prosimo, posodobite statusa delovanja preko Čas Dnevniki"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Naložbe
 DocType: Issue,Resolution Details,Resolucija Podrobnosti
 DocType: Quality Inspection Reading,Acceptance Criteria,Merila sprejemljivosti
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,Jasno Tabela
 DocType: Features Setup,Brands,Blagovne znamke
 DocType: C-Form Invoice Detail,Invoice No,Račun št
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Od narocilo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Od narocilo
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Pustite se ne more uporabiti / preklicana pred {0}, saj je bilanca dopust že-carry posredujejo v evidenco dodeljevanja dopust prihodnji {1}"
 DocType: Activity Cost,Costing Rate,Stanejo Rate
 ,Customer Addresses And Contacts,Naslovi strank in kontakti
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,Vzdrževanje Urniki
 ,Quotation Trends,Narekovaj Trendi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
 DocType: Shipping Rule Condition,Shipping Amount,Dostava Znesek
 ,Pending Amount,Dokler Znesek
 DocType: Purchase Invoice Item,Conversion Factor,Faktor pretvorbe
@@ -1531,16 +1543,16 @@
 ,Supplier-Wise Sales Analytics,Dobavitelj-Wise Prodajna Analytics
 DocType: Address Template,This format is used if country specific format is not found,"Ta oblika se uporablja, če je ni mogoče najti poseben format državo"
 DocType: Production Order,Use Multi-Level BOM,Uporabite Multi-Level BOM
-DocType: Bank Reconciliation,Include Reconciled Entries,Vključi uskladiti Entries
+DocType: Bank Reconciliation,Include Reconciled Entries,Vključi usklajene vnose
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Drevo finanial računov.
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Račun {0}, mora biti tipa &quot;osnovno sredstvo&quot;, kot {1} je postavka sredstvo Item"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Račun {0}, mora biti tipa &quot;osnovno sredstvo&quot;, kot {1} je postavka sredstvo Item"
 DocType: HR Settings,HR Settings,Nastavitve HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Terjatev čaka na odobritev. Samo Expense odobritelj lahko posodobite stanje.
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Količina
 DocType: Leave Block List Allow,Leave Block List Allow,Pustite Block List Dovoli
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ne more biti prazen ali prostor
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr ne more biti prazen ali prostor
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Šport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Skupaj Actual
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Enota
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Odhodkov Terjatve
 DocType: Issue,Support,Podpora
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Poglej košarico
 ,BOM Search,BOM Iskanje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zapiranje (Odpiranje + vsote)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Prosimo, navedite valuto v družbi"
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM Pretvorba je potrebno v vrstici {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Datum razdalja ne more biti pred datumom check zapored {0}
 DocType: Salary Slip,Deduction,Odbitek
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Postavka Cena dodana za {0} v Ceniku {1}
 DocType: Address Template,Address Template,Naslov Predloga
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% Naloge Dopolnil
 DocType: Project,Gross Margin,Gross Margin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Prosimo, da najprej vnesete Production artikel"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,onemogočena uporabnik
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,onemogočena uporabnik
 DocType: Opportunity,Quotation,Kotacija
 DocType: Salary Slip,Total Deduction,Skupaj Odbitek
 DocType: Quotation,Maintenance User,Vzdrževanje Uporabnik
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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**.,** Fiscal Year ** predstavlja poslovno leto. Vse vknjižbe in druge velike transakcije so gosenicami proti ** poslovnega leta **.
 DocType: Opportunity,Customer / Lead Address,Stranka / Lead Naslov
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
 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
@@ -1588,12 +1602,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Spremljajte prodajnih akcij. Spremljajte Interesenti, citatov, Sales Order itd iz akcije, da bi ocenili donosnost naložbe."
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Vpisi Zaloga obstajajo proti skladišču {0}, zato vam ne more ponovno dodeliti ali spremeniti Skladišče"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Vpisi Zaloga obstajajo proti skladišču {0}, zato vam ne more ponovno dodeliti ali spremeniti Skladišče"
 DocType: Appraisal,Calculate Total Score,Izračunaj skupni rezultat
 DocType: Supplier Quotation,Manufacturing Manager,Proizvodnja Manager
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Split Dostava Opomba v pakete.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Pošiljke
+apps/erpnext/erpnext/hooks.py +69,Shipments,Pošiljke
 DocType: Purchase Order Item,To be delivered to customer,Ki jih je treba dostaviti kupcu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Status čas Prijava je treba predložiti.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijska št {0} ne pripada nobeni Warehouse
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"Types of employment (permanent, contract, intern etc.).","Vrste zaposlitve (trajna, pogodbeni, intern itd)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
 DocType: Currency Exchange,From Currency,Iz valute
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosimo, izberite Dodeljeni znesek, fakture Vrsta in številka računa v atleast eno vrstico"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Sales Order potreben za postavko {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosimo, izberite Dodeljeni znesek, fakture Vrsta in številka računa v atleast eno vrstico"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Sales Order potreben za postavko {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,"Zneski, ki se ne odraža v sistemu"
 DocType: Purchase Invoice Item,Rate (Company Currency),Oceni (družba Valuta)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Drugi
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,V postopku
 DocType: Authorization Rule,Itemwise Discount,Itemwise Popust
 DocType: Purchase Order Item,Reference Document Type,Referenčni dokument Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} proti Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} proti Sales Order {1}
 DocType: Account,Fixed Asset,Osnovno sredstvo
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Zaporednimi Inventory
 DocType: Activity Type,Default Billing Rate,Privzeto Oceni plačevanja
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order do plačila
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Zahtevek Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Čas Dnevniki ustvaril:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,"Prosimo, izberite ustrezen račun"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,"Prosimo, izberite ustrezen račun"
 DocType: Item,Weight UOM,Teža UOM
 DocType: Employee,Blood Group,Blood Group
 DocType: Purchase Invoice Item,Page Break,Page Break
@@ -1664,7 +1678,7 @@
 DocType: Offer Letter Term,Offer Term,Ponudba Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
 DocType: Job Applicant,Job Opening,Job Otvoritev
-DocType: Payment Reconciliation,Payment Reconciliation,Plačilo Sprava
+DocType: Payment Reconciliation,Payment Reconciliation,Uskladitev plačil
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Prosimo, izberite ime zadolžen osebe"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnologija
 DocType: Offer Letter,Offer Letter,Ponujamo Letter
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,Time
 DocType: Authorization Rule,Approving Role (above authorized value),Odobritvi vloge (nad pooblaščeni vrednosti)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Če želite dodati otrok vozlišča, raziskovanje drevo in kliknite na vozlišču, pod katero želite dodati več vozlišč."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija: {0} ne more biti starš ali otrok {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija: {0} ne more biti starš ali otrok {2}
 DocType: Production Order Operation,Completed Qty,Dopolnil Kol
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Seznam Cena {0} je onemogočena
 DocType: Manufacturing Settings,Allow Overtime,Dovoli Nadurno delo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serijske številke, potrebne za postavko {1}. Ki ste ga navedli {2}."
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,Stranka Postavka Kode
 DocType: Opportunity,Lost Reason,Lost Razlog
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Ustvarite Plačilni Entries proti odločitvam ali računih.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,New Naslov
 DocType: Quality Inspection,Sample Size,Velikost vzorca
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Vsi predmeti so bili že obračunano
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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"
 DocType: Project,External,Zunanji
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,Preimenovanje orodje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Posodobitev Stroški
 DocType: Item Reorder,Item Reorder,Postavka Preureditev
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Prenos Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Prenos Material
 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."
 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
 DocType: Installation Note,Installation Note,Namestitev Opomba
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Dodaj Davki
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Denarni tok iz financiranja
 ,Financial Analytics,Finančni Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Hčerinska družba
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,Ustvarite plačilnega lista
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Pričakovana višina kot na banko
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Vir sredstev (obveznosti)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina v vrstici {0} ({1}) mora biti enaka kot je bila proizvedena količina {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina v vrstici {0} ({1}) mora biti enaka kot je bila proizvedena količina {2}
 DocType: Appraisal,Employee,Zaposleni
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Uvoz Email Od
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Povabi kot uporabnik
 DocType: Features Setup,After Sale Installations,Po prodajo naprav
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} je v celoti zaračunali
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} je v celoti zaračunali
 DocType: Workstation Working Hour,End Time,Končni čas
 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 +75,Group by Voucher,Skupina kupon
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Zahtevani Na
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Rename Tool,File to Rename,Datoteka za preimenovanje
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Zaporedna številka potreben za postavko {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Zaporedna številka potreben za postavko {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Prikaži Plačila
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vzdrževanje Urnik {0} je treba odpovedati pred preklicem te Sales Order
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,Sales Order Zahtevano
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Ustvarite stranko
 DocType: Purchase Invoice,Credit To,Kredit
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktivne vodi / Stranke
 DocType: Employee Education,Post Graduate,Post Graduate
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Vzdrževanje Urnik Detail
 DocType: Quality Inspection Reading,Reading 9,Branje 9
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Plačilo računa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Neto sprememba terjatev do kupcev
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzacijske Off
 DocType: Quality Inspection Reading,Accepted,Sprejeto
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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."
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,Skupaj Znesek plačila
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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,Dostava Pravilo Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Surovine ne more biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Surovine ne more biti prazno.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
 DocType: Newsletter,Test,Testna
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kot že obstajajo transakcije zalog za to postavko, \ ne morete spremeniti vrednote &quot;Ima Zaporedna številka&quot;, &quot;Ima serija ni &#39;,&quot; je Stock Postavka &quot;in&quot; metoda vrednotenja &quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Hitro Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hitro Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Vi stopnje ni mogoče spremeniti, če BOM omenjeno agianst vsako postavko"
 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 +157,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 +211,{0} {1} is not submitted,{0} {1} ni predložena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} ni predložena
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Pogoji in razmer1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,Dovoljena vrednost
 DocType: Contact,Enter department to which this Contact belongs,"Vnesite oddelek, v katerem ta Kontakt pripada"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Skupaj Odsoten
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Postavka ali skladišča za vrstico {0} ne ujema Material dogovoru
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Postavka ali skladišča za vrstico {0} ne ujema Material dogovoru
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Merska enota
 DocType: Fiscal Year,Year End Date,Leto End Date
 DocType: Task Depends On,Task Depends On,Naloga je odvisna od
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Naročilo Končni datum mora biti večja od Datum pridružitve
 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."
 DocType: Customer Group,Has Child Node,Ima otrok Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} proti narocilo {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} proti narocilo {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Vnesite statične parametre url tukaj (npr. Pošiljatelj = ERPNext, username = ERPNext, geslo = 1234 itd)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ni v nobeni aktivnem poslovnem letu. Za več podrobnosti preverite {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je primer spletne strani samodejno ustvari iz ERPNext
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,Recd Količina
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne more proizvajati več item {0} od prodaje kol {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Gotovinski račun
 DocType: Tax Rule,Billing City,Zaračunavanje Mesto
 DocType: Global Defaults,Hide Currency Symbol,Skrij valutni simbol
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Pomožni Stroški
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Nad
 DocType: Buying Settings,Default Buying Price List,Privzeto Seznam odkupna cena
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Noben zaposleni za zgoraj izbranih kriterijih ALI plačilnega lista že ustvarili
 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"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Način plačila
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Glejte &quot;Oceni materialov na osnovi&quot; v stanejo oddelku
 DocType: Appraisal Goal,Key Responsibility Area,Key Odgovornost Area
 DocType: Item Reorder,Material Request Type,Material Zahteva Type
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Vrstica {0}: UOM Conversion Factor je obvezna
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Stroškovno Center
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Prosimo, izberite vrednost za {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Vsi naslovi.
 DocType: Company,Stock Settings,Nastavitve Stock
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je mogoče le, če so naslednje lastnosti enaka v obeh evidencah. Je skupina, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je mogoče le, če so naslednje lastnosti enaka v obeh evidencah. Je skupina, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Upravljanje skupine kupcev drevo.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,New Stroški Center Ime
 DocType: Leave Control Panel,Leave Control Panel,Pustite Nadzorna plošča
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Plačilo Tool Podrobnosti
 ,Sales Browser,Prodaja Browser
 DocType: Journal Entry,Total Credit,Skupaj Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Posojila in predujmi (sredstva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dolžniki
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Velika
@@ -2003,7 +2022,7 @@
 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.
 DocType: Production Order Operation,Make Time Log,Vzemite si čas Prijava
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,"Prosim, nastavite naročniško količino"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,"Prosim, nastavite naročniško količino"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Prosimo, da ustvarite strank iz svinca {0}"
 DocType: Price List,Applicable for Countries,Velja za države
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Računalniki
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Ni Opombe
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Ni Opombe
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zapadle
 DocType: Account,Stock Received But Not Billed,Prejete Stock Ampak ne zaračuna
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root račun mora biti skupina
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root račun mora biti skupina
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plače + arrear Znesek + Vnovčevanje Znesek - Skupaj Odbitek
 DocType: Monthly Distribution,Distribution Name,Porazdelitev Name
 DocType: Features Setup,Sales and Purchase,Prodaja in nakup
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,Balance Party
 DocType: Sales Invoice Item,Time Log Batch,Čas Log Serija
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Prosimo, izberite Uporabi popust na"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Plača Slip Ustvarjeno
 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: Stock Entry,Material Transfer for Manufacture,Prenos materialov za proizvodnjo
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,Polletna
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Poslovno leto {0} ni bilo mogoče najti.
 DocType: Bank Reconciliation,Get Relevant Entries,Pridobite ustreznimi vnosi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Računovodstvo Vstop za zalogi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Računovodstvo Vstop za zalogi
 DocType: Sales Invoice,Sales Team1,Prodaja TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Element {0} ne obstaja
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Element {0} ne obstaja
 DocType: Sales Invoice,Customer Address,Stranka Naslov
 DocType: Purchase Invoice,Apply Additional Discount On,Uporabi dodatni popust na
 DocType: Account,Root Type,Root Type
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Pokažite ta diaprojekcije na vrhu strani
 DocType: BOM,Item UOM,Postavka UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Davčna Znesek Po Popust Znesek (družba Valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Ciljna skladišče je obvezna za vrstico {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Ciljna skladišče je obvezna za vrstico {0}
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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 kontnem pripada organizaciji.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana, pijača, tobak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ali BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Lahko le plačilo proti neobračunano {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Lahko le plačilo proti neobračunano {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Stopnja Komisija ne more biti večja od 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalna Inventory Raven
 DocType: Stock Entry,Subcontract,Podizvajalska pogodba
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Dohodni pregled kakovosti.
 DocType: Purchase Order Item,Returned Qty,Vrnjeno Kol
 DocType: Employee,Exit,Izhod
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Tip je obvezna
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root Tip je obvezna
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijska št {0} ustvaril
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za udobje kupcev lahko te kode se uporabljajo v tiskanih oblikah, kot so na računih in dobavnicah"
 DocType: Employee,You can enter any date manually,Lahko jih vnesete nobenega datuma
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Poskusna doba
 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 +110,Row {0}: Advance against Customer must be credit,Vrstica {0}: Advance proti naročniku mora biti kredit
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Potrdilo o nakupu Postavka Priložena
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Plačajte
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Plačajte
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Da datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Dnevniki za ohranjanje statusa dostave sms
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Preureditev Raven
 DocType: Attendance,Attendance Date,Udeležba Datum
 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 +110,Account with child nodes cannot be converted to ledger,Račun z zapirali vozlišč ni mogoče pretvoriti v knjigo terjatev
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Račun z zapirali vozlišč ni mogoče pretvoriti v knjigo terjatev
 DocType: Address,Preferred Shipping Address,Želeni Shipping Address
 DocType: Purchase Receipt Item,Accepted Warehouse,Accepted Skladišče
 DocType: Bank Reconciliation Detail,Posting Date,Napotitev Datum
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serijska št {0} ne obstaja
 DocType: Pricing Rule,Discount Percentage,Popust Odstotek
 DocType: Payment Reconciliation Invoice,Invoice Number,Številka računa
-apps/erpnext/erpnext/hooks.py +54,Orders,Naročila
+apps/erpnext/erpnext/hooks.py +55,Orders,Naročila
 DocType: Leave Control Panel,Employee Type,Vrsta delavec
 DocType: Employee Leave Approver,Leave Approver,Pustite odobritelju
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Preneseno za Izdelava
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Materialov zaračunali proti tej Sales Order
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Obdobje Closing Začetek
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija
+DocType: Account,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavitelj (-i)
 DocType: Customer,Credit Limit,Kreditni limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Izberite vrsto posla
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,Zaprosila za
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledi tej dobavnica proti kateri koli projekt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root račun ni mogoče izbrisati
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Čisti denarni tok iz naložbenja
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root račun ni mogoče izbrisati
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Prikaži Stock Vnosi
 ,Is Primary Address,Je primarni naslov
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referenčna # {0} dne {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referenčna # {0} dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Upravljanje naslovov
 DocType: Pricing Rule,Item Code,Oznaka
 DocType: Production Planning Tool,Create Production Orders,Ustvarjanje naročila za proizvodnjo
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,Uporabnik Pripomba
 DocType: Lead,Market Segment,Tržni segment
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposleni Notranji Delo Zgodovina
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Zapiranje (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Zapiranje (Dr)
 DocType: Contact,Passive,Pasivna
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijska št {0} ni na zalogi
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Davčna predlogo za prodajo transakcije.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,Zaračunavajo Znesek
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Sprava
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dobite posodobitve
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Material Zahteva {0} je odpovedan ali ustavi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Material Zahteva {0} je odpovedan ali ustavi
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Dodajte nekaj zapisov vzorčnih
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Pustite upravljanje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,"Skupina, ki jo račun"
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Glava računa na podlagi odgovornosti, v katerem se bodo rezervirana dobiček / izguba"
 DocType: Payment Tool,Against Vouchers,Proti boni
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hitra pomoč
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Prodajna Extras
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} proti centru Cost {2} bo presegel s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Od datuma&quot; mora biti po &quot;Da Datum &#39;
 ,Stock Projected Qty,Stock Predvidena Količina
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
 DocType: Sales Order,Customer's Purchase Order,Stranke Naročilo
 DocType: Warranty Claim,From Company,Od družbe
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Vrednost ali Kol
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Pustite Block Seznam Dovoljeno
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Lahko ga bodo uporabljali za prijavo
 DocType: Sales Partner,Retailer,Retailer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit Za računu mora biti bilanca računa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Vse vrste Dobavitelj
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +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/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Kotacija {0} ni tipa {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vzdrževanje Urnik Postavka
 DocType: Sales Order,%  Delivered,% Delivered
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto teža paketa. Ponavadi neto teža + embalaža teže. (za tisk)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uporabniki s to vlogo dovoljeno postaviti na zamrznjene račune in ustvariti / spreminjanje vknjižbe zoper zamrznjenih računih
 DocType: Serial No,Is Cancelled,Je Preklicana
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje pošiljke
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Moje pošiljke
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Tudi če obstaja več cenovnih Pravila z najvišjo prioriteto, se uporabljajo nato naslednji notranje prednostne naloge:"
 DocType: Supplier,Supplier Details,Dobavitelj Podrobnosti
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Poziva
 DocType: Project,Total Costing Amount (via Time Logs),Skupaj Stanejo Znesek (preko Čas Dnevniki)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Naročilnica {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Naročilnica {0} ni predložila
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Predvidoma
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijska št {0} ne pripada Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opomba: Sistem ne bo preveril čez povzetju in over-rezervacije za postavko {0} kot količina ali znesek je 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opomba: Sistem ne bo preveril čez povzetju in over-rezervacije za postavko {0} kot količina ali znesek je 0
 DocType: Notification Control,Quotation Message,Kotacija Sporočilo
 DocType: Issue,Opening Date,Otvoritev Datum
 DocType: Journal Entry,Remark,Pripomba
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,Posodi za plačevanja
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Računi, ki jih dobavitelji postavljeno."
 DocType: POS Profile,Write Off Account,Napišite Off račun
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Čisti denarni tok iz poslovanja
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,npr DDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Postavka 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum upokojitve mora biti večji od datuma pridružitve
 DocType: Sales Invoice,Against Income Account,Proti dohodkov
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Delivered
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Territory cilji
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2421,10 +2443,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Serijska številka je obvezna za postavko {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To je koren prodaje oseba in jih ni mogoče urejati.
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Stopnja: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Stopnja: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plača Slip Odbitek
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Izberite skupino vozlišče prvi.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cilj mora biti eden od {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Cilj mora biti eden od {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Izpolnite obrazec in ga shranite
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Prenesite poročilo, ki vsebuje vse surovine s svojo najnovejšo stanja zalog"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Skupnost
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ne stranka ali dobavitelj) gospodar.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Prosimo, vpišite &quot;Pričakovana Dostava Date&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dobavnic {0} je treba preklicati pred preklicem te Sales Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ni veljavna številka serije za postavko {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Opomba: Ni dovolj bilanca dopust za dopust tipa {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Opomba: Če se plačilo ni izvedeno pred kakršno koli sklicevanje, da Journal Entry ročno."
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošlji samodejne elektronske pošte v Contacts o posredovanju transakcij.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Vrstica {0}: Kol ne avalable v skladišču {1} na {2} {3}. Na voljo Kol: {4}, Prenos Količina: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Postavka 3
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Sales Team,Contribution (%),Prispevek (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Predloga
 DocType: Sales Person,Sales Person Name,Prodaja Oseba Name
@@ -2492,23 +2514,23 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Add Users,Dodaj uporabnike
 DocType: Pricing Rule,Item Group,Element Group
 DocType: Task,Actual Start Date (via Time Logs),Actual Start Date (via Čas Dnevniki)
-DocType: Stock Reconciliation Item,Before reconciliation,Pred sprave
+DocType: Stock Reconciliation Item,Before reconciliation,Pred uskladitvijo
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,Privzeto BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Prosimo, ponovno tip firma za potrditev"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Skupaj Izjemna Amt
 DocType: Time Log Batch,Total Hours,Skupaj ure
 DocType: Journal Entry,Printing Settings,Printing Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Skupaj obremenitve mora biti enaka celotnemu kreditnemu. Razlika je {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Skupaj obremenitve mora biti enaka celotnemu kreditnemu. Razlika je {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Avtomobilizem
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od dobavnica
 DocType: Time Log,From Time,Od časa
 DocType: Notification Control,Custom Message,Sporočilo po meri
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bančništvo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Gotovina ali bančnega računa je obvezen za izdelavo vnos plačila
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Gotovina ali bančnega računa je obvezen za izdelavo vnos plačila
 DocType: Purchase Invoice,Price List Exchange Rate,Cenik Exchange Rate
 DocType: Purchase Invoice Item,Rate,Stopnja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","Multiple Cena pravilo obstaja z istimi merili, prosim rešiti \ konflikt z dodeljevanjem prednost. Cena Pravila: {0}"
 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 +580,Issue Material,Vprašanje Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Vprašanje Material
 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,Citati
 DocType: Hub Settings,Access Token,Dostopni žeton
 DocType: Sales Invoice Item,Serial No,Zaporedna številka
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Prosimo, da najprej vnesete Maintaince Podrobnosti"
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Največja Znesek računa
 DocType: Purchase Invoice Item,Image View,Image View
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednotenje in Total
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ta postavka je varianta {0} (Template). Atributi bodo kopirali več iz predloge, če je nastavljen &quot;Ne Kopiraj«"
 DocType: Account,Purchase User,Nakup Uporabnik
 DocType: Notification Control,Customize the Notification,Prilagodite Obvestilo
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Denarni tok iz poslovanja
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Privzete predloge naslova ni mogoče brisati
 DocType: Sales Invoice,Shipping Rule,Dostava Pravilo
 DocType: Journal Entry,Print Heading,Print Postavka
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledite preko e-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Davčna Znesek Po Popust Znesek
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Prosimo, izberite datumom knjiženja najprej"
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serijska št Zahtevano za zaporednimi postavki {0}
 DocType: Journal Entry,Bank Entry,Banka Začetek
 DocType: Authorization Rule,Applicable To (Designation),Ki se uporabljajo za (Oznaka)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Dodaj v voziček
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Skupina S
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Omogoči / onemogoči valute.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštni stroški
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava &amp; prosti čas
 DocType: Purchase Order,The date on which recurring order will be stop,"Datum, na katerega se bodo ponavljajoče se naročilo ustavi"
 DocType: Quality Inspection,Item Serial No,Postavka Zaporedna številka
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} je treba zmanjšati za {1} ali pa bi se morala povečati strpnost preliva
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} je treba zmanjšati za {1} ali pa bi se morala povečati strpnost preliva
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Skupaj Present
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Ura
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Zaporednimi Postavka {0} ni mogoče posodobiti \ uporabo zaloge sprave
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Prenos Material za dobavitelja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Prenos Material za dobavitelja
 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,Svinec Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Ustvarite predračun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Niste pooblaščeni za odobritev liste na Block termini
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Vsi ti predmeti so bili že obračunano
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Vsi ti predmeti so bili že obračunano
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Mogoče odobriti {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Dostava Pravilo Pogoji
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM po zamenjavi
 DocType: Features Setup,Point of Sale,Prodajno mesto
 DocType: Account,Tax,Davčna
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Vrstica {0}: {1} ni veljaven {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle izdelkov
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Od Bundle izdelkov
 DocType: Production Planning Tool,Production Planning Tool,Production Planning Tool
 DocType: Quality Inspection,Report Date,Poročilo Datum
 DocType: C-Form,Invoices,Računi
 DocType: Job Opening,Job Title,Job Naslov
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Prejemniki
 DocType: Features Setup,Item Groups in Details,Postavka Skupine v Podrobnosti
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Začetek Point-of-Sale (POS)
@@ -2618,8 +2644,9 @@
 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: Pricing Rule,Customer Group,Skupina za stranke
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Expense račun je obvezna za postavko {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Expense račun je obvezna za postavko {0}
 DocType: Item,Website Description,Spletna stran Opis
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Neto sprememba v kapitalu
 DocType: Serial No,AMC Expiry Date,AMC preteka Datum
 ,Sales Register,Prodaja Register
 DocType: Quotation,Quotation Lost Reason,Kotacija Lost Razlog
@@ -2627,12 +2654,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nič ni za urejanje.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Povzetek za ta mesec in v teku dejavnosti
 DocType: Customer Group,Customer Group Name,Skupina Ime stranke
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Atributi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Pridobite Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Vnesite Napišite Off račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Pridobite Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Vnesite Napišite Off račun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Zadnja Datum naročila
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Naredite trošarine fakturo
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Račun {0} ne pripada podjetju {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Podatki projekt pametno ni na voljo za ponudbo
 DocType: Project,Expected End Date,Pričakovani datum zaključka
 DocType: Appraisal Template,Appraisal Template Title,Cenitev Predloga Naslov
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Commercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} ne sme biti Stock Postavka
 DocType: Cost Center,Distribution Id,Porazdelitev Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super Storitve
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vrednost za Attribute {0} mora biti v razponu od {1} na {2} v korakih po {3}
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni znesek
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
 DocType: Leave Allocation,Unused leaves,Neizkoriščene listi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Privzeto Terjatev računov
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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,Setup Series
+DocType: Payment Reconciliation,To Invoice Date,Če želite Datum računa
 DocType: Supplier,Contact HTML,Kontakt HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Odkupne Prejemki
-DocType: Payment Reconciliation,Maximum Amount,Najvišji znesek
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kako Pricing pravilo se uporablja?
 DocType: Quality Inspection,Delivery Note No,Dostava Opomba Ne
 DocType: Company,Retail,Maloprodaja
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Stranka {0} ne obstaja
 DocType: Attendance,Absent,Odsoten
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle izdelek
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Vrstica {0}: Neveljavna referenčna {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle izdelek
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Vrstica {0}: Neveljavna referenčna {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Nakup davki in dajatve Template
 DocType: Upload Attendance,Download Template,Prenesi predlogo
 DocType: GL Entry,Remarks,Opombe
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,Mesečni Udeležba Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nobenega zapisa najdenih
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Stroški Center je obvezen za postavko {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Račun {0} je neaktiven
 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
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Izkaz poslovnega izida&quot; tip račun {0} ni dovoljen v vstopna odprtina
 DocType: Features Setup,Sales Discounts,Prodajna Popusti
 DocType: Hub Settings,Seller Country,Prodajalec Država
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Objavite elementov na spletni strani
 DocType: Authorization Rule,Authorization Rule,Dovoljenje Pravilo
 DocType: Sales Invoice,Terms and Conditions Details,Pogoji in Podrobnosti
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Tehnični podatki
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodajne Davki in dajatve predloge
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblačila in dodatki
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Število reda
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,Zaračunavanje Znesek
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Neveljavna količina, določena za postavko {0}. Količina mora biti večja od 0."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Vloge za dopust.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Račun z obstoječim poslom ni mogoče izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Račun z obstoječim poslom ni mogoče izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Pravni stroški
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Dan v mesecu, v katerem se bo samodejno naročilo ustvarila npr 05, 28, itd"
 DocType: Sales Invoice,Posting Time,Napotitev čas
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,Zlomiti se
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Račun: {0} z valuti: ne more biti izbran {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: Matično račun {1} ne pripada podjetju: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: Matično račun {1} ne pripada podjetju: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Uspešno izbrisana vse transakcije v zvezi s to družbo!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kot na datum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Poskusno delo
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Privzeto Skladišče je obvezna za borzo točki.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Privzeto Skladišče je obvezna za borzo točki.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Izplačilo plače za mesec {0} in leto {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert stopnja Cenik če manjka
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Skupaj Plačan znesek
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Skupni znesek plačevanja (preko Čas Dnevniki)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Prodamo ta artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dobavitelj Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Količina mora biti večja od 0
 DocType: Journal Entry,Cash Entry,Cash Začetek
 DocType: Sales Partner,Contact Desc,Kontakt opis izdelka
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Vrsta listov kot priložnostno, bolni itd"
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Dodajte vrstice, da določijo letne proračune na računih."
 DocType: Buying Settings,Default Supplier Type,Privzeta Dobavitelj Type
 DocType: Production Order,Total Operating Cost,Skupni operativni stroški
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Opomba: Točka {0} vpisana večkrat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Opomba: Točka {0} vpisana večkrat
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Vsi stiki.
 DocType: Newsletter,Test Email Id,Testna Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Kratica podjetja
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Vse skupine strank
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Davčna Predloga je obvezna.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Račun {0}: Matično račun {1} ne obstaja
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,Račun {0}: Matično račun {1} ne obstaja
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenik Rate (družba Valuta)
 DocType: Account,Temporary,Začasna
 DocType: Address,Preferred Billing Address,Želeni plačevanja Naslov
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,Element-pametno Cenik Rate
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je ustavila
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} je ustavila
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
 DocType: Lead,Add to calendar on this date,Dodaj v koledar na ta dan
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravila za dodajanje stroškov dostave.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Prihajajoči dogodki
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,Iz svinca
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Naročila sprosti za proizvodnjo.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Izberite poslovno leto ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
 DocType: Hub Settings,Name Token,Ime Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standardna Prodaja
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast eno skladišče je obvezna
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,Iz garancije
 DocType: BOM Replace Tool,Replace,Zamenjaj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} proti prodajne fakture {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Vnesite privzeto mersko enoto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} proti prodajne fakture {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Vnesite privzeto mersko enoto
 DocType: Purchase Invoice Item,Project Name,Ime projekta
 DocType: Supplier,Mention if non-standard receivable account,Omemba če nestandardno terjatve račun
 DocType: Journal Entry Account,If Income or Expense,Če prihodek ali odhodek
 DocType: Features Setup,Item Batch Nos,Postavka Serija Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Razlika
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Človeški viri
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Davčni Sredstva
 DocType: BOM Item,BOM No,BOM Ne
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ki bo nadomestila
 DocType: Account,Debit,Debet
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatne Stroški
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Proračunsko leto End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Filter ne more temeljiti na kupona št, če je združena s Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Naredite Dobavitelj predračun
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Naredite Dobavitelj predračun
 DocType: Quality Inspection,Incoming,Dohodni
 DocType: BOM,Materials Required (Exploded),Potreben materiali (eksplodirala)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Zmanjšajte Služenje za dopust brez plačila (md)
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Vrstica # {0}: Serijska št {1} ne ujema z {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Zapusti
 DocType: Batch,Batch ID,Serija ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Opomba: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Opomba: {0}
 ,Delivery Note Trends,Dobavnica Trendi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Povzetek Ta teden je
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora biti kupljena ali podizvajalcev Postavka v vrstici {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Odkup tečaj
 DocType: Task,Actual Time (in Hours),Dejanski čas (v urah)
 DocType: Employee,History In Company,Zgodovina V družbi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Količina celotne izdaje / Transfer {0} v Industrijska Zahteva {1} ne sme biti večja od zahtevane količine {2} za postavko {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Glasila
 DocType: Address,Shipping,Dostava
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,Končni datum obdobja Trenutni vrstni red je
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Naredite Pisna ponudba
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Return
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Privzeto mersko enoto za Variant mora biti enaka kot predlogo
 DocType: Production Order Operation,Production Order Operation,Proizvodnja naročite Delovanje
 DocType: Pricing Rule,Disable,Onemogoči
 DocType: Project Task,Pending Review,Dokler Pregled
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID stranke
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Da mora biti čas biti večja od od časa
 DocType: Journal Entry Account,Exchange Rate,Menjalni tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Sales Order {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Sales Order {0} ni predložila
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladišče {0}: Matično račun {1} ne Bolong podjetju {2}
 DocType: BOM,Last Purchase Rate,Zadnja Purchase Rate
 DocType: Account,Asset,Asset
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,Zaloga za Embalaža Items
 DocType: Item Variant,Item Variant,Postavka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Nastavitev ta naslov predlogo kot privzeto saj ni druge privzeto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje na računu že v obremenitve, se vam ni dovoljeno, da nastavite &quot;Stanje mora biti&quot; kot &quot;kredit&quot;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje na računu že v obremenitve, se vam ni dovoljeno, da nastavite &quot;Stanje mora biti&quot; kot &quot;kredit&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kakovosti
 DocType: Production Planning Tool,Filter based on customer,"Filter, ki temelji na kupca"
 DocType: Payment Tool Detail,Against Voucher No,Proti kupona št
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,Naslednja Kontakt
 DocType: Employee,Employment Type,Vrsta zaposlovanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Osnovna sredstva
+,Cash Flow,Denarni tok
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Prijavni rok ne more biti čez dve Razporejanje zapisov
 DocType: Item Group,Default Expense Account,Privzeto Expense račun
 DocType: Employee,Notice (days),Obvestilo (dni)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,Skladišča
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print in Stacionarna
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Skupina Node
-DocType: Payment Reconciliation,Minimum Amount,Minimalni znesek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,"Posodobitev končnih izdelkov,"
 DocType: Workstation,per hour,na uro
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Račun za skladišče (Perpetual Inventory) bo nastala na podlagi tega računa.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladišče ni mogoče črtati, saj obstaja vnos stock knjiga za to skladišče."
 DocType: Company,Distribution,Porazdelitev
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Plačani znesek
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Plačani znesek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max popust dovoljena za postavko: {0} je {1}%
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Podjetje manjka v skladiščih {0}
 DocType: POS Profile,Terms and Conditions,Pravila in pogoji
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Do datuma mora biti v poslovnem letu. Ob predpostavki, da želite Datum = {0}"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},"Do datuma mora biti v poslovnem letu. Ob predpostavki, da želite Datum = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Tukaj lahko ohranijo višino, težo, alergije, zdravstvene pomisleke itd"
 DocType: Leave Block List,Applies to Company,Velja za podjetja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Ni mogoče preklicati, ker je predložila Stock Začetek {0} obstaja"
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Vnesite Nakup Prejemki
 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 +425,Transaction not allowed against stopped Production Order {0},Transakcija ni dovoljena zoper ustavili proizvodnjo naročite {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup dohodni strežnik za podporo email id. (npr support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Pomanjkanje Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
 DocType: Salary Slip,Salary Slip,Plača listek
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Da Datum&quot; je potrebno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Ustvarjajo dobavnic, da paketi dostavi. Uporablja se za uradno številko paketa, vsebino paketa in njegovo težo."
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Evidence zaposlenih.
 DocType: HR Settings,Payroll Settings,Nastavitve plače
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match nepovezane računov in plačil.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Naročiti
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Naročiti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root ne more imeti matična stroškovno mesto v
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Izberi znamko ...
 DocType: Sales Invoice,C-Form Applicable,"C-obliki, ki velja"
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,Datum začetka
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Dodeli liste za obdobje.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Kliknite tukaj, da se preveri"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Račun {0}: ne moreš sam dodeliti kot matično račun
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Račun {0}: ne moreš sam dodeliti kot matično račun
 DocType: Purchase Invoice Item,Price List Rate,Cenik Rate
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Pokaži &quot;Na zalogi&quot; ali &quot;Ni na zalogi&quot;, ki temelji na zalogi na voljo v tem skladišču."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Kosovnica (BOM)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,Pričakovani datum začetka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Odstranite element, če stroški ne nanaša na to postavko"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Prejeti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Prejeti
 DocType: Maintenance Visit,Fully Completed,V celoti končana
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Izobraževalni Kvalifikacije
 DocType: Workstation,Operating Costs,Obratovalni stroški
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposleni Leave odobritelj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} je bil uspešno dodan v seznam novice.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Ne more razglasiti kot izgubljena, ker je bil predračun postavil."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nakup Master Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Proizvodnja naročite {0} je treba predložiti
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Proizvodnja naročite {0} je treba predložiti
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Prosimo, izberite Start in končni datum za postavko {0}"
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Glavni Poročila
 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
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,Industrija Type
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Nekaj je šlo narobe!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Opozorilo: Pustite prijava vsebuje naslednje datume blok
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodaja Račun {0} je že bila predložena
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Prodaja Račun {0} je že bila predložena
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,datum dokončanja
 DocType: Purchase Invoice Item,Amount (Company Currency),Znesek (družba Valuta)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,"Organizacijska enota (oddelek), master."
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,Zaporedna številka Service Contract preteka
 DocType: Item,Unit of Measure Conversion,Merska enota konverzijo
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Delavec se ne more spremeniti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,"Ne, ne moreš kreditnih in debetnih isti račun ob istem času"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,"Ne, ne moreš kreditnih in debetnih isti račun ob istem času"
 DocType: Naming Series,Help HTML,Pomoč HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Skupaj weightage dodeljena mora biti 100%. To je {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Dodatek za prekomerno {0} prečkal za postavko {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Dodatek za prekomerno {0} prečkal za postavko {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Ime osebe ali organizacije, ki ta naslov pripada."
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Vaše Dobavitelji
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Ni mogoče nastaviti kot izgubili, kot je narejena Sales Order."
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,Datum izdaje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} za {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Vrstica # {0}: Nastavite Dobavitelj za postavko {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Prosimo, preverite Multi Valuta možnost, da se omogoči račune pri drugi valuti"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,"Prosimo, preverite Multi Valuta možnost, da se omogoči račune pri drugi valuti"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Postavka: {0} ne obstaja v sistemu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Nimate dovoljenja za nastavitev Zamrznjena vrednost
-DocType: Payment Reconciliation,Get Unreconciled Entries,Pridobite Unreconciled Entries
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Nimate dovoljenja za nastavitev Zamrznjena vrednost
+DocType: Payment Reconciliation,Get Unreconciled Entries,Pridobite neusklajene vnose
+DocType: Payment Reconciliation,From Invoice Date,Od Datum računa
 DocType: Cost Center,Budgets,Proračuni
-DocType: Employee,Emergency Contact Details,Zasilna Kontaktni podatki
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Kaj to naredi?
 DocType: Delivery Note,To Warehouse,Za skladišča
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Račun {0} je bila vpisan več kot enkrat za fiskalno leto {1}
 ,Average Commission Rate,Povprečen Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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/hr/doctype/attendance/attendance.py +34,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č
 DocType: Purchase Taxes and Charges,Account Head,Račun Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Posodobite dodatnih stroškov za izračun iztovori stroške predmetov
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Električno
 DocType: Stock Entry,Total Value Difference (Out - In),Skupna vrednost Razlika (Out - IN)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Vrstica {0}: Menjalni tečaj je obvezen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Vrstica {0}: Menjalni tečaj je obvezen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID uporabnika ni nastavljena za Employee {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Iz garancijskega zahtevka
 DocType: Stock Entry,Default Source Warehouse,Privzeto Vir Skladišče
 DocType: Item,Customer Code,Koda za stranke
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},"Opomnik za rojstni dan, za {0}"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dni od zadnjega naročila
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
 DocType: Buying Settings,Naming Series,Poimenovanje serije
 DocType: Leave Block List,Leave Block List Name,Pustite Ime Block List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Zaloga Sredstva
@@ -3271,7 +3301,7 @@
 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
 DocType: Authorization Rule,Based On,Temelji na
 DocType: Sales Order Item,Ordered Qty,Naročeno Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Postavka {0} je onemogočena
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Postavka {0} je onemogočena
 DocType: Stock Settings,Stock Frozen Upto,Stock Zamrznjena Stanuje
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},"Obdobje Od in obdobje, da datumi obvezne za ponavljajoče {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektna dejavnost / naloga.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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"
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Napišite enkratni znesek (družba Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
 DocType: Landed Cost Voucher,Landed Cost Voucher,Pristali Stroški bon
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Prosim, nastavite {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan Meseca
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,Naloži Udeležba
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Količina so obvezna
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Staranje Razpon 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Znesek
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Znesek
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nadomesti
 ,Sales Analytics,Prodajna Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Proizvodne Nastavitve
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Postavitev Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Vnesite privzeto valuto v podjetju Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Dnevni opomniki
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Davčna Pravilo Konflikti z {0}
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inženir
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Iskanje sklope
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Oznaka zahteva pri Row št {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Oznaka zahteva pri Row št {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Actual
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 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 +263,Installation Note {0} has already been submitted,Je že bil predložen Namestitev Opomba {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Je že bil predložen Namestitev Opomba {0}
 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
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,Velja Holiday Seznam
 DocType: Employee,Cheque,Ček
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija Posodobljeno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Vrsta poročila je obvezna
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Vrsta poročila je obvezna
 DocType: Item,Serial Number Series,Serijska številka serije
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladišče je obvezna za borzo postavki {0} v vrstici {1}
 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/public/js/setup_wizard.js +101,The First User: You,Prva Uporabnik: You
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Uspešno Pobotano
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Uspešno usklajeno
 DocType: Production Order,Planned End Date,Načrtovan End Date
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Če so predmeti shranjeni.
 DocType: Tax Rule,Validity,Veljavnost
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,Udeležba
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,"Napotitev datum in čas objavljate, je obvezna"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,"Napotitev datum in čas objavljate, je obvezna"
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Davčna predlogo za nakup transakcij.
 ,Item Prices,Postavka Cene
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"V besedi bo viden, ko boste prihranili naročilnico."
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,Pregled Datum
 DocType: Purchase Invoice,Advance Payments,Predplačila
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Ciljna skladišče v vrstici {0} mora biti enaka kot Production reda
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ni dovoljenja za uporabo plačilnega orodje
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,&quot;Obvestilo o e-poštni naslovi&quot; niso določeni za ponavljajoče% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Zaokrožijo račun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni stroški
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Spremeni
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Spremeni
 DocType: Purchase Invoice,Contact Email,Kontakt E-pošta
 DocType: Appraisal Goal,Score Earned,Rezultat Zaslužili
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",na primer &quot;My Company LLC&quot;
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,Bruto Teža UOM
 DocType: Email Digest,Receivables / Payables,Terjatve / obveznosti
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodajni fakturi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Credit račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Credit račun
 DocType: Landed Cost Item,Landed Cost Item,Pristali Stroški Postavka
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Prikaži ničelnimi vrednostmi
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina postavke pridobljeno po proizvodnji / prepakiranja iz danih količin surovin
 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 +562,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
 DocType: Item,Default Warehouse,Privzeto Skladišče
 DocType: Task,Actual End Date (via Time Logs),Dejanski končni datum (via Čas Dnevniki)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Proračun ne more biti dodeljena pred Group račun {0}
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Načrtujte čas dnevnike zunaj Workstation delovnih ur.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} je že bil predložen
 ,Items To Be Requested,"Predmeti, ki bodo zahtevana"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Get zadnjega nakupa Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Zaračunavanje Ocena temelji na vrsto dejavnosti (na uro)
 DocType: Company,Company Info,Informacije o podjetju
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Družba E-pošta ID ni mogoče najti, zato pošta ni poslala"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Uporaba sredstev (sredstva)
 DocType: Production Planning Tool,Filter based on item,"Filter, ki temelji na točki"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Debetni račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debetni račun
 DocType: Fiscal Year,Year Start Date,Leto Start Date
 DocType: Attendance,Employee Name,ime zaposlenega
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaokrožena Skupaj (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Ne more prikrite skupini, saj je izbrana vrsta računa."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Ne more prikrite skupini, saj je izbrana vrsta računa."
 DocType: Purchase Common,Purchase Common,Nakup Splošno
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} je bila spremenjena. Osvežite.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop uporabnike iz česar dopusta aplikacij na naslednjih dneh.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Od Priložnost
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Zaslužki zaposlencev
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted Količina
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne obstaja
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Računi zbrana strankam.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} naročnikov dodane
 DocType: Maintenance Schedule,Schedule,Urnik
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Določite proračun za to stroškovno mesto. Če želite nastaviti proračunske ukrepe, glejte &quot;Seznam Company&quot;"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,Branje 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Bon Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
 DocType: Expense Claim,Approved,Odobreno
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot &quot;levo&quot;
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Vpisi računovodstvo lista.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Na voljo Količina na IZ SKLADIŠČA
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Vrstica {0}: Party / račun se ne ujema z {1} / {2} v {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Vrstica {0}: Party / račun se ne ujema z {1} / {2} v {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Če želite ustvariti davčnem obračunu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Vnesite Expense račun
 DocType: Account,Stock,Stock
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,Naročilo End Date
 DocType: Sales Order,Track this Sales Order against any Project,Sledi tej Sales Order proti kateri koli projekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodajne Pull naročil (v pričakovanju, da poda), na podlagi zgornjih meril"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Od dobavitelja Kotacija
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Od dobavitelja Kotacija
 DocType: Deduction Type,Deduction Type,Vrsta Odbitka
 DocType: Attendance,Half Day,Poldnevni
 DocType: Pricing Rule,Min Qty,Min Kol
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,Transakcijski Datum
 DocType: Production Plan Item,Planned Qty,Načrtovano Kol
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Skupna davčna
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Za Količina (Izdelano Kol) obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Za Količina (Izdelano Kol) obvezna
 DocType: Stock Entry,Default Target Warehouse,Privzeto Target Skladišče
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (družba Valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Vrstica {0}: Vrsta stranka in stranka se uporablja samo zoper terjatve / obveznosti račun
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,Komisija Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Naredite Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikacije blok dopustu oddelka.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Košarica je Prazna
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košarica je Prazna
 DocType: Production Order,Actual Operating Cost,Dejanski operacijski stroškov
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root ni mogoče urejati.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root ni mogoče urejati.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,"Lahko dodeli znesek, ki ni večja od unadusted zneska"
 DocType: Manufacturing Settings,Allow Production on Holidays,Dovoli Proizvodnja na počitnicah
 DocType: Sales Order,Customer's Purchase Order Date,Stranke Naročilo Datum
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Oblikovalec
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Pogoji Template
 DocType: Serial No,Delivery Details,Dostava Podrobnosti
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},"Stroškov Center, je potrebno v vrstici {0} v Davki miza za tip {1}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},"Stroškov Center, je potrebno v vrstici {0} v Davki miza za tip {1}"
 DocType: Item,Automatically create Material Request if quantity falls below this level,Samodejno ustvari Material Zahtevaj če količina pade pod to raven
 ,Item-wise Purchase Register,Element-pametno Nakup Registriraj se
 DocType: Batch,Expiry Date,Rok uporabnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Če želite nastaviti raven naročanje, mora postavka biti Nakup Postavka ali Manufacturing Postavka"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Če želite nastaviti raven naročanje, mora postavka biti Nakup Postavka ali Manufacturing Postavka"
 ,Supplier Addresses and Contacts,Dobavitelj Naslovi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Prosimo, izberite kategorijo najprej"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Master projekt.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Poldnevni)
 DocType: Supplier,Credit Days,Kreditne dnevi
 DocType: Leave Type,Is Carry Forward,Se Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Dobili predmetov iz BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Dobili predmetov 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/config/manufacturing.py +120,Bill of Materials,Kosovnica
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Vrstica {0}: Vrsta stranka in stranka je potrebna za terjatve / obveznosti račun {1}
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,Razlog za odhod
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionirano Znesek
 DocType: GL Entry,Is Opening,Je Odpiranje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Vrstica {0}: debetna vnos ne more biti povezano z {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Račun {0} ne obstaja
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Vrstica {0}: debetna vnos ne more biti povezano z {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Račun {0} ne obstaja
 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 d6d2dfe..042e89a 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Ju lutem, përzgjidhni Partisë Lloji i parë"
 DocType: Item,Customer Items,Items të konsumatorëve
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Llogaria {0}: llogari Parent {1} nuk mund të jetë libri
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Llogaria {0}: llogari Parent {1} nuk mund të jetë libri
 DocType: Item,Publish Item to hub.erpnext.com,Publikojë pika për hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Njoftime Email
 DocType: Item,Default Unit of Measure,Gabim Njësia e Masës
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta është e nevojshme për Lista Çmimi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Do të llogaritet në transaksion.
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Nga Kërkesë materiale
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Nga Kërkesë materiale
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Aplikuesi
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nuk ka rezultate shumë.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Për të ruajtur të konsumatorëve kodin mençur pika dhe për t&#39;i bërë ato të kërkueshme në bazë të përdorimit të tyre të Kodit, ky opsion"
 DocType: Mode of Payment Account,Mode of Payment Account,Mënyra e Llogarisë Pagesave
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Shfaq Variantet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Sasi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Sasi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredi (obligimeve)
 DocType: Employee Education,Year of Passing,Viti i kalimit
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Në magazinë
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Kujdes shëndetësor
 DocType: Purchase Invoice,Monthly,Mujor
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Vonesa në pagesa (ditë)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faturë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Faturë
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Email Adresa
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Viti Fiskal {0} është e nevojshme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Mbrojtje
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Rezultati (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nuk përputhet me {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nuk përputhet me {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Automjeteve Nuk ka
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Ju lutem, përzgjidhni Lista e Çmimeve"
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,"Ju lutem, përzgjidhni Lista e Çmimeve"
 DocType: Production Order Operation,Work In Progress,Punë në vazhdim
 DocType: Employee,Holiday List,Festa Lista
 DocType: Time Log,Time Log,Koha Identifikohu
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Njëjta kompani është futur më shumë se një herë
 DocType: Employee,Married,I martuar
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nuk lejohet për {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
 DocType: Payment Reconciliation,Reconcile,Pajtojë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Ushqimore
 DocType: Quality Inspection Reading,Reading 1,Leximi 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Bëni Banka Hyrja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondet pensionale
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Magazina është i detyrueshëm nëse lloji i llogarisë është Magazina
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Magazina është i detyrueshëm nëse lloji i llogarisë është Magazina
 DocType: SMS Center,All Sales Person,Të gjitha Person Sales
 DocType: Lead,Person Name,Emri personi
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kontrolloni nëse përsëritura rendit, zgjidhni për të ndaluar përsëritura ose të vënë duhur End Date"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,I interesuar
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill e materialit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Hapje
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Nga {0} në {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Nga {0} në {1}
 DocType: Item,Copy From Item Group,Kopje nga grupi Item
 DocType: Journal Entry,Opening Entry,Hyrja Hapja
 DocType: Stock Entry,Additional Costs,Kostot shtesë
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Llogaria me transaksion ekzistuese nuk mund të konvertohet në grup.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Llogaria me transaksion ekzistuese nuk mund të konvertohet në grup.
 DocType: Lead,Product Enquiry,Produkt Enquiry
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Ju lutemi shkruani kompani parë
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Ju lutemi zgjidhni kompania e parë
 DocType: Employee Education,Under Graduate,Nën diplomuar
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target Në
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target Në
 DocType: BOM,Total Cost,Kostoja Totale
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Identifikohu Aktiviteti:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Item {0} nuk ekziston në sistemin apo ka skaduar
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Item {0} duhet të jetë një Item Blerje
 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 +444,Item {0} is not active or end of life has been reached,Item {0} nuk është aktiv apo fundi i jetës është arritur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Do të rifreskohet pas Sales Fatura është dorëzuar.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Cilësimet për HR Module
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detajet e operacioneve të kryera.
 DocType: Serial No,Maintenance Status,Mirëmbajtja Statusi
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Artikuj dhe Çmimeve
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Nga Data duhet të jetë brenda vitit fiskal. Duke supozuar Nga Data = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Nga Data duhet të jetë brenda vitit fiskal. Duke supozuar Nga Data = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Zgjidhni punonjës për të cilin ju jeni duke krijuar vlerësimit.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Kosto Qendra {0} nuk i përket kompanisë {1}
 DocType: Customer,Individual,Individ
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Paraja neto nga Financimi
 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
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Tjetër Periodik {0} do të krijohet në {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Kontakt Emri
 DocType: Production Plan Item,SO Pending Qty,SO pritje Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Krijon shqip pagave për kriteret e përmendura më sipër.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Nuk ka përshkrim dhënë
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Kërkesë për blerje.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Lehtësimin Data duhet të jetë më i madh se data e bashkimit
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Item Faqja Specifikimi
 DocType: Payment Tool,Reference No,Referenca Asnjë
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Lini Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,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/accounts/utils.py +341,Annual,Vjetor
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pajtimi Item
 DocType: Stock Entry,Sales Invoice No,Shitjet Faturë Asnjë
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Furnizuesi Type
 DocType: Item,Publish in Hub,Publikojë në Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Item {0} është anuluar
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Item {0} është anuluar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Lidhje
 DocType: Shipping Rule,Worldwide Shipping,Shipping në mbarë botën
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Urdhra të konfirmuara nga konsumatorët.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Sugjerime
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Item buxhetet Grupi-i mençur në këtë territor. Ju gjithashtu mund të përfshijë sezonalitetin duke vendosur të Shpërndarjes.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Ju lutemi shkruani grup llogari prind për depo {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagesës kundër {0} {1} nuk mund të jetë më i madh se Outstanding Sasia {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagesës kundër {0} {1} nuk mund të jetë më i madh se Outstanding Sasia {2}
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile Nr
 DocType: Maintenance Schedule,Generate Schedule,Generate Orari
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Fundit
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 karaktere
 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
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Mëso
 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ë
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Manage shitjes person Tree.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Lloji Faturë
 DocType: Sales Invoice Item,Delivery Note,Ofrimit Shënim
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Ngritja Tatimet
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Ngritja Tatimet
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Përmbledhje për këtë javë dhe aktivitete në pritje
 DocType: Workstation,Rent Cost,Qira Kosto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Ju lutem, përzgjidhni muaji dhe viti"
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Në dispozicion në bom, ofrimit Shënim, Blerje Faturës, Rendit Prodhimi, Rendit Blerje, pranimin Blerje, Sales Faturës, Sales Rendit, Stock Hyrja, pasqyrë e mungesave"
 DocType: Item Tax,Tax Rate,Shkalla e tatimit
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Zgjidh Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Zgjidh Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} menaxhohet grumbull-i mençur, nuk mund të pajtohen duke përdorur \ Stock pajtimit, në vend që të përdorin Stock Hyrja"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Convert për të jo-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Pranimi blerje duhet të dorëzohet
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Mjekësor
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Arsyeja për humbjen
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation është i mbyllur në datat e mëposhtme sipas Holiday Lista: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mundësitë
 DocType: Employee,Single,I vetëm
 DocType: Issue,Attachment,Attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Buxheti nuk mund të vendosen për Qendrën Kosto Group
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,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 +563,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 +140,Holiday master.,Mjeshtër pushime.
 DocType: Material Request Item,Required Date,Data e nevojshme
 DocType: Delivery Note,Billing Address,Faturimi Adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Ju lutemi shkruani kodin artikull.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Ju lutemi shkruani kodin artikull.
 DocType: BOM,Costing,Kushton
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Nëse kontrolluar, shuma e taksave do të konsiderohen si të përfshirë tashmë në Printo Tarifa / Shuma Shtyp"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Gjithsej Qty
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikë
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Serial No Garanci Expiry
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Item {0} nuk është Blerje Item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Item {0} nuk është Blerje Item
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} është një adresë e pavlefshme email në &quot;Njoftimi \ Email Address &#39;
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Gjithsej Faturimi Kjo Viti:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Add / Edit taksat dhe tatimet
 DocType: Purchase Invoice,Supplier Invoice No,Furnizuesi Fatura Asnjë
 DocType: Territory,For reference,Për referencë
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Mbyllja (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Mbyllja (Cr)
 DocType: Serial No,Warranty Period (Days),Garanci Periudha (ditë)
 DocType: Installation Note Item,Installation Note Item,Instalimi Shënim Item
 ,Pending Qty,Në pritje Qty
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Shpërndarja mujore ** ju ndihmon të shpërndajë buxhetin tuaj në të gjithë muajt e nëse ju keni sezonalitetin në biznesin tuaj. Për të shpërndarë një buxhet të përdorur këtë shpërndarje, vendosur kjo shpërndarje ** ** mujore në ** Qendra Kosto **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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.py +126,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 +20,Please select Company and Party Type first,"Ju lutem, përzgjidhni kompanisë dhe Partisë Lloji i parë"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Financiare / vit kontabilitetit.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Na vjen keq, Serial Nos nuk mund të bashkohen"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,Projekti Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskale Viti Data e Fillimit nuk duhet të jetë më i madh se vitin fiskal End Date
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskale Viti Data e Fillimit nuk duhet të jetë më i madh se vitin fiskal End Date
 DocType: Warranty Claim,Resolution,Zgjidhje
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dorëzuar: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Dorëzuar: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Llogaria e pagueshme
 DocType: Sales Order,Billing and Delivery Status,Faturimi dhe dorëzimit Statusi
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Konsumatorët të përsëritur
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,Citat Për
 DocType: Lead,Middle Income,Të ardhurat e Mesme
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Hapja (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Shuma e ndarë nuk mund të jetë negative
 DocType: Purchase Order Item,Billed Amt,Faturuar Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Një Magazina logjik kundër të cilit janë bërë të hyra të aksioneve.
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Prodhimi Rendit është i detyrueshëm
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Propozimi Shkrimi
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negative Stock Gabim ({6}) për Item {0} në Magazina {1} në {2} {3} në {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negative Stock Gabim ({6}) për Item {0} në Magazina {1} në {2} {3} në {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskale Viti i kompanisë
 DocType: Packing Slip Item,DN Detail,DN Detail
 DocType: Time Log,Billed,Faturuar
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,Default kushton Vlerësoni
 DocType: Maintenance Schedule,Maintenance Schedule,Mirëmbajtja Orari
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pastaj Çmimeve Rregullat janë filtruar në bazë të konsumatorëve, Grupi Customer, Territorit, Furnizuesin, Furnizuesi Lloji, fushatën, Sales Partner etj"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Ndryshimi neto në Inventarin
 DocType: Employee,Passport Number,Pasaporta Numri
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Menaxher
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Nga marrja Blerje
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Njëjti artikull është futur shumë herë.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Nga marrja Blerje
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Njëjti artikull është futur shumë herë.
 DocType: SMS Settings,Receiver Parameter,Marresit Parametri
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Bazuar Në &#39;dhe&#39; Grupit nga &#39;nuk mund të jetë e njëjtë
 DocType: Sales Person,Sales Person Targets,Synimet Sales Person
 DocType: Production Order Operation,In minutes,Në minuta
 DocType: Issue,Resolution Date,Rezoluta Data
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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}
 DocType: Selling Settings,Customer Naming By,Emërtimi Customer Nga
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convert të Grupit
 DocType: Activity Cost,Activity Type,Aktiviteti Type
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Botime
 DocType: Activity Cost,Projects User,Projektet i përdoruesit
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Konsumuar
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nuk u gjet në detaje Fatura tryezë
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} nuk u gjet në detaje Fatura tryezë
 DocType: Company,Round Off Cost Center,Rrumbullakët Off Qendra Kosto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Vizitoni {0} duhet të anulohet para se anulimi këtë Radhit Sales
 DocType: Material Request,Material Transfer,Transferimi materiale
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Për të gjetur pika në shitje dhe dokumentet e blerjes bazuar në nr e tyre serik. Kjo është gjithashtu mund të përdoret për të gjetur detajet garanci e produktit.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock tanishme
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Magazina refuzuar është e detyrueshme kundër artikull regected
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Gjithsej faturimit këtë vit
 DocType: Account,Expenses Included In Valuation,Shpenzimet e përfshira në Vlerësimit
 DocType: Employee,Provide email id registered in company,Sigurojë id mail regjistruar në kompaninë
 DocType: Hub Settings,Seller City,Shitës qytetit
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Item ka variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Item ka variante.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0} nuk është një gjendje Item
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nuk është një gjendje Item
 DocType: Mode of Payment Account,Default Account,Gabim Llogaria
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,"Ju lutem, përzgjidhni ditë javore jashtë"
 DocType: Production Order Operation,Planned End Time,Planifikuar Fundi Koha
 ,Sales Person Target Variance Item Group-Wise,Sales Person i synuar Varianca Item Grupi i urti
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Llogaria me transaksion ekzistues nuk mund të konvertohet në Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Llogaria me transaksion ekzistues nuk mund të konvertohet në Ledger
 DocType: Delivery Note,Customer's Purchase Order No,Konsumatorit Blerje Rendit Jo
 DocType: Employee,Cell Number,Numri Cell
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Kërkesat Auto Materiale Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,I humbur
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ju nuk mund të hyjë kupon aktual në &quot;Kundër Journal hyrjes &#39;kolonë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Ju nuk mund të hyjë kupon aktual në &quot;Kundër Journal hyrjes &#39;kolonë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energji
 DocType: Opportunity,Opportunity From,Opportunity Nga
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Deklarata mujore e pagave.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Nga {0} nga lloji {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertimi Faktori është e detyrueshme
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Hyrjet e kontabilitetit mund të bëhet kundër nyjet fletë. Entries kundër grupeve nuk janë të lejuara.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Numri i Marrjes Blerje nevojshme për Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Numri i Marrjes Blerje nevojshme për Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item atribut Vlera
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Shitjet fushata.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Lista e Çmimeve nuk zgjidhet
 DocType: Employee,Family Background,Historiku i familjes
 DocType: Process Payroll,Send Email,Dërgo Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nuk ka leje
 DocType: Company,Default Bank Account,Gabim Llogarisë Bankare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Për të filtruar në bazë të Partisë, Partia zgjidhni llojin e parë"
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Gjërat me weightage më të lartë do të tregohet më e lartë
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Banka Pajtimit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Faturat e mia
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Faturat e mia
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Asnjë punonjës gjetur
 DocType: Purchase Order,Stopped,U ndal
 DocType: Item,If subcontracted to a vendor,Në qoftë se nënkontraktuar për një shitës
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Dërgo Tani
 ,Support Analytics,Analytics Mbështetje
 DocType: Item,Website Warehouse,Website Magazina
+DocType: Payment Reconciliation,Minimum Invoice Amount,Shuma minimale Faturë
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Të dhënat C-Forma
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Për të mundësuar &quot;Pika e Shitjes&quot; karakteristika
 DocType: Bin,Moving Average Rate,Moving norma mesatare
 DocType: Production Planning Tool,Select Items,Zgjidhni Items
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},"{0} kundër Bill {1} {2}, datë"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},"{0} kundër Bill {1} {2}, datë"
 DocType: Maintenance Visit,Completion Status,Përfundimi Statusi
 DocType: Sales Invoice Item,Target Warehouse,Target Magazina
 DocType: Item,Allow over delivery or receipt upto this percent,Lejo mbi ofrimin ose pranimin upto këtë qind
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatikisht shkruaj mesazh për dorëzimin e transaksioneve.
 DocType: Production Order,Item To Manufacture,Item Për Prodhimi
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statusi është {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Blerje Rendit për Pagesa
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Blerje Rendit për Pagesa
 DocType: Sales Order Item,Projected Qty,Projektuar Qty
 DocType: Sales Invoice,Payment Due Date,Afati i pageses
 DocType: Newsletter,Newsletter Manager,Newsletter Menaxher
@@ -704,7 +709,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Bilanci i llogarisë tashmë në kredi, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Debitimit &#39;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Bilanci i llogarisë tashmë në kredi, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Debitimit &#39;"
 DocType: Account,Balance must be,Bilanci duhet të jetë
 DocType: Hub Settings,Publish Pricing,Publikimi i Çmimeve
 DocType: Notification Control,Expense Claim Rejected Message,Shpenzim Kërkesa Refuzuar mesazh
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Kursi i këmbimit të monedhës mjeshtër.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} duhet të jetë aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} duhet të jetë aktiv
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Ju lutem zgjidhni llojin e dokumentit të parë
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Lini arkëtim Shuma
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,Default Llogaritë e pagueshme
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Punonjës {0} nuk është aktiv apo nuk ekziston
 DocType: Features Setup,Item Barcode,Item Barkodi
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Item Variantet {0} përditësuar
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Item Variantet {0} përditësuar
 DocType: Quality Inspection Reading,Reading 6,Leximi 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Blerje Faturë Advance
 DocType: Address,Shop,Dyqan
 DocType: Hub Settings,Sync Now,Sync Tani
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,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}
 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.
 DocType: Employee,Permanent Address Is,Adresa e përhershme është
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacioni përfundoi për mënyrën se si shumë mallra të gatshme?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Markë
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Kompensimi për tejkalimin {0} kaloi për Item {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Kompensimi për tejkalimin {0} kaloi për Item {1}.
 DocType: Employee,Exit Interview Details,Detajet Dil Intervista
 DocType: Item,Is Purchase Item,Është Blerje Item
 DocType: Journal Entry Account,Purchase Invoice,Blerje Faturë
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,Gjithsej në fjalë
 DocType: Material Request Item,Lead Time Date,Lead Data Koha
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Ju lutem specifikoni Serial Jo për Item {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Ju lutem specifikoni Serial Jo për Item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Për sendet e &#39;Produkt Bundle&#39;, depo, pa serial dhe Serisë Nuk do të konsiderohet nga &#39;Paketimi listë&#39; tryezë. Nëse Magazina dhe Serisë Nuk janë të njëjta për të gjitha sendet e paketimit për çdo send &#39;produkt Bundle&#39;, këto vlera mund të futen në tabelën kryesore Item, vlerat do të kopjohet në &#39;Paketimi listë&#39; tryezë."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Dërgesat për klientët.
 DocType: Purchase Invoice Item,Purchase Order Item,Rendit Blerje Item
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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 +626,Select Item for Transfer,Përzgjidh Item për transferimin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Lejo përdoruesit të redaktoni listën e çmimeve Vlerësoni në transaksionet
 DocType: Pricing Rule,Max Qty,Max Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Pagesa kundër Sales / Rendit Blerje gjithmonë duhet të shënohet si më parë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimik
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Të gjitha sendet janë tashmë të transferuar për këtë Rendit Production.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Të gjitha sendet janë tashmë të transferuar për këtë Rendit Production.
 DocType: Process Payroll,Select Payroll Year and Month,Zgjidh pagave vit dhe Muaji
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Shko në grupin e duhur (zakonisht Aplikimi i Fondeve&gt; asetet aktuale&gt; llogaritë bankare dhe për të krijuar një llogari të re (duke klikuar mbi Shto fëmijë) të tipit &quot;Banka&quot;
 DocType: Workstation,Electricity Cost,Kosto të energjisë elektrike
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),Të gjitha Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get Paid Përparimet
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Bashkangjit foton tuaj
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Bëj
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Bëj
 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 +3,My Cart,Shporta ime
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Shporta ime
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Hapja Qty
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Llogarisë Bankare
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Tabela atribut është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} nuk mund të jetë negative
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Zbritje
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Zbritje
 DocType: Features Setup,Purchase Discounts,Blerje Zbritje
 DocType: Workstation,Wages,Pagat
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Do të përditësohet vetëm nëse Koha Identifikohu është &#39;billable&#39;
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,Shteti Shipping
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item duhet të shtohen duke përdorur &#39;të marrë sendet nga blerjen Pranimet&#39; button
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Shitjet Shpenzimet
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Blerja Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Blerja Standard
 DocType: GL Entry,Against,Kundër
 DocType: Item,Default Selling Cost Center,Gabim Qendra Shitja Kosto
 DocType: Sales Partner,Implementation Partner,Partner Zbatimi
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,Shpërndarës
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shporta Transporti Rregulla
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Prodhimi Rendit {0} duhet të anulohet para se anulimi këtë Radhit Sales
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Ju lutemi të vendosur &#39;Aplikoni Discount shtesë në&#39;
 ,Ordered Items To Be Billed,Items urdhëruar të faturuar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Nga një distancë duhet të jetë më pak se në rang
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Zgjidh Koha Shkrime dhe Submit për të krijuar një Sales re Faturë.
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Kjo Serisë Koha Identifikohu është faturuar.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Krijo Mundësi
 DocType: Salary Slip,Leave Without Pay,Lini pa pagesë
-DocType: Supplier,Communications,Komunikimet
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Kapaciteti Planifikimi Gabim
 ,Trial Balance for Party,Bilanci gjyqi për Partinë
 DocType: Lead,Consultant,Konsulent
 DocType: Salary Slip,Earnings,Fitim
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Mbaroi Item {0} duhet të jetë hyrë në për hyrje të tipit Prodhimi
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Hapja Bilanci Kontabilitet
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Mbaroi Item {0} duhet të jetë hyrë në për hyrje të tipit Prodhimi
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Hapja Bilanci Kontabilitet
 DocType: Sales Invoice Advance,Sales Invoice Advance,Shitjet Faturë Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Asgjë për të kërkuar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Aktual Data e Fillimit&#39; nuk mund të jetë më i madh se &#39;Lajme End Date&#39;
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,Vitin aktual fiskal
 DocType: Global Defaults,Disable Rounded Total,Disable rrumbullakosura Total
 DocType: Lead,Call,Thirrje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&quot;Hyrjet&quot; nuk mund të jetë bosh
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&quot;Hyrjet&quot; nuk mund të jetë bosh
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate rresht {0} me të njëjtën {1}
 ,Trial Balance,Bilanci gjyqi
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Ngritja Punonjësit
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,User ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Shiko Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Hershme
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Prodhimi kundër Sales Rendit
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Pjesa tjetër e botës
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Nuk është i autorizuar për të redaktuar Llogari ngrirë {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get Faturat e papaguara
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,Vendi i lëshimit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontratë
 DocType: Email Digest,Add Quote,Shto Citim
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Faktori UOM Coversion nevojshme për UOM: {0} në Item: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Faktori UOM Coversion nevojshme për UOM: {0} në Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Shpenzimet indirekte
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Produktet ose shërbimet tuaja
 DocType: Mode of Payment,Mode of Payment,Mënyra e pagesës
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,Website Image should be a public file or website URL,Faqja Image duhet të jetë një file publik ose URL website
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ky është një grup artikull rrënjë dhe nuk mund të redaktohen.
 DocType: Journal Entry Account,Purchase Order,Rendit Blerje
 DocType: Warehouse,Warehouse Contact Info,Magazina Kontaktimit
@@ -1018,8 +1024,8 @@
 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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Pajisje kapitale
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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ë."
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,Qëllim
 DocType: Sales Invoice Item,Edit Description,Ndrysho Përshkrimi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Pritet Data e dorëzimit është më e vogël se sa ishte planifikuar Data e fillimit.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Për Furnizuesin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Për Furnizuesin
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Vendosja Tipi Llogarisë ndihmon në zgjedhjen e kësaj llogarie në transaksionet.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Kompania Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Largohet Total
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,Journal Hyrja
 DocType: Workstation,Workstation Name,Workstation Emri
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Buletinet të kontakteve, të çon."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operacionet nuk mund të lihet bosh.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operacionet nuk mund të lihet bosh.
 ,Delivered Items To Be Billed,Items dorëzohet për t&#39;u faturuar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depo nuk mund të ndryshohet për të Serial Nr
 DocType: Authorization Rule,Average Discount,Discount mesatar
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Nga {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operacioni Përshkrim
 DocType: Item,Will also apply to variants,Gjithashtu do të zbatohet për variante
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Nuk mund të ndryshojë fiskale Viti Fillimit Data dhe viti fiskal End Date herë Viti fiskal është ruajtur.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Nuk mund të ndryshojë fiskale Viti Fillimit Data dhe viti fiskal End Date herë Viti fiskal është ruajtur.
 DocType: Quotation,Shopping Cart,Karrocat
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily largohet
 DocType: Pricing Rule,Campaign,Fushatë
@@ -1100,7 +1106,8 @@
 DocType: Sales Order Item,Planned Quantity,Sasia e planifikuar
 DocType: Purchase Invoice Item,Item Tax Amount,Shuma Tatimore Item
 DocType: Item,Maintain Stock,Ruajtja Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Stock Entries krijuar tashmë për Rendin Production
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,nuk mund të jetë më i madh se 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,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 Slip Deduction,Depends on Leave Without Pay,Varet në pushim pa pagesë
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Kuvendet Nën
 DocType: Shipping Rule Condition,To Value,Të vlerës
 DocType: Supplier,Stock Manager,Stock Menaxher
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Depo Burimi është i detyrueshëm për rresht {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Depo Burimi është i detyrueshëm për rresht {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Shqip Paketimi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Zyra Qira
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setup SMS settings portë
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ka adresë shtuar ende.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation orë pune
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analist
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e JV {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e JV {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",Për të mundësuar &quot;Pika e Shitjes&quot; pikëpamje
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Pagesa nuk mund të bëhet për karrocë bosh
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Pagesa nuk mund të bëhet për karrocë bosh
 DocType: Item,Sales Details,Shitjet Detajet
 DocType: Opportunity,With Items,Me Items
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Në Qty
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,Qendra prind Kosto
 DocType: Sales Invoice,Source,Burim
 DocType: Leave Type,Is Leave Without Pay,Lini është pa pagesë
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nuk u gjetën në tabelën e Pagesave të dhënat
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nuk u gjetën në tabelën e Pagesave të dhënat
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Viti Financiar Data e Fillimit
 DocType: Employee External Work History,Total Experience,Përvoja Total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Paketimi Shqip (s) anulluar
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Paketimi Shqip (s) anulluar
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow nga Investimi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Mallrave dhe Forwarding Pagesat
 DocType: Material Request Item,Sales Order No,Rendit Sales Asnjë
 DocType: Item Group,Item Group Name,Item Emri i Grupit
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materialet Transferimi për prodhimin e
 DocType: Pricing Rule,For Price List,Për listën e çmimeve
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Ekzekutiv Kërko
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Shkalla Blerje për artikull: {0} nuk u gjet, e cila është e nevojshme për të librit hyrje të Kontabilitetit (shpenzimeve). Ju lutemi të përmendim së çmimit të artikullit kundër një listë të çmimeve blerjen."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Shkalla Blerje për artikull: {0} nuk u gjet, e cila është e nevojshme për të librit hyrje të Kontabilitetit (shpenzimeve). Ju lutemi të përmendim së çmimit të artikullit kundër një listë të çmimeve blerjen."
 DocType: Maintenance Schedule,Schedules,Oraret
 DocType: Purchase Invoice Item,Net Amount,Shuma neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Bom Detail Asnjë
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Shtesë Shuma Discount (Valuta Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Gabim: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Gabim: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Ju lutem të krijuar një llogari të re nga Chart e Llogarive.
 DocType: Maintenance Visit,Maintenance Visit,Mirëmbajtja Vizitoni
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Customer&gt; Grupi Customer&gt; Territori
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Hyrja Kontabiliteti për {0} mund të bëhen vetëm në monedhën: {1}
 DocType: Pricing Rule,Pricing Rule,Rregulla e Çmimeve
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Kërkesë materiale për të blerë Radhit
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Kërkesë materiale për të blerë Radhit
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: kthye Item {1} nuk ekziston në {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Llogaritë bankare
 ,Bank Reconciliation Statement,Deklarata Banka Pajtimit
@@ -1225,11 +1233,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Hapja Stock Bilanci
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} duhet të shfaqen vetëm një herë
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Nga Vlera
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Prodhim Sasia është e detyrueshme
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Prodhim Sasia është e detyrueshme
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Shuma nuk pasqyrohet në bankë
 DocType: Quality Inspection Reading,Reading 4,Leximi 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Kërkesat për shpenzimet e kompanisë.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,Kërkesat materiale për të cilat Kuotimet Furnizuesi nuk janë krijuar
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Për të gjetur objekte duke përdorur barcode. Ju do të jenë në gjendje për të hyrë artikuj në Shënimin shitjes dhe ofrimit të Faturës nga skanimi barcode e sendit.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Mark si Dorëzuar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Mark si Dorëzuar
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Bëni Kuotim
 DocType: Dependent Task,Dependent Task,Detyra e varur
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Marresit Lista
 DocType: Payment Tool Detail,Payment Amount,Shuma e pagesës
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Shuma konsumuar
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Shiko
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Shiko
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Ndryshimi neto në para të gatshme
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktura e pagave Zbritje
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostoja e Artikujve emetuara
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Sasia nuk duhet të jetë më shumë se {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Mosha (ditë)
 DocType: Quotation Item,Quotation Item,Citat Item
 DocType: Account,Account Name,Emri i llogarisë
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Nga Data nuk mund të jetë më i madh se deri më sot
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Nga Data nuk mund të jetë më i madh se deri më sot
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} sasi {1} nuk mund të jetë një pjesë
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,Shkalla e konvertimit nuk mund të jetë 0 ose 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Shkalla e konvertimit nuk mund të jetë 0 ose 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Blerje Pranimi {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Blerje Pranimi {0} nuk është dorëzuar
 DocType: Company,Default Payable Account,Gabim Llogaria pagueshme
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% faturuar
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Çështjet e mia
 DocType: BOM Item,BOM Item,Bom Item
 DocType: Appraisal,For Employee,Për punonjësit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,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/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Shuma e pagesës nuk mund të jetë negative
 DocType: Expense Claim,Total Amount Reimbursed,Shuma totale rimbursohen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Kundër Furnizuesin Fatura {0} datë {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Kundër Furnizuesin Fatura {0} datë {1}
 DocType: Customer,Default Price List,E albumit Lista e Çmimeve
 DocType: Payment Reconciliation,Payments,Pagesat
 DocType: Budget Detail,Budget Allocated,Buxheti i alokuar
 DocType: Journal Entry,Entry Type,Hyrja Lloji
 ,Customer Credit Balance,Bilanci Customer Credit
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Ndryshimi neto në llogaritë e pagueshme
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Ju lutem verifikoni id tuaj e-mail
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Customer kërkohet për &#39;Customerwise Discount &quot;
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Update pagesës datat bankare me revista.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktivizo Shporta
 DocType: Employee,Permanent Address,Adresa e përhershme
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Item {0} duhet të jetë një element i Shërbimit.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Advance paguar kundër {0} {1} nuk mund të jetë më e madhe \ se Grand Total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Ju lutemi zgjidhni kodin pika
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Ulja e zbritjes për pushim pa pagesë (LWP)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Njësi e vetme e një artikulli.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Koha Identifikohu Batch {0} duhet të jetë &#39;Dërguar&#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Koha Identifikohu Batch {0} duhet të jetë &#39;Dërguar&#39;
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Magazina kërkohet në radhë nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Magazina kërkohet në radhë nr {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Postar
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Një grup të konsumatorëve ekziston me të njëjtin emër, ju lutem të ndryshojë emrin Customer ose riemërtoni grup të konsumatorëve"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Ju lutem, përzgjidhni {0} parë."
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Teksti {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,"Ju lutem, përzgjidhni {0} parë."
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},Teksti {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Kontakti i ri
 DocType: Territory,Parent Territory,Territori prind
 DocType: Quality Inspection Reading,Reading 2,Leximi 2
 DocType: Stock Entry,Material Receipt,Pranimi materiale
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partia Lloji dhe Partia është e nevojshme për arkëtueshme / pagueshme llogarisë {0}
 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 +210,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 +213,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 +85,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
@@ -1361,15 +1373,15 @@
 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: Sales Invoice Item,Batch No,Batch Asnjë
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Lejo Sales shumta urdhra kundër Rendit Blerje një konsumatorit
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Kryesor
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Kryesor
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Prefiksi vendosur për numëron seri mbi transaksionet tuaja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Urdhri u ndal nuk mund të anulohet. Heq tapën për të anulluar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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: Item,Variants,Variantet
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Bëni Rendit Blerje
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Bëni Rendit Blerje
 DocType: SMS Center,Send To,Send To
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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ë
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Magazina dhe Referenca
 DocType: Supplier,Statutory info and other general information about your Supplier,Info Statutore dhe informacione të tjera të përgjithshme në lidhje me furnizuesit tuaj
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item nuk i lejohet të ketë Rendit prodhimit.
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Shuma e kredisë në llogari në monedhë të
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Koha Shkrime për prodhimin.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplikoni Magazina-i mençur Reorder Niveli
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} duhet të dorëzohet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} duhet të dorëzohet
 DocType: Authorization Control,Authorization Control,Kontrolli Autorizimi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,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/config/projects.py +23,Time Log for tasks.,Koha Identifikohu për detyra.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pagesa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Pagesa
 DocType: Production Order Operation,Actual Time and Cost,Koha aktuale dhe kostos
 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},Kërkesa material i maksimumi {0} mund të jetë bërë për Item {1} kundër Sales Rendit {2}
 DocType: Employee,Salutation,Përshëndetje
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Koleg
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Item {0} nuk është një Item serialized
 DocType: SMS Center,Create Receiver List,Krijo Marresit Lista
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Skaduar
 DocType: Packing Slip,To Package No.,Për paketën Nr
 DocType: Warranty Claim,Issue Date,Çështja Data
 DocType: Activity Cost,Activity Cost,Kosto Aktiviteti
@@ -1449,7 +1461,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Arritur
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territori / Customer
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,p.sh. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e faturës papaguar {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e faturës papaguar {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Me fjalë do të jetë i dukshëm një herë ju ruani Sales Faturë.
 DocType: Item,Is Sales Item,Është Item Sales
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} krijuar
 DocType: Delivery Note Item,Against Sales Order,Kundër Sales Rendit
 ,Serial No Status,Serial Asnjë Statusi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Tabela artikull nuk mund të jetë bosh
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Tabela artikull nuk mund të jetë bosh
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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}"
 DocType: Pricing Rule,Selling,Shitja
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Detyrat dhe Taksat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Ju lutem shkruani datën Reference
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Ju lutem shkruani datën Reference
 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} shënimet e pagesës nuk mund të filtrohen nga {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela për çështje që do të shfaqet në Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Furnizuar Qty
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,Instalimi Koha
 DocType: Sales Invoice,Accounting Details,Detajet Kontabilitet
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Fshij gjitha transaksionet për këtë kompani
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operacioni {1} nuk është përfunduar për {2} Qty e mallrave të kryer në prodhimin Order # {3}. Ju lutem Përditëso statusin operacion anë Koha Shkrime
+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,Row # {0}: Operacioni {1} nuk është përfunduar për {2} Qty e mallrave të kryer në prodhimin Order # {3}. Ju lutem Përditëso statusin operacion anë Koha Shkrime
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investimet
 DocType: Issue,Resolution Details,Rezoluta Detajet
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriteret e pranimit
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,Tabela e qartë
 DocType: Features Setup,Brands,Markat
 DocType: C-Form Invoice Detail,Invoice No,Fatura Asnjë
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Nga Rendit Blerje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Nga Rendit Blerje
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lini nuk mund të zbatohet / anulohet {0} para, si bilanci leja ka qenë tashmë copë dërgohet në regjistrin e ardhshëm alokimit Pushimi {1}"
 DocType: Activity Cost,Costing Rate,Kushton Rate
 ,Customer Addresses And Contacts,Adresat dhe kontaktet Customer
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,Mirëmbajtja Oraret
 ,Quotation Trends,Kuotimit Trendet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,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
 ,Pending Amount,Në pritje Shuma
 DocType: Purchase Invoice Item,Conversion Factor,Konvertimi Faktori
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Pema e llogarive finanial.
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Llogaria {0} duhet të jetë e tipit &quot;aseteve fikse&quot; si i artikullit {1} është një çështje e Aseteve
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Llogaria {0} duhet të jetë e tipit &quot;aseteve fikse&quot; si i artikullit {1} është një çështje e Aseteve
 DocType: HR Settings,HR Settings,HR Cilësimet
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Shpenzim Kërkesa është në pritje të miratimit. Vetëm aprovuesi shpenzimeve mund update statusin.
 DocType: Purchase Invoice,Additional Discount Amount,Shtesë Shuma Discount
 DocType: Leave Block List Allow,Leave Block List Allow,Dërgo Block Lista Lejoni
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportiv
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Gjithsej aktuale
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Njësi
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Kërkesat e shpenzimeve
 DocType: Issue,Support,Mbështetje
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Shiko shportën
 ,BOM Search,Bom Kërko
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Mbyllja (Hapja + arrin)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Ju lutem specifikoni monedhës në Kompaninë
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktori UOM Konvertimi është e nevojshme në rresht {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Data Pastrimi nuk mund të jetë para datës Kontrolloni në rresht {0}
 DocType: Salary Slip,Deduction,Zbritje
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Item Çmimi shtuar për {0} në çmim Lista {1}
 DocType: Address Template,Address Template,Adresa Template
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,Detyrat% Kompletuar
 DocType: Project,Gross Margin,Marzhi bruto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Ju lutemi shkruani Prodhimi pikën e parë
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,përdorues me aftësi të kufizuara
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,përdorues me aftësi të kufizuara
 DocType: Opportunity,Quotation,Citat
 DocType: Salary Slip,Total Deduction,Zbritje Total
 DocType: Quotation,Maintenance User,Mirëmbajtja User
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
 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
@@ -1588,12 +1602,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mbani gjurmët e Fushatave Sales. Mbani gjurmët e kryeson, citatet, Sales Rendit etj nga Fushata për të vlerësuar kthimit mbi investimin."
 DocType: Expense Claim,Approver,Aprovuesi
 ,SO Qty,SO Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Entries Stock ekzistojnë kundër depo {0}, kështu që ju nuk mund të ri-caktojë ose modifikojë Magazina"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Entries Stock ekzistojnë kundër depo {0}, kështu që ju nuk mund të ri-caktojë ose modifikojë Magazina"
 DocType: Appraisal,Calculate Total Score,Llogaritur Gjithsej Vota
 DocType: Supplier Quotation,Manufacturing Manager,Prodhim Menaxher
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Shënim Split dorëzimit në pako.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Dërgesat
+apps/erpnext/erpnext/hooks.py +69,Shipments,Dërgesat
 DocType: Purchase Order Item,To be delivered to customer,Që do të dërgohen për të klientit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Koha Identifikohu Statusi duhet të dorëzohet.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial Asnjë {0} nuk i përkasin ndonjë Magazina
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +356,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
 DocType: Currency Exchange,From Currency,Nga Valuta
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ju lutem, përzgjidhni Shuma e ndarë, tip fature, si dhe numrin e faturës në atleast një rresht"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Rendit Shitjet e nevojshme për Item {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ju lutem, përzgjidhni Shuma e ndarë, tip fature, si dhe numrin e faturës në atleast një rresht"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Rendit Shitjet e nevojshme për Item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Shuma nuk reflektohet në sistemin e
 DocType: Purchase Invoice Item,Rate (Company Currency),Shkalla (Kompania Valuta)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Të tjerët
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,Në Procesin
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
 DocType: Purchase Order Item,Reference Document Type,Referenca Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} kundër Sales Rendit {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} kundër Sales Rendit {1}
 DocType: Account,Fixed Asset,Aseteve fikse
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inventar serialized
 DocType: Activity Type,Default Billing Rate,Default Faturimi Vlerësoni
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Rendit Shitjet për Pagesa
 DocType: Expense Claim Detail,Expense Claim Detail,Shpenzim Kërkesa Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Koha Shkrime krijuar:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,"Ju lutem, përzgjidhni llogarinë e saktë"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,"Ju lutem, përzgjidhni llogarinë e saktë"
 DocType: Item,Weight UOM,Pesha UOM
 DocType: Employee,Blood Group,Grup gjaku
 DocType: Purchase Invoice Item,Page Break,Faqe Pushim
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,Për Koha
 DocType: Authorization Rule,Approving Role (above authorized value),Miratimi Rolit (mbi vlerën e autorizuar)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Për të shtuar nyje fëmijë, të shqyrtojë pemë dhe klikoni në nyjen nën të cilën ju doni të shtoni më shumë nyje."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,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/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} nuk mund të jetë prindi ose fëmija i {2}
 DocType: Production Order Operation,Completed Qty,Kompletuar Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Lista e Çmimeve {0} është me aftësi të kufizuara
 DocType: Manufacturing Settings,Allow Overtime,Lejo jashtë orarit
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numrat Serial nevojshme për Item {1}. Ju keni dhënë {2}.
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,Kodet Customer Item
 DocType: Opportunity,Lost Reason,Humbur Arsyeja
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Krijo Entries pagesës ndaj urdhrave ose faturave.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Adresa e re
 DocType: Quality Inspection,Sample Size,Shembull Madhësi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Të gjitha sendet janë tashmë faturohen
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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
 DocType: Project,External,I jashtëm
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update Kosto
 DocType: Item Reorder,Item Reorder,Item reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Material Transferimi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Material Transferimi
 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."
 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
 DocType: Installation Note,Installation Note,Instalimi Shënim
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Shto Tatimet
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Cash Flow nga Financimi
 ,Financial Analytics,Analytics Financiare
 DocType: Quality Inspection,Verified By,Verifikuar nga
 DocType: Address,Subsidiary,Ndihmës
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,Krijo Kuponi pagave
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Bilanci pritet si për banka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Burimi i Fondeve (obligimeve) të papaguara
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Sasia në rresht {0} ({1}) duhet të jetë e njëjtë me sasinë e prodhuar {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Sasia në rresht {0} ({1}) duhet të jetë e njëjtë me sasinë e prodhuar {2}
 DocType: Appraisal,Employee,Punonjës
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email Nga
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Fto si Përdorues
 DocType: Features Setup,After Sale Installations,Pas Instalimeve Shitje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} është faturuar plotësisht
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} është faturuar plotësisht
 DocType: Workstation Working Hour,End Time,Fundi Koha
 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 +75,Group by Voucher,Grupi nga Bonon
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Kerkohet Në
 DocType: Sales Invoice,Mass Mailing,Mailing Mass
 DocType: Rename Tool,File to Rename,Paraqesë për Rename
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Numri i purchse Rendit nevojshme për Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Numri i purchse Rendit nevojshme për Item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Trego Pagesat
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,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
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,Sales Rendit kërkuar
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Krijo Customer
 DocType: Purchase Invoice,Credit To,Kredia për
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Kryeson Active / Konsumatorët
 DocType: Employee Education,Post Graduate,Post diplomuar
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Mirëmbajtja Orari Detail
 DocType: Quality Inspection Reading,Reading 9,Leximi 9
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,Ngritur nga
 DocType: Payment Tool,Payment Account,Llogaria e pagesës
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Ndryshimi neto në llogarive të arkëtueshme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensues Off
 DocType: Quality Inspection Reading,Accepted,Pranuar
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,Gjithsej shuma e pagesës
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,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 +418,"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 +207,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 +422,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
 DocType: Newsletter,Test,Provë
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Si ka transaksione ekzistuese të aksioneve për këtë artikull, \ ju nuk mund të ndryshojë vlerat e &#39;ka Serial&#39;, &#39;Has Serisë Jo&#39;, &#39;A Stock Item&#39; dhe &#39;Metoda Vlerësimi&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Quick Journal Hyrja
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Hyrja
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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: 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 +157,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 +211,{0} {1} is not submitted,{0} {1} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} nuk është dorëzuar
 apps/erpnext/erpnext/config/stock.py +18,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ë.
 DocType: Purchase Invoice,Terms and Conditions1,Termat dhe Conditions1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,Vlera e autorizuar
 DocType: Contact,Enter department to which this Contact belongs,Shkruani departamentin për të cilin kjo Kontakt takon
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Gjithsej Mungon
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Item ose Magazina për rresht {0} nuk përputhet Materiale Kërkesë
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Item ose Magazina për rresht {0} nuk përputhet Materiale Kërkesë
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Njësia e Masës
 DocType: Fiscal Year,Year End Date,Viti End Date
 DocType: Task Depends On,Task Depends On,Detyra varet
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrata Data e përfundimit duhet të jetë më i madh se data e bashkimit
 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.
 DocType: Customer Group,Has Child Node,Ka Nyja e fëmijëve
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} kundër Rendit Blerje {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} kundër Rendit Blerje {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Shkruani parametrave statike url këtu (P.sh.. Dërguesi = ERPNext, emrin = ERPNext, fjalëkalimi = 1234, etj)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} jo në çdo Viti Fiskal aktive. Për më shumë detaje shikoni {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Kjo është një website shembull auto-generated nga ERPNext
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,Recd Sasia
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nuk mund të prodhojë më shumë Item {0} se sasia Sales Rendit {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
 DocType: Payment Reconciliation,Bank / Cash Account,Llogarisë Bankare / Cash
 DocType: Tax Rule,Billing City,Faturimi i qytetit
 DocType: Global Defaults,Hide Currency Symbol,Fshih Valuta size
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Shpenzimet komunale
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Mbi
 DocType: Buying Settings,Default Buying Price List,E albumit Lista Blerja Çmimi
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Nuk ka punonjës me kriteret e zgjedhura sipër apo rrogës pip krijuar tashmë
 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"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Lloji Pagesa
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Shih &quot;Shkalla e materialeve në bazë të&quot; në nenin kushton
 DocType: Appraisal Goal,Key Responsibility Area,Key Zona Përgjegjësia
 DocType: Item Reorder,Material Request Type,Material Type Kërkesë
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Konvertimi Faktori është i detyrueshëm
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Qendra Kosto
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Kupon #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Ju lutem, përzgjidhni një vlerë për {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Të gjitha adresat.
 DocType: Company,Stock Settings,Stock Cilësimet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Shkrirja është e mundur vetëm nëse prona e mëposhtme janë të njëjta në të dy regjistrat. Është Grupi, Root Type, Kompania"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Shkrirja është e mundur vetëm nëse prona e mëposhtme janë të njëjta në të dy regjistrat. Është Grupi, Root Type, Kompania"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Manage grup të konsumatorëve Tree.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Qendra Kosto New Emri
 DocType: Leave Control Panel,Leave Control Panel,Lini Control Panel
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Detail Tool Pagesa
 ,Sales Browser,Shitjet Browser
 DocType: Journal Entry,Total Credit,Gjithsej Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Warning: Një tjetër {0} # {1} ekziston kundër hyrjes aksioneve {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Warning: Një tjetër {0} # {1} ekziston kundër hyrjes aksioneve {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Kreditë dhe paradhëniet (aktiveve)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorët
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,I madh
@@ -2003,7 +2022,7 @@
 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
 DocType: Production Order Operation,Make Time Log,Bëni kohë Kyçu
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Ju lutemi të vendosur sasinë Reorder
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Ju lutemi të vendosur sasinë Reorder
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Ju lutem të krijuar Customer nga Lead {0}
 DocType: Price List,Applicable for Countries,Të zbatueshme për vendet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Kompjuter
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Asnjë Vërejtje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Asnjë Vërejtje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,I vonuar
 DocType: Account,Stock Received But Not Billed,Stock Marrë Por Jo faturuar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root Llogaria duhet të jetë një grup i
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root Llogaria duhet të jetë një grup i
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto Pay + arrear Shuma + Arkëtim Shuma - Zbritje Total
 DocType: Monthly Distribution,Distribution Name,Emri shpërndarja
 DocType: Features Setup,Sales and Purchase,Shitjet dhe Blerje
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,Bilanci i Partisë
 DocType: Sales Invoice Item,Time Log Batch,Koha Identifikohu Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Ju lutem, përzgjidhni Aplikoni zbritje në"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Shqip Paga Krijuar
 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: Stock Entry,Material Transfer for Manufacture,Transferimi materiale për Prodhimin
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,Gjashtëmujor
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Viti Fiskal {0} nuk u gjet.
 DocType: Bank Reconciliation,Get Relevant Entries,Get gjitha relevante
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Hyrja kontabilitetit për magazinë
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Hyrja kontabilitetit për magazinë
 DocType: Sales Invoice,Sales Team1,Shitjet Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Item {0} nuk ekziston
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Item {0} nuk ekziston
 DocType: Sales Invoice,Customer Address,Customer Adresa
 DocType: Purchase Invoice,Apply Additional Discount On,Aplikoni shtesë zbritje në
 DocType: Account,Root Type,Root Type
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Trego këtë slideshow në krye të faqes
 DocType: BOM,Item UOM,Item UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Shuma e taksave Pas Shuma ulje (Kompania Valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Depo objektiv është i detyrueshëm për rresht {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Depo objektiv është i detyrueshëm për rresht {0}
 DocType: Quality Inspection,Quality Inspection,Cilësia Inspektimi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Vogla
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Ushqim, Pije &amp; Duhani"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ose BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Vetëm mund të bëni pagesën kundër pafaturuar {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,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 +122,Commission rate cannot be greater than 100,Shkalla e Komisionit nuk mund të jetë më e madhe se 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Niveli minimal Inventari
 DocType: Stock Entry,Subcontract,Nënkontratë
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspektimit të cilësisë hyrëse.
 DocType: Purchase Order Item,Returned Qty,U kthye Qty
 DocType: Employee,Exit,Dalje
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Lloji është i detyrueshëm
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root Lloji është i detyrueshëm
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Asnjë {0} krijuar
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Për komoditetin e klientëve, këto kode mund të përdoren në formate të shtypura si faturat dhe ofrimit të shënimeve"
 DocType: Employee,You can enter any date manually,Ju mund të hyjë në çdo datë me dorë
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Periudha provuese
 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 +110,Row {0}: Advance against Customer must be credit,Row {0}: Advance kundër Customer duhet të jetë krediti
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Fatura Blerje Item furnizuar
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Kushtoj
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Kushtoj
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Për datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Shkrime për ruajtjen e statusit të dorëzimit SMS
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Niveli
 DocType: Attendance,Attendance Date,Pjesëmarrja Data
 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 +110,Account with child nodes cannot be converted to ledger,Llogaria me nyje fëmijëve nuk mund të konvertohet në Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Llogaria me nyje fëmijëve nuk mund të konvertohet në Ledger
 DocType: Address,Preferred Shipping Address,Preferuar Transporti Adresa
 DocType: Purchase Receipt Item,Accepted Warehouse,Magazina pranuar
 DocType: Bank Reconciliation Detail,Posting Date,Posting Data
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Asnjë {0} nuk ekziston
 DocType: Pricing Rule,Discount Percentage,Përqindja Discount
 DocType: Payment Reconciliation Invoice,Invoice Number,Numri i faturës
-apps/erpnext/erpnext/hooks.py +54,Orders,Urdhërat
+apps/erpnext/erpnext/hooks.py +55,Orders,Urdhërat
 DocType: Leave Control Panel,Employee Type,Lloji punonjës
 DocType: Employee Leave Approver,Leave Approver,Lini aprovuesi
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Transferuar për Prodhime
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% E materialeve faturuar kundër këtij Rendit Shitje
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periudha Mbyllja Hyrja
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizim
+DocType: Account,Depreciation,Amortizim
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizuesi (s)
 DocType: Customer,Credit Limit,Limit Credit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Përzgjidhni llojin e transaksionit
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,Kërkuar Për
 DocType: Quotation Item,Against Doctype,Kundër DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Përcjell këtë notën shpërndarëse kundër çdo Projektit
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Llogari rrënjë nuk mund të fshihet
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Paraja neto nga Investimi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Llogari rrënjë nuk mund të fshihet
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Shfaq Stock Entries
 ,Is Primary Address,Është Adresimi Fillor
 DocType: Production Order,Work-in-Progress Warehouse,Puna në progres Magazina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referenca # {0} datë {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referenca # {0} datë {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Manage Adresat
 DocType: Pricing Rule,Item Code,Kodi i artikullit
 DocType: Production Planning Tool,Create Production Orders,Krijo urdhërat e prodhimit
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,Përdoruesi Vërejtje
 DocType: Lead,Market Segment,Segmenti i Tregut
 DocType: Employee Internal Work History,Employee Internal Work History,Punonjës historia e Brendshme
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Mbyllja (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Mbyllja (Dr)
 DocType: Contact,Passive,Pasiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Asnjë {0} nuk në magazinë
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Template taksave për shitjen e transaksioneve.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,Shuma e faturuar
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Pajtimit
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get Updates
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiali Kërkesë {0} është anuluar ose ndërprerë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Materiali Kërkesë {0} është anuluar ose ndërprerë
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Shto një pak të dhënat mostër
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lini Menaxhimi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupi nga Llogaria
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kreu llogari nën përgjegjësisë, në të cilën Fitimi / Humbja do të rezervuar"
 DocType: Payment Tool,Against Vouchers,Kundër kuponit
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ndihmë Quick
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Shitjet Extras
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} buxheti për llogaria {1} kundër Qendra Kosto {2} do të kalojë nga {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
 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;
 ,Stock Projected Qty,Stock Projektuar Qty
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
 DocType: Sales Order,Customer's Purchase Order,Rendit Blerje konsumatorit
 DocType: Warranty Claim,From Company,Nga kompanisë
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Vlera ose Qty
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Dërgo Block Lista Lejohet
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Ju do të përdorin atë për Hyr
 DocType: Sales Partner,Retailer,Shitës me pakicë
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredi në llogarinë duhet të jetë një llogari Bilanci i Gjendjes
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Gjitha llojet Furnizuesi
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +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/selling/doctype/sales_order/sales_order.py +93,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
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Pesha bruto e paketës. Zakonisht pesha neto + paketimin pesha materiale. (Për shtyp)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Përdoruesit me këtë rol janë të lejuara për të ngritur llogaritë ngrirë dhe për të krijuar / modifikuar shënimet e kontabilitetit kundrejt llogarive të ngrira
 DocType: Serial No,Is Cancelled,Është anuluar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Dërgesat e mia
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Dërgesat e mia
 DocType: Journal Entry,Bill Date,Bill Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Edhe në qoftë se ka rregulla të shumta çmimeve me prioritet më të lartë, prioritetet e brendshme atëherë në vijim aplikohen:"
 DocType: Supplier,Supplier Details,Detajet Furnizuesi
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Telefonatat
 DocType: Project,Total Costing Amount (via Time Logs),Shuma kushton (nëpërmjet Koha Shkrime)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Blerje Rendit {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Blerje Rendit {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Projektuar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Asnjë {0} nuk i përkasin Magazina {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Shënim: Sistemi nuk do të kontrollojë mbi-ofrimit dhe mbi-prenotim për Item {0} si sasi apo shumë është 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Shënim: Sistemi nuk do të kontrollojë mbi-ofrimit dhe mbi-prenotim për Item {0} si sasi apo shumë është 0
 DocType: Notification Control,Quotation Message,Citat Mesazh
 DocType: Issue,Opening Date,Hapja Data
 DocType: Journal Entry,Remark,Vërejtje
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,Batched për faturim
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Faturat e ngritura nga furnizuesit.
 DocType: POS Profile,Write Off Account,Shkruani Off Llogari
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Paraja neto nga operacionet
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,p.sh. TVSH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Pika 4
 DocType: Journal Entry Account,Journal Entry Account,Llogaria Journal Hyrja
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,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
 DocType: Sales Invoice,Against Income Account,Kundër llogarisë së të ardhurave
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Dorëzuar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Synimet Territory
 DocType: Delivery Note,Transporter Info,Transporter Informacion
@@ -2421,10 +2443,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numri i Batch është i detyrueshëm për Item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Ky është një person i shitjes rrënjë dhe nuk mund të redaktohen.
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Shkalla: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Shkalla: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Paga Shqip Zbritje
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Zgjidh një nyje grupi i parë.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Qëllimi duhet të jetë një nga {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Qëllimi duhet të jetë një nga {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Plotësoni formularin dhe për të shpëtuar atë
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Shkarko një raport që përmban të gjitha lëndëve të para me statusin e tyre të fundit inventar
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forumi Komuniteti
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Kompani (jo Customer ose Furnizuesi) mjeshtër.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Ju lutemi shkruani &#39;datës së pritshme dorëzimit&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nuk është një numër i vlefshëm Batch për Item {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Shënim: Nuk ka bilanc mjaft leje për pushim Lloji {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Shënim: Në qoftë se pagesa nuk është bërë kundër çdo referencë, e bëjnë Journal Hyrja dorë."
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Dërgo email automatike në Kontaktet për transaksionet Dorëzimi.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Qty nuk avalable në magazinë {1} në {2} {3}. Në dispozicion Qty: {4}, Transferimi Qty: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Pika 3
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Sales Team,Contribution (%),Kontributi (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Përgjegjësitë
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Shabllon
 DocType: Sales Person,Sales Person Name,Sales Person Emri
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Para se të pajtimit
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,Gabim bom
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Ju lutem ri-lloj emri i kompanisë për të konfirmuar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Outstanding Amt Total
 DocType: Time Log Batch,Total Hours,Totali Orë
 DocType: Journal Entry,Printing Settings,Printime Cilësimet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Debiti i përgjithshëm duhet të jetë e barabartë me totalin e kredisë. Dallimi është {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Debiti i përgjithshëm duhet të jetë e barabartë me totalin e kredisë. Dallimi është {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilistik
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Nga dorëzim Shënim
 DocType: Time Log,From Time,Nga koha
 DocType: Notification Control,Custom Message,Custom Mesazh
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investimeve Bankare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,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/accounts/doctype/sales_invoice/sales_invoice.py +374,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
 DocType: Purchase Invoice,Price List Exchange Rate,Lista e Çmimeve Exchange Rate
 DocType: Purchase Invoice Item,Rate,Normë
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Mjek praktikant
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","Multiple Rregulla Çmimi ekziston me kritere të njëjta, ju lutemi të zgjidhur \ konfliktin me jepte prioritet. Rregullat Çmimi: {0}"
 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 +580,Issue Material,Materiali çështje
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Materiali çështje
 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
 DocType: Hub Settings,Access Token,Qasja Token
 DocType: Sales Invoice Item,Serial No,Serial Asnjë
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Ju lutemi shkruani maintaince Detaje parë
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Shuma maksimale Faturë
 DocType: Purchase Invoice Item,Image View,Image Shiko
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Vlerësimi dhe Total
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Ky artikull është një variant i {0} (Stampa). Atributet do të kopjohet gjatë nga template nëse &#39;Jo Copy &quot;është vendosur
 DocType: Account,Purchase User,Blerje User
 DocType: Notification Control,Customize the Notification,Customize Njoftimin
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cash Flow nga operacionet
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Default Adresa Template nuk mund të fshihet
 DocType: Sales Invoice,Shipping Rule,Rregulla anijeve
 DocType: Journal Entry,Print Heading,Printo Kreu
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Raw Material
 DocType: Leave Application,Follow via Email,Ndiqni nëpërmjet Email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Shuma e taksave Pas Shuma ulje
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,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 +335,Please select Posting Date first,"Ju lutem, përzgjidhni datën e postimit parë"
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos kërkuar për Item serialized {0}
 DocType: Journal Entry,Bank Entry,Banka Hyrja
 DocType: Authorization Rule,Applicable To (Designation),Për të zbatueshme (Përcaktimi)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Futeni në kosh
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupi Nga
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Enable / disable monedhave.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Shpenzimet postare
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,Data në të cilën mënyrë periodike do të ndalet
 DocType: Quality Inspection,Item Serial No,Item Nr Serial
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} duhet të reduktohet me {1} ose ju duhet të rritet toleranca del nga shtrati
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} duhet të reduktohet me {1} ose ju duhet të rritet toleranca del nga shtrati
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,I pranishëm Total
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Orë
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Item serialized {0} nuk mund të rifreskohet \ përdorur Stock Pajtimin
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferimi materiale të Furnizuesit
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Transferimi materiale të Furnizuesit
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Krijo Kuotim
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Ju nuk jeni i autorizuar të miratojë lë në datat Block
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Të gjitha këto objekte janë tashmë faturohen
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Të gjitha këto objekte janë tashmë faturohen
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Mund të miratohet nga {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Shipping Rregulla Kushte
 DocType: BOM Replace Tool,The new BOM after replacement,BOM ri pas zëvendësimit
 DocType: Features Setup,Point of Sale,Pika e Shitjes
 DocType: Account,Tax,Tatim
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rresht {0}: {1} nuk eshte e vlefshme {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Nga Bundle produktit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Nga Bundle produktit
 DocType: Production Planning Tool,Production Planning Tool,Planifikimi Tool prodhimit
 DocType: Quality Inspection,Report Date,Raporti Data
 DocType: C-Form,Invoices,Faturat
 DocType: Job Opening,Job Title,Titulli Job
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Marrësit
 DocType: Features Setup,Item Groups in Details,Grupet pika në detaje
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Sasi të Prodhimi duhet të jetë më e madhe se 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Fillimi Point-of-Sale (POS)
@@ -2618,8 +2644,9 @@
 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: Pricing Rule,Customer Group,Grupi Klientit
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Llogari shpenzim është i detyrueshëm për pikën {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Llogari shpenzim është i detyrueshëm për pikën {0}
 DocType: Item,Website Description,Website Përshkrim
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Ndryshimi neto në ekuitetit
 DocType: Serial No,AMC Expiry Date,AMC Data e Mbarimit
 ,Sales Register,Shitjet Regjistrohu
 DocType: Quotation,Quotation Lost Reason,Citat Humbur Arsyeja
@@ -2627,12 +2654,12 @@
 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/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Përmbledhje për këtë muaj dhe aktivitetet në pritje
 DocType: Customer Group,Customer Group Name,Emri Grupi Klientit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Atributet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Get Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Ju lutem, jepini të anullojë Llogari"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Get Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Ju lutem, jepini të anullojë Llogari"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Rendit fundit Date
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Bëni Akciza Faturë
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Llogaria {0} nuk i takon kompanisë {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Të dhënat Project-i mençur nuk është në dispozicion për Kuotim
 DocType: Project,Expected End Date,Pritet Data e Përfundimit
 DocType: Appraisal Template,Appraisal Template Title,Vlerësimi Template Titulli
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Komercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Komercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Prind Item {0} nuk duhet të jetë një Stock Item
 DocType: Cost Center,Distribution Id,Shpërndarja Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Sherbime tmerrshëm
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vlera për atribut {0} duhet të jetë brenda intervalit {1} të {2} në increments e {3}
 DocType: Tax Rule,Sales,Shitjet
 DocType: Stock Entry Detail,Basic Amount,Shuma bazë
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
 DocType: Leave Allocation,Unused leaves,Gjethet e papërdorura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default llogarive të arkëtueshme
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Pranimet Blerje
-DocType: Payment Reconciliation,Maximum Amount,Shuma maksimale
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Si Rregulla e Çmimeve aplikohet?
 DocType: Quality Inspection,Delivery Note No,Ofrimit Shënim Asnjë
 DocType: Company,Retail,Me pakicë
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Customer {0} nuk ekziston
 DocType: Attendance,Absent,Që mungon
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle produkt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: referencë Invalid {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle produkt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Row {0}: referencë Invalid {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Blerje taksat dhe tatimet Template
 DocType: Upload Attendance,Download Template,Shkarko Template
 DocType: GL Entry,Remarks,Vërejtje
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,Mujore Sheet Pjesëmarrja
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nuk ka Record gjetur
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Qendra Kosto është e detyrueshme për Item {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Të marrë sendet nga Bundle produktit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Të marrë sendet nga Bundle produktit
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Llogaria {0} është joaktiv
 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
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Fitimi dhe Humbja &#39;llogaria lloj {0} nuk lejohen në Hapja Hyrja
 DocType: Features Setup,Sales Discounts,Shitjet Zbritje
 DocType: Hub Settings,Seller Country,Shitës Vendi
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publikojnë artikuj në faqen
 DocType: Authorization Rule,Authorization Rule,Rregulla Autorizimi
 DocType: Sales Invoice,Terms and Conditions Details,Termat dhe Kushtet Detajet
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Specifikimet
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Shitjet Taksat dhe Tarifat Stampa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Veshmbathje &amp; Aksesorë
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Numri i Rendit
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,Shuma Faturimi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Sasia e pavlefshme specifikuar për pika {0}. Sasia duhet të jetë më i madh se 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Aplikimet për leje.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Llogaria me transaksion ekzistues nuk mund të fshihet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Llogaria me transaksion ekzistues nuk mund të fshihet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Shpenzimet ligjore
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Ditë të muajit në të cilin rendi auto do të gjenerohet p.sh. 05, 28 etj"
 DocType: Sales Invoice,Posting Time,Posting Koha
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,Avari
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Llogaria: {0} me monedhën: {1} nuk mund të zgjidhen
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Data
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Llogaria {0}: llogari Parent {1} nuk i përkasin kompanisë: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Llogaria {0}: llogari Parent {1} nuk i përkasin kompanisë: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Sukses të fshihen të gjitha transaksionet që lidhen me këtë kompani!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Si në Data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Provë
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Gabim Magazina është e detyrueshme për aksioneve Item.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Gabim Magazina është e detyrueshme për aksioneve Item.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pagesa e pagës për muajin {0} dhe vitin {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Shkalla Lista e Çmimeve nëse mungon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Gjithsej shuma e paguar
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Shuma totale Faturimi (nëpërmjet Koha Shkrime)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Ne shesim këtë artikull
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Furnizuesi Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Sasia duhet të jetë më e madhe se 0
 DocType: Journal Entry,Cash Entry,Hyrja Cash
 DocType: Sales Partner,Contact Desc,Kontakt Përshkrimi
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Lloji i lë si rastësor, të sëmurë etj"
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Shto rreshtave për të vendosur buxhetet vjetore në llogaritë.
 DocType: Buying Settings,Default Supplier Type,Gabim Furnizuesi Type
 DocType: Production Order,Total Operating Cost,Gjithsej Kosto Operative
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Shënim: Item {0} hyrë herë të shumta
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Shënim: Item {0} hyrë herë të shumta
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Të gjitha kontaktet.
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Shkurtesa kompani
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Të gjitha grupet e konsumatorëve
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Template tatimi është i detyrueshëm.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Llogaria {0}: llogari Parent {1} nuk ekziston
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,I përkohshëm
 DocType: Address,Preferred Billing Address,Preferuar Faturimi Adresa
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,Pika-mençur Lista e Çmimeve Rate
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} është ndalur
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} është ndalur
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
 DocType: Lead,Add to calendar on this date,Shtoni në kalendarin në këtë datë
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Rregullat për të shtuar shpenzimet e transportit detar.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Ngjarje të ardhshme
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,Nga Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Urdhërat lëshuar për prodhim.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Zgjidh Vitin Fiskal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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 +455,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
 DocType: Hub Settings,Name Token,Emri Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Shitja Standard
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast një depo është e detyrueshme
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,Nga Garanci
 DocType: BOM Replace Tool,Replace,Zëvendësoj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} kundër Shitjeve Faturës {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ju lutem shkruani Njësia e parazgjedhur e Masës
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} kundër Shitjeve Faturës {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Ju lutem shkruani Njësia e parazgjedhur e Masës
 DocType: Purchase Invoice Item,Project Name,Emri i Projektit
 DocType: Supplier,Mention if non-standard receivable account,Përmend në qoftë se jo-standarde llogari të arkëtueshme
 DocType: Journal Entry Account,If Income or Expense,Nëse të ardhura ose shpenzime
 DocType: Features Setup,Item Batch Nos,Item Serisë Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Vlera e aksioneve Diferenca
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Burimeve Njerëzore
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Pasuritë tatimore
 DocType: BOM Item,BOM No,Bom Asnjë
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Moving Mesatare
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM i cili do të zëvendësohet
 DocType: Account,Debit,Debi
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,Kosto shtesë
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Viti Financiar End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nuk mund të filtruar në bazë të Voucher Jo, qoftë të grupuara nga Bonon"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
 DocType: Quality Inspection,Incoming,Hyrje
 DocType: BOM,Materials Required (Exploded),Materialet e nevojshme (Shpërtheu)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Ulja e Fituar për pushim pa pagesë (LWP)
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: serial {1} nuk përputhet me {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Lini Rastesishme
 DocType: Batch,Batch ID,ID Batch
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Shënim: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Shënim: {0}
 ,Delivery Note Trends,Trendet ofrimit Shënim
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Përmbledhja e kësaj jave
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} duhet të jetë një element i blerë ose nën-kontraktuar në rresht {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Blerja Rate
 DocType: Task,Actual Time (in Hours),Koha aktuale (në orë)
 DocType: Employee,History In Company,Historia Në kompanisë
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Sasia totale Issue / Transferim {0} në materiale Kërkesën {1} nuk mund të jetë më e madhe se sasia e kërkuar {2} për {3} Item
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Buletinet
 DocType: Address,Shipping,Transporti
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Hyrja
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,Data e fundit e periudhës së urdhrit aktual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Të bëjë ofertën Letër
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Kthimi
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Default njësinë e matjes për Varianti duhet të jetë i njëjtë si Template
 DocType: Production Order Operation,Production Order Operation,Prodhimit Rendit Operacioni
 DocType: Pricing Rule,Disable,Disable
 DocType: Project Task,Pending Review,Në pritje Rishikimi
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Customer Id
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Për Koha duhet të jetë më e madhe se sa nga koha
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazina {0}: llogari Parent {1} nuk Bolong të kompanisë {2}
 DocType: BOM,Last Purchase Rate,Rate fundit Blerje
 DocType: Account,Asset,Pasuri
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,Stock dispozicion për Items Paketimi
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Vendosja këtë adresë Template si default pasi nuk ka asnjë mungesë tjetër
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Menaxhimit të Cilësisë
 DocType: Production Planning Tool,Filter based on customer,Filter bazuar në klient
 DocType: Payment Tool Detail,Against Voucher No,Kundër Voucher Nr
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,Kontaktoni Next
 DocType: Employee,Employment Type,Lloji Punësimi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Mjetet themelore
+,Cash Flow,Cash Flow
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Periudha e aplikimit nuk mund të jetë në dy regjistrave alokimin
 DocType: Item Group,Default Expense Account,Llogaria e albumit shpenzimeve
 DocType: Employee,Notice (days),Njoftim (ditë)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,Depot
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print dhe stacionare
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Nyja grup
-DocType: Payment Reconciliation,Minimum Amount,Shuma minimale
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Update Mbaroi Mallrat
 DocType: Workstation,per hour,në orë
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Llogaria për depo (Inventari pandërprerë) do të krijohet në bazë të kësaj llogarie.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depo nuk mund të fshihet si ekziston hyrja aksioneve librit për këtë depo.
 DocType: Company,Distribution,Shpërndarje
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Shuma e paguar
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Shuma e paguar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Menaxher i Projektit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dërgim
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max zbritje lejohet për artikull: {0} është {1}%
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Mbështetje
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Kompania është e humbur në depo {0}
 DocType: POS Profile,Terms and Conditions,Termat dhe Kushtet
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Deri më sot duhet të jetë brenda vitit fiskal. Duke supozuar në datën = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Deri më sot duhet të jetë brenda vitit fiskal. Duke supozuar në datën = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Këtu ju mund të mbajë lartësia, pesha, alergji, shqetësimet mjekësore etj"
 DocType: Leave Block List,Applies to Company,Zbatohet për Kompaninë
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Nuk mund të anulojë, sepse paraqitet Stock Hyrja {0} ekziston"
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Ju lutemi shkruani Pranimet Blerje
 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 +425,Transaction not allowed against stopped Production Order {0},Transaksioni nuk lejohet kundër Prodhimit ndalur Rendit {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup server hyrje për mbështetjen e email id. (P.sh. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mungesa Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
 DocType: Salary Slip,Salary Slip,Shqip paga
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Deri më sot&quot; është e nevojshme
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generate paketim rrëshqet për paketat që do të dërgohen. Përdoret për të njoftuar numrin paketë, paketë përmbajtjen dhe peshën e saj."
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Të dhënat punonjës.
 DocType: HR Settings,Payroll Settings,Listën e pagave Cilësimet
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Përputhje për Faturat jo-lidhura dhe pagesat.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Vendi Renditja
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Vendi Renditja
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Rrënjë nuk mund të ketë një qendër me kosto prind
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Zgjidh Markë ...
 DocType: Sales Invoice,C-Form Applicable,C-Formulari i zbatueshëm
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,Data e Fillimit
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Alokimi i lë për një periudhë.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Kliko këtu për të verifikuar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Llogaria {0}: Ju nuk mund të caktojë veten si llogari prind
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Llogaria {0}: Ju nuk mund të caktojë veten si llogari prind
 DocType: Purchase Invoice Item,Price List Rate,Lista e Çmimeve Rate
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Trego &quot;Në magazinë&quot; ose &quot;Jo në magazinë&quot; në bazë të aksioneve në dispozicion në këtë depo.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill e materialeve (BOM)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,Pritet Data e Fillimit
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Hiq pika në qoftë se akuza nuk është i zbatueshëm për këtë artikull
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,P.sh.. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Merre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Merre
 DocType: Maintenance Visit,Fully Completed,Përfunduar Plotësisht
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Kualifikimi arsimor
 DocType: Workstation,Operating Costs,Shpenzimet Operative
 DocType: Employee Leave Approver,Employee Leave Approver,Punonjës Pushimi aprovuesi
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} është shtuar me sukses në listën tonë Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Nuk mund të deklarojë si të humbur, sepse Kuotim i është bërë."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Blerje Master Menaxher
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Prodhimi Rendit {0} duhet të dorëzohet
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Prodhimi Rendit {0} duhet të dorëzohet
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +136,Main Reports,Raportet kryesore
 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
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,Industria Type
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Diçka shkoi keq!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Warning: Lini aplikimi përmban datat e mëposhtme bllok
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Shitjet Faturë {0} tashmë është dorëzuar
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Shitjet Faturë {0} tashmë është dorëzuar
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data e përfundimit
 DocType: Purchase Invoice Item,Amount (Company Currency),Shuma (Kompania Valuta)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Njësia Organizata (departamenti) mjeshtër.
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,Serial Asnjë Shërbimit Kontratë Expiry
 DocType: Item,Unit of Measure Conversion,Njësia e masës këmbimit
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Punonjësi nuk mund të ndryshohet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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ë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,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ë
 DocType: Naming Series,Help HTML,Ndihmë HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage Gjithsej caktuar duhet të jetë 100%. Kjo është {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Kompensimi për tejkalimin {0} kaloi për Item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Kompensimi për tejkalimin {0} kaloi për Item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Emri i personit ose organizatës që kjo adresë takon.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Furnizuesit tuaj
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nuk mund të vendosur si Humbur si Sales Order është bërë.
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,Data e lëshimit
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Nga {0} për {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Furnizuesi Set për pika {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Ju lutem kontrolloni opsionin Multi Valuta për të lejuar llogaritë me valutë tjetër
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Ju lutem kontrolloni opsionin Multi Valuta për të lejuar llogaritë me valutë tjetër
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} nuk ekziston në sistemin
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Ju nuk jeni i autorizuar për të vendosur vlerën e ngrira
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Ju nuk jeni i autorizuar për të vendosur vlerën e ngrira
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Unreconciled Entries
+DocType: Payment Reconciliation,From Invoice Date,Nga Faturë Data
 DocType: Cost Center,Budgets,Buxhetet
-DocType: Employee,Emergency Contact Details,Detajet emergjente Kontakt
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Çfarë do të bëni?
 DocType: Delivery Note,To Warehouse,Për Magazina
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Llogaria {0} ka hyrë më shumë se një herë për vitin fiskal {1}
 ,Average Commission Rate,Mesatare Rate Komisioni
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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/hr/doctype/attendance/attendance.py +34,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ë
 DocType: Purchase Taxes and Charges,Account Head,Shef llogari
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Update shpenzimet shtesë për të llogaritur koston ul të artikujve
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
 DocType: Stock Entry,Total Value Difference (Out - In),Gjithsej Diferenca Vlera (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate është i detyrueshëm
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate është i detyrueshëm
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Përdoruesi ID nuk është caktuar për punonjësit {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Nga Garanci Kërkesës
 DocType: Stock Entry,Default Source Warehouse,Gabim Burimi Magazina
 DocType: Item,Customer Code,Kodi Klientit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Vërejtje ditëlindjen për {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Ditët Që Rendit Fundit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Pasuritë e aksioneve
@@ -3271,7 +3301,7 @@
 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
 DocType: Authorization Rule,Based On,Bazuar në
 DocType: Sales Order Item,Ordered Qty,Urdhërohet Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Item {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Item {0} është me aftësi të kufizuara
 DocType: Stock Settings,Stock Frozen Upto,Stock ngrira Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periudha nga dhe periudha në datat e detyrueshme për të përsëritura {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Aktiviteti i projekt / detyra.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Shkruaj Off Shuma (Kompania Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
 DocType: Landed Cost Voucher,Landed Cost Voucher,Zbarkoi Voucher Kosto
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ju lutemi të vendosur {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Përsëriteni në Ditën e Muajit
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,Ngarko Pjesëmarrja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM dhe Prodhim Sasi janë të nevojshme
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gama plakjen 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Sasi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Sasi
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom zëvendësohet
 ,Sales Analytics,Sales Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Prodhim Cilësimet
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Ngritja me e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Ju lutem shkruani monedhën parazgjedhje në kompaninë Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Harroni të Përditshëm
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Konfliktet Rregulla tatimor me {0}
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,Sasia e prodhuar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inxhinier
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Kuvendet Kërko Nën
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Kodi i artikullit kërkohet në radhë nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Kodi i artikullit kërkohet në radhë nr {0}
 DocType: Sales Partner,Partner Type,Lloji Partner
 DocType: Purchase Taxes and Charges,Actual,Aktual
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
 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 +263,Installation Note {0} has already been submitted,Instalimi Shënim {0} tashmë është dorëzuar
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Instalimi Shënim {0} tashmë është dorëzuar
 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
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,Zbatueshme Lista Holiday
 DocType: Employee,Cheque,Çek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seria Përditësuar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Raporti Lloji është i detyrueshëm
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Raporti Lloji është i detyrueshëm
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,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/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/public/js/setup_wizard.js +101,The First User: You,Së pari Përdoruesi: Ju
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Harmonizuar me sukses
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Harmonizuar me sukses
 DocType: Production Order,Planned End Date,Planifikuar Data e Përfundimit
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ku sendet janë ruajtur.
 DocType: Tax Rule,Validity,Vlefshmëri
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,Pjesëmarrje
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Postimi datën dhe postimi kohë është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Postimi datën dhe postimi kohë është i detyrueshëm
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Template taksave për blerjen e transaksioneve.
 ,Item Prices,Çmimet pika
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Me fjalë do të jetë i dukshëm një herë ju ruani qëllim blerjen.
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,Data shqyrtim
 DocType: Purchase Invoice,Advance Payments,Pagesat e paradhënies
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,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
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nuk ka leje për të përdorur mjet pagese
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,&quot;Njoftimi Email Adresat &#39;jo të specifikuara për përsëritura% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Rrumbullakët Off Llogari
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Shpenzimet administrative
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Këshillues
 DocType: Customer Group,Parent Customer Group,Grupi prind Klientit
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ndryshim
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Ndryshim
 DocType: Purchase Invoice,Contact Email,Kontakti Email
 DocType: Appraisal Goal,Score Earned,Vota fituara
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",p.sh. &quot;My Company LLC&quot;
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,Bruto Pesha UOM
 DocType: Email Digest,Receivables / Payables,Arketueshme / Te Pagueshme
 DocType: Delivery Note Item,Against Sales Invoice,Kundër Sales Faturës
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Llogaria e Kredisë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Llogaria e Kredisë
 DocType: Landed Cost Item,Landed Cost Item,Kosto zbarkoi Item
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Trego zero vlerat
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Sasia e sendit të marra pas prodhimit / ripaketimin nga sasi të caktuara të lëndëve të para
 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 +562,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
 DocType: Item,Default Warehouse,Gabim Magazina
 DocType: Task,Actual End Date (via Time Logs),Aktuale End Date (nëpërmjet Koha Shkrime)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Buxheti nuk mund të caktohet kundër Llogaria Grupit {0}
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planifikoni kohë shkrimet jashtë orarit Workstation punës.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} tashmë është dorëzuar
 ,Items To Be Requested,Items të kërkohet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Get fundit Blerje Vlerësoni
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Vlerësoni Faturimi bazuar në aktivitet të llojit (në orë)
 DocType: Company,Company Info,Company Info
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Kompania Email ID nuk u gjet, prandaj nuk mail dërguar"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikimi i mjeteve (aktiveve)
 DocType: Production Planning Tool,Filter based on item,Filter bazuar në pikën
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Llogaria Debiti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Llogaria Debiti
 DocType: Fiscal Year,Year Start Date,Viti Data e Fillimit
 DocType: Attendance,Employee Name,Emri punonjës
 DocType: Sales Invoice,Rounded Total (Company Currency),Harmonishëm Total (Kompania Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,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/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,Nuk mund të fshehta të grupit për shkak Tipi Llogarisë është zgjedhur.
 DocType: Purchase Common,Purchase Common,Blerje përbashkët
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} është modifikuar. Ju lutem refresh.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop përdoruesit nga bërja Dërgo Aplikacione në ditët në vijim.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Nga Opportunity
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Përfitimet e Punonjësve
 DocType: Sales Invoice,Is POS,Është POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Sasi të pranuar
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nuk ekziston
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Faturat e ngritura për të Konsumatorëve.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonentë shtuar
 DocType: Maintenance Schedule,Schedule,Orar
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Define Buxheti për këtë qendër kosto. Për të vendosur veprimin e buxhetit, shih &quot;Lista e Kompanive&quot;"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,Leximi 3
 ,Hub,Qendër
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
 DocType: Expense Claim,Approved,I miratuar
 DocType: Pricing Rule,Price,Çmim
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Punonjës lirohet për {0} duhet të jetë vendosur si &#39;majtë&#39;
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Rregjistrimet në ditar të kontabilitetit.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qty në dispozicion në nga depo
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Ju lutem, përzgjidhni Record punonjës parë."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partia / Llogaria nuk përputhet me {1} / {2} në {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partia / Llogaria nuk përputhet me {1} / {2} në {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Për të krijuar një Llogari Tatimore
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
 DocType: Account,Stock,Stock
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,Kontrata Data e përfundimit
 DocType: Sales Order,Track this Sales Order against any Project,Përcjell këtë Urdhër Sales kundër çdo Projektit
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Shitjes tërheq urdhëron (në pritje për të ofruar), bazuar në kriteret e mësipërme"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Nga furnizuesi Kuotim
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Nga furnizuesi Kuotim
 DocType: Deduction Type,Deduction Type,Zbritja Type
 DocType: Attendance,Half Day,Gjysma Dita
 DocType: Pricing Rule,Min Qty,Min Qty
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,Transaksioni Data
 DocType: Production Plan Item,Planned Qty,Planifikuar Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Tatimi Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Për sasinë (Prodhuar Qty) është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Për sasinë (Prodhuar Qty) është i detyrueshëm
 DocType: Stock Entry,Default Target Warehouse,Gabim Magazina Target
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Kompania Valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partia Lloji dhe Partia është i zbatueshëm vetëm kundër arkëtueshme / pagueshme llogari
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,Rate Komisioni
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Bëni Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikacionet pushimit bllok nga departamenti.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Shporta është bosh
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Shporta është bosh
 DocType: Production Order,Actual Operating Cost,Aktuale Kosto Operative
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Rrënjë nuk mund të redaktohen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Rrënjë nuk mund të redaktohen.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Shuma e ndarë nuk mund të më të madhe se shuma unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Lejo Prodhimi në pushime
 DocType: Sales Order,Customer's Purchase Order Date,Konsumatorit Rendit Blerje Data
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Projektues
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termat dhe Kushtet Template
 DocType: Serial No,Delivery Details,Detajet e ofrimit të
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Qendra Kosto është e nevojshme në rresht {0} në Tatimet tryezë për llojin {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Qendra Kosto është e nevojshme në rresht {0} në Tatimet tryezë për llojin {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatikisht të krijojë materiale Kërkesë nëse sasia bie nën këtë nivel
 ,Item-wise Purchase Register,Pika-mençur Blerje Regjistrohu
 DocType: Batch,Expiry Date,Data e Mbarimit
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Për të vendosur nivelin Reorder, pika duhet të jetë një artikull i blerë ose Prodhim Item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Për të vendosur nivelin Reorder, pika duhet të jetë një artikull i blerë ose Prodhim Item"
 ,Supplier Addresses and Contacts,Adresat Furnizues dhe Kontaktet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ju lutemi zgjidhni kategorinë e parë
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Mjeshtër projekt.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Gjysme Dite)
 DocType: Supplier,Credit Days,Ditët e kreditit
 DocType: Leave Type,Is Carry Forward,Është Mbaj Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Të marrë sendet nga bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Bill e materialeve
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partia Lloji dhe Partia është e nevojshme për arkëtueshme / pagueshme llogari {1}
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,Arsyeja e largimit
 DocType: Expense Claim Detail,Sanctioned Amount,Shuma e sanksionuar
 DocType: GL Entry,Is Opening,Është Hapja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: debiti hyrja nuk mund të jetë i lidhur me një {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Llogaria {0} nuk ekziston
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Row {0}: debiti hyrja nuk mund të jetë i lidhur me një {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Llogaria {0} nuk ekziston
 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.csv b/erpnext/translations/sr.csv
index 6be9239..84ba4e5 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Производи широке потрошње
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Молимо Вас да одаберете Парти Типе први
 DocType: Item,Customer Items,Предмети Цустомер
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Рачун {0}: {1 Родитељ рачун} не може бити књига
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Рачун {0}: {1 Родитељ рачун} не може бити књига
 DocType: Item,Publish Item to hub.erpnext.com,Објављивање ставку да хуб.ерпнект.цом
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Уведомления по электронной почте
 DocType: Item,Default Unit of Measure,Уобичајено Јединица мере
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,Кориснички Контакт
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Од материјала захтеву
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Од материјала захтеву
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дрво
 DocType: Job Applicant,Job Applicant,Посао захтева
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нема више резултата.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Да бисте задржали купца мудрог код ставке и да их претраживати на основу њиховог кода користили ову опцију
 DocType: Mode of Payment Account,Mode of Payment Account,Начин плаћања налог
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Схов Варијанте
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Количина
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Количина
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредиты ( обязательства)
 DocType: Employee Education,Year of Passing,Година Пассинг
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,На складишту
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,здравство
 DocType: Purchase Invoice,Monthly,Месечно
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Кашњење у плаћању (Дани)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Е-маил адреса
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Фискална година {0} је потребно
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,одбрана
 DocType: Company,Abbr,Аббр
 DocType: Appraisal Goal,Score (0-5),Оцена (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ров {0}: {1} {2} не поклапа са {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Ров {0}: {1} {2} не поклапа са {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Ров # {0}:
 DocType: Delivery Note,Vehicle No,Нема возила
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Изаберите Ценовник
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Изаберите Ценовник
 DocType: Production Order Operation,Work In Progress,Ворк Ин Прогресс
 DocType: Employee,Holiday List,Холидаи Листа
 DocType: Time Log,Time Log,Време Лог
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Иста компанија је ушла у више наврата
 DocType: Employee,Married,Ожењен
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Није дозвољено за {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 DocType: Payment Reconciliation,Reconcile,помирити
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Маке Банк Ентри
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиони фондови
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Магацин је обавезна ако аццоунт типе Магацин
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Магацин је обавезна ако аццоунт типе Магацин
 DocType: SMS Center,All Sales Person,Све продаје Особа
 DocType: Lead,Person Name,Особа Име
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Проверите да ли се понављају ред, уклоните ознаку да заустави понављају или ставити одговарајућу од завршетка"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Заинтересован
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Счет за материалы
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Отварање
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Од {0} {1} да
+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,Отварање Ентри
 DocType: Stock Entry,Additional Costs,Додатни трошкови
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Счет с существующей сделки не могут быть преобразованы в группы .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Счет с существующей сделки не могут быть преобразованы в группы .
 DocType: Lead,Product Enquiry,Производ Енкуири
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Молимо унесите прва компанија
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,Циљна На
+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 +9,Activity Log:,Активност Пријављивање :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
@@ -165,7 +165,7 @@
 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 +444,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Да ли ће бити ажурирани након продаје Рачун се подноси.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Настройки для модуля HR
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Детаљи о пословању спроведена.
 DocType: Serial No,Maintenance Status,Одржавање статус
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Предмети и цене
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Од датума треба да буде у оквиру фискалне године. Под претпоставком Од датума = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Од датума треба да буде у оквиру фискалне године. Под претпоставком Од датума = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Изаберите запосленог за кога правите процену.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},МВЗ {0} не принадлежит компании {1}
 DocType: Customer,Individual,Појединац
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Нето готовина из финансирања
 DocType: Lead,Address & Contact,Адреса и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додај неискоришћене листове из претходних алокација
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Следећа Поновни {0} ће бити креирана на {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Контакт Име
 DocType: Production Plan Item,SO Pending Qty,СО чекању КТИ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ствара плата листић за горе наведених критеријума.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Не введено описание
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Захтев за куповину.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,Ставка Сајт Спецификација
 DocType: Payment Tool,Reference No,Референца број
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Оставите Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,годовой
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Стоцк Помирење артикла
 DocType: Stock Entry,Sales Invoice No,Продаја Рачун Нема
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Снабдевач Тип
 DocType: Item,Publish in Hub,Објављивање у Хуб
 ,Terretory,Терретори
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Пункт {0} отменяется
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Материјал Захтев
 DocType: Bank Reconciliation,Update Clearance Date,Упдате Дате клиренс
 DocType: Item,Purchase Details,Куповина Детаљи
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Ставка {0} није пронађен у &quot;сировине Испоручује се &#39;сто у нарудзбенице {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Ставка {0} није пронађен у &quot;сировине Испоручује се &#39;сто у нарудзбенице {1}
 DocType: Employee,Relation,Однос
 DocType: Shipping Rule,Worldwide Shipping,Широм света Достава
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Потврђена наређења од купаца.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Предлози
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Сет тачка Групе мудрих буџете на овој територији. Такође можете укључити сезонски постављањем дистрибуције.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Молимо вас да унесете родитељску групу рачуна за складиште {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаћање по {0} {1} не може бити већи од преосталог износа {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаћање по {0} {1} не може бити већи од преосталог износа {2}
 DocType: Supplier,Address HTML,Адреса ХТМЛ
 DocType: Lead,Mobile No.,Мобиле Но
 DocType: Maintenance Schedule,Generate Schedule,Генериши Распоред
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,најновији
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Макс 5 знакова
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Први одсуство одобраватељ на листи ће бити постављен као подразумевани Аппровер Леаве
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Научити
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Активност Трошкови по запосленом
 DocType: Accounts Settings,Settings for Accounts,Подешавања за рачуне
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Управление менеджера по продажам дерево .
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Тема Валута
 DocType: Payment Reconciliation Invoice,Invoice Type,Фактура Тип
 DocType: Sales Invoice Item,Delivery Note,Обавештење о пријему пошиљке
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Подешавање Порези
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Подешавање Порези
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Плаћање Ступање је модификована након што га извукао. Молимо вас да га опет повуците.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Преглед за ову недељу и чекају активности
 DocType: Workstation,Rent Cost,Издавање Трошкови
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Изаберите месец и годину
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Доступный в спецификации , накладной , счете-фактуре, производственного заказа , заказа на поставку , покупка получение, счет-фактура , заказ клиента , фондовой въезда, расписания"
 DocType: Item Tax,Tax Rate,Пореска стопа
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Избор артикла
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Избор артикла
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Итем: {0} је успео серија-мудар, не може да се помири користећи \
  Стоцк помирење, уместо коришћење Сток Ентри"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серијски бр морају бити исти као {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Претвори у не-Гроуп
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Куповина Потврда мора да се поднесе
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,медицинский
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Разлог за губљење
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,Самац
 DocType: Issue,Attachment,Прилог
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Буџет не може да се подеси за групу трошкова Центар
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,Мастер отдыха .
 DocType: Material Request Item,Required Date,Потребан датум
 DocType: Delivery Note,Billing Address,Адреса за наплату
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Унесите Шифра .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Унесите Шифра .
 DocType: BOM,Costing,Коштање
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако је проверен, порески износ ће се сматрати као што је већ укључена у Принт Рате / Штампа Износ"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Укупно ком
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Хитна Телефон
 ,Serial No Warranty Expiry,Серијски Нема гаранције истека
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Повећање не може бити 0
 DocType: Production Planning Tool,Material Requirement,Материјал Захтев
 DocType: Company,Delete Company Transactions,Делете Цомпани трансакције
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Пункт {0} не Приобретите товар
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Пункт {0} не Приобретите товар
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} је неважећи емаил адреса у 'Обавештење \
  емаил адресе'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Укупно цард Ова Година:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Адд / Едит порези и таксе
 DocType: Purchase Invoice,Supplier Invoice No,Снабдевач фактура бр
 DocType: Territory,For reference,За референце
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не могу да избришем серијски број {0}, као што се користи у промету акција"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Затварање (Цр)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Затварање (Цр)
 DocType: Serial No,Warranty Period (Days),Гарантни период (дани)
 DocType: Installation Note Item,Installation Note Item,Инсталација Напомена Ставка
 ,Pending Qty,Кол чекању
@@ -466,7 +469,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Месечна Дистрибуција** помаже распоредите свој буџет по месецима ако је ваш посао сезонског типа.
 
  Да распоредите буџет користећи ову расподелу, поставите **Месечна расподела** у **Трошковни Центар**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Нема резултата у фактури табели записи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Нема резултата у фактури табели записи
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Молимо Вас да изаберете Цомпани и Партије Типе прво
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Финансовый / отчетного года .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Извини , Серијски Нос не може да се споје"
@@ -474,9 +477,9 @@
 DocType: Project Task,Project Task,Пројектни задатак
 ,Lead Id,Олово Ид
 DocType: C-Form Invoice Detail,Grand Total,Свеукупно
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Датум почетка не би требало да буде већа од Фискална година Датум завршетка
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Датум почетка не би требало да буде већа од Фискална година Датум завршетка
 DocType: Warranty Claim,Resolution,Резолуција
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Достављено: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Достављено: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Плаћа се рачуна
 DocType: Sales Order,Billing and Delivery Status,Обрачун и Статус испоруке
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Репеат Купци
@@ -491,7 +494,7 @@
 DocType: Quotation,Quotation To,Цитат
 DocType: Lead,Middle Income,Средњи приход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Додељена сума не може бити негативан
 DocType: Purchase Order Item,Billed Amt,Фактурисане Амт
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логичан Магацин против које уноси хартије су направљени.
@@ -500,7 +503,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Производња налог обавезујући
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Писање предлога
 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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Отрицательный Ошибка со ( {6} ) по пункту {0} в Склад {1} на {2} {3} в {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Отрицательный Ошибка со ( {6} ) по пункту {0} в Склад {1} на {2} {3} в {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година Компанија
 DocType: Packing Slip Item,DN Detail,ДН Детаљ
 DocType: Time Log,Billed,Изграђена
@@ -519,16 +522,17 @@
 DocType: Activity Type,Default Costing Rate,Уобичајено Кошта курс
 DocType: Maintenance Schedule,Maintenance Schedule,Одржавање Распоред
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Онда Ценовник Правила се филтрирају на основу клијента, корисника услуга Група, Територија, добављача, добављач Тип, кампање, продаја партнер итд"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Нето промена у инвентару
 DocType: Employee,Passport Number,Пасош Број
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,менаџер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Од рачуном
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Исто аукција је ушао више пута.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Од рачуном
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Исто аукција је ушао више пута.
 DocType: SMS Settings,Receiver Parameter,Пријемник Параметар
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основу"" и ""Групиши по"" не могу бити идентични"
 DocType: Sales Person,Sales Person Targets,Продаја Персон Мете
 DocType: Production Order Operation,In minutes,У минута
 DocType: Issue,Resolution Date,Резолуција Датум
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 DocType: Selling Settings,Customer Naming By,Кориснички назив под
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Претвори у групи
 DocType: Activity Cost,Activity Type,Активност Тип
@@ -539,7 +543,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} није пронађен у табели Фактура Детаљи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
 DocType: Material Request,Material Transfer,Пренос материјала
@@ -561,13 +565,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,маркетинг
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Да бисте пратили ставку у продаји и куповини докумената на основу њихових серијских бр. Ово се такође може користити за праћење детаље гаранције производа.
 DocType: Purchase Receipt Item Supplied,Current Stock,Тренутне залихе
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Одбијен Магацин је обавезна против регецтед ставке
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Укупно наплате ове године
 DocType: Account,Expenses Included In Valuation,Трошкови укључени у процене
 DocType: Employee,Provide email id registered in company,Обезбедити ид е регистрован у предузећу
 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 +533,Item has variants.,Тачка има варијанте.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дрво Тип
@@ -585,18 +589,18 @@
 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 +92,{0} is not a stock Item,{0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} не является акционерным Пункт
 DocType: Mode of Payment Account,Default Account,Уобичајено Рачун
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен , если Возможность сделан из свинца"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Пожалуйста, выберите в неделю выходной"
 DocType: Production Order Operation,Planned End Time,Планирано време завршетка
 ,Sales Person Target Variance Item Group-Wise,Лицо продаж Целевая Разница Пункт Группа Мудрого
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Счет с существующей сделки не могут быть преобразованы в книге
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Счет с существующей сделки не могут быть преобразованы в книге
 DocType: Delivery Note,Customer's Purchase Order No,Наруџбенице купца Нема
 DocType: Employee,Cell Number,Мобилни број
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Аутоматско Материјал Захтеви Генератед
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,изгубљен
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Не можете ући у тренутну ваучер 'против' Јоурнал Ентри колону
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Не можете ући у тренутну ваучер 'против' Јоурнал Ентри колону
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,енергија
 DocType: Opportunity,Opportunity From,Прилика Од
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Месечна плата изјава.
@@ -605,9 +609,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Од {0} типа {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор конверзије је обавезно
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Аццоунтинг прилога може се против листа чворова. Записи против групе нису дозвољени.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
 DocType: Opportunity,Maintenance,Одржавање
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},"Покупка Получение число , необходимое для Пункт {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},"Покупка Получение число , необходимое для Пункт {0}"
 DocType: Item Attribute Value,Item Attribute Value,Итем Вредност атрибута
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Кампании по продажам .
 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.
@@ -665,7 +669,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Породица Позадина
 DocType: Process Payroll,Send Email,Сенд Емаил
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Без дозвола
 DocType: Company,Default Bank Account,Уобичајено банковног рачуна
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Филтрирање на основу партије, изаберите партија Типе први"
@@ -673,7 +677,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Нос
 DocType: Item,Items with higher weightage will be shown higher,Предмети са вишим веигхтаге ће бити приказано више
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банка помирење Детаљ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Моји рачуни
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Моји рачуни
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Не работник не найдено
 DocType: Purchase Order,Stopped,Заустављен
 DocType: Item,If subcontracted to a vendor,Ако подизвођење на продавца
@@ -683,6 +687,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Пошаљи сада
 ,Support Analytics,Подршка Аналитика
 DocType: Item,Website Warehouse,Сајт Магацин
+DocType: Payment Reconciliation,Minimum Invoice Amount,Минимални износ фактуре
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Дан у месецу на којем друмски фактура ће бити генерисан нпр 05, 28 итд"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Коначан мора бити мања или једнака 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Ц - Форма евиденција
@@ -692,7 +697,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Да бисте омогућили &quot;Поинт оф Сале&quot; Феатурес
 DocType: Bin,Moving Average Rate,Мовинг Авераге рате
 DocType: Production Planning Tool,Select Items,Изаберите ставке
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
 DocType: Maintenance Visit,Completion Status,Завршетак статус
 DocType: Sales Invoice Item,Target Warehouse,Циљна Магацин
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволите преко испоруку или пријем упто овом одсто
@@ -704,7 +709,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок .
 DocType: Production Order,Item To Manufacture,Ставка за производњу
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Налог за куповину на исплату
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Налог за куповину на исплату
 DocType: Sales Order Item,Projected Qty,Пројектовани Кол
 DocType: Sales Invoice,Payment Due Date,Плаћање Дуе Дате
 DocType: Newsletter,Newsletter Manager,Билтен директор
@@ -728,7 +733,7 @@
 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 +304,Point-of-Sale,Место продаје
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Стања на рачуну већ у Кредит, није вам дозвољено да поставите 'биланс треба да се' као 'Дебит """
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Стања на рачуну већ у Кредит, није вам дозвољено да поставите 'биланс треба да се' као 'Дебит """
 DocType: Account,Balance must be,Баланс должен быть
 DocType: Hub Settings,Publish Pricing,Објављивање Цене
 DocType: Notification Control,Expense Claim Rejected Message,Расходи потраживање Одбијен поруку
@@ -751,7 +756,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Мастер Валютный курс .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,БОМ {0} мора бити активна
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,БОМ {0} мора бити активна
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Прво изаберите врсту документа
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
 DocType: Salary Slip,Leave Encashment Amount,Оставите Износ Енцасхмент
@@ -769,17 +774,17 @@
 DocType: Supplier,Default Payable Accounts,Уобичајено се плаћају рачуни
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Features Setup,Item Barcode,Ставка Баркод
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактури Адванце
 DocType: Address,Shop,Продавница
 DocType: Hub Settings,Sync Now,Синц Сада
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Ров {0}: Кредит Унос се не може повезати са {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Ров {0}: Кредит Унос се не може повезати са {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Уобичајено банка / Готовина налог ће аутоматски бити ажуриран у ПОС фактура, када је овај режим изабран."
 DocType: Employee,Permanent Address Is,Стална адреса је
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операција завршена за колико готове робе?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Бренд
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Исправка за преко-{0} прешао за пункт {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Исправка за преко-{0} прешао за пункт {1}.
 DocType: Employee,Exit Interview Details,Екит Детаљи Интервју
 DocType: Item,Is Purchase Item,Да ли је куповина артикла
 DocType: Journal Entry Account,Purchase Invoice,Фактури
@@ -791,7 +796,7 @@
 DocType: Salary Slip,Total in words,Укупно у речима
 DocType: Material Request Item,Lead Time Date,Олово Датум Време
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,је обавезно. Можда Мењачница запис није створен за
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Наведите Сериал но за пункт {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Наведите Сериал но за пункт {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","За &#39;производ&#39; Бундле предмета, Магацин, редни број и серијски бр ће се сматрати из &quot;листе паковања &#39;табели. Ако Складиште и серијски бр су исти за све ставке паковање за било коју &#39;производ&#39; Бундле ставке, те вредности се могу уносити у главном табели тачка, вредности ће бити копирана у &#39;Паковање лист&#39; сто."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Испоруке купцима.
 DocType: Purchase Invoice Item,Purchase Order Item,Куповина ставке поруџбине
@@ -800,14 +805,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Варијација
 ,Company Name,Име компаније
 DocType: SMS Center,Total Message(s),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Избор тачка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,Изаберите главу рачуна банке у којој је депонован чек.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Дозволите кориснику да измените Рате Ценовник у трансакцијама
 DocType: Pricing Rule,Max Qty,Макс Кол-во
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,хемијски
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Сви артикли су већ пребачени за ову производњу Реда.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Сви артикли су већ пребачени за ову производњу Реда.
 DocType: Process Payroll,Select Payroll Year and Month,Изабери Паиролл година и месец
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Иди на одговарајуће групе (обично Примена средстава&gt; обртна имовина&gt; банковне рачуне и креирати нови налог (кликом на Додај Цхилд) типа &quot;Банка&quot;
 DocType: Workstation,Electricity Cost,Струја Трошкови
@@ -821,10 +827,10 @@
 DocType: SMS Center,All Lead (Open),Све Олово (Опен)
 DocType: Purchase Invoice,Get Advances Paid,Гет аванси
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Прикрепите свою фотографию
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Правити
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Правити
 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 +3,My Cart,Моја Корпа
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Моја Корпа
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Отварање Кол
@@ -843,10 +849,10 @@
 DocType: POS Profile,Cash/Bank Account,Готовина / банковног рачуна
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
 DocType: Delivery Note,Delivery To,Достава Да
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Атрибут сто је обавезно
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,Атрибут сто је обавезно
 DocType: Production Planning Tool,Get Sales Orders,Гет продајних налога
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може бити негативан
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Попуст
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Попуст
 DocType: Features Setup,Purchase Discounts,Куповина Попусти
 DocType: Workstation,Wages,Плате
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Да ли ће бити ажурирани само ако се време је &#39;Наплативо&#39;
@@ -871,7 +877,7 @@
 DocType: Tax Rule,Shipping State,Достава Држава
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора се додати користећи 'Гет ставки из пурцхасе примитака' дугме
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Коммерческие расходы
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Стандардна Куповина
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Стандардна Куповина
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Имплементација Партнер
@@ -913,6 +919,7 @@
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа Достава Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Молимо поставите &#39;Аппли додатни попуст на&#39;
 ,Ordered Items To Be Billed,Ж артикала буду наплаћени
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Од Опсег мора да буде мањи од у распону
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Изаберите Протоколи време и слање да створи нову продајну фактуру.
@@ -922,13 +929,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ово време Пријава Групно је наплаћена.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Направи прилика
 DocType: Salary Slip,Leave Without Pay,Оставите Без плате
-DocType: Supplier,Communications,Комуникације
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Капацитет Планирање Грешка
 ,Trial Balance for Party,Претресно Разлика за странке
 DocType: Lead,Consultant,Консултант
 DocType: Salary Slip,Earnings,Зарада
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Завршио артикла {0} мора бити унета за тип Производња улазак
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Отварање рачуноводства Стање
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Завршио артикла {0} мора бити унета за тип Производња улазак
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Отварање рачуноводства Стање
 DocType: Sales Invoice Advance,Sales Invoice Advance,Продаја Рачун Адванце
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ништа се захтевати
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Стварни датум почетка"" не може бити већи од ""Стварни датум завршетка"""
@@ -969,7 +975,7 @@
 DocType: Global Defaults,Current Fiscal Year,Текуће фискалне године
 DocType: Global Defaults,Disable Rounded Total,Онемогући Роундед Укупно
 DocType: Lead,Call,Позив
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 ,Trial Balance,Пробни биланс
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Подешавање Запослени
@@ -981,9 +987,9 @@
 DocType: Contact,User ID,Кориснички ИД
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Погледај Леџер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Најраније
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
 DocType: Production Order,Manufacture against Sales Order,Производња против налога за продају
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,Бруто Паи
@@ -1013,7 +1019,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 DocType: Journal Entry,Get Outstanding Invoices,Гет неплаћене рачуне
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1026,13 +1032,13 @@
 DocType: Employee,Place of Issue,Место издавања
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,уговор
 DocType: Email Digest,Add Quote,Додај Куоте
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},УОМ цоверсион фактор потребан за УЦГ: {0} тачке: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},УОМ цоверсион фактор потребан за УЦГ: {0} тачке: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,косвенные расходы
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ред {0}: Кол је обавезно
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,пољопривреда
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,Ваши производи или услуге
 DocType: Mode of Payment,Mode of Payment,Начин плаћања
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,То јекорен ставка група и не може се мењати .
 DocType: Journal Entry Account,Purchase Order,Налог за куповину
 DocType: Warehouse,Warehouse Contact Info,Магацин Контакт Инфо
@@ -1041,8 +1047,8 @@
 DocType: Email Digest,Annual Income,Годишњи приход
 DocType: Serial No,Serial No Details,Серијска Нема детаља
 DocType: Purchase Invoice Item,Item Tax Rate,Ставка Пореска стопа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитальные оборудование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Правилник о ценама је први изабран на основу 'Примени на ""терену, који могу бити артикла, шифра групе или Марка."
@@ -1052,7 +1058,7 @@
 DocType: Appraisal Goal,Goal,Циљ
 DocType: Sales Invoice Item,Edit Description,Измени опис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Очекивани Датум испоруке је мањи од планираног почетка Датум.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,За добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,За добављача
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Подешавање Тип налога помаже у одабиру овог рачуна у трансакцијама.
 DocType: Purchase Invoice,Grand Total (Company Currency),Гранд Укупно (Друштво валута)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Укупно Одлазећи
@@ -1065,7 +1071,7 @@
 DocType: Journal Entry,Journal Entry,Јоурнал Ентри
 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 +427,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,То је број последње створеног трансакције са овим префиксом
@@ -1097,7 +1103,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Билтене контактима, води."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Операције не може остати празно.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Операције не може остати празно.
 ,Delivered Items To Be Billed,Испоручени артикала буду наплаћени
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Магацин не може да се промени за серијским бројем
 DocType: Authorization Rule,Average Discount,Просечна дисконтна
@@ -1112,7 +1118,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Од {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Операција Опис
 DocType: Item,Will also apply to variants,Важиће и за варијанте
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Не можете променити фискалну годину и датум почетка фискалне године Датум завршетка једном Фискална година је сачувана.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Не можете променити фискалну годину и датум почетка фискалне године Датум завршетка једном Фискална година је сачувана.
 DocType: Quotation,Shopping Cart,Корпа
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Просек Дневни Одлазећи
 DocType: Pricing Rule,Campaign,Кампања
@@ -1123,7 +1129,8 @@
 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 +211,Stock Entries already created for Production Order ,Сток уноси већ створене за производно Реда
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Сток уноси већ створене за производно Реда
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Нето промена у основном средству
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставите празно ако се сматра за све ознакама
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Мак: {0}
@@ -1135,7 +1142,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Контни
 DocType: Material Request,Terms and Conditions Content,Услови коришћења садржаја
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Неплански
 DocType: Employee,Owned,Овнед
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи оставити без Паи
@@ -1173,7 +1180,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub сборки
 DocType: Shipping Rule Condition,To Value,Да вредност
 DocType: Supplier,Stock Manager,Сток директор
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
+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 +581,Packing Slip,Паковање Слип
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,аренда площади для офиса
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Подешавање Подешавања СМС Гатеваи
@@ -1181,10 +1188,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Адреса додао.
 DocType: Workstation Working Hour,Workstation Working Hour,Воркстатион радни сат
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,аналитичар
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака количини ЈВ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака количини ЈВ {2}
 DocType: Item,Inventory,Инвентар
 DocType: Features Setup,"To enable ""Point of Sale"" view",Да бисте омогућили &quot;Поинт Оф Сале&quot; поглед
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плаћање не може се за празан корпу
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Плаћање не може се за празан корпу
 DocType: Item,Sales Details,Детаљи продаје
 DocType: Opportunity,With Items,Са ставкама
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,У Кол
@@ -1199,10 +1206,11 @@
 DocType: Cost Center,Parent Cost Center,Родитељ Трошкови центар
 DocType: Sales Invoice,Source,Извор
 DocType: Leave Type,Is Leave Without Pay,Да ли је Оставите без плате
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Нема резултата у табели плаћања записи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Нема резултата у табели плаћања записи
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Финансовый год Дата начала
 DocType: Employee External Work History,Total Experience,Укупно Искуство
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Новчани ток од Инвестирање
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 DocType: Material Request Item,Sales Order No,Продаја Наручите Нема
 DocType: Item Group,Item Group Name,Ставка Назив групе
@@ -1210,12 +1218,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Трансфер материјал за производњу
 DocType: Pricing Rule,For Price List,Для Прейскурантом
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Екецутиве Сеарцх
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Куповина стопа за ставку: {0} није пронађен, који је потребан да резервишете рачуноводствене унос (расход). Молимо вас да позовете цену артикла, против листе куповна цена."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Куповина стопа за ставку: {0} није пронађен, који је потребан да резервишете рачуноводствене унос (расход). Молимо вас да позовете цену артикла, против листе куповна цена."
 DocType: Maintenance Schedule,Schedules,Распореди
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,БОМ Детаљ Нема
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Додатне Износ попуста (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Ошибка: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Ошибка: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Молимо креирајте нови налог из контном оквиру .
 DocType: Maintenance Visit,Maintenance Visit,Одржавање посета
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Кориснички> Кориснички Група> Територија
@@ -1241,7 +1249,7 @@
 DocType: Sales Partner,Sales Partner Target,Продаја Партнер Циљна
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Књиговодство Ступање на {0} може се вршити само у валути: {1}
 DocType: Pricing Rule,Pricing Rule,Цены Правило
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материјал захтјев за откуп Ордер
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Материјал захтјев за откуп Ордер
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ред # {0}: враћено артикла {1} не постоји у {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банковни рачуни
 ,Bank Reconciliation Statement,Банка помирење Изјава
@@ -1249,11 +1257,11 @@
 ,POS,ПОС
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Отварање Сток Стање
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} мора појавити само једном
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Није дозвољено да транфер више {0} од {1} против нарудзбенице {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},Листья Выделенные Успешно для {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нет объектов для вьючных
 DocType: Shipping Rule Condition,From Value,Од вредности
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Производња Количина је обавезно
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Производња Количина је обавезно
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Износи не огледа у банци
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Захтеви за рачун предузећа.
@@ -1265,33 +1273,34 @@
 ,Material Requests for which Supplier Quotations are not created,Материјални Захтеви за који Супплиер Цитати нису створени
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Дан (и) на коју се пријављујете за дозволу су празници. Не морате пријавити за одмор.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Да бисте пратили ставки помоћу баркод. Моћи ћете да унесете ставке у испоруци напомени и продаје фактуру за скенирање баркода на ставке.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Означи као Деливеред
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Означи као Деливеред
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направи понуду
 DocType: Dependent Task,Dependent Task,Зависна Задатак
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,Стани Рођендан Подсетници
 DocType: SMS Center,Receiver List,Пријемник Листа
 DocType: Payment Tool Detail,Payment Amount,Плаћање Износ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Цонсумед Износ
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Погледај
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Погледај
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Нето промена на пари
 DocType: Salary Structure Deduction,Salary Structure Deduction,Плата Структура Одбитак
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 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 +185,Quantity must not be more than {0},Количина не сме бити више од {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Старост (Дани)
 DocType: Quotation Item,Quotation Item,Понуда шифра
 DocType: Account,Account Name,Име налога
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Од датума не може бити већа него до сада
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Од датума не може бити већа него до сада
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Серийный номер {0} количество {1} не может быть фракция
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Тип Поставщик мастер .
 DocType: Purchase Order Item,Supplier Part Number,Снабдевач Број дела
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
 DocType: Company,Default Payable Account,Уобичајено оплате рачуна
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Подешавања за онлине куповину као што су испоруке правила, ценовник итд"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Приходована
@@ -1303,15 +1312,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Моји проблеми
 DocType: BOM Item,BOM Item,БОМ шифра
 DocType: Appraisal,For Employee,За запосленог
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Ред {0}: Унапред против добављач мора да се задужи
 DocType: Company,Default Values,Уобичајено Вредности
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Ров {0}: Плаћање износ не може бити негативан
 DocType: Expense Claim,Total Amount Reimbursed,Укупан износ рефундирају
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Против добављача Фактура {0} {1} од
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Против добављача Фактура {0} {1} од
 DocType: Customer,Default Price List,Уобичајено Ценовник
 DocType: Payment Reconciliation,Payments,Исплате
 DocType: Budget Detail,Budget Allocated,Буџет Издвојена
 DocType: Journal Entry,Entry Type,Ступање Тип
 ,Customer Credit Balance,Кориснички кредитни биланс
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Нето промена у потрашивањима
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Молимо Вас да потврдите свој емаил ид
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Клиент требуется для "" Customerwise Скидка """
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Ажурирање банка плаћање датира са часописима.
@@ -1332,7 +1343,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Омогући Корпа
 DocType: Employee,Permanent Address,Стална адреса
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Пункт {0} должен быть Service Элемент .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Унапред платио против {0} {1} не може бити већи \ од ГРАНД Укупно {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Пожалуйста, выберите элемент кода"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Смањите одбитка за дозволу без плате (ЛВП)
@@ -1349,18 +1360,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материјал Захтев се користи да би овај унос Стоцк
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Једна јединица једне тачке.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Время входа Пакетная {0} должен быть ' Представленные '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Время входа Пакетная {0} должен быть ' Представленные '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Направите Рачуноводство унос за сваки Стоцк Покрета
 DocType: Leave Allocation,Total Leaves Allocated,Укупно Лишће Издвојена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Магацин потребно на Ров Но {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Магацин потребно на Ров Но {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Молимо Вас да унесете важи финансијске године датум почетка
 DocType: Employee,Date Of Retirement,Датум одласка у пензију
 DocType: Upload Attendance,Get Template,Гет шаблона
 DocType: Address,Postal,Поштански
 DocType: Item,Weightage,Веигхтаге
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов существует с тем же именем , пожалуйста изменить имя клиентов или переименовать группу клиентов"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Изаберите {0} прво.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Текст {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Изаберите {0} прво.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},Текст {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Нови контакт
 DocType: Territory,Parent Territory,Родитељ Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
 DocType: Stock Entry,Material Receipt,Материјал Пријем
@@ -1368,7 +1380,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Странка Тип и Странка је потребан за примања / обавезе обзир {0}
 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 +210,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Магацин {0} не може бити обрисан јер постоји количина за Ставку {1}
 DocType: Quotation,Order Type,Врста поруџбине
 DocType: Purchase Invoice,Notification Email Address,Обавештење е-маил адреса
@@ -1385,15 +1397,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Превише колоне. Извоз извештај и одштампајте га помоћу тих апликација.
 DocType: Sales 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 +152,Main,основной
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,основной
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Сет префикс за нумерисање серију на својим трансакцијама
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Остановился заказ не может быть отменен. Unstop отменить .
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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: Item,Variants,Варијанте
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Маке наруџбенице
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Маке наруџбенице
 DocType: SMS Center,Send To,Пошаљи
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Додијељени износ
@@ -1406,7 +1418,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Магацини и Референца
 DocType: Supplier,Statutory info and other general information about your Supplier,Статутарна инфо и друге опште информације о вашем добављачу
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адресе
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Против часопису Ступање {0} нема никакву премца {1} улазак
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,Против часопису Ступање {0} нема никакву премца {1} улазак
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за владавину Схиппинг
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Тачка није дозвољено да имају Продуцтион Ордер.
@@ -1415,10 +1427,10 @@
 DocType: GL Entry,Credit Amount in Account Currency,Износ кредита на рачуну валути
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Тиме Протоколи за производњу.
 DocType: Item,Apply Warehouse-wise Reorder Level,Нанесите Варехоусе-Висе Реордер Левел
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,БОМ {0} мора да се поднесе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,БОМ {0} мора да се поднесе
 DocType: Authorization Control,Authorization Control,Овлашћење за контролу
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Време Пријава за задатке.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Плаћање
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Плаћање
 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},Материал Запрос максимума {0} могут быть сделаны для Пункт {1} против Заказ на продажу {2}
 DocType: Employee,Salutation,Поздрав
@@ -1435,7 +1447,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,помоћник
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
 DocType: SMS Center,Create Receiver List,Направите листу пријемника
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Истекло
 DocType: Packing Slip,To Package No.,За Пакет број
 DocType: Warranty Claim,Issue Date,Датум емитовања
 DocType: Activity Cost,Activity Cost,Активност Трошкови
@@ -1473,7 +1484,7 @@
 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 +65,Territory / Customer,Територија / Кориснички
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,например 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,Да ли продаје артикла
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ставка Група дрво
@@ -1485,7 +1496,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} создан
 DocType: Delivery Note Item,Against Sales Order,Против продаје налога
 ,Serial No Status,Серијски број статус
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Ставка сто не сме да буде празно
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Ставка сто не сме да буде празно
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Ров {0}: За подешавање {1} периодичност, разлика између од и до данас \ мора бити већи или једнак {2}"
 DocType: Pricing Rule,Selling,Продаја
@@ -1494,7 +1505,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Пошлины и налоги
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,Додатна количина
@@ -1509,7 +1520,7 @@
 DocType: Installation Note,Installation Time,Инсталација време
 DocType: Sales Invoice,Accounting Details,Књиговодство Детаљи
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Обриши све трансакције за ову компанију
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Ров # {0}: Операција {1} није завршен за {2} кти готових производа у производњи заказа # {3}. Плеасе упдате статус операције преко временском дневнику
+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,Ров # {0}: Операција {1} није завршен за {2} кти готових производа у производњи заказа # {3}. Плеасе упдате статус операције преко временском дневнику
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,инвестиции
 DocType: Issue,Resolution Details,Резолуција Детаљи
 DocType: Quality Inspection Reading,Acceptance Criteria,Критеријуми за пријем
@@ -1525,7 +1536,7 @@
 DocType: Holiday List,Clear Table,Слободан Табела
 DocType: Features Setup,Brands,Брендови
 DocType: C-Form Invoice Detail,Invoice No,Рачун Нема
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Од наруџбеницу
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Од наруџбеницу
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,Кошта курс
 ,Customer Addresses And Contacts,Кориснички Адресе и контакти
@@ -1542,7 +1553,7 @@
 ,Maintenance Schedules,Планове одржавања
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Ставка група не помиње у тачки мајстор за ставку {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
 DocType: Shipping Rule Condition,Shipping Amount,Достава Износ
 ,Pending Amount,Чека Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
@@ -1559,12 +1570,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дерево finanial счетов.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Оставите празно ако се сматра за све типове запослених
 DocType: Landed Cost Voucher,Distribute Charges Based On,Дистрибуирају пријава по
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Счет {0} должен быть типа "" Fixed Asset "", как товара {1} является активом Пункт"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Счет {0} должен быть типа "" Fixed Asset "", как товара {1} является активом Пункт"
 DocType: HR Settings,HR Settings,ХР Подешавања
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходи Тужба се чека на одобрење . СамоРасходи одобраватељ да ажурирате статус .
 DocType: Purchase Invoice,Additional Discount Amount,Додатне Износ попуста
 DocType: Leave Block List Allow,Leave Block List Allow,Оставите листу блокираних Аллов
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Аббр не може бити празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Аббр не може бити празно или простор
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,спортски
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Укупно Стварна
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,блок
@@ -1576,6 +1587,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} теперь используется по умолчанию финансовый год . Пожалуйста, обновите страницу в браузере , чтобы изменения вступили в силу."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Расходи Потраживања
 DocType: Issue,Support,Подршка
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Погледај корпу
 ,BOM Search,БОМ Тражи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Затварање (Опенинг + износи)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Молимо наведите валуту у Друштву
@@ -1587,13 +1599,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Фактор Единица измерения преобразования требуется в строке {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Дата просвет не может быть до даты регистрации в строке {0}
 DocType: Salary Slip,Deduction,Одузимање
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Ставка Цена додат за {0} у ценовнику {1}
 DocType: Address Template,Address Template,Адреса шаблона
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Молимо Вас да унесете Ид радник ове продаје особе
 DocType: Territory,Classification of Customers by region,Класификација купаца по региону
 DocType: Project,% Tasks Completed,% Завршених послова
 DocType: Project,Gross Margin,Бруто маржа
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Молимо унесите прво Производња пункт
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,искључени корисник
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,искључени корисник
 DocType: Opportunity,Quotation,Понуда
 DocType: Salary Slip,Total Deduction,Укупно Одбитак
 DocType: Quotation,Maintenance User,Одржавање Корисник
@@ -1602,7 +1615,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
 DocType: Production Order Operation,Actual Operation Time,Стварна Операција време
 DocType: Authorization Rule,Applicable To (User),Важећи Да (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одбити
@@ -1612,12 +1625,12 @@
 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,ТАКО Кол
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток уноси постоје против складишта {0}, стога не можете поново доделите или промени Варехоусе"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток уноси постоје против складишта {0}, стога не можете поново доделите или промени Варехоусе"
 DocType: Appraisal,Calculate Total Score,Израчунајте Укупна оцена
 DocType: Supplier Quotation,Manufacturing Manager,Производња директор
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Сплит Напомена Испорука у пакетима.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Пошиљке
+apps/erpnext/erpnext/hooks.py +69,Shipments,Пошиљке
 DocType: Purchase Order Item,To be delivered to customer,Који ће бити достављен купца
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Пријави статус мора да се поднесе.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серијски број {0} не припада ниједној Варехоусе
@@ -1636,10 +1649,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Изаберите фирму ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставите празно ако се сматра за сва одељења
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная , контракт, стажер и т.д. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Currency Exchange,From Currency,Од валутног
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Износи не огледа у систему
 DocType: Purchase Invoice Item,Rate (Company Currency),Стопа (Друштво валута)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,другие
@@ -1655,7 +1668,7 @@
 DocType: Quality Inspection,In Process,У процесу
 DocType: Authorization Rule,Itemwise Discount,Итемвисе Попуст
 DocType: Purchase Order Item,Reference Document Type,Референтна Тип документа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} против Салес Ордер {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} против Салес Ордер {1}
 DocType: Account,Fixed Asset,Исправлена активами
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Серијализоване Инвентар
 DocType: Activity Type,Default Billing Rate,Уобичајено обрачуна курс
@@ -1665,7 +1678,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продаја Налог за плаћања
 DocType: Expense Claim Detail,Expense Claim Detail,Расходи потраживање Детаљ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Време трупци цреатед:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Молимо изаберите исправан рачун
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Молимо изаберите исправан рачун
 DocType: Item,Weight UOM,Тежина УОМ
 DocType: Employee,Blood Group,Крв Група
 DocType: Purchase Invoice Item,Page Break,Страна Пауза
@@ -1696,10 +1709,10 @@
 DocType: Time Log,To Time,За време
 DocType: Authorization Rule,Approving Role (above authorized value),Одобравање улога (изнад овлашћеног вредности)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Да бисте додали дете чворове , истражују дрво и кликните на чвору под којим желите да додате још чворова ."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на рачун мора бити Плаћа рачун
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия : {0} не может быть родитель или ребенок {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Кредит на рачун мора бити Плаћа рачун
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,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 +116,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитне рачуни могу бити повезани против другог кредитног уласка"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитне рачуни могу бити повезани против другог кредитног уласка"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Прайс-лист {0} отключена
 DocType: Manufacturing Settings,Allow Overtime,Дозволи Овертиме
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} серијски бројеви који су потребни за тачком {1}. Ви сте под условом {2}.
@@ -1707,8 +1720,9 @@
 DocType: Item,Customer Item Codes,Кориснички кодова
 DocType: Opportunity,Lost Reason,Лост Разлог
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Направи Оплата записи против налога или фактурама.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Величина узорка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Све ставке су већ фактурисано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,"Даље трошкова центри могу да буду под групама, али уноса можете извршити над несрпским групама"
 DocType: Project,External,Спољни
@@ -1764,13 +1778,14 @@
 DocType: Rename Tool,Rename Tool,Преименовање Тоол
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Ажурирање Трошкови
 DocType: Item Reorder,Item Reorder,Предмет Реордер
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Пренос материјала
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Пренос материјала
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведите операције , оперативне трошкове и дају јединствену операцију без своје пословање ."
 DocType: Purchase Invoice,Price List Currency,Ценовник валута
 DocType: Naming Series,User must always select,Корисник мора увек изабрати
 DocType: Stock Settings,Allow Negative Stock,Дозволи Негативно Стоцк
 DocType: Installation Note,Installation Note,Инсталација Напомена
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Додај Порези
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Новчани ток од финансирања
 ,Financial Analytics,Финансијски Аналитика
 DocType: Quality Inspection,Verified By,Верифиед би
 DocType: Address,Subsidiary,Подружница
@@ -1780,19 +1795,19 @@
 DocType: Process Payroll,Create Salary Slip,Направи Слип платама
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Очекује стање као по банци
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Источник финансирования ( обязательства)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ( {1} ) должна быть такой же, как изготавливается количество {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ( {1} ) должна быть такой же, как изготавливается количество {2}"
 DocType: Appraisal,Employee,Запосленик
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Увоз е-маил Од
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Позови као корисник
 DocType: Features Setup,After Sale Installations,Након инсталације продају
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} је у потпуности наплаћује
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} је у потпуности наплаћује
 DocType: Workstation Working Hour,End Time,Крајње време
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартные условия договора для продажи или покупки.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Группа по ваучером
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обавезно На
 DocType: Sales Invoice,Mass Mailing,Масовна Маилинг
 DocType: Rename Tool,File to Rename,Филе Ренаме да
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Схов Плаћања
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Указано БОМ {0} не постоји за ставку {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
@@ -1802,6 +1817,7 @@
 DocType: Selling Settings,Sales Order Required,Продаја Наручите Обавезно
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Креирање корисника
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,Одржавање Распоред Детаљ
 DocType: Quality Inspection Reading,Reading 9,Читање 9
@@ -1813,6 +1829,7 @@
 DocType: Warranty Claim,Raised By,Подигао
 DocType: Payment Tool,Payment Account,Плаћање рачуна
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Наведите компанија наставити
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Нето Промена Потраживања
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
 DocType: Quality Inspection Reading,Accepted,Примљен
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,Молимо проверите да ли сте заиста желите да избришете све трансакције за ову компанију. Ваши основни подаци ће остати како јесте. Ова акција се не може поништити.
@@ -1820,17 +1837,17 @@
 DocType: Payment Tool,Total Payment Amount,Укупно Износ за плаћање
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Сировине не може бити празан.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,Сировине не може бити празан.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Као што постоје постојеће трансакције стоцк за ову ставку, \ не можете променити вредности &#39;има серијски Не&#39;, &#39;Има серијски бр&#39;, &#39;Да ли лагеру предмета&#39; и &#39;Процена Метод&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Брзо Јоурнал Ентри
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Брзо Јоурнал Ентри
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
 DocType: Employee,Previous Work Experience,Претходно радно искуство
 DocType: Stock Entry,For Quantity,За Количина
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} не представлено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} не представлено
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Захтеви за ставке.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Одвојена производња поруџбина ће бити направљен за сваку готовог добар ставке.
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Цондитионс1
@@ -1843,7 +1860,7 @@
 DocType: Authorization Rule,Authorized Value,Овлашћени Вредност
 DocType: Contact,Enter department to which this Contact belongs,Унесите одељење које се овај контакт припада
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Укупно Абсент
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Јединица мере
 DocType: Fiscal Year,Year End Date,Датум завршетка године
 DocType: Task Depends On,Task Depends On,Задатак Дубоко У
@@ -1869,7 +1886,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Треће лице дистрибутер / дилер / заступника / сарадник / дистрибутер који продаје компанијама производе за провизију.
 DocType: Customer Group,Has Child Node,Има деце Ноде
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} против нарудзбенице {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} против нарудзбенице {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Унесите статичке параметре овде УРЛ адресу (нпр. пошиљалац = ЕРПНект, усернаме = ЕРПНект, лозинком = 1234 итд)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ни на који активно фискалној години. За више детаља проверите {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
@@ -1917,7 +1934,7 @@
  10. Додајте или Одузети: Било да желите да додате или одбије порез."
 DocType: Purchase Receipt Item,Recd Quantity,Рецд Количина
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0} , чем количество продаж Заказать {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовински рачун
 DocType: Tax Rule,Billing City,Биллинг Цити
 DocType: Global Defaults,Hide Currency Symbol,Сакриј симбол валуте
@@ -1949,6 +1966,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Коммунальные расходы
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Изнад
 DocType: Buying Settings,Default Buying Price List,Уобичајено Куповина Ценовник
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.","Установить значения по умолчанию , как Болгарии, Валюта , текущий финансовый год и т.д."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Плаћање Тип
@@ -1984,7 +2002,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Погледајте &quot;стопа материјала на бази&quot; у Цостинг одељак
 DocType: Appraisal Goal,Key Responsibility Area,Кључна Одговорност Површина
 DocType: Item Reorder,Material Request Type,Материјал Врста Захтева
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Ред {0}: УОМ фактор конверзије је обавезна
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ред {0}: УОМ фактор конверзије је обавезна
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Реф
 DocType: Cost Center,Cost Center,Трошкови центар
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
@@ -2007,7 +2025,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Све адресе.
 DocType: Company,Stock Settings,Стоцк Подешавања
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спајање је могуће само ако следеће особине су исти у оба записа. Да ли је група, корен тип, Компанија"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спајање је могуће само ако следеће особине су исти у оба записа. Да ли је група, корен тип, Компанија"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управление групповой клиентов дерево .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Нови Трошкови Центар Име
 DocType: Leave Control Panel,Leave Control Panel,Оставите Цонтрол Панел
@@ -2027,8 +2045,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Плаћање Алат Детаљ
 ,Sales Browser,Браузер по продажам
 DocType: Journal Entry,Total Credit,Укупна кредитна
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,местный
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,Дужници
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Велики
@@ -2047,7 +2065,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Све продаје Трансакције се могу означена против више лица ** ** Продаја тако да можете подесити и пратити циљеве.
 ,S.O. No.,С.О. Не.
 DocType: Production Order Operation,Make Time Log,Маке Тиме Пријави
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Молимо поставите количину преусмеравање
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Молимо поставите количину преусмеравање
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
 DocType: Price List,Applicable for Countries,Важи за земље
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Компьютеры
@@ -2107,10 +2125,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Барем једна ставка треба унети у негативном количином у повратном документа
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Но Примедбе
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Но Примедбе
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Презадужен
 DocType: Account,Stock Received But Not Billed,Залиха примљена Али не наплати
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Корен Рачун мора бити група
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Корен Рачун мора бити група
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Бруто Паи + Заостатак Износ + Енцасхмент Износ - Укупно дедукције
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 DocType: Features Setup,Sales and Purchase,Продаја и Куповина
@@ -2124,6 +2142,7 @@
 DocType: Journal Entry Account,Party Balance,Парти Стање
 DocType: Sales Invoice Item,Time Log Batch,Време Лог Групно
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Молимо одаберите Аппли попуста на
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Плаћа Слип Креирано
 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,Пренос материјала за Производња
@@ -2131,9 +2150,9 @@
 DocType: Purchase Invoice,Half-yearly,Полугодишње
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Фискална година {0} није пронађен.
 DocType: Bank Reconciliation,Get Relevant Entries,Гет Релевантне уносе
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Рачуноводство Ентри за Деонице
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Рачуноводство Ентри за Деонице
 DocType: Sales Invoice,Sales Team1,Продаја Теам1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Кориснички Адреса
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесите додатни попуст Он
 DocType: Account,Root Type,Корен Тип
@@ -2141,15 +2160,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Покажи ову пројекцију слајдова на врху странице
 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 +149,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
 DocType: Quality Inspection,Quality Inspection,Провера квалитета
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Ектра Смалл
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правно лице / Подружница са посебном контном припада организацији.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храна , пиће и дуван"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,ПЛ или БС
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимална Инвентар Ниво
 DocType: Stock Entry,Subcontract,Подуговор
@@ -2187,7 +2206,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Долазни контрола квалитета.
 DocType: Purchase Order Item,Returned Qty,Вратио ком
 DocType: Employee,Exit,Излаз
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Корен Тип је обавезно
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Корен Тип је обавезно
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Серийный номер {0} создан
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За практичност потрошача, ови кодови могу да се користе у штампаним форматима као што су фактуре и отпремнице"
 DocType: Employee,You can enter any date manually,Можете да ручно унесете било који датум
@@ -2195,8 +2214,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Пробни период
 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 +110,Row {0}: Advance against Customer must be credit,Ред {0}: Унапред против Купца мора бити кредит
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Куповина Потврда јединице у комплету
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Платити
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Платити
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Да датетиме
 DocType: SMS Settings,SMS Gateway URL,СМС Гатеваи УРЛ адреса
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Протоколи за одржавање смс статус испоруке
@@ -2213,7 +2233,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Реордер Ниво
 DocType: Attendance,Attendance Date,Гледалаца Датум
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Плата распада на основу зараде и дедукције.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Счет с дочерних узлов не могут быть преобразованы в книге
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Счет с дочерних узлов не могут быть преобразованы в книге
 DocType: Address,Preferred Shipping Address,Жељени Адреса испоруке
 DocType: Purchase Receipt Item,Accepted Warehouse,Прихваћено Магацин
 DocType: Bank Reconciliation Detail,Posting Date,Постављање Дате
@@ -2231,7 +2251,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Серийный номер {0} не существует
 DocType: Pricing Rule,Discount Percentage,Скидка в процентах
 DocType: Payment Reconciliation Invoice,Invoice Number,Фактура број
-apps/erpnext/erpnext/hooks.py +54,Orders,Поруџбине
+apps/erpnext/erpnext/hooks.py +55,Orders,Поруџбине
 DocType: Leave Control Panel,Employee Type,Запослени Тип
 DocType: Employee Leave Approver,Leave Approver,Оставите Аппровер
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Материјал Пребачен за производњу
@@ -2243,7 +2263,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Материјала наплаћени против овог налога за продају
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Затварање период Ступање
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,МВЗ с существующими сделок не могут быть преобразованы в группе
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,амортизация
+DocType: Account,Depreciation,амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Супплиер (с)
 DocType: Customer,Credit Limit,Кредитни лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изаберите тип трансакције
@@ -2268,11 +2288,12 @@
 DocType: Material Request,Requested For,Тражени За
 DocType: Quotation Item,Against Doctype,Против ДОЦТИПЕ
 DocType: Delivery Note,Track this Delivery Note against any Project,Прати ову напомену Испорука против било ког пројекта
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Корневая учетная запись не может быть удалена
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Нето готовина из Инвестирање
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Корневая учетная запись не может быть удалена
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Схов Сток уноси
 ,Is Primary Address,Примарна Адреса
 DocType: Production Order,Work-in-Progress Warehouse,Рад у прогресу Магацин
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Ссылка # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управљање адресе
 DocType: Pricing Rule,Item Code,Шифра
 DocType: Production Planning Tool,Create Production Orders,Креирање налога Производне
@@ -2280,7 +2301,7 @@
 DocType: Journal Entry,User Remark,Корисник Напомена
 DocType: Lead,Market Segment,Сегмент тржишта
 DocType: Employee Internal Work History,Employee Internal Work History,Запослени Интерна Рад Историја
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Затварање (др)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Затварање (др)
 DocType: Contact,Passive,Пасиван
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Серийный номер {0} не в наличии
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Налоговый шаблон для продажи сделок.
@@ -2296,7 +2317,7 @@
 ,Billed Amount,Изграђена Износ
 DocType: Bank Reconciliation,Bank Reconciliation,Банка помирење
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Гет Упдатес
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Додајте неколико узорака евиденцију
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Оставите Манагемент
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Группа по Счет
@@ -2305,14 +2326,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Глава рачун под одговорности , у којој ће Добитак / Губитак се резервисати"
 DocType: Payment Tool,Against Vouchers,Против Ваучери
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Брзо Помоћ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
 DocType: Features Setup,Sales Extras,Продаја Екстра
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} против МВЗ {2} будет превышать {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',"""Од датума"" мора бити након ""До датума"""
 ,Stock Projected Qty,Пројектовани Стоцк Кти
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Sales Order,Customer's Purchase Order,Куповина нарудзбини
 DocType: Warranty Claim,From Company,Из компаније
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Вредност или Кол
@@ -2322,9 +2343,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Оставите Блоцк Лист Дозвољени
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Ви ћете га користити за Пријављивање
 DocType: Sales Partner,Retailer,Продавац на мало
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Сви Типови добављача
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
+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 +93,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржавање Распоред шифра
 DocType: Sales Order,%  Delivered,Испоручено %
@@ -2368,7 +2389,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежина пакета. Обично нето тежина + амбалаже тежина. (За штампу)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Корисници са овом улогом је дозвољено да подесите замрзнуте рачуне и створити / модификује рачуноводствене уносе против замрзнутим рачунима
 DocType: Serial No,Is Cancelled,Да ли Отказан
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Моје пошиљке
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Моје пошиљке
 DocType: Journal Entry,Bill Date,Бил Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Чак и ако постоји више Цене правила са највишим приоритетом, онда следећи интерни приоритети се примењују:"
 DocType: Supplier,Supplier Details,Добављачи Детаљи
@@ -2389,10 +2410,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,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 +198,Purchase Order {0} is not submitted,Заказ на {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Заказ на {0} не представлено
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,пројектован
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по - доставки и избыточного бронирования по пункту {0} как количестве 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,Датум отварања
 DocType: Journal Entry,Remark,Примедба
@@ -2405,9 +2426,9 @@
 DocType: Time Log,Batched for Billing,Дозирана за наплату
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Рачуни подигао Добављачи.
 DocType: POS Profile,Write Off Account,Отпис налог
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Сумма скидки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повратак против фактури
 DocType: Item,Warranty Period (in days),Гарантни период (у данима)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Нето готовина из пословања
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,например НДС
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Тачка 4
 DocType: Journal Entry Account,Journal Entry Account,Јоурнал Ентри рачуна
@@ -2448,7 +2469,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
 DocType: Sales Invoice,Against Income Account,Против приход
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Испоручено
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,Транспортер Инфо
@@ -2476,10 +2497,10 @@
 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 +14,This is a root sales person and cannot be edited.,То јекорен продаје човек и не може се мењати .
 ,Stock Ledger,Берза Леџер
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Оцени: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Оцени: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Плата Слип Одбитак
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Изаберите групу чвор прво.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Цель должна быть одна из {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Цель должна быть одна из {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Попуните формулар и да га сачувате
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Преузмите извештај садржи све сировине са њиховим најновијим инвентара статусу
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форум
@@ -2517,7 +2538,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компания ( не клиента или поставщика ) хозяин.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Пожалуйста, введите ' ожидаемой даты поставки """
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Напомена: Ако се плаћање не врши против било референце, чине Јоурнал Ентри ручно."
@@ -2537,7 +2558,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Тачка 3
 DocType: Purchase Order,Customer Contact Email,Кориснички Контакт Е-маил
 DocType: Sales Team,Contribution (%),Учешће (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Одговорности
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продаја Особа Име
@@ -2548,20 +2569,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Пре помирења
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Делимично Изграђена
 DocType: Item,Default BOM,Уобичајено БОМ
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Молимо Вас да поново тип цомпани наме да потврди
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Укупно Изванредна Амт
 DocType: Time Log Batch,Total Hours,Укупно време
 DocType: Journal Entry,Printing Settings,Принтинг Подешавања
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Укупно задуживање мора бити једнак укупном кредитном .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Укупно задуживање мора бити једнак укупном кредитном .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,аутомобилски
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Из доставница
 DocType: Time Log,From Time,Од времена
 DocType: Notification Control,Custom Message,Прилагођена порука
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестиционо банкарство
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
 DocType: Purchase Invoice,Price List Exchange Rate,Цена курсној листи
 DocType: Purchase Invoice Item,Rate,Стопа
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,стажиста
@@ -2580,9 +2601,10 @@
 , са приоритетом. Цена Правила: {0}"
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ваздушна линија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Питање Материјал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Питање Материјал
 DocType: Material Request Item,For Warehouse,За Варехоусе
 DocType: Employee,Offer Date,Понуда Датум
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитати
 DocType: Hub Settings,Access Token,Приступ токен
 DocType: Sales Invoice Item,Serial No,Серијски број
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Пожалуйста, введите Maintaince Подробности"
@@ -2596,10 +2618,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,"Есть больше праздников , чем рабочих дней в этом месяце."
 DocType: Product Bundle Item,Product Bundle Item,Производ Бундле артикла
 DocType: Sales Partner,Sales Partner Name,Продаја Име партнера
+DocType: Payment Reconciliation,Maximum Invoice Amount,Максимални износ фактуре
 DocType: Purchase Invoice Item,Image View,Слика Погледај
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,Вредновање и Тотал
@@ -2607,6 +2631,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Ово артикла је варијанта {0} (Темплате). Атрибути ће бити копирани са шаблона осим 'Нема Копирање' постављено
 DocType: Account,Purchase User,Куповина Корисник
 DocType: Notification Control,Customize the Notification,Прилагођавање обавештења
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Новчани ток из пословања
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Уобичајено Адреса Шаблон не може бити обрисан
 DocType: Sales Invoice,Shipping Rule,Достава Правило
 DocType: Journal Entry,Print Heading,Штампање наслова
@@ -2617,7 +2642,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,сырье
 DocType: Leave Application,Follow via Email,Пратите преко е-поште
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сумма налога После скидка сумма
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи . Вы не можете удалить этот аккаунт .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Молимо Вас да изаберете датум постања први
@@ -2635,6 +2660,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Серийный Нос Требуется для сериализованный элемент {0}
 DocType: Journal Entry,Bank Entry,Банка Унос
 DocType: Authorization Rule,Applicable To (Designation),Важећи Да (Именовање)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Добавить в корзину
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Група По
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Включение / отключение валюты.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Почтовые расходы
@@ -2642,30 +2668,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забава и слободно време
 DocType: Purchase Order,The date on which recurring order will be stop,Датум када се понавља налог ће бити зауставити
 DocType: Quality Inspection,Item Serial No,Ставка Сериал но
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} мора бити смањена за {1} или би требало да повећа толеранцију преливања
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} мора бити смањена за {1} или би требало да повећа толеранцију преливања
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Укупно Поклон
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серијализованом артикла {0} не може да се ажурира \
  користећи Сток помирење"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Пребаци Материјал добављачу
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Пребаци Материјал добављачу
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Направи понуду
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Нисте ауторизовани да одобри лишће на блок Датуми
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Все эти предметы уже выставлен счет
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Все эти предметы уже выставлен счет
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Может быть одобрено {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Правило услови испоруке
 DocType: BOM Replace Tool,The new BOM after replacement,Нови БОМ након замене
 DocType: Features Setup,Point of Sale,Поинт оф Сале
 DocType: Account,Tax,Порез
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Ред {0}: {1} није валидан {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Од производа Бундле
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Од производа Бундле
 DocType: Production Planning Tool,Production Planning Tool,Планирање производње алата
 DocType: Quality Inspection,Report Date,Извештај Дате
 DocType: C-Form,Invoices,Рачуни
 DocType: Job Opening,Job Title,Звање
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Примаоци
 DocType: Features Setup,Item Groups in Details,Ставка Групе у детаљима
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Количина да Производња мора бити већи од 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Почетак Поинт-оф-Сале (ПОС)
@@ -2673,8 +2698,9 @@
 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: Pricing Rule,Customer Group,Кориснички Група
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: Item,Website Description,Вебсајт Опис
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Нето промена у капиталу
 DocType: Serial No,AMC Expiry Date,АМЦ Датум истека
 ,Sales Register,Продаја Регистрација
 DocType: Quotation,Quotation Lost Reason,Понуда Лост разлог
@@ -2682,12 +2708,12 @@
 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 +108,Summary for this month and pending activities,Преглед за овај месец и чекају активности
 DocType: Customer Group,Customer Group Name,Кориснички Назив групе
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,Атрибути
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Гет ставке
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Пожалуйста, введите списать счет"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Гет ставке
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Последњи Низ Датум
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Маке Акциза фактура
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Рачун {0} не припада компанији {1}
@@ -2703,7 +2729,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
 DocType: Project,Expected End Date,Очекивани датум завршетка
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,коммерческий
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,коммерческий
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родитељ артикла {0} не сме бити лагеру предмета
 DocType: Cost Center,Distribution Id,Дистрибуција Ид
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
@@ -2716,7 +2742,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Вредност атрибута за {0} мора бити у распону од {1} {2} да у корацима од {3}
 DocType: Tax Rule,Sales,Продајни
 DocType: Stock Entry Detail,Basic Amount,Основни Износ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
 DocType: Leave Allocation,Unused leaves,Неискоришћени листови
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Кр
 DocType: Customer,Default Receivable Accounts,Уобичајено Рецеивабле Аццоунтс
@@ -2728,16 +2754,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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,Контакт ХТМЛ
 DocType: Landed Cost Voucher,Purchase Receipts,Куповина Примици
-DocType: Payment Reconciliation,Maximum Amount,Максимални износ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Како се примењује Правилник о ценама?
 DocType: Quality Inspection,Delivery Note No,Испорука Напомена Не
 DocType: Company,Retail,Малопродаја
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Клиент {0} не существует
 DocType: Attendance,Absent,Одсутан
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Производ Бундле
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ред {0}: Погрешна референца {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Производ Бундле
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Ред {0}: Погрешна референца {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купите порези и таксе Темплате
 DocType: Upload Attendance,Download Template,Преузмите шаблон
 DocType: GL Entry,Remarks,Примедбе
@@ -2764,7 +2790,7 @@
 ,Monthly Attendance Sheet,Гледалаца Месечни лист
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Нема података фоунд
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Трошкови Центар је обавезан за пункт {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Гет ставки из производа Бундле
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Гет ставки из производа Бундле
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Счет {0} неактивен
 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,Гледалаца Од Датум и радног То Дате је обавезна
@@ -2773,8 +2799,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,""" Прибыль и убытки "" тип счета {0} не допускаются в Открытие запись"
 DocType: Features Setup,Sales Discounts,Продаја Попусти
 DocType: Hub Settings,Seller Country,Продавац Земља
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Објављивање ставке на сајту
 DocType: Authorization Rule,Authorization Rule,Овлашћење Правило
 DocType: Sales Invoice,Terms and Conditions Details,Услови Детаљи
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,технические условия
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продаја Порези и накнаде Темплате
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Одећа и прибор
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Број Реда
@@ -2796,7 +2824,7 @@
 DocType: Time Log,Billing Amount,Обрачун Износ
 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 +18,Applications for leave.,Пријаве за одмор.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Счет с существующей сделки не могут быть удалены
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Счет с существующей сделки не могут быть удалены
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,судебные издержки
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Дан у месецу на којем би аутоматски ће се генерисати нпр 05, 28 итд"
 DocType: Sales Invoice,Posting Time,Постављање Време
@@ -2812,11 +2840,11 @@
 DocType: Maintenance Visit,Breakdown,Слом
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Рачун: {0} са валутом: {1} не може бити изабран
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Датум
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Рачун {0}: {1 Родитељ рачун} не припада компанији: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Рачун {0}: {1 Родитељ рачун} не припада компанији: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Успешно избрисали све трансакције везане за ову компанију!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Као и на датум
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,пробни рад
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт .
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт .
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Аутоматско уметак Ценовник стопа ако недостаје
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Укупно Плаћени износ
@@ -2828,6 +2856,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Укупно цард Износ (преко Тиме Протоколи)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Ми продајемо ову ставку
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Добављач Ид
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Количину треба већи од 0
 DocType: Journal Entry,Cash Entry,Готовина Ступање
 DocType: Sales Partner,Contact Desc,Контакт Десц
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Тип листова као што су повремене, болесне итд"
@@ -2836,7 +2865,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Додајте редове одређује годишње буџете на рачунима.
 DocType: Buying Settings,Default Supplier Type,Уобичајено Снабдевач Тип
 DocType: Production Order,Total Operating Cost,Укупни оперативни трошкови
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Примечание: Пункт {0} вошли несколько раз
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Примечание: Пункт {0} вошли несколько раз
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Сви контакти.
 DocType: Newsletter,Test Email Id,Тест маил Ид
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Компанија Скраћеница
@@ -2861,7 +2890,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Пореска Шаблон је обавезно.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Рачун {0}: {1 Родитељ рачун} не постоји
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,Рачун {0}: {1 Родитељ рачун} не постоји
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник Цена (Друштво валута)
 DocType: Account,Temporary,Привремен
 DocType: Address,Preferred Billing Address,Жељени Адреса за наплату
@@ -2879,8 +2908,8 @@
 ,Item-wise Price List Rate,Ставка - мудар Ценовник курс
 DocType: Purchase Order Item,Supplier Quotation,Снабдевач Понуда
 DocType: Quotation,In Words will be visible once you save the Quotation.,У речи ће бити видљив када сачувате цитат.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} је заустављена
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} је заустављена
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
 DocType: Lead,Add to calendar on this date,Додај у календар овог датума
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила для добавления стоимости доставки .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстојећи догађаји
@@ -2901,24 +2930,24 @@
 DocType: Customer,From Lead,Од Леад
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Поруџбине пуштен за производњу.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Изаберите Фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
 DocType: Hub Settings,Name Token,Име токен
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Стандардна Продаја
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Атлеаст једно складиште је обавезно
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,Заменити
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
 DocType: Purchase Invoice Item,Project Name,Назив пројекта
 DocType: Supplier,Mention if non-standard receivable account,Спомените ако нестандардни потраживања рачуна
 DocType: Journal Entry Account,If Income or Expense,Ако прихода или расхода
 DocType: Features Setup,Item Batch Nos,Итем Батцх Нос
 DocType: Stock Ledger Entry,Stock Value Difference,Вредност акције Разлика
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Људски Ресурси
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,Људски Ресурси
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Плаћање Плаћање Помирење
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,налоговые активы
 DocType: BOM Item,BOM No,БОМ Нема
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,Јоурнал Ентри {0} нема налог {1} или већ упарен против другог ваучера
 DocType: Item,Moving Average,Мовинг Авераге
 DocType: BOM Replace Tool,The BOM which will be replaced,БОМ који ће бити замењен
 DocType: Account,Debit,Задужење
@@ -2955,7 +2984,7 @@
 DocType: Stock Entry Detail,Additional Cost,Додатни трошак
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Финансовый год Дата окончания
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не можете да филтрирате на основу ваучер Не , ако груписани по ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Направи понуду добављача
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Направи понуду добављача
 DocType: Quality Inspection,Incoming,Долазни
 DocType: BOM,Materials Required (Exploded),Материјали Обавезно (Екплодед)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Смањите Зарада за дозволу без плате (ЛВП)
@@ -2963,7 +2992,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Серијски број {1} не одговара {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
 DocType: Batch,Batch ID,Батцх ИД
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Примечание: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Достава Напомена трендови
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Овонедељном Преглед
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} должен быть куплены или субподрядчиком Пункт в строке {1}
@@ -2997,7 +3026,6 @@
 DocType: Purchase Order,End date of current order's period,Датум завршетка периода постојећи поредак је
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Маке Оффер Леттер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Повратак
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Уобичајено Јединица мере за варијанту морају бити исти као шаблон
 DocType: Production Order Operation,Production Order Operation,Производња Ордер Операција
 DocType: Pricing Rule,Disable,запрещать
 DocType: Project Task,Pending Review,Чека критику
@@ -3005,7 +3033,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Кориснички Ид
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Да Време мора бити већи од Фром Тиме
 DocType: Journal Entry Account,Exchange Rate,Курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Магацин {0}: {1 Родитељ рачун} не Болонг предузећу {2}
 DocType: BOM,Last Purchase Rate,Последња куповина Стопа
 DocType: Account,Asset,преимућство
@@ -3025,7 +3053,7 @@
 ,Available Stock for Packing Items,На располагању лагер за паковање ставке
 DocType: Item Variant,Item Variant,Итем Варијанта
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Постављање Ова адреса шаблон као подразумевани, јер не постоји други подразумевани"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Стање рачуна већ у задуживање, није вам дозвољено да поставите 'Стање Муст Бе' као 'Кредит'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Управљање квалитетом
 DocType: Production Planning Tool,Filter based on customer,Филтер на бази купца
 DocType: Payment Tool Detail,Against Voucher No,Против ваучера Но
@@ -3042,6 +3070,7 @@
 DocType: Opportunity,Next Contact,Следећа Контакт
 DocType: Employee,Employment Type,Тип запослења
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,капитальные активы
+,Cash Flow,Protok novca
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Период примене не могу бити на два намјена евиденције
 DocType: Item Group,Default Expense Account,Уобичајено Трошкови налога
 DocType: Employee,Notice (days),Обавештење ( дана )
@@ -3073,13 +3102,12 @@
 DocType: Production Order,Warehouses,Складишта
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Печать и стационарное
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Група Ноде
-DocType: Payment Reconciliation,Minimum Amount,Минимални износ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Ажурирање готове робе
 DocType: Workstation,per hour,на сат
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Рачун за складишта ( сталне инвентуре ) ће бити направљен у оквиру овог рачуна .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада .
 DocType: Company,Distribution,Дистрибуција
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Износ Плаћени
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Износ Плаћени
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Пројецт Манагер
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,депеша
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Максимална дозвољена попуст за ставку: {0} је {1}%
@@ -3103,7 +3131,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Подршка Аналтиицс
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компания на складах отсутствует {0}
 DocType: POS Profile,Terms and Conditions,Услови
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Да би требало да буде дата у фискалну годину. Под претпоставком То Дате = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Да би требало да буде дата у фискалну годину. Под претпоставком То Дате = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Овде можете одржавати висина, тежина, алергија, медицинску забринутост сл"
 DocType: Leave Block List,Applies to Company,Примењује се на предузећа
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить , потому что представляется со Вступление {0} существует"
@@ -3117,11 +3145,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Молимо Вас да унесете куповини Приливи
 DocType: Sales Invoice,Get Advances Received,Гет аванси
 DocType: Email Digest,Add/Remove Recipients,Адд / Ремове прималаца
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},Сделка не допускается в отношении остановил производство ордена {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Настройка сервера входящей для поддержки электронный идентификатор . (например support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Мањак Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
 DocType: Salary Slip,Salary Slip,Плата Слип
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' To Date ' требуется
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генерисати паковање признанице за да буде испоручена пакети. Користи се за обавијести пакет број, Садржај пакета и његову тежину."
@@ -3210,7 +3238,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Запослених евиденција.
 DocType: HR Settings,Payroll Settings,Платне Подешавања
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Матцх нису повезане фактурама и уплатама.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Извршите поруџбину
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Извршите поруџбину
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Корен не може имати центар родитеља трошкова
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Изабери Марка ...
 DocType: Sales Invoice,C-Form Applicable,Ц-примењује
@@ -3225,7 +3253,7 @@
 DocType: Appraisal,Start Date,Датум почетка
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Выделите листья на определенный срок.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Кликните овде да бисте проверили
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Рачун {0}: Не може да се доделити као родитељ налог
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Рачун {0}: Не може да се доделити као родитељ налог
 DocType: Purchase Invoice Item,Price List Rate,Ценовник Оцени
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Схов &quot;У складишту&quot; или &quot;Није у складишту&quot; заснован на лагеру на располагању у овом складишту.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Саставнице (БОМ)
@@ -3234,17 +3262,17 @@
 DocType: Project,Expected Start Date,Очекивани датум почетка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Уклоните ставку ако оптужбе се не примењује на ту ставку
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Нпр. смсгатеваи.цом / апи / сенд_смс.цги
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Пријем
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Пријем
 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: Employee Leave Approver,Employee Leave Approver,Запослени одсуство одобраватељ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} је успешно додат у нашој листи билтен.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не могу прогласити као изгубљен , јер Понуда је учињен ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Куповина Мастер менаџер
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Главни Извештаји
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,До данас не може бити раније од датума
@@ -3262,7 +3290,7 @@
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Нешто није у реду!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Упозорење: Оставите пријава садржи следеће датуме блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Завршетак датум
 DocType: Purchase Invoice Item,Amount (Company Currency),Износ (Друштво валута)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Название подразделения (департамент) хозяин.
@@ -3281,10 +3309,10 @@
 ,Serial No Service Contract Expiry,Серијски број услуга Уговор Истек
 DocType: Item,Unit of Measure Conversion,Јединица мере Цонверсион
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Запослени не може да се промени
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ви не можете кредитних и дебитних исти налог у исто време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Ви не можете кредитних и дебитних исти налог у исто време
 DocType: Naming Series,Help HTML,Помоћ ХТМЛ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100% . Это {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Исправка за преко-{0} {прешао за тачке 1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Исправка за преко-{0} {прешао за тачке 1}
 DocType: Address,Name of person or organization that this address belongs to.,Име особе или организације која је ова адреса припада.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Ваши Добављачи
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не можете поставити као Лост као Продаја Наручите је направљен .
@@ -3300,31 +3328,31 @@
 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/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Молимо вас да проверите Мулти валута опцију да дозволи рачуне са другој валути
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Молимо вас да проверите Мулти валута опцију да дозволи рачуне са другој валути
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Итем: {0} не постоји у систему
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Нисте овлашћени да подесите вредност Фрозен
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Нисте овлашћени да подесите вредност Фрозен
 DocType: Payment Reconciliation,Get Unreconciled Entries,Гет неусаглашених уносе
+DocType: Payment Reconciliation,From Invoice Date,Од Датум рачуна
 DocType: Cost Center,Budgets,Буџети
-DocType: Employee,Emergency Contact Details,Хитна Контакт
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Шта он ради ?
 DocType: Delivery Note,To Warehouse,Да Варехоусе
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Счет {0} был введен более чем один раз в течение финансового года {1}
 ,Average Commission Rate,Просечан курс Комисија
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Гледалаца не може бити означен за будуће датуме
 DocType: Pricing Rule,Pricing Rule Help,Правилник о ценама Помоћ
 DocType: Purchase Taxes and Charges,Account Head,Рачун шеф
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Упдате додатне трошкове да израчуна слетео трошак ставке
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,электрический
 DocType: Stock Entry,Total Value Difference (Out - In),Укупна вредност Разлика (Оут - Ин)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Ред {0}: курс је обавезна
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Ред {0}: курс је обавезна
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID пользователя не установлен Требуются {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Од право на гаранцију
 DocType: Stock Entry,Default Source Warehouse,Уобичајено Извор Магацин
 DocType: Item,Customer Code,Кориснички Код
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Подсетник за рођендан за {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Дана Од Последња Наручи
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,фондовые активы
@@ -3337,7 +3365,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Затварање рачуна {0} мора бити типа одговорности / Екуити
 DocType: Authorization Rule,Based On,На Дана
 DocType: Sales Order Item,Ordered Qty,Ж Кол
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Ставка {0} је онемогућен
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Ставка {0} је онемогућен
 DocType: Stock Settings,Stock Frozen Upto,Берза Фрозен Упто
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Период од периода до датума и обавезних се понављају {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Пројекат активност / задатак.
@@ -3345,7 +3373,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпис Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слетео Трошкови Ваучер
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Пожалуйста, установите {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Поновите на дан у месецу
@@ -3375,12 +3403,12 @@
 DocType: Upload Attendance,Upload Attendance,Уплоад присуствовање
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,БОМ и Производња Количина се тражи
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старење Опсег 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Износ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Износ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,БОМ заменио
 ,Sales Analytics,Продаја Аналитика
 DocType: Manufacturing Settings,Manufacturing Settings,Производња Подешавања
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Подешавање Е-маил
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,"Пожалуйста, введите валюту по умолчанию в компании Master"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Дневни Подсетник
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Сукоби Пореска Правило са {0}
@@ -3406,13 +3434,13 @@
 DocType: Sales Order Item,Produced Quantity,Произведена количина
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,инжењер
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Тражи Суб скупштине
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
 DocType: Sales Partner,Partner Type,Партнер Тип
 DocType: Purchase Taxes and Charges,Actual,Стваран
 DocType: Authorization Rule,Customerwise Discount,Цустомервисе Попуст
 DocType: Purchase Invoice,Against Expense Account,Против трошковником налог
 DocType: Production Order,Production Order,Продуцтион Ордер
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
 DocType: Quotation Item,Against Docname,Против Доцнаме
 DocType: SMS Center,All Employee (Active),Све Запослени (активна)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Погледај Сада
@@ -3424,15 +3452,15 @@
 DocType: Employee,Applicable Holiday List,Важећи Холидаи Листа
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серия Обновлено
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Тип отчета является обязательным
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Тип отчета является обязательным
 DocType: Item,Serial Number Series,Серијски број серија
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для складе Пункт {0} в строке {1}
 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/public/js/setup_wizard.js +101,The First User: You,Први Корисник : Ви
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Датум почетка и фискалну годину Датум завршетка су већ постављена у фискалној {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успешно помирили
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Датум почетка и фискалну годину Датум завршетка су већ постављена у фискалној {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Успешно помирили
 DocType: Production Order,Planned End Date,Планирани Датум Крај
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Где ставке су ускладиштене.
 DocType: Tax Rule,Validity,Рок важења
@@ -3440,7 +3468,7 @@
 DocType: Attendance,Attendance,Похађање
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Дата публикации и постављање време је обавезна
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Дата публикации и постављање време је обавезна
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Налоговый шаблон для покупки сделок.
 ,Item Prices,Итем Цене
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,У речи ће бити видљив када сачувате поруџбеницу.
@@ -3449,15 +3477,15 @@
 DocType: Task,Review Date,Прегледајте Дате
 DocType: Purchase Invoice,Advance Payments,Адванце Плаћања
 DocType: Purchase Taxes and Charges,On Net Total,Он Нет Укупно
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же , как производственного заказа"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же , как производственного заказа"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Нема дозволе за коришћење средства наплате
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Нотифицатион Емаил Аддрессес' не указано се понављају и% с
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Валута не може да се промени након што уносе користите неки други валуте
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,Валута не може да се промени након што уносе користите неки други валуте
 DocType: Company,Round Off Account,Заокружити рачун
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,административные затраты
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родитељ групу потрошача
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промена
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Промена
 DocType: Purchase Invoice,Contact Email,Контакт Емаил
 DocType: Appraisal Goal,Score Earned,Оцена Еарнед
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","например "" Моя компания ООО """
@@ -3467,13 +3495,13 @@
 DocType: Packing Slip,Gross Weight UOM,Бруто тежина УОМ
 DocType: Email Digest,Receivables / Payables,Потраживања / Обавезе
 DocType: Delivery Note Item,Against Sales Invoice,Против продаје фактура
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Кредитни рачун
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Кредитни рачун
 DocType: Landed Cost Item,Landed Cost Item,Слетео Цена артикла
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Схов нула вредности
 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 +562,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
 DocType: Item,Default Warehouse,Уобичајено Магацин
 DocType: Task,Actual End Date (via Time Logs),Стварна Датум завршетка (преко Тиме Протоколи)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Буџет не може бити додељен против групе рачуна {0}
@@ -3509,29 +3537,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,План време дневнике ван Воркстатион радног времена.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} уже представлен
 ,Items To Be Requested,Артикли бити затражено
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Гет Ласт Рате Куповина
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Обрачун курс заснован на врсти дјелатности (по сату)
 DocType: Company,Company Info,Подаци фирме
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Компании e-mail ID не найден, следовательно, Почта не отправляется"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств ( активов )
 DocType: Production Planning Tool,Filter based on item,Филтер на бази ставке
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Текући рачуни
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Текући рачуни
 DocType: Fiscal Year,Year Start Date,Датум почетка године
 DocType: Attendance,Employee Name,Запослени Име
 DocType: Sales Invoice,Rounded Total (Company Currency),Заобљени Укупно (Друштво валута)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Не могу да цоверт групи јер је изабран Тип рачуна.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,Не могу да цоверт групи јер је изабран Тип рачуна.
 DocType: Purchase Common,Purchase Common,Куповина Заједнички
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,Оппортунити
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Примања запослених
 DocType: Sales Invoice,Is POS,Да ли је ПОС
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Произведено Кол
 DocType: Purchase Receipt Item,Accepted Quantity,Прихваћено Количина
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не постоји
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Рачуни подигао купцима.
 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 +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} је додао претплатници
 DocType: Maintenance Schedule,Schedule,Распоред
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Дефинисати буџет за ову трошкова Центра. Да бисте поставили буџета акцију, погледајте &quot;Компанија Листа&quot;"
@@ -3539,7 +3568,7 @@
 DocType: Quality Inspection Reading,Reading 3,Читање 3
 ,Hub,Средиште
 DocType: GL Entry,Voucher Type,Тип ваучера
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценовник није пронађен или онемогућен
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Ценовник није пронађен или онемогућен
 DocType: Expense Claim,Approved,Одобрено
 DocType: Pricing Rule,Price,цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
@@ -3553,7 +3582,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Рачуноводствене ставке дневника.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно на ком Од Варехоусе
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Партија / налог не подудара са {1} / {2} {3} у {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Да бисте креирали пореском билансу
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Унесите налог Екпенсе
 DocType: Account,Stock,Залиха
@@ -3564,7 +3593,7 @@
 DocType: Employee,Contract End Date,Уговор Датум завршетка
 DocType: Sales Order,Track this Sales Order against any Project,Прати овај продајни налог против било ког пројекта
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Повуците продајне налоге (чека да испоручи) на основу наведених критеријума
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Од понуде добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Од понуде добављача
 DocType: Deduction Type,Deduction Type,Одбитак Тип
 DocType: Attendance,Half Day,Пола дана
 DocType: Pricing Rule,Min Qty,Мин Кол-во
@@ -3572,7 +3601,7 @@
 DocType: GL Entry,Transaction Date,Трансакција Датум
 DocType: Production Plan Item,Planned Qty,Планирани Кол
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Укупно Пореска
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,За Количина (Мануфацтуред Кти) је обавезан
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,За Количина (Мануфацтуред Кти) је обавезан
 DocType: Stock Entry,Default Target Warehouse,Уобичајено Циљна Магацин
 DocType: Purchase Invoice,Net Total (Company Currency),Нето Укупно (Друштво валута)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Партија Тип и странка се примењује само против примања / обавезе рачуна
@@ -3626,9 +3655,9 @@
 DocType: Customer,Commission Rate,Комисија Оцени
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Маке Вариант
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Блок оставите апликације по одељењу.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Корпа је празна
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Корпа је празна
 DocType: Production Order,Actual Operating Cost,Стварни Оперативни трошкови
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Корневая не могут быть изменены .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Корневая не могут быть изменены .
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Додељена сума не може већи од износа унадустед
 DocType: Manufacturing Settings,Allow Production on Holidays,Дозволите производња на празницима
 DocType: Sales Order,Customer's Purchase Order Date,Наруџбенице купца Датум
@@ -3639,11 +3668,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,дизајнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Услови коришћења шаблона
 DocType: Serial No,Delivery Details,Достава Детаљи
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Аутоматско креирање Материал захтев ако количина падне испод тог нивоа
 ,Item-wise Purchase Register,Тачка-мудар Куповина Регистрација
 DocType: Batch,Expiry Date,Датум истека
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да бисте поставили ниво преусмеравање тачка мора бити Куповина јединица или Производња артикла
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да бисте поставили ниво преусмеравање тачка мора бити Куповина јединица или Производња артикла
 ,Supplier Addresses and Contacts,Добављач Адресе и контакти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Прво изаберите категорију
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Пројекат господар.
@@ -3651,7 +3680,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Пола дана)
 DocType: Supplier,Credit Days,Кредитни Дана
 DocType: Leave Type,Is Carry Forward,Је напред Царри
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Се ставке из БОМ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Саставница
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Партија Тип и Странка је потребно за примања / обавезе рачуна {1}
@@ -3659,7 +3688,7 @@
 DocType: Employee,Reason for Leaving,Разлог за напуштање
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционисани Износ
 DocType: GL Entry,Is Opening,Да ли Отварање
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Ров {0}: Дебит Унос се не може повезати са {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Счет {0} не существует
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Ров {0}: Дебит Унос се не може повезати са {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Счет {0} не существует
 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 d816e52..8c83669 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Konsumentprodukter
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Välj Partityp först
 DocType: Item,Customer Items,Kundartiklar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Kontot {0}: Förälder kontot {1} kan inte vara en liggare
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Kontot {0}: Förälder kontot {1} kan inte vara en liggare
 DocType: Item,Publish Item to hub.erpnext.com,Publish Post som hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-postmeddelanden
 DocType: Item,Default Unit of Measure,Standard mätenhet
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta krävs för prislista {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Kommer att beräknas i transaktionen.
 DocType: Purchase Order,Customer Contact,Kundkontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Från Materialförfrågan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Från Materialförfrågan
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Trä
 DocType: Job Applicant,Job Applicant,Arbetssökande
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Inga fler resultat.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. För att upprätthålla kunden unika prodkt kod och att göra den sökbar baseras på deras kod, använd detta alternativ"
 DocType: Mode of Payment Account,Mode of Payment Account,Betalningssätt konto
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Visar varianter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Kvantitet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Kvantitet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (skulder)
 DocType: Employee Education,Year of Passing,Passerande År
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,I Lager
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sjukvård
 DocType: Purchase Invoice,Monthly,Månadsvis
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Försenad betalning (dagar)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-Postadress
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Räkenskapsårets {0} krävs
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Försvar
 DocType: Company,Abbr,Förkortning
 DocType: Appraisal Goal,Score (0-5),Poäng (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} matchar inte med {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} matchar inte med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Rad # {0}:
 DocType: Delivery Note,Vehicle No,Fordons nr
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Välj Prislista
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Välj Prislista
 DocType: Production Order Operation,Work In Progress,Pågående Arbete
 DocType: Employee,Holiday List,Holiday Lista
 DocType: Time Log,Time Log,Tid Log
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samma Företaget anges mer än en gång
 DocType: Employee,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ej tillåtet för {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
 DocType: Payment Reconciliation,Reconcile,Avstämma
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Matvaror
 DocType: Quality Inspection Reading,Reading 1,Avläsning 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Skapa Bank inlägg
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionsfonder
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Lagret är obligatoriskt om kontotyp är Lager
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Lagret är obligatoriskt om kontotyp är Lager
 DocType: SMS Center,All Sales Person,Alla försäljningspersonal
 DocType: Lead,Person Name,Namn
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Markera om återkommande order, avmarkera för att stoppa återkommande eller ange Slutdatum"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Intresserad
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Öppning
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Från {0} till {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Från {0} till {1}
 DocType: Item,Copy From Item Group,Kopiera från artikelgrupp
 DocType: Journal Entry,Opening Entry,Öppnings post
 DocType: Stock Entry,Additional Costs,Merkostnader
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konto med befintlig transaktioner kan inte omvandlas till grupp.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Konto med befintlig transaktioner kan inte omvandlas till grupp.
 DocType: Lead,Product Enquiry,Produkt Förfrågan
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Ange företaget först
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Välj Företaget först
 DocType: Employee Education,Under Graduate,Enligt Graduate
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Mål på
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Mål på
 DocType: BOM,Total Cost,Total Kostnad
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitets Logg:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Objektet existerar inte {0} i systemet eller har löpt ut
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Produkt {0} måste vara en beställningsprodukt
 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 +444,Item {0} is not active or end of life has been reached,Produkt {0} är inte aktiv eller uttjänta har nåtts
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,Produkt {0} är inte aktiv eller uttjänta har nåtts
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Kommer att uppdateras efter fakturan skickas.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Inställningar för HR-modul
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detaljer om de åtgärder som genomförs.
 DocType: Serial No,Maintenance Status,Underhåll Status
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Produkter och prissättning
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Från Datum bör ligga inom räkenskapsåret. Förutsatt Från Datum = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Från Datum bör ligga inom räkenskapsåret. Förutsatt Från Datum = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Välj anställd för vilken du skapar bedömning.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Kostnadsställe {0} tillhör inte bolaget {1}
 DocType: Customer,Individual,Individuell
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Nettokassaflöde från finansiering
 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
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Nästa Återkommande {0} kommer att skapas på {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Kontaktnamn
 DocType: Production Plan Item,SO Pending Qty,SO Väntar Antal
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Skapar lönebesked för ovan nämnda kriterier.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ingen beskrivning ges
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Begäran om köp.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Avgångs Datum måste vara större än Datum för anställningsdatum
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Produkt hemsidespecifikation
 DocType: Payment Tool,Reference No,Referensnummer
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Lämna Blockerad
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,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/accounts/utils.py +341,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Lager Avstämning Punkt
 DocType: Stock Entry,Sales Invoice No,Försäljning Faktura nr
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Leverantör Typ
 DocType: Item,Publish in Hub,Publicera i Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Punkt {0} avbryts
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Punkt {0} avbryts
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Förhållande
 DocType: Shipping Rule,Worldwide Shipping,Världsomspännande sändnings
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekräftade ordrar från kunder.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Förslag
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Ange artikelgrupp visa budgetar på detta område. Du kan även inkludera säsongs genom att ställa in Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Ange huvudkontogrupp för lager {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betalning mot {0} {1} inte kan vara större än utestående beloppet {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betalning mot {0} {1} inte kan vara större än utestående beloppet {2}
 DocType: Supplier,Address HTML,Adress HTML
 DocType: Lead,Mobile No.,Mobilnummer.
 DocType: Maintenance Schedule,Generate Schedule,Generera Schema
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Senaste
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 tecken
 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
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Lär dig
 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
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Hantera Säljare.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Flera valutor
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Typ
 DocType: Sales Invoice Item,Delivery Note,Följesedel
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Ställa in skatter
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Ställa in skatter
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Sammanfattning för denna vecka och pågående aktiviteter
 DocType: Workstation,Rent Cost,Hyr Kostnad
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Välj månad och år
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Finns i BOM, följesedel, Inköp Faktura, produktionsorder, inköpsorder, inköpskvitto, Försäljning Faktura, kundorder, införande i lager, Tidrapport"
 DocType: Item Tax,Tax Rate,Skattesats
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Välj Punkt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Välj Punkt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Produkt: {0} förvaltade satsvis, kan inte förenas med \ Lagersammansättning, använd istället Lageranteckning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Konvertera till icke-gruppen
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Inköpskvitto måste lämnas in
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Anledning till att förlora
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Arbetsstation är stängd på följande datum enligt kalender: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Möjligheter
 DocType: Employee,Single,Singel
 DocType: Issue,Attachment,Bifogning
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan inte ställas in för koncernens kostnadsställe
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,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 +563,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 +140,Holiday master.,Semester topp.
 DocType: Material Request Item,Required Date,Obligatorisk Datum
 DocType: Delivery Note,Billing Address,Fakturaadress
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Ange Artikelkod.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Ange Artikelkod.
 DocType: BOM,Costing,Kostar
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Om markerad, kommer skattebeloppet anses redan ingå i Skriv värdet / Skriv beloppet"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totalt Antal
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
 ,Serial No Warranty Expiry,Serial Ingen garanti löper ut
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Produkt {0} är inte ett beställningsobjekt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Produkt {0} är inte ett beställningsobjekt
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} är en ogiltig e-postadress i &quot;Anmälan \ e-postadress&quot;
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Totalt Billing detta år:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lägg till / redigera skatter och avgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverantörsfaktura Nej
 DocType: Territory,For reference,Som referens
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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 +229,Closing (Cr),Closing (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Closing (Cr)
 DocType: Serial No,Warranty Period (Days),Garantiperiod (dagar)
 DocType: Installation Note Item,Installation Note Item,Installeringsnotis objekt
 ,Pending Qty,Väntar Antal
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månatlig Distribution ** hjälper dig att distribuera din budget över månader om du har säsonger i din verksamhet. För att fördela en budget med hjälp av denna fördelning, ställ in ** Månatlig Distribution ** i ** Kostnadscenter **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Inga träffar i Faktura tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Inga träffar i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Välj Företag och parti typ först
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Budget / räkenskapsåret.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Tyvärr, kan serienumren inte slås samman"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,Projektuppgift
 ,Lead Id,Prospekt Id
 DocType: C-Form Invoice Detail,Grand Total,Totalsumma
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Räkenskapsårets Startdatum får inte vara större än Räkenskapsårets Slutdatum
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Räkenskapsårets Startdatum får inte vara större än Räkenskapsårets Slutdatum
 DocType: Warranty Claim,Resolution,Åtgärd
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Levereras: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Levereras: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Betalningskonto
 DocType: Sales Order,Billing and Delivery Status,Fakturering och leveransstatus
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Återkommande kunder
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,Offert Till
 DocType: Lead,Middle Income,Medelinkomst
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Öppning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Avsatt belopp kan inte vara negativ
 DocType: Purchase Order Item,Billed Amt,Fakturerat ant.
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ett aktuell lagerlokal mot vilken lager noteringar görs.
@@ -495,7 +498,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsorder är Obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Förslagsskrivning
 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
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativt lager Fel ({6}) till punkt {0} i centrallager {1} på {2} {3} i {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativt lager Fel ({6}) till punkt {0} i centrallager {1} på {2} {3} i {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Räkenskapsårets Företag
 DocType: Packing Slip Item,DN Detail,DN Detalj
 DocType: Time Log,Billed,Fakturerad
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,Standardkalkyl betyg
 DocType: Maintenance Schedule,Maintenance Schedule,Underhållsschema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sedan prissättningsregler filtreras bort baserat på kundens, Customer Group, Territory, leverantör, leverantör typ, kampanj, Sales Partner etc."
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Nettoförändring i Inventory
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Chef
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Från inköpskvitto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Samma objekt har angetts flera gånger.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Från inköpskvitto
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Samma objekt har angetts flera gånger.
 DocType: SMS Settings,Receiver Parameter,Mottagare Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Baserad på"" och ""Gruppera efter"" kan inte vara samma"
 DocType: Sales Person,Sales Person Targets,Försäljnings Person Mål
 DocType: Production Order Operation,In minutes,På några minuter
 DocType: Issue,Resolution Date,Åtgärds Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
 DocType: Selling Settings,Customer Naming By,Kundnamn på
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konvertera till gruppen
 DocType: Activity Cost,Activity Type,Aktivitetstyp
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicering
 DocType: Activity Cost,Projects User,Projekt Användare
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Förbrukat
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} hittades inte i Fakturainformationslistan
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} hittades inte i Fakturainformationslistan
 DocType: Company,Round Off Cost Center,Avrunda kostnadsställe
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Servicebesök {0} måste avbrytas innan man kan avbryta kundorder
 DocType: Material Request,Material Transfer,Material Transfer
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marknadsföring
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Om du vill spåra objekt i försäljnings- och inköps dokument som grundar sig på deras serienummer nos. Detta är kan också användas för att spåra garanti detaljerad information om produkten.
 DocType: Purchase Receipt Item Supplied,Current Stock,Nuvarande lager
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Avvisade Lager är obligatoriskt mot avvisade artiklar
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Total fakturering detta år
 DocType: Account,Expenses Included In Valuation,Kostnader ingår i rapporten
 DocType: Employee,Provide email id registered in company,Ange E-post ID registrerat i bolaget
 DocType: Hub Settings,Seller City,Säljaren stad
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Produkten har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Produkten har varianter.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Typ
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0} är inte en lagervara
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} är inte en lagervara
 DocType: Mode of Payment Account,Default Account,Standard konto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,Välj helgdagar
 DocType: Production Order Operation,Planned End Time,Planerat Sluttid
 ,Sales Person Target Variance Item Group-Wise,Försäljningen Person Mål Varians Post Group-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konto med befintlig transaktioner kan inte omvandlas till liggaren
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Konto med befintlig transaktioner kan inte omvandlas till liggaren
 DocType: Delivery Note,Customer's Purchase Order No,Kundens inköpsorder Nr
 DocType: Employee,Cell Number,Mobilnummer
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Automaterial Framställningar Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Förlorade
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan inte ange aktuell kupong i 'Mot Journalposter' kolumnen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Du kan inte ange aktuell kupong i 'Mot Journalposter' kolumnen
 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 +33,Monthly salary statement.,Månadslön uttalande.
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Från {0} av typen {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rad {0}: Omvandlingsfaktor är obligatoriskt
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Bokföringsposter kan göras mot huvudnoder. Inlägg mot grupper är inte tillåtna.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Inköpskvitto nummer som krävs för artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Inköpskvitto nummer som krävs för artikel {0}
 DocType: Item Attribute Value,Item Attribute Value,Produkt Attribut Värde
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Säljkampanjer.
 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.
@@ -641,7 +645,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prislista inte valt
 DocType: Employee,Family Background,Familjebakgrund
 DocType: Process Payroll,Send Email,Skicka Epost
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Inget Tillstånd
 DocType: Company,Default Bank Account,Standard bankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","För att filtrera baserat på partiet, väljer Party Typ först"
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Produkter med högre medelvikt kommer att visas högre
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstämning Detalj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Mina Fakturor
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Mina Fakturor
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen anställd hittades
 DocType: Purchase Order,Stopped,Stoppad
 DocType: Item,If subcontracted to a vendor,Om underleverantörer till en leverantör
@@ -659,6 +663,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Skicka Nu
 ,Support Analytics,Stöd Analytics
 DocType: Item,Website Warehouse,Webbplatslager
+DocType: Payment Reconciliation,Minimum Invoice Amount,Minimifakturabelopp
 DocType: Sales 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"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form arkiv
@@ -668,7 +673,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",För att aktivera &quot;Point of Sale&quot; funktioner
 DocType: Bin,Moving Average Rate,Rörligt medelvärdes hastighet
 DocType: Production Planning Tool,Select Items,Välj objekt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} mot räkning {1} daterad {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} mot räkning {1} daterad {2}
 DocType: Maintenance Visit,Completion Status,Slutförande Status
 DocType: Sales Invoice Item,Target Warehouse,Target Lager
 DocType: Item,Allow over delivery or receipt upto this percent,Tillåt överleverans eller mottagande upp till denna procent
@@ -680,7 +685,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Komponera meddelandet automatiskt mot uppvisande av transaktioner.
 DocType: Production Order,Item To Manufacture,Produkt för att tillverka
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status är {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Inköpsorder till betalning
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Inköpsorder till betalning
 DocType: Sales Order Item,Projected Qty,Projicerad Antal
 DocType: Sales Invoice,Payment Due Date,Förfallodag
 DocType: Newsletter,Newsletter Manager,Nyhetsbrevsansvarig
@@ -704,7 +709,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Butiksförsäljnig
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Kontosaldo redan i Kredit,du är inte tillåten att ställa in ""Balans måste vara"" som ""Debet '"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Kontosaldo redan i Kredit,du är inte tillåten att ställa in ""Balans måste vara"" som ""Debet '"
 DocType: Account,Balance must be,Balans måste vara
 DocType: Hub Settings,Publish Pricing,Publicera prissättning
 DocType: Notification Control,Expense Claim Rejected Message,Räkning avvisas meddelande
@@ -727,7 +732,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakurs mästare.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} måste vara aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} måste vara aktiv
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Välj dokumenttyp först
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Lämna inlösningsmängd
@@ -745,17 +750,17 @@
 DocType: Supplier,Default Payable Accounts,Standard avgiftskonton
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbetare {0} är inte aktiv eller existerar inte
 DocType: Features Setup,Item Barcode,Produkt Streckkod
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
 DocType: Quality Inspection Reading,Reading 6,Avläsning 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inköpsfakturan Advancerat
 DocType: Address,Shop,Shop
 DocType: Hub Settings,Sync Now,Synkronisera nu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Rad {0}: kreditering kan inte kopplas till en {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Rad {0}: kreditering kan inte kopplas till en {1}
 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.
 DocType: Employee,Permanent Address Is,Permanent Adress är
 DocType: Production Order Operation,Operation completed for how many finished goods?,Driften färdig för hur många färdiga varor?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Varumärket
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Ersättning för över {0} korsade till punkt {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Ersättning för över {0} korsade till punkt {1}.
 DocType: Employee,Exit Interview Details,Avsluta intervju Detaljer
 DocType: Item,Is Purchase Item,Är beställningsobjekt
 DocType: Journal Entry Account,Purchase Invoice,Inköpsfaktura
@@ -767,7 +772,7 @@
 DocType: Salary Slip,Total in words,Totalt i ord
 DocType: Material Request Item,Lead Time Date,Ledtid datum
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,är obligatoriskt. Kanske Valutaväxling posten inte skapas för
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Rad # {0}: Ange Löpnummer för punkt {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Rad # {0}: Ange Löpnummer för punkt {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","För ""Produktgrupper"" poster, Lager, Serienummer och Batch kommer  att övervägas från ""Packlistan"". Om Lager och Batch inte är samma för alla förpacknings objekt för alla ""Produktgrupper"" , kan dessa värden skrivas in i huvud produkten, kommer värden kopieras till ""Packlistan""."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Transporter till kunder.
 DocType: Purchase Invoice Item,Purchase Order Item,Inköpsorder Artikeln
@@ -776,14 +781,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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 +626,Select Item for Transfer,Välj föremål för Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillåt användare att redigera prislista i transaktioner
 DocType: Pricing Rule,Max Qty,Max Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betalning mot Försäljning / inköpsorder bör alltid märkas i förskott
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Alla objekt har redan överförts till denna produktionsorder.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Alla objekt har redan överförts till denna produktionsorder.
 DocType: Process Payroll,Select Payroll Year and Month,Välj Lön År och Månad
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Gå till lämplig grupp (vanligtvis Tillämpning av fonder> Omsättningstillgångar> bankkonton och skapa ett nytt konto (genom att klicka på Lägg till typ) av typen ""Bank"""
 DocType: Workstation,Electricity Cost,Elkostnad
@@ -797,10 +803,10 @@
 DocType: SMS Center,All Lead (Open),Alla Ledare (Öppna)
 DocType: Purchase Invoice,Get Advances Paid,Få utbetalda förskott
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Bifoga din bild
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Göra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Göra
 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 +3,My Cart,Min kundvagn
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Min kundvagn
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Öppning Antal
@@ -819,10 +825,10 @@
 DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Attributtabell är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} kan inte vara negativ
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabatt
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Rabatt
 DocType: Features Setup,Purchase Discounts,Inköpsrabatter
 DocType: Workstation,Wages,Löner
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Kommer endast uppdateras om tidsloggen är ""Fakturerbar"""
@@ -847,7 +853,7 @@
 DocType: Tax Rule,Shipping State,Frakt State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Produkt måste tillsättas med hjälp av ""få produkter  från kvitton"" -knappen"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Försäljnings Kostnader
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard handla
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standard handla
 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
@@ -889,6 +895,7 @@
 DocType: Sales Partner,Distributor,Distributör
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Varukorgen frakt Regel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Produktionsorder {0} måste avbrytas innan du kan avbryta kundorder
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Ställ in &quot;tillämpa ytterligare rabatt på&quot;
 ,Ordered Items To Be Billed,Beställda varor att faktureras
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Från Range måste vara mindre än ligga
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Välj Time Loggar och skicka för att skapa en ny försäljnings faktura.
@@ -898,13 +905,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log Batch har fakturerats.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Skapa Möjlighet
 DocType: Salary Slip,Leave Without Pay,Lämna utan lön
-DocType: Supplier,Communications,Kommunikation
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Kapacitetsplanering Error
 ,Trial Balance for Party,Trial Balance för Party
 DocType: Lead,Consultant,Konsult
 DocType: Salary Slip,Earnings,Vinster
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Färdiga artiklar {0} måste anges för Tillverkningstypen
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Ingående redovisning Balans
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Färdiga artiklar {0} måste anges för Tillverkningstypen
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Ingående redovisning Balans
 DocType: Sales Invoice Advance,Sales Invoice Advance,Försäljning Faktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ingenting att begära
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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;
@@ -946,7 +952,7 @@
 DocType: Global Defaults,Current Fiscal Year,Innevarande räkenskapsår
 DocType: Global Defaults,Disable Rounded Total,Inaktivera avrundat Totalbelopp
 DocType: Lead,Call,Ring
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;poster&#39; kan inte vara tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&#39;poster&#39; kan inte vara tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate raden {0} med samma {1}
 ,Trial Balance,Trial Balans
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Ställa in Anställda
@@ -958,9 +964,9 @@
 DocType: Contact,User ID,Användar ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Se journal
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidigast
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Tillverkning mot kundorder
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resten av världen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -990,7 +996,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ej tillåtet att redigera fryst konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Hämta utestående fakturor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Kundorder {0} är inte giltig
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1003,13 +1009,13 @@
 DocType: Employee,Place of Issue,Utgivningsplats
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
 DocType: Email Digest,Add Quote,Lägg Citat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM coverfaktor krävs för UOM: {0} i punkt: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},UOM coverfaktor krävs för UOM: {0} i punkt: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekta kostnader
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Dina produkter eller tjänster
 DocType: Mode of Payment,Mode of Payment,Betalningssätt
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,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 +121,Website Image should be a public file or website URL,Website Bild bör vara en offentlig fil eller webbadress
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Detta är en rot varugrupp och kan inte ändras.
 DocType: Journal Entry Account,Purchase Order,Inköpsorder
 DocType: Warehouse,Warehouse Contact Info,Lagrets kontaktinfo
@@ -1018,8 +1024,8 @@
 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/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Kapital Utrustning
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
@@ -1029,7 +1035,7 @@
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Redigera Beskrivning
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Förväntad leveransdatum är mindre än planerat startdatum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,För Leverantör
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,För Leverantör
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ställa Kontotyp hjälper i att välja detta konto i transaktioner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Totalsumma (Företagsvaluta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Totalt Utgående
@@ -1042,7 +1048,7 @@
 DocType: Journal Entry,Journal Entry,Journalanteckning
 DocType: Workstation,Workstation Name,Arbetsstation Namn
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-postutskick:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,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 +430,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
@@ -1074,7 +1080,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhetsbrev till kontakter, prospekts."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Verksamheten kan inte lämnas tomt.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Verksamheten kan inte lämnas tomt.
 ,Delivered Items To Be Billed,Levererade artiklar att faktureras
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kan inte ändras för serienummer
 DocType: Authorization Rule,Average Discount,Genomsnittlig rabatt
@@ -1089,7 +1095,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Från {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Drift Beskrivning
 DocType: Item,Will also apply to variants,Kommer även gälla för varianter
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Det går inte att ändra räkenskapsårets Startdatum och Räkenskapsårets Slutdatum när verksamhetsåret sparas.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Det går inte att ändra räkenskapsårets Startdatum och Räkenskapsårets Slutdatum när verksamhetsåret sparas.
 DocType: Quotation,Shopping Cart,Kundvagn
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daglig Utgång
 DocType: Pricing Rule,Campaign,Kampanj
@@ -1100,7 +1106,8 @@
 DocType: Sales Order Item,Planned Quantity,Planerad Kvantitet
 DocType: Purchase Invoice Item,Item Tax Amount,Produkt skattebeloppet
 DocType: Item,Maintain Stock,Behåll Lager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Aktie Inlägg redan skapats för produktionsorder
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1112,7 +1119,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Villkor Innehåll
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,kan inte vara större än 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
 DocType: Maintenance Visit,Unscheduled,Ledig
 DocType: Employee,Owned,Ägs
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Beror på avgång utan lön
@@ -1149,7 +1156,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,Att Värdera
 DocType: Supplier,Stock Manager,Lagrets direktör
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Källa lager är obligatoriskt för rad {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Källa lager är obligatoriskt för rad {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Följesedel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorshyra
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setup SMS-gateway-inställningar
@@ -1157,10 +1164,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adress inlagd ännu.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbetsstation arbetstimme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med JV mängd {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med JV mängd {2}
 DocType: Item,Inventory,Inventering
 DocType: Features Setup,"To enable ""Point of Sale"" view",För att aktivera &quot;Point of Sale&quot; view
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betalning kan inte göras för tomma kundvagnar
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Betalning kan inte göras för tomma kundvagnar
 DocType: Item,Sales Details,Försäljnings Detaljer
 DocType: Opportunity,With Items,Med artiklar
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antal
@@ -1175,10 +1182,11 @@
 DocType: Cost Center,Parent Cost Center,Överordnat kostnadsställe
 DocType: Sales Invoice,Source,Källa
 DocType: Leave Type,Is Leave Without Pay,Är ledighet utan lön
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Inga träffar i betalningstabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Inga träffar i betalningstabellen
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Budgetåret Startdatum
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Följesedlar avbryts
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Följesedlar avbryts
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Kassaflöde från investeringsverksamheten
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,"Frakt, spedition Avgifter"
 DocType: Material Request Item,Sales Order No,Kundorder Ingen
 DocType: Item Group,Item Group Name,Produkt  Gruppnamn
@@ -1186,12 +1194,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Överför Material Tillverkning
 DocType: Pricing Rule,For Price List,För prislista
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Inköpsomsätting för artikel: {0} hittades inte, som krävs för att boka konterings (kostnad). Nämn artikelpris mot en inköpslista."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Inköpsomsätting för artikel: {0} hittades inte, som krävs för att boka konterings (kostnad). Nämn artikelpris mot en inköpslista."
 DocType: Maintenance Schedule,Schedules,Scheman
 DocType: Purchase Invoice Item,Net Amount,Nettobelopp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detalj nr
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ytterligare rabattbeloppet (Företagsvaluta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Fel: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Fel: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Skapa nytt konto från kontoplan.
 DocType: Maintenance Visit,Maintenance Visit,Servicebesök
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kund> Kundgrupp > Område
@@ -1217,7 +1225,7 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kontering för {0} kan endast göras i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prissättning Regel
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Material begäran om att inköpsorder
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Material begäran om att inköpsorder
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Rad # {0}: Returnerad artikel {1} existerar inte i {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonton
 ,Bank Reconciliation Statement,Bank Avstämning Uttalande
@@ -1225,11 +1233,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Ingående lagersaldo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} måste bara finnas en gång
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Från Värde
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Tillverknings Kvantitet är obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Tillverknings Kvantitet är obligatorisk
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Belopp som inte återspeglas i bank
 DocType: Quality Inspection Reading,Reading 4,Avläsning 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Anspråk på företagets bekostnad.
@@ -1241,33 +1249,34 @@
 ,Material Requests for which Supplier Quotations are not created,Material Begäran för vilka leverantörsofferter är inte skapade
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Om du vill spåra objekt med streckkod. Du kommer att kunna komma in poster i följesedeln och fakturan genom att skanna streckkoder av objekt.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Markera som levereras
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Markera som levereras
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Skapa offert
 DocType: Dependent Task,Dependent Task,Beroende Uppgift
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
 DocType: SMS Center,Receiver List,Mottagare Lista
 DocType: Payment Tool Detail,Payment Amount,Betalningsbelopp
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Förbrukad mängd
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Visa
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Visa
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Nettoförändring i Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Lönestruktur Avdrag
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostnad för utfärdade artiklar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Antal får inte vara mer än {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Ålder (dagar)
 DocType: Quotation Item,Quotation Item,Offert Artikel
 DocType: Account,Account Name,Kontonamn
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Från Datum kan inte vara större än Till Datum
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Från Datum kan inte vara större än Till Datum
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} kvantitet {1} inte kan vara en fraktion
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,Konverteringskurs kan inte vara 0 eller 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Konverteringskurs kan inte vara 0 eller 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} avbryts eller stoppas
 DocType: Accounts Settings,Credit Controller,Kreditcontroller
 DocType: Delivery Note,Vehicle Dispatch Date,Fordon Avgångs Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Inköpskvitto {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Inköpskvitto {0} är inte lämnat
 DocType: Company,Default Payable Account,Standard betalkonto
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% Fakturerad
@@ -1279,15 +1288,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mina Frågor
 DocType: BOM Item,BOM Item,BOM Punkt
 DocType: Appraisal,For Employee,För anställd
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,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/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rad {0}: Betalningsbelopp kan inte vara negativ
 DocType: Expense Claim,Total Amount Reimbursed,Totala belopp som ersatts
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Mot leverantörsfakturor {0} den {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Mot leverantörsfakturor {0} den {1}
 DocType: Customer,Default Price List,Standard Prislista
 DocType: Payment Reconciliation,Payments,Betalningar
 DocType: Budget Detail,Budget Allocated,Budget
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Kund tillgodohavande
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Netto Förändring av leverantörsskulder
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Kontrollera din e-post id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Kunder krävs för ""Kundrabatt"""
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Uppdatera bankbetalningsdagar med tidskrifter.
@@ -1308,7 +1319,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktivera Varukorgen
 DocType: Employee,Permanent Address,Permanent Adress
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Produkt  {0} måste vara ett serviceobjekt.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Förskott som betalats mot {0} {1} kan inte vara större \ än Totalsumma {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Välj artikelkod
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Minska Avdrag för ledighet utan lön (LWP)
@@ -1325,18 +1336,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Enda enhet av ett objekt.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Tid Log Batch {0} måste &quot;Avsändare&quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Tid Log Batch {0} måste &quot;Avsändare&quot;
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Lager krävs vid Rad nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Lager krävs vid Rad nr {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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: Address,Postal,Post
 DocType: Item,Weightage,Vikt
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"En kundgrupp finns med samma namn, ändra Kundens namn eller döp om kundgruppen"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Välj {0} först.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Välj {0} först.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},text {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Ny kontakt
 DocType: Territory,Parent Territory,Överordnat område
 DocType: Quality Inspection Reading,Reading 2,Avläsning 2
 DocType: Stock Entry,Material Receipt,Material Kvitto
@@ -1344,7 +1356,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partityp och Parti krävs för mottagare / Betalnings konto {0}
 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 +210,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 +213,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 +85,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
@@ -1361,15 +1373,15 @@
 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: Sales Invoice Item,Batch No,Batch nr
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillåt flera kundorder mot Kundens beställning
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Huvud
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Huvud
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ställ prefix för nummerserie på dina transaktioner
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Stoppad ordning kan inte avbrytas. Unstop att avbryta.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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: Item,Variants,Varianter
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Skapa beställning
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Skapa beställning
 DocType: SMS Center,Send To,Skicka Till
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1382,7 +1394,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Lager och referens
 DocType: Supplier,Statutory info and other general information about your Supplier,Lagstadgad information och annan allmän information om din leverantör
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,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/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Produkten är inte tillåten att ha produktionsorder.
@@ -1391,10 +1403,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Credit Belopp i konto Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Loggar för tillverkning.
 DocType: Item,Apply Warehouse-wise Reorder Level,Applicera Lagermässiga förändringar på annan nivå
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} måste lämnas in
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} måste lämnas in
 DocType: Authorization Control,Authorization Control,Behörighetskontroll
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rad # {0}: Avslag Warehouse är obligatoriskt mot förkastade Punkt {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Log för uppgifter.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Betalning
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Betalning
 DocType: Production Order Operation,Actual Time and Cost,Faktisk tid och kostnad
 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},Material Begäran om maximalt {0} kan göras till punkt {1} mot kundorder {2}
 DocType: Employee,Salutation,Salutation
@@ -1411,7 +1424,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Produktt {0} är inte en serialiserad Produkt
 DocType: SMS Center,Create Receiver List,Skapa Mottagare Lista
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Utgånget
 DocType: Packing Slip,To Package No.,Förpackningens Nej
 DocType: Warranty Claim,Issue Date,Utgivningsdatum
 DocType: Activity Cost,Activity Cost,Aktivitetskostnad
@@ -1449,7 +1461,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Uppnått
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territorium / Kund
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,t.ex. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med att fakturerat utestående belopp {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med att fakturerat utestående belopp {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,I Ord kommer att synas när du sparar fakturan.
 DocType: Item,Is Sales Item,Är Försäljningsobjekt
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Produktgruppträdet
@@ -1461,7 +1473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} skapad
 DocType: Delivery Note Item,Against Sales Order,Mot kundorder
 ,Serial No Status,Serial No Status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Produkt tabellen kan inte vara tomt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Produkt tabellen kan inte vara tomt
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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}"
 DocType: Pricing Rule,Selling,Försäljnings
@@ -1470,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Tullar och skatter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Ange Referensdatum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Ange Referensdatum
 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} betalningsposter kan inte filtreras genom {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabell för punkt som kommer att visas i Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Medföljande Antal
@@ -1485,7 +1497,7 @@
 DocType: Installation Note,Installation Time,Installationstid
 DocType: Sales Invoice,Accounting Details,Redovisning Detaljer
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Ta bort alla transaktioner för detta företag
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Rad # {0}: Operation {1} är inte klar för {2} st av färdiga varor i produktionsorder # {3}. Uppdatera driftstatus via Tidsloggar
+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,Rad # {0}: Operation {1} är inte klar för {2} st av färdiga varor i produktionsorder # {3}. Uppdatera driftstatus via Tidsloggar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringarna
 DocType: Issue,Resolution Details,Åtgärds Detaljer
 DocType: Quality Inspection Reading,Acceptance Criteria,Acceptanskriterier
@@ -1501,7 +1513,7 @@
 DocType: Holiday List,Clear Table,Rensa Tabell
 DocType: Features Setup,Brands,Varumärken
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Från beställning
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Från beställning
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lämna inte kan tillämpas / avbryts innan {0}, som ledighet balans redan har carry-vidarebefordras i framtiden ledighet tilldelningspost {1}"
 DocType: Activity Cost,Costing Rate,Kalkylfrekvens
 ,Customer Addresses And Contacts,Kund adresser och kontakter
@@ -1518,7 +1530,7 @@
 ,Maintenance Schedules,Underhålls scheman
 ,Quotation Trends,Offert Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbelopp
 ,Pending Amount,Väntande antal
 DocType: Purchase Invoice Item,Conversion Factor,Omvandlingsfaktor
@@ -1535,12 +1547,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Träd finanial konton.
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Kontot {0} måste vara av typen ""Fast tillgång"" som punkt {1} är en tillgångspost"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Kontot {0} måste vara av typen ""Fast tillgång"" som punkt {1} är en tillgångspost"
 DocType: HR Settings,HR Settings,HR Inställningar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Räkning väntar på godkännande. Endast Utgiftsgodkännare kan uppdatera status.
 DocType: Purchase Invoice,Additional Discount Amount,Ytterligare rabatt Belopp
 DocType: Leave Block List Allow,Leave Block List Allow,Lämna Block List Tillåt
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Förkortning kan inte vara tomt
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Förkortning kan inte vara tomt
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totalt Faktisk
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Enhet
@@ -1552,6 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{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/project/project.js +47,Expense Claims,Räkningar
 DocType: Issue,Support,Stöd
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Visa kundvagn
 ,BOM Search,BOM Sök
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Stänger (Öppna + Totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Ange valuta i bolaget
@@ -1563,13 +1576,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM omräkningsfaktor i rad {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Utförsäljningsdatumet kan inte vara före markerat datum i rad {0}
 DocType: Salary Slip,Deduction,Avdrag
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Artikel Pris till för {0} i prislista {1}
 DocType: Address Template,Address Template,Adress Mall
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,% Uppgifter Avslutade
 DocType: Project,Gross Margin,Bruttomarginal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Ange Produktionsartikel först
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,inaktiverad användare
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,inaktiverad användare
 DocType: Opportunity,Quotation,Offert
 DocType: Salary Slip,Total Deduction,Totalt Avdrag
 DocType: Quotation,Maintenance User,Serviceanvändare
@@ -1578,7 +1592,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
 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
@@ -1588,12 +1602,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Håll koll på säljkampanjer. Håll koll på Prospekter, Offerter, kundorder etc från kampanjer för att mäta avkastning på investeringen."
 DocType: Expense Claim,Approver,Godkännare
 ,SO Qty,SO Antal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Arkiv poster finns mot lager {0}, därför du kan inte åter tilldela eller ändra Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Arkiv poster finns mot lager {0}, därför du kan inte åter tilldela eller ändra Warehouse"
 DocType: Appraisal,Calculate Total Score,Beräkna Totalsumma
 DocType: Supplier Quotation,Manufacturing Manager,Tillverkningsansvarig
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Split följesedel i paket.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Transporter
+apps/erpnext/erpnext/hooks.py +69,Shipments,Transporter
 DocType: Purchase Order Item,To be delivered to customer,Som skall levereras till kund
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tid Log Status måste lämnas in.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Löpnummer {0} inte tillhör någon Warehouse
@@ -1613,10 +1627,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +356,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
 DocType: Currency Exchange,From Currency,Från Valuta
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Välj tilldelade beloppet, Faktura Typ och fakturanumret i minst en rad"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Kundorder krävs för punkt {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Välj tilldelade beloppet, Faktura Typ och fakturanumret i minst en rad"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Kundorder krävs för punkt {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Belopp som inte återspeglas i systemet
 DocType: Purchase Invoice Item,Rate (Company Currency),Andel (Företagsvaluta)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Annat
@@ -1632,7 +1646,7 @@
 DocType: Quality Inspection,In Process,Pågående
 DocType: Authorization Rule,Itemwise Discount,Produktvis rabatt
 DocType: Purchase Order Item,Reference Document Type,Referensdokument Typ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} mot kundorder {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} mot kundorder {1}
 DocType: Account,Fixed Asset,Fast tillgångar
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serial numrerade Inventory
 DocType: Activity Type,Default Billing Rate,Standardfakturerings betyg
@@ -1642,7 +1656,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Kundorder till betalning
 DocType: Expense Claim Detail,Expense Claim Detail,Räkningen Detalj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Tid Loggar skapat:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Välj rätt konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Välj rätt konto
 DocType: Item,Weight UOM,Vikt UOM
 DocType: Employee,Blood Group,Blodgrupp
 DocType: Purchase Invoice Item,Page Break,Sidbrytning
@@ -1673,10 +1687,10 @@
 DocType: Time Log,To Time,Till Time
 DocType: Authorization Rule,Approving Role (above authorized value),Godkännande Roll (ovan auktoriserad värde)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Om du vill lägga ordnade noder, utforska träd och klicka på noden där du vill lägga till fler noder."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan inte vara över eller barn under {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan inte vara över eller barn under {2}
 DocType: Production Order Operation,Completed Qty,Avslutat Antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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/accounts/doctype/journal_entry/journal_entry.py +122,"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/get_item_details.py +260,Price List {0} is disabled,Prislista {0} är inaktiverad
 DocType: Manufacturing Settings,Allow Overtime,Tillåt övertid
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummer krävs för punkt {1}. Du har gett {2}.
@@ -1684,8 +1698,9 @@
 DocType: Item,Customer Item Codes,Kund artikelnummer
 DocType: Opportunity,Lost Reason,Förlorad Anledning
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Skapa Betalnings inlägg mot Order eller Fakturor.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Ny adress
 DocType: Quality Inspection,Sample Size,Provstorlek
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alla objekt har redan fakturerats
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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
 DocType: Project,External,Extern
@@ -1741,13 +1756,14 @@
 DocType: Rename Tool,Rename Tool,Ändrings Verktyget
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Uppdatera Kostnad
 DocType: Item Reorder,Item Reorder,Produkt Ändra ordning
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfermaterial
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transfermaterial
 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."
 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
 DocType: Installation Note,Installation Note,Installeringsnotis
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Lägg till skatter
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Kassaflöde från finansiering
 ,Financial Analytics,Finansiella Analyser
 DocType: Quality Inspection,Verified By,Verifierad Av
 DocType: Address,Subsidiary,Dotterbolag
@@ -1757,19 +1773,19 @@
 DocType: Process Payroll,Create Salary Slip,Skapa lönebeskedet
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Förväntad balans per bank
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Källa fonderna (skulder)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kvantitet i rad {0} ({1}) måste vara samma som tillverkad mängd {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kvantitet i rad {0} ({1}) måste vara samma som tillverkad mängd {2}
 DocType: Appraisal,Employee,Anställd
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importera e-post från
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Bjud in som Användare
 DocType: Features Setup,After Sale Installations,Eftermarknadsinstallationer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} är fullt fakturerad
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} är fullt fakturerad
 DocType: Workstation Working Hour,End Time,Sluttid
 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 +75,Group by Voucher,Grupp av Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obligatorisk På
 DocType: Sales Invoice,Mass Mailing,Massutskick
 DocType: Rename Tool,File to Rename,Fil att byta namn på
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Inköp Beställningsnummer krävs för artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Inköp Beställningsnummer krävs för artikel {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Visa Betalningar
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Underhållsschema {0} måste avbrytas innanman kan dra avbryta kundorder
@@ -1779,6 +1795,7 @@
 DocType: Selling Settings,Sales Order Required,Kundorder krävs
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Skapa kund
 DocType: Purchase Invoice,Credit To,Kredit till
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktiva Leads / Kunder
 DocType: Employee Education,Post Graduate,Betygsinlägg
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Underhållsschema Detalj
 DocType: Quality Inspection Reading,Reading 9,Avläsning 9
@@ -1790,6 +1807,7 @@
 DocType: Warranty Claim,Raised By,Höjt av
 DocType: Payment Tool,Payment Account,Betalningskonto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Ange vilket bolag för att fortsätta
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Nettoförändring av kundfordringar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensations Av
 DocType: Quality Inspection Reading,Accepted,Godkända
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.
@@ -1797,17 +1815,17 @@
 DocType: Payment Tool,Total Payment Amount,Totalt Betalningsbelopp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Det gick inte att uppdatera lager, faktura innehåller släppa sjöfarten objekt."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Eftersom det redan finns lagertransaktioner för denna artikel, \ kan du inte ändra värdena för ""Har Löpnummer"", ""Har Batch Nej"", ""Är Lagervara"" och ""Värderingsmetod"""
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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: 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 +157,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 +211,{0} {1} is not submitted,{0} {1} inte lämnad
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} inte lämnad
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Villkor och Conditions1
@@ -1820,7 +1838,7 @@
 DocType: Authorization Rule,Authorized Value,Auktoriserad Värde
 DocType: Contact,Enter department to which this Contact belongs,Ange avdelning som denna Kontakt tillhör
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Totalt Frånvarande
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Produkt eller Lager för rad {0} matchar inte Materialförfrågan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Produkt eller Lager för rad {0} matchar inte Materialförfrågan
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Måttenhet
 DocType: Fiscal Year,Year End Date,År Slutdatum
 DocType: Task Depends On,Task Depends On,Uppgift Beror på
@@ -1846,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontraktets Slutdatum måste vara större än Datum för inträde
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,En tredje parts distributör / återförsäljare / bonusagent / affiliate / återförsäljare som säljer företagens produkter för en provision.
 DocType: Customer Group,Has Child Node,Har Under Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} mot beställning {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} mot beställning {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Ange statiska url parametrar här (T.ex.. Avsändare = ERPNext, användarnamn = ERPNext, lösenord = 1234 mm)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} inte någon aktiv räkenskapsår. För mer information kolla {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Detta är ett exempel webbplats automatiskt genererade från ERPNext
@@ -1874,7 +1892,7 @@
 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: Purchase Receipt Item,Recd Quantity,Recd Kvantitet
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Det går inte att producera mer artiklar {0} än kundorderns mängd {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Konto
 DocType: Tax Rule,Billing City,Fakturerings Ort
 DocType: Global Defaults,Hide Currency Symbol,Dölj Valutasymbol
@@ -1906,6 +1924,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Kostnader
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Ovan
 DocType: Buying Settings,Default Buying Price List,Standard Inköpslista
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Ingen anställd för ovan valda kriterier eller lönebeskedet redan skapat
 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."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betalning Typ
@@ -1941,7 +1960,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate of Materials Based On&quot; i kalkyl avsnitt
 DocType: Appraisal Goal,Key Responsibility Area,Nyckelansvar Områden
 DocType: Item Reorder,Material Request Type,Typ av Materialbegäran
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Rad {0}: UOM Omvandlingsfaktor är obligatorisk
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Kostnadscenter
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Rabatt #
@@ -1963,7 +1982,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Välj ett värde för {0} offert_till {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alla adresser.
 DocType: Company,Stock Settings,Stock Inställningar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammanslagning är endast möjligt om följande egenskaper är desamma i båda posterna. Är gruppen, Root typ, Företag"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammanslagning är endast möjligt om följande egenskaper är desamma i båda posterna. Är gruppen, Root typ, Företag"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Hantera Kundgruppsträd.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Nytt kostnadsställe Namn
 DocType: Leave Control Panel,Leave Control Panel,Lämna Kontrollpanelen
@@ -1983,8 +2002,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Betalning Verktygs Detalj
 ,Sales Browser,Försäljnings Webbläsare
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Varning: En annan {0} # {1} finns mot införande i lager {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Varning: En annan {0} # {1} finns mot införande i lager {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Utlåning (tillgångar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Gäldenärer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Stor
@@ -2003,7 +2022,7 @@
 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
 DocType: Production Order Operation,Make Time Log,Skapa tidslogg
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Ställ beställnings kvantitet
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Ställ beställnings kvantitet
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Skapa Kunden från Prospekt {0}
 DocType: Price List,Applicable for Countries,Gäller Länder
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Datorer
@@ -2051,10 +2070,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Anmärkningar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Anmärkningar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Försenad
 DocType: Account,Stock Received But Not Billed,Stock mottagits men inte faktureras
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root Hänsyn måste vara en grupp
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Root Hänsyn måste vara en grupp
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttolön + efterskott Belopp + inlösen Belopp - Totalt Avdrag
 DocType: Monthly Distribution,Distribution Name,Distributions Namn
 DocType: Features Setup,Sales and Purchase,Försäljning och Inköp
@@ -2068,6 +2087,7 @@
 DocType: Journal Entry Account,Party Balance,Parti Balans
 DocType: Sales Invoice Item,Time Log Batch,Tid Log Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Välj Verkställ rabatt på
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Lön Slip Skapad
 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: Stock Entry,Material Transfer for Manufacture,Material Transfer för Tillverkning
@@ -2075,9 +2095,9 @@
 DocType: Purchase Invoice,Half-yearly,Halvårs
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Räkenskapsårets {0} hittades inte.
 DocType: Bank Reconciliation,Get Relevant Entries,Hämta relevanta uppgifter
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Kontering för lager
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Kontering för lager
 DocType: Sales Invoice,Sales Team1,Försäljnings Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Punkt {0} inte existerar
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Punkt {0} inte existerar
 DocType: Sales Invoice,Customer Address,Kundadress
 DocType: Purchase Invoice,Apply Additional Discount On,Applicera ytterligare rabatt på
 DocType: Account,Root Type,Root Typ
@@ -2086,15 +2106,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Visa denna bildspel längst upp på sidan
 DocType: BOM,Item UOM,Produkt UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skattebelopp efter rabatt Belopp (Company valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lager är obligatoriskt för rad {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Target lager är obligatoriskt för rad {0}
 DocType: Quality Inspection,Quality Inspection,Kvalitetskontroll
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Liten
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,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.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mat, dryck och tobak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Kan bara göra betalning mot ofakturerade {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Kan bara göra betalning mot ofakturerade {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionshastighet kan inte vara större än 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minsta lagernivå
 DocType: Stock Entry,Subcontract,Subkontrakt
@@ -2132,7 +2152,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inkommande kvalitetskontroll.
 DocType: Purchase Order Item,Returned Qty,Återvände Antal
 DocType: Employee,Exit,Utgång
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type är obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Root Type är obligatorisk
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Löpnummer {0} skapades
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","För att underlätta för kunderna, kan dessa koder användas i utskriftsformat som fakturor och följesedlar"
 DocType: Employee,You can enter any date manually,Du kan ange något datum manuellt
@@ -2140,8 +2160,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Provanställning
 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 +110,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden måste vara kredit
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Inköpskvitto Artikel Levereras
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betala
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Betala
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Till Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway webbadress
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Loggar för att upprätthålla sms leveransstatus
@@ -2158,7 +2179,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Ombeställningsnivå
 DocType: Attendance,Attendance Date,Närvaro Datum
 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 +110,Account with child nodes cannot be converted to ledger,Konto med underordnade noder kan inte omvandlas till liggaren
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Konto med underordnade noder kan inte omvandlas till liggaren
 DocType: Address,Preferred Shipping Address,Önskad leveransadress
 DocType: Purchase Receipt Item,Accepted Warehouse,Godkänt Lager
 DocType: Bank Reconciliation Detail,Posting Date,Bokningsdatum
@@ -2176,7 +2197,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serienummer {0} inte existerar
 DocType: Pricing Rule,Discount Percentage,Rabatt Procent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
-apps/erpnext/erpnext/hooks.py +54,Orders,Beställningar
+apps/erpnext/erpnext/hooks.py +55,Orders,Beställningar
 DocType: Leave Control Panel,Employee Type,Anställningstyp
 DocType: Employee Leave Approver,Leave Approver,Ledighetsgodkännare
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Överfört för tillverkning
@@ -2188,7 +2209,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Av material faktureras mot denna kundorder
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Period Utgående Post
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Avskrivningar
+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: Customer,Credit Limit,Kreditgräns
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Välj typ av transaktion
@@ -2213,11 +2234,12 @@
 DocType: Material Request,Requested For,Begärd För
 DocType: Quotation Item,Against Doctype,Mot Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Prenumerera på det här följesedel mot någon Project
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-kontot kan inte tas bort
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Nettokassaflöde från Investera
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Root-kontot kan inte tas bort
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Visa Stock Inlägg
 ,Is Primary Address,Är Primär adress
 DocType: Production Order,Work-in-Progress Warehouse,Pågående Arbete - Lager
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referens # {0} den {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referens # {0} den {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Hantera Adresser
 DocType: Pricing Rule,Item Code,Produktkod
 DocType: Production Planning Tool,Create Production Orders,Skapa produktionsorder
@@ -2225,7 +2247,7 @@
 DocType: Journal Entry,User Remark,Användar Anmärkning
 DocType: Lead,Market Segment,Marknadssegment
 DocType: Employee Internal Work History,Employee Internal Work History,Anställd interna arbetshistoria
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Closing (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Closing (Dr)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Löpnummer {0} inte i lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skatte mall för att sälja transaktioner.
@@ -2241,7 +2263,7 @@
 ,Billed Amount,Fakturerat antal
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstämning
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hämta uppdateringar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Material Begäran {0} avbryts eller stoppas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Material Begäran {0} avbryts eller stoppas
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Lägg till några exempeldokument
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lämna ledning
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupp per konto
@@ -2250,14 +2272,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontot huvudet under ansvar, där Vinst / Förlust bokas"
 DocType: Payment Tool,Against Vouchers,Mot Kuponger
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Snabbhjälp
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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}
 DocType: Features Setup,Sales Extras,Försäljnings Extras
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget för Konto {1} mot kostnadsställe {2} kommer att överstiga med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
 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;
 ,Stock Projected Qty,Lager Projicerad Antal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
 DocType: Sales Order,Customer's Purchase Order,Kundens beställning
 DocType: Warranty Claim,From Company,Från Företag
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Värde eller Antal
@@ -2267,9 +2289,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Lämna Block List tillåtna
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Du kommer att använda den för att logga in
 DocType: Sales Partner,Retailer,Återförsäljare
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Tack till kontot måste vara ett balanskonto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Alla Leverantörs Typer
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +46,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 +93,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
@@ -2313,7 +2335,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovikten på paketet. Vanligtvis nettovikt + förpackningsmaterial vikt. (För utskrift)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Användare med den här rollen får ställa frysta konton och skapa / ändra bokföringsposter mot frysta konton
 DocType: Serial No,Is Cancelled,Är Inställd
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mina Transporter
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Mina Transporter
 DocType: Journal Entry,Bill Date,Faktureringsdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Även om det finns flera prissättningsregler med högsta prioritet, kommer följande interna prioriteringar tillämpas:"
 DocType: Supplier,Supplier Details,Leverantör Detaljer
@@ -2334,10 +2356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Samtal
 DocType: Project,Total Costing Amount (via Time Logs),Totalt kalkyl Belopp (via Time Loggar)
 DocType: Purchase Order Item Supplied,Stock UOM,Lager UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Inköpsorder {0} inte lämnad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Inköpsorder {0} inte lämnad
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Projicerad
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serienummer {0} tillhör inte Lager {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Obs: Systemet kommer inte att kontrollera över leverans och överbokning till punkt {0} då kvantitet eller belopp är 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Obs: Systemet kommer inte att kontrollera över leverans och överbokning till punkt {0} då kvantitet eller belopp är 0
 DocType: Notification Control,Quotation Message,Offert Meddelande
 DocType: Issue,Opening Date,Öppningsdatum
 DocType: Journal Entry,Remark,Anmärkning
@@ -2350,9 +2372,9 @@
 DocType: Time Log,Batched for Billing,Batchad för fakturering
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Räkningar som framförts av leverantörer.
 DocType: POS Profile,Write Off Account,Avskrivningskonto
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Netto kassaflöde från rörelsen
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,t.ex. moms
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Produkt  4
 DocType: Journal Entry Account,Journal Entry Account,Journalanteckning konto
@@ -2393,7 +2415,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,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
 DocType: Sales Invoice,Against Income Account,Mot Inkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Levererad
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Territorium Mål
 DocType: Delivery Note,Transporter Info,Transporter info
@@ -2421,10 +2443,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer är obligatoriskt för punkt {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Detta är en rot säljare och kan inte ändras.
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Betyg: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Betyg: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Lön Slip Avdrag
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Välj en grupp nod först.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Syfte måste vara en av {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Syfte måste vara en av {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Fyll i formuläret och spara det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Hämta en rapport som innehåller alla råvaror med deras senaste lagerstatus
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
@@ -2462,7 +2484,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Företag (inte kund eller leverantör) ledare.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Ange &quot;Förväntat leveransdatum&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,Betald belopp + Avskrivningsbelopp kan inte vara större än Totalsumma
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,Betald belopp + Avskrivningsbelopp kan inte vara större än Totalsumma
 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 inte en giltig batchnummer för punkt {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Obs: Det finns inte tillräckligt med ledighetdagar för ledighet typ {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Notera: Om betalning inte sker mot någon referens, gör Journalpost manuellt."
@@ -2479,12 +2501,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Skicka automatiska meddelanden till kontakter på Skickar transaktioner.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Rad {0}: Antal inte tillgängligt i lager {1} på {2} {3}. Tillgängliga Antal: {4}, Transfer Antal: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Produkt 3
 DocType: Purchase Order,Customer Contact Email,Kundkontakt Email
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvarsområden
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Mall
 DocType: Sales Person,Sales Person Name,Försäljnings Person Namn
@@ -2495,20 +2517,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Innan avstämning
 apps/erpnext/erpnext/support/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 +374,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 +383,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
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Vänligen ange företagsnamn igen för att bekräfta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totalt Utestående Amt
 DocType: Time Log Batch,Total Hours,Totalt antal timmar
 DocType: Journal Entry,Printing Settings,Utskriftsinställningar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Totalt Betal måste vara lika med de sammanlagda kredit. Skillnaden är {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Totalt Betal måste vara lika med de sammanlagda kredit. Skillnaden är {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Fordon
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Från Följesedel
 DocType: Time Log,From Time,Från Tid
 DocType: Notification Control,Custom Message,Anpassat Meddelande
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto är obligatoriskt för utbetalningensposten
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto är obligatoriskt för utbetalningensposten
 DocType: Purchase Invoice,Price List Exchange Rate,Prislista Växelkurs
 DocType: Purchase Invoice Item,Rate,Betygsätt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
@@ -2526,9 +2548,10 @@
 			conflict by assigning priority. Price Rules: {0}","Flera prisregler finns med samma kriterier, vänligen lös \ konflikten genom att prioritera. Pris Regler: {0}"
 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 +580,Issue Material,Problem Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Problem Material
 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
 DocType: Hub Settings,Access Token,Tillträde token
 DocType: Sales Invoice Item,Serial No,Serienummer
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Ange servicedetaljer först
@@ -2542,10 +2565,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maximal Fakturabelopp
 DocType: Purchase Invoice Item,Image View,Visa bild
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Värdering och Total
@@ -2553,6 +2578,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Denna punkt är en variant av {0} (Template). Attribut kopieras över från mallen om &quot;No Copy &#39;är inställd
 DocType: Account,Purchase User,Inköpsanvändare
 DocType: Notification Control,Customize the Notification,Anpassa Anmälan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Kassaflöde från rörelsen
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adress mall kan inte tas bort
 DocType: Sales Invoice,Shipping Rule,Frakt Regel
 DocType: Journal Entry,Print Heading,Utskrifts Rubrik
@@ -2563,7 +2589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Råmaterial
 DocType: Leave Application,Follow via Email,Följ via e-post
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebelopp efter rabatt Belopp
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Välj Publiceringsdatum först
@@ -2581,6 +2607,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos krävs för Serialiserad Punkt {0}
 DocType: Journal Entry,Bank Entry,Bank anteckning
 DocType: Authorization Rule,Applicable To (Designation),Är tillämpligt för (Destination)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Lägg till i kundvagn
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppera efter
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivera / inaktivera valutor.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Post Kostnader
@@ -2588,29 +2615,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Underhållning &amp; Fritid
 DocType: Purchase Order,The date on which recurring order will be stop,Den dag då återkommande beställning kommer att stoppa
 DocType: Quality Inspection,Item Serial No,Produkt Löpnummer
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} måste minskas med {1} eller om du bör öka överfödstolerans
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} måste minskas med {1} eller om du bör öka överfödstolerans
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Totalt Närvarande
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Timme
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serie Punkt {0} kan inte uppdateras \ använder Stock Avstämning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Överföra material till leverantören
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Överföra material till leverantören
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Skapa offert
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Du har inte behörighet att godkänna löv på Block Datum
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alla dessa punkter har redan fakturerats
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Alla dessa punkter har redan fakturerats
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkännas av {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Frakt härskar Villkor
 DocType: BOM Replace Tool,The new BOM after replacement,Den nya BOM efter byte
 DocType: Features Setup,Point of Sale,Butiksförsäljning
 DocType: Account,Tax,Skatt
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rad {0}: {1} är inte en giltig {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Från produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Från produkt Bundle
 DocType: Production Planning Tool,Production Planning Tool,Produktionsplaneringsverktyg
 DocType: Quality Inspection,Report Date,Rapportdatum
 DocType: C-Form,Invoices,Fakturor
 DocType: Job Opening,Job Title,Jobbtitel
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Mottagare
 DocType: Features Setup,Item Groups in Details,Produktgrupper i Detaljer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Kvantitet som Tillverkning måste vara större än 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -2618,8 +2644,9 @@
 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: Pricing Rule,Customer Group,Kundgrupp
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Utgiftskonto är obligatorisk för produkten {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Utgiftskonto är obligatorisk för produkten {0}
 DocType: Item,Website Description,Webbplats Beskrivning
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Nettoförändringen i eget kapital
 DocType: Serial No,AMC Expiry Date,AMC Förfallodatum
 ,Sales Register,Försäljningsregistret
 DocType: Quotation,Quotation Lost Reason,Anledning förlorad Offert
@@ -2627,12 +2654,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det finns inget att redigera.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Sammanfattning för denna månad och pågående aktiviteter
 DocType: Customer Group,Customer Group Name,Kundgruppnamn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Attributer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Hämta artiklar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Ange avskrivningskonto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Hämta artiklar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Ange avskrivningskonto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sista beställningsdatum
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Skapa punktfaktura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Kontot {0} till inte företaget {1}
@@ -2648,7 +2675,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projektvis uppgifter finns inte tillgängligt för Offert
 DocType: Project,Expected End Date,Förväntad Slutdatum
 DocType: Appraisal Template,Appraisal Template Title,Bedömning mall Titel
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Kommersiell
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Kommersiell
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Moderbolaget Punkt {0} får inte vara en lagervara
 DocType: Cost Center,Distribution Id,Fördelning Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Grymma Tjänster
@@ -2661,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Värde för Attribut {0} måste vara inom intervallet {1} till {2} i steg om {3}
 DocType: Tax Rule,Sales,Försäljning
 DocType: Stock Entry Detail,Basic Amount,BASBELOPP
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
 DocType: Leave Allocation,Unused leaves,Oanvända blad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard Mottagarkonton
@@ -2673,16 +2700,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,Kvitton
-DocType: Payment Reconciliation,Maximum Amount,Maximibeloppet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hur prissättning tillämpas?
 DocType: Quality Inspection,Delivery Note No,Följesedel nr
 DocType: Company,Retail,Detaljhandeln
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kund {0} existerar inte
 DocType: Attendance,Absent,Frånvarande
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produktpaket
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rad {0}: Ogiltig referens {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Produktpaket
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Rad {0}: Ogiltig referens {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Inköp Skatter och avgifter Mall
 DocType: Upload Attendance,Download Template,Hämta mall
 DocType: GL Entry,Remarks,Anmärkningar
@@ -2709,7 +2736,7 @@
 ,Monthly Attendance Sheet,Månads Närvaroblad
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post hittades
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadsställe är obligatorisk för punkt {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Få artiklar från produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Få artiklar från produkt Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} är inaktivt
 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
@@ -2718,8 +2745,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Resultaträkning"" kontotyp {0} inte tillåtna i öppna poster"
 DocType: Features Setup,Sales Discounts,Försäljnings Rabatter
 DocType: Hub Settings,Seller Country,Säljare Land
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publicera artiklar på webbplatsen
 DocType: Authorization Rule,Authorization Rule,Auktoriseringsregel
 DocType: Sales Invoice,Terms and Conditions Details,Villkor Detaljer
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Specifikationer
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Försäljnings Skatter och avgifter Mall
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kläder &amp; tillbehör
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antal Beställningar
@@ -2741,7 +2770,7 @@
 DocType: Time Log,Billing Amount,Fakturerings Mängd
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ogiltig mängd som anges för produkten {0}. Kvantitet bör vara större än 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ansökan om ledighet.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konto med befintlig transaktioner kan inte tas bort
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Konto med befintlig transaktioner kan inte tas bort
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Rättsskydds
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den dagen i den månad som auto beställning kommer att genereras t.ex. 05, 28 etc"
 DocType: Sales Invoice,Posting Time,Boknings Tid
@@ -2757,11 +2786,11 @@
 DocType: Maintenance Visit,Breakdown,Nedbrytning
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan inte väljas {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Check Datum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Förälder konto {1} tillhör inte företaget: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Förälder konto {1} tillhör inte företaget: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Framgångsrikt bort alla transaktioner i samband med detta företag!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på Date
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Skyddstillsyn
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Standard Lager är obligatoriskt för lagervara.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Standard Lager är obligatoriskt för lagervara.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Utbetalning av lön för månaden {0} och år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Diskinmatning Prislista ränta om saknas
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Sammanlagda belopp som betalats
@@ -2773,6 +2802,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Totalt Billing Belopp (via Time Loggar)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Vi säljer detta objekt
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverantör Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Kvantitet bör vara större än 0
 DocType: Journal Entry,Cash Entry,Kontantinlägg
 DocType: Sales Partner,Contact Desc,Kontakt Desc
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Typ av löv som tillfällig, sjuka etc."
@@ -2781,7 +2811,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Lägg rader för att ställa in årsbudgetar på konton.
 DocType: Buying Settings,Default Supplier Type,Standard Leverantörstyp
 DocType: Production Order,Total Operating Cost,Totala driftskostnaderna
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Obs: Punkt {0} inlagd flera gånger
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Obs: Punkt {0} inlagd flera gånger
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alla kontakter.
 DocType: Newsletter,Test Email Id,Test e-post ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Företagetsförkortning
@@ -2806,7 +2836,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alla kundgrupper
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Skatte Mall är obligatorisk.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Förälder konto {1} existerar inte
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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: Account,Temporary,Tillfällig
 DocType: Address,Preferred Billing Address,Önskad faktureringsadress
@@ -2824,8 +2854,8 @@
 ,Item-wise Price List Rate,Produktvis Prislistavärde
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} är stoppad
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} är stoppad
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
 DocType: Lead,Add to calendar on this date,Lägg till i kalender på denna dag
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler för att lägga fraktkostnader.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,uppkommande händelser
@@ -2845,24 +2875,24 @@
 DocType: Customer,From Lead,Från Prospekt
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Order släppts för produktion.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Välj räkenskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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 +455,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
 DocType: Hub Settings,Name Token,Namn token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standardförsäljnings
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Minst ett lager är obligatorisk
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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
 DocType: Serial No,Out of Warranty,Ingen garanti
 DocType: BOM Replace Tool,Replace,Ersätt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} mot faktura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ange standardmåttenhet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} mot faktura {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Ange standardmåttenhet
 DocType: Purchase Invoice Item,Project Name,Projektnamn
 DocType: Supplier,Mention if non-standard receivable account,Nämn om icke-standardiserade fordran konto
 DocType: Journal Entry Account,If Income or Expense,Om intäkter eller kostnader
 DocType: Features Setup,Item Batch Nos,Produkt Sats nr
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Värde Skillnad
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Personal administration
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Skattefordringar
 DocType: BOM Item,BOM No,BOM nr
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Rörligt medelvärde
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM som kommer att ersättas
 DocType: Account,Debit,Debit-
@@ -2899,7 +2929,7 @@
 DocType: Stock Entry Detail,Additional Cost,Extra kostnad
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Budgetåret Slutdatum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",Kan inte filtrera baserat på kupong nr om grupperad efter kupong
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Skapa Leverantörsoffert
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Skapa Leverantörsoffert
 DocType: Quality Inspection,Incoming,Inkommande
 DocType: BOM,Materials Required (Exploded),Material som krävs (Expanderad)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Minska tjänat belopp för ledighet utan lön (LWP)
@@ -2907,7 +2937,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,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/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Tillfällig ledighet
 DocType: Batch,Batch ID,Batch-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Obs: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Obs: {0}
 ,Delivery Note Trends,Följesedel Trender
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Veckans Sammanfattning
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} måste vara ett Köpt eller underleverantörers föremål i rad {1}
@@ -2922,6 +2952,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Köpkurs
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timmar)
 DocType: Employee,History In Company,Historia Företaget
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Den totala emissions / Transfer kvantitet {0} i Material Request {1} kan inte vara större än efterfrågat antal {2} till punkt {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Nyhetsbrev
 DocType: Address,Shipping,Frakt
 DocType: Stock Ledger Entry,Stock Ledger Entry,Lager Ledger Entry
@@ -2941,7 +2972,6 @@
 DocType: Purchase Order,End date of current order's period,Slutdatum för nuvarande order period
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Skapa ett anbudsbrev
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Återgå
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Standard mätenhet för Variant måste vara densamma som mall
 DocType: Production Order Operation,Production Order Operation,Produktionsorder Drift
 DocType: Pricing Rule,Disable,Inaktivera
 DocType: Project Task,Pending Review,Väntar På Granskning
@@ -2949,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kundnummer
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Till tid måste vara större än From Time
 DocType: Journal Entry Account,Exchange Rate,Växelkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Lager {0}: Moderbolaget konto {1} tillhör inte företaget {2}
 DocType: BOM,Last Purchase Rate,Senaste Beställningsvärde
 DocType: Account,Asset,Tillgång
@@ -2969,7 +2999,7 @@
 ,Available Stock for Packing Items,Tillgängligt lager för förpackningsprodukter
 DocType: Item Variant,Item Variant,Produkt Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Ställa den här adressen mall som standard eftersom det inte finns någon annan standard
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Kvalitetshantering
 DocType: Production Planning Tool,Filter based on customer,Filter utifrån kundernas
 DocType: Payment Tool Detail,Against Voucher No,Mot kupongnr
@@ -2986,6 +3016,7 @@
 DocType: Opportunity,Next Contact,Nästa Kontakta
 DocType: Employee,Employment Type,Anställnings Typ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Fasta tillgångar
+,Cash Flow,Pengaflöde
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Ansökningstiden kan inte vara över två alocation register
 DocType: Item Group,Default Expense Account,Standardutgiftskonto
 DocType: Employee,Notice (days),Observera (dagar)
@@ -3017,13 +3048,12 @@
 DocType: Production Order,Warehouses,Lager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Skriv ut
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Grupp Nod
-DocType: Payment Reconciliation,Minimum Amount,Minimibelopp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Uppdatera färdiga varor
 DocType: Workstation,per hour,per timme
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto för lagret (Perpetual Inventory) kommer att skapas inom ramen för detta konto.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Lager kan inte tas bort som lagrets huvudbok  existerar för det här lagret.
 DocType: Company,Distribution,Fördelning
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Betald Summa
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Betald Summa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektledare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Skicka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabatt tillåtet för objektet: {0} är {1}%
@@ -3047,7 +3077,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Stöd Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Företaget saknas i lager {0}
 DocType: POS Profile,Terms and Conditions,Villkor
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Till Datum bör ligga inom räkenskapsåret. Förutsatt att Dag = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Till Datum bör ligga inom räkenskapsåret. Förutsatt att Dag = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Här kan du behålla längd, vikt, allergier, medicinska problem etc"
 DocType: Leave Block List,Applies to Company,Gäller Företag
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Det går inte att avbryta eftersom lämnad Lagernotering {0} existerar
@@ -3061,11 +3091,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Ange kvitton
 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 +425,Transaction not allowed against stopped Production Order {0},Transaktion inte tillåtet mot stoppad produktionsorder {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Inställning inkommande server stöd e-id. (T.ex. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Brist Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
 DocType: Salary Slip,Salary Slip,Lön Slip
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Till datum&quot; krävs
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Skapa följesedlar efter paket som skall levereras. Används för att meddela kollinummer, paketets innehåll och dess vikt."
@@ -3143,7 +3173,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Personaldokument.
 DocType: HR Settings,Payroll Settings,Sociala Inställningar
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Matcha ej bundna fakturor och betalningar.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Beställa
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Beställa
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan inte ha en överordnat kostnadsställe
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Välj märke ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Tillämplig
@@ -3158,7 +3188,7 @@
 DocType: Appraisal,Start Date,Start Datum
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Tilldela avgångar under en period.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klicka här för att kontrollera
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan inte tilldela sig själv som förälder konto
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan inte tilldela sig själv som förälder konto
 DocType: Purchase Invoice Item,Price List Rate,Prislista värde
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Visa &quot;i lager&quot; eller &quot;Inte i lager&quot; som bygger på lager tillgängliga i detta lager.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
@@ -3167,17 +3197,17 @@
 DocType: Project,Expected Start Date,Förväntat startdatum
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Ta bort alternativ om avgifter inte är tillämpade för denna post
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,T.ex. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Receive
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Receive
 DocType: Maintenance Visit,Fully Completed,Helt Avslutad
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Färdig
 DocType: Employee,Educational Qualification,Utbildnings Kvalificering
 DocType: Workstation,Operating Costs,Operations Kostnader
 DocType: Employee Leave Approver,Employee Leave Approver,Anställd Lämna godkännare
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} har lagts till vårt nyhetsbrev lista.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Det går inte att ange som förlorad, eftersom Offert har gjorts."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Inköpschef
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Produktionsorder {0} måste lämnas in
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Produktionsorder {0} måste lämnas in
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Välj startdatum och slutdatum för punkt {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Huvud Rapporter
 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
@@ -3195,7 +3225,7 @@
 DocType: Industry Type,Industry Type,Industrityp
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Något gick snett!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Varning: Ledighetsansökan innehåller följande block datum
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Fakturan {0} har redan lämnats in
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Fakturan {0} har redan lämnats in
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Slutförande Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Belopp (Företagsvaluta)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisation enhet (avdelnings) ledare.
@@ -3214,10 +3244,10 @@
 ,Serial No Service Contract Expiry,Löpnummer serviceavtal löper ut
 DocType: Item,Unit of Measure Conversion,Enhet Omvandling
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Anställd kan inte ändras
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Du kan inte kreditera och debitera samma konto på samma gång
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Du kan inte kreditera och debitera samma konto på samma gång
 DocType: Naming Series,Help HTML,Hjälp HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Totalt weightage delas ska vara 100%. Det är {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Ersättning för över {0} korsade till punkt {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Ersättning för över {0} korsade till punkt {1}
 DocType: Address,Name of person or organization that this address belongs to.,Namn på den person eller organisation som den här adressen tillhör.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Dina Leverantörer
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan inte ställa in då Förlorad kundorder är gjord.
@@ -3230,35 +3260,35 @@
 DocType: Employee,Date of Issue,Utgivningsdatum
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Från {0} för {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Rad # {0}: Ställ Leverantör för punkt {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Kontrollera flera valutor möjlighet att tillåta konton med annan valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Kontrollera flera valutor möjlighet att tillåta konton med annan valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Produkt: {0} existerar inte i systemet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Du har inte behörighet att ställa in Frysta värden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Du har inte behörighet att ställa in Frysta värden
 DocType: Payment Reconciliation,Get Unreconciled Entries,Hämta ej verifierade Anteckningar
+DocType: Payment Reconciliation,From Invoice Date,Från fakturadatum
 DocType: Cost Center,Budgets,Budgetar
-DocType: Employee,Emergency Contact Details,Akut Kontaktuppgifter
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Vad gör den?
 DocType: Delivery Note,To Warehouse,Till Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Kontot {0} har angetts mer än en gång för räkenskapsåret {1}
 ,Average Commission Rate,Genomsnittligt commisionbetyg
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'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/hr/doctype/attendance/attendance.py +34,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
 DocType: Purchase Taxes and Charges,Account Head,Kontohuvud
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Uppdatera merkostnader för att beräkna landade kostnaden för objekt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Total Value Skillnad (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Rad {0}: Växelkurser är obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Rad {0}: Växelkurser är obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Användar-ID inte satt för anställd {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Från garantianspråk
 DocType: Stock Entry,Default Source Warehouse,Standardkälla Lager
 DocType: Item,Customer Code,Kund kod
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Påminnelse födelsedag för {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dagar sedan senast Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,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 +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Tillgångar
@@ -3271,7 +3301,7 @@
 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
 DocType: Authorization Rule,Based On,Baserat På
 DocType: Sales Order Item,Ordered Qty,Beställde Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Punkt {0} är inaktiverad
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Punkt {0} är inaktiverad
 DocType: Stock Settings,Stock Frozen Upto,Lager Fryst Upp
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Period Från och period datum obligatoriska för återkommande {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektverksamhet / uppgift.
@@ -3279,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv engångsavgift (Company valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landad Kostnad rabatt
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ställ in {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Upprepa på Månadsdag
@@ -3308,12 +3338,12 @@
 DocType: Upload Attendance,Upload Attendance,Ladda upp Närvaro
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM och tillverkningskvantitet krävs
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Åldringsräckvidd 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Mängd
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Mängd
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ersatte
 ,Sales Analytics,Försäljnings Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Tillverknings Inställningar
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Ställa in e-post
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Ange standardvaluta i Bolaget
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Dagliga påminnelser
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Skatt Regel Konflikter med {0}
@@ -3339,13 +3369,13 @@
 DocType: Sales Order Item,Produced Quantity,Producerat Kvantitet
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingenjör
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Sök Sub Assemblies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Produkt kod krävs vid Radnr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Produkt kod krävs vid Radnr {0}
 DocType: Sales Partner,Partner Type,Partner Typ
 DocType: Purchase Taxes and Charges,Actual,Faktisk
 DocType: Authorization Rule,Customerwise Discount,Kundrabatt
 DocType: Purchase Invoice,Against Expense Account,Mot utgiftskonto
 DocType: Production Order,Production Order,Produktionsorder
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installeringsnotis {0} har redan lämnats in
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Installeringsnotis {0} har redan lämnats in
 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
@@ -3357,15 +3387,15 @@
 DocType: Employee,Applicable Holiday List,Tillämplig kalender
 DocType: Employee,Cheque,Check
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serie Uppdaterad
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapporttyp är obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Rapporttyp är obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Lager är obligatoriskt för Lagervara {0} i rad {1}
 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/public/js/setup_wizard.js +101,The First User: You,Den första användaren: Du
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Framgångsrikt Avstämt
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Framgångsrikt Avstämt
 DocType: Production Order,Planned End Date,Planerat Slutdatum
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Där artiklar lagras.
 DocType: Tax Rule,Validity,Giltighet
@@ -3373,7 +3403,7 @@
 DocType: Attendance,Attendance,Närvaro
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Bokningsdatum och bokningstid är obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Bokningsdatum och bokningstid är obligatorisk
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Skatte mall för att köpa transaktioner.
 ,Item Prices,Produktpriser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,I Ord kommer att synas när du sparar beställningen.
@@ -3382,15 +3412,15 @@
 DocType: Task,Review Date,Kontroll Datum
 DocType: Purchase Invoice,Advance Payments,Förskottsbetalningar
 DocType: Purchase Taxes and Charges,On Net Total,På Net Totalt
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rad {0} måste vara densamma som produktionsorder
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ingen tillåtelse att använda betalningsverktyg
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""Anmälan e-postadresser"" inte angett för återkommande% s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Avrunda konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativa kostnader
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Konsultering
 DocType: Customer Group,Parent Customer Group,Överordnad kundgrupp
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Byta
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Byta
 DocType: Purchase Invoice,Contact Email,Kontakt E-Post
 DocType: Appraisal Goal,Score Earned,Betyg förtjänat
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","t.ex. ""Mitt Företag LLC"""
@@ -3400,13 +3430,13 @@
 DocType: Packing Slip,Gross Weight UOM,Bruttovikt UOM
 DocType: Email Digest,Receivables / Payables,Fordringar / skulder
 DocType: Delivery Note Item,Against Sales Invoice,Mot fakturan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,KUNDKONTO
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,KUNDKONTO
 DocType: Landed Cost Item,Landed Cost Item,Landad kostnadspost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Visa nollvärden
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Antal av objekt som erhålls efter tillverkning / ompackning från givna mängder av råvaror
 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 +562,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
 DocType: Item,Default Warehouse,Standard Lager
 DocType: Task,Actual End Date (via Time Logs),Faktiskt Slutdatum (via Tidslogg)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan inte tilldelas mot gruppkonto {0}
@@ -3442,29 +3472,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planera tidsloggar utanför planerad arbetstid.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} har redan lämnats in
 ,Items To Be Requested,Produkter att begäras
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Hämta Senaste Beställningsvärdet
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing Pris baseras på Aktivitetstyp (per timme)
 DocType: Company,Company Info,Företagsinfo
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Företagets epost-ID hittades inte, darför inte epost skickas"
 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)
 DocType: Production Planning Tool,Filter based on item,Filter baserat på objektet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Bankkortkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Bankkortkonto
 DocType: Fiscal Year,Year Start Date,År Startdatum
 DocType: Attendance,Employee Name,Anställd Namn
 DocType: Sales Invoice,Rounded Total (Company Currency),Avrundat Totalt (Företagsvaluta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Det går inte att konvertera till koncernen eftersom Kontotyp valts.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,Det går inte att konvertera till koncernen eftersom Kontotyp valts.
 DocType: Purchase Common,Purchase Common,Gemensamma inköp
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} har ändrats. Vänligen uppdatera.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stoppa användare från att göra Lämna program på följande dagarna.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Från Möjlighet
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Ersättningar till anställda
 DocType: Sales Invoice,Is POS,Är POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Godkänd Kvantitet
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} existerar inte
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Fakturor till kunder.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tillagda
 DocType: Maintenance Schedule,Schedule,Tidtabell
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definiera budget för detta kostnadsställe. Om du vill ställa budget action, se &quot;Företag Lista&quot;"
@@ -3472,7 +3503,7 @@
 DocType: Quality Inspection Reading,Reading 3,Avläsning 3
 ,Hub,Nav
 DocType: GL Entry,Voucher Type,Rabatt Typ
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prislista hittades inte eller avaktiverad
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Prislista hittades inte eller avaktiverad
 DocType: Expense Claim,Approved,Godkänd
 DocType: Pricing Rule,Price,Pris
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"Anställd sparkades på {0} måste ställas in som ""lämnat"""
@@ -3486,7 +3517,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Redovisning journalanteckningar.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tillgång Antal på From Warehouse
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Välj Anställningsregister först.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / konto stämmer inte med {1} / {2} i {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / konto stämmer inte med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,För att skapa en skattekontot
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Ange utgiftskonto
 DocType: Account,Stock,Lager
@@ -3497,7 +3528,7 @@
 DocType: Employee,Contract End Date,Kontrakts Slutdatum
 DocType: Sales Order,Track this Sales Order against any Project,Prenumerera på det här kundorder mot varje Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Hämta försäljningsorder (i avvaktan på att leverera) baserat på ovanstående kriterier
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Från leverantör Offert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Från leverantör Offert
 DocType: Deduction Type,Deduction Type,Avdragstyp
 DocType: Attendance,Half Day,Halv Dag
 DocType: Pricing Rule,Min Qty,Min Antal
@@ -3505,7 +3536,7 @@
 DocType: GL Entry,Transaction Date,Transaktionsdatum
 DocType: Production Plan Item,Planned Qty,Planerade Antal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Totalt Skatt
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,För Kvantitet (Tillverkad Antal) är obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,För Kvantitet (Tillverkad Antal) är obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Valt Lager
 DocType: Purchase Invoice,Net Total (Company Currency),Netto Totalt (Företagsvaluta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Parti Typ och Parti gäller endast mot Fordran / Betal konto
@@ -3559,9 +3590,9 @@
 DocType: Customer,Commission Rate,Provisionbetyg
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Gör Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Block ledighet applikationer avdelningsvis.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Kundvagnen är tom
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Kundvagnen är tom
 DocType: Production Order,Actual Operating Cost,Faktisk driftkostnad
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root kan inte redigeras.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Root kan inte redigeras.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Avsatt belopp kan inte större än icke redigerat belopp
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillåt Produktion på helgdagar
 DocType: Sales Order,Customer's Purchase Order Date,Kundens inköpsorder Datum
@@ -3572,11 +3603,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Villkor Mall
 DocType: Serial No,Delivery Details,Leveransdetaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Kostnadsställe krävs rad {0} i skatte tabellen för typ {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Kostnadsställe krävs rad {0} i skatte tabellen för typ {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Skapa automatiskt Material Begäran om kvantitet understiger denna nivå
 ,Item-wise Purchase Register,Produktvis Inköpsregister
 DocType: Batch,Expiry Date,Utgångsdatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","För att ställa in beställningsnivå, måste objektet vara en inköpsobjekt eller tillverkning Punkt"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","För att ställa in beställningsnivå, måste objektet vara en inköpsobjekt eller tillverkning Punkt"
 ,Supplier Addresses and Contacts,Leverantör adresser och kontakter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vänligen välj kategori först
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projektchef.
@@ -3584,7 +3615,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditdagar
 DocType: Leave Type,Is Carry Forward,Är Överförd
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Hämta artiklar från BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Parti Typ och Parti krävs för obetalda / konto {1}
@@ -3592,7 +3623,7 @@
 DocType: Employee,Reason for Leaving,Anledning för att lämna
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktionerade Belopp
 DocType: GL Entry,Is Opening,Är Öppning
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rad {0}: debitering kan inte kopplas till en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Kontot {0} existerar inte
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Rad {0}: debitering kan inte kopplas till en {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Kontot {0} existerar inte
 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/ta.csv b/erpnext/translations/ta.csv
index 58a84fc..6e5f8de 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,நுகர்வோர் தயாரிப்புகள்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,முதல் கட்சி வகையைத் தேர்வு செய்க
 DocType: Item,Customer Items,வாடிக்கையாளர் பொருட்கள்
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,கணக்கு {0}: பெற்றோர் கணக்கு {1} ஒரு பேரேட்டில் இருக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,கணக்கு {0}: பெற்றோர் கணக்கு {1} ஒரு பேரேட்டில் இருக்க முடியாது
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com செய்ய உருப்படியை வெளியிட
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,மின்னஞ்சல் அறிவிப்புகள்
 DocType: Item,Default Unit of Measure,மெஷர் முன்னிருப்பு அலகு
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,வாடிக்கையாளர் தொடர்பு
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,பொருள் கோரிக்கையை இருந்து
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,பொருள் கோரிக்கையை இருந்து
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} மரம்
 DocType: Job Applicant,Job Applicant,வேலை விண்ணப்பதாரர்
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,மேலும் முடிவுகள் இல்லை.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. வாடிக்கையாளர் வாரியாக உருப்படியை குறியீடு பராமரிக்க மற்றும் அவற்றின் குறியீடு அடிப்படையில் அவர்களை தேடும் செய்ய இந்த விருப்பத்தை பயன்படுத்த
 DocType: Mode of Payment Account,Mode of Payment Account,கொடுப்பனவு கணக்கு முறை
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,காட்டு மாறிகள்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,அளவு
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,அளவு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),கடன்கள் ( கடன்)
 DocType: Employee Education,Year of Passing,தேர்ச்சி பெறுவதற்கான ஆண்டு
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,பங்கு
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,உடல்நலம்
 DocType: Purchase Invoice,Monthly,மாதாந்தர
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),கட்டணம் தாமதம் (நாட்கள்)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,விலைப்பட்டியல்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,விலைப்பட்டியல்
 DocType: Maintenance Schedule Item,Periodicity,வட்டம்
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,மின்னஞ்சல் முகவரி
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,நிதியாண்டு {0} தேவையான
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,பாதுகாப்பு
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ஸ்கோர் (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},ரோ {0} {1} {2} பொருந்தவில்லை {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},ரோ {0} {1} {2} பொருந்தவில்லை {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ரோ # {0}:
 DocType: Delivery Note,Vehicle No,வாகனம் இல்லை
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,விலை பட்டியல் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,விலை பட்டியல் தேர்ந்தெடுக்கவும்
 DocType: Production Order Operation,Work In Progress,முன்னேற்றம் வேலை
 DocType: Employee,Holiday List,விடுமுறை பட்டியல்
 DocType: Time Log,Time Log,நேரம் புகுபதிகை
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,அதே நிறுவனம் ஒன்றுக்கு மேற்பட்ட முறை உள்ளிட்ட
 DocType: Employee,Married,திருமணம்
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},அனுமதிக்கப்பட்ட {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
 DocType: Payment Reconciliation,Reconcile,சமரசம்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,மளிகை
 DocType: Quality Inspection Reading,Reading 1,1 படித்தல்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,வங்கி நுழைவு செய்ய
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ஓய்வூதிய நிதி
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,கணக்கு வகை கிடங்கு என்றால் கிடங்கு கட்டாய ஆகிறது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,கணக்கு வகை கிடங்கு என்றால் கிடங்கு கட்டாய ஆகிறது
 DocType: SMS Center,All Sales Person,அனைத்து விற்பனை நபர்
 DocType: Lead,Person Name,நபர் பெயர்
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","பாருங்கள் பொருட்டு மீண்டும் மீண்டும் என்றால், மீண்டும் நிறுத்த அல்லது முறையான முடிவு தேதி வைத்து தேர்வு நீக்கவும்"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,அக்கறை உள்ள
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,பொருள் பில்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,திறப்பு
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},இருந்து {0} {1}
+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,நுழைவு திறந்து
 DocType: Stock Entry,Additional Costs,கூடுதல் செலவுகள்
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,ஏற்கனவே பரிவர்த்தனை கணக்கு குழு மாற்றப்பட முடியாது .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,ஏற்கனவே பரிவர்த்தனை கணக்கு குழு மாற்றப்பட முடியாது .
 DocType: Lead,Product Enquiry,தயாரிப்பு விசாரணை
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,முதல் நிறுவனம் உள்ளிடவும்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,இலக்கு
+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 +9,Activity Log:,செயல்பாடு : புகுபதிகை
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,பொருள் {0} அமைப்பில் இல்லை அல்லது காலாவதியானது
@@ -165,7 +165,7 @@
 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 +444,Item {0} is not active or end of life has been reached,பொருள் {0} செயலில் இல்லை அல்லது வாழ்க்கை முடிவுக்கு வந்து விட்டது
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,பொருள் {0} செயலில் இல்லை அல்லது வாழ்க்கை முடிவுக்கு வந்து விட்டது
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,விற்பனை விலைப்பட்டியல் சமர்பிக்கப்பட்டதும் புதுப்பிக்கப்படும்.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,அலுவலக தொகுதி அமைப்புகள்
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,குலையை மூடுதல் மேற்கொள்ளப்படும்.
 DocType: Serial No,Maintenance Status,பராமரிப்பு நிலைமை
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,பொருட்கள் மற்றும் விலை
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},வரம்பு தேதி நிதியாண்டு க்குள் இருக்க வேண்டும். தேதி அனுமானம் = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},வரம்பு தேதி நிதியாண்டு க்குள் இருக்க வேண்டும். தேதி அனுமானம் = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,நீங்கள் மதிப்பீடு உருவாக்கும் யாருக்காக பணியாளர் தேர்வு.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},செலவு மையம் {0} அல்ல நிறுவனத்தின் {1}
 DocType: Customer,Individual,தனிப்பட்ட
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,கடன் இருந்து நிகர பண
 DocType: Lead,Address & Contact,முகவரி மற்றும் தொடர்பு கொள்ள
 DocType: Leave Allocation,Add unused leaves from previous allocations,முந்தைய ஒதுக்கீடுகளை இருந்து பயன்படுத்தப்படாத இலைகள் சேர்க்கவும்
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},அடுத்த தொடர் {0} ம் உருவாக்கப்பட்ட {1}
@@ -222,6 +223,7 @@
 ,Contact Name,பெயர் தொடர்பு
 DocType: Production Plan Item,SO Pending Qty,எனவே அளவு நிலுவையில்
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,மேலே குறிப்பிட்டுள்ள அடிப்படை சம்பளம் சீட்டு உருவாக்குகிறது.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,கொடுக்கப்பட்ட விளக்கம் இல்லை
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,வாங்குவதற்கு கோரிக்கை.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,"தேர்வு விடுமுறை வீடு, இந்த விடுமுறை விண்ணப்பத்தை"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,தேதி நிவாரணத்தில் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,உருப்படியை வலைத்தளம் குறிப்புகள்
 DocType: Payment Tool,Reference No,குறிப்பு இல்லை
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,தடுக்கப்பட்ட விட்டு
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,வருடாந்திர
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,பங்கு நல்லிணக்க பொருள்
 DocType: Stock Entry,Sales Invoice No,விற்பனை விலைப்பட்டியல் இல்லை
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,வழங்குபவர் வகை
 DocType: Item,Publish in Hub,மையம் உள்ள வெளியிடு
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,பொருள் {0} ரத்து
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,பொருள் {0} ரத்து
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,பொருள் கோரிக்கை
 DocType: Bank Reconciliation,Update Clearance Date,இசைவு தேதி புதுப்பிக்க
 DocType: Item,Purchase Details,கொள்முதல் விவரம்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},கொள்முதல் ஆணை உள்ள &#39;மூலப்பொருட்கள் சப்ளை&#39; அட்டவணை காணப்படவில்லை பொருள் {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},கொள்முதல் ஆணை உள்ள &#39;மூலப்பொருட்கள் சப்ளை&#39; அட்டவணை காணப்படவில்லை பொருள் {0} {1}
 DocType: Employee,Relation,உறவு
 DocType: Shipping Rule,Worldwide Shipping,உலகம் முழுவதும் கப்பல்
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,வாடிக்கையாளர்கள் இருந்து உத்தரவுகளை உறுதி.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,பரிந்துரைகள்
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,இந்த மண்டலம் உருப்படி பிரிவு வாரியான வரவு செலவு திட்டம் அமைக்க. நீங்கள் விநியோகம் அமைக்க பருவகாலம் சேர்க்க முடியும்.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},கிடங்கு பெற்றோர் கணக்கு குழு உள்ளிடவும் {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},எதிராக செலுத்தும் {0} {1} மிகச்சிறந்த காட்டிலும் அதிகமாக இருக்க முடியாது {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,அட்டவணை உருவாக்க
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,சமீபத்திய
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,மேக்ஸ் 5 எழுத்துக்கள்
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,பட்டியலில் முதல் விடுப்பு சர்க்கார் தரப்பில் சாட்சி இயல்புநிலை விடுப்பு சர்க்கார் தரப்பில் சாட்சி என அமைக்க வேண்டும்
+apps/erpnext/erpnext/config/desktop.py +73,Learn,அறிய
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,பணியாளர் ஒன்றுக்கு நடவடிக்கை செலவு
 DocType: Accounts Settings,Settings for Accounts,கணக்குகளைத் அமைப்புகள்
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,விற்பனை நபர் மரம் நிர்வகி .
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,பல நாணய
 DocType: Payment Reconciliation Invoice,Invoice Type,விலைப்பட்டியல் வகை
 DocType: Sales Invoice Item,Delivery Note,டெலிவரி குறிப்பு
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,வரி அமைத்தல்
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,வரி அமைத்தல்
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,நீங்கள் அதை இழுத்து பின்னர் கொடுப்பனவு நுழைவு மாற்றப்பட்டுள்ளது. மீண்டும் அதை இழுக்க கொள்ளவும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,இந்த வாரம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
 DocType: Workstation,Rent Cost,வாடகை செலவு
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,மாதம் மற்றும் ஆண்டு தேர்ந்தெடுக்கவும்
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Bom, டெலிவரி குறிப்பு , கொள்முதல் விலைப்பட்டியல் , உத்தரவு , கொள்முதல் ஆணை , கொள்முதல் ரசீது , கவிஞருக்கு , விற்பனை , பங்கு நுழைவு , எங்கோ கிடைக்கும்"
 DocType: Item Tax,Tax Rate,வரி விகிதம்
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,உருப்படி தேர்வுசெய்க
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","பொருள்: {0} தொகுதி வாரியாக, அதற்கு பதிலாக பயன்படுத்த பங்கு நுழைவு \
  பங்கு நல்லிணக்க பயன்படுத்தி சமரசப்படுத்த முடியாது நிர்வகிக்கப்படத்தது"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ரோ # {0}: கூறு எண் அதே இருக்க வேண்டும் {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,அல்லாத குழு மாற்றுக
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,வாங்கும் ரசீது சமர்ப்பிக்க வேண்டும்
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,மருத்துவம்
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,இழந்து காரணம்
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,ஒற்றை
 DocType: Issue,Attachment,இணைப்பு
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,பட்ஜெட் குழு செலவு மையம் அமைக்க
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,விடுமுறை மாஸ்டர் .
 DocType: Material Request Item,Required Date,தேவையான தேதி
 DocType: Delivery Note,Billing Address,பில்லிங் முகவரி
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,பொருள் கோட் உள்ளிடவும்.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,பொருள் கோட் உள்ளிடவும்.
 DocType: BOM,Costing,செலவு
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","தேர்ந்தெடுக்கப்பட்டால், ஏற்கனவே அச்சிடுக விகிதம் / அச்சிடுக தொகை சேர்க்கப்பட்டுள்ளது என, வரி தொகை"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,மொத்த அளவு
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
 DocType: Shipping Rule,Net Weight,நிகர எடை
 DocType: Employee,Emergency Phone,அவசர தொலைபேசி
 ,Serial No Warranty Expiry,தொடர் இல்லை உத்தரவாதத்தை காலாவதியாகும்
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,சம்பள உயர்வு 0 இருக்க முடியாது
 DocType: Production Planning Tool,Material Requirement,பொருள் தேவை
 DocType: Company,Delete Company Transactions,நிறுவனத்தின் பரிவர்த்தனைகள் நீக்கு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,பொருள் {0} பொருள் கொள்முதல் இல்லை
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,பொருள் {0} பொருள் கொள்முதல் இல்லை
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} 'அறிவித்தல் \
  மின்னஞ்சல் முகவரி' இருக்கும் ஒரு தவறான மின்னஞ்சல் முகவரி ஆகிறது"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,மொத்த பில்லிங் இந்த வருடம்:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,வரிகள் மற்றும் கட்டணங்கள் சேர்க்க / திருத்தவும்
 DocType: Purchase Invoice,Supplier Invoice No,வழங்குபவர் விலைப்பட்டியல் இல்லை
 DocType: Territory,For reference,குறிப்பிற்கு
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","நீக்க முடியாது தொ.எ. {0}, அது பங்கு பரிவர்த்தனைகள் பயன்படுத்தப்படும் விதத்தில்"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),நிறைவு (CR)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),நிறைவு (CR)
 DocType: Serial No,Warranty Period (Days),உத்தரவாதத்தை காலம் (நாட்கள்)
 DocType: Installation Note Item,Installation Note Item,நிறுவல் குறிப்பு பொருள்
 ,Pending Qty,நிலுவையில் அளவு
@@ -466,7 +469,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** மாதந்திர விநியோகம் ** உங்கள் தொழிலுக்கு பருவகாலம் வேண்டும் என்றால் நீங்கள் மாதங்களுக்கு முழுவதும் உங்கள் வரவு செலவு திட்டம் விநியோகிக்க உதவுகிறது.
 
 , இந்த விநியோக பயன்படுத்தி ஒரு பட்ஜெட் விநியோகிக்க ** விலை மையத்தில் ** இந்த ** மாதந்திர விநியோகம் அமைக்க **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,விலைப்பட்டியல் அட்டவணை காணப்படவில்லை பதிவுகள்
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,விலைப்பட்டியல் அட்டவணை காணப்படவில்லை பதிவுகள்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,முதல் நிறுவனம் மற்றும் கட்சி வகை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,நிதி / கணக்கு ஆண்டு .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","மன்னிக்கவும், சீரியல் இலக்கங்கள் ஒன்றாக்க முடியாது"
@@ -474,9 +477,9 @@
 DocType: Project Task,Project Task,திட்ட பணி
 ,Lead Id,முன்னணி ஐடி
 DocType: C-Form Invoice Detail,Grand Total,ஆக மொத்தம்
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,நிதி ஆண்டு தொடக்கம் தேதி நிதி ஆண்டு இறுதியில் தேதி விட அதிகமாக இருக்க கூடாது
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,நிதி ஆண்டு தொடக்கம் தேதி நிதி ஆண்டு இறுதியில் தேதி விட அதிகமாக இருக்க கூடாது
 DocType: Warranty Claim,Resolution,தீர்மானம்
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},வழங்கப்படுகிறது {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},வழங்கப்படுகிறது {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,செலுத்த வேண்டிய கணக்கு
 DocType: Sales Order,Billing and Delivery Status,பில்லிங் மற்றும் டெலிவரி நிலை
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,மீண்டும் வாடிக்கையாளர்கள்
@@ -491,7 +494,7 @@
 DocType: Quotation,Quotation To,என்று மேற்கோள்
 DocType: Lead,Middle Income,நடுத்தர வருமானம்
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),துவாரம் ( CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,ஒதுக்கப்பட்ட தொகை எதிர்மறை இருக்க முடியாது
 DocType: Purchase Order Item,Billed Amt,கணக்கில் AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"பங்கு உள்ளீடுகளை செய்யப்படுகின்றன எதிராக, ஒரு தருக்க கிடங்கு."
@@ -500,7 +503,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,உற்பத்தி ஓட்டப் ஆகிறது
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,மானசாவுடன்
 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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},எதிர்மறை பங்கு பிழை ( {6} ) உருப்படி {0} கிடங்கு உள்ள {1} ம் {2} {3} ல் {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},எதிர்மறை பங்கு பிழை ( {6} ) உருப்படி {0} கிடங்கு உள்ள {1} ம் {2} {3} ல் {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,நிதியாண்டு நிறுவனத்தின்
 DocType: Packing Slip Item,DN Detail,DN விரிவாக
 DocType: Time Log,Billed,கட்டணம்
@@ -519,16 +522,17 @@
 DocType: Activity Type,Default Costing Rate,இயல்புநிலை செலவு மதிப்பீடு
 DocType: Maintenance Schedule,Maintenance Schedule,பராமரிப்பு அட்டவணை
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","பின்னர் விலை விதிகள் வாடிக்கையாளர் அடிப்படையில் வடிகட்டப்பட்ட, வாடிக்கையாளர் குழு, மண்டலம், சப்ளையர், வழங்குபவர் வகை, இயக்கம், விற்பனை பங்குதாரரான முதலியன"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,சரக்கு நிகர மாற்றம்
 DocType: Employee,Passport Number,பாஸ்போர்ட் எண்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,மேலாளர்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,கொள்முதல் ரசீது இருந்து
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,ஒரே பொருளைப் பலமுறை உள்ளிட்ட.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,கொள்முதல் ரசீது இருந்து
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,ஒரே பொருளைப் பலமுறை உள்ளிட்ட.
 DocType: SMS Settings,Receiver Parameter,ரிசீவர் அளவுரு
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'அடிப்படையாக கொண்டு ' மற்றும் ' குழு மூலம் ' அதே இருக்க முடியாது
 DocType: Sales Person,Sales Person Targets,விற்பனை நபர் இலக்குகள்
 DocType: Production Order Operation,In minutes,நிமிடங்களில்
 DocType: Issue,Resolution Date,தீர்மானம் தேதி
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
 DocType: Selling Settings,Customer Naming By,மூலம் பெயரிடுதல் வாடிக்கையாளர்
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,குழு மாற்ற
 DocType: Activity Cost,Activity Type,நடவடிக்கை வகை
@@ -539,7 +543,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0} {1} விலைப்பட்டியல் விவரம் அட்டவணையில் இல்லை
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு வருகை {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 DocType: Material Request,Material Transfer,பொருள் மாற்றம்
@@ -561,13 +565,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,மார்கெட்டிங்
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,அவர்களின் தொடர் இலக்கங்கள் அடிப்படையில் விற்பனை மற்றும் கொள்முதல் ஆவணங்களில் உருப்படியை தடமறிய. இந்த உற்பத்தியில் உத்தரவாதத்தை விவரங்களை கண்டறிய பயன்படுகிறது.
 DocType: Purchase Receipt Item Supplied,Current Stock,தற்போதைய பங்கு
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,நிராகரிக்கப்பட்டது கிடங்கு regected உருப்படியை எதிராக கட்டாய ஆகிறது
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,இந்த ஆண்டு மொத்த பில்லிங்
 DocType: Account,Expenses Included In Valuation,செலவுகள் மதிப்பீட்டு சேர்க்கப்பட்டுள்ளது
 DocType: Employee,Provide email id registered in company,நிறுவனத்தின் பதிவு மின்னஞ்சல் ஐடி வழங்கும்
 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 +533,Item has variants.,பொருள் வகைகள் உண்டு.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,மரம் வகை
@@ -585,18 +589,18 @@
 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 +92,{0} is not a stock Item,{0} ஒரு பங்கு பொருள் அல்ல
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ஒரு பங்கு பொருள் அல்ல
 DocType: Mode of Payment Account,Default Account,முன்னிருப்பு கணக்கு
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,வாய்ப்பு முன்னணி தயாரிக்கப்படுகிறது என்றால் முன்னணி அமைக்க வேண்டும்
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,வாராந்திர ஆஃப் நாள் தேர்வு செய்க
 DocType: Production Order Operation,Planned End Time,திட்டமிட்ட நேரம்
 ,Sales Person Target Variance Item Group-Wise,விற்பனை நபர் இலக்கு வேறுபாடு பொருள் குழு வாரியாக
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,ஏற்கனவே பரிவர்த்தனை கணக்கு பேரேடு மாற்றப்பட முடியாது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,ஏற்கனவே பரிவர்த்தனை கணக்கு பேரேடு மாற்றப்பட முடியாது
 DocType: Delivery Note,Customer's Purchase Order No,வாடிக்கையாளர் கொள்முதல் ஆர்டர் இல்லை
 DocType: Employee,Cell Number,செல் எண்
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ஆட்டோ பொருள் கோரிக்கைகள் உருவாக்கிய
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,லாஸ்ட்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"நீங்கள் பத்தியில், 'ஜர்னல் ஆஃப் நுழைவு எதிராக' தற்போதைய ரசீது நுழைய முடியாது"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"நீங்கள் பத்தியில், 'ஜர்னல் ஆஃப் நுழைவு எதிராக' தற்போதைய ரசீது நுழைய முடியாது"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,சக்தி
 DocType: Opportunity,Opportunity From,வாய்ப்பு வரம்பு
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,மாத சம்பளம் அறிக்கை.
@@ -605,9 +609,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0} இருந்து: {0} வகை {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ரோ {0}: மாற்று காரணி கட்டாய ஆகிறது
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,கணக்கியல் உள்ளீடுகள் இலை முனைகளில் எதிராகவும். குழுக்களுக்கு எதிராக பதிவுகள் அனுமதி இல்லை.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,செயலிழக்க அல்லது அது மற்ற BOM கள் தொடர்பு உள்ளது என BOM ரத்துசெய்ய முடியாது
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,செயலிழக்க அல்லது அது மற்ற BOM கள் தொடர்பு உள்ளது என BOM ரத்துசெய்ய முடியாது
 DocType: Opportunity,Maintenance,பராமரிப்பு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},பொருள் தேவை கொள்முதல் ரசீது எண் {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},பொருள் தேவை கொள்முதல் ரசீது எண் {0}
 DocType: Item Attribute Value,Item Attribute Value,பொருள் மதிப்பு பண்பு
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,விற்பனை பிரச்சாரங்களை .
 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.
@@ -665,7 +669,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,விலை பட்டியல் தேர்வு
 DocType: Employee,Family Background,குடும்ப பின்னணி
 DocType: Process Payroll,Send Email,மின்னஞ்சல் அனுப்ப
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,இல்லை அனுமதி
 DocType: Company,Default Bank Account,முன்னிருப்பு வங்கி கணக்கு
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",கட்சி அடிப்படையில் வடிகட்ட தேர்ந்தெடுக்கவும் கட்சி முதல் வகை
@@ -673,7 +677,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,இலக்கங்கள்
 DocType: Item,Items with higher weightage will be shown higher,அதிக வெயிட்டேஜ் உருப்படிகள் அதிக காட்டப்படும்
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,வங்கி நல்லிணக்க விரிவாக
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,என் பொருள்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,என் பொருள்
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,எதுவும் ஊழியர்
 DocType: Purchase Order,Stopped,நிறுத்தி
 DocType: Item,If subcontracted to a vendor,ஒரு விற்பனையாளர் ஒப்பந்தக்காரர்களுக்கு என்றால்
@@ -683,6 +687,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,இப்போது அனுப்பவும்
 ,Support Analytics,ஆதரவு ஆய்வு
 DocType: Item,Website Warehouse,இணைய கிடங்கு
+DocType: Payment Reconciliation,Minimum Invoice Amount,குறைந்தபட்ச விலைப்பட்டியல் அளவு
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","கார் விலைப்பட்டியல் 05, 28 எ.கா. உருவாக்கப்படும் மாதத்தின் நாள்"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ஸ்கோர் குறைவாக அல்லது 5 சமமாக இருக்க வேண்டும்
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,சி படிவம் பதிவுகள்
@@ -692,7 +697,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;விற்பனை செய்யுமிடம்&quot; அம்சங்களை செயல்படுத்த
 DocType: Bin,Moving Average Rate,சராசரி விகிதம் நகரும்
 DocType: Production Planning Tool,Select Items,தேர்ந்தெடு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} பில் எதிராக {1} தேதியிட்ட {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} பில் எதிராக {1} தேதியிட்ட {2}
 DocType: Maintenance Visit,Completion Status,நிறைவு நிலைமை
 DocType: Sales Invoice Item,Target Warehouse,இலக்கு கிடங்கு
 DocType: Item,Allow over delivery or receipt upto this percent,இந்த சதவிகிதம் வரை விநியோக அல்லது ரசீது மீது அனுமதிக்கவும்
@@ -704,7 +709,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,தானாக நடவடிக்கைகள் சமர்ப்பிப்பு செய்தி உருவாக்கும் .
 DocType: Production Order,Item To Manufacture,உற்பத்தி பொருள்
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} நிலையை {2} ஆகிறது
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,கொடுப்பனவு ஆணை வாங்க
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,கொடுப்பனவு ஆணை வாங்க
 DocType: Sales Order Item,Projected Qty,திட்டமிட்டிருந்தது அளவு
 DocType: Sales Invoice,Payment Due Date,கொடுப்பனவு காரணமாக தேதி
 DocType: Newsletter,Newsletter Manager,செய்திமடல் மேலாளர்
@@ -728,7 +733,7 @@
 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 +304,Point-of-Sale,புள்ளி விற்பனை
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","கணக்கு நிலுவை ஏற்கனவே கடன், நீங்கள் அமைக்க அனுமதி இல்லை 'டெபிட்' என 'சமநிலை இருக்க வேண்டும்'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","கணக்கு நிலுவை ஏற்கனவே கடன், நீங்கள் அமைக்க அனுமதி இல்லை 'டெபிட்' என 'சமநிலை இருக்க வேண்டும்'"
 DocType: Account,Balance must be,இருப்பு இருக்க வேண்டும்
 DocType: Hub Settings,Publish Pricing,விலை வெளியிடு
 DocType: Notification Control,Expense Claim Rejected Message,இழப்பில் கோரிக்கை செய்தி நிராகரிக்கப்பட்டது
@@ -751,7 +756,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,நாணய மாற்று வீதம் மாஸ்டர் .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,முதல் ஆவணம் வகையை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,இந்த பராமரிப்பு பணிகள் முன் பொருள் வருகைகள் {0} ரத்து
 DocType: Salary Slip,Leave Encashment Amount,பணமாக்கல் தொகை விட்டு
@@ -769,17 +774,17 @@
 DocType: Supplier,Default Payable Accounts,இயல்புநிலை செலுத்தத்தக்க கணக்குகள்
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,பணியாளர் {0} செயலில் இல்லை அல்லது இல்லை
 DocType: Features Setup,Item Barcode,உருப்படியை பார்கோடு
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
 DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,விலைப்பட்டியல் அட்வான்ஸ் வாங்குவதற்கு
 DocType: Address,Shop,ஷாப்பிங்
 DocType: Hub Settings,Sync Now,இப்போது ஒத்திசை
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},ரோ {0}: கடன் நுழைவு இணைத்தே ஒரு {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},ரோ {0}: கடன் நுழைவு இணைத்தே ஒரு {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,இந்த முறையில் தேர்ந்தெடுக்கும் போது முன்னிருப்பு வங்கி / பண கணக்கு தானாக பிஓஎஸ் விலைப்பட்டியல் உள்ள புதுப்பிக்கப்படும்.
 DocType: Employee,Permanent Address Is,நிரந்தர முகவரி
 DocType: Production Order Operation,Operation completed for how many finished goods?,ஆபரேஷன் எத்தனை முடிக்கப்பட்ட பொருட்கள் நிறைவு?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,பிராண்ட்
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}.
 DocType: Employee,Exit Interview Details,பேட்டி விவரம் வெளியேற
 DocType: Item,Is Purchase Item,கொள்முதல் உருப்படி உள்ளது
 DocType: Journal Entry Account,Purchase Invoice,விலைப்பட்டியல் கொள்வனவு
@@ -791,7 +796,7 @@
 DocType: Salary Slip,Total in words,வார்த்தைகளில் மொத்த
 DocType: Material Request Item,Lead Time Date,நேரம் தேதி இட்டு
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,கட்டாயமாகும். ஒருவேளை செலாவணி பதிவு செய்தது
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},ரோ # {0}: பொருள் சீரியல் இல்லை குறிப்பிடவும் {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},ரோ # {0}: பொருள் சீரியல் இல்லை குறிப்பிடவும் {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","&#39;தயாரிப்பு மூட்டை&#39; பொருட்களை, சேமிப்புக் கிடங்கு, தொ.எ. மற்றும் தொகுதி இல்லை &#39;பேக்கிங்கை பட்டியலில் மேஜையிலிருந்து கருதப்படுகிறது. கிடங்கு மற்றும் தொகுதி இல்லை எந்த &#39;தயாரிப்பு மூட்டை&#39; உருப்படியை அனைத்து பொதி பொருட்களை அதே இருந்தால், அந்த மதிப்புகள் முக்கிய பொருள் அட்டவணை உள்ளிட்ட முடியும், மதிப்புகள் மேஜை &#39;&#39; பட்டியல் பொதி &#39;நகலெடுக்கப்படும்."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,வாடிக்கையாளர்களுக்கு ஏற்றுமதி.
 DocType: Purchase Invoice Item,Purchase Order Item,ஆர்டர் பொருள் வாங்க
@@ -800,14 +805,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,மாறுபாடு
 ,Company Name,நிறுவனத்தின் பெயர்
 DocType: SMS Center,Total Message(s),மொத்த செய்தி (கள்)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,காசோலை டெபாசிட் அங்கு வங்கி கணக்கு தலைவர் தேர்வு.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,பயனர் நடவடிக்கைகளில் விலை பட்டியல் விகிதம் திருத்த அனுமதி
 DocType: Pricing Rule,Max Qty,மேக்ஸ் அளவு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,இரசாயன
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,அனைத்து பொருட்களும் ஏற்கனவே இந்த உத்தரவு க்கு மாற்றப்பட்டது.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,அனைத்து பொருட்களும் ஏற்கனவே இந்த உத்தரவு க்கு மாற்றப்பட்டது.
 DocType: Process Payroll,Select Payroll Year and Month,சம்பளப்பட்டியல் ஆண்டு மற்றும் மாத தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",அதற்கான குழு (பொதுவாக நிதிகள் விண்ணப்ப&gt; நடப்பு சொத்துக்கள்&gt; வங்கி கணக்குகள் சென்று வகை) குழந்தை சேர் கிளிக் செய்வதன் மூலம் (ஒரு புதிய கணக்கு உருவாக்க &quot;வங்கி&quot;
 DocType: Workstation,Electricity Cost,மின்சார செலவு
@@ -821,10 +827,10 @@
 DocType: SMS Center,All Lead (Open),அனைத்து முன்னணி (திறந்த)
 DocType: Purchase Invoice,Get Advances Paid,கட்டண முன்னேற்றங்கள் கிடைக்கும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,உங்கள் படம் இணைக்கவும்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,செய்ய
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,செய்ய
 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 +3,My Cart,என் வண்டியில்
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,என் வண்டியில்
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,திறந்து அளவு
@@ -843,10 +849,10 @@
 DocType: POS Profile,Cash/Bank Account,பண / வங்கி கணக்கு
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,அளவு அல்லது மதிப்பு எந்த மாற்றமும் நீக்கப்பட்ட விடயங்கள்.
 DocType: Delivery Note,Delivery To,வழங்கும்
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
 DocType: Production Planning Tool,Get Sales Orders,விற்பனை ஆணைகள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} எதிர்மறை இருக்க முடியாது
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,தள்ளுபடி
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,தள்ளுபடி
 DocType: Features Setup,Purchase Discounts,கொள்முதல் தள்ளுபடி
 DocType: Workstation,Wages,ஊதியங்கள்
 DocType: Time Log,Will be updated only if Time Log is 'Billable',நேரம் பரிசீலனை &#39;பில்&#39; என்றால் ஒரே மேம்படுத்தப்பட்ட
@@ -871,7 +877,7 @@
 DocType: Tax Rule,Shipping State,கப்பல் மாநிலம்
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,பொருள் பொத்தானை 'வாங்குதல் ரசீதுகள் இருந்து விடயங்கள் பெறவும்' பயன்படுத்தி சேர்க்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,விற்பனை செலவு
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,ஸ்டாண்டர்ட் வாங்குதல்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,ஸ்டாண்டர்ட் வாங்குதல்
 DocType: GL Entry,Against,எதிராக
 DocType: Item,Default Selling Cost Center,இயல்புநிலை விற்பனை செலவு மையம்
 DocType: Sales Partner,Implementation Partner,செயல்படுத்தல் வரன்வாழ்க்கை துணை
@@ -913,6 +919,7 @@
 DocType: Sales Partner,Distributor,பகிர்கருவி
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,வண்டியில் கப்பல் விதி
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,உத்தரவு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',அமைக்க மேலும் கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும் &#39;தயவு செய்து
 ,Ordered Items To Be Billed,கணக்கில் வேண்டும் உத்தரவிட்டது உருப்படிகள்
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,ரேஞ்ச் குறைவாக இருக்க வேண்டும் இருந்து விட வரையறைக்கு
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,நேரம் பதிவுகள் தேர்ந்தெடுத்து ஒரு புதிய விற்பனை விலைப்பட்டியல் உருவாக்க சமர்ப்பிக்கவும்.
@@ -922,13 +929,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,இந்த நேரம் புகுபதிகை தொகுதி படியாக.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,வாய்ப்பை உருவாக்க
 DocType: Salary Slip,Leave Without Pay,சம்பளமில்லா விடுப்பு
-DocType: Supplier,Communications,தகவல்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,கொள்ளளவு திட்டமிடுதல் பிழை
 ,Trial Balance for Party,கட்சி சோதனை இருப்பு
 DocType: Lead,Consultant,பிறர் அறிவுரை வேண்டுபவர்
 DocType: Salary Slip,Earnings,வருவாய்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,முடிந்தது பொருள் {0} உற்பத்தி வகை நுழைவு உள்ளிட்ட
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,திறந்து கணக்கு இருப்பு
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,முடிந்தது பொருள் {0} உற்பத்தி வகை நுழைவு உள்ளிட்ட
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,திறந்து கணக்கு இருப்பு
 DocType: Sales Invoice Advance,Sales Invoice Advance,விற்பனை விலைப்பட்டியல் முன்பணம்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,கேட்டு எதுவும்
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' உண்மையான தொடக்க தேதி ' உண்மையான முடிவு தேதி ' விட முடியாது
@@ -970,7 +976,7 @@
 DocType: Global Defaults,Current Fiscal Year,தற்போதைய நிதியாண்டு
 DocType: Global Defaults,Disable Rounded Total,வட்டமான மொத்த முடக்கு
 DocType: Lead,Call,அழைப்பு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' பதிவுகள் ' காலியாக இருக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,' பதிவுகள் ' காலியாக இருக்க முடியாது
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},பிரதி வரிசையில் {0} அதே {1}
 ,Trial Balance,விசாரணை இருப்பு
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ஊழியர் அமைத்தல்
@@ -982,9 +988,9 @@
 DocType: Contact,User ID,பயனர் ஐடி
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,காட்சி லெட்ஜர்
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,மிகமுந்திய
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
 DocType: Production Order,Manufacture against Sales Order,விற்பனை அமைப்புக்கு எதிராக உற்பத்தி
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,உலகம் முழுவதும்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,ஒட்டு மொத்த ஊதியம் / சம்பளம்
@@ -1014,7 +1020,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},உறைந்த கணக்கு திருத்த அதிகாரம் இல்லை {0}
 DocType: Journal Entry,Get Outstanding Invoices,சிறந்த பற்றுச்சீட்டுகள் கிடைக்கும்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,விற்பனை ஆணை {0} தவறானது
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1027,13 +1033,13 @@
 DocType: Employee,Place of Issue,இந்த இடத்தில்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ஒப்பந்த
 DocType: Email Digest,Add Quote,ஆனால் சேர்க்கவும்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},மொறட்டுவ பல்கலைகழகம் தேவையான மொறட்டுவ பல்கலைகழகம் Coversion காரணி: {0} உருப்படியை: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},மொறட்டுவ பல்கலைகழகம் தேவையான மொறட்டுவ பல்கலைகழகம் Coversion காரணி: {0} உருப்படியை: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,மறைமுக செலவுகள்
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ரோ {0}: அளவு கட்டாய ஆகிறது
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,விவசாயம்
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,உங்கள் தயாரிப்புகள் அல்லது சேவைகள்
 DocType: Mode of Payment,Mode of Payment,கட்டணம் செலுத்தும் முறை
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,இந்த ஒரு ரூட் உருப்படியை குழு மற்றும் திருத்த முடியாது .
 DocType: Journal Entry Account,Purchase Order,ஆர்டர் வாங்க
 DocType: Warehouse,Warehouse Contact Info,சேமிப்பு கிடங்கு தொடர்பு தகவல்
@@ -1042,8 +1048,8 @@
 DocType: Email Digest,Annual Income,ஆண்டு வருமானம்
 DocType: Serial No,Serial No Details,தொடர் எண் விவரம்
 DocType: Purchase Invoice Item,Item Tax Rate,உருப்படியை வரி விகிதம்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,பொருள் {0} ஒரு துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,மூலதன கருவிகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","விலை விதி முதல் பொருள், பொருள் பிரிவு அல்லது பிராண்ட் முடியும், துறையில் 'விண்ணப்பிக்க' அடிப்படையில் தேர்வு செய்யப்படுகிறது."
@@ -1053,7 +1059,7 @@
 DocType: Appraisal Goal,Goal,இலக்கு
 DocType: Sales Invoice Item,Edit Description,திருத்த விளக்கம்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,எதிர்பார்த்த வழங்குதல் தேதி திட்டமிட்ட தொடக்க தேதி விட குறைந்த உள்ளது.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,சப்ளையர்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,சப்ளையர்
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,அமைத்தல் கணக்கு வகை பரிமாற்றங்கள் இந்த கணக்கு தேர்வு உதவுகிறது.
 DocType: Purchase Invoice,Grand Total (Company Currency),கிராண்ட் மொத்த (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,மொத்த வெளிச்செல்லும்
@@ -1066,7 +1072,7 @@
 DocType: Journal Entry,Journal Entry,பத்திரிகை நுழைவு
 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 +427,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,இந்த முன்னொட்டு கடந்த உருவாக்கப்பட்ட பரிவர்த்தனை எண்ணிக்கை
@@ -1098,7 +1104,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","தொடர்புகள் செய்திமடல்கள், வழிவகுக்கிறது."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,செயல்பாடுகள் காலியாக இருக்கக் கூடாது.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,செயல்பாடுகள் காலியாக இருக்கக் கூடாது.
 ,Delivered Items To Be Billed,கட்டணம் வழங்கப்படும் பொருட்கள்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,கிடங்கு சீரியல் எண் மாற்றப்பட கூடாது
 DocType: Authorization Rule,Average Discount,சராசரி தள்ளுபடி
@@ -1113,7 +1119,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},இருந்து {0} | {1} {2}
 DocType: BOM Operation,Operation Description,அறுவை சிகிச்சை விளக்கம்
 DocType: Item,Will also apply to variants,கூட வகைகளில் விண்ணப்பிக்க
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,நிதியாண்டு தொடக்க தேதி மற்றும் நிதியாண்டு சேமிக்கப்படும் முறை நிதி ஆண்டு இறுதியில் தேதி மாற்ற முடியாது.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,நிதியாண்டு தொடக்க தேதி மற்றும் நிதியாண்டு சேமிக்கப்படும் முறை நிதி ஆண்டு இறுதியில் தேதி மாற்ற முடியாது.
 DocType: Quotation,Shopping Cart,வணிக வண்டி
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg: டெய்லி வெளிச்செல்லும்
 DocType: Pricing Rule,Campaign,பிரச்சாரம்
@@ -1124,7 +1130,8 @@
 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 +211,Stock Entries already created for Production Order ,ஏற்கனவே உற்பத்தி ஆணை உருவாக்கப்பட்ட பங்கு பதிவுகள்
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ஏற்கனவே உற்பத்தி ஆணை உருவாக்கப்பட்ட பங்கு பதிவுகள்
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,நிலையான சொத்து நிகர மாற்றம்
 DocType: Leave Control Panel,Leave blank if considered for all designations,அனைத்து வடிவ கருத்தில் இருந்தால் வெறுமையாக
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},அதிகபட்சம்: {0}
@@ -1136,7 +1143,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,கணக்கு விளக்கப்படம்
 DocType: Material Request,Terms and Conditions Content,நிபந்தனைகள் உள்ளடக்கம்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
 DocType: Maintenance Visit,Unscheduled,திட்டமிடப்படாத
 DocType: Employee,Owned,சொந்தமானது
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,சம்பளமில்லா விடுப்பு பொறுத்தது
@@ -1174,7 +1181,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,துணை சபைகளின்
 DocType: Shipping Rule Condition,To Value,மதிப்பு
 DocType: Supplier,Stock Manager,பங்கு மேலாளர்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},மூல கிடங்கில் வரிசையில் கட்டாய {0}
+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 +581,Packing Slip,ஸ்லிப் பொதி
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,அலுவலகத்திற்கு வாடகைக்கு
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,அமைப்பு எஸ்எம்எஸ் வாயில் அமைப்புகள்
@@ -1182,10 +1189,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,இல்லை முகவரி இன்னும் கூறினார்.
 DocType: Workstation Working Hour,Workstation Working Hour,பணிநிலையம் வேலை செய்யும் நேரம்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,ஆய்வாளர்
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ரோ {0}: ஒதுக்கப்பட்டுள்ள தொகை {1} குறைவாக இருக்க வேண்டும் அல்லது கூட்டுத் தொழில் தொகை சமம் வேண்டும் {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ரோ {0}: ஒதுக்கப்பட்டுள்ள தொகை {1} குறைவாக இருக்க வேண்டும் அல்லது கூட்டுத் தொழில் தொகை சமம் வேண்டும் {2}
 DocType: Item,Inventory,சரக்கு
 DocType: Features Setup,"To enable ""Point of Sale"" view",பார்வை &quot;விற்பனை செய்யுமிடம்&quot; செயல்படுத்த
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,கொடுப்பனவு காலியாக வண்டி முடியாது
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,கொடுப்பனவு காலியாக வண்டி முடியாது
 DocType: Item,Sales Details,விற்பனை விவரம்
 DocType: Opportunity,With Items,பொருட்களை கொண்டு
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,அளவு உள்ள
@@ -1200,10 +1207,11 @@
 DocType: Cost Center,Parent Cost Center,பெற்றோர் செலவு மையம்
 DocType: Sales Invoice,Source,மூல
 DocType: Leave Type,Is Leave Without Pay,சம்பளமில்லா விடுப்பு
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,கொடுப்பனவு அட்டவணை காணப்படவில்லை பதிவுகள்
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,கொடுப்பனவு அட்டவணை காணப்படவில்லை பதிவுகள்
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,நிதி ஆண்டு தொடக்கம் தேதி
 DocType: Employee External Work History,Total Experience,மொத்த அனுபவம்
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,மூட்டை சீட்டு (கள்) ரத்து
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,மூட்டை சீட்டு (கள்) ரத்து
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,முதலீடு இருந்து பண பரிமாற்ற
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,சரக்கு மற்றும் அனுப்புதல் கட்டணம்
 DocType: Material Request Item,Sales Order No,விற்பனை ஆணை இல்லை
 DocType: Item Group,Item Group Name,உருப்படியை குழு பெயர்
@@ -1211,12 +1219,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,உற்பத்தி இடமாற்றத் பொருட்கள்
 DocType: Pricing Rule,For Price List,விலை பட்டியல்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,நிறைவேற்று தேடல்
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","உருப்படியை கொள்முதல் விகிதம்: {0} கிடைக்கவில்லை, கணக்கியல் உள்ளீடு (இழப்பில்) பதிவு செய்ய தேவைப்படும். ஒரு கொள்முதல் விலை பட்டியல் எதிரான பொருளின் விலை குறிப்பிட கொள்ளவும்."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","உருப்படியை கொள்முதல் விகிதம்: {0} கிடைக்கவில்லை, கணக்கியல் உள்ளீடு (இழப்பில்) பதிவு செய்ய தேவைப்படும். ஒரு கொள்முதல் விலை பட்டியல் எதிரான பொருளின் விலை குறிப்பிட கொள்ளவும்."
 DocType: Maintenance Schedule,Schedules,கால அட்டவணைகள்
 DocType: Purchase Invoice Item,Net Amount,நிகர
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM விரிவாக இல்லை
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),கூடுதல் தள்ளுபடி தொகை (நிறுவனத்தின் நாணயம்)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},பிழை: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},பிழை: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,கணக்கு பட்டியலில் இருந்து புதிய கணக்கை உருவாக்கு .
 DocType: Maintenance Visit,Maintenance Visit,பராமரிப்பு வருகை
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,வாடிக்கையாளர்> வாடிக்கையாளர் குழு> மண்டலம்
@@ -1242,7 +1250,7 @@
 DocType: Sales Partner,Sales Partner Target,விற்பனை வரன்வாழ்க்கை துணை இலக்கு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} பைனான்ஸ் உள்நுழைய மட்டும் நாணய முடியும்: {1}
 DocType: Pricing Rule,Pricing Rule,விலை விதி
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ஆணை வாங்க பொருள் வேண்டுதல்
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ஆணை வாங்க பொருள் வேண்டுதல்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},ரோ # {0}: திரும்பினார் பொருள் {1} இல்லை நிலவும் {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,வங்கி கணக்குகள்
 ,Bank Reconciliation Statement,வங்கி நல்லிணக்க அறிக்கை
@@ -1250,11 +1258,11 @@
 ,POS,பிஓஎஸ்
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,ஆரம்ப இருப்பு இருப்பு
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} ஒரு முறை மட்டுமே தோன்றும் வேண்டும்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},மேலும் tranfer அனுமதி இல்லை {0} விட {1} கொள்முதல் ஆணை எதிராக {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},இலைகள் வெற்றிகரமாக ஒதுக்கப்பட்ட {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,மூட்டை உருப்படிகள் எதுவும் இல்லை
 DocType: Shipping Rule Condition,From Value,மதிப்பு இருந்து
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,உற்பத்தி அளவு கட்டாய ஆகிறது
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,உற்பத்தி அளவு கட்டாய ஆகிறது
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,வங்கி பிரதிபலித்தது
 DocType: Quality Inspection Reading,Reading 4,4 படித்தல்
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,நிறுவனத்தின் செலவினம் கூற்றுக்கள்.
@@ -1266,33 +1274,34 @@
 ,Material Requests for which Supplier Quotations are not created,வழங்குபவர் மேற்கோள்கள் உருவாக்கப்பட்ட எந்த பொருள் கோரிக்கைகள்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,நீங்கள் விடுப்பு விண்ணப்பிக்கும் எந்த நாள் (கள்) விடுமுறை. நீங்கள் விடுப்பு விண்ணப்பிக்க வேண்டும்.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,பார்கோடு பயன்படுத்தி பொருட்களை கண்காணிக்க வேண்டும். நீங்கள் உருப்படியின் பார்கோடு ஸ்கேனிங் மூலம் வினியோகம் குறிப்பு மற்றும் விற்பனை விலைப்பட்டியல் உள்ள பொருட்களை நுழைய முடியும்.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,மார்க் வழங்கப்படுகிறது என
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,மார்க் வழங்கப்படுகிறது என
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,விலைப்பட்டியல் செய்ய
 DocType: Dependent Task,Dependent Task,தங்கிவாழும் பணி
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,நிறுத்து நினைவூட்டல்கள்
 DocType: SMS Center,Receiver List,ரிசீவர் பட்டியல்
 DocType: Payment Tool Detail,Payment Amount,கட்டணம் அளவு
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,உட்கொள்ளுகிறது தொகை
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} காண்க
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} காண்க
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,பண நிகர மாற்றம்
 DocType: Salary Structure Deduction,Salary Structure Deduction,சம்பளம் அமைப்பு பொருத்தியறிதல்
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {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 +185,Quantity must not be more than {0},அளவு அதிகமாக இருக்க கூடாது {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),வயது (நாட்கள்)
 DocType: Quotation Item,Quotation Item,மேற்கோள் பொருள்
 DocType: Account,Account Name,கணக்கு பெயர்
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,தேதி முதல் இன்று வரை விட முடியாது
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,தேதி முதல் இன்று வரை விட முடியாது
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,தொடர் இல {0} அளவு {1} ஒரு பகுதியை இருக்க முடியாது
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,வழங்குபவர் வகை மாஸ்டர் .
 DocType: Purchase Order Item,Supplier Part Number,வழங்குபவர் பாகம் எண்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,மாற்று விகிதம் 0 அல்லது 1 இருக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,மாற்று விகிதம் 0 அல்லது 1 இருக்க முடியாது
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,கொள்முதல் ரசீது {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,கொள்முதல் ரசீது {0} சமர்ப்பிக்க
 DocType: Company,Default Payable Account,இயல்புநிலை செலுத்த வேண்டிய கணக்கு
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","அத்தகைய கப்பல் விதிகள், விலை பட்டியல் முதலியன போன்ற ஆன்லைன் வணிக வண்டி அமைப்புகள்"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% கூறப்பட்டு
@@ -1304,15 +1313,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,என் சிக்கல்கள்
 DocType: BOM Item,BOM Item,BOM பொருள்
 DocType: Appraisal,For Employee,பணியாளர் தேவை
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,ரோ {0}: சப்ளையர் எதிராக அட்வான்ஸ் பற்று
 DocType: Company,Default Values,இயல்புநிலை கலாச்சாரம்
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,ரோ {0}: கட்டணம் அளவு எதிர்மறையாக இருக்க முடியாது
 DocType: Expense Claim,Total Amount Reimbursed,மொத்த அளவு திரும்ப
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},வழங்குபவர் எதிராக விலைப்பட்டியல் {0} தேதியிட்ட {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},வழங்குபவர் எதிராக விலைப்பட்டியல் {0} தேதியிட்ட {1}
 DocType: Customer,Default Price List,முன்னிருப்பு விலை பட்டியல்
 DocType: Payment Reconciliation,Payments,பணம்
 DocType: Budget Detail,Budget Allocated,பட்ஜெட் ஒதுக்கப்பட்ட
 DocType: Journal Entry,Entry Type,நுழைவு வகை
 ,Customer Credit Balance,வாடிக்கையாளர் கடன் இருப்பு
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,செலுத்தத்தக்க கணக்குகள் நிகர மாற்றம்
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,உங்கள் மின்னஞ்சல் ஐடி சரிபார்க்கவும்
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',' Customerwise தள்ளுபடி ' தேவையான வாடிக்கையாளர்
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,மேம்படுத்தல் வங்கி பணம் பத்திரிகைகள் மூலம் செல்கிறது.
@@ -1333,7 +1344,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,வண்டியில் இயக்கு
 DocType: Employee,Permanent Address,நிரந்தர முகவரி
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,பொருள் {0} ஒரு சேவை பொருளாக இருக்க வேண்டும்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",மொத்தம் விட \ {0} {1} அதிகமாக இருக்க முடியும் எதிராக பணம் முன்கூட்டியே {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,உருப்படியை குறியீடு தேர்வு செய்க
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),சம்பளமில்லா விடுப்பு க்கான பொருத்தியறிதல் குறைக்க (LWP)
@@ -1350,18 +1361,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,ஒரு பொருள் ஒரே யூனிட்.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',நேரம் பதிவு தொகுப்பு {0} ' Submitted'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',நேரம் பதிவு தொகுப்பு {0} ' Submitted'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,"ஒவ்வொரு பங்கு இயக்கம் , பைனான்ஸ் உள்ளீடு செய்ய"
 DocType: Leave Allocation,Total Leaves Allocated,மொத்த இலைகள் ஒதுக்கப்பட்ட
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},ரோ இல்லை தேவையான கிடங்கு {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},ரோ இல்லை தேவையான கிடங்கு {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,செல்லுபடியாகும் நிதி ஆண்டின் தொடக்க மற்றும் முடிவு தேதிகளை உள்ளிடவும்
 DocType: Employee,Date Of Retirement,ஓய்வு தேதி
 DocType: Upload Attendance,Get Template,வார்ப்புரு கிடைக்கும்
 DocType: Address,Postal,தபால் அலுவலகம் சார்ந்த
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ஒரு வாடிக்கையாளர் குழு அதே பெயரில் வாடிக்கையாளர் பெயர் மாற்ற அல்லது வாடிக்கையாளர் குழு பெயர்மாற்றம் செய்க
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,முதல் {0} தேர்ந்தெடுக்கவும்.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},உரை {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,முதல் {0} தேர்ந்தெடுக்கவும்.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},உரை {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,புதிய தொடர்பு
 DocType: Territory,Parent Territory,பெற்றோர் மண்டலம்
 DocType: Quality Inspection Reading,Reading 2,2 படித்தல்
 DocType: Stock Entry,Material Receipt,பொருள் ரசீது
@@ -1369,7 +1381,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},கட்சி டைப் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கு தேவையான {0}
 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 +210,Quantity required for Item {0} in row {1},உருப்படி தேவையான அளவு {0} வரிசையில் {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},உருப்படி தேவையான அளவு {0} வரிசையில் {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},அளவு பொருள் உள்ளது என கிடங்கு {0} நீக்க முடியாது {1}
 DocType: Quotation,Order Type,வரிசை வகை
 DocType: Purchase Invoice,Notification Email Address,அறிவிப்பு மின்னஞ்சல் முகவரி
@@ -1386,15 +1398,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,பல பத்திகள். அறிக்கை ஏற்றுமதி மற்றும் ஒரு விரிதாள் பயன்பாட்டை பயன்படுத்தி அச்சிட.
 DocType: Sales 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 +152,Main,முதன்மை
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,முதன்மை
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,மாற்று
 DocType: Naming Series,Set prefix for numbering series on your transactions,உங்கள் நடவடிக்கைகள் மீது தொடர் எண்ணுவதற்கான முன்னொட்டு அமைக்க
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,நிறுத்தி பொருட்டு ரத்து செய்ய முடியாது . ரத்து செய்ய தடை இல்லாத .
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,செய்ய கொள்முதல் ஆணை
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,செய்ய கொள்முதல் ஆணை
 DocType: SMS Center,Send To,அனுப்பு
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ஒதுக்கப்பட்டுள்ள தொகை
@@ -1407,7 +1419,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,கிடங்கு மற்றும் குறிப்பு
 DocType: Supplier,Statutory info and other general information about your Supplier,சட்டப்பூர்வ தகவல் மற்றும் உங்கள் சப்ளையர் பற்றி மற்ற பொது தகவல்
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,முகவரிகள்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,ஜர்னல் எதிராக நுழைவு {0} எந்த வேறொன்றும் {1} நுழைவு இல்லை
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,ஜர்னல் எதிராக நுழைவு {0} எந்த வேறொன்றும் {1} நுழைவு இல்லை
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},நகல் சீரியல் இல்லை உருப்படி உள்ளிட்ட {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ஒரு கப்பல் ஆட்சிக்கு ஒரு நிலையில்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,பொருள் உத்தரவு அனுமதி இல்லை.
@@ -1416,10 +1428,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,கணக்கு நாணய கடன் தொகை
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,உற்பத்தி நேரம் மற்றும் பதிவுகள்.
 DocType: Item,Apply Warehouse-wise Reorder Level,கிடங்கு வாரியான மறுவரிசைப்படுத்துக நிலை விண்ணப்பிக்கவும்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
 DocType: Authorization Control,Authorization Control,அங்கீகாரம் கட்டுப்பாடு
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ரோ # {0}: கிடங்கு நிராகரிக்கப்பட்டது நிராகரித்தது பொருள் எதிராக கட்டாயமாகும் {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,பணிகளை நேரம் புகுபதிகை.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,கொடுப்பனவு
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,கொடுப்பனவு
 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},அதிகபட்ச பொருள் கோரிக்கை {0} உருப்படி {1} எதிராகவிற்பனை ஆணை {2}
 DocType: Employee,Salutation,வணக்கம் தெரிவித்தல்
@@ -1436,7 +1449,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,இணை
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,பொருள் {0} ஒரு தொடர் பொருள் அல்ல
 DocType: SMS Center,Create Receiver List,பெறுநர் பட்டியல் உருவாக்க
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,காலாவதியான
 DocType: Packing Slip,To Package No.,இல்லை தொகுப்பு வேண்டும்
 DocType: Warranty Claim,Issue Date,பிரச்சினை தேதி
 DocType: Activity Cost,Activity Cost,நடவடிக்கை செலவு
@@ -1474,7 +1486,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Achieved
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,மண்டலம் / வாடிக்கையாளர்
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,"உதாரணமாக, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,விற்பனை பொருள் ஆகும்
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,பொருள் குழு மரம்
@@ -1486,7 +1498,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} உருவாக்கப்பட்டது
 DocType: Delivery Note Item,Against Sales Order,விற்னையாளர் எதிராக
 ,Serial No Status,தொடர் இல்லை நிலைமை
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,பொருள் அட்டவணை காலியாக இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,பொருள் அட்டவணை காலியாக இருக்க முடியாது
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","ரோ {0}: அமைக்க {1} காலகட்டம், இருந்து மற்றும் தேதி \
  இடையே வேறுபாடு அதிகமாக அல்லது சமமாக இருக்க வேண்டும், {2}"
@@ -1496,7 +1508,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,கடமைகள் மற்றும் வரி
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,வழங்கப்பட்ட அளவு
@@ -1511,7 +1523,7 @@
 DocType: Installation Note,Installation Time,நிறுவல் நேரம்
 DocType: Sales Invoice,Accounting Details,கணக்கு விவரங்கள்
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்கு
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ரோ # {0}: ஆபரேஷன் {1} உற்பத்தி முடிந்ததும் பொருட்களின் {2} கொத்தமல்லி நிறைவு இல்லை ஒழுங்கு # {3}. நேரம் பதிவுகள் வழியாக அறுவை சிகிச்சை நிலையை மேம்படுத்த தயவு செய்து
+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,ரோ # {0}: ஆபரேஷன் {1} உற்பத்தி முடிந்ததும் பொருட்களின் {2} கொத்தமல்லி நிறைவு இல்லை ஒழுங்கு # {3}. நேரம் பதிவுகள் வழியாக அறுவை சிகிச்சை நிலையை மேம்படுத்த தயவு செய்து
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,முதலீடுகள்
 DocType: Issue,Resolution Details,தீர்மானம் விவரம்
 DocType: Quality Inspection Reading,Acceptance Criteria,ஏற்று வரையறைகள்
@@ -1527,7 +1539,7 @@
 DocType: Holiday List,Clear Table,தெளிவான அட்டவணை
 DocType: Features Setup,Brands,பிராண்ட்கள்
 DocType: C-Form Invoice Detail,Invoice No,இல்லை விலைப்பட்டியல்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,கொள்முதல் ஆணை இருந்து
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,கொள்முதல் ஆணை இருந்து
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,இதற்கான செலவு மதிப்பீடு
 ,Customer Addresses And Contacts,வாடிக்கையாளர் முகவரிகள் மற்றும் தொடர்புகள்
@@ -1544,7 +1556,7 @@
 ,Maintenance Schedules,பராமரிப்பு அட்டவணை
 ,Quotation Trends,மேற்கோள் போக்குகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},உருப்படி உருப்படியை மாஸ்டர் குறிப்பிடப்பட்டுள்ளது பொருள் பிரிவு {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
 DocType: Shipping Rule Condition,Shipping Amount,கப்பல் தொகை
 ,Pending Amount,நிலுவையில் தொகை
 DocType: Purchase Invoice Item,Conversion Factor,மாற்ற காரணி
@@ -1561,12 +1573,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial கணக்குகளின் மரம் .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,அனைத்து பணியாளர் வகையான கருதப்படுகிறது என்றால் வெறுமையாக
 DocType: Landed Cost Voucher,Distribute Charges Based On,விநியோகிக்க குற்றச்சாட்டுக்களை அடிப்படையாகக் கொண்டு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,பொருள் {1} சொத்து பொருள் என கணக்கு {0} வகை ' நிலையான சொத்து ' இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,பொருள் {1} சொத்து பொருள் என கணக்கு {0} வகை ' நிலையான சொத்து ' இருக்க வேண்டும்
 DocType: HR Settings,HR Settings,அலுவலக அமைப்புகள்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,செலவு கோரும் அனுமதிக்காக நிலுவையில் உள்ளது . மட்டுமே செலவு அப்ரூவரான நிலையை மேம்படுத்த முடியும் .
 DocType: Purchase Invoice,Additional Discount Amount,கூடுதல் தள்ளுபடி தொகை
 DocType: Leave Block List Allow,Leave Block List Allow,பிளாக் பட்டியல் அனுமதி விட்டு
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr வெற்று இடைவெளி அல்லது இருக்க முடியாது
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr வெற்று இடைவெளி அல்லது இருக்க முடியாது
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,விளையாட்டு
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,உண்மையான மொத்த
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,அலகு
@@ -1578,6 +1590,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} இப்போது இயல்புநிலை நிதியாண்டு ஆகிறது . விளைவு எடுக்க மாற்றம் உங்களது உலாவி புதுப்பிக்கவும் .
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,செலவு சட்டக்கோரல்கள்
 DocType: Issue,Support,ஆதரவு
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,நம்மவர்
 ,BOM Search,"BOM, தேடல்"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),நிறைவு (+ கூட்டுத்தொகை திறக்கப்படவுள்ளது)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,நிறுவனத்தின் நாணய குறிப்பிடவும்
@@ -1589,13 +1602,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},மொறட்டுவ பல்கலைகழகம் மாற்ற காரணி வரிசையில் தேவைப்படுகிறது {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},இசைவு தேதி வரிசையில் காசோலை தேதி முன் இருக்க முடியாது {0}
 DocType: Salary Slip,Deduction,கழித்தல்
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},பொருள் விலை சேர்க்கப்பட்டது {0} விலை பட்டியல் உள்ள {1}
 DocType: Address Template,Address Template,முகவரி டெம்ப்ளேட்
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,இந்த வியாபாரி பணியாளர் Id உள்ளிடவும்
 DocType: Territory,Classification of Customers by region,பிராந்தியம் மூலம் வாடிக்கையாளர்கள் பிரிவுகள்
 DocType: Project,% Tasks Completed,% முடிக்கப்பட்ட பணிகள்
 DocType: Project,Gross Margin,கிராஸ் மார்ஜின்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,முதல் உற்பத்தி பொருள் உள்ளிடவும்
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,ஊனமுற்ற பயனர்
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ஊனமுற்ற பயனர்
 DocType: Opportunity,Quotation,மேற்கோள்
 DocType: Salary Slip,Total Deduction,மொத்த பொருத்தியறிதல்
 DocType: Quotation,Maintenance User,பராமரிப்பு பயனர்
@@ -1604,7 +1618,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},எச்சரிக்கை: இணைப்பு தவறான SSL சான்றிதழ் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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,தள்ளு
@@ -1614,12 +1628,12 @@
 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,எனவே அளவு
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","பங்கு உள்ளீடுகளை கிடங்கில் எதிரான உள்ளன {0}, எனவே நீங்கள் மீண்டும் ஒதுக்க அல்லது கிடங்கு மாற்ற முடியாது"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","பங்கு உள்ளீடுகளை கிடங்கில் எதிரான உள்ளன {0}, எனவே நீங்கள் மீண்டும் ஒதுக்க அல்லது கிடங்கு மாற்ற முடியாது"
 DocType: Appraisal,Calculate Total Score,மொத்த மதிப்பெண் கணக்கிட
 DocType: Supplier Quotation,Manufacturing Manager,தயாரிப்பு மேலாளர்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},தொடர் இல {0} வரை உத்தரவாதத்தை கீழ் உள்ளது {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,தொகுப்புகளை கொண்டு டெலிவரி குறிப்பு பிரிந்தது.
-apps/erpnext/erpnext/hooks.py +68,Shipments,படுவதற்கு
+apps/erpnext/erpnext/hooks.py +69,Shipments,படுவதற்கு
 DocType: Purchase Order Item,To be delivered to customer,வாடிக்கையாளர் வழங்க வேண்டும்
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,நேரம் பதிவு நிலைமை சமர்ப்பிக்க வேண்டும்.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,தொ.எ. {0} எந்த கிடங்கு சொந்தம் இல்லை
@@ -1639,10 +1653,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,நிறுவனத்தின் தேர்ந்தெடுக்கவும் ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,அனைத்து துறைகளில் கருதப்படுகிறது என்றால் வெறுமையாக
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","வேலைவாய்ப்பு ( நிரந்தர , ஒப்பந்த , பயிற்சி முதலியன) வகைகள் ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
 DocType: Currency Exchange,From Currency,நாணய இருந்து
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","குறைந்தது ஒரு வரிசையில் ஒதுக்கப்பட்டுள்ள தொகை, விலைப்பட்டியல் வகை மற்றும் விலைப்பட்டியல் எண் தேர்ந்தெடுக்கவும்"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},பொருள் தேவை விற்பனை ஆணை {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","குறைந்தது ஒரு வரிசையில் ஒதுக்கப்பட்டுள்ள தொகை, விலைப்பட்டியல் வகை மற்றும் விலைப்பட்டியல் எண் தேர்ந்தெடுக்கவும்"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},பொருள் தேவை விற்பனை ஆணை {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,அமைப்பு பிரதிபலித்தது
 DocType: Purchase Invoice Item,Rate (Company Currency),விகிதம் (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,மற்றவை
@@ -1658,7 +1672,7 @@
 DocType: Quality Inspection,In Process,செயல்முறை உள்ள
 DocType: Authorization Rule,Itemwise Discount,இனவாரியாக தள்ளுபடி
 DocType: Purchase Order Item,Reference Document Type,குறிப்பு ஆவண வகை
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} விற்பனை ஆணை எதிரான {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} விற்பனை ஆணை எதிரான {1}
 DocType: Account,Fixed Asset,நிலையான சொத்து
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,தொடர் சரக்கு
 DocType: Activity Type,Default Billing Rate,இயல்புநிலை பில்லிங் மதிப்பீடு
@@ -1668,7 +1682,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,செலுத்துதல் விற்பனை ஆணை
 DocType: Expense Claim Detail,Expense Claim Detail,இழப்பில் உரிமைகோரல் விவரம்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,நேரம் பதிவுகள் உருவாக்கப்பட்ட:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,சரியான கணக்கில் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,சரியான கணக்கில் தேர்ந்தெடுக்கவும்
 DocType: Item,Weight UOM,எடை மொறட்டுவ பல்கலைகழகம்
 DocType: Employee,Blood Group,குருதி பகுப்பினம்
 DocType: Purchase Invoice Item,Page Break,பக்கம் பிரேக்
@@ -1699,10 +1713,10 @@
 DocType: Time Log,To Time,டைம்
 DocType: Authorization Rule,Approving Role (above authorized value),(அங்கீகாரம் மதிப்பை மேலே) பாத்திரம் அப்ரூவிங்
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","குழந்தை முனைகள் சேர்க்க, மரம் ஆராய நீங்கள் மேலும் முனைகளில் சேர்க்க வேண்டும் கீழ் முனை மீது கிளிக் செய்யவும்."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,கணக்கில் வரவு ஒரு செலுத்த வேண்டிய கணக்கு இருக்க வேண்டும்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM மறுநிகழ்வு : {0} பெற்றோர் அல்லது குழந்தை இருக்க முடியாது {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,கணக்கில் வரவு ஒரு செலுத்த வேண்டிய கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,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 +116,"For {0}, only debit accounts can be linked against another credit entry",{0} மட்டுமே டெபிட் கணக்குகள் மற்றொரு கடன் நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry",{0} மட்டுமே டெபிட் கணக்குகள் மற்றொரு கடன் நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,விலை பட்டியல் {0} முடக்கப்பட்டுள்ளது
 DocType: Manufacturing Settings,Allow Overtime,மேலதிக அனுமதிக்கவும்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} பொருள் தேவையான சீரியல் எண்கள் {1}. நீங்கள் வழங்கிய {2}.
@@ -1710,8 +1724,9 @@
 DocType: Item,Customer Item Codes,வாடிக்கையாளர் பொருள் குறியீடுகள்
 DocType: Opportunity,Lost Reason,இழந்த காரணம்
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ஆணைகள் அல்லது பொருள் எதிரான கொடுப்பனவு பதிவுகள் உருவாக்கவும்.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,புதிய முகவரி
 DocType: Quality Inspection,Sample Size,மாதிரி அளவு
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,அனைத்து பொருட்களும் ஏற்கனவே விலை விவரம்
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,மேலும் செலவு மையங்கள் குழுக்கள் கீழ் செய்யப்பட்ட ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்
 DocType: Project,External,வெளி
@@ -1767,13 +1782,14 @@
 DocType: Rename Tool,Rename Tool,கருவி மறுபெயரிடு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,மேம்படுத்தல்
 DocType: Item Reorder,Item Reorder,உருப்படியை மறுவரிசைப்படுத்துக
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,மாற்றம் பொருள்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,மாற்றம் பொருள்
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","நடவடிக்கைகள் , இயக்க செலவு குறிப்பிட உங்கள் நடவடிக்கைகள் ஒரு தனிப்பட்ட நடவடிக்கை இல்லை கொடுக்க ."
 DocType: Purchase Invoice,Price List Currency,விலை பட்டியல் நாணயத்தின்
 DocType: Naming Series,User must always select,பயனர் எப்போதும் தேர்ந்தெடுக்க வேண்டும்
 DocType: Stock Settings,Allow Negative Stock,எதிர்மறை பங்கு அனுமதிக்கும்
 DocType: Installation Note,Installation Note,நிறுவல் குறிப்பு
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,வரிகளை சேர்க்க
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,கடன் இருந்து பண பரிமாற்ற
 ,Financial Analytics,நிதி பகுப்பாய்வு
 DocType: Quality Inspection,Verified By,மூலம் சரிபார்க்கப்பட்ட
 DocType: Address,Subsidiary,உப
@@ -1783,19 +1799,19 @@
 DocType: Process Payroll,Create Salary Slip,சம்பளம் ஸ்லிப் உருவாக்க
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,வங்கி படி எதிர்பார்க்கப்படுகிறது சமநிலை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),நிதி ஆதாரம் ( கடன்)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},அளவு வரிசையில் {0} ( {1} ) அதே இருக்க வேண்டும் உற்பத்தி அளவு {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},அளவு வரிசையில் {0} ( {1} ) அதே இருக்க வேண்டும் உற்பத்தி அளவு {2}
 DocType: Appraisal,Employee,ஊழியர்
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,இருந்து இறக்குமதி மின்னஞ்சல்
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,பயனர் அழை
 DocType: Features Setup,After Sale Installations,விற்பனை நிறுவல்கள் பிறகு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} முழுமையாக வசூலிக்கப்படும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} முழுமையாக வசூலிக்கப்படும்
 DocType: Workstation Working Hour,End Time,முடிவு நேரம்
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,விற்பனை அல்லது கொள்முதல் தரநிலை ஒப்பந்த அடிப்படையில் .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,வவுச்சர் மூலம் குழு
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,தேவையான அன்று
 DocType: Sales Invoice,Mass Mailing,வெகுஜன அஞ்சல்
 DocType: Rename Tool,File to Rename,மறுபெயர் கோப்புகள்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse ஆணை எண் பொருள் தேவை {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse ஆணை எண் பொருள் தேவை {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,காட்டு கொடுப்பனவு
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},பொருள் இருப்பு இல்லை BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு அட்டவணை {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
@@ -1805,6 +1821,7 @@
 DocType: Selling Settings,Sales Order Required,விற்பனை ஆர்டர் தேவை
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,உருவாக்கு
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,பராமரிப்பு அட்டவணை விரிவாக
 DocType: Quality Inspection Reading,Reading 9,9 படித்தல்
@@ -1816,6 +1833,7 @@
 DocType: Warranty Claim,Raised By,எழுப்பப்பட்ட
 DocType: Payment Tool,Payment Account,கொடுப்பனவு கணக்கு
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,கணக்குகள் நிகர மாற்றம்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,இழப்பீட்டு இனிய
 DocType: Quality Inspection Reading,Accepted,ஏற்று
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,நீங்கள் உண்மையில் இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்க வேண்டும் என்பதை உறுதி செய்யுங்கள். இது போன்ற உங்கள் மாஸ்டர் தரவு இருக்கும். இந்தச் செயலைச் செயல்.
@@ -1823,17 +1841,17 @@
 DocType: Payment Tool,Total Payment Amount,மொத்த பணம் அளவு
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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 +204,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
 DocType: Newsletter,Test,சோதனை
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","இருக்கும் பங்கு பரிவர்த்தனைகள் நீங்கள் மதிப்புகள் மாற்ற முடியாது \ இந்த உருப்படி, உள்ளன &#39;என்பதைப் தொ.எ. உள்ளது&#39;, &#39;தொகுதி எவ்வித&#39;, &#39;பங்கு உருப்படியை&#39; மற்றும் &#39;மதிப்பீட்டு முறை&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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 +157,Please enter Planned Qty for Item {0} at row {1},பொருள் திட்டமிடப்பட்டுள்ளது அளவு உள்ளிடவும் {0} வரிசையில் {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} சமர்ப்பிக்க
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,பொருட்கள் கோரிக்கைகள்.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,தனி உற்பத்தி வரிசையில் ஒவ்வொரு முடிக்கப்பட்ட நல்ல உருப்படியை செய்தது.
 DocType: Purchase Invoice,Terms and Conditions1,விதிமுறைகள் மற்றும் Conditions1
@@ -1846,7 +1864,7 @@
 DocType: Authorization Rule,Authorized Value,அங்கீகரிக்கப்பட்ட மதிப்பு
 DocType: Contact,Enter department to which this Contact belongs,இந்த தொடர்பு சார்ந்த துறை உள்ளிடவும்
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,மொத்த இருக்காது
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,வரிசையில் பொருள் அல்லது கிடங்கு {0} பொருள் கோரிக்கை பொருந்தவில்லை
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,வரிசையில் பொருள் அல்லது கிடங்கு {0} பொருள் கோரிக்கை பொருந்தவில்லை
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,அளவிடத்தக்க அலகு
 DocType: Fiscal Year,Year End Date,ஆண்டு முடிவு தேதி
 DocType: Task Depends On,Task Depends On,பணி பொறுத்தது
@@ -1872,7 +1890,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,இந்த ஒப்பந்தம் முடிவுக்கு தேதி சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,கமிஷன் நிறுவனங்கள் பொருட்கள் விற்கும் ஒரு மூன்றாம் தரப்பு விநியோகஸ்தராக / வியாபாரி / கமிஷன் முகவர் / இணைப்பு / விற்பனையாளரை.
 DocType: Customer Group,Has Child Node,குழந்தை கணு உள்ளது
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} கொள்முதல் ஆணை எதிரான {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} கொள்முதல் ஆணை எதிரான {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","இங்கே நிலையான URL அளவுருக்கள் (எ.கா. அனுப்புநர் = ERPNext, பயனர்பெயர் = ERPNext, கடவுச்சொல்லை = 1234 முதலியன) உள்ளிடவும்"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} எந்த செயலில் நிதி ஆண்டில். மேலும் விவரங்களுக்கு பார்க்கவும் {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,இந்த ERPNext இருந்து தானாக உருவாக்கப்பட்ட ஒரு உதாரணம் இணையதளம் உள்ளது
@@ -1920,7 +1938,7 @@
  10. சேர் அல்லது கழித்து: நீங்கள் சேர்க்க அல்லது வரி கழித்து வேண்டும் என்பதை."
 DocType: Purchase Receipt Item,Recd Quantity,Recd அளவு
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},மேலும் பொருள் தயாரிக்க முடியாது {0} விட விற்பனை ஆணை அளவு {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
 DocType: Payment Reconciliation,Bank / Cash Account,வங்கி / பண கணக்கு
 DocType: Tax Rule,Billing City,பில்லிங் நகரம்
 DocType: Global Defaults,Hide Currency Symbol,நாணய சின்னம் மறைக்க
@@ -1952,6 +1970,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,பயன்பாட்டு செலவுகள்
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 மேலே
 DocType: Buying Settings,Default Buying Price List,இயல்புநிலை கொள்முதல் விலை பட்டியல்
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.","முதலியன கம்பெனி, நாணய , நடப்பு நிதியாண்டில் , போன்ற அமை கலாச்சாரம்"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,கொடுப்பனவு வகை
@@ -1987,7 +2006,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",பகுதி செயற் கைக்கோள் நிலாவிலிருந்து உள்ள &quot;அடிப்படையில் பொருட்களின் விகிதம்&quot; பார்க்க
 DocType: Appraisal Goal,Key Responsibility Area,முக்கிய பொறுப்பு பகுதி
 DocType: Item Reorder,Material Request Type,பொருள் கோரிக்கை வகை
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,ரோ {0}: UOM மாற்றக் காரணி கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ரோ {0}: UOM மாற்றக் காரணி கட்டாயமாகும்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,குறிப்
 DocType: Cost Center,Cost Center,செலவு மையம்
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,வவுச்சர் #
@@ -2010,7 +2029,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,அனைத்து முகவரிகள்.
 DocType: Company,Stock Settings,பங்கு அமைப்புகள்
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","பின்வரும் பண்புகளைக் சாதனைகளை அதே இருந்தால் அதை இணைத்தல் மட்டுமே சாத்தியம். குழு, ரூட் வகை, நிறுவனம்"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","பின்வரும் பண்புகளைக் சாதனைகளை அதே இருந்தால் அதை இணைத்தல் மட்டுமே சாத்தியம். குழு, ரூட் வகை, நிறுவனம்"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,வாடிக்கையாளர் குழு மரம் நிர்வகி .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,புதிய செலவு மையம் பெயர்
 DocType: Leave Control Panel,Leave Control Panel,கண்ட்ரோல் பேனல் விட்டு
@@ -2030,8 +2049,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,கொடுப்பனவு கருவி விபரம்
 ,Sales Browser,விற்னையாளர் உலாவி
 DocType: Journal Entry,Total Credit,மொத்த கடன்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},எச்சரிக்கை: மற்றொரு {0} # {1} பங்கு நுழைவதற்கு எதிராக உள்ளது {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,உள்ளூர்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},எச்சரிக்கை: மற்றொரு {0} # {1} பங்கு நுழைவதற்கு எதிராக உள்ளது {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,"இருப்பினும், கடனாளிகள்"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,பெரிய
@@ -2050,7 +2069,7 @@
 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. இல்லை
 DocType: Production Order Operation,Make Time Log,நேரம் பதிவு செய்ய
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,", ஆர்டர் அளவு அமைக்க, தயவு செய்து"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,", ஆர்டர் அளவு அமைக்க, தயவு செய்து"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},முன்னணி இருந்து வாடிக்கையாளர் உருவாக்க தயவுசெய்து {0}
 DocType: Price List,Applicable for Countries,நாடுகள் பொருந்தும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,கணினி
@@ -2110,10 +2129,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,குறைந்தபட்சம் ஒரு பொருளை திருப்பி ஆவணம் எதிர்மறை அளவு உள்ளிட்ட
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,எந்த கருத்துக்கள்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,எந்த கருத்துக்கள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,காலங்கடந்த
 DocType: Account,Stock Received But Not Billed,"பங்கு பெற்றார், ஆனால் கணக்கில் இல்லை"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,ரூட் கணக்கு ஒரு குழு இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,ரூட் கணக்கு ஒரு குழு இருக்க வேண்டும்
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,மொத்த சம்பளம் + நிலுவை தொகை + பணமாக்கல் தொகை - மொத்தம் பொருத்தியறிதல்
 DocType: Monthly Distribution,Distribution Name,விநியோக பெயர்
 DocType: Features Setup,Sales and Purchase,விற்பனை மற்றும் கொள்முதல்
@@ -2127,6 +2146,7 @@
 DocType: Journal Entry Account,Party Balance,கட்சி இருப்பு
 DocType: Sales Invoice Item,Time Log Batch,நேரம் புகுபதிகை தொகுப்பு
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,தள்ளுபடி விண்ணப்பிக்க தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,சம்பளம் ஸ்லிப் உருவாக்கப்பட்டது
 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,உற்பத்தி பொருள் மாற்றம்
@@ -2134,9 +2154,9 @@
 DocType: Purchase Invoice,Half-yearly,அரை ஆண்டு
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,நிதியாண்டு {0} காணப்படும்.
 DocType: Bank Reconciliation,Get Relevant Entries,தொடர்புடைய பதிவுகள் பெற
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,பங்கு பைனான்ஸ் நுழைவு
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,பங்கு பைனான்ஸ் நுழைவு
 DocType: Sales Invoice,Sales Team1,விற்பனை Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,பொருள் {0} இல்லை
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,பொருள் {0} இல்லை
 DocType: Sales Invoice,Customer Address,வாடிக்கையாளர் முகவரி
 DocType: Purchase Invoice,Apply Additional Discount On,கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும்
 DocType: Account,Root Type,ரூட் வகை
@@ -2145,15 +2165,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,பக்கத்தின் மேல் இந்த காட்சியை காட்ட
 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 +149,Target warehouse is mandatory for row {0},இலக்கு கிடங்கில் வரிசையில் கட்டாய {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},இலக்கு கிடங்கில் வரிசையில் கட்டாய {0}
 DocType: Quality Inspection,Quality Inspection,தரமான ஆய்வு
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,கூடுதல் சிறிய
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,கணக்கு {0} உறைந்திருக்கும்
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,நிறுவனத்திற்கு சொந்தமான கணக்குகள் ஒரு தனி விளக்கப்படம் சட்ட நிறுவனம் / துணைநிறுவனத்திற்கு.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","உணவு , குளிர்பானங்கள் & புகையிலை"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL அல்லது BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},மட்டுமே எதிரான கட்டணம் செய்யலாம் unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},மட்டுமே எதிரான கட்டணம் செய்யலாம் unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,கமிஷன் விகிதம் அதிகமாக 100 இருக்க முடியாது
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,குறைந்தபட்ச சரக்கு நிலை
 DocType: Stock Entry,Subcontract,உள் ஒப்பந்தம்
@@ -2191,7 +2211,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,உள்வரும் தரத்தை ஆய்வு.
 DocType: Purchase Order Item,Returned Qty,திரும்பி அளவு
 DocType: Employee,Exit,மரணம்
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,ரூட் வகை கட்டாய ஆகிறது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,ரூட் வகை கட்டாய ஆகிறது
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,தொடர் இல {0} உருவாக்கப்பட்டது
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","வாடிக்கையாளர்களின் வசதிக்காக, இந்த குறியீடுகள் பற்றுச்சீட்டுகள் மற்றும் டெலிவரி குறிப்புகள் போன்ற அச்சு வடிவங்கள் பயன்படுத்த முடியும்"
 DocType: Employee,You can enter any date manually,நீங்கள் கைமுறையாக எந்த தேதி நுழைய முடியும்
@@ -2199,8 +2219,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,ப்ரொபேஷ்னரி காலம்
 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 +110,Row {0}: Advance against Customer must be credit,ரோ {0}: வாடிக்கையாளர் எதிராக அட்வான்ஸ் கடன் இருக்க வேண்டும்
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,கொள்முதல் ரசீது பொருள் வழங்கியது
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,செலுத்த
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,செலுத்த
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,நாள்நேரம் செய்ய
 DocType: SMS Settings,SMS Gateway URL,எஸ்எம்எஸ் வாயில் URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,எஸ்எம்எஸ் விநியோகம் அந்தஸ்து தக்கவைப்பதற்கு பதிவுகள்
@@ -2217,7 +2238,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,மறுவரிசைப்படுத்துக நிலை
 DocType: Attendance,Attendance Date,வருகை தேதி
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,சம்பளம் கலைத்தல் வருமானம் மற்றும் துப்பறியும் அடிப்படையாக கொண்டது.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,குழந்தை முனைகளில் கணக்கு பேரேடு மாற்றப்பட முடியாது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,குழந்தை முனைகளில் கணக்கு பேரேடு மாற்றப்பட முடியாது
 DocType: Address,Preferred Shipping Address,விருப்பமான கப்பல் முகவரி
 DocType: Purchase Receipt Item,Accepted Warehouse,ஏற்று கிடங்கு
 DocType: Bank Reconciliation Detail,Posting Date,தேதி தகவல்களுக்கு
@@ -2235,7 +2256,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,தொடர் இல {0} இல்லை
 DocType: Pricing Rule,Discount Percentage,தள்ளுபடி சதவீதம்
 DocType: Payment Reconciliation Invoice,Invoice Number,விலைப்பட்டியல் எண்
-apps/erpnext/erpnext/hooks.py +54,Orders,ஆணைகள்
+apps/erpnext/erpnext/hooks.py +55,Orders,ஆணைகள்
 DocType: Leave Control Panel,Employee Type,பணியாளர் அமைப்பு
 DocType: Employee Leave Approver,Leave Approver,சர்க்கார் தரப்பில் சாட்சி விட்டு
 DocType: Manufacturing Settings,Material Transferred for Manufacture,பொருள் உற்பத்தி மாற்றப்பட்டது
@@ -2247,7 +2268,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,பொருட்களை% இந்த விற்பனை அமைப்புக்கு எதிராக வசூலிக்கப்படும்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,காலம் நிறைவு நுழைவு
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ஏற்கனவே பரிவர்த்தனைகள் செலவு மையம் குழு மாற்றப்பட முடியாது
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,மதிப்பிறக்கம் தேய்மானம்
+DocType: Account,Depreciation,மதிப்பிறக்கம் தேய்மானம்
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),வழங்குபவர் (கள்)
 DocType: Customer,Credit Limit,கடன் எல்லை
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,பரிவர்த்தனை தேர்ந்தெடுக்கவும்
@@ -2272,11 +2293,12 @@
 DocType: Material Request,Requested For,கோரப்பட்ட
 DocType: Quotation Item,Against Doctype,Doctype எதிராக
 DocType: Delivery Note,Track this Delivery Note against any Project,எந்த திட்டம் எதிரான இந்த டெலிவரி குறிப்பு கண்காணிக்க
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,ரூட் கணக்கை நீக்க முடியாது
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,முதலீடு இருந்து நிகர பண
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,ரூட் கணக்கை நீக்க முடியாது
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,காட்டு பங்கு பதிவுகள்
 ,Is Primary Address,முதன்மை முகவரி
 DocType: Production Order,Work-in-Progress Warehouse,"வேலை, செயலில் கிடங்கு"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},குறிப்பு # {0} தேதியிட்ட {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},குறிப்பு # {0} தேதியிட்ட {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,முகவரிகள் நிர்வகிக்கவும்
 DocType: Pricing Rule,Item Code,உருப்படியை கோட்
 DocType: Production Planning Tool,Create Production Orders,உற்பத்தி ஆணைகள் உருவாக்க
@@ -2284,7 +2306,7 @@
 DocType: Journal Entry,User Remark,பயனர் குறிப்பு
 DocType: Lead,Market Segment,சந்தை பிரிவு
 DocType: Employee Internal Work History,Employee Internal Work History,ஊழியர் உள்நாட்டு வேலை வரலாறு
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),நிறைவு (டாக்டர்)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),நிறைவு (டாக்டர்)
 DocType: Contact,Passive,மந்தமான
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,தொடர் இல {0} இல்லை பங்கு
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,பரிவர்த்தனைகள் விற்பனை வரி வார்ப்புரு .
@@ -2300,7 +2322,7 @@
 ,Billed Amount,கூறப்படுவது தொகை
 DocType: Bank Reconciliation,Bank Reconciliation,வங்கி நல்லிணக்க
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,மேம்படுத்தல்கள் கிடைக்கும்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,பொருள் கோரிக்கை {0} ரத்து அல்லது நிறுத்தி
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,பொருள் கோரிக்கை {0} ரத்து அல்லது நிறுத்தி
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,ஒரு சில மாதிரி பதிவுகளை சேர்க்கவும்
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,மேலாண்மை விடவும்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,கணக்கு குழு
@@ -2309,14 +2331,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","லாபம் / நஷ்டம் பதிவு வேண்டிய பொறுப்பு கீழ் கணக்கு தலைவர் ,"
 DocType: Payment Tool,Against Vouchers,கே எதிரான
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,விரைவு உதவி
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},மூல மற்றும் அடைவு கிடங்கில் வரிசையில் அதே இருக்க முடியாது {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},மூல மற்றும் அடைவு கிடங்கில் வரிசையில் அதே இருக்க முடியாது {0}
 DocType: Features Setup,Sales Extras,விற்பனை உபரி
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} கணக்கு வரவு செலவு {1} செலவு மையம் எதிரான {2} {3} அதிகமாக இருக்கும்
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',' வரம்பு தேதி ' தேதி ' பிறகு இருக்க வேண்டும்
 ,Stock Projected Qty,பங்கு அளவு திட்டமிடப்பட்ட
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
 DocType: Sales Order,Customer's Purchase Order,வாடிக்கையாளர் கொள்முதல் ஆணை
 DocType: Warranty Claim,From Company,நிறுவனத்தின் இருந்து
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,மதிப்பு அல்லது அளவு
@@ -2326,9 +2348,9 @@
 DocType: Leave Block List,Leave Block List Allowed,அனுமதிக்கப்பட்ட பிளாக் பட்டியல் விட்டு
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,நீங்கள் உள்நுழைய அதை பயன்படுத்த வேண்டும்
 DocType: Sales Partner,Retailer,சில்லறை
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,கணக்கில் பணம் வரவு ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,கணக்கில் பணம் வரவு ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,அனைத்து வழங்குபவர் வகைகள்
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,பொருள் தானாக எண் ஏனெனில் பொருள் கோட் கட்டாய ஆகிறது
+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 +93,Quotation {0} not of type {1},மேற்கோள் {0} அல்ல வகை {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,பராமரிப்பு அட்டவணை உருப்படி
 DocType: Sales Order,%  Delivered,அனுப்பப்பட்டது%
@@ -2372,7 +2394,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),தொகுப்பின் மொத்த எடை. பொதுவாக நிகர எடை + பேக்கேஜிங் பொருட்கள் எடை. (அச்சுக்கு)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,இந்த பங்களிப்பை செய்த உறைந்த கணக்குகள் எதிராக கணக்கியல் உள்ளீடுகள் மாற்ற / உறைந்த கணக்குகள் அமைக்க உருவாக்க அனுமதி
 DocType: Serial No,Is Cancelled,ரத்து
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,என் படுவதற்கு
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,என் படுவதற்கு
 DocType: Journal Entry,Bill Date,பில் தேதி
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","அதிகபட்ச முன்னுரிமை கொண்ட பல விலை விதிகள் உள்ளன என்றால், பின் பின்வரும் உள் முன்னுரிமைகள் பயன்படுத்தப்படும்:"
 DocType: Supplier,Supplier Details,வழங்குபவர் விவரம்
@@ -2393,10 +2415,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,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 +198,Purchase Order {0} is not submitted,கொள்முதல் ஆணை {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,கொள்முதல் ஆணை {0} சமர்ப்பிக்க
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,திட்டமிடப்பட்ட
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},தொடர் இல {0} கிடங்கு அல்ல {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"குறிப்பு: இந்த அமைப்பு பொருள் விநியோகம் , மேல் முன்பதிவு பார்க்க மாட்டேன் {0} அளவு அல்லது அளவு 0 ஆகிறது"
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,தேதி திறப்பு
 DocType: Journal Entry,Remark,குறிப்பு
@@ -2409,9 +2431,9 @@
 DocType: Time Log,Batched for Billing,பில்லிங் Batched
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,பில்கள் விநியோகஸ்தர்கள் எழுப்பும்.
 DocType: POS Profile,Write Off Account,கணக்கு இனிய எழுத
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,தள்ளுபடி தொகை
 DocType: Purchase Invoice,Return Against Purchase Invoice,எதிராக கொள்முதல் விலைப்பட்டியல் திரும்ப
 DocType: Item,Warranty Period (in days),உத்தரவாதத்தை காலம் (நாட்கள்)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,செயல்பாடுகள் இருந்து நிகர பண
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,"உதாரணமாக, வரி"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,பொருள் 4
 DocType: Journal Entry Account,Journal Entry Account,பத்திரிகை நுழைவு கணக்கு
@@ -2452,7 +2474,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,ஓய்வு நாள் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 DocType: Sales Invoice,Against Income Account,வருமான கணக்கு எதிராக
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% வழங்கப்படுகிறது
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,போக்குவரத்து தகவல்
@@ -2480,10 +2502,10 @@
 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 +14,This is a root sales person and cannot be edited.,இந்த ஒரு ரூட் விற்பனை நபர் மற்றும் திருத்த முடியாது .
 ,Stock Ledger,பங்கு லெட்ஜர்
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},மதிப்பீடு: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},மதிப்பீடு: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,சம்பளம் ஸ்லிப் பொருத்தியறிதல்
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,முதல் ஒரு குழு முனை தேர்ந்தெடுக்கவும்.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},நோக்கம் ஒன்றாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},நோக்கம் ஒன்றாக இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,"படிவத்தை பூர்த்தி செய்து, அதை காப்பாற்ற"
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,அவர்களின் சமீபத்திய சரக்கு நிலை அனைத்து மூலப்பொருட்கள் கொண்ட ஒரு அறிக்கையை பதிவிறக்கு
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,கருத்துக்களம்
@@ -2521,7 +2543,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,நிறுவனத்தின் ( இல்லை வாடிக்கையாளருக்கு அல்லது வழங்குநருக்கு ) மாஸ்டர் .
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',' எதிர்பார்த்த டெலிவரி தேதி ' உள்ளிடவும்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,டெலிவரி குறிப்புகள் {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,பணம் அளவு + அளவு தள்ளுபடி கிராண்ட் மொத்த விட முடியாது
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},குறிப்பு: விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","குறிப்பு: பணம் எந்த குறிப்பு எதிராக செய்த எனில், கைமுறையாக பத்திரிகை பதிவு செய்ய."
@@ -2538,13 +2560,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} {1} 'முடக்கப்பட்டுள்ளது
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,திறந்த அமை
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,சமர்ப்பிக்கும் பரிமாற்றங்கள் மீது தொடர்புகள் தானியங்கி மின்னஞ்சல்களை அனுப்ப.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","ரோ {0}: அளவு கிடங்கில் avalable இல்லை {1} ம் {2} {3}.
  கிடைக்கும் அளவு: {4}, அளவு மாற்றம்: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,பொருள் 3
 DocType: Purchase Order,Customer Contact Email,வாடிக்கையாளர் தொடர்பு மின்னஞ்சல்
 DocType: Sales Team,Contribution (%),பங்களிப்பு (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,குறிப்பு: கொடுப்பனவு நுழைவு ' பண அல்லது வங்கி கணக்கு ' குறிப்பிடப்படவில்லை என்பதால் உருவாக்கப்பட்டது முடியாது
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,குறிப்பு: கொடுப்பனவு நுழைவு ' பண அல்லது வங்கி கணக்கு ' குறிப்பிடப்படவில்லை என்பதால் உருவாக்கப்பட்டது முடியாது
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,பொறுப்புகள்
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,டெம்ப்ளேட்
 DocType: Sales Person,Sales Person Name,விற்பனை நபர் பெயர்
@@ -2555,20 +2577,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,சமரசம் முன்
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,பொருள் வரி ரோ {0} வகை வரி அல்லது வருமான அல்லது செலவு அல்லது வசூலிக்கப்படும் கணக்கு இருக்க வேண்டும்
 DocType: Sales Order,Partly Billed,இதற்கு கட்டணம்
 DocType: Item,Default BOM,முன்னிருப்பு BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,மீண்டும் தட்டச்சு நிறுவனத்தின் பெயர் உறுதிப்படுத்த தயவு செய்து
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,மொத்த மிகச்சிறந்த விவரங்கள்
 DocType: Time Log Batch,Total Hours,மொத்த நேரம்
 DocType: Journal Entry,Printing Settings,அச்சிடுதல் அமைப்புகள்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},மொத்த பற்று மொத்த கடன் சமமாக இருக்க வேண்டும் .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},மொத்த பற்று மொத்த கடன் சமமாக இருக்க வேண்டும் .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,வாகன
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,டெலிவரி குறிப்பு இருந்து
 DocType: Time Log,From Time,நேரம் இருந்து
 DocType: Notification Control,Custom Message,தனிப்பயன் செய்தி
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,முதலீட்டு வங்கி
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,பண அல்லது வங்கி கணக்கு கொடுப்பனவு நுழைவு செய்யும் கட்டாய
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,பண அல்லது வங்கி கணக்கு கொடுப்பனவு நுழைவு செய்யும் கட்டாய
 DocType: Purchase Invoice,Price List Exchange Rate,விலை பட்டியல் செலாவணி விகிதம்
 DocType: Purchase Invoice Item,Rate,விலை
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,நடமாட்டத்தை கட்டுபடுத்து
@@ -2587,9 +2609,10 @@
  மோதல் தீர்க்க செய்யவும். விலை விதிகள்: {0}"
 DocType: Account,Bank,வங்கி
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,விமானத்துறை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,பிரச்சினை பொருள்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,பிரச்சினை பொருள்
 DocType: Material Request Item,For Warehouse,சேமிப்பு
 DocType: Employee,Offer Date,ஆஃபர் தேதி
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,மேற்கோள்கள்
 DocType: Hub Settings,Access Token,அணுகல் டோக்கன்
 DocType: Sales Invoice Item,Serial No,இல்லை தொடர்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Maintaince விவரம் முதல் உள்ளிடவும்
@@ -2603,10 +2626,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,இந்த மாதம் வேலை நாட்களுக்கு மேல் விடுமுறை உள்ளன .
 DocType: Product Bundle Item,Product Bundle Item,தயாரிப்பு மூட்டை பொருள்
 DocType: Sales Partner,Sales Partner Name,விற்பனை வரன்வாழ்க்கை துணை பெயர்
+DocType: Payment Reconciliation,Maximum Invoice Amount,அதிகபட்ச விலைப்பட்டியல் அளவு
 DocType: Purchase Invoice Item,Image View,பட காட்சி
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,மதிப்பீடு மற்றும் மொத்த
@@ -2614,6 +2639,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,இந்த பொருள் {0} (டெம்பிளேட்) ஒரு மாறுபாடு உள்ளது. 'இல்லை நகல் அமைக்க வரை காரணிகள் டெம்ப்ளேட் இருந்து நகல்
 DocType: Account,Purchase User,கொள்முதல் பயனர்
 DocType: Notification Control,Customize the Notification,அறிவிப்பு தனிப்பயனாக்கு
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,செயல்பாடுகள் இருந்து பண பரிமாற்ற
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,இயல்புநிலை முகவரி டெம்ப்ளேட் நீக்க முடியாது
 DocType: Sales Invoice,Shipping Rule,கப்பல் விதி
 DocType: Journal Entry,Print Heading,தலைப்பு அச்சிட
@@ -2624,7 +2650,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,மூலப்பொருட்களின்
 DocType: Leave Application,Follow via Email,மின்னஞ்சல் வழியாக பின்பற்றவும்
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,தள்ளுபடி தொகை பிறகு வரி தொகை
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,குழந்தை கணக்கு இந்த கணக்கு உள்ளது . நீங்கள் இந்த கணக்கை நீக்க முடியாது .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},இயல்புநிலை BOM உள்ளது உருப்படி {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,முதல் பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்
@@ -2642,6 +2668,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},தொடராக பொருள் தொடர் இலக்கங்கள் தேவையான {0}
 DocType: Journal Entry,Bank Entry,வங்கி நுழைவு
 DocType: Authorization Rule,Applicable To (Designation),பொருந்தும் (பதவி)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,வணிக வண்டியில் சேர்
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,குழு மூலம்
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ முடக்கு நாணயங்கள் செயல்படுத்து.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,தபால் செலவுகள்
@@ -2649,30 +2676,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,பொழுதுபோக்கு & ஓய்வு
 DocType: Purchase Order,The date on which recurring order will be stop,மீண்டும் மீண்டும் வரும் பொருட்டு நிறுத்த வேண்டும் எந்த தேதி
 DocType: Quality Inspection,Item Serial No,உருப்படி இல்லை தொடர்
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} குறைக்கப்பட வேண்டும் அல்லது நீங்கள் வழிதல் சகிப்புத்தன்மை அதிகரிக்க வேண்டும்
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} குறைக்கப்பட வேண்டும் அல்லது நீங்கள் வழிதல் சகிப்புத்தன்மை அதிகரிக்க வேண்டும்
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,மொத்த தற்போதைய
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,மணி
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","தொடராக பொருள் {0} பங்கு நல்லிணக்க பயன்படுத்தி \
  மேம்படுத்தப்பட்டது"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,சப்ளையர் பொருள் மாற்றுவது
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,சப்ளையர் பொருள் மாற்றுவது
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,மேற்கோள் உருவாக்கவும்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,நீங்கள் பிளாக் தேதிகள் இலைகள் ஒப்புதல் அங்கீகாரம் இல்லை
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,இந்த பொருட்கள் ஏற்கனவே விலை விவரம்
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,இந்த பொருட்கள் ஏற்கனவே விலை விவரம்
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ஒப்புதல்
 DocType: Shipping Rule,Shipping Rule Conditions,கப்பல் விதி நிபந்தனைகள்
 DocType: BOM Replace Tool,The new BOM after replacement,மாற்று பின்னர் புதிய BOM
 DocType: Features Setup,Point of Sale,விற்பனை செய்யுமிடம்
 DocType: Account,Tax,வரி
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},ரோ {0}: {1} ஒரு செல்லுபடியாகும் அல்ல {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,தயாரிப்பு மூட்டை இருந்து
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,தயாரிப்பு மூட்டை இருந்து
 DocType: Production Planning Tool,Production Planning Tool,உற்பத்தி திட்டமிடல் கருவி
 DocType: Quality Inspection,Report Date,தேதி அறிக்கை
 DocType: C-Form,Invoices,பொருள்
 DocType: Job Opening,Job Title,வேலை தலைப்பு
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} பெற்றவர்கள்
 DocType: Features Setup,Item Groups in Details,விவரங்கள் உருப்படியை குழுக்கள்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,உற்பத்தி செய்ய அளவு 0 அதிகமாக இருக்க வேண்டும்.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),தொடக்க புள்ளி (POS) த்தில்
@@ -2680,8 +2706,9 @@
 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: Pricing Rule,Customer Group,வாடிக்கையாளர் பிரிவு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},செலவு கணக்கு உருப்படியை கட்டாய {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},செலவு கணக்கு உருப்படியை கட்டாய {0}
 DocType: Item,Website Description,இணையதளத்தில் விளக்கம்
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ஈக்விட்டி நிகர மாற்றம்
 DocType: Serial No,AMC Expiry Date,AMC காலாவதியாகும் தேதி
 ,Sales Register,விற்பனை பதிவு
 DocType: Quotation,Quotation Lost Reason,மேற்கோள் காரணம் லாஸ்ட்
@@ -2689,12 +2716,12 @@
 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 +108,Summary for this month and pending activities,இந்த மாதம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
 DocType: Customer Group,Customer Group Name,வாடிக்கையாளர் குழு பெயர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,கற்பிதங்கள்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,பொருட்கள் கிடைக்கும்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,கணக்கு எழுத உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,பொருட்கள் கிடைக்கும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,கணக்கு எழுத உள்ளிடவும்
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,கடைசி ஆர்டர் தேதி
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,கலால் விலைப்பட்டியல் செய்ய
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},கணக்கு {0} செய்கிறது நிறுவனம் சொந்தமானது {1}
@@ -2710,7 +2737,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,திட்ட வாரியான தரவு மேற்கோள் கிடைக்கவில்லை
 DocType: Project,Expected End Date,எதிர்பார்க்கப்படுகிறது முடிவு தேதி
 DocType: Appraisal Template,Appraisal Template Title,மதிப்பீட்டு வார்ப்புரு தலைப்பு
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,வர்த்தகம்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,வர்த்தகம்
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,பெற்றோர் பொருள் {0} ஒரு பங்கு பொருள் இருக்க கூடாது
 DocType: Cost Center,Distribution Id,விநியோக அடையாளம்
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,வியப்பா சேவைகள்
@@ -2723,7 +2750,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} கற்பிதம் மதிப்பு எல்லைக்குள் இருக்க வேண்டும் {1} க்கு {2} அதிகரிப்பில் {3}
 DocType: Tax Rule,Sales,விற்பனை
 DocType: Stock Entry Detail,Basic Amount,அடிப்படை தொகை
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
 DocType: Leave Allocation,Unused leaves,பயன்படுத்தப்படாத இலைகள்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,கணக்குகள் இயல்புநிலை
@@ -2735,16 +2762,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,கொள்முதல் ரசீதுகள்
-DocType: Payment Reconciliation,Maximum Amount,அதிகபட்ச தொகை
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,எப்படி விலை பயன்படுத்தப்படும் விதி என்ன?
 DocType: Quality Inspection,Delivery Note No,டெலிவரி குறிப்பு இல்லை
 DocType: Company,Retail,சில்லறை
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,வாடிக்கையாளர் {0} இல்லை
 DocType: Attendance,Absent,வராதிரு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,தயாரிப்பு மூட்டை
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},ரோ {0}: தவறான குறிப்பு {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,தயாரிப்பு மூட்டை
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},ரோ {0}: தவறான குறிப்பு {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,வரி மற்றும் கட்டணங்கள் வார்ப்புரு வாங்க
 DocType: Upload Attendance,Download Template,வார்ப்புரு பதிவிறக்க
 DocType: GL Entry,Remarks,கருத்துக்கள்
@@ -2771,7 +2798,7 @@
 ,Monthly Attendance Sheet,மாதாந்திர பங்கேற்கும் தாள்
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,எந்த பதிவும் இல்லை
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: செலவு மையம் பொருள் கட்டாய {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,கணக்கு {0} செயலற்று
 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,தேதி தேதி மற்றும் வருகை வருகை கட்டாய ஆகிறது
@@ -2780,8 +2807,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' இலாப நட்ட ' வகை கணக்கு {0} நுழைவு திறந்து அனுமதி இல்லை
 DocType: Features Setup,Sales Discounts,விற்பனை தள்ளுபடி
 DocType: Hub Settings,Seller Country,விற்பனையாளர் நாடு
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,இணையத்தளம் வெளியிடு
 DocType: Authorization Rule,Authorization Rule,அங்கீகார விதி
 DocType: Sales Invoice,Terms and Conditions Details,நிபந்தனைகள் விவரம்
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,விருப்பம்
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,விற்பனை வரி மற்றும் கட்டணங்கள் டெம்ப்ளேட்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ஆடை & ஆபரனங்கள்
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,ஆணை எண்
@@ -2803,7 +2832,7 @@
 DocType: Time Log,Billing Amount,பில்லிங் அளவு
 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 +18,Applications for leave.,விடுமுறை விண்ணப்பங்கள்.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,ஏற்கனவே பரிவர்த்தனை கணக்கு நீக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,ஏற்கனவே பரிவர்த்தனை கணக்கு நீக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,சட்ட செலவுகள்
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","கார் பொருட்டு 05, 28 எ.கா. உருவாக்கப்படும் மாதத்தின் நாள்"
 DocType: Sales Invoice,Posting Time,நேரம் தகவல்களுக்கு
@@ -2819,11 +2848,11 @@
 DocType: Maintenance Visit,Breakdown,முறிவு
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,கணக்கு: {0} நாணயத்துடன்: {1} தேர்வு செய்ய முடியாது
 DocType: Bank Reconciliation Detail,Cheque Date,காசோலை தேதி
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},கணக்கு {0}: பெற்றோர் கணக்கு {1} நிறுவனத்திற்கு சொந்தமானது இல்லை: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},கணக்கு {0}: பெற்றோர் கணக்கு {1} நிறுவனத்திற்கு சொந்தமானது இல்லை: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,வெற்றிகரமாக இந்த நிறுவனம் தொடர்பான அனைத்து நடவடிக்கைகளில் நீக்கப்பட்டது!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,தேதி வரை
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,சோதனை காலம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,இயல்புநிலை கிடங்கு பங்கு பொருள் கட்டாயமாகும்.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,இயல்புநிலை கிடங்கு பங்கு பொருள் கட்டாயமாகும்.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},மாதம் சம்பளம் கொடுப்பனவு {0} மற்றும் ஆண்டு {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,வாகன நுழைவு விலை பட்டியல் விகிதம் காணாமல் என்றால்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,மொத்த கட்டண தொகை
@@ -2835,6 +2864,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),மொத்த பில்லிங் அளவு (நேரத்தில் பதிவுகள் வழியாக)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,நாம் இந்த பொருளை விற்க
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,வழங்குபவர் அடையாளம்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,அளவு 0 அதிகமாக இருக்க வேண்டும்
 DocType: Journal Entry,Cash Entry,பண நுழைவு
 DocType: Sales Partner,Contact Desc,தொடர்பு DESC
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","சாதாரண, உடம்பு போன்ற இலைகள் வகை"
@@ -2843,7 +2873,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,கணக்கு ஆண்டு வரவு செலவு திட்டம் அமைக்க வரிசைகளை சேர்க்க.
 DocType: Buying Settings,Default Supplier Type,முன்னிருப்பு சப்ளையர் வகை
 DocType: Production Order,Total Operating Cost,மொத்த இயக்க செலவு
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,குறிப்பு: பொருள் {0} பல முறை உள்ளிட்ட
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,குறிப்பு: பொருள் {0} பல முறை உள்ளிட்ட
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,அனைத்து தொடர்புகள்.
 DocType: Newsletter,Test Email Id,டெஸ்ட் மின்னஞ்சல் விலாசம்
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,நிறுவனத்தின் சுருக்கமான
@@ -2868,7 +2898,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,வரி டெம்ப்ளேட் கட்டாயமாகும்.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,கணக்கு {0}: பெற்றோர் கணக்கு {1} இல்லை
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,கணக்கு {0}: பெற்றோர் கணக்கு {1} இல்லை
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),விலை பட்டியல் விகிதம் (நிறுவனத்தின் கரன்சி)
 DocType: Account,Temporary,தற்காலிக
 DocType: Address,Preferred Billing Address,விருப்பமான பில்லிங் முகவரி
@@ -2886,8 +2916,8 @@
 ,Item-wise Price List Rate,பொருள் வாரியான விலை பட்டியல் விகிதம்
 DocType: Purchase Order Item,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
 DocType: Quotation,In Words will be visible once you save the Quotation.,நீங்கள் மேற்கோள் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} நிறுத்தி உள்ளது
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} நிறுத்தி உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
 DocType: Lead,Add to calendar on this date,இந்த தேதி நாள்காட்டியில் சேர்க்கவும்
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,கப்பல் செலவுகள் சேர்த்து விதிகள் .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,எதிர்வரும் நிகழ்வுகள்
@@ -2908,24 +2938,24 @@
 DocType: Customer,From Lead,முன்னணி இருந்து
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,ஆணைகள் உற்பத்தி வெளியிடப்பட்டது.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,நிதியாண்டு தேர்ந்தெடுக்கவும் ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
 DocType: Hub Settings,Name Token,பெயர் டோக்கன்
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,குறைந்தது ஒரு கிடங்கில் அவசியமானதாகும்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,பதிலாக
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} விற்பனை விலைப்பட்டியல் எதிரான {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,நடவடிக்கை இயல்புநிலை அலகு உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} விற்பனை விலைப்பட்டியல் எதிரான {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,நடவடிக்கை இயல்புநிலை அலகு உள்ளிடவும்
 DocType: Purchase Invoice Item,Project Name,திட்டம் பெயர்
 DocType: Supplier,Mention if non-standard receivable account,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு என்றால்
 DocType: Journal Entry Account,If Income or Expense,என்றால் வருமானம் அல்லது செலவு
 DocType: Features Setup,Item Batch Nos,உருப்படியை தொகுப்பு இலக்கங்கள்
 DocType: Stock Ledger Entry,Stock Value Difference,பங்கு மதிப்பு வேறுபாடு
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,மனித வள
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,மனித வள
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,கொடுப்பனவு நல்லிணக்க கொடுப்பனவு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,வரி சொத்துகள்
 DocType: BOM Item,BOM No,BOM இல்லை
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,பத்திரிகை நுழைவு {0} {1} அல்லது ஏற்கனவே மற்ற ரசீது எதிராக பொருந்தியது கணக்கு இல்லை
 DocType: Item,Moving Average,சராசரி நகரும்
 DocType: BOM Replace Tool,The BOM which will be replaced,பதிலீடு செய்யப்படும் BOM
 DocType: Account,Debit,பற்று
@@ -2962,7 +2992,7 @@
 DocType: Stock Entry Detail,Additional Cost,கூடுதல் செலவு
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,நிதி ஆண்டு முடிவு தேதி
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","வவுச்சர் அடிப்படையில் வடிகட்ட முடியாது இல்லை , ரசீது மூலம் தொகுக்கப்பட்டுள்ளது என்றால்"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
 DocType: Quality Inspection,Incoming,அடுத்து வருகிற
 DocType: BOM,Materials Required (Exploded),பொருட்கள் தேவை (விரிவான)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),சம்பளம் (LWP) இல்லாமல் விடுமுறை ஆதாயம் குறைக்க
@@ -2970,7 +3000,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},ரோ # {0}: தொ.எ. {1} பொருந்தவில்லை {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,தற்செயல் விடுப்பு
 DocType: Batch,Batch ID,தொகுதி அடையாள
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},குறிப்பு: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},குறிப்பு: {0}
 ,Delivery Note Trends,பந்து குறிப்பு போக்குகள்
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,இந்த வார சுருக்கம்
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} வரிசையில் ஒரு வாங்கப்பட்டது அல்லது துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும் {1}
@@ -2985,6 +3015,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,சராசரி. வாங்குதல் விகிதம்
 DocType: Task,Actual Time (in Hours),(மணிகளில்) உண்மையான நேரம்
 DocType: Employee,History In Company,நிறுவனத்தின் ஆண்டு வரலாறு
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,செய்தி
 DocType: Address,Shipping,கப்பல் வாணிபம்
 DocType: Stock Ledger Entry,Stock Ledger Entry,பங்கு லெட்ஜர் நுழைவு
@@ -3004,7 +3035,6 @@
 DocType: Purchase Order,End date of current order's period,தற்போதைய ஆர்டரை கால இறுதியில் தேதி
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ஆஃபர் கடிதம் செய்ய
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,திரும்ப
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,மாற்று அளவீடு இயல்புநிலை யூனிட் டெம்ப்ளேட் அதே இருக்க வேண்டும்
 DocType: Production Order Operation,Production Order Operation,உத்தரவு ஆபரேஷன்
 DocType: Pricing Rule,Disable,முடக்கு
 DocType: Project Task,Pending Review,விமர்சனம் நிலுவையில்
@@ -3012,7 +3042,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,வாடிக்கையாளர் அடையாள
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,நேரம் இருந்து விட பெரியதாக இருக்க வேண்டும் வேண்டும்
 DocType: Journal Entry Account,Exchange Rate,அயல்நாட்டு நாணய பரிமாற்ற விகிதம் வீதம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},கிடங்கு {0}: பெற்றோர் கணக்கு {1} நிறுவனம் bolong இல்லை {2}
 DocType: BOM,Last Purchase Rate,கடந்த கொள்முதல் விலை
 DocType: Account,Asset,சொத்து
@@ -3032,7 +3062,7 @@
 ,Available Stock for Packing Items,பொருட்கள் பொதி கிடைக்கும் பங்கு
 DocType: Item Variant,Item Variant,பொருள் மாற்று
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,வேறு எந்த இயல்புநிலை உள்ளது என இயல்புநிலை முகவரி டெம்ப்ளேட் அமைக்க
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ஏற்கனவே பற்று உள்ள கணக்கு நிலுவை, நீங்கள் 'கடன்' இருப்பு வேண்டும் 'அமைக்க அனுமதி இல்லை"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,தர மேலாண்மை
 DocType: Production Planning Tool,Filter based on customer,வாடிக்கையாளர் அடிப்படையில் வடிகட்ட
 DocType: Payment Tool Detail,Against Voucher No,ரசீது இல்லை எதிராக
@@ -3049,6 +3079,7 @@
 DocType: Opportunity,Next Contact,அடுத்த தொடர்பு
 DocType: Employee,Employment Type,வேலை வகை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,நிலையான சொத்துக்கள்
+,Cash Flow,பண பரிமாற்ற
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,விண்ணப்ப காலம் இரண்டு alocation பதிவுகள் முழுவதும் இருக்க முடியாது
 DocType: Item Group,Default Expense Account,முன்னிருப்பு செலவு கணக்கு
 DocType: Employee,Notice (days),அறிவிப்பு ( நாட்கள்)
@@ -3080,13 +3111,12 @@
 DocType: Production Order,Warehouses,கிடங்குகள்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,அச்சு மற்றும் நிலையான
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,குழு முனை
-DocType: Payment Reconciliation,Minimum Amount,குறைந்தபட்ச தொகை
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,புதுப்பி முடிந்தது பொருட்கள்
 DocType: Workstation,per hour,ஒரு மணி நேரத்திற்கு
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,கிடங்கு ( நிரந்தர இருப்பு ) கணக்கு இந்த கணக்கு கீழ் உருவாக்கப்பட்டது.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,பங்கு லெட்ஜர் நுழைவு கிடங்கு உள்ளது என கிடங்கு நீக்க முடியாது .
 DocType: Company,Distribution,பகிர்ந்தளித்தல்
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,கட்டண தொகை
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,கட்டண தொகை
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,திட்ட மேலாளர்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,கொல்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,மேக்ஸ் தள்ளுபடி உருப்படியை அனுமதி: {0} {1}% ஆகும்
@@ -3110,7 +3140,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ஆதரவு Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},நிறுவனத்தின் கிடங்குகளில் காணவில்லை {0}
 DocType: POS Profile,Terms and Conditions,நிபந்தனைகள்
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},தேதி நிதி ஆண்டின் க்குள் இருக்க வேண்டும். தேதி நிலையினை = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},தேதி நிதி ஆண்டின் க்குள் இருக்க வேண்டும். தேதி நிலையினை = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","இங்கே நீங்கள் உயரம், எடை, ஒவ்வாமை, மருத்துவ கவலைகள் ஹிப்ரு பராமரிக்க முடியும்"
 DocType: Leave Block List,Applies to Company,நிறுவனத்தின் பொருந்தும்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"சமர்ப்பிக்கப்பட்ட பங்கு நுழைவு {0} ஏனெனில், ரத்து செய்ய முடியாது"
@@ -3124,11 +3154,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,கொள்முதல் ரசீதுகள் உள்ளிடவும்
 DocType: Sales Invoice,Get Advances Received,முன்னேற்றம் பெற்ற கிடைக்கும்
 DocType: Email Digest,Add/Remove Recipients,சேர்க்க / பெற்றவர்கள் அகற்று
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},பரிவர்த்தனை நிறுத்தி உத்தரவு எதிரான அனுமதி இல்லை {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),ஆதரவு மின்னஞ்சல் ஐடி அமைப்பு உள்வரும் சர்வர் . (எ. கா: support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,பற்றாக்குறைவே அளவு
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
 DocType: Salary Slip,Salary Slip,சம்பளம் ஸ்லிப்
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.","தொகுப்புகள் வழங்க வேண்டும் ஐந்து சீட்டுகள் பொதி உருவாக்குதல். தொகுப்பு எண், தொகுப்பு உள்ளடக்கங்களை மற்றும் அதன் எடை தெரிவிக்க பயன்படுகிறது."
@@ -3217,7 +3247,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,ஊழியர் பதிவுகள்.
 DocType: HR Settings,Payroll Settings,சம்பளப்பட்டியல் அமைப்புகள்
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,அல்லாத தொடர்புடைய பற்றுச்சீட்டுகள் மற்றும் கட்டணங்கள் போட்டி.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,ஸ்நாக்ஸ்
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,ஸ்நாக்ஸ்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ரூட் ஒரு பெற்றோர் செலவு சென்டர் முடியாது
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,தேர்வு பிராண்ட் ...
 DocType: Sales Invoice,C-Form Applicable,பொருந்தாது சி படிவம்
@@ -3232,7 +3262,7 @@
 DocType: Appraisal,Start Date,தொடக்க தேதி
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,ஒரு காலத்தில் இலைகள் ஒதுக்க.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,சரிபார்க்க இங்கே கிளிக் செய்யவும்
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,கணக்கு {0}: நீங்கள் பெற்றோர் கணக்கு தன்னை ஒதுக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,கணக்கு {0}: நீங்கள் பெற்றோர் கணக்கு தன்னை ஒதுக்க முடியாது
 DocType: Purchase Invoice Item,Price List Rate,விலை பட்டியல் விகிதம்
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",இந்த கிடங்கில் கிடைக்கும் பங்கு அடிப்படையில் &quot;ஸ்டாக் இல்லை&quot; &quot;இருப்பு&quot; காட்டு அல்லது.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),பொருட்களை பில் (BOM)
@@ -3241,17 +3271,17 @@
 DocType: Project,Expected Start Date,எதிர்பார்க்கப்படுகிறது தொடக்க தேதி
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,குற்றச்சாட்டுக்கள் அந்த பொருளை பொருந்தாது என்றால் உருப்படியை அகற்று
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,உதாரணம். smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,பெறவும்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,பெறவும்
 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: Employee Leave Approver,Employee Leave Approver,பணியாளர் விடுப்பு சர்க்கார் தரப்பில் சாட்சி
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} வெற்றிகரமாக எங்கள் செய்திமடல் பட்டியலில் சேர்க்க.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","இழந்தது மேற்கோள் செய்யப்பட்டது ஏனெனில் , அறிவிக்க முடியாது ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,கொள்முதல் மாஸ்டர் மேலாளர்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,உத்தரவு {0} சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,உத்தரவு {0} சமர்ப்பிக்க வேண்டும்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},தொடக்க தேதி மற்றும் பொருள் முடிவு தேதி தேர்வு செய்க {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,முக்கிய செய்திகள்
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,தேதி தேதி முதல் முன் இருக்க முடியாது
@@ -3269,7 +3299,7 @@
 DocType: Industry Type,Industry Type,தொழில் அமைப்பு
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,ஏதோ தவறு நடந்து!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,எச்சரிக்கை: விடுப்பு பயன்பாடு பின்வரும் தொகுதி தேதிகள் உள்ளன
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,கவிஞருக்கு {0} ஏற்கனவே சமர்ப்பித்த
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,கவிஞருக்கு {0} ஏற்கனவே சமர்ப்பித்த
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,நிறைவு நாள்
 DocType: Purchase Invoice Item,Amount (Company Currency),அளவு (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,அமைப்பு அலகு ( துறை ) மாஸ்டர் .
@@ -3288,10 +3318,10 @@
 ,Serial No Service Contract Expiry,தொடர் எண் சேவை ஒப்பந்தம் காலாவதியாகும்
 DocType: Item,Unit of Measure Conversion,நடவடிக்கையாக மாற்றும் அலகு
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,பணியாளர் மாற்ற முடியாது
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,நீங்கள் கடன் மற்றும் அதே நேரத்தில் அதே கணக்கு பற்று முடியாது
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,நீங்கள் கடன் மற்றும் அதே நேரத்தில் அதே கணக்கு பற்று முடியாது
 DocType: Naming Series,Help HTML,HTML உதவி
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},ஒதுக்கப்படும் மொத்த தாக்கத்தில் 100 % இருக்க வேண்டும். இது {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}
 DocType: Address,Name of person or organization that this address belongs to.,நபர் அல்லது இந்த முகவரியை சொந்தமானது என்று நிறுவனத்தின் பெயர்.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,உங்கள் சப்ளையர்கள்
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,விற்பனை ஆணை உள்ளது என இழந்தது அமைக்க முடியாது.
@@ -3304,35 +3334,35 @@
 DocType: Employee,Date of Issue,இந்த தேதி
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0} இருந்து: {0} ஐந்து {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},ரோ # {0}: உருப்படியை அமைக்க சப்ளையர் {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,பொருள் {1} இணைக்கப்பட்ட வலைத்தளம் பட {0} காணலாம்
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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.,வலைத்தளத்தில் பல குழுக்கள் இந்த உருப்படி பட்டியல்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,மற்ற நாணய கணக்குகளை அனுமதிக்க பல நாணய விருப்பத்தை சரிபார்க்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,மற்ற நாணய கணக்குகளை அனுமதிக்க பல நாணய விருப்பத்தை சரிபார்க்கவும்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,பொருள்: {0} அமைப்பின் இல்லை
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,நீங்கள் உறைந்த மதிப்பை அமைக்க அதிகாரம் இல்லை
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,நீங்கள் உறைந்த மதிப்பை அமைக்க அதிகாரம் இல்லை
 DocType: Payment Reconciliation,Get Unreconciled Entries,ஒப்புரவாகவேயில்லை பதிவுகள் பெற
+DocType: Payment Reconciliation,From Invoice Date,விலைப்பட்டியல் வரம்பு தேதி
 DocType: Cost Center,Budgets,"வரவு செலவு திட்டம்,"
-DocType: Employee,Emergency Contact Details,அவசர தொடர்பு விவரம்
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,அது என்ன?
 DocType: Delivery Note,To Warehouse,சேமிப்பு கிடங்கு வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},கணக்கு {0} மேலும் நிதியாண்டில் முறை உள்ளிட்ட{1}
 ,Average Commission Rate,சராசரி கமிஷன் விகிதம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,வருகை எதிர்கால நாட்களுக்கு குறித்தது முடியாது
 DocType: Pricing Rule,Pricing Rule Help,விலை விதி உதவி
 DocType: Purchase Taxes and Charges,Account Head,கணக்கு ஒதுக்கும் தலைப்பு - பிரிவு
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,பொருட்களை தரையிறங்கியது செலவு கணக்கிட கூடுதல் செலவுகள் புதுப்பிக்கவும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,மின்
 DocType: Stock Entry,Total Value Difference (Out - In),மொத்த மதிப்பு வேறுபாடு (அவுட் - ல்)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,ரோ {0}: மாற்று வீதம் கட்டாயமாகும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,ரோ {0}: மாற்று வீதம் கட்டாயமாகும்
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},பயனர் ஐடி பணியாளர் அமைக்க{0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,உத்தரவாதத்தை கூறுகின்றனர் இருந்து
 DocType: Stock Entry,Default Source Warehouse,முன்னிருப்பு மூல கிடங்கு
 DocType: Item,Customer Code,வாடிக்கையாளர் கோட்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},பிறந்த நாள் நினைவூட்டல் {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,கடந்த சில நாட்களாக கடைசி ஆர்டர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,பங்கு சொத்துக்கள்
@@ -3345,7 +3375,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,கணக்கு {0} நிறைவு வகை பொறுப்பு / ஈக்விட்டி இருக்க வேண்டும்
 DocType: Authorization Rule,Based On,அடிப்படையில்
 DocType: Sales Order Item,Ordered Qty,அளவு உத்தரவிட்டார்
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Stock Settings,Stock Frozen Upto,பங்கு வரை உறை
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},வரம்பு மற்றும் காலம் மீண்டும் மீண்டும் கட்டாய தேதிகள் காலம் {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,திட்ட செயல்பாடு / பணி.
@@ -3353,7 +3383,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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 க்கும் குறைவான இருக்க வேண்டும்
 DocType: Purchase Invoice,Write Off Amount (Company Currency),தொகை ஆஃப் எழுத (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed செலவு வவுச்சர்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},அமைக்கவும் {0}
 DocType: Purchase Invoice,Repeat on Day of Month,மாதம் ஒரு நாள் மீண்டும்
@@ -3383,12 +3413,12 @@
 DocType: Upload Attendance,Upload Attendance,பங்கேற்கும் பதிவேற்ற
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,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/accounts/doctype/journal_entry/journal_entry.js +446,Amount,அளவு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,அளவு
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM பதிலாக
 ,Sales Analytics,விற்பனை அனலிட்டிக்ஸ்
 DocType: Manufacturing Settings,Manufacturing Settings,உற்பத்தி அமைப்புகள்
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,மின்னஞ்சல் அமைத்தல்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,நிறுவனத்தின் முதன்மை இயல்புநிலை நாணய உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,நிறுவனத்தின் முதன்மை இயல்புநிலை நாணய உள்ளிடவும்
 DocType: Stock Entry Detail,Stock Entry Detail,பங்கு நுழைவு விரிவாக
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,டெய்லி நினைவூட்டல்கள்
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},வரி விதிமுறை முரண்படுகிறது {0}
@@ -3414,13 +3444,13 @@
 DocType: Sales Order Item,Produced Quantity,உற்பத்தி அளவு
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,பொறியாளர்
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,தேடல் துணை கூட்டங்கள்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},வரிசை எண் தேவையான பொருள் கோட் {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},வரிசை எண் தேவையான பொருள் கோட் {0}
 DocType: Sales Partner,Partner Type,வரன்வாழ்க்கை துணை வகை
 DocType: Purchase Taxes and Charges,Actual,உண்மையான
 DocType: Authorization Rule,Customerwise Discount,Customerwise தள்ளுபடி
 DocType: Purchase Invoice,Against Expense Account,செலவு கணக்கு எதிராக
 DocType: Production Order,Production Order,உற்பத்தி ஆணை
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,நிறுவல் குறிப்பு {0} ஏற்கனவே சமர்ப்பித்த
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,நிறுவல் குறிப்பு {0} ஏற்கனவே சமர்ப்பித்த
 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,இப்போது காண்க
@@ -3432,15 +3462,15 @@
 DocType: Employee,Applicable Holiday List,பொருந்தும் விடுமுறை பட்டியல்
 DocType: Employee,Cheque,காசோலை
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,தொடர் இற்றை
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,புகார் வகை கட்டாய ஆகிறது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,புகார் வகை கட்டாய ஆகிறது
 DocType: Item,Serial Number Series,வரிசை எண் தொடர்
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},கிடங்கு பங்கு பொருள் கட்டாய {0} வரிசையில் {1}
 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/public/js/setup_wizard.js +101,The First User: You,முதல் பயனர் : நீங்கள்
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},நிதியாண்டு தொடக்க தேதி மற்றும் நிதி ஆண்டு இறுதியில் தேதி ஏற்கனவே நிதி ஆண்டில் அமைக்க {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,வெற்றிகரமாக ஒருமைப்படுத்திய
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},நிதியாண்டு தொடக்க தேதி மற்றும் நிதி ஆண்டு இறுதியில் தேதி ஏற்கனவே நிதி ஆண்டில் அமைக்க {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,வெற்றிகரமாக ஒருமைப்படுத்திய
 DocType: Production Order,Planned End Date,திட்டமிட்ட தேதி
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,அங்கு பொருட்களை சேமிக்கப்படும்.
 DocType: Tax Rule,Validity,ஏற்றுக்கொள்ளக்கூடிய
@@ -3448,7 +3478,7 @@
 DocType: Attendance,Attendance,கவனம்
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,தகவல்களுக்கு தேதி மற்றும் தகவல்களுக்கு நேரம் கட்டாய ஆகிறது
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,தகவல்களுக்கு தேதி மற்றும் தகவல்களுக்கு நேரம் கட்டாய ஆகிறது
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,பரிவர்த்தனைகள் வாங்கும் வரி வார்ப்புரு .
 ,Item Prices,உருப்படியை விலைகள்
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,நீங்கள் கொள்முதல் ஆணை சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
@@ -3457,15 +3487,15 @@
 DocType: Task,Review Date,தேதி
 DocType: Purchase Invoice,Advance Payments,அட்வான்ஸ் கொடுப்பனவு
 DocType: Purchase Taxes and Charges,On Net Total,நிகர மொத்தம் உள்ள
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,வரிசையில் இலக்கு கிடங்கில் {0} அதே இருக்க வேண்டும் உத்தரவு
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,வரிசையில் இலக்கு கிடங்கில் {0} அதே இருக்க வேண்டும் உத்தரவு
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,அனுமதி இல்லை கொடுப்பனவு கருவி பயன்படுத்த
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% கள் மீண்டும் மீண்டும் குறிப்பிடப்படவில்லை 'அறிவிப்பு மின்னஞ்சல் முகவரிகளில்'
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,நாணய வேறு நாணயங்களுக்கு பயன்படுத்தி உள்ளீடுகள் செய்வதில் பிறகு மாற்றிக்கொள்ள
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,நாணய வேறு நாணயங்களுக்கு பயன்படுத்தி உள்ளீடுகள் செய்வதில் பிறகு மாற்றிக்கொள்ள
 DocType: Company,Round Off Account,கணக்கு ஆஃப் சுற்றுக்கு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,நிர்வாக செலவுகள்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,ஆலோசனை
 DocType: Customer Group,Parent Customer Group,பெற்றோர் வாடிக்கையாளர் பிரிவு
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,மாற்றம்
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,மாற்றம்
 DocType: Purchase Invoice,Contact Email,மின்னஞ்சல் தொடர்பு
 DocType: Appraisal Goal,Score Earned,ஜூலை ஈட்டிய
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","உதாரணமாக, ""என் கம்பெனி எல்எல்சி"""
@@ -3475,13 +3505,13 @@
 DocType: Packing Slip,Gross Weight UOM,மொத்த எடை மொறட்டுவ பல்கலைகழகம்
 DocType: Email Digest,Receivables / Payables,வரவுகள் / Payables
 DocType: Delivery Note Item,Against Sales Invoice,விற்பனை விலைப்பட்டியல் எதிராக
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,கடன் கணக்கு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,கடன் கணக்கு
 DocType: Landed Cost Item,Landed Cost Item,இறங்கினார் செலவு உருப்படி
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,பூஜ்ய மதிப்புகள் காட்டு
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,உருப்படி அளவு மூலப்பொருட்களை கொடுக்கப்பட்ட அளவு இருந்து உற்பத்தி / repacking பின்னர் பெறப்படும்
 DocType: Payment Reconciliation,Receivable / Payable Account,பெறத்தக்க / செலுத்த வேண்டிய கணக்கு
 DocType: Delivery Note Item,Against Sales Order Item,விற்பனை ஆணை பொருள் எதிராக
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
 DocType: Item,Default Warehouse,இயல்புநிலை சேமிப்பு கிடங்கு
 DocType: Task,Actual End Date (via Time Logs),உண்மையான தேதி (நேரத்தில் பதிவுகள் வழியாக)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},பட்ஜெட் குழு கணக்கை எதிராக ஒதுக்கப்படும் முடியாது {0}
@@ -3517,29 +3547,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,வர்க்ஸ்டேஷன் பணிநேரம் தவிர்த்து நேரத்தில் பதிவுகள் திட்டமிட்டுள்ளோம்.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ஏற்கனவே சமர்ப்பிக்கபட்டது
 ,Items To Be Requested,கோரிய பொருட்களை
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,கடைசியாக கொள்முதல் விலை கிடைக்கும்
 DocType: Time Log,Billing Rate based on Activity Type (per hour),நடவடிக்கை வகை அடிப்படையில் பில்லிங் விகிதம் (ஒரு நாளைக்கு)
 DocType: Company,Company Info,நிறுவன தகவல்
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","நிறுவனத்தின் மின்னஞ்சல் ஐடி இல்லை , எனவே அனுப்பிய மின்னஞ்சல்"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),நிதி பயன்பாடு ( சொத்துக்கள் )
 DocType: Production Planning Tool,Filter based on item,உருப்படியை அடிப்படையில் வடிகட்ட
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,பற்று கணக்கு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,பற்று கணக்கு
 DocType: Fiscal Year,Year Start Date,ஆண்டு தொடக்க தேதி
 DocType: Attendance,Employee Name,பணியாளர் பெயர்
 DocType: Sales Invoice,Rounded Total (Company Currency),வட்டமான மொத்த (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"கணக்கு வகை தேர்வு, ஏனெனில் குழு இரகசிய முடியாது."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"கணக்கு வகை தேர்வு, ஏனெனில் குழு இரகசிய முடியாது."
 DocType: Purchase Common,Purchase Common,பொதுவான வாங்க
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,வாய்ப்பை இருந்து
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,பணியாளர் நன்மைகள்
 DocType: Sales Invoice,Is POS,பிஓஎஸ் உள்ளது
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
 DocType: Production Order,Manufactured Qty,உற்பத்தி அளவு
 DocType: Purchase Receipt Item,Accepted Quantity,ஏற்று அளவு
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} இல்லை உள்ளது
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,பில்கள் வாடிக்கையாளர்கள் உயர்த்தப்பட்டுள்ளது.
 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 +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} சந்தாதாரர்கள் சேர்ந்தன
 DocType: Maintenance Schedule,Schedule,அனுபந்தம்
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","இந்த செலவு மையம் பட்ஜெட் வரையறை. பட்ஜெட் அமைக்க, பார்க்க &quot;நிறுவனத்தின் பட்டியல்&quot;"
@@ -3547,7 +3578,7 @@
 DocType: Quality Inspection Reading,Reading 3,3 படித்தல்
 ,Hub,மையம்
 DocType: GL Entry,Voucher Type,ரசீது வகை
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
 DocType: Expense Claim,Approved,ஏற்பளிக்கப்பட்ட
 DocType: Pricing Rule,Price,விலை
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',{0} ம் நிம்மதியாக பணியாளர் 'இடது' அமைக்க வேண்டும்
@@ -3561,7 +3592,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,பைனான்ஸ் ஜர்னல் பதிவுகள்.
 DocType: Delivery Note Item,Available Qty at From Warehouse,கிடங்கில் இருந்து கிடைக்கும் அளவு
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ரோ {0}: கட்சி / கணக்கு பொருந்தவில்லை {1} / {2} உள்ள {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,ஒரு வரி கணக்கு உருவாக்க
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
 DocType: Account,Stock,பங்கு
@@ -3572,7 +3603,7 @@
 DocType: Employee,Contract End Date,ஒப்பந்தம் முடிவு தேதி
 DocType: Sales Order,Track this Sales Order against any Project,எந்த திட்டம் எதிரான இந்த விற்பனை ஆணை கண்காணிக்க
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,மேலே அடிப்படை அடிப்படையில் விற்பனை ஆணைகள் (வழங்க நிலுவையில்) இழுக்க
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,வழங்குபவர் கூறியவை
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,வழங்குபவர் கூறியவை
 DocType: Deduction Type,Deduction Type,துப்பறியும் வகை
 DocType: Attendance,Half Day,அரை நாள்
 DocType: Pricing Rule,Min Qty,min அளவு
@@ -3580,7 +3611,7 @@
 DocType: GL Entry,Transaction Date,பரிவர்த்தனை தேதி
 DocType: Production Plan Item,Planned Qty,திட்டமிட்ட அளவு
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,மொத்த வரி
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,அளவு (அளவு உற்பத்தி) என்பது கட்டாயம்
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,அளவு (அளவு உற்பத்தி) என்பது கட்டாயம்
 DocType: Stock Entry,Default Target Warehouse,முன்னிருப்பு அடைவு கிடங்கு
 DocType: Purchase Invoice,Net Total (Company Currency),நிகர மொத்தம் (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ரோ {0}: கட்சி வகை மற்றும் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கை எதிராக மட்டுமே பொருந்தும்
@@ -3634,9 +3665,9 @@
 DocType: Customer,Commission Rate,கமிஷன் விகிதம்
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,மாற்று செய்ய
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,துறை மூலம் பயன்பாடுகள் விட்டு தடுக்கும்.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,கார்ட் காலியாக உள்ளது
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,கார்ட் காலியாக உள்ளது
 DocType: Production Order,Actual Operating Cost,உண்மையான இயக்க செலவு
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,ரூட் திருத்த முடியாது .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,ரூட் திருத்த முடியாது .
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,ஒதுக்கப்பட்ட தொகை unadusted தொகையை விட கூடுதலான முடியாது
 DocType: Manufacturing Settings,Allow Production on Holidays,விடுமுறை உற்பத்தி அனுமதி
 DocType: Sales Order,Customer's Purchase Order Date,வாடிக்கையாளர் கொள்முதல் ஆர்டர் தேதி
@@ -3647,11 +3678,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,வடிவமைப்புகள்
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,நிபந்தனைகள் வார்ப்புரு
 DocType: Serial No,Delivery Details,விநியோக விவரம்
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,அளவு இந்த அளவு கீழே விழும் என்றால் தானாக பொருள் வேண்டுதல் உருவாக்க
 ,Item-wise Purchase Register,உருப்படியை வாரியான வாங்குதல் பதிவு
 DocType: Batch,Expiry Date,காலாவதியாகும் தேதி
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","மீள் கட்டளை நிலை அமைக்க, உருப்படி ஒரு கொள்முதல் பொருள் அல்லது தயாரிப்பு பொருள் இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","மீள் கட்டளை நிலை அமைக்க, உருப்படி ஒரு கொள்முதல் பொருள் அல்லது தயாரிப்பு பொருள் இருக்க வேண்டும்"
 ,Supplier Addresses and Contacts,வழங்குபவர் முகவரிகள் மற்றும் தொடர்புகள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,முதல் வகையை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/projects.py +18,Project master.,திட்டம் மாஸ்டர்.
@@ -3659,7 +3690,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(அரை நாள்)
 DocType: Supplier,Credit Days,கடன் நாட்கள்
 DocType: Leave Type,Is Carry Forward,அடுத்த Carry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,பொருட்களின் பில்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ரோ {0}: கட்சி வகை மற்றும் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கிற்கு தேவையான {1}
@@ -3667,7 +3698,7 @@
 DocType: Employee,Reason for Leaving,விட்டு காரணம்
 DocType: Expense Claim Detail,Sanctioned Amount,ஒப்புதல் தொகை
 DocType: GL Entry,Is Opening,திறக்கிறது
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},ரோ {0}: ஒப்புதல் நுழைவு இணைத்தே ஒரு {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,கணக்கு {0} இல்லை
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},ரோ {0}: ஒப்புதல் நுழைவு இணைத்தே ஒரு {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,கணக்கு {0} இல்லை
 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 efb5b82..70616ab 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,สินค้าอุปโภคบริโภค
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,กรุณาเลือกประเภทพรรคแรก
 DocType: Item,Customer Items,รายการลูกค้า
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่สามารถแยกประเภท
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่สามารถแยกประเภท
 DocType: Item,Publish Item to hub.erpnext.com,เผยแพร่รายการที่จะ hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,การแจ้งเตือน ทางอีเมล์
 DocType: Item,Default Unit of Measure,หน่วยเริ่มต้นของวัด
@@ -19,13 +19,13 @@
 DocType: POS Profile,Applicable for User,ใช้งานได้สำหรับผู้ใช้
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",หยุดใบสั่งผลิตไม่สามารถยกเลิกจุกมันเป็นครั้งแรกที่จะยกเลิก
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},สกุลเงินเป็นสิ่งจำเป็นสำหรับราคา {0}
-DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* จะได้รับการคำนวณในการทำธุรกรรม
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* จะได้รับการคำนวณขณะการทำธุรกรรม
 DocType: Purchase Order,Customer Contact,ติดต่อลูกค้า
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,ขอ จาก วัสดุ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,ขอ จาก วัสดุ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ต้นไม้
 DocType: Job Applicant,Job Applicant,ผู้สมัครงาน
 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/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},ประเภทภาษีที่เกิดขึ้นจริงไม่สามารถรวมอยู่ในราคาสินค้าในแถว {0}
 DocType: C-Form,Customer,ลูกค้า
 DocType: Purchase Receipt Item,Required By,ที่จำเป็นโดย
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 เพื่อรักษารหัสรายการลูกค้าที่ฉลาดและจะทำให้พวกเขาค้นหาตามรหัสของพวกเขาใช้ตัวเลือกนี้
 DocType: Mode of Payment Account,Mode of Payment Account,โหมดของการบัญชีการชำระเงิน
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,แสดงหลากหลายรูปแบบ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,ปริมาณ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,จำนวน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),เงินให้กู้ยืม ( หนี้สิน )
 DocType: Employee Education,Year of Passing,ปีที่ผ่าน
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ในสต็อก
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,การดูแลสุขภาพ
 DocType: Purchase Invoice,Monthly,รายเดือน
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ความล่าช้าในการชำระเงิน (วัน)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,ใบกำกับสินค้า
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,ใบกำกับสินค้า
 DocType: Maintenance Schedule Item,Periodicity,การเป็นช่วง ๆ
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ที่อยู่อีเมล
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,ปีงบประมาณ {0} จะต้อง
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ฝ่ายจำเลย
 DocType: Company,Abbr,ตัวอักษรย่อ
 DocType: Appraisal Goal,Score (0-5),คะแนน (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},แถว {0}: {1} {2} ไม่ตรงกับ {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},แถว {0}: {1} {2} ไม่ตรงกับ {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,แถว # {0}:
 DocType: Delivery Note,Vehicle No,รถไม่มี
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,เลือกรายชื่อราคา
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,เลือกรายชื่อราคา
 DocType: Production Order Operation,Work In Progress,ทำงานในความคืบหน้า
 DocType: Employee,Holiday List,รายการวันหยุด
 DocType: Time Log,Time Log,บันทึกเวลา
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,บริษัท เดียวกันจะเข้ามามากกว่าหนึ่งครั้ง
 DocType: Employee,Married,แต่งงาน
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ไม่อนุญาตสำหรับ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
 DocType: Payment Reconciliation,Reconcile,คืนดี
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ร้านขายของชำ
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ให้ธนาคารเข้า
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,กองทุน บำเหน็จบำนาญ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,คลังสินค้ามีผลบังคับใช้ถ้าเป็นประเภทบัญชีคลังสินค้า
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,คลังสินค้ามีผลบังคับใช้ถ้าเป็นประเภทบัญชีคลังสินค้า
 DocType: SMS Center,All Sales Person,คนขายทั้งหมด
 DocType: Lead,Person Name,คนที่ชื่อ
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",ตรวจสอบว่าคำสั่งที่เกิดขึ้นยกเลิกการเลือกที่จะหยุดการเกิดขึ้นอีกหรือวางที่เหมาะสมวันที่สิ้นสุด
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,สนใจ
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,รายการวัสดุ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,การเปิด
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},จาก {0} เป็น {1}
+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,เปิดรายการ
 DocType: Stock Entry,Additional Costs,ค่าใช้จ่ายเพิ่มเติม
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,บัญชี กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,บัญชี กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
 DocType: Lead,Product Enquiry,สอบถามสินค้า
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,กรุณากรอก บริษัท แรก
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,เป้าหมาย ที่
+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 +9,Activity Log:,บันทึกกิจกรรม:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,รายการที่ {0} ไม่อยู่ใน ระบบหรือ หมดอายุแล้ว
@@ -165,7 +165,7 @@
 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 +444,Item {0} is not active or end of life has been reached,รายการที่ {0} ไม่ได้ใช้งาน หรือจุดสิ้นสุดของ ชีวิต ได้ถึง
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,รายการที่ {0} ไม่ได้ใช้งาน หรือจุดสิ้นสุดของ ชีวิต ได้ถึง
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,จะมีการปรับปรุงหลังจากที่ใบแจ้งหนี้การขายมีการส่ง
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,การตั้งค่าสำหรับ โมดูล ทรัพยากรบุคคล
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,รายละเอียดของการดำเนินการดำเนินการ
 DocType: Serial No,Maintenance Status,สถานะการบำรุงรักษา
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,รายการและราคา
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},จากวันที่ควรจะเป็นภายในปีงบประมาณ สมมติว่าตั้งแต่วันที่ = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},จากวันที่ควรจะเป็นภายในปีงบประมาณ สมมติว่าตั้งแต่วันที่ = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,เลือกพนักงานสำหรับคนที่คุณกำลังสร้างการประเมิน
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},ศูนย์ต้นทุน {0} ไม่ได้เป็นของ บริษัท {1}
 DocType: Customer,Individual,บุคคล
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,เงินสดสุทธิจากการจัดหาเงินทุน
 DocType: Lead,Address & Contact,ที่อยู่และติดต่อ
 DocType: Leave Allocation,Add unused leaves from previous allocations,เพิ่มใบไม่ได้ใช้จากการจัดสรรก่อนหน้า
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},ที่เกิดขึ้นต่อไป {0} จะถูกสร้างขึ้นบน {1}
@@ -222,6 +223,7 @@
 ,Contact Name,ชื่อผู้ติดต่อ
 DocType: Production Plan Item,SO Pending Qty,ดังนั้นรอจำนวน
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,สร้างสลิปเงินเดือนสำหรับเกณฑ์ดังกล่าวข้างต้น
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,ให้ คำอธิบาย
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ขอซื้อ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,เพียง เลือก ผู้อนุมัติ ออกสามารถส่ง ออกจาก โปรแกรมนี้
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,บรรเทา วันที่ ต้องมากกว่า วันที่ เข้าร่วม
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,สเปกเว็บไซต์รายการ
 DocType: Payment Tool,Reference No,อ้างอิง
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,ฝากที่ถูกบล็อก
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,ประจำปี
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,สต็อกสินค้าสมานฉันท์
 DocType: Stock Entry,Sales Invoice No,ขายใบแจ้งหนี้ไม่มี
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,ประเภทผู้ผลิต
 DocType: Item,Publish in Hub,เผยแพร่ใน Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,ขอวัสดุ
 DocType: Bank Reconciliation,Update Clearance Date,อัพเดทวันที่ Clearance
 DocType: Item,Purchase Details,รายละเอียดการซื้อ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},รายการ {0} ไม่พบใน &#39;วัตถุดิบมา&#39; ตารางในการสั่งซื้อ {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},รายการ {0} ไม่พบใน &#39;วัตถุดิบมา&#39; ตารางในการสั่งซื้อ {1}
 DocType: Employee,Relation,ความสัมพันธ์
 DocType: Shipping Rule,Worldwide Shipping,การจัดส่งสินค้าทั่วโลก
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,คำสั่งซื้อได้รับการยืนยันจากลูกค้า
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,ข้อเสนอแนะ
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,กำหนดงบประมาณกลุ่มฉลาดรายการในมณฑลนี้ คุณยังสามารถรวมฤดูกาลโดยการตั้งค่าการกระจาย
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},กรุณากรอกตัวอักษรกลุ่มบัญชีผู้ปกครองสำหรับคลังสินค้า {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},การชำระเงินกับ {0} {1} ไม่สามารถจะสูงกว่าจำนวนเงินที่โดดเด่น {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,สร้างตาราง
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ล่าสุด
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,สูงสุด 5 ตัวอักษร
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,อนุมัติไว้ครั้งแรกในรายการจะถูกกำหนดเป็นค่าเริ่มต้นอนุมัติไว้
+apps/erpnext/erpnext/config/desktop.py +73,Learn,เรียนรู้
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ค่าใช้จ่ายในกิจกรรมต่อพนักงาน
 DocType: Accounts Settings,Settings for Accounts,การตั้งค่าสำหรับบัญชี
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,จัดการ คนขาย ต้นไม้
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,หลายสกุลเงิน
 DocType: Payment Reconciliation Invoice,Invoice Type,ประเภทใบแจ้งหนี้
 DocType: Sales Invoice Item,Delivery Note,หมายเหตุจัดส่งสินค้า
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,การตั้งค่าภาษี
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,การตั้งค่าภาษี
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,เข้าชำระเงินได้รับการแก้ไขหลังจากที่คุณดึงมัน กรุณาดึงมันอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} เข้ามา เป็นครั้งที่สอง ใน รายการ ภาษี
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} ได้บันทึกเป็นครั้งที่สองใน รายการ ภาษี
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,สรุปในสัปดาห์นี้และกิจกรรมที่ค้างอยู่
 DocType: Workstation,Rent Cost,ต้นทุนการ ให้เช่า
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,กรุณาเลือกเดือนและปี
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","ที่มีจำหน่ายใน BOM , หมายเหตุ การจัดส่ง ใบแจ้งหนี้ การซื้อ , การผลิต สั่งซื้อ สั่ง ซื้อ รับซื้อ , ขายใบแจ้งหนี้ การขายสินค้า สต็อก เข้า Timesheet"
 DocType: Item Tax,Tax Rate,อัตราภาษี
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,เลือกรายการ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,เลือกรายการ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","รายการ: {0} การจัดการชุดฉลาดไม่สามารถคืนดีใช้ \
  สมานฉันท์หุ้นแทนที่จะใช้เข้าสต็อก"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},แถว # {0}: รุ่นที่ไม่มีจะต้องเป็นเช่นเดียวกับ {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,แปลงที่ไม่ใช่กลุ่ม
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ใบเสร็จรับเงินจะต้องส่ง
@@ -350,9 +353,10 @@
 DocType: Workstation,Consumable Cost,ค่าใช้จ่ายที่ สิ้นเปลือง
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) จะต้องมีบทบาท 'ออกอนุมัติ'
 DocType: Purchase Receipt,Vehicle Date,วันที่ยานพาหนะ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ทางการแพทย์
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,การแพทย์
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,เหตุผล สำหรับการสูญเสีย
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,เดียว
 DocType: Issue,Attachment,ความผูกพัน
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,งบประมาณไม่สามารถตั้งค่าสำหรับศูนย์ต้นทุนกลุ่ม
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,นาย ฮอลิเดย์
 DocType: Material Request Item,Required Date,วันที่ที่ต้องการ
 DocType: Delivery Note,Billing Address,ที่อยู่การเรียกเก็บเงิน
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,กรุณากรอก รหัสสินค้า
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,กรุณากรอก รหัสสินค้า
 DocType: BOM,Costing,ต้นทุน
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",หากการตรวจสอบจำนวนเงินภาษีจะถือว่าเป็นรวมอยู่ในอัตราพิมพ์ / จำนวนพิมพ์
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,จำนวนรวม
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
 DocType: Shipping Rule,Net Weight,ปริมาณสุทธิ
 DocType: Employee,Emergency Phone,โทรศัพท์ ฉุกเฉิน
 ,Serial No Warranty Expiry,อนุกรมหมดอายุไม่มีการรับประกัน
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,ไม่สามารถเพิ่มเป็น 0
 DocType: Production Planning Tool,Material Requirement,ความต้องการวัสดุ
 DocType: Company,Delete Company Transactions,ลบรายการที่ บริษัท
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,รายการที่ {0} ไม่ได้ ซื้อ สินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,รายการที่ {0} ไม่ได้ ซื้อ สินค้า
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} เป็นที่อยู่อีเมลที่ไม่ถูกต้องใน 'ประกาศ \
  ที่อยู่อีเมลล์'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,การเรียกเก็บเงินรวมในปีนี้:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,เพิ่ม / แก้ไข ภาษีและค่าธรรมเนียม
 DocType: Purchase Invoice,Supplier Invoice No,ใบแจ้งหนี้ที่ผู้ผลิตไม่มี
 DocType: Territory,For reference,สำหรับการอ้างอิง
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",ไม่สามารถลบไม่มี Serial {0} เป็นมันถูกนำมาใช้ในการทำธุรกรรมหุ้น
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),ปิด (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),ปิด (Cr)
 DocType: Serial No,Warranty Period (Days),ระยะเวลารับประกัน (วัน)
 DocType: Installation Note Item,Installation Note Item,รายการหมายเหตุการติดตั้ง
 ,Pending Qty,รอดำเนินการจำนวน
@@ -466,7 +469,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** การกระจายรายเดือน ** จะช่วยให้คุณกระจายงบประมาณของคุณในเดือนถ้าคุณมีฤดูกาลในธุรกิจของคุณ
 
  ต้องการกระจายงบประมาณโดยใช้การกระจายนี้ตั้งนี้การกระจายรายเดือน ** ** ** ในศูนย์ต้นทุน **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,ไม่พบใบแจ้งหนี้ในตารางบันทึก
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,ไม่พบใบแจ้งหนี้ในตารางบันทึก
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,กรุณาเลือก บริษัท และประเภทพรรคแรก
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,การเงิน รอบปีบัญชี /
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",ขออภัย อนุกรม Nos ไม่สามารถ รวม
@@ -474,9 +477,9 @@
 DocType: Project Task,Project Task,โครงการงาน
 ,Lead Id,รหัสช่องทาง
 DocType: C-Form Invoice Detail,Grand Total,รวมทั้งสิ้น
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,วันเริ่มต้นปีงบประมาณไม่ควรจะสูงกว่าปีงบประมาณที่สิ้นสุดวันที่
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,วันเริ่มต้นปีงบประมาณไม่ควรจะสูงกว่าปีงบประมาณที่สิ้นสุดวันที่
 DocType: Warranty Claim,Resolution,ความละเอียด
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},จัดส่ง: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},จัดส่ง: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,เจ้าหนี้การค้า
 DocType: Sales Order,Billing and Delivery Status,เรียกเก็บเงินและสถานะการจัดส่ง
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ทำซ้ำลูกค้า
@@ -491,7 +494,7 @@
 DocType: Quotation,Quotation To,ใบเสนอราคาเพื่อ
 DocType: Lead,Middle Income,มีรายได้ปานกลาง
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),เปิด ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,จำนวนเงินที่จัดสรร ไม่สามารถ ลบ
 DocType: Purchase Order Item,Billed Amt,จำนวนจำนวนมากที่สุด
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,โกดังตรรกะกับที่รายการหุ้นที่ทำ
@@ -500,10 +503,10 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,การสั่งซื้อการผลิตบังคับ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,การเขียน ข้อเสนอ
 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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},ข้อผิดพลาด หุ้น ลบ ( {6}) กับ รายการ {0} ใน คลังสินค้า {1} ใน {2} {3} ใน {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},ข้อผิดพลาด หุ้น ลบ ( {6}) กับ รายการ {0} ใน คลังสินค้า {1} ใน {2} {3} ใน {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,ปีงบประมาณ บริษัท
 DocType: Packing Slip Item,DN Detail,รายละเอียด DN
-DocType: Time Log,Billed,เรียกเก็บเงิน
+DocType: Time Log,Billed,ได้เรียกเก็บเงินแล้ว
 DocType: Batch,Batch Description,คำอธิบาย Batch
 DocType: Delivery Note,Time at which items were delivered from warehouse,เวลาที่รายการถูกส่งมาจากคลังสินค้า
 DocType: Sales Invoice,Sales Taxes and Charges,ภาษีการขายและค่าใช้จ่าย
@@ -519,16 +522,17 @@
 DocType: Activity Type,Default Costing Rate,เริ่มต้นอัตราการคิดต้นทุน
 DocType: Maintenance Schedule,Maintenance Schedule,กำหนดการซ่อมบำรุง
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","แล้วกฎราคาจะถูกกรองออกขึ้นอยู่กับลูกค้ากลุ่มลูกค้า, มณฑล, ผู้ผลิต, ผู้ผลิตประเภทแคมเปญพันธมิตรการขายอื่น ๆ"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,เปลี่ยนสุทธิในสินค้าคงคลัง
 DocType: Employee,Passport Number,หมายเลขหนังสือเดินทาง
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,ผู้จัดการ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,จากการรับซื้อ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,รายการเดียวกันได้รับการป้อนหลายครั้ง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,จากการรับซื้อ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,รายการเดียวกันได้รับการป้อนหลายครั้ง
 DocType: SMS Settings,Receiver Parameter,พารามิเตอร์รับ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' อยู่ ใน ' และ ' จัดกลุ่มตาม ' ต้องไม่เหมือนกัน
 DocType: Sales Person,Sales Person Targets,ขายเป้าหมายคน
 DocType: Production Order Operation,In minutes,ในไม่กี่นาที
 DocType: Issue,Resolution Date,วันที่ความละเอียด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
 DocType: Selling Settings,Customer Naming By,การตั้งชื่อตามลูกค้า
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,แปลงเป็น กลุ่ม
 DocType: Activity Cost,Activity Type,ประเภทกิจกรรม
@@ -539,7 +543,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} ไม่พบในตารางรายละเอียดใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,การบำรุงรักษา ไปที่ {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
 DocType: Material Request,Material Transfer,โอนวัสดุ
@@ -550,10 +554,10 @@
 DocType: BOM Operation,Operation Time,เปิดบริการเวลา
 DocType: Pricing Rule,Sales Manager,ผู้จัดการฝ่ายขาย
 DocType: Journal Entry,Write Off Amount,เขียนทันทีจำนวน
-DocType: Journal Entry,Bill No,ไม่มีบิล
-DocType: Purchase Invoice,Quarterly,ทุกสามเดือน
+DocType: Journal Entry,Bill No,หมายเลขบิล
+DocType: Purchase Invoice,Quarterly,ทุกไตรมาส
 DocType: Selling Settings,Delivery Note Required,หมายเหตุจัดส่งสินค้าที่จำเป็น
-DocType: Sales Order Item,Basic Rate (Company Currency),อัตราขั้นพื้นฐาน (สกุลเงิน บริษัท )
+DocType: Sales Order Item,Basic Rate (Company Currency),อัตราขั้นพื้นฐาน (สกุลเงินบริษัท )
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush วัตถุดิบที่ใช้ใน
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,กรุณากรอก รายละเอียดของรายการ
 DocType: Purchase Receipt,Other Details,รายละเอียดอื่น ๆ
@@ -561,13 +565,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,การตลาด
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,เพื่อติดตามรายการในเอกสารการขายและการซื้อจาก Nos อนุกรมของพวกเขา นี้สามารถใช้ในการติดตามรายละเอียดการรับประกันของผลิตภัณฑ์
 DocType: Purchase Receipt Item Supplied,Current Stock,สต็อกปัจจุบัน
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,คลังสินค้า ปฏิเสธ มีผลบังคับใช้ กับ รายการ regected
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,การเรียกเก็บเงินรวมในปีนี้
 DocType: Account,Expenses Included In Valuation,ค่าใช้จ่ายรวมอยู่ในการประเมินมูลค่า
 DocType: Employee,Provide email id registered in company,ให้ ID อีเมลที่ลงทะเบียนใน บริษัท
 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 +533,Item has variants.,รายการที่มีสายพันธุ์
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ประเภท ต้นไม้
@@ -585,18 +589,18 @@
 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 +92,{0} is not a stock Item,{0} ไม่ได้เป็น รายการ สต็อก
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ไม่ได้เป็น รายการ สต็อก
 DocType: Mode of Payment Account,Default Account,บัญชีเริ่มต้น
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,ต้องตั้งช่องทาง ถ้า โอกาสถูกสร้างมาจากช่องทาง
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,กรุณาเลือก วันหยุด ประจำสัปดาห์
 DocType: Production Order Operation,Planned End Time,เวลาสิ้นสุดการวางแผน
 ,Sales Person Target Variance Item Group-Wise,คน ขาย เป้าหมาย แปรปรวน กลุ่มสินค้า - ฉลาด
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,บัญชี กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,บัญชี กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
 DocType: Delivery Note,Customer's Purchase Order No,ใบสั่งซื้อของลูกค้าไม่มี
 DocType: Employee,Cell Number,จำนวนเซลล์
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto วัสดุการขอสร้าง
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,สูญหาย
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,คุณไม่สามารถใส่บัตรกำนัลในปัจจุบัน 'กับอนุทิน' คอลัมน์
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,คุณไม่สามารถใส่บัตรกำนัลในปัจจุบัน 'กับอนุทิน' คอลัมน์
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,พลังงาน
 DocType: Opportunity,Opportunity From,โอกาสจาก
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,งบเงินเดือน
@@ -605,11 +609,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: จาก {0} ประเภท {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,แถว {0}: ปัจจัยการแปลงมีผลบังคับใช้
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,รายการทางบัญชีสามารถทำกับโหนดใบ คอมเมนต์กับกลุ่มไม่ได้รับอนุญาต
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,ไม่สามารถยกเลิกการใช้งานหรือยกเลิก BOM ตามที่มีการเชื่อมโยงกับ BOMs อื่น ๆ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,ไม่สามารถยกเลิกการใช้งานหรือยกเลิก BOM ตามที่มีการเชื่อมโยงกับ BOMs อื่น ๆ
 DocType: Opportunity,Maintenance,การบำรุงรักษา
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},จำนวน รับซื้อ ที่จำเป็นสำหรับ รายการ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},จำนวน รับซื้อ ที่จำเป็นสำหรับ รายการ {0}
 DocType: Item Attribute Value,Item Attribute Value,รายการค่าแอตทริบิวต์
-apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,แคมเปญ การขาย
+apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,แคมเปญการขาย
 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
@@ -665,7 +669,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,ราคา ไม่ได้เลือก
 DocType: Employee,Family Background,ภูมิหลังของครอบครัว
 DocType: Process Payroll,Send Email,ส่งอีเมล์
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,ไม่ได้รับอนุญาต
 DocType: Company,Default Bank Account,บัญชีธนาคารเริ่มต้น
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ในการกรองขึ้นอยู่กับพรรคเลือกพรรคพิมพ์ครั้งแรก
@@ -673,7 +677,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,รายการที่มี weightage ที่สูงขึ้นจะแสดงที่สูงขึ้น
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,รายละเอียดการกระทบยอดธนาคาร
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,ใบแจ้งหนี้ของฉัน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,ใบแจ้งหนี้ของฉัน
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,พบว่า พนักงานที่ ไม่มี
 DocType: Purchase Order,Stopped,หยุด
 DocType: Item,If subcontracted to a vendor,ถ้าเหมาไปยังผู้ขาย
@@ -683,6 +687,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ส่งเดี๋ยวนี้
 ,Support Analytics,Analytics สนับสนุน
 DocType: Item,Website Warehouse,คลังสินค้าเว็บไซต์
+DocType: Payment Reconciliation,Minimum Invoice Amount,จำนวนใบแจ้งหนี้ขั้นต่ำ
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","วันของเดือนที่ใบแจ้งหนี้อัตโนมัติจะถูกสร้างขึ้นเช่น 05, 28 ฯลฯ"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,คะแนน ต้องน้อยกว่า หรือ เท่ากับ 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C- บันทึก แบบฟอร์ม
@@ -692,7 +697,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",ต้องการเปิดใช้งาน &quot;จุดขาย&quot; คุณสมบัติ
 DocType: Bin,Moving Average Rate,ย้ายอัตราเฉลี่ย
 DocType: Production Planning Tool,Select Items,เลือกรายการ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} กับบิล {1} ลงวันที่ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} กับบิล {1} ลงวันที่ {2}
 DocType: Maintenance Visit,Completion Status,สถานะเสร็จ
 DocType: Sales Invoice Item,Target Warehouse,คลังสินค้าเป้าหมาย
 DocType: Item,Allow over delivery or receipt upto this percent,อนุญาตให้ส่งมอบหรือใบเสร็จรับเงินได้ไม่เกินร้อยละนี้
@@ -704,7 +709,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,เขียนข้อความ โดยอัตโนมัติใน การส่ง ของ การทำธุรกรรม
 DocType: Production Order,Item To Manufacture,รายการที่จะผลิต
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} สถานะเป็น {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,การสั่งซื้อที่จะชำระเงิน
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,การสั่งซื้อที่จะชำระเงิน
 DocType: Sales Order Item,Projected Qty,จำนวนที่คาดการณ์ไว้
 DocType: Sales Invoice,Payment Due Date,วันที่ครบกำหนด ชำระเงิน
 DocType: Newsletter,Newsletter Manager,ผู้จัดการจดหมายข่าว
@@ -728,8 +733,8 @@
 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 +304,Point-of-Sale,จุดขาย
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",ยอดเงินในบัญชีแล้วในเครดิตคุณไม่ได้รับอนุญาตให้ตั้ง 'ยอดดุลต้องเป็น' เป็น 'เดบิต'
-DocType: Account,Balance must be,จะต้องมี ความสมดุล
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",ยอดเงินในบัญชีแล้วในเครดิตคุณไม่ได้รับอนุญาตให้ตั้ง 'ยอดดุลต้องเป็น' เป็น 'เดบิต'
+DocType: Account,Balance must be,ยอดเงินจะต้องมี
 DocType: Hub Settings,Publish Pricing,เผยแพร่ราคา
 DocType: Notification Control,Expense Claim Rejected Message,เรียกร้องค่าใช้จ่ายที่ถูกปฏิเสธข้อความ
 ,Available Qty,จำนวนที่มีจำหน่าย
@@ -747,11 +752,11 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,ดูสมาชิก
 DocType: Purchase Invoice Item,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
 ,Received Items To Be Billed,รายการที่ได้รับจะถูกเรียกเก็บเงิน
-DocType: Employee,Ms,ms
+DocType: Employee,Ms,นางสาว / นาง
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,นาย อัตรา แลกเปลี่ยนเงินตราต่างประเทศ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} จะต้องใช้งาน
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} จะต้องใช้งาน
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,เลือกประเภทของเอกสารที่แรก
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ยกเลิก การเข้าชม วัสดุ {0} ก่อนที่จะ ยกเลิก การบำรุงรักษา นี้ เยี่ยมชม
 DocType: Salary Slip,Leave Encashment Amount,ฝากเงินการได้เป็นเงินสด
@@ -763,23 +768,23 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,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,สกุลเงินในบัญชี
+DocType: Bank Reconciliation,Account Currency,สกุลเงินของบัญชี
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,กรุณาระบุบัญชีรอบปิด บริษัท
 DocType: Purchase Receipt,Range,เทือกเขา
 DocType: Supplier,Default Payable Accounts,บัญชีเจ้าหนี้เริ่มต้น
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,พนักงาน {0} ไม่ได้ ใช้งานอยู่หรือ ไม่อยู่
 DocType: Features Setup,Item Barcode,บาร์โค้ดสินค้า
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ใบแจ้งหนี้การซื้อล่วงหน้า
 DocType: Address,Shop,ร้านค้า
 DocType: Hub Settings,Sync Now,ซิงค์เดี๋ยวนี้
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},แถว {0}: รายการเครดิตไม่สามารถเชื่อมโยงกับ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},แถว {0}: รายการเครดิตไม่สามารถเชื่อมโยงกับ {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,เริ่มต้นบัญชีธนาคาร / เงินสดจะถูกปรับปรุงโดยอัตโนมัติในใบแจ้งหนี้ POS เมื่อโหมดนี้ถูกเลือก
 DocType: Employee,Permanent Address Is,ที่อยู่ ถาวร เป็น
 DocType: Production Order Operation,Operation completed for how many finished goods?,การดำเนินการเสร็จสมบูรณ์สำหรับวิธีการหลายสินค้าสำเร็จรูป?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ยี่ห้อ
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
 DocType: Employee,Exit Interview Details,ออกจากรายละเอียดการสัมภาษณ์
 DocType: Item,Is Purchase Item,รายการซื้อเป็น
 DocType: Journal Entry Account,Purchase Invoice,ซื้อใบแจ้งหนี้
@@ -791,7 +796,7 @@
 DocType: Salary Slip,Total in words,รวมอยู่ในคำพูด
 DocType: Material Request Item,Lead Time Date,นำวันเวลา
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,มีผลบังคับใช้ บางทีบันทึกแลกเปลี่ยนเงินตราต่างประเทศที่ไม่ได้สร้างขึ้นสำหรับ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},แถว # {0}: โปรดระบุหมายเลขเครื่องกับรายการ {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},แถว # {0}: โปรดระบุหมายเลขเครื่องกับรายการ {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","สำหรับรายการ &#39;Bundle สินค้า, คลังสินค้า, ไม่มี Serial และรุ่นที่จะไม่ได้รับการพิจารณาจาก&#39; บรรจุรายชื่อ &#39;ตาราง ถ้าคลังสินค้าและรุ่นที่ไม่มีเหมือนกันสำหรับรายการที่บรรจุทั้งหมดรายการใด ๆ &#39;Bundle สินค้า&#39; ค่าเหล่านั้นสามารถป้อนในตารางรายการหลักค่าจะถูกคัดลอกไปบรรจุรายชื่อ &#39;ตาราง"
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,จัดส่งให้กับลูกค้า
 DocType: Purchase Invoice Item,Purchase Order Item,สั่งซื้อสินค้าสั่งซื้อ
@@ -800,14 +805,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,ความแปรปรวน
 ,Company Name,ชื่อ บริษัท
 DocType: SMS Center,Total Message(s),ข้อความ รวม (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,เลือกหัวที่บัญชีของธนาคารที่ตรวจสอบถูกวาง
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ช่วยให้ผู้ใช้ในการแก้ไขอัตราราคาปกติในการทำธุรกรรม
-DocType: Pricing Rule,Max Qty,แม็กซ์ จำนวน
+DocType: Pricing Rule,Max Qty,จำนวนสูงสุด
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,สารเคมี
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,รายการทั้งหมดที่ได้รับการโอนใบสั่งผลิตนี้
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,รายการทั้งหมดที่ได้รับการโอนใบสั่งผลิตนี้
 DocType: Process Payroll,Select Payroll Year and Month,เลือกเงินเดือนปีและเดือน
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",ไปที่กลุ่มที่เหมาะสม (โดยปกติแอพลิเคชันของกองทุน&gt; สินทรัพย์หมุนเวียน&gt; บัญชีธนาคารและสร้างบัญชีใหม่ (โดยการคลิกที่เพิ่มเด็ก) ประเภท &quot;ธนาคาร&quot;
 DocType: Workstation,Electricity Cost,ค่าใช้จ่าย ไฟฟ้า
@@ -821,10 +827,10 @@
 DocType: SMS Center,All Lead (Open),ช่องทางทั้งหมด (เปิด)
 DocType: Purchase Invoice,Get Advances Paid,รับเงินทดรองจ่าย
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,แนบ รูปของคุณ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,ทำ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,สร้าง
 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 +3,My Cart,รถเข็นของฉัน
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,รถเข็นของฉัน
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,เปิด จำนวน
@@ -832,7 +838,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,ตัวเลือกหุ้น
 DocType: Journal Entry Account,Expense Claim,เรียกร้องค่าใช้จ่าย
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},จำนวนสำหรับ {0}
-DocType: Leave Application,Leave Application,ฝากแอพลิเคชัน
+DocType: Leave Application,Leave Application,ออกจากแอพลิเคชัน
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ฝากเครื่องมือการจัดสรร
 DocType: Leave Block List,Leave Block List Dates,ไม่ระบุวันที่รายการบล็อก
 DocType: Company,If Monthly Budget Exceeded (for expense account),หากเกินงบประมาณรายเดือน (สำหรับบัญชีค่าใช้จ่าย)
@@ -843,17 +849,17 @@
 DocType: POS Profile,Cash/Bank Account,เงินสด / บัญชีธนาคาร
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,รายการที่ลบออกด้วยการเปลี่ยนแปลงในปริมาณหรือไม่มีค่า
 DocType: Delivery Note,Delivery To,เพื่อจัดส่งสินค้า
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
 DocType: Production Planning Tool,Get Sales Orders,รับการสั่งซื้อการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ไม่สามารถเป็นจำนวนลบได้
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,ส่วนลด
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,ส่วนลด
 DocType: Features Setup,Purchase Discounts,ส่วนลดการซื้อ
 DocType: Workstation,Wages,ค่าจ้าง
 DocType: Time Log,Will be updated only if Time Log is 'Billable',จะมีการปรับปรุงเฉพาะในกรณีที่เวลาเข้าสู่ระบบคือ &#39;ที่เรียกเก็บเงิน&#39;
 DocType: Project,Internal,ภายใน
 DocType: Task,Urgent,ด่วน
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},โปรดระบุ ID แถวที่ถูกต้องสำหรับแถว {0} ในตาราง {1}
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ไปที่สก์ท็อปและเริ่มต้นใช้ ERPNext
+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,ซื้อสินค้าใบเสร็จรับเงิน
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,คลังสินค้าสำรองในการขายการสั่งซื้อ / โกดังสินค้าสำเร็จรูป
@@ -862,7 +868,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,คุณเป็น ผู้อนุมัติ ค่าใช้จ่าย สำหรับการ บันทึก นี้ กรุณา อัปเดต 'สถานะ ' และ ประหยัด
 DocType: Serial No,Creation Document No,การสร้าง เอกสาร ไม่มี
 DocType: Issue,Issue,ปัญหา
-apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,บัญชีไม่ตรงกับ บริษัท
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,บัญชีไม่ตรงกับบริษัท
 apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","คุณสมบัติสำหรับความหลากหลายของสินค้า เช่นขนาด, สี ฯลฯ"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP คลังสินค้า
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้สัญญา การบำรุงรักษา ไม่เกิน {1}
@@ -870,8 +876,8 @@
 DocType: Lead,Organization Name,ชื่อองค์กร
 DocType: Tax Rule,Shipping State,การจัดส่งสินค้าของรัฐ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,รายการจะต้องมีการเพิ่มการใช้ 'รับรายการสั่งซื้อจากใบเสร็จรับเงิน' ปุ่ม
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ค่าใช้จ่ายใน การขาย
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,การซื้อมาตรฐาน
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ค่าใช้จ่ายในการขาย
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,การซื้อมาตรฐาน
 DocType: GL Entry,Against,กับ
 DocType: Item,Default Selling Cost Center,ขาย เริ่มต้นที่ ศูนย์ต้นทุน
 DocType: Sales Partner,Implementation Partner,พันธมิตรการดำเนินงาน
@@ -913,6 +919,7 @@
 DocType: Sales Partner,Distributor,ผู้จัดจำหน่าย
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,รถเข็นกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,สั่งผลิต {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',โปรดตั้ง &#39;ใช้ส่วนลดเพิ่มเติมใน&#39;
 ,Ordered Items To Be Billed,รายการที่สั่งซื้อจะเรียกเก็บเงิน
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,จากช่วงจะต้องมีน้อยกว่าในช่วง
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,เลือกบันทึกเวลา และส่งมาเพื่อสร้างเป็นใบแจ้งหนี้การขายใหม่
@@ -922,13 +929,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,บันทึกเวลาชุดนี้ ถูกเรียกเก็บเงินแล้ว
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,สร้าง โอกาส
 DocType: Salary Slip,Leave Without Pay,ฝากโดยไม่ต้องจ่าย
-DocType: Supplier,Communications,คมนาคม
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,ข้อผิดพลาดการวางแผนกำลังการผลิต
 ,Trial Balance for Party,งบทดลองสำหรับพรรค
 DocType: Lead,Consultant,ผู้ให้คำปรึกษา
 DocType: Salary Slip,Earnings,ผลกำไร
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,เสร็จสิ้นรายการ {0} ต้องป้อนสำหรับรายการประเภทการผลิต
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,เปิดยอดคงเหลือบัญชี
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,เสร็จสิ้นรายการ {0} ต้องป้อนสำหรับรายการประเภทการผลิต
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,เปิดยอดคงเหลือบัญชี
 DocType: Sales Invoice Advance,Sales Invoice Advance,ขายใบแจ้งหนี้ล่วงหน้า
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,ไม่มีอะไรที่จะ ขอ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' วันเริ่มต้น จริง ' ไม่สามารถ จะมากกว่า ' วันสิ้นสุด จริง '
@@ -937,7 +943,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},ทั้ง บัตรเดบิตหรือ เครดิต เงิน เป็นสิ่งจำเป็นสำหรับ {0}
 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.,จ่ายสุทธิ (คำ) จะสามารถมองเห็นได้เมื่อคุณบันทึกสลิปเงินเดือน
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,สีน้ำเงิน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,สีฟ้า
 DocType: Purchase Invoice,Is Return,คือการกลับมา
 DocType: Price List Country,Price List Country,ราคาประเทศ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,โหนด เพิ่มเติมสามารถ ถูกสร้างขึ้น ภายใต้ โหนด ' กลุ่ม ประเภท
@@ -970,7 +976,7 @@
 DocType: Global Defaults,Current Fiscal Year,ปีงบประมาณปัจจุบัน
 DocType: Global Defaults,Disable Rounded Total,ปิดการใช้งานรวมโค้ง
 DocType: Lead,Call,โทรศัพท์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' รายการ ' ต้องไม่ว่างเปล่า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,' รายการ ' ต้องไม่ว่างเปล่า
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},แถว ที่ซ้ำกัน {0} ด้วย เหมือนกัน {1}
 ,Trial Balance,งบทดลอง
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,การตั้งค่าพนักงาน
@@ -982,9 +988,9 @@
 DocType: Contact,User ID,รหัสผู้ใช้
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,ดู บัญชีแยกประเภท
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ที่เก่าแก่ที่สุด
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
 DocType: Production Order,Manufacture against Sales Order,การผลิตกับการสั่งซื้อการขาย
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,ส่วนที่เหลือ ของโลก
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,จ่ายขั้นต้น
@@ -1014,7 +1020,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},ได้รับอนุญาตให้ แก้ไข บัญชี แช่แข็ง {0}
 DocType: Journal Entry,Get Outstanding Invoices,รับใบแจ้งหนี้ค้าง
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,การขายสินค้า {0} ไม่ถูกต้อง
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1027,13 +1033,13 @@
 DocType: Employee,Place of Issue,สถานที่ได้รับการรับรอง
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,สัญญา
 DocType: Email Digest,Add Quote,เพิ่มอ้าง
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},ปัจจัย Coversion UOM จำเป็นสำหรับ UOM: {0} ในรายการ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},ปัจจัย Coversion UOM จำเป็นสำหรับ UOM: {0} ในรายการ: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,ค่าใช้จ่าย ทางอ้อม
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,แถว {0}: จำนวนมีผลบังคับใช้
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,การเกษตร
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,สินค้า หรือ บริการของคุณ
 DocType: Mode of Payment,Mode of Payment,โหมดของการชำระเงิน
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,กลุ่มนี้เป็นกลุ่ม รายการที่ ราก และ ไม่สามารถแก้ไขได้
 DocType: Journal Entry Account,Purchase Order,ใบสั่งซื้อ
 DocType: Warehouse,Warehouse Contact Info,ข้อมูลการติดต่อคลังสินค้า
@@ -1042,8 +1048,8 @@
 DocType: Email Digest,Annual Income,รายได้ต่อปี
 DocType: Serial No,Serial No Details,รายละเอียดหมายเลขเครื่อง
 DocType: Purchase Invoice Item,Item Tax Rate,อัตราภาษีสินค้า
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,รายการ {0} จะต้องเป็น รายการ ย่อย หด
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,อุปกรณ์ ทุน
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",กฎข้อแรกคือการกำหนดราคาเลือกตาม 'สมัครในสนามซึ่งจะมีรายการกลุ่มสินค้าหรือยี่ห้อ
@@ -1053,7 +1059,7 @@
 DocType: Appraisal Goal,Goal,เป้าหมาย
 DocType: Sales Invoice Item,Edit Description,แก้ไขรายละเอียด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,วันที่จัดส่งสินค้าที่คาดว่าจะน้อยกว่าวันเริ่มต้นการวางแผน
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,สำหรับ ผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,สำหรับ ผู้ผลิต
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ประเภทบัญชีการตั้งค่าช่วยในการเลือกบัญชีนี้ในการทำธุรกรรม
 DocType: Purchase Invoice,Grand Total (Company Currency),แกรนด์รวม (สกุลเงิน บริษัท )
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ขาออกทั้งหมด
@@ -1063,10 +1069,10 @@
 DocType: Item,Website Item Groups,กลุ่มรายการเว็บไซต์
 DocType: Purchase Invoice,Total (Company Currency),รวม (บริษัท สกุลเงิน)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,หมายเลข {0} เข้ามา มากกว่าหนึ่งครั้ง
-DocType: Journal Entry,Journal Entry,บันทึกรายการค้า
+DocType: Journal Entry,Journal Entry,รายการบันทึก
 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 +427,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,นี่คือหมายเลขของรายการที่สร้างขึ้นล่าสุดกับคำนำหน้านี้
@@ -1098,7 +1104,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",จดหมายข่าวไปยังรายชื่อนำไปสู่
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,การดำเนินงานที่ไม่สามารถปล่อยให้ว่างไว้
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,การดำเนินงานที่ไม่สามารถปล่อยให้ว่างไว้
 ,Delivered Items To Be Billed,รายการที่ส่งไปถูกเรียกเก็บเงิน
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,คลังสินค้า ไม่สามารถ เปลี่ยนเป็น เลข อนุกรม
 DocType: Authorization Rule,Average Discount,ส่วนลดโดยเฉลี่ย
@@ -1113,21 +1119,22 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},จาก {0} | {1} {2}
 DocType: BOM Operation,Operation Description,ดำเนินการคำอธิบาย
 DocType: Item,Will also apply to variants,นอกจากนี้ยังจะนำไปใช้กับสายพันธุ์
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ไม่สามารถเปลี่ยนแปลงวันเริ่มต้นปีงบประมาณและปีงบประมาณวันที่สิ้นสุดเมื่อปีงบประมาณจะถูกบันทึกไว้
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ไม่สามารถเปลี่ยนแปลงวันเริ่มต้นปีงบประมาณและปีงบประมาณวันที่สิ้นสุดเมื่อปีงบประมาณจะถูกบันทึกไว้
 DocType: Quotation,Shopping Cart,รถเข็นช้อปปิ้ง
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,เฉลี่ยวันขาออก
 DocType: Pricing Rule,Campaign,รณรงค์
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',สถานะการอนุมัติ ต้อง 'อนุมัติ ' หรือ ' ปฏิเสธ '
 DocType: Purchase Invoice,Contact Person,Contact Person
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',' วันเริ่มต้น ที่คาดว่าจะ ' ไม่สามารถ จะมากกว่า ' วัน สุดท้าย ที่คาดว่าจะ '
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','วันที่คาดว่าจะเริ่มต้น' ไม่สามารถ จะมากกว่า 'วันที่คาดว่าจะจบ'
 DocType: Holiday List,Holidays,วันหยุด
 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 +211,Stock Entries already created for Production Order ,รายการสต็อกที่สร้างไว้แล้วสำหรับการสั่งซื้อการผลิต
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,รายการสต็อกที่สร้างไว้แล้วสำหรับการสั่งซื้อการผลิต
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,เปลี่ยนสุทธิในสินทรัพย์ถาวร
 DocType: Leave Control Panel,Leave blank if considered for all designations,เว้นไว้หากพิจารณากำหนดทั้งหมด
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},แม็กซ์: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},สูงสุด: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,จาก Datetime
 DocType: Email Digest,For Company,สำหรับ บริษัท
 apps/erpnext/erpnext/config/support.py +38,Communication log.,บันทึกการสื่อสาร
@@ -1136,7 +1143,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ผังบัญชี
 DocType: Material Request,Terms and Conditions Content,ข้อตกลงและเงื่อนไขเนื้อหา
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ไม่สามารถจะมากกว่า 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
 DocType: Maintenance Visit,Unscheduled,ไม่ได้หมายกำหนดการ
 DocType: Employee,Owned,เจ้าของ
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ขึ้นอยู่กับการออกโดยไม่จ่ายเงิน
@@ -1157,7 +1164,7 @@
  ใช้สำหรับภาษีและค่าใช้จ่าย"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,พนักงานไม่สามารถรายงานให้กับตัวเอง
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",หากบัญชีถูกแช่แข็ง รายการ จะได้รับอนุญาต ให้กับผู้ใช้ ที่ จำกัด
-DocType: Email Digest,Bank Balance,ธนาคาร Balance
+DocType: Email Digest,Bank Balance,ยอดเงินในธนาคาร
 apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},บัญชีรายการสำหรับ {0}: {1} สามารถทำได้ในสกุลเงิน: {2}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,No active Salary Structure found for employee {0} and the month,ไม่มีโครงสร้างเงินเดือนที่ต้องการใช้งานพบว่าพนักงาน {0} และเดือน
 DocType: Job Opening,"Job profile, qualifications required etc.",รายละเอียด งาน คุณสมบัติ ที่จำเป็น อื่น ๆ
@@ -1174,7 +1181,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,ประกอบ ย่อย
 DocType: Shipping Rule Condition,To Value,เพื่อให้มีค่า
 DocType: Supplier,Stock Manager,ผู้จัดการ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},คลังสินค้า ที่มา มีผลบังคับใช้ แถว {0}
+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 +581,Packing Slip,สลิป
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,สำนักงาน ให้เช่า
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,การตั้งค่าการติดตั้งเกตเวย์ SMS
@@ -1182,13 +1189,13 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ที่อยู่ไม่เพิ่มเลย
 DocType: Workstation Working Hour,Workstation Working Hour,เวิร์คสเตชั่ชั่วโมงการทำงาน
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,นักวิเคราะห์
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},แถว {0}: จำนวนจัดสรร {1} ต้องน้อยกว่าหรือเท่ากับจำนวนเงินที่ JV {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},แถว {0}: จำนวนจัดสรร {1} ต้องน้อยกว่าหรือเท่ากับจำนวนเงินที่ JV {2}
 DocType: Item,Inventory,รายการสินค้า
 DocType: Features Setup,"To enable ""Point of Sale"" view",ต้องการเปิดใช้งาน &quot;จุดขาย&quot; มุมมอง
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,การชำระเงินไม่สามารถทำรถว่างเปล่า
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,การชำระเงินไม่สามารถทำรถว่างเปล่า
 DocType: Item,Sales Details,รายละเอียดการขาย
 DocType: Opportunity,With Items,กับรายการ
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,ใน จำนวน
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,ในจำนวน
 DocType: Notification Control,Expense Claim Rejected,เรียกร้องค่าใช้จ่ายที่ถูกปฏิเสธ
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",วันที่ใบแจ้งหนี้ต่อไปจะถูกสร้างขึ้น มันถูกสร้างขึ้นบนส่ง
@@ -1200,10 +1207,11 @@
 DocType: Cost Center,Parent Cost Center,ศูนย์ต้นทุนผู้ปกครอง
 DocType: Sales Invoice,Source,แหล่ง
 DocType: Leave Type,Is Leave Without Pay,ถูกทิ้งไว้โดยไม่ต้องจ่ายเงิน
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,ไม่พบในตารางการชำระเงินบันทึก
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,ไม่พบในตารางการชำระเงินบันทึก
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,วันเริ่มต้น ปี การเงิน
 DocType: Employee External Work History,Total Experience,ประสบการณ์รวม
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,บรรจุ สลิป (s) ยกเลิก
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,บรรจุ สลิป (s) ยกเลิก
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,กระแสเงินสดจากการลงทุน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,การขนส่งสินค้าและ การส่งต่อ ค่าใช้จ่าย
 DocType: Material Request Item,Sales Order No,สั่งซื้อยอดขาย
 DocType: Item Group,Item Group Name,ชื่อกลุ่มสินค้า
@@ -1211,14 +1219,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,วัสดุการโอนเงินสำหรับการผลิต
 DocType: Pricing Rule,For Price List,สำหรับราคาตามรายการ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,การค้นหา ผู้บริหาร
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",ไม่พบราคาซื้อของรายการ: {0} ซึ่งจำเป็นสำหรับการกรอกรายการเข้าบัญชี (รายจ่าย) กรุณาแจ้งราคาสินค้าไว้ในรายการราคาซื้อ
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",ไม่พบราคาซื้อของรายการ: {0} ซึ่งจำเป็นสำหรับการกรอกรายการเข้าบัญชี (รายจ่าย) กรุณาแจ้งราคาสินค้าไว้ในรายการราคาซื้อ
 DocType: Maintenance Schedule,Schedules,ตารางเวลา
 DocType: Purchase Invoice Item,Net Amount,ปริมาณสุทธิ
 DocType: Purchase Order Item Supplied,BOM Detail No,รายละเอียด BOM ไม่มี
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),จำนวนส่วนลดเพิ่มเติม (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},ข้อผิดพลาด: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},ข้อผิดพลาด: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,กรุณาสร้างบัญชีใหม่ จากผังบัญชี
-DocType: Maintenance Visit,Maintenance Visit,ชมการบำรุงรักษา
+DocType: Maintenance Visit,Maintenance Visit,การเข้ามาบำรุงรักษา
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ลูกค้า> กลุ่มลูกค้า> มณฑล
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,จำนวนชุดที่โกดัง
 DocType: Time Log Batch Detail,Time Log Batch Detail,รายละเอียดชุดบันทึกเวลา
@@ -1242,7 +1250,7 @@
 DocType: Sales Partner,Sales Partner Target,เป้าหมายยอดขายพันธมิตร
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},รายการบัญชีสำหรับ {0} สามารถทำได้ในสกุลเงิน: {1}
 DocType: Pricing Rule,Pricing Rule,กฎ การกำหนดราคา
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,วัสดุขอใบสั่งซื้อ
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,วัสดุขอใบสั่งซื้อ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},แถว # {0}: กลับรายการ {1} ไม่อยู่ใน {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,บัญชีธนาคาร
 ,Bank Reconciliation Statement,งบกระทบยอดธนาคาร
@@ -1250,11 +1258,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,เปิดหุ้นคงเหลือ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} ต้องปรากฏเพียงครั้งเดียว
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ไม่อนุญาตให้โอนมากขึ้น {0} กว่า {1} กับใบสั่งซื้อ {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},ใบ จัดสรร ประสบความสำเร็จ ในการ {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ไม่มี รายการ ที่จะแพ็ค
 DocType: Shipping Rule Condition,From Value,จากมูลค่า
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,จำนวนการผลิต นี้มีความจำเป็น
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,จำนวนการผลิต นี้มีความจำเป็น
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,จำนวนเงินไม่ได้สะท้อนให้เห็นในธนาคาร
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,การเรียกร้องค่าใช้จ่ายของ บริษัท
@@ -1266,36 +1274,37 @@
 ,Material Requests for which Supplier Quotations are not created,ขอ วัสดุ ที่ ใบเสนอราคา ของผู้ผลิต ไม่ได้สร้างขึ้น
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,วันที่ (s) ที่คุณจะใช้สำหรับการลาวันหยุด คุณไม่จำเป็นต้องใช้สำหรับการลา
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,เพื่อติดตามรายการโดยใช้บาร์โค้ด คุณจะสามารถป้อนรายการในหมายเหตุจัดส่งสินค้าและขายใบแจ้งหนี้โดยการสแกนบาร์โค้ดของรายการ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,มาร์คส่ง
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,มาร์คส่ง
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ทำให้ใบเสนอราคา
 DocType: Dependent Task,Dependent Task,ขึ้นอยู่กับงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,หยุด วันเกิด การแจ้งเตือน
 DocType: SMS Center,Receiver List,รายชื่อผู้รับ
 DocType: Payment Tool Detail,Payment Amount,จำนวนเงินที่ชำระ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,บริโภคจํานวนเงิน
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} ดู
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} ดู
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,เปลี่ยนเป็นเงินสดสุทธิ
 DocType: Salary Structure Deduction,Salary Structure Deduction,หักโครงสร้างเงินเดือน
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {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 +185,Quantity must not be more than {0},จำนวนต้องไม่เกิน {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),อายุ (วัน)
 DocType: Quotation Item,Quotation Item,รายการใบเสนอราคา
 DocType: Account,Account Name,ชื่อบัญชี
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,จากวันที่ไม่สามารถจะมากกว่านัด
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,จากวันที่ไม่สามารถจะมากกว่านัด
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,อนุกรม ไม่มี {0} ปริมาณ {1} ไม่สามารถเป็น ส่วนหนึ่ง
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,ประเภท ผู้ผลิต หลัก
 DocType: Purchase Order Item,Supplier Part Number,หมายเลขชิ้นส่วนของผู้ผลิต
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,อัตราการแปลง ไม่สามารถเป็น 0 หรือ 1
-apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} จะถูกยกเลิกหรือหยุด
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,อัตราการแปลง ไม่สามารถเป็น 0 หรือ 1
+apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,รับซื้อ {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,รับซื้อ {0} ไม่ได้ ส่ง
 DocType: Company,Default Payable Account,เริ่มต้นเจ้าหนี้การค้า
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",การตั้งค่าสำหรับตะกร้าช้อปปิ้งออนไลน์เช่นกฎการจัดส่งรายการราคา ฯลฯ
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% เรียกเก็บเงิน
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% เรียกเก็บเงินแล้ว
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,สงวนไว้ จำนวน
 DocType: Party Account,Party Account,บัญชีพรรค
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,ทรัพยากรบุคคล
@@ -1304,15 +1313,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,ปัญหาของฉัน
 DocType: BOM Item,BOM Item,รายการ BOM
 DocType: Appraisal,For Employee,สำหรับพนักงาน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,แถว {0}: ล่วงหน้ากับต้องมีการหักเงินจากผู้ผลิต
 DocType: Company,Default Values,เริ่มต้นค่า
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,แถว {0}: จำนวนการชำระเงินไม่สามารถเป็นเชิงลบ
 DocType: Expense Claim,Total Amount Reimbursed,รวมจำนวนเงินชดเชย
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},กับผู้ผลิตใบแจ้งหนี้ {0} วัน {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},กับผู้ผลิตใบแจ้งหนี้ {0} วัน {1}
 DocType: Customer,Default Price List,รายการราคาเริ่มต้น
 DocType: Payment Reconciliation,Payments,วิธีการชำระเงิน
 DocType: Budget Detail,Budget Allocated,งบประมาณที่จัดสรร
 DocType: Journal Entry,Entry Type,ประเภทรายการ
 ,Customer Credit Balance,เครดิตบาลานซ์ลูกค้า
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,เปลี่ยนสุทธิในบัญชีเจ้าหนี้
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,โปรดตรวจสอบอีเมลของคุณ id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',ลูกค้า จำเป็นต้องใช้ สำหรับ ' Customerwise ส่วนลด '
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,การชำระเงินของธนาคารปรับปรุงวันที่มีวารสาร
@@ -1333,7 +1344,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,เปิดการใช้งานรถเข็น
 DocType: Employee,Permanent Address,ที่อยู่ถาวร
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,รายการ {0} จะต้องมี รายการ บริการ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",จ่ายเงินล่วงหน้ากับ {0} {1} ไม่สามารถมากขึ้น \ กว่าแกรนด์รวม {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,กรุณา เลือกรหัส สินค้า
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),ลดการหักออกโดยไม่จ่าย (LWP)
@@ -1350,18 +1361,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,หน่วยเดียวของรายการ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',ต้อง 'ส่ง' ชุดบันทึกเวลา {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',ต้อง 'ส่ง' ชุดบันทึกเวลา {0}
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ทำให้ รายการ บัญชี สำหรับ ทุก การเคลื่อนไหวของ หุ้น
 DocType: Leave Allocation,Total Leaves Allocated,ใบรวมจัดสรร
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},โกดังสินค้าจำเป็นที่แถวไม่มี {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},โกดังสินค้าจำเป็นที่แถวไม่มี {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,กรุณากรอกเริ่มต้นปีงบการเงินที่ถูกต้องและวันที่สิ้นสุด
 DocType: Employee,Date Of Retirement,วันที่ของการเกษียณอายุ
 DocType: Upload Attendance,Get Template,รับแม่แบบ
 DocType: Address,Postal,ไปรษณีย์
 DocType: Item,Weightage,weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,กลุ่ม ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน โปรด เปลี่ยนชื่อ ลูกค้าหรือเปลี่ยนชื่อ กลุ่ม ลูกค้า
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,กรุณาเลือก {0} ครั้งแรก
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},ข้อความ {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,กรุณาเลือก {0} ครั้งแรก
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},ข้อความ {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,ติดต่อใหม่
 DocType: Territory,Parent Territory,ดินแดนปกครอง
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,ใบเสร็จรับเงินวัสดุ
@@ -1369,7 +1381,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},ประเภทพรรคและพรรคเป็นสิ่งจำเป็นสำหรับลูกหนี้ / เจ้าหนี้ {0}
 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 +210,Quantity required for Item {0} in row {1},จำนวน รายการ ที่จำเป็นสำหรับ {0} ในแถว {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},จำนวน รายการ ที่จำเป็นสำหรับ {0} ในแถว {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},คลังสินค้า {0} ไม่สามารถลบได้ เป็น ปริมาณ ที่มีอยู่สำหรับ รายการ {1}
 DocType: Quotation,Order Type,ประเภทสั่งซื้อ
 DocType: Purchase Invoice,Notification Email Address,ที่อยู่อีเมลการแจ้งเตือน
@@ -1386,15 +1398,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,คอลัมน์มากเกินไป ส่งออกรายงานและพิมพ์โดยใช้โปรแกรมสเปรดชีต
 DocType: Sales 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 +152,Main,หลัก
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,หลัก
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,ตัวแปร
 DocType: Naming Series,Set prefix for numbering series on your transactions,กำหนดคำนำหน้าสำหรับหมายเลขชุดทำธุรกรรมของคุณ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,เพื่อ หยุด ไม่สามารถยกเลิกได้ เปิดจุก ที่จะยกเลิก
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี้หรือแม่แบบของมัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,ทำให้ การสั่งซื้อ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,ทำให้ การสั่งซื้อ
 DocType: SMS Center,Send To,ส่งให้
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
 DocType: Payment Reconciliation Payment,Allocated amount,จำนวนเงินที่จัดสรร
@@ -1407,7 +1419,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,คลังสินค้าและการอ้างอิง
 DocType: Supplier,Statutory info and other general information about your Supplier,ข้อมูลตามกฎหมายและข้อมูลทั่วไปอื่น ๆ เกี่ยวกับผู้จำหน่ายของคุณ
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,ที่อยู่
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,กับอนุทิน {0} ไม่ได้มีที่ไม่มีใครเทียบ {1} รายการ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,กับอนุทิน {0} ไม่ได้มีที่ไม่มีใครเทียบ {1} รายการ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},ซ้ำ หมายเลขเครื่อง ป้อนสำหรับ รายการ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,เงื่อนไขสำหรับกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,รายการสินค้าที่ไม่ได้รับอนุญาตให้มีการสั่งซื้อการผลิต
@@ -1416,27 +1428,27 @@
 DocType: GL Entry,Credit Amount in Account Currency,จำนวนเงินเครดิตสกุลเงินในบัญชี
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,บันทึกเวลาในการผลิต
 DocType: Item,Apply Warehouse-wise Reorder Level,สมัครโกดังฉลาดสั่งซื้อใหม่ระดับ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} จะต้องส่ง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} จะต้องส่ง
 DocType: Authorization Control,Authorization Control,ควบคุมการอนุมัติ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},แถว # {0}: ปฏิเสธคลังสินค้ามีผลบังคับใช้กับปฏิเสธรายการ {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,บันทึกเวลาสำหรับงานต่างๆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,วิธีการชำระเงิน
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,วิธีการชำระเงิน
 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},ขอ วัสดุ สูงสุด {0} สามารถทำ รายการ {1} กับ การขายสินค้า {2}
 DocType: Employee,Salutation,ประณม
 DocType: Pricing Rule,Brand,ยี่ห้อ
 DocType: Item,Will also apply for variants,นอกจากนี้ยังจะใช้สำหรับสายพันธุ์
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,กำรายการในเวลาของการขาย
-DocType: Sales Order Item,Actual Qty,จำนวนที่เกิดขึ้นจริง
+DocType: Sales Order Item,Actual Qty,จำนวนจริง
 DocType: Sales Invoice Item,References,อ้างอิง
 DocType: Quality Inspection Reading,Reading 10,อ่าน 10
 apps/erpnext/erpnext/public/js/setup_wizard.js +366,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",รายการสินค้า หรือบริการที่คุณ ซื้อหรือขาย ของคุณ
 DocType: Hub Settings,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/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,คุณได้ป้อนรายการซ้ำกัน กรุณาแก้ไขและลองอีกครั้ง
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,มูลค่า {0} สำหรับแอตทริบิวต์ {1} ไม่อยู่ในรายชื่อของรายการที่ถูกต้องแอตทริบิวต์ค่า
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,ภาคี
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,รายการที่ {0} ไม่ได้เป็นรายการ ต่อเนื่อง
 DocType: SMS Center,Create Receiver List,สร้างรายการรับ
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,หมดอายุ
 DocType: Packing Slip,To Package No.,กับแพคเกจหมายเลข
 DocType: Warranty Claim,Issue Date,วันที่ออก
 DocType: Activity Cost,Activity Cost,ค่าใช้จ่ายในกิจกรรม
@@ -1466,15 +1478,15 @@
 DocType: Sales Person,Parent Sales Person,ผู้ปกครองคนขาย
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,โปรดระบุ สกุลเงิน เริ่มต้นใน บริษัท โท และ เริ่มต้น ทั่วโลก
 DocType: Purchase Invoice,Recurring Invoice,ใบแจ้งหนี้ที่เกิดขึ้นประจำ
-apps/erpnext/erpnext/config/projects.py +79,Managing Projects,การจัดการโครงการ
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,จัดการโครงการ
 DocType: Supplier,Supplier of Goods or Services.,ผู้ผลิตสินค้าหรือบริการ
 DocType: Budget Detail,Fiscal Year,ปีงบประมาณ
-DocType: Cost Center,Budget,งบ
+DocType: Cost Center,Budget,งบประมาณ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"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 +65,Territory / Customer,มณฑล / ลูกค้า
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,เช่นผู้ 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,รายการขาย
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,กลุ่มสินค้า ต้นไม้
@@ -1486,7 +1498,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} สร้าง
 DocType: Delivery Note Item,Against Sales Order,กับ การขายสินค้า
 ,Serial No Status,สถานะหมายเลขเครื่อง
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,ตาราง รายการที่ ไม่ สามารถมีช่องว่าง
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,ตาราง รายการที่ ไม่ สามารถมีช่องว่าง
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","แถว {0}: การตั้งค่า {1} ช่วงความแตกต่างระหว่างจากและไปยังวันที่ \
  ต้องมากกว่าหรือเท่ากับ {2}"
@@ -1496,7 +1508,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,หน้าที่ และภาษี
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,กรุณากรอก วันที่ อ้างอิง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,จำหน่ายจำนวน
@@ -1511,7 +1523,7 @@
 DocType: Installation Note,Installation Time,เวลาติดตั้ง
 DocType: Sales Invoice,Accounting Details,รายละเอียดบัญชี
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,ลบการทำธุรกรรมทั้งหมดของ บริษัท นี้
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,แถว #{0}: การดำเนินการ {1} ยังไม่เสร็จสมบูรณ์สำหรับ {2} จำนวนของสินค้าที่เสร็จแล้วตามคำสั่งผลิต # {3} โปรดปรับปรุงสถานะการทำงานผ่านทางบันทึกเวลา
+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,แถว #{0}: การดำเนินการ {1} ยังไม่เสร็จสมบูรณ์สำหรับ {2} จำนวนของสินค้าที่เสร็จแล้วตามคำสั่งผลิต # {3} โปรดปรับปรุงสถานะการทำงานผ่านทางบันทึกเวลา
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,เงินลงทุน
 DocType: Issue,Resolution Details,รายละเอียดความละเอียด
 DocType: Quality Inspection Reading,Acceptance Criteria,เกณฑ์การยอมรับ กําหนดเกณฑ์ การยอมรับ
@@ -1520,31 +1532,31 @@
 DocType: Item Group,Show In Website,แสดงในเว็บไซต์
 apps/erpnext/erpnext/public/js/setup_wizard.js +375,Group,กลุ่ม
 DocType: Task,Expected Time (in hours),เวลาที่คาดว่าจะ (ชั่วโมง)
-,Qty to Order,จำนวน การสั่งซื้อสินค้า
+,Qty to Order,จำนวนการสั่งซื้อสินค้า
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","เพื่อติดตามชื่อแบรนด์ในเอกสารดังต่อไปหมายเหตุการจัดส่งสินค้า, โอกาส, วัสดุขอรายการสั่งซื้อ, ซื้อคูปอง, ใบเสร็จรับเงินซื้อใบเสนอราคา, ใบแจ้งหนี้การขาย, Bundle สินค้า, การขายสินค้า, ไม่มี Serial"
 apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,แผนภูมิแกรนต์ของงานทั้งหมด
 DocType: Appraisal,For Employee Name,สำหรับชื่อของพนักงาน
 DocType: Holiday List,Clear Table,ตารางที่ชัดเจน
 DocType: Features Setup,Brands,แบรนด์
 DocType: C-Form Invoice Detail,Invoice No,ใบแจ้งหนี้ไม่มี
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,จากการสั่งซื้อ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,จากการสั่งซื้อ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,อัตราการคิดต้นทุน
 ,Customer Addresses And Contacts,ที่อยู่ของลูกค้าและการติดต่อ
 DocType: Employee,Resignation Letter Date,วันที่ใบลาออก
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,กฎการกำหนดราคาจะถูกกรองต่อไปขึ้นอยู่กับปริมาณ
 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 +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) จะต้องมีบทบาท 'ค่าใช้จ่ายอนุมัติ'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) จะต้องมีตำแหน่ง 'ผู้อนุมัติค่าใช้จ่าย'
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Pair,คู่
 DocType: Bank Reconciliation Detail,Against Account,กับบัญชี
 DocType: Maintenance Schedule Detail,Actual Date,วันที่เกิดขึ้นจริง
 DocType: Item,Has Batch No,ชุดมีไม่มี
 DocType: Delivery Note,Excise Page Number,หมายเลขหน้าสรรพสามิต
 DocType: Employee,Personal Details,รายละเอียดส่วนบุคคล
-,Maintenance Schedules,ตารางการบำรุงรักษา
+,Maintenance Schedules,กำหนดการบำรุงรักษา
 ,Quotation Trends,ใบเสนอราคา แนวโน้ม
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},กลุ่มสินค้าไม่ได้กล่าวถึงในหลักรายการสำหรับรายการที่ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
 DocType: Shipping Rule Condition,Shipping Amount,จำนวนการจัดส่งสินค้า
 ,Pending Amount,จำนวนเงินที่ รอดำเนินการ
 DocType: Purchase Invoice Item,Conversion Factor,ปัจจัยการเปลี่ยนแปลง
@@ -1561,12 +1573,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,ผังต้นไม้ของบัญชีการเงิน
 DocType: Leave Control Panel,Leave blank if considered for all employee types,เว้นไว้หากพิจารณาให้พนักงานทุกประเภท
 DocType: Landed Cost Voucher,Distribute Charges Based On,กระจายค่าใช้จ่ายขึ้นอยู่กับ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,บัญชี {0} ต้องเป็นชนิด ' สินทรัพย์ถาวร ' เป็น รายการ {1} เป็น รายการสินทรัพย์
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,บัญชี {0} ต้องเป็นชนิด ' สินทรัพย์ถาวร ' เป็น รายการ {1} เป็น รายการสินทรัพย์
 DocType: HR Settings,HR Settings,การตั้งค่าทรัพยากรบุคคล
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ค่าใช้จ่ายที่ เรียกร้อง คือการ รอการอนุมัติ เพียง แต่ผู้อนุมัติ ค่าใช้จ่าย สามารถอัปเดต สถานะ
 DocType: Purchase Invoice,Additional Discount Amount,จำนวนส่วนลดเพิ่มเติม
 DocType: Leave Block List Allow,Leave Block List Allow,ฝากรายการบล็อกอนุญาตให้
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,กีฬา
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,ทั้งหมดที่เกิดขึ้นจริง
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,หน่วย
@@ -1578,6 +1590,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ตอนนี้ก็คือ การเริ่มต้น ปีงบประมาณ กรุณารีเฟรช เบราว์เซอร์ ของคุณ สำหรับการเปลี่ยนแปลงที่จะ มีผลบังคับใช้
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ค่าใช้จ่ายในการเรียกร้อง
 DocType: Issue,Support,สนับสนุน
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,ดูสินค้าในตะกร้า
 ,BOM Search,BOM ค้นหา
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),ปิด (เปิดผลรวม +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,โปรดระบุสกุลเงินใน บริษัท
@@ -1589,22 +1602,23 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},ปัจจัย UOM แปลง จะต้อง อยู่ในแถว {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},วันที่ โปรโมชั่น ไม่สามารถเป็น ก่อนวันที่ เช็คอิน แถว {0}
 DocType: Salary Slip,Deduction,การหัก
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},รายการสินค้าเพิ่มสำหรับ {0} ในราคา {1}
 DocType: Address Template,Address Template,แม่แบบที่อยู่
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,กรุณากรอกพนักงาน Id นี้คนขาย
 DocType: Territory,Classification of Customers by region,การจำแนกประเภทของลูกค้าตามภูมิภาค
 DocType: Project,% Tasks Completed,% งานที่เสร็จสมบูรณ์แล้ว
 DocType: Project,Gross Margin,อัตรากำไรขั้นต้น
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,กรุณากรอก ผลิต รายการ แรก
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,ผู้พิการ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ผู้พิการ
 DocType: Opportunity,Quotation,ใบเสนอราคา
 DocType: Salary Slip,Total Deduction,หักรวม
-DocType: Quotation,Maintenance User,ผู้ใช้งานบำรุงรักษา
+DocType: Quotation,Maintenance User,ผู้บำรุงรักษา
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,ค่าใช้จ่ายในการปรับปรุง
 DocType: Employee,Date of Birth,วันเกิด
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
 DocType: Production Order Operation,Actual Operation Time,เวลาการดำเนินงานที่เกิดขึ้นจริง
 DocType: Authorization Rule,Applicable To (User),ที่ใช้บังคับกับ (User)
 DocType: Purchase Taxes and Charges,Deduct,หัก
@@ -1614,19 +1628,19 @@
 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,ดังนั้น จำนวน
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",รายการสต็อกที่มีอยู่กับคลังสินค้า {0} ด้วยเหตุนี้คุณจะไม่สามารถกำหนดหรือปรับเปลี่ยนคลังสินค้า
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",รายการสต็อกที่มีอยู่กับคลังสินค้า {0} ด้วยเหตุนี้คุณจะไม่สามารถกำหนดหรือปรับเปลี่ยนคลังสินค้า
 DocType: Appraisal,Calculate Total Score,คำนวณคะแนนรวม
 DocType: Supplier Quotation,Manufacturing Manager,ผู้จัดการฝ่ายผลิต
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้การ รับประกัน ไม่เกิน {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,แยกหมายเหตุจัดส่งสินค้าเข้าไปในแพคเกจ
-apps/erpnext/erpnext/hooks.py +68,Shipments,การจัดส่ง
+apps/erpnext/erpnext/hooks.py +69,Shipments,การจัดส่ง
 DocType: Purchase Order Item,To be delivered to customer,ที่จะส่งมอบให้กับลูกค้า
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ต้องส่งสถานะของบันทึกเวลา
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,ไม่มี Serial {0} ไม่ได้อยู่ในโกดังสินค้าใด ๆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,แถว #
-DocType: Purchase Invoice,In Words (Company Currency),ในคำ (สกุลเงิน บริษัท )
+DocType: Purchase Invoice,In Words (Company Currency),ในคำ (สกุลเงิน บริษัท)
 DocType: Pricing Rule,Supplier,ผู้จัดจำหน่าย
-DocType: C-Form,Quarter,หนึ่งในสี่
+DocType: C-Form,Quarter,ไตรมาส
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,ค่าใช้จ่าย เบ็ดเตล็ด
 DocType: Global Defaults,Default Company,บริษัท เริ่มต้น
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ค่าใช้จ่าย หรือ ความแตกต่าง บัญชี มีผลบังคับใช้ กับ รายการ {0} ที่มัน มีผลกระทบต่อ มูลค่า หุ้น โดยรวม
@@ -1639,10 +1653,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,เลือก บริษัท ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,เว้นไว้หากพิจารณาให้หน่วยงานทั้งหมด
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",ประเภท ของการจ้างงาน ( ถาวร สัญญา ฝึกงาน ฯลฯ )
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} จำเป็นสำหรับ รายการ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} จำเป็นสำหรับ รายการ {1}
 DocType: Currency Exchange,From Currency,จากสกุลเงิน
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",กรุณาเลือกจำนวนเงินที่จัดสรรประเภทใบแจ้งหนี้และจำนวนใบแจ้งหนี้ในอย่างน้อยหนึ่งแถว
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},การสั่งซื้อสินค้า ที่จำเป็นสำหรับการ ขาย สินค้า {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",กรุณาเลือกจำนวนเงินที่จัดสรรประเภทใบแจ้งหนี้และจำนวนใบแจ้งหนี้ในอย่างน้อยหนึ่งแถว
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},การสั่งซื้อสินค้า ที่จำเป็นสำหรับการ ขาย สินค้า {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,จำนวนเงินไม่ได้สะท้อนให้เห็นในระบบ
 DocType: Purchase Invoice Item,Rate (Company Currency),อัตรา (สกุลเงิน บริษัท )
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,คนอื่น ๆ
@@ -1658,7 +1672,7 @@
 DocType: Quality Inspection,In Process,ในกระบวนการ
 DocType: Authorization Rule,Itemwise Discount,ส่วนลด Itemwise
 DocType: Purchase Order Item,Reference Document Type,เอกสารประเภท
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} กับคำสั่งขาย {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} กับคำสั่งขาย {1}
 DocType: Account,Fixed Asset,สินทรัพย์ คงที่
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,เนื่องสินค้าคงคลัง
 DocType: Activity Type,Default Billing Rate,เริ่มต้นอัตราการเรียกเก็บเงิน
@@ -1668,7 +1682,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ใบสั่งขายถึงการชำระเงิน
 DocType: Expense Claim Detail,Expense Claim Detail,รายละเอียดค่าใช้จ่ายสินไหม
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,สร้างบันทึกเวลาเมื่อ:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,กรุณาเลือกบัญชีที่ถูกต้อง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,กรุณาเลือกบัญชีที่ถูกต้อง
 DocType: Item,Weight UOM,UOM น้ำหนัก
 DocType: Employee,Blood Group,กรุ๊ปเลือด
 DocType: Purchase Invoice Item,Page Break,แบ่งหน้า
@@ -1688,7 +1702,7 @@
 DocType: Stock Entry,Total Incoming Value,ค่าเข้ามาทั้งหมด
 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,ผู้จัดการที่มีคุณภาพ
+DocType: Quality Inspection,Quality Manager,ผู้จัดการคุณภาพ
 DocType: Job Applicant,Job Opening,เปิดงาน
 DocType: Payment Reconciliation,Payment Reconciliation,กระทบยอดการชำระเงิน
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,กรุณา เลือกชื่อ Incharge บุคคล
@@ -1699,19 +1713,20 @@
 DocType: Time Log,To Time,ถึงเวลา
 DocType: Authorization Rule,Approving Role (above authorized value),อนุมัติบทบาท (สูงกว่าค่าที่ได้รับอนุญาต)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",ในการเพิ่ม โหนด เด็ก สำรวจ ต้นไม้ และคลิกที่ โหนด ตามที่ คุณต้องการเพิ่ม โหนด เพิ่มเติม
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,เครดิตการบัญชีจะต้องเป็นบัญชีเจ้าหนี้
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM เรียกซ้ำ : {0} ไม่สามารถ เป็นผู้ปกครอง หรือเด็ก ของ {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,เครดิตการบัญชีจะต้องเป็นบัญชีเจ้าหนี้
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,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 +116,"For {0}, only debit accounts can be linked against another credit entry",มีบัญชีประเภทเดบิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเครดิต สำหรับ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry",มีบัญชีประเภทเดบิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเครดิต สำหรับ {0}
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,ราคา {0} ถูกปิดใช้งาน
 DocType: Manufacturing Settings,Allow Overtime,อนุญาตให้ทำงานล่วงเวลา
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{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: Opportunity,Lost Reason,เหตุผลที่หายไป
+DocType: Opportunity,Lost Reason,เหตุผลที่สูญหาย
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,สร้างรายการการชำระเงินกับคำสั่งซื้อหรือใบแจ้งหนี้
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,ที่อยู่ใหม่
 DocType: Quality Inspection,Sample Size,ขนาดของกลุ่มตัวอย่าง
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,รายการทั้งหมดที่ ได้รับการ ออกใบแจ้งหนี้ แล้ว
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,ศูนย์ต้นทุนเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
 DocType: Project,External,ภายนอก
@@ -1767,13 +1782,14 @@
 DocType: Rename Tool,Rename Tool,เปลี่ยนชื่อเครื่องมือ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,ปรับปรุง ค่าใช้จ่าย
 DocType: Item Reorder,Item Reorder,รายการ Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,โอน วัสดุ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,โอน วัสดุ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",ระบุการดำเนินการ ค่าใช้จ่าย ในการดำเนินงาน และให้การดำเนินการ ที่ไม่ซ้ำกัน ในการ ดำเนินงานของคุณ
 DocType: Purchase Invoice,Price List Currency,สกุลเงินรายการราคา
 DocType: Naming Series,User must always select,ผู้ใช้จะต้องเลือก
 DocType: Stock Settings,Allow Negative Stock,อนุญาตให้สต็อกเชิงลบ
 DocType: Installation Note,Installation Note,หมายเหตุการติดตั้ง
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,เพิ่ม ภาษี
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,กระแสเงินสดจากการจัดหาเงินทุน
 ,Financial Analytics,Analytics การเงิน
 DocType: Quality Inspection,Verified By,ตรวจสอบโดย
 DocType: Address,Subsidiary,บริษัท สาขา
@@ -1783,19 +1799,19 @@
 DocType: Process Payroll,Create Salary Slip,สร้างสลิปเงินเดือน
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,ยอดเงินที่คาดว่าจะเป็นต่อธนาคาร
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),แหล่งที่มาของ เงินทุน ( หนี้สิน )
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},จำนวน ในแถว {0} ({1} ) จะต้อง เป็นเช่นเดียวกับ ปริมาณ การผลิต {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},จำนวน ในแถว {0} ({1} ) จะต้อง เป็นเช่นเดียวกับ ปริมาณ การผลิต {2}
 DocType: Appraisal,Employee,ลูกจ้าง
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,นำเข้าจากอีเมล์
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,นำเข้าอีเมล์จาก
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,เชิญผู้ใช้
 DocType: Features Setup,After Sale Installations,หลังจากการติดตั้งขาย
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} เรียกเก็บเงินเต็มจำนวน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} ได้ถูกเรียกเก็บเงินเต็มจำนวน
 DocType: Workstation Working Hour,End Time,เวลาสิ้นสุด
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,ข้อสัญญา มาตรฐานสำหรับ การขายหรือการ ซื้อ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,กลุ่ม โดย คูปอง
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ต้องใช้ใน
 DocType: Sales Invoice,Mass Mailing,จดหมายมวล
 DocType: Rename Tool,File to Rename,การเปลี่ยนชื่อไฟล์
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},จำนวน การสั่งซื้อ Purchse จำเป็นสำหรับ รายการ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},จำนวน การสั่งซื้อ Purchse จำเป็นสำหรับ รายการ {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,แสดงการชำระเงิน
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},ระบุ BOM {0} ไม่อยู่สำหรับรายการ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ตาราง การบำรุงรักษา {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
@@ -1805,6 +1821,7 @@
 DocType: Selling Settings,Sales Order Required,สั่งซื้อยอดขายที่ต้องการ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,สร้าง ลูกค้า
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,รายละเอียดกำหนดการซ่อมบำรุง
 DocType: Quality Inspection Reading,Reading 9,อ่าน 9
@@ -1816,24 +1833,25 @@
 DocType: Warranty Claim,Raised By,โดยยก
 DocType: Payment Tool,Payment Account,บัญชีการชำระเงิน
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,เปลี่ยนสุทธิในบัญชีลูกหนี้
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ชดเชย ปิด
-DocType: Quality Inspection Reading,Accepted,ได้รับการยอมรับ
+DocType: Quality Inspection Reading,Accepted,ได้รับการยอมรับแล้ว
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,โปรดตรวจสอบว่าคุณต้องการที่จะลบการทำธุรกรรมทั้งหมดของ บริษัท นี้ ข้อมูลหลักของคุณจะยังคงอยู่อย่างที่มันเป็น การดำเนินการนี้ไม่สามารถยกเลิกได้
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},การอ้างอิงที่ไม่ถูกต้อง {0} {1}
 DocType: Payment Tool,Total Payment Amount,จำนวนเงินที่ชำระทั้งหมด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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 +204,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
 DocType: Newsletter,Test,ทดสอบ
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","เนื่องจากมีการทำธุรกรรมที่มีอยู่สต็อกสำหรับรายการนี้ \ คุณไม่สามารถเปลี่ยนค่าของ &#39;มีไม่มี Serial&#39;, &#39;มีรุ่นที่ไม่มี&#39;, &#39;เป็นรายการสต็อก &quot;และ&quot; วิธีการประเมิน&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,วารสารรายการด่วน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,วารสารรายการด่วน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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 +157,Please enter Planned Qty for Item {0} at row {1},กรุณากรอก จำนวน การ วางแผน รายการ {0} ที่ แถว {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} ยังไม่ได้ส่ง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} ยังไม่ได้ส่ง
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,ขอรายการ
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,เพื่อผลิตแยกจะถูกสร้างขึ้นสำหรับรายการที่ดีในแต่ละสำเร็จรูป
 DocType: Purchase Invoice,Terms and Conditions1,ข้อตกลงและ Conditions1
@@ -1846,7 +1864,7 @@
 DocType: Authorization Rule,Authorized Value,มูลค่าที่ได้รับอนุญาต
 DocType: Contact,Enter department to which this Contact belongs,ใส่แผนกที่ติดต่อนี้เป็นของ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,ขาดทั้งหมด
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,สินค้าหรือ โกดัง แถว {0} ไม่ตรงกับที่ ขอ วัสดุ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,สินค้าหรือ โกดัง แถว {0} ไม่ตรงกับที่ ขอ วัสดุ
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,หน่วยของการวัด
 DocType: Fiscal Year,Year End Date,ปีที่จบ วันที่
 DocType: Task Depends On,Task Depends On,ขึ้นอยู่กับงาน
@@ -1872,7 +1890,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,วันที่สิ้นสุด สัญญา จะต้องมากกว่า วันที่ เข้าร่วม
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,จำหน่ายบุคคลที่สาม / ตัวแทนจำหน่าย / ตัวแทนคณะกรรมการ / พันธมิตร / ผู้ค้าปลีกที่ขายสินค้า บริษัท สำหรับคณะกรรมการ
 DocType: Customer Group,Has Child Node,มีโหนดลูก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} กับใบสั่งซื้อ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} กับใบสั่งซื้อ {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",ป้อนพารามิเตอร์คงที่ URL ที่นี่ (เช่นผู้ส่ง = ERPNext ชื่อผู้ใช้ = ERPNext รหัสผ่าน = 1234 ฯลฯ )
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ไม่ได้อยู่ในปีงบประมาณที่ใช้งานใด ๆ สำหรับรายละเอียดเพิ่มเติมตรวจ {2}
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,เว็บไซต์ นี้เป็น ตัวอย่างที่สร้างขึ้นโดยอัตโนมัติ จาก ERPNext
@@ -1920,8 +1938,8 @@
  10 เพิ่มหรือหัก: ไม่ว่าคุณต้องการที่จะเพิ่มหรือหักภาษี"
 DocType: Purchase Receipt Item,Recd Quantity,จำนวน Recd
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ไม่สามารถผลิต สินค้า ได้มากขึ้น {0} กว่าปริมาณ การขายสินค้า {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
-DocType: Payment Reconciliation,Bank / Cash Account,บัญชีธนาคาร / เงินสด
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
+DocType: Payment Reconciliation,Bank / Cash Account,บัญชีเงินสด / ธนาคาร
 DocType: Tax Rule,Billing City,เมืองการเรียกเก็บเงิน
 DocType: Global Defaults,Hide Currency Symbol,ซ่อนสัญลักษณ์สกุลเงิน
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","เช่นธนาคาร, เงินสด, บัตรเครดิต"
@@ -1952,6 +1970,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ค่าใช้จ่ายใน ยูทิลิตี้
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-ขึ้นไป
 DocType: Buying Settings,Default Buying Price List,รายการราคาซื้อเริ่มต้น
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.",การตั้ง ค่าเริ่มต้น เช่น บริษัท สกุลเงิน ปัจจุบัน ปีงบประมาณ ฯลฯ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,ประเภท การชำระเงิน
@@ -1986,8 +2005,8 @@
 DocType: Stock Reconciliation Item,Current Qty,จำนวนปัจจุบัน
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",โปรดดูที่ &quot;ค่าของวัสดุบนพื้นฐานของ&quot; ต้นทุนในมาตรา
 DocType: Appraisal Goal,Key Responsibility Area,พื้นที่ความรับผิดชอบหลัก
-DocType: Item Reorder,Material Request Type,ชนิดของการร้องขอวัสดุ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,แถว {0}: UOM ปัจจัยการแปลงมีผลบังคับใช้
+DocType: Item Reorder,Material Request Type,ประเภทของการขอวัสดุ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,แถว {0}: UOM ปัจจัยการแปลงมีผลบังคับใช้
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,อ้าง
 DocType: Cost Center,Cost Center,ศูนย์ต้นทุน
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,บัตรกำนัล #
@@ -2010,7 +2029,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,ที่อยู่ทั้งหมด
 DocType: Company,Stock Settings,การตั้งค่าหุ้น
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",การควบรวมจะเป็นไปได้ถ้าคุณสมบัติต่อไปนี้จะเหมือนกันทั้งในบันทึก เป็นกลุ่มประเภทราก บริษัท
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",การควบรวมจะเป็นไปได้ถ้าคุณสมบัติต่อไปนี้จะเหมือนกันทั้งในบันทึก เป็นกลุ่มประเภทราก บริษัท
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,จัดการ กลุ่ม ลูกค้า ต้นไม้
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,ใหม่ ชื่อ ศูนย์ต้นทุน
 DocType: Leave Control Panel,Leave Control Panel,ฝากแผงควบคุม
@@ -2030,8 +2049,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,รายละเอียดการชำระเงินเครื่องมือ
 ,Sales Browser,ขาย เบราว์เซอร์
 DocType: Journal Entry,Total Credit,เครดิตรวม
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},คำเตือน: อีก {0} # {1} อยู่กับรายการหุ้น {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,ในประเทศ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},คำเตือน: อีก {0} # {1} อยู่กับรายการหุ้น {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,ลูกหนี้
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,ใหญ่
@@ -2050,7 +2069,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ขายทำธุรกรรมทั้งหมดสามารถติดแท็กกับหลายบุคคลที่ขาย ** ** เพื่อให้คุณสามารถตั้งค่าและตรวจสอบเป้าหมาย
 ,S.O. No.,เลขที่ใบสั่งขาย
 DocType: Production Order Operation,Make Time Log,สร้างบันทึกเวลา
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,กรุณาตั้งค่าปริมาณการสั่งซื้อ
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,กรุณาตั้งค่าปริมาณการสั่งซื้อ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},กรุณาสร้าง ลูกค้า จากช่องทาง {0}
 DocType: Price List,Applicable for Countries,ใช้งานได้สำหรับประเทศ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,คอมพิวเตอร์
@@ -2110,14 +2129,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,อย่างน้อยหนึ่งรายการที่ควรจะใส่ที่มีปริมาณเชิงลบในเอกสารกลับมา
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,หมายเหตุไม่มี
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,หมายเหตุไม่มี
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,เกินกำหนด
 DocType: Account,Stock Received But Not Billed,สินค้าที่ได้รับ แต่ไม่ได้เรียกเก็บ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,บัญชีรากจะต้องเป็นกลุ่ม
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,บัญชีรากจะต้องเป็นกลุ่ม
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,จ่ายขั้นต้น + จำนวน Arrear + จำนวนการได้เป็นเงินสด - หักรวม
 DocType: Monthly Distribution,Distribution Name,ชื่อการแจกจ่าย
 DocType: Features Setup,Sales and Purchase,การขายและการซื้อ
-DocType: Supplier Quotation Item,Material Request No,ขอวัสดุไม่มี
+DocType: Supplier Quotation Item,Material Request No,เลขการขอวัสดุ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},การตรวจสอบคุณภาพ ที่จำเป็นสำหรับ รายการ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,อัตราที่สกุลเงินของลูกค้าจะถูกแปลงเป็นสกุลเงินหลักของ บริษัท
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ได้รับการยกเลิกการสมัครที่ประสบความสำเร็จจากรายการนี้
@@ -2127,6 +2146,7 @@
 DocType: Journal Entry Account,Party Balance,ยอดคงเหลือพรรค
 DocType: Sales Invoice Item,Time Log Batch,ชุดบันทึกเวลา
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,กรุณาเลือกใช้ส่วนลด
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,สลิปเงินเดือนที่ต้องการสร้าง
 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,โอนวัสดุสำหรับการผลิต
@@ -2134,9 +2154,9 @@
 DocType: Purchase Invoice,Half-yearly,รายหกเดือน
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,ปีงบประมาณ {0} ไม่พบ
 DocType: Bank Reconciliation,Get Relevant Entries,ได้รับ คอมเมนต์ ที่เกี่ยวข้อง
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,เข้าบัญชีสำหรับสต็อก
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,เข้าบัญชีสำหรับสต็อก
 DocType: Sales Invoice,Sales Team1,ขาย Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,รายการที่ {0} ไม่อยู่
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,รายการที่ {0} ไม่อยู่
 DocType: Sales Invoice,Customer Address,ที่อยู่ของลูกค้า
 DocType: Purchase Invoice,Apply Additional Discount On,สมัครสมาชิกเพิ่มเติมส่วนลด
 DocType: Account,Root Type,ประเภท ราก
@@ -2145,15 +2165,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,แสดงภาพสไลด์นี้ที่ด้านบนของหน้า
 DocType: BOM,Item UOM,UOM รายการ
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),จํานวนเงินภาษีหลังจากที่จำนวนส่วนลด (บริษัท สกุลเงิน)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},คลังสินค้า เป้าหมาย จำเป็นสำหรับ แถว {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},คลังสินค้า เป้าหมาย จำเป็นสำหรับ แถว {0}
 DocType: Quality Inspection,Quality Inspection,การตรวจสอบคุณภาพ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,ขนาดเล็กเป็นพิเศษ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,บัญชี {0} จะถูก แช่แข็ง
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,นิติบุคคล / สาขา ที่มีผังบัญชีแยกกัน ภายใต้องค์กร
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","อาหาร, เครื่องดื่ม และ ยาสูบ"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL หรือ BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},สามารถชำระเงินยังไม่เรียกเก็บกับ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},สามารถชำระเงินยังไม่เรียกเก็บกับ {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,อัตราค่านายหน้า ไม่สามารถ จะมากกว่า 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,ระดับสินค้าคงคลังต่ำสุด
 DocType: Stock Entry,Subcontract,สัญญารับช่วง
@@ -2163,7 +2183,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,ไม่มี SMS ที่ส่ง
 DocType: Account,Company,บริษัท
 DocType: Account,Expense Account,บัญชีค่าใช้จ่าย
@@ -2191,16 +2211,17 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,การตรวจสอบคุณภาพที่เข้ามา
 DocType: Purchase Order Item,Returned Qty,จำนวนกลับ
 DocType: Employee,Exit,ทางออก
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,ประเภท ราก มีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,ประเภท ราก มีผลบังคับใช้
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,อนุกรม ไม่มี {0} สร้าง
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",เพื่อความสะดวกของลูกค้า รหัสเหล่านี้จะถูกใช้ในการพิมพ์เอกสาร เช่น ใบแจ้งหนี้ และใบนำส่งสินค้า
-DocType: Employee,You can enter any date manually,คุณสามารถป้อนวันที่ใด ๆ ด้วยตนเอง
+DocType: Employee,You can enter any date manually,คุณสามารถป้อนวันที่ได้ด้วยตนเอง
 DocType: Sales Invoice,Advertisement,การโฆษณา
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,ระยะเวลาการฝึกงาน
 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 +110,Row {0}: Advance against Customer must be credit,แถว {0}: ล่วงหน้ากับลูกค้าจะต้องมีเครดิต
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,รายการรับซื้อจำหน่าย
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,จ่ายเงิน
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,จ่ายเงิน
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,เพื่อ Datetime
 DocType: SMS Settings,SMS Gateway URL,URL เกตเวย์ SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,บันทึกการรักษาสถานะการจัดส่งทาง SMS
@@ -2217,7 +2238,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,สั่งซื้อใหม่ระดับ
 DocType: Attendance,Attendance Date,วันที่เข้าร่วม
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,การล่มสลายเงินเดือนขึ้นอยู่กับกำไรและหัก
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,บัญชีที่มี ต่อมน้ำเด็ก ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,บัญชีที่มี ต่อมน้ำเด็ก ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
 DocType: Address,Preferred Shipping Address,ที่อยู่การจัดส่งสินค้าที่ต้องการ
 DocType: Purchase Receipt Item,Accepted Warehouse,คลังสินค้าได้รับการยอมรับ
 DocType: Bank Reconciliation Detail,Posting Date,โพสต์วันที่
@@ -2235,11 +2256,11 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,อนุกรม ไม่มี {0} ไม่อยู่
 DocType: Pricing Rule,Discount Percentage,ร้อยละ ส่วนลด
 DocType: Payment Reconciliation Invoice,Invoice Number,จำนวนใบแจ้งหนี้
-apps/erpnext/erpnext/hooks.py +54,Orders,คำสั่งซื้อ
+apps/erpnext/erpnext/hooks.py +55,Orders,คำสั่งซื้อ
 DocType: Leave Control Panel,Employee Type,ประเภทพนักงาน
 DocType: Employee Leave Approver,Leave Approver,ฝากอนุมัติ
 DocType: Manufacturing Settings,Material Transferred for Manufacture,วัสดุสำหรับการผลิตโอน
-DocType: Expense Claim,"A user with ""Expense Approver"" role","ผู้ใช้ที่มีบทบาท ""ค่าใช้จ่ายอนุมัติ"""
+DocType: Expense Claim,"A user with ""Expense Approver"" role","ผู้ใช้ที่มีบทบาท ""อนุมัติค่าใช้จ่าย"""
 ,Issued Items Against Production Order,รายการที่ออกมาต่อต้านการสั่งซื้อการผลิต
 DocType: Pricing Rule,Purchase Manager,ผู้จัดการฝ่ายจัดซื้อ
 DocType: Payment Tool,Payment Tool,เครื่องมือการชำระเงิน
@@ -2247,7 +2268,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% ของวัสดุที่เรียกเก็บเงินกับการสั่งซื้อนี้ขาย
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,ระยะเวลาการเข้าปิดบัญชี
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ศูนย์ต้นทุน กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ค่าเสื่อมราคา
+DocType: Account,Depreciation,ค่าเสื่อมราคา
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ผู้ผลิต (s)
 DocType: Customer,Credit Limit,วงเงินสินเชื่อ
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,เลือกประเภทของการทำธุรกรรม
@@ -2264,7 +2285,7 @@
 DocType: Stock Settings,Freeze Stock Entries,ตรึงคอมเมนต์สินค้า
 DocType: Item,Reorder level based on Warehouse,ระดับสั่งซื้อใหม่บนพื้นฐานของคลังสินค้า
 DocType: Activity Cost,Billing Rate,อัตราการเรียกเก็บเงิน
-,Qty to Deliver,จำนวน ที่จะ ส่งมอบ
+,Qty to Deliver,จำนวนที่จะส่งมอบ
 DocType: Monthly Distribution Percentage,Month,เดือน
 ,Stock Analytics,สต็อก Analytics
 DocType: Installation Note Item,Against Document Detail No,กับรายละเอียดของเอกสารเลขที่
@@ -2272,11 +2293,12 @@
 DocType: Material Request,Requested For,สำหรับ การร้องขอ
 DocType: Quotation Item,Against Doctype,กับ ประเภทเอกสาร
 DocType: Delivery Note,Track this Delivery Note against any Project,ติดตามการจัดส่งสินค้าหมายเหตุนี้กับโครงการใด ๆ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,บัญชี ราก ไม่สามารถลบได้
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,เงินสดสุทธิจากการลงทุน
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,บัญชี ราก ไม่สามารถลบได้
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,แสดงรายการสต็อก
 ,Is Primary Address,เป็นที่อยู่หลัก
 DocType: Production Order,Work-in-Progress Warehouse,คลังสินค้าทำงานในความคืบหน้า
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},อ้างอิง # {0} วันที่ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},อ้างอิง # {0} วันที่ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,การจัดการที่อยู่
 DocType: Pricing Rule,Item Code,รหัสสินค้า
 DocType: Production Planning Tool,Create Production Orders,สร้างคำสั่งซื้อการผลิต
@@ -2284,7 +2306,7 @@
 DocType: Journal Entry,User Remark,หมายเหตุผู้ใช้
 DocType: Lead,Market Segment,ส่วนตลาด
 DocType: Employee Internal Work History,Employee Internal Work History,ประวัติการทำงานของพนักงานภายใน
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),ปิด (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),ปิด (Dr)
 DocType: Contact,Passive,ไม่โต้ตอบ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,อนุกรม ไม่มี {0} ไม่ได้อยู่ใน สต็อก
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,แม่แบบ ภาษี สำหรับการขาย ในการทำธุรกรรม
@@ -2300,7 +2322,7 @@
 ,Billed Amount,จำนวนเงินที่ เรียกเก็บเงิน
 DocType: Bank Reconciliation,Bank Reconciliation,กระทบยอดธนาคาร
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,ได้รับการปรับปรุง
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,ขอ วัสดุ {0} จะถูกยกเลิก หรือ หยุด
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,ขอ วัสดุ {0} จะถูกยกเลิก หรือ หยุด
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,เพิ่มบันทึกไม่กี่ตัวอย่าง
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ออกจากการบริหารจัดการ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,โดย กลุ่ม บัญชี
@@ -2308,15 +2330,15 @@
 DocType: Lead,Lower Income,รายได้ต่ำ
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",หัว บัญชีภายใต้ ความรับผิด ในการที่ กำไร / ขาดทุน จะได้รับการ จอง
 DocType: Payment Tool,Against Vouchers,กับบัตรกำนัล
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,ความช่วยเหลือด่วน
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},แหล่งที่มาและ คลังสินค้า เป้าหมาย ไม่สามารถเป็น เหมือนกันสำหรับ แถว {0}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,ช่วยเหลือ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},แหล่งที่มาและ คลังสินค้า เป้าหมาย ไม่สามารถเป็น เหมือนกันสำหรับ แถว {0}
 DocType: Features Setup,Sales Extras,พิเศษขาย
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} งบประมาณสำหรับ บัญชี {1} กับ ศูนย์ต้นทุน {2} จะเกิน โดย {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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','จาก วันที่ ' ต้อง เป็นหลังจากที่ ' นัด '
 ,Stock Projected Qty,หุ้น ที่คาดการณ์ จำนวน
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
 DocType: Sales Order,Customer's Purchase Order,การสั่งซื้อของลูกค้า
 DocType: Warranty Claim,From Company,จาก บริษัท
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ค่าหรือ จำนวน
@@ -2326,9 +2348,9 @@
 DocType: Leave Block List,Leave Block List Allowed,ฝากรายการบล็อกอนุญาตให้นำ
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,คุณจะใช้มันเพื่อเข้าสู่ระบบ
 DocType: Sales Partner,Retailer,พ่อค้าปลีก
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญชีงบดุล
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญชีงบดุล
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ทุก ประเภท ของผู้ผลิต
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,รหัสสินค้า ที่จำเป็น เพราะ สินค้า ไม่ เลขโดยอัตโนมัติ
+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 +93,Quotation {0} not of type {1},ไม่ได้ ชนิดของ ใบเสนอราคา {0} {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,รายการกำหนดการซ่อมบำรุง
 DocType: Sales Order,%  Delivered,% จัดส่งแล้ว
@@ -2349,7 +2371,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,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 +66,Unsubscribe from this Email Digest,ยกเลิกการรับอีเมล์ Digest นี้
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,ข้อความ ที่ส่ง
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,ข้อความส่งแล้ว
 DocType: Production Plan Sales Order,SO Date,ดังนั้นวันที่
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,อัตราที่สกุลเงินรายการราคาจะถูกแปลงเป็นสกุลเงินหลักของลูกค้า
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ปริมาณสุทธิ (บริษัท สกุลเงิน)
@@ -2372,7 +2394,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),น้ำหนักรวมของแพคเกจ น้ำหนักสุทธิปกติ + น้ำหนักวัสดุบรรจุภัณฑ์ (สำหรับพิมพ์)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ผู้ใช้ที่มี บทบาทนี้ ได้รับอนุญาตให้ตั้ง บัญชีแช่แข็งและ สร้าง / แก้ไข รายการบัญชี ในบัญชีแช่แข็ง
 DocType: Serial No,Is Cancelled,เป็นยกเลิก
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,การจัดส่งของฉัน
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,การจัดส่งของฉัน
 DocType: Journal Entry,Bill Date,วันที่บิล
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",แม้ว่าจะมีกฎการกำหนดราคาหลายกับความสำคัญสูงสุดแล้วจัดลำดับความสำคัญดังต่อไปนี้ภายในจะใช้:
 DocType: Supplier,Supplier Details,รายละเอียดผู้จัดจำหน่าย
@@ -2393,10 +2415,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,โทร
 DocType: Project,Total Costing Amount (via Time Logs),จํานวนต้นทุนรวม (ผ่านบันทึกเวลา)
 DocType: Purchase Order Item Supplied,Stock UOM,UOM สต็อก
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,สั่งซื้อ {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,สั่งซื้อ {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,ที่คาดการณ์ไว้
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน โกดัง {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,หมายเหตุ : ระบบ จะไม่ตรวจสอบ มากกว่าการ ส่งมอบและ มากกว่าการ จอง รายการ {0} เป็น ปริมาณ หรือจำนวน เป็น 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,เปิดวันที่
 DocType: Journal Entry,Remark,คำพูด
@@ -2409,9 +2431,9 @@
 DocType: Time Log,Batched for Billing,batched สำหรับการเรียกเก็บเงิน
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,ตั๋วเงินยกโดยซัพพลายเออร์
 DocType: POS Profile,Write Off Account,เขียนทันทีบัญชี
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,จำนวน ส่วนลด
 DocType: Purchase Invoice,Return Against Purchase Invoice,กลับไปกับการซื้อใบแจ้งหนี้
 DocType: Item,Warranty Period (in days),ระยะเวลารับประกัน (วัน)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,เงินสดจากการดำเนินงานสุทธิ
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,เช่นผู้ ภาษีมูลค่าเพิ่ม
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,วาระที่ 4
 DocType: Journal Entry Account,Journal Entry Account,วารสารบัญชีเข้า
@@ -2451,8 +2473,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM ปัจจุบันและ ใหม่ BOM ไม่สามารถ จะเหมือนกัน
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,วันที่ ของ การเกษียณอายุ ต้องมากกว่า วันที่ เข้าร่วม
 DocType: Sales Invoice,Against Income Account,กับบัญชีรายได้
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% ส่ง
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,รายการ {0}: จำนวนสั่ง {1} ไม่สามารถจะน้อยกว่าจำนวนสั่งซื้อขั้นต่ำ {2} (ที่กำหนดไว้ในรายการ)
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% ส่งแล้ว
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,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,ข้อมูลการขนย้าย
@@ -2480,10 +2502,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},หมายเลข Batch มีผลบังคับใช้สำหรับสินค้า {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,นี้เป็น คนขาย ราก และ ไม่สามารถแก้ไขได้
 ,Stock Ledger,บัญชีแยกประเภทสินค้า
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},ราคา: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},ราคา: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,หักเงินเดือนสลิป
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,เลือกโหนดกลุ่มแรก
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},จุดประสงค์ ต้องเป็นหนึ่งใน {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},จุดประสงค์ ต้องเป็นหนึ่งใน {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,กรอกแบบฟอร์ม และบันทึกไว้
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,ดาวน์โหลดรายงานที่มีวัตถุดิบทั้งหมดที่มีสถานะสินค้าคงคลังของพวกเขาล่าสุด
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ฟอรั่มชุมชน
@@ -2521,7 +2543,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,บริษัท (ไม่ใช่ ลูกค้า หรือ ซัพพลายเออร์ ) เจ้านาย
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"โปรดป้อน "" วันที่ส่ง ที่คาดหวัง '"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ใบนำส่งสินค้า {0} ต้องถูกยกเลิก ก่อนยกเลิกคำสั่งขายนี้
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,ชำระ เงิน + เขียน ปิด จำนวน ไม่สามารถ จะสูงกว่า แกรนด์ รวม
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},หมายเหตุ : มี ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",หมายเหตุ: หากการชำระเงินไม่ได้ทำกับการอ้างอิงใด ๆ ให้วารสารเข้าด้วยตนเอง
@@ -2538,13 +2560,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} ‘{1}' ถูกปิดใช้งาน
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ตั้งเป็นเปิด
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ส่งอีเมลโดยอัตโนมัติไปยังรายชื่อในการทำธุรกรรมการส่ง
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","แถว {0}: จำนวนไม่ Avalable ในคลังสินค้า {1} ใน {2} {3}
  จำนวนที่ยังอยู่: {4} โอนจำนวน: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,วาระที่ 3
 DocType: Purchase Order,Customer Contact Email,อีเมล์ที่ใช้ติดต่อลูกค้า
 DocType: Sales Team,Contribution (%),สมทบ (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,หมายเหตุ : รายการ การชำระเงินจะ ไม่ได้รับการ สร้างขึ้นตั้งแต่ ' เงินสด หรือ บัญชี ธนาคาร ไม่ได้ระบุ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,หมายเหตุ : รายการ การชำระเงินจะ ไม่ได้รับการ สร้างขึ้นตั้งแต่ ' เงินสด หรือ บัญชี ธนาคาร ไม่ได้ระบุ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,ความรับผิดชอบ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,แบบ
 DocType: Sales Person,Sales Person Name,ชื่อคนขาย
@@ -2555,20 +2577,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,ก่อนที่จะกลับไปคืนดี
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,รายการ แถว ภาษี {0} ต้องมีบัญชี ภาษี ประเภท หรือ รายได้ หรือ ค่าใช้จ่าย หรือ คิดค่าบริการได้
 DocType: Sales Order,Partly Billed,จำนวนมากที่สุดเป็นส่วนใหญ่
 DocType: Item,Default BOM,BOM เริ่มต้น
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,กรุณาชื่อ บริษัท อีกครั้งเพื่อยืนยันชนิด
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,รวมที่โดดเด่น Amt
 DocType: Time Log Batch,Total Hours,รวมชั่วโมง
 DocType: Journal Entry,Printing Settings,การตั้งค่าการพิมพ์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},เดบิต รวม ต้องเท่ากับ เครดิต รวม
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},เดบิต รวม ต้องเท่ากับ เครดิต รวม
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ยานยนต์
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,จากหมายเหตุการจัดส่งสินค้า
 DocType: Time Log,From Time,ตั้งแต่เวลา
 DocType: Notification Control,Custom Message,ข้อความที่กำหนดเอง
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,วาณิชธนกิจ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,เงินสดหรือ บัญชีธนาคาร มีผลบังคับใช้ สำหรับการทำ รายการ ชำระเงิน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,เงินสดหรือ บัญชีธนาคาร มีผลบังคับใช้ สำหรับการทำ รายการ ชำระเงิน
 DocType: Purchase Invoice,Price List Exchange Rate,ราคาอัตราแลกเปลี่ยนรายชื่อ
 DocType: Purchase Invoice Item,Rate,อัตรา
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,แพทย์ฝึกหัด
@@ -2587,9 +2609,10 @@
  โดยการกำหนดลำดับความสำคัญ ราคากฎ: {0}"
 DocType: Account,Bank,ธนาคาร
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,สายการบิน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,ฉบับวัสดุ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,ฉบับวัสดุ
 DocType: Material Request Item,For Warehouse,สำหรับโกดัง
 DocType: Employee,Offer Date,ข้อเสนอ วันที่
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ใบเสนอราคา
 DocType: Hub Settings,Access Token,เข้าสู่ Token
 DocType: Sales Invoice Item,Serial No,อนุกรมไม่มี
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,กรุณากรอก รายละเอียด Maintaince แรก
@@ -2598,15 +2621,17 @@
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",หากคุณมีความยาวพิมพ์รูปแบบคุณลักษณะนี้สามารถใช้ในการแยกหน้าเว็บที่จะพิมพ์บนหน้าเว็บหลายหน้ากับส่วนหัวและท้ายกระดาษทั้งหมดในแต่ละหน้า
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,ดินแดน ทั้งหมด
 DocType: Purchase Invoice,Items,รายการ
-DocType: Fiscal Year,Year Name,ปีชื่อ
+DocType: Fiscal Year,Year Name,ชื่อปี
 DocType: Process Payroll,Process Payroll,เงินเดือนกระบวนการ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,มี วันหยุด มากขึ้นกว่าที่ เป็น วันทำการ ในเดือนนี้
 DocType: Product Bundle Item,Product Bundle Item,Bundle รายการสินค้า
 DocType: Sales Partner,Sales Partner Name,ชื่อพันธมิตรขาย
+DocType: Payment Reconciliation,Maximum Invoice Amount,จำนวนใบแจ้งหนี้สูงสุด
 DocType: Purchase Invoice Item,Image View,ดูภาพ
 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 +553,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: Purchase Taxes and Charges,Valuation and Total,การประเมินและรวม
@@ -2614,6 +2639,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,รายการนี้เป็นตัวแปรของ {0} (Template) คุณสมบัติจะถูกคัดลอกมาจากแม่แบบเว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
 DocType: Account,Purchase User,ผู้ซื้อ
 DocType: Notification Control,Customize the Notification,กำหนดประกาศ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,กระแสเงินสดจากการดำเนินงาน
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,แม่แบบเริ่มต้นที่อยู่ไม่สามารถลบได้
 DocType: Sales Invoice,Shipping Rule,กฎการจัดส่งสินค้า
 DocType: Journal Entry,Print Heading,พิมพ์หัวเรื่อง
@@ -2624,7 +2650,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,วัตถุดิบ
 DocType: Leave Application,Follow via Email,ผ่านทางอีเมล์ตาม
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,จำนวน ภาษี หลังจากที่ จำนวน ส่วนลด
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,บัญชีของเด็ก ที่มีอยู่ สำหรับบัญชีนี้ คุณไม่สามารถลบ บัญชีนี้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,กรุณาเลือกวันที่โพสต์แรก
@@ -2642,6 +2668,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},อนุกรม Nos จำเป็นสำหรับ รายการ เนื่อง {0}
 DocType: Journal Entry,Bank Entry,ธนาคารเข้า
 DocType: Authorization Rule,Applicable To (Designation),ที่ใช้บังคับกับ (จุด)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,ใส่ในรถเข็น
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,กลุ่มตาม
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,เปิด / ปิดการใช้งาน สกุลเงิน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ค่าใช้จ่าย ไปรษณีย์
@@ -2649,30 +2676,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,บันเทิงและ การพักผ่อน
 DocType: Purchase Order,The date on which recurring order will be stop,วันที่เกิดขึ้นเป็นประจำเพื่อที่จะหยุด
 DocType: Quality Inspection,Item Serial No,รายการ Serial No.
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} จะต้องลดลงโดย {1} หรือคุณควรจะเพิ่มความอดทนล้น
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} จะต้องลดลงโดย {1} หรือคุณควรจะเพิ่มความอดทนล้น
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,ปัจจุบันทั้งหมด
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,ชั่วโมง
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","เนื่องรายการ {0} ไม่สามารถปรับปรุง \
  ใช้การกระทบยอดสต็อก"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,โอนวัสดุที่จะผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,โอนวัสดุที่จะผลิต
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,สร้าง ใบเสนอราคา
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,คุณไม่ได้รับอนุญาตในการอนุมัติใบในวันที่ถูกบล็อก
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,รายการทั้งหมด เหล่านี้ได้รับ ใบแจ้งหนี้ แล้ว
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,รายการทั้งหมด เหล่านี้ได้รับ ใบแจ้งหนี้ แล้ว
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},สามารถ ได้รับการอนุมัติ โดย {0}
 DocType: Shipping Rule,Shipping Rule Conditions,เงื่อนไขกฎการจัดส่งสินค้า
 DocType: BOM Replace Tool,The new BOM after replacement,BOM ใหม่หลังจากเปลี่ยน
 DocType: Features Setup,Point of Sale,จุดขาย
 DocType: Account,Tax,ภาษี
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},แถว {0}: {1} ไม่ถูกต้อง {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,จาก Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,จาก Bundle สินค้า
 DocType: Production Planning Tool,Production Planning Tool,เครื่องมือการวางแผนการผลิต
 DocType: Quality Inspection,Report Date,รายงานวันที่
 DocType: C-Form,Invoices,ใบแจ้งหนี้
 DocType: Job Opening,Job Title,ตำแหน่งงาน
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} ผู้รับ
 DocType: Features Setup,Item Groups in Details,กลุ่มรายการในรายละเอียด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,ปริมาณการผลิตจะต้องมากกว่า 0
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),จุดเริ่มต้นของการขาย (POS)
@@ -2680,8 +2706,9 @@
 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: Pricing Rule,Customer Group,กลุ่มลูกค้า
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},บัญชีค่าใช้จ่าย ที่จำเป็น สำหรับรายการที่ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},บัญชีค่าใช้จ่าย ที่จำเป็น สำหรับรายการที่ {0}
 DocType: Item,Website Description,คำอธิบายเว็บไซต์
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,เปลี่ยนสุทธิในส่วนของ
 DocType: Serial No,AMC Expiry Date,วันที่หมดอายุ AMC
 ,Sales Register,ขายสมัครสมาชิก
 DocType: Quotation,Quotation Lost Reason,ใบเสนอราคา Lost เหตุผล
@@ -2689,12 +2716,12 @@
 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 +108,Summary for this month and pending activities,สรุปในเดือนนี้และกิจกรรมที่อยู่ระหว่างดำเนินการ
 DocType: Customer Group,Customer Group Name,ชื่อกลุ่มลูกค้า
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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,คุณลักษณะ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,รับสินค้า
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,กรุณากรอกตัวอักษร เขียน ปิด บัญชี
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,รับสินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,กรุณากรอกตัวอักษร เขียน ปิด บัญชี
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,วันที่สั่งซื้อล่าสุด
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,ให้ สรรพสามิต ใบแจ้งหนี้
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
@@ -2704,13 +2731,13 @@
 DocType: Serial No,Creation Document Type,ประเภท การสร้าง เอกสาร
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint เยี่ยมชม
 DocType: Leave Type,Is Encash,เป็นได้เป็นเงินสด
-DocType: Purchase Invoice,Mobile No,มือถือไม่มี
+DocType: Purchase Invoice,Mobile No,เบอร์มือถือ
 DocType: Payment Tool,Make Journal Entry,ทำให้อนุทิน
 DocType: Leave Allocation,New Leaves Allocated,ใหม่ใบจัดสรร
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,ข้อมูล โครงการ ฉลาด ไม่สามารถใช้ได้กับ ใบเสนอราคา
 DocType: Project,Expected End Date,คาดว่าวันที่สิ้นสุด
 DocType: Appraisal Template,Appraisal Template Title,หัวข้อแม่แบบประเมิน
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,เชิงพาณิชย์
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,เชิงพาณิชย์
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,ผู้ปกครองรายการ {0} ต้องไม่เป็นรายการสต็อก
 DocType: Cost Center,Distribution Id,รหัสกระจาย
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,บริการ ที่น่ากลัว
@@ -2723,7 +2750,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ราคาแอตทริบิวต์ {0} &#39;จะต้องอยู่ในช่วงของ {1} เป็น {2} ในการเพิ่มขึ้นของ {3}
 DocType: Tax Rule,Sales,ขาย
 DocType: Stock Entry Detail,Basic Amount,จํานวนเงินขั้นพื้นฐาน
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
 DocType: Leave Allocation,Unused leaves,ใบที่ไม่ได้ใช้
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,บัญชีลูกหนี้เริ่มต้น
@@ -2735,16 +2762,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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 ติดต่อ
 DocType: Landed Cost Voucher,Purchase Receipts,ซื้อรายรับ
-DocType: Payment Reconciliation,Maximum Amount,จำนวนสูงสุด
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,วิธีกฎการกำหนดราคาจะใช้?
 DocType: Quality Inspection,Delivery Note No,หมายเหตุจัดส่งสินค้าไม่มี
 DocType: Company,Retail,ค้าปลีก
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,ลูกค้า {0} ไม่อยู่
 DocType: Attendance,Absent,ขาด
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle สินค้า
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},แถว {0}: การอ้างอิงที่ไม่ถูกต้อง {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},แถว {0}: การอ้างอิงที่ไม่ถูกต้อง {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ซื้อภาษีและค่าใช้จ่ายแม่แบบ
 DocType: Upload Attendance,Download Template,ดาวน์โหลดแม่แบบ
 DocType: GL Entry,Remarks,ข้อคิดเห็น
@@ -2771,7 +2798,7 @@
 ,Monthly Attendance Sheet,แผ่นผู้เข้าร่วมรายเดือน
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,บันทึกไม่พบ
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ศูนย์ต้นทุนจำเป็นสำหรับรายการ {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,บัญชี {0} ไม่ได้ใช้งาน
 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,เข้าร่วมประชุม จาก วันที่และ การเข้าร่วมประชุม เพื่อให้ มีผลบังคับใช้ วันที่
@@ -2780,8 +2807,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' กำไรขาดทุน ประเภท บัญชี {0} ไม่ได้รับอนุญาต ใน การเปิด รายการ
 DocType: Features Setup,Sales Discounts,ส่วนลดการขาย
 DocType: Hub Settings,Seller Country,ผู้ขายประเทศ
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,รายการเผยแพร่บนเว็บไซต์
 DocType: Authorization Rule,Authorization Rule,กฎการอนุญาต
 DocType: Sales Invoice,Terms and Conditions Details,ข้อตกลงและเงื่อนไขรายละเอียด
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,ข้อมูลจำเพาะของ
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ภาษีการขายและค่าใช้จ่ายแม่แบบ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,เครื่องแต่งกาย และอุปกรณ์เสริม
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,จำนวนการสั่งซื้อ
@@ -2803,8 +2832,8 @@
 DocType: Time Log,Billing Amount,จำนวนเงินที่เรียกเก็บเงิน
 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 +18,Applications for leave.,โปรแกรมประยุกต์สำหรับการลา
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,บัญชี ที่มีอยู่ กับการทำธุรกรรม ไม่สามารถลบได้
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ค่าใช้จ่าย ทางกฎหมาย
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,บัญชี ที่มีอยู่ กับการทำธุรกรรม ไม่สามารถลบได้
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ค่าใช้จ่ายทางกฎหมาย
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","วันของเดือนที่สั่งซื้อรถยนต์จะถูกสร้างขึ้นเช่น 05, 28 ฯลฯ"
 DocType: Sales Invoice,Posting Time,โพสต์เวลา
 DocType: Sales Order,% Amount Billed,% ของยอดเงินที่เรียกเก็บแล้ว
@@ -2819,11 +2848,11 @@
 DocType: Maintenance Visit,Breakdown,การเสีย
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,บัญชี: {0} กับสกุลเงิน: {1} ไม่สามารถเลือกได้
 DocType: Bank Reconciliation Detail,Cheque Date,วันที่เช็ค
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่ได้เป็นของ บริษัท : {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่ได้เป็นของ บริษัท : {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,ประสบความสำเร็จในการทำธุรกรรมที่ถูกลบทั้งหมดที่เกี่ยวข้องกับ บริษัท นี้!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ขณะที่ในวันที่
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,การทดลอง
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,โกดัง เริ่มต้น มีผลบังคับใช้ กับ รายการ สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,โกดัง เริ่มต้น มีผลบังคับใช้ กับ รายการ สต็อก
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},การชำระเงิน ของเงินเดือน สำหรับเดือน{0} และปี {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,แทรกอัตโนมัติราคาอัตรารายชื่อถ้าขาดหายไป
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,รวมจำนวนเงินที่จ่าย
@@ -2835,6 +2864,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),จำนวนเงินที่เรียกเก็บเงินรวม (ผ่านบันทึกเวลา)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,เราขาย สินค้า นี้
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id ผู้ผลิต
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,ปริมาณที่ควรจะเป็นมากกว่า 0
 DocType: Journal Entry,Cash Entry,เงินสดเข้า
 DocType: Sales Partner,Contact Desc,Desc ติดต่อ
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.",ประเภทของใบเช่นลำลอง ฯลฯ ป่วย
@@ -2843,7 +2873,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,เพิ่มแถวเพื่อตั้งงบประมาณประจำปีของบัญชี
 DocType: Buying Settings,Default Supplier Type,ซัพพลายเออร์ชนิดเริ่มต้น
 DocType: Production Order,Total Operating Cost,ค่าใช้จ่ายการดำเนินงานรวม
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,หมายเหตุ : รายการ {0} เข้ามา หลายครั้ง
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,หมายเหตุ : รายการ {0} เข้ามา หลายครั้ง
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,ติดต่อทั้งหมด
 DocType: Newsletter,Test Email Id,Email รหัสการทดสอบ
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,ชื่อย่อ บริษัท
@@ -2868,7 +2898,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,ทุกกลุ่ม ลูกค้า
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,แม่แบบภาษีมีผลบังคับใช้
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่อยู่
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่อยู่
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),อัตราราคาปกติ (สกุลเงิน บริษัท )
 DocType: Account,Temporary,ชั่วคราว
 DocType: Address,Preferred Billing Address,ที่อยู่การเรียกเก็บเงินที่ต้องการ
@@ -2879,15 +2909,15 @@
 DocType: HR Settings,Employee Records to be created by,ระเบียนพนักงานที่จะถูกสร้างขึ้นโดย
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,บันทึกเวลาชุดนี้ถูกยกเลิกแล้ว
 ,Reqd By Date,reqd โดยวันที่
-DocType: Salary Slip Earning,Salary Slip Earning,สลิปเงินเดือนรายได้
+DocType: Salary Slip Earning,Salary Slip Earning,รายได้สลิปเงินเดือน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,เจ้าหนี้
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,แถว # {0}: ไม่มีอนุกรมมีผลบังคับใช้
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,รายการ ฉลาด รายละเอียด ภาษี
 ,Item-wise Price List Rate,รายการ ฉลาด อัตรา ราคาตามรายการ
 DocType: Purchase Order Item,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
 DocType: Quotation,In Words will be visible once you save the Quotation.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบเสนอราคา
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} หยุดทำงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},บาร์โค้ด {0} ใช้แล้ว ใน รายการ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} หยุดทำงาน
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},บาร์โค้ด {0} ได้ใช้แล้วในรายการ {1}
 DocType: Lead,Add to calendar on this date,เพิ่มไปยังปฏิทินของวันนี้
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,กฎระเบียบ สำหรับการเพิ่ม ค่าใช้จ่ายใน การจัดส่งสินค้า
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,เหตุการณ์ที่จะเกิดขึ้น
@@ -2907,24 +2937,24 @@
 DocType: Customer,From Lead,จากช่องทาง
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,คำสั่งปล่อยให้การผลิต
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,เลือกปีงบประมาณ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,รายละเอียด POS ต้องทำให้ POS รายการ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,รายละเอียด POS ต้องทำให้ POS รายการ
 DocType: Hub Settings,Name Token,ชื่อ Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,ขาย มาตรฐาน
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,อย่างน้อยหนึ่งคลังสินค้ามีผลบังคับใช้
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,แทนที่
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} กับการขายใบแจ้งหนี้ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,กรุณาใส่ หน่วย เริ่มต้น ของการวัด
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} กับการขายใบแจ้งหนี้ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,กรุณาใส่ หน่วย เริ่มต้น ของการวัด
 DocType: Purchase Invoice Item,Project Name,ชื่อโครงการ
 DocType: Supplier,Mention if non-standard receivable account,ถ้าพูดถึงไม่ได้มาตรฐานบัญชีลูกหนี้
 DocType: Journal Entry Account,If Income or Expense,ถ้ารายได้หรือค่าใช้จ่าย
 DocType: Features Setup,Item Batch Nos,Nos Batch รายการ
 DocType: Stock Ledger Entry,Stock Value Difference,ความแตกต่างมูลค่าหุ้น
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,ทรัพยากรมนุษย์
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,ทรัพยากรมนุษย์
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,กระทบยอดการชำระเงิน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,สินทรัพย์ ภาษี
 DocType: BOM Item,BOM No,BOM ไม่มี
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,อนุทิน {0} ไม่มีบัญชี {1} หรือการจับคู่แล้วกับบัตรกำนัลอื่น ๆ
 DocType: Item,Moving Average,ค่าเฉลี่ยเคลื่อนที่
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ซึ่งจะถูกแทนที่
 DocType: Account,Debit,หักบัญชี
@@ -2961,7 +2991,7 @@
 DocType: Stock Entry Detail,Additional Cost,ค่าใช้จ่ายเพิ่มเติม
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,ปี การเงิน สิ้นสุด วันที่
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",ไม่สามารถกรอง ตาม คูปอง ไม่ ถ้า จัดกลุ่มตาม คูปอง
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
 DocType: Quality Inspection,Incoming,ขาเข้า
 DocType: BOM,Materials Required (Exploded),วัสดุบังคับ (ระเบิด)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),ลดรายได้สำหรับการออกโดยไม่จ่าย (LWP)
@@ -2969,7 +2999,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},แถว # {0}: ไม่มี Serial {1} ไม่ตรงกับ {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,สบาย ๆ ออก
 DocType: Batch,Batch ID,ID ชุด
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},หมายเหตุ : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},หมายเหตุ : {0}
 ,Delivery Note Trends,แนวโน้มหมายเหตุการจัดส่งสินค้า
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ข้อมูลอย่างนี้สัปดาห์
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} จะต้องเป็น รายการ ที่จัดซื้อ หรือ ย่อย สัญญา ในแถว {1}
@@ -2979,11 +3009,12 @@
 DocType: Opportunity,Opportunity Date,วันที่มีโอกาส
 DocType: Purchase Receipt,Return Against Purchase Receipt,กลับต่อต้านการซื้อใบเสร็จรับเงิน
 DocType: Purchase Order,To Bill,บิล
-DocType: Material Request,% Ordered,% สั่ง
+DocType: Material Request,% Ordered,% สั่งแล้ว
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,งานเหมา
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ราคาซื้อเฉลี่ย
 DocType: Task,Actual Time (in Hours),เวลาที่เกิดขึ้นจริง (ในชั่วโมง)
 DocType: Employee,History In Company,ประวัติใน บริษัท
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,จดหมายข่าว
 DocType: Address,Shipping,การส่งสินค้า
 DocType: Stock Ledger Entry,Stock Ledger Entry,รายการสินค้าบัญชีแยกประเภท
@@ -3003,7 +3034,6 @@
 DocType: Purchase Order,End date of current order's period,วันที่สิ้นสุดระยะเวลาการสั่งซื้อของ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ทำให้หนังสือเสนอ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,กลับ
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,เริ่มต้นหน่วยวัดสำหรับตัวแปรจะต้องเป็นแม่แบบเดียวกับ
 DocType: Production Order Operation,Production Order Operation,การดำเนินงานการผลิตการสั่งซื้อ
 DocType: Pricing Rule,Disable,ปิดการใช้งาน
 DocType: Project Task,Pending Review,รอตรวจทาน
@@ -3011,7 +3041,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,รหัสลูกค้า
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,เวลาที่จะต้องมากกว่าจากเวลา
 DocType: Journal Entry Account,Exchange Rate,อัตราแลกเปลี่ยน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},คลังสินค้า {0}: บัญชีผู้ปกครอง {1} ไม่ bolong บริษัท {2}
 DocType: BOM,Last Purchase Rate,อัตราซื้อล่าสุด
 DocType: Account,Asset,สินทรัพย์
@@ -3031,8 +3061,8 @@
 ,Available Stock for Packing Items,สต็อกสำหรับการบรรจุรายการ
 DocType: Item Variant,Item Variant,รายการตัวแปร
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,การตั้งค่าแม่แบบที่อยู่นี้เป็นค่าเริ่มต้นที่ไม่มีค่าเริ่มต้นอื่น ๆ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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 +76,Quality Management,การบริหารจัดการ ที่มีคุณภาพ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,การบริหารจัดการคุณภาพ
 DocType: Production Planning Tool,Filter based on customer,กรองขึ้นอยู่กับลูกค้า
 DocType: Payment Tool Detail,Against Voucher No,กับคูปองไม่มี
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},กรุณากรอก ปริมาณ รายการ {0}
@@ -3048,6 +3078,7 @@
 DocType: Opportunity,Next Contact,ติดต่อถัดไป
 DocType: Employee,Employment Type,ประเภทการจ้างงาน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,สินทรัพย์ถาวร
+,Cash Flow,กระแสเงินสด
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,รับสมัครไม่สามารถบันทึกในสอง alocation
 DocType: Item Group,Default Expense Account,บัญชีค่าใช้จ่ายเริ่มต้น
 DocType: Employee,Notice (days),แจ้งให้ทราบล่วงหน้า (วัน)
@@ -3079,13 +3110,12 @@
 DocType: Production Order,Warehouses,โกดัง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,การพิมพ์และ เครื่องเขียน
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,กลุ่มโหนด
-DocType: Payment Reconciliation,Minimum Amount,จำนวนขั้นต่ำ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,ปรับปรุง สินค้า สำเร็จรูป
 DocType: Workstation,per hour,ต่อชั่วโมง
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,บัญชีสำหรับ คลังสินค้า( Inventory ตลอด ) จะถูก สร้างขึ้นภายใต้ บัญชี นี้
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,คลังสินค้า ไม่สามารถลบได้ เป็นรายการ บัญชีแยกประเภท หุ้น ที่มีอยู่สำหรับ คลังสินค้า นี้
 DocType: Company,Distribution,การกระจาย
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,จำนวนเงินที่ชำระ
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,จำนวนเงินที่ชำระ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,ผู้จัดการโครงการ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,ส่งไป
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ส่วนลดสูงสุดที่ได้รับอนุญาตสำหรับรายการ: {0} เป็น {1}%
@@ -3109,7 +3139,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics สนับสนุน
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},บริษัท ที่ขาดหายไป ในคลังสินค้า {0}
 DocType: POS Profile,Terms and Conditions,ข้อตกลงและเงื่อนไข
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},วันที่ควรจะเป็นภายในปีงบประมาณ สมมติว่านัด = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},วันที่ควรจะเป็นภายในปีงบประมาณ สมมติว่านัด = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ที่นี่คุณสามารถรักษาความสูงน้ำหนัก, ภูมิแพ้, ฯลฯ ปัญหาด้านการแพทย์"
 DocType: Leave Block List,Applies to Company,นำไปใช้กับ บริษัท
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,ไม่สามารถยกเลิก ได้เพราะ ส่ง สินค้า เข้า {0} มีอยู่
@@ -3123,11 +3153,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,กรุณากรอกตัวอักษรซื้อรายรับ
 DocType: Sales Invoice,Get Advances Received,รับเงินรับล่วงหน้า
 DocType: Email Digest,Add/Remove Recipients,เพิ่ม / ลบ ชื่อผู้รับ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},การทำธุรกรรมที่ ไม่ได้รับอนุญาต กับ หยุด การผลิต สั่งซื้อ {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),การตั้งค่า เซิร์ฟเวอร์ขาเข้า สำหรับการสนับสนุน อีเมล์ ของคุณ (เช่น support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ปัญหาการขาดแคลนจำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
 DocType: Salary Slip,Salary Slip,สลิปเงินเดือน
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.","สร้างบรรจุภัณฑ์สำหรับแพคเกจที่จะส่งมอบ ที่ใช้ในการแจ้งหมายเลขแพคเกจ, แพคเกจเนื้อหาและน้ำหนักของมัน"
@@ -3169,7 +3199,7 @@
 DocType: Appraisal,Appraisal Template,แม่แบบการประเมิน
 DocType: Item Group,Item Classification,การจัดประเภทรายการ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,ผู้จัดการฝ่ายพัฒนาธุรกิจ
-DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,วัตถุประสงค์ชมการบำรุงรักษา
+DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,วัตถุประสงค์การเข้ามาบำรุงรักษา
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,ระยะเวลา
 ,General Ledger,บัญชีแยกประเภททั่วไป
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,ดูนำ
@@ -3216,7 +3246,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,ระเบียนพนักงาน
 DocType: HR Settings,Payroll Settings,การตั้งค่า บัญชีเงินเดือน
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,ตรงกับใบแจ้งหนี้ไม่ได้เชื่อมโยงและการชำระเงิน
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,สถานที่การสั่งซื้อ
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,สถานที่การสั่งซื้อ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,รากไม่สามารถมีศูนย์ต้นทุนผู้ปกครอง
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,เลือกยี่ห้อ ...
 DocType: Sales Invoice,C-Form Applicable,C-Form สามารถนำไปใช้ได้
@@ -3231,7 +3261,7 @@
 DocType: Appraisal,Start Date,วันที่เริ่มต้น
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,จัดสรร ใบ เป็นระยะเวลา
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,คลิกที่นี่เพื่อตรวจสอบ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,บัญชี {0}: คุณไม่สามารถกำหนดตัวเองเป็นบัญชีผู้ปกครอง
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,บัญชี {0}: คุณไม่สามารถกำหนดตัวเองเป็นบัญชีผู้ปกครอง
 DocType: Purchase Invoice Item,Price List Rate,อัตราราคาตามรายการ
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",แสดง &quot;ในสต็อก&quot; หรือ &quot;ไม่อยู่ในสต็อก&quot; บนพื้นฐานของหุ้นที่มีอยู่ในคลังสินค้านี้
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),บิลวัสดุ (BOM)
@@ -3240,17 +3270,17 @@
 DocType: Project,Expected Start Date,วันที่เริ่มต้นคาดว่า
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,ลบรายการค่าใช้จ่ายถ้าไม่สามารถใช้ได้กับรายการที่
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,เช่น smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,รับ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,รับ
 DocType: Maintenance Visit,Fully Completed,เสร็จสมบูรณ์
-apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% แล้วเสร็จ
+apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% เสร็จแล้ว
 DocType: Employee,Educational Qualification,วุฒิการศึกษา
 DocType: Workstation,Operating Costs,ค่าใช้จ่ายในการดำเนินงาน
 DocType: Employee Leave Approver,Employee Leave Approver,อนุมัติพนักงานออก
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ได้รับการเพิ่มประสบความสำเร็จในรายการจดหมายข่าวของเรา
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",ไม่ สามารถประกาศ เป็น หายไป เพราะ ใบเสนอราคา ได้รับการทำ
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ซื้อผู้จัดการโท
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,สั่งผลิต {0} จะต้องส่ง
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,สั่งผลิต {0} จะต้องส่ง
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},กรุณาเลือก วันเริ่มต้น และ วันที่สิ้นสุด สำหรับรายการที่ {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,รายงานหลัก
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,วันที่ ไม่สามารถ ก่อนที่จะ นับจากวันที่
@@ -3268,7 +3298,7 @@
 DocType: Industry Type,Industry Type,ประเภทอุตสาหกรรม
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,สิ่งที่ผิดพลาด!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,คำเตือน: โปรแกรมออกมีวันที่บล็อกต่อไปนี้
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,ใบแจ้งหนี้ การขาย {0} ได้ ถูกส่งมา อยู่แล้ว
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,ใบแจ้งหนี้ การขาย {0} ได้ ถูกส่งมา อยู่แล้ว
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,วันที่เสร็จสมบูรณ์
 DocType: Purchase Invoice Item,Amount (Company Currency),จำนวนเงิน (สกุลเงิน บริษัท )
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,หน่วย องค์กร (เขตปกครอง) ต้นแบบ
@@ -3287,10 +3317,10 @@
 ,Serial No Service Contract Expiry,อนุกรมไม่มีหมดอายุสัญญาบริการ
 DocType: Item,Unit of Measure Conversion,หน่วยวัดแปลง
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,พนักงานไม่สามารถเปลี่ยนแปลงได้
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,คุณไม่ สามารถเครดิต และ หักเงินจากบัญชี เดียวกันในเวลาเดียวกัน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,คุณไม่ สามารถเครดิต และ หักเงินจากบัญชี เดียวกันในเวลาเดียวกัน
 DocType: Naming Series,Help HTML,วิธีใช้ HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},weightage รวม ที่ได้รับมอบหมาย ควรจะ 100% มันเป็น {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
 DocType: Address,Name of person or organization that this address belongs to.,ชื่อบุคคลหรือองค์กรที่อยู่นี้เป็นของ
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,ซัพพลายเออร์ ของคุณ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ไม่สามารถตั้งค่า ที่ หายไป ในขณะที่ การขายสินค้า ที่ทำ
@@ -3303,35 +3333,35 @@
 DocType: Employee,Date of Issue,วันที่ออก
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: จาก {0} สำหรับ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},แถว # {0}: ตั้งผู้ผลิตสำหรับรายการ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,ภาพ Website {0} แนบไปกับรายการ {1} ไม่สามารถพบได้
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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.,รายการนี้ในหลายกลุ่มในเว็บไซต์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,กรุณาตรวจสอบตัวเลือกสกุลเงินที่จะอนุญาตให้มีหลายบัญชีที่มีสกุลเงินอื่น ๆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,กรุณาตรวจสอบตัวเลือกสกุลเงินที่จะอนุญาตให้มีหลายบัญชีที่มีสกุลเงินอื่น ๆ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,รายการ: {0} ไม่อยู่ในระบบ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,คุณยังไม่ได้ รับอนุญาตให้ กำหนดค่า แช่แข็ง
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,คุณยังไม่ได้ รับอนุญาตให้ กำหนดค่า แช่แข็ง
 DocType: Payment Reconciliation,Get Unreconciled Entries,คอมเมนต์ได้รับ Unreconciled
+DocType: Payment Reconciliation,From Invoice Date,จากวันที่ใบแจ้งหนี้
 DocType: Cost Center,Budgets,งบประมาณ
-DocType: Employee,Emergency Contact Details,รายละเอียดการติดต่อในกรณีฉุกเฉิน
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,มัน ทำอะไรได้บ้าง
 DocType: Delivery Note,To Warehouse,ไปที่โกดัง
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},บัญชี {0} ได้รับการป้อน มากกว่าหนึ่งครั้ง ในรอบปี {1}
 ,Average Commission Rate,อัตราเฉลี่ยของค่าคอมมิชชั่น
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,'มี ซีเรียล ไม่' ไม่สามารถ 'ใช่' สำหรับรายการ ที่ไม่มี สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,'มีเลขซีเรียล' ไม่สามารถ 'ใช่' สำหรับรายการ ที่ไม่มี สต็อก
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,ผู้เข้าร่วมไม่สามารถทำเครื่องหมายสำหรับวันที่ในอนาคต
 DocType: Pricing Rule,Pricing Rule Help,กฎการกำหนดราคาช่วยเหลือ
 DocType: Purchase Taxes and Charges,Account Head,หัวบัญชี
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,ปรับปรุงค่าใช้จ่ายเพิ่มเติมในการคำนวณค่าใช้จ่ายในที่ดินของรายการ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,ไฟฟ้า
 DocType: Stock Entry,Total Value Difference (Out - In),ความแตกต่างมูลค่ารวม (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,แถว {0}: อัตราแลกเปลี่ยนที่มีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,แถว {0}: อัตราแลกเปลี่ยนที่มีผลบังคับใช้
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},รหัสผู้ใช้ ไม่ได้ ตั้งไว้สำหรับ พนักงาน {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,จากการรับประกันเรียกร้อง
 DocType: Stock Entry,Default Source Warehouse,คลังสินค้าที่มาเริ่มต้น
 DocType: Item,Customer Code,รหัสลูกค้า
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},เตือนวันเกิดสำหรับ {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,ตั้งแต่ วันที่ สั่งซื้อ ล่าสุด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,สินทรัพย์ หุ้น
@@ -3344,7 +3374,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,บัญชีปิด {0} ต้องเป็นชนิดรับผิด / ผู้ถือหุ้น
 DocType: Authorization Rule,Based On,ขึ้นอยู่กับ
 DocType: Sales Order Item,Ordered Qty,สั่งซื้อ จำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Stock Settings,Stock Frozen Upto,สต็อกไม่เกิน Frozen
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},ระยะเวลาเริ่มต้นและระยะเวลาในการบังคับใช้สำหรับวันที่เกิดขึ้น {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,กิจกรรมของโครงการ / งาน
@@ -3352,7 +3382,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),เขียนปิดจำนวนเงิน (บริษัท สกุล)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ที่ดินคูปองต้นทุน
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},กรุณาตั้ง {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ทำซ้ำในวันเดือน
@@ -3364,7 +3394,7 @@
 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} รายการซิงค์
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} รายการที่ซิงค์แล้ว
 DocType: Sales Order,Partly Delivered,ส่งบางส่วน
 DocType: Sales Invoice,Existing Customer,ลูกค้าที่มีอยู่
 DocType: Email Digest,Receivables,ลูกหนี้
@@ -3372,7 +3402,7 @@
 DocType: Quality Inspection Reading,Reading 5,Reading 5
 DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","id อีเมลใส่คั่นด้วยเครื่องหมายจุลภาค, การสั่งซื้อจะถูกส่งโดยอัตโนมัติในวันที่โดยเฉพาะอย่างยิ่ง"
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,ชื่อแคมเปญ จะต้อง
-DocType: Maintenance Visit,Maintenance Date,วันที่การบำรุงรักษา
+DocType: Maintenance Visit,Maintenance Date,วันที่ทำการบำรุงรักษา
 DocType: Purchase Receipt Item,Rejected Serial No,หมายเลขเครื่องปฏิเสธ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,จดหมายข่าวใหม่
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},วันที่เริ่มต้น ควรจะน้อยกว่า วันที่ สิ้นสุดสำหรับ รายการ {0}
@@ -3382,12 +3412,12 @@
 DocType: Upload Attendance,Upload Attendance,อัพโหลดผู้เข้าร่วม
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,รายการวัสดุและปริมาณการผลิตจะต้อง
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ช่วงสูงอายุ 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,จำนวน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,จำนวน
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM แทนที่
 ,Sales Analytics,Analytics ขาย
 DocType: Manufacturing Settings,Manufacturing Settings,การตั้งค่าการผลิต
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,การตั้งค่าอีเมล์
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,กรุณาใส่ สกุลเงินเริ่มต้น ใน บริษัท มาสเตอร์
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,กรุณาใส่ สกุลเงินเริ่มต้น ใน บริษัท มาสเตอร์
 DocType: Stock Entry Detail,Stock Entry Detail,รายละเอียดรายการสินค้า
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,การแจ้งเตือนทุกวัน
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},ความขัดแย้งกับกฎภาษี {0}
@@ -3413,13 +3443,13 @@
 DocType: Sales Order Item,Produced Quantity,จำนวนที่ผลิต
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,วิศวกร
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ค้นหาประกอบย่อย
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},รหัสสินค้า ที่จำเป็น ที่ แถว ไม่มี {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},รหัสสินค้า ที่จำเป็น ที่ แถว ไม่มี {0}
 DocType: Sales Partner,Partner Type,ประเภทคู่
 DocType: Purchase Taxes and Charges,Actual,ตามความเป็นจริง
 DocType: Authorization Rule,Customerwise Discount,ส่วนลด Customerwise
 DocType: Purchase Invoice,Against Expense Account,กับบัญชีค่าใช้จ่าย
 DocType: Production Order,Production Order,สั่งซื้อการผลิต
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,หมายเหตุ การติดตั้ง {0} ได้ ถูกส่งมา อยู่แล้ว
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,หมายเหตุ การติดตั้ง {0} ได้ ถูกส่งมา อยู่แล้ว
 DocType: Quotation Item,Against Docname,กับ ชื่อเอกสาร
 DocType: SMS Center,All Employee (Active),พนักงาน (Active) ทั้งหมด
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ดู ตอนนี้
@@ -3431,15 +3461,15 @@
 DocType: Employee,Applicable Holiday List,รายการวันหยุดที่ใช้บังคับ
 DocType: Employee,Cheque,เช็ค
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,ชุด ล่าสุด
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,ประเภทรายงาน มีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,ประเภทรายงาน มีผลบังคับใช้
 DocType: Item,Serial Number Series,ชุด หมายเลข
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},คลังสินค้า จำเป็นสำหรับ รายการ หุ้น {0} ในแถว {1}
 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/public/js/setup_wizard.js +101,The First User: You,ผู้ใช้งาน ครั้งแรก: คุณ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},วันเริ่มต้นปีงบประมาณและปีงบประมาณสิ้นสุดวันที่มีการตั้งค่าอยู่แล้วในปีงบประมาณ {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciled ประสบความสำเร็จ
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},วันเริ่มต้นปีงบประมาณและปีงบประมาณสิ้นสุดวันที่มีการตั้งค่าอยู่แล้วในปีงบประมาณ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Reconciled ประสบความสำเร็จ
 DocType: Production Order,Planned End Date,วันที่สิ้นสุดการวางแผน
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,ที่รายการจะถูกเก็บไว้
 DocType: Tax Rule,Validity,ความถูกต้อง
@@ -3447,7 +3477,7 @@
 DocType: Attendance,Attendance,การดูแลรักษา
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,วันที่โพสต์และโพสต์เวลามีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,วันที่โพสต์และโพสต์เวลามีผลบังคับใช้
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,แม่แบบภาษี สำหรับการทำธุรกรรมการซื้อ
 ,Item Prices,รายการราคาสินค้า
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบสั่งซื้อ
@@ -3456,15 +3486,15 @@
 DocType: Task,Review Date,ทบทวนวันที่
 DocType: Purchase Invoice,Advance Payments,การชำระเงินล่วงหน้า
 DocType: Purchase Taxes and Charges,On Net Total,เมื่อรวมสุทธิ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,คลังสินค้า เป้าหมาย ในแถว {0} จะต้อง เป็นเช่นเดียวกับ การผลิต การสั่งซื้อ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,คลังสินค้า เป้าหมาย ในแถว {0} จะต้อง เป็นเช่นเดียวกับ การผลิต การสั่งซื้อ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,ไม่อนุญาตให้ใช้เครื่องมือการชำระเงิน
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'ประกาศที่อยู่อีเมล' ไม่ระบุที่เกิดขึ้นสำหรับ% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,สกุลเงินไม่สามารถเปลี่ยนแปลงได้หลังจากการทำรายการโดยใช้เงินสกุลอื่น
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,สกุลเงินไม่สามารถเปลี่ยนแปลงได้หลังจากการทำรายการโดยใช้เงินสกุลอื่น
 DocType: Company,Round Off Account,ปิดรอบบัญชี
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,ค่าใช้จ่ายใน การดูแลระบบ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,การให้คำปรึกษา
 DocType: Customer Group,Parent Customer Group,กลุ่มลูกค้าผู้ปกครอง
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,เปลี่ยนแปลง
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,เปลี่ยนแปลง
 DocType: Purchase Invoice,Contact Email,ติดต่ออีเมล์
 DocType: Appraisal Goal,Score Earned,คะแนนที่ได้รับ
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","เช่นผู้ ""บริษัท LLC ของฉัน"""
@@ -3474,13 +3504,13 @@
 DocType: Packing Slip,Gross Weight UOM,UOM น้ำหนักรวม
 DocType: Email Digest,Receivables / Payables,ลูกหนี้ / เจ้าหนี้
 DocType: Delivery Note Item,Against Sales Invoice,กับขายใบแจ้งหนี้
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,บัญชีเครดิต
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,บัญชีเครดิต
 DocType: Landed Cost Item,Landed Cost Item,รายการค่าใช้จ่ายลง
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,แสดงค่าศูนย์
 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 +562,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
 DocType: Item,Default Warehouse,คลังสินค้าเริ่มต้น
 DocType: Task,Actual End Date (via Time Logs),วันที่สิ้นสุดที่เกิดขึ้นจริง (ผ่านบันทึกเวลา)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},งบประมาณไม่สามารถกำหนดกลุ่มกับบัญชี {0}
@@ -3497,7 +3527,7 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,ไม่หมดอายุ
 DocType: Journal Entry,Total Debit,เดบิตรวม
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,เริ่มต้นโกดังสินค้าสำเร็จรูป
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,คนขาย
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,พนักงานขาย
 DocType: Sales Invoice,Cold Calling,โทรเย็น
 DocType: SMS Parameter,SMS Parameter,พารามิเตอร์ SMS
 DocType: Maintenance Schedule Item,Half Yearly,ประจำปีครึ่ง
@@ -3516,29 +3546,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,บันทึกเวลานอกแผนเวิร์คสเตชั่ชั่วโมงทำงาน
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ถูกส่งมา อยู่แล้ว
 ,Items To Be Requested,รายการที่จะ ได้รับการร้องขอ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,รับซื้อให้ล่าสุด
 DocType: Time Log,Billing Rate based on Activity Type (per hour),อัตราการเรียกเก็บเงินขึ้นอยู่กับประเภทกิจกรรม (ต่อชั่วโมง)
 DocType: Company,Company Info,ข้อมูล บริษัท
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent",บริษัท ID อีเมล์ ไม่พบ จึง ส่ง ไม่ได้ส่ง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),การใช้ประโยชน์กองทุน (สินทรัพย์)
 DocType: Production Planning Tool,Filter based on item,กรองขึ้นอยู่กับสินค้า
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,บัญชีเดบิต
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,บัญชีเดบิต
 DocType: Fiscal Year,Year Start Date,วันที่เริ่มต้นปี
 DocType: Attendance,Employee Name,ชื่อของพนักงาน
 DocType: Sales Invoice,Rounded Total (Company Currency),รวมกลม (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,ไม่สามารถแอบแฝงเข้ากลุ่มเพราะประเภทบัญชีถูกเลือก
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,ไม่สามารถแอบแฝงเข้ากลุ่มเพราะประเภทบัญชีถูกเลือก
 DocType: Purchase Common,Purchase Common,ซื้อสามัญ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} ได้รับการแก้ไข กรุณารีเฟรช
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,จากโอกาส
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ผลประโยชน์ของพนักงาน
 DocType: Sales Invoice,Is POS,POS เป็น
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
 DocType: Production Order,Manufactured Qty,จำนวนการผลิต
 DocType: Purchase Receipt Item,Accepted Quantity,จำนวนที่ยอมรับ
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ไม่อยู่
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,ตั๋วเงินยกให้กับลูกค้า
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id โครงการ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},แถวไม่มี {0}: จำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่ค้างอยู่กับค่าใช้จ่ายในการเรียกร้อง {1} ที่รอดำเนินการเป็นจำนวน {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},แถวไม่มี {0}: จำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่ค้างอยู่กับค่าใช้จ่ายในการเรียกร้อง {1} ที่รอดำเนินการเป็นจำนวน {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} สมาชิกเพิ่ม
 DocType: Maintenance Schedule,Schedule,กำหนดการ
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",กำหนดงบประมาณสำหรับศูนย์ต้นทุนนี้ การดำเนินการในการตั้งงบประมาณให้ดูรายการ &quot;บริษัท ฯ &quot;
@@ -3546,7 +3577,7 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,ดุม
 DocType: GL Entry,Voucher Type,ประเภทบัตรกำนัล
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
 DocType: Expense Claim,Approved,ได้รับการอนุมัติ
 DocType: Pricing Rule,Price,ราคา
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',พนักงาน โล่งใจ ที่ {0} จะต้องตั้งค่า เป็น ' ซ้าย '
@@ -3560,7 +3591,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,รายการบัญชีวารสาร
 DocType: Delivery Note Item,Available Qty at From Warehouse,จำนวนที่จำหน่ายจากคลังสินค้า
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},แถว {0}: ปาร์ตี้ / บัญชีไม่ตรงกับ {1} / {2} ใน {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,เพื่อสร้างบัญชีภาษี
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
 DocType: Account,Stock,คลังสินค้า
@@ -3571,15 +3602,15 @@
 DocType: Employee,Contract End Date,วันที่สิ้นสุดสัญญา
 DocType: Sales Order,Track this Sales Order against any Project,ติดตามนี้สั่งซื้อขายกับโครงการใด ๆ
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,ดึงยอดขาย (รอการส่งมอบ) คำสั่งตามเกณฑ์ดังกล่าวข้างต้น
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,ใบเสนอราคา จาก ผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,ใบเสนอราคา จาก ผู้ผลิต
 DocType: Deduction Type,Deduction Type,ประเภทหัก
 DocType: Attendance,Half Day,ครึ่งวัน
-DocType: Pricing Rule,Min Qty,นาที จำนวน
+DocType: Pricing Rule,Min Qty,จำนวนขั้นตำ่
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",เพื่อติดตามรายการในการขายและเอกสารการจัดซื้อที่มีเลขชุด &quot;ที่ต้องการอุตสาหกรรม: สารเคมี&quot;
 DocType: GL Entry,Transaction Date,วันที่ทำรายการ
 DocType: Production Plan Item,Planned Qty,จำนวนวางแผน
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,ภาษีทั้งหมด
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,สำหรับปริมาณ (ผลิตจำนวน) มีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,สำหรับปริมาณ (ผลิตจำนวน) มีผลบังคับใช้
 DocType: Stock Entry,Default Target Warehouse,คลังสินค้าเป้าหมายเริ่มต้น
 DocType: Purchase Invoice,Net Total (Company Currency),รวมสุทธิ (สกุลเงิน บริษัท )
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,แถว {0}: ประเภทพรรคและพรรคจะใช้ได้เฉพาะกับลูกหนี้ / เจ้าหนี้การค้า
@@ -3627,15 +3658,15 @@
 DocType: Item Group,General Settings,การตั้งค่าทั่วไป
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,สกุลเงินจากสกุลเงินและไม่สามารถเดียวกัน
 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/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,คุณต้องบันทึกแบบฟอร์มก่อนที่จะดำเนินการต่อ
 DocType: Item Attribute,Numeric Values,ค่าที่เป็นตัวเลข
 apps/erpnext/erpnext/public/js/setup_wizard.js +262,Attach Logo,แนบ โลโก้
 DocType: Customer,Commission Rate,อัตราค่าคอมมิชชั่น
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,ทำให้ตัวแปร
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,ปิดกั้นการใช้งานออกโดยกรม
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,รถเข็นที่ว่างเปล่า
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,รถเข็นที่ว่างเปล่า
 DocType: Production Order,Actual Operating Cost,ต้นทุนการดำเนินงานที่เกิดขึ้นจริง
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,ราก ไม่สามารถแก้ไขได้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,ราก ไม่สามารถแก้ไขได้
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,จำนวนเงินที่จัดสรร ไม่สามารถ มากกว่าจำนวนที่ยังไม่ปรับปรุง
 DocType: Manufacturing Settings,Allow Production on Holidays,อนุญาตให้ผลิตในวันหยุด
 DocType: Sales Order,Customer's Purchase Order Date,วันที่สั่งซื้อของลูกค้าสั่งซื้อ
@@ -3646,11 +3677,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,นักออกแบบ
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,ข้อตกลงและเงื่อนไขของแม่แบบ
 DocType: Serial No,Delivery Details,รายละเอียดการจัดส่งสินค้า
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,โดยอัตโนมัติสร้างวัสดุขอถ้าปริมาณต่ำกว่าระดับนี้
 ,Item-wise Purchase Register,สมัครสมาชิกสั่งซื้อสินค้าที่ชาญฉลาด
 DocType: Batch,Expiry Date,วันหมดอายุ
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item",การตั้งค่าระดับสั่งซื้อสินค้าจะต้องเป็นรายการการซื้อหรือการผลิตรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item",การตั้งค่าระดับสั่งซื้อสินค้าจะต้องเป็นรายการการซื้อหรือการผลิตรายการ
 ,Supplier Addresses and Contacts,ที่อยู่ ของผู้ผลิต และผู้ติดต่อ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,กรุณาเลือก หมวดหมู่ แรก
 apps/erpnext/erpnext/config/projects.py +18,Project master.,ต้นแบบโครงการ
@@ -3658,7 +3689,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(ครึ่งวัน)
 DocType: Supplier,Credit Days,วันเครดิต
 DocType: Leave Type,Is Carry Forward,เป็น Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,รับสินค้า จาก BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},แถว {0}: ประเภทพรรคและพรรคเป็นสิ่งจำเป็นสำหรับลูกหนี้ / เจ้าหนี้บัญชี {1}
@@ -3666,7 +3697,7 @@
 DocType: Employee,Reason for Leaving,เหตุผลที่ลาออก
 DocType: Expense Claim Detail,Sanctioned Amount,จำนวนตามทำนองคลองธรรม
 DocType: GL Entry,Is Opening,คือการเปิด
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},แถว {0}: รายการเดบิตไม่สามารถเชื่อมโยงกับ {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,บัญชี {0} ไม่อยู่
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},แถว {0}: รายการเดบิตไม่สามารถเชื่อมโยงกับ {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,บัญชี {0} ไม่อยู่
 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 6d5c48e..45021cf 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -9,8 +9,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Tüketici Ürünleri
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,İlk Parti Türünü seçiniz
 DocType: Item,Customer Items,Müşteri Öğeler
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com için Öğe Yayınla
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-posta Bildirimleri
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-posta Bildirimleri
@@ -26,7 +26,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Döviz Fiyat Listesi için gereklidir {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* İşlemde hesaplanacaktır.
 DocType: Purchase Order,Customer Contact,Müşteri İletişim
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Malzeme talebinden
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Malzeme talebinden
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Ağaç
 DocType: Job Applicant,Job Applicant,İş Başvuru Sahiibi
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Daha fazla sonuç.
@@ -64,8 +64,8 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1.Müşteriye bilgilendirme sağlamak için Malzeme kodu ve bu seçenek kullanılarak onları kodları ile araştırılabilir yapmak
 DocType: Mode of Payment Account,Mode of Payment Account,Ödeme Hesabının Mod
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Göster Varyantlar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Miktar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Miktar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Miktar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Miktar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Krediler (Yükümlülükler)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Krediler (Yükümlülükler)
 DocType: Employee Education,Year of Passing,Geçiş Yılı
@@ -80,20 +80,20 @@
 DocType: Purchase Invoice,Monthly,Aylık
 DocType: Purchase Invoice,Monthly,Aylık
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Ödeme Gecikme (Gün)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Mali yıl {0} gereklidir
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Savunma
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Savunma
 DocType: Company,Abbr,Kısaltma
 DocType: Company,Abbr,Kısaltma
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Satır {0}: {1} {2} ile eşleşmiyor {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Satır {0}: {1} {2} ile eşleşmiyor {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Satır # {0}:
 DocType: Delivery Note,Vehicle No,Araç No
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Fiyat Listesi seçiniz
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Fiyat Listesi seçiniz
 DocType: Production Order Operation,Work In Progress,Devam eden iş
 DocType: Employee,Holiday List,Tatil Listesi
 DocType: Employee,Holiday List,Tatil Listesi
@@ -127,7 +127,7 @@
 DocType: Employee,Married,Evli
 DocType: Employee,Married,Evli
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Izin verilmez {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,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 +396,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
 DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
 DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Bakkal
@@ -136,7 +136,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Banka Girişi Yap
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Emeklilik Fonları
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Emeklilik Fonları
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Hesap türü Depo ise Depo zorunludur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Hesap türü Depo ise Depo zorunludur
 DocType: SMS Center,All Sales Person,Bütün Satış Kişileri
 DocType: Lead,Person Name,Kişi Adı
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kontrol düzeni yinelenen eğer, yinelenen durdurmak veya uygun Bitiş Tarihi koymak için işaretini kaldırın"
@@ -157,17 +157,17 @@
 DocType: Lead,Interested,İlgili
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Ürün Ağacı
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Açılış
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Gönderen {0} için {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Gönderen {0} için {1}
 DocType: Item,Copy From Item Group,Ürün Grubundan kopyalayın
 DocType: Journal Entry,Opening Entry,Giriş Girdisi
 DocType: Stock Entry,Additional Costs,Ek maliyetler
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,İşlem görmüş hesaplar gruba dönüştürülemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,İşlem görmüş hesaplar gruba dönüştürülemez.
 DocType: Lead,Product Enquiry,Ürün Sorgulama
 DocType: Lead,Product Enquiry,Ürün Sorgulama
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Lütfen ilk önce şirketi girin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,İlk Şirket seçiniz
 DocType: Employee Education,Under Graduate,Lisans
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Hedefi
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Hedefi
 DocType: BOM,Total Cost,Toplam Maliyet
 DocType: BOM,Total Cost,Toplam Maliyet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Etkinlik Günlüğü:
@@ -206,7 +206,7 @@
 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",", Ş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 +444,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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Satış Faturası verildikten sonra güncellenecektir.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,İK Modülü Ayarları
@@ -228,7 +228,7 @@
 DocType: Serial No,Maintenance Status,Bakım Durumu
 DocType: Serial No,Maintenance Status,Bakım Durumu
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Öğeleri ve Fiyatlandırma
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,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
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,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: Appraisal,Select the Employee for whom you are creating the Appraisal.,Değerlendirme oluşturduğunuz Çalışanı seçin
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Maliyet Merkezi {0} Şirket {1} e ait değildir.
 DocType: Customer,Individual,Bireysel
@@ -270,6 +270,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,ޞirket girin
 DocType: Delivery Note Item,Against Sales Invoice Item,Satış Fatura Ürün Karşı
 ,Production Orders in Progress,Devam eden Üretim Siparişleri
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Finansman Sağlanan Net Nakit
 DocType: Lead,Address & Contact,Adres ve İrtibat
 DocType: Leave Allocation,Add unused leaves from previous allocations,Önceki tahsisleri kullanılmayan yaprakları ekleyin
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Sonraki Dönüşümlü {0} üzerinde oluşturulur {1}
@@ -277,6 +278,7 @@
 ,Contact Name,İletişim İsmi
 DocType: Production Plan Item,SO Pending Qty,SO Bekleyen Miktar
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Yukarıda belirtilen kriterler için maaş makbuzu oluştur.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Açıklama verilmemiştir
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Satın alma isteği.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,Relieving Date must be greater than Date of Joining,Ayrılma tarihi Katılma tarihinden sonra olmalıdır
@@ -289,7 +291,7 @@
 DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi Özellikleri
 DocType: Payment Tool,Reference No,Referans No
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,İzin engellendi
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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/stock/doctype/item/item.py +585,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/accounts/utils.py +341,Annual,Yıllık
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Yıllık
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stok Uzlaşma Öğe
@@ -304,12 +306,12 @@
 DocType: Pricing Rule,Supplier Type,Tedarikçi Türü
 DocType: Item,Publish in Hub,Hub Yayınla
 ,Terretory,Bölge
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Ürün {0} iptal edildi
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Ürün {0} iptal edildi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Malzeme Talebi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,İlişki
 DocType: Shipping Rule,Worldwide Shipping,Dünya çapında Nakliye
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Müşteriler Siparişi Onaylandı.
@@ -324,7 +326,7 @@
 DocType: Lead,Suggestions,Öneriler
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Bu bölgede Ürün grubu bütçeleri ayarlayın. Dağıtımı ayarlayarak dönemsellik de ekleyebilirsiniz.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Depo ana hesap grubu giriniz {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Karşı Ödeme {0} {1} Üstün Tutar daha büyük olamaz {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Karşı Ödeme {0} {1} Üstün Tutar daha büyük olamaz {2}
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Cep No
 DocType: Lead,Mobile No.,Cep No
@@ -335,6 +337,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Son
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,En fazla 5 karakter
 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)
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Öğrenin
 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
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Satış Elemanı Ağacını Yönetin.
@@ -357,9 +360,9 @@
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
 DocType: Sales Invoice Item,Delivery Note,İrsaliye
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Vergiler kurma
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Vergiler kurma
 apps/erpnext/erpnext/accounts/utils.py +191,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 +377,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Bu hafta ve bekleyen aktiviteler için Özet
 DocType: Workstation,Rent Cost,Kira Bedeli
 DocType: Workstation,Rent Cost,Kira Bedeli
@@ -377,11 +380,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM,İrsaliye, Satın Alma Faturası, Satın Alma Makbuzu, Satış Faturası, Satış Emri, Stok Girdisi, Zaman Çizelgesinde Mevcut"
 DocType: Item Tax,Tax Rate,Vergi Oranı
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Öğe Seç
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Öğe Seç
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Ürün: {0} toplu-bilge, bunun yerine kullanmak Stok Girişi \
  Stok Uzlaşma kullanılarak uzlaşma olamaz yönetilen"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Olmayan gruba dönüştürme
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Satınalma Makbuzu teslim edilmelidir
@@ -434,6 +437,7 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Kaybetme nedeni
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Kaybetme nedeni
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},İş İstasyonu Tatil List göre aşağıdaki tarihlerde kapalı: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Fırsatlar
 DocType: Employee,Single,Tek
 DocType: Employee,Single,Bireysel
 DocType: Issue,Attachment,Haciz
@@ -469,7 +473,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,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 +563,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
@@ -477,8 +481,8 @@
 DocType: Material Request Item,Required Date,Gerekli Tarih
 DocType: Material Request Item,Required Date,Gerekli Tarih
 DocType: Delivery Note,Billing Address,Faturalama  Adresi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Ürün Kodu girin.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Ürün Kodu girin.
 DocType: BOM,Costing,Maliyetlendirme
 DocType: BOM,Costing,Maliyetlendirme
 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"
@@ -517,7 +521,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Bakım ürünleri
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"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 +467,"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
@@ -542,18 +546,17 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,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/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Ürün {0} Satın alma ürünü değildir
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Ürün {0} Satın alma ürünü değildir
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} 'Bildirim \
  E-posta Adresi' geçersiz e-posta adresi"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Toplam Fatura Bu Yıl:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ekle / Düzenle Vergi ve Harçlar
 DocType: Purchase Invoice,Supplier Invoice No,Tedarikçi Fatura No
 DocType: Purchase Invoice,Supplier Invoice No,Tedarikçi Fatura No
 DocType: Territory,For reference,Referans için
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Silinemiyor Seri No {0}, hisse senedi işlemlerinde kullanıldığı gibi"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Kapanış (Cr)
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Kapanış (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Kapanış (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Kapanış (Cr)
 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
@@ -576,8 +579,8 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Aylık Dağılımı ** işinizde size mevsimsellik varsa ay boyunca bütçenizi dağıtmak yardımcı olur.
 
 , Bu dağılım kullanılarak bir bütçe dağıtmak ** Maliyet Merkezi'nde ** ** Bu Aylık Dağıtım ayarlamak için **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,İlk Şirket ve Parti Tipi seçiniz
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Mali / Muhasebe yılı.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Üzgünüz, seri numaraları birleştirilemiyor"
@@ -586,10 +589,10 @@
 ,Lead Id,Talep Yaratma  Kimliği
 DocType: C-Form Invoice Detail,Grand Total,Genel Toplam
 DocType: C-Form Invoice Detail,Grand Total,Genel Toplam
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Mali Yıl başlangıç tarihi Mali Yıl bitiş tarihinden ileri olmamalıdır
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Mali Yıl başlangıç tarihi Mali Yıl bitiş tarihinden ileri olmamalıdır
 DocType: Warranty Claim,Resolution,Karar
 DocType: Warranty Claim,Resolution,Karar
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Teslim: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Teslim: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Ödenecek Hesap
 DocType: Sales Order,Billing and Delivery Status,Fatura ve Teslimat Durumu
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Tekrar Müşteriler
@@ -608,7 +611,7 @@
 DocType: Lead,Middle Income,Orta Gelir
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Açılış (Cr)
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Açılış (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Tahsis edilen miktar negatif olamaz
 DocType: Purchase Order Item,Billed Amt,Faturalı Tutarı
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Stok girişleri mantıksal Depoya karşı yapıldı
@@ -618,7 +621,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Teklifi Yazma
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Teklifi Yazma
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Başka Satış Kişi {0} aynı Çalışan kimliği ile var
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatif Stok Hatası ({6}) Ürün {0} için {4} {5} de {2} {3} üzerindeki Depoda
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatif Stok Hatası ({6}) Ürün {0} için {4} {5} de {2} {3} üzerindeki Depoda
 DocType: Fiscal Year Company,Fiscal Year Company,Mali Yıl Şirketi
 DocType: Packing Slip Item,DN Detail,DN Detay
 DocType: Packing Slip Item,DN Detail,DN Detay
@@ -642,12 +645,13 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Bakım Programı
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sonra Fiyatlandırma Kurallar Müşteri dayalı filtre edilir, Müşteri Grubu, Territory, Tedarikçi, Tedarikçi Tipi, Kampanya, Satış Ortağı vb"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sonra Fiyatlandırma Kurallar Müşteri dayalı filtre edilir, Müşteri Grubu, Territory, Tedarikçi, Tedarikçi Tipi, Kampanya, Satış Ortağı vb"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Envanter Net Değişim
 DocType: Employee,Passport Number,Pasaport Numarası
 DocType: Employee,Passport Number,Pasaport Numarası
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Yönetici
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Yönetici
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Satın Alma Makbuzundan
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Aynı madde birden çok kez girildi.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Satın Alma Makbuzundan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Aynı madde birden çok kez girildi.
 DocType: SMS Settings,Receiver Parameter,Alıcı Parametre
 DocType: SMS Settings,Receiver Parameter,Alıcı Parametre
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Dayalıdır' ve 'Grubundadır' aynı olamaz
@@ -655,7 +659,7 @@
 DocType: Production Order Operation,In minutes,Dakika içinde
 DocType: Issue,Resolution Date,Karar Tarihi
 DocType: Issue,Resolution Date,Karar Tarihi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
 DocType: Selling Settings,Customer Naming By,Adlandırılan Müşteri
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Gruba Dönüştürmek
 DocType: Activity Cost,Activity Type,Faaliyet Türü
@@ -668,8 +672,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Yayıncılık
 DocType: Activity Cost,Projects User,Projeler Kullanıcı
 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 +145,{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 +145,{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 +141,{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 +141,{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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bakım Ziyareti {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
 DocType: Material Request,Material Transfer,Materyal Transfer
@@ -699,13 +703,13 @@
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Ürünleri seri numaralarına bağlı olarak alım ve satış belgelerinde izlemek için. Bu aynı zamanda ürünün garanti ayarları için de kullanılabilir.
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Reddedilen Depo reddedilen Ürün karşılığı zorunludur
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Bu yıl toplam fatura
 DocType: Account,Expenses Included In Valuation,Değerlemeye dahil giderler
 DocType: Employee,Provide email id registered in company,Şirkette kayıtlı e-posta adresini veriniz
 DocType: Hub Settings,Seller City,Satıcı Şehri
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Öğe varyantları vardır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Öğe varyantları vardır.
 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
@@ -729,20 +733,20 @@
 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 +92,{0} is not a stock Item,{0} bir stok ürünü değildir.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} bir stok ürünü değildir.
 DocType: Mode of Payment Account,Default Account,Varsayılan Hesap
 DocType: Mode of Payment Account,Default Account,Varsayılan Hesap
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,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 +33,Please select weekly off day,Haftalık izin gününü seçiniz
 DocType: Production Order Operation,Planned End Time,Planlanan Bitiş Zamanı
 ,Sales Person Target Variance Item Group-Wise,Satış Personeli Hedef Varyans Ürün Grup Bilgisi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,İşlem görmüş hesaplar muhasebe defterine dönüştürülemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,İşlem görmüş hesaplar muhasebe defterine dönüştürülemez.
 DocType: Delivery Note,Customer's Purchase Order No,Müşterinin Sipariş numarası
 DocType: Employee,Cell Number,Hücre sayısı
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Otomatik Malzeme İstekler Oluşturulmuş
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Sen sütununda 'Journal girişine karşı' geçerli fiş giremezsiniz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Sen sütununda 'Journal girişine karşı' geçerli fiş giremezsiniz
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Enerji
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Enerji
 DocType: Opportunity,Opportunity From,Fırsattan itibaren
@@ -754,10 +758,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: gönderen {0} çeşidi {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Satır {0}: Dönüşüm katsayısı zorunludur
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Muhasebe Girişler yaprak düğümleri karşı yapılabilir. Gruplar karşı Girişler izin verilmez.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Ürün {0} için gerekli Satın alma makbuzu numarası
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Ürün {0} için gerekli Satın alma makbuzu numarası
 DocType: Item Attribute Value,Item Attribute Value,Ürün Özellik Değeri
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Satış kampanyaları.
 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.
@@ -820,7 +824,7 @@
 DocType: Employee,Family Background,Aile Geçmişi
 DocType: Process Payroll,Send Email,E-posta Gönder
 DocType: Process Payroll,Send Email,E-posta Gönder
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,İzin yok
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
@@ -830,7 +834,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Yüksek weightage Öğeler yüksek gösterilir
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Uzlaşma Detay
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Uzlaşma Detay
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Benim Faturalar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Benim Faturalar
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Çalışan bulunmadı
 DocType: Purchase Order,Stopped,Durduruldu
 DocType: Purchase Order,Stopped,Durduruldu
@@ -842,6 +846,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Şimdi Gönder
 ,Support Analytics,Destek Analizi
 DocType: Item,Website Warehouse,Web Sitesi Depo
+DocType: Payment Reconciliation,Minimum Invoice Amount,Asgari Fatura Tutarı
 DocType: Sales 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ü"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form kayıtları
@@ -852,7 +857,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;Point of Sale&quot; özellikleri etkinleştirmek için
 DocType: Bin,Moving Average Rate,Hareketli Ortalama Kuru
 DocType: Production Planning Tool,Select Items,Ürünleri Seçin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} Bill karşı {1} tarihli {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} Bill karşı {1} tarihli {2}
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: Sales Invoice Item,Target Warehouse,Hedef Depo
@@ -866,7 +871,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,İşlemlerin sunulmasında otomatik olarak mesaj oluştur.
 DocType: Production Order,Item To Manufacture,Üretilecek Ürün
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} durum {2} olduğu
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ödeme Satınalma Siparişi
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ödeme Satınalma Siparişi
 DocType: Sales Order Item,Projected Qty,Öngörülen Tutar
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
@@ -897,7 +902,7 @@
 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
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Satış Noktası
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",Bakiye alacaklı durumdaysa borçlu duruma çevrilemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",Bakiye alacaklı durumdaysa borçlu duruma çevrilemez.
 DocType: Account,Balance must be,Bakiye şu olmalıdır
 DocType: Hub Settings,Publish Pricing,Fiyatlandırma Yayınla
 DocType: Notification Control,Expense Claim Rejected Message,Gider Talebi Reddedildi Mesajı
@@ -924,7 +929,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Ana Döviz Kuru.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} aktif olmalıdır
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} aktif olmalıdır
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Önce belge türünü seçiniz
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,İzin Tahsilat Miktarı
@@ -946,18 +951,18 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Çalışan {0} aktif değil veya yok.
 DocType: Features Setup,Item Barcode,Ürün Barkodu
 DocType: Features Setup,Item Barcode,Ürün Barkodu
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
 DocType: Quality Inspection Reading,Reading 6,6 Okuma
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fatura peşin alım
 DocType: Address,Shop,Mağaza
 DocType: Address,Shop,Mağaza
 DocType: Hub Settings,Sync Now,Sync Şimdi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Satır {0}: Kredi giriş ile bağlantılı edilemez bir {1}
 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.
 DocType: Employee,Permanent Address Is,Kalıcı Adres
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasyon kaç mamul tamamlandı?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Marka
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,{1} den fazla Ürün için {0} üzerinde ödenek
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{1} den fazla Ürün için {0} üzerinde ödenek
 DocType: Employee,Exit Interview Details,Çıkış Görüşmesi Detayları
 DocType: Item,Is Purchase Item,Satın Alma Maddesi
 DocType: Journal Entry Account,Purchase Invoice,Satınalma Faturası
@@ -970,8 +975,8 @@
 DocType: Payment Tool,Paid,Ücretli
 DocType: Salary Slip,Total in words,Sözlü Toplam
 DocType: Material Request Item,Lead Time Date,Talep Yaratma Zaman Tarihi
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,zorunludur. Belki Döviz rekor için oluşturulmadı
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Satır # {0}: Ürün{1} için seri no belirtiniz
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,zorunludur. Döviz kur kayıdının yaratılamadığı hesap
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Satır # {0}: Ürün{1} için seri no belirtiniz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","&#39;Ürün Bundle&#39; öğeler, Depo, Seri No ve Toplu No &#39;Ambalaj Listesi&#39; tablodan kabul edilecektir. Depo ve Toplu Hayır herhangi bir &#39;Ürün Bundle&#39; öğe için tüm ambalaj öğeler için aynı ise, bu değerler ana Öğe tabloda girilebilir, değerler tablosu &#39;Listesi Ambalaj&#39; kopyalanacaktır."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Müşterilere yapılan sevkiyatlar.
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Müşterilere yapılan sevkiyatlar.
@@ -984,7 +989,8 @@
 ,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 +626,Select Item for Transfer,Transferi için seçin Öğe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Kullanıcıya işlemlerdeki Fiyat Listesi Oranını düzenlemek için izin ver
@@ -992,7 +998,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Satır {0}: Satış / Satınalma Siparişi karşı Ödeme hep avans olarak işaretlenmiş olmalıdır
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,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 +682,All items have already been transferred for this Production Order.,Tüm öğeler zaten bu üretim Sipariş devredilmiştir.
 DocType: Process Payroll,Select Payroll Year and Month,Bordro Yılı ve Ay Seçiniz
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Uygun bir grup (genellikle Fonların Uygulama&gt; Dönen Varlıklar&gt; Banka Hesapları gidin ve Çeşidi) Çocuk ekle üzerine tıklayarak (yeni Hesabı oluşturmak &quot;Banka&quot;
 DocType: Workstation,Electricity Cost,Elektrik Maliyeti
@@ -1007,10 +1013,10 @@
 DocType: SMS Center,All Lead (Open),Bütün Başlıklar (Açık)
 DocType: Purchase Invoice,Get Advances Paid,Avansları Öde
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Resminizi Ekleyin
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Yapmak
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Yapmak
 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 +3,My Cart,Benim Sepeti
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Benim Sepeti
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Açılış Miktarı
@@ -1032,11 +1038,11 @@
 DocType: POS Profile,Cash/Bank Account,Kasa / Banka Hesabı
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Özellik tablosu zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,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 +64,{0} can not be negative,{0} negatif olamaz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} negatif olamaz
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Indirim
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Indirim
 DocType: Features Setup,Purchase Discounts,Satın Alma indirimleri
 DocType: Workstation,Wages,Ücret
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Zaman Günlüğü &#39;Faturalanabilir&#39; ise sadece güncellenen olacak
@@ -1064,8 +1070,8 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Ürün düğmesi 'satın alma makbuzlarını Öğeleri alın' kullanılarak eklenmelidir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Satış Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Satış Giderleri
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standart Satın Alma
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standart Satın Alma
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standart Satın Alma
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Standart Satın Alma
 DocType: GL Entry,Against,Karşı
 DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
 DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
@@ -1113,6 +1119,7 @@
 DocType: Sales Partner,Distributor,Dağıtımcı
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Alışveriş Sepeti Nakliye Kural
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Üretim Siparişi {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Set &#39;On İlave İndirim Uygula&#39; Lütfen
 ,Ordered Items To Be Billed,Faturalanacak Sipariş Edilen Ürünler
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Menzil az olmak zorundadır Kimden daha Range için
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Günlükleri seçin ve yeni Satış Faturası oluşturmak için teslim edin.
@@ -1124,14 +1131,13 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Fırsat oluştur
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Fırsat oluştur
 DocType: Salary Slip,Leave Without Pay,Ücretsiz İzin
-DocType: Supplier,Communications,İletişim
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Kapasite Planlama Hatası
 ,Trial Balance for Party,Parti için Deneme Dengesi
 DocType: Lead,Consultant,Danışman
 DocType: Lead,Consultant,Danışman
 DocType: Salary Slip,Earnings,Kazanç
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Öğe bitirdi {0} imalatı tipi giriş için girilmelidir
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Açılış Muhasebe Dengesi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Öğe bitirdi {0} imalatı tipi giriş için girilmelidir
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Açılış Muhasebe Dengesi
 DocType: Sales Invoice Advance,Sales Invoice Advance,Satış Fatura Avansı
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Talep edecek bir şey yok
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
@@ -1182,7 +1188,7 @@
 DocType: Global Defaults,Disable Rounded Total,Yuvarlak toplam devre dışı
 DocType: Global Defaults,Disable Rounded Total,Yuvarlak toplam devre dışı
 DocType: Lead,Call,Çağrı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Girdiler' boş olamaz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'Girdiler' boş olamaz
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Satır {0} ı  {1} ile aynı biçimde kopyala
 ,Trial Balance,Mizan
 ,Trial Balance,Mizan
@@ -1198,9 +1204,9 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Değerlendirme Defteri
 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 +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Satış Emrine Karşı Üretim
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Dünyanın geri kalanı
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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
@@ -1232,7 +1238,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Dondurulmuş Hesabı {0} düzenleme yetkisi yok
 DocType: Journal Entry,Get Outstanding Invoices,Bekleyen Faturaları alın
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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.
@@ -1246,7 +1252,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Sözleşme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Sözleşme
 DocType: Email Digest,Add Quote,Alıntı ekle
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Ürün {1} de Ölçü Birimi: {0} için Ölçü Birimi dönüştürme katsayısı gereklidir.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Ürün {1} de Ölçü Birimi: {0} için Ölçü Birimi dönüştürme katsayısı gereklidir.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Dolaylı Giderler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Dolaylı Giderler
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Satır {0}: Miktar zorunludur
@@ -1256,7 +1262,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,Ürünleriniz veya hizmetleriniz
 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 +112,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 +121,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/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Bu bir kök Ürün grubudur ve düzenlenemez.
 DocType: Journal Entry Account,Purchase Order,Satın alma emri
 DocType: Warehouse,Warehouse Contact Info,Depo İletişim Bilgileri
@@ -1268,8 +1274,8 @@
 DocType: Serial No,Serial No Details,Seri No Detayları
 DocType: Purchase Invoice Item,Item Tax Rate,Ürün Vergi Oranı
 DocType: Purchase Invoice Item,Item Tax Rate,Ürün Vergi Oranı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Sermaye Ekipmanları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Sermaye Ekipmanları
@@ -1283,7 +1289,7 @@
 DocType: Appraisal Goal,Goal,Hedef
 DocType: Sales Invoice Item,Edit Description,Edit Açıklama
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Beklenen Teslim Tarihi Planlanan Başlama Tarihi daha az olduğunu.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Tedarikçi İçin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Tedarikçi İçin
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Hesap Türünü ayarlamak işlemlerde bu hesabı seçeren yardımcı olur
 DocType: Purchase Invoice,Grand Total (Company Currency),Genel Toplam (ޞirket para birimi)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Toplam Giden
@@ -1299,7 +1305,7 @@
 DocType: Workstation,Workstation Name,İş İstasyonu Adı
 DocType: Workstation,Workstation Name,İş İstasyonu Adı
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Digest e-posta:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} Öğe ait değil {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} does not belong to Item {1},BOM {0} Öğe ait değil {1}
 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
@@ -1337,7 +1343,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","İrtibatlara, müşterilere bülten"
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operasyon boş bırakılamaz.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Operasyon boş bırakılamaz.
 ,Delivered Items To Be Billed,Faturalanacak Teslim edilen Ürünler
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depo Seri No için değiştirilemez
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depo Seri No için değiştirilemez
@@ -1357,7 +1363,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Gönderen {0} | {1} {2}
 DocType: BOM Operation,Operation Description,İşletme Tanımı
 DocType: Item,Will also apply to variants,Ayrıca varyant için de geçerlidir
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Mali Yıl Başlangıç Tarihi ve Mali Yılı kaydedildikten sonra Mali Yıl Sonu Tarihi değiştiremezsiniz.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Mali Yıl Başlangıç Tarihi ve Mali Yılı kaydedildikten sonra Mali Yıl Sonu Tarihi değiştiremezsiniz.
 DocType: Quotation,Shopping Cart,Alışveriş Sepeti
 DocType: Quotation,Shopping Cart,Alışveriş Sepeti
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Ort Günlük Giden
@@ -1374,7 +1380,8 @@
 DocType: Purchase Invoice Item,Item Tax Amount,Ürün Vergi Tutarı
 DocType: Purchase Invoice Item,Item Tax Amount,Ürün Vergi Tutarı
 DocType: Item,Maintain Stock,Stok koruyun
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Zaten Üretim Siparişi için oluşturulan Stok Girişler
+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
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,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 +517,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 +182,Max: {0},Max: {0}
@@ -1388,7 +1395,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,100 'den daha büyük olamaz
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,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 Slip Deduction,Depends on Leave Without Pay,Pay olmadan İzni bağlıdır
@@ -1436,7 +1443,7 @@
 DocType: Shipping Rule Condition,To Value,Değer Vermek
 DocType: Shipping Rule Condition,To Value,Değer Vermek
 DocType: Supplier,Stock Manager,Stok Müdürü
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Satır {0} Kaynak depo zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Satır {0} Kaynak depo zorunludur
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Ambalaj Makbuzu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Ofis Kiraları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Ofis Kiraları
@@ -1447,10 +1454,10 @@
 DocType: Workstation Working Hour,Workstation Working Hour,İş İstasyonu Çalışma Saati
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analist
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analist
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Satır {0}: Tahsis miktar {1} daha az olması veya JV miktarı eşittir gerekir {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Satır {0}: Tahsis miktar {1} daha az olması veya JV miktarı eşittir gerekir {2}
 DocType: Item,Inventory,Stok
 DocType: Features Setup,"To enable ""Point of Sale"" view",Bakış &quot;Sale Noktası&quot; etkinleştirmek için
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Boş sepet için ödeme yapılamaz
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Boş sepet için ödeme yapılamaz
 DocType: Item,Sales Details,Satış Ayrıntılar
 DocType: Opportunity,With Items,Öğeler ile
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Miktarında
@@ -1469,12 +1476,13 @@
 DocType: Sales Invoice,Source,Kaynak
 DocType: Sales Invoice,Source,Kaynak
 DocType: Leave Type,Is Leave Without Pay,Pay Yapmadan mı
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Mali Yıl Başlangıç Tarihi
 DocType: Employee External Work History,Total Experience,Toplam Deneyim
 DocType: Employee External Work History,Total Experience,Toplam Deneyim
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Ambalaj Makbuzları İptal Edildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Ambalaj Makbuzları İptal Edildi
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Yatırım Nakit Akışı
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Navlun ve Sevkiyat Ücretleri
 DocType: Material Request Item,Sales Order No,Satış Sipariş No
 DocType: Material Request Item,Sales Order No,Satış Sipariş No
@@ -1484,13 +1492,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Üretim için Aktarım Malzemeleri
 DocType: Pricing Rule,For Price List,Fiyat Listesi İçin
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Yürütücü Arama
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Öğe için satın alma oranı: {0} bulunamadı, muhasebe girişi (gideri) kitap için gereklidir. Bir satın alma fiyat listesi karşı madde fiyatı belirtiniz."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Öğe için satın alma oranı: {0} bulunamadı, muhasebe girişi (gideri) kitap için gereklidir. Bir satın alma fiyat listesi karşı madde fiyatı belirtiniz."
 DocType: Maintenance Schedule,Schedules,Programlar
 DocType: Purchase Invoice Item,Net Amount,Net Miktar
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detay yok
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ek İndirim Tutarı (Şirket Para)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Hata: {0}> {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Hata: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Hata: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Hata: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Lütfen hesap tablosundan yeni hesap oluşturunuz
 DocType: Maintenance Visit,Maintenance Visit,Bakım Ziyareti
 DocType: Maintenance Visit,Maintenance Visit,Bakım Ziyareti
@@ -1521,7 +1529,7 @@
 DocType: Sales Partner,Sales Partner Target,Satış Ortağı Hedefi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},"{0} için muhasebe kayıt, sadece para yapılabilir: {1}"
 DocType: Pricing Rule,Pricing Rule,Fiyatlandırma Kuralı
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Satınalma Siparişi Malzeme Talebi
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Satınalma Siparişi Malzeme Talebi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Satır # {0}: İade Item {1} değil var yok {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Banka Hesapları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Banka Hesapları
@@ -1531,12 +1539,12 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Açılış Stok Dengesi
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} sadece bir kez yer almalıdır
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,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/stock/doctype/stock_entry/stock_entry.py +335,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 +62,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
 DocType: Shipping Rule Condition,From Value,Değerden
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Bankaya yansıyan değil tutarlar
 DocType: Quality Inspection Reading,Reading 4,4 Okuma
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Şirket Gideri Talepleri.
@@ -1549,10 +1557,10 @@
 ,Material Requests for which Supplier Quotations are not created,Kendisi için tedarikçi fiyat teklifi oluşturulmamış Malzeme Talepleri
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Ürünleri barkod kullanarak aramak için. Ürünlerin barkodunu taratarak Ürünleri İrsaliye ev Satış Faturasına girebilirsiniz
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Mark Teslim olarak
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Mark Teslim olarak
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Teklifi Yap
 DocType: Dependent Task,Dependent Task,Bağımlı Görev
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,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
@@ -1560,26 +1568,27 @@
 DocType: SMS Center,Receiver List,Alıcı Listesi
 DocType: Payment Tool Detail,Payment Amount,Ödeme Tutarı
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Tüketilen Tutar
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Görüntüle
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Görüntüle
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Nakit Net Değişim
 DocType: Salary Structure Deduction,Salary Structure Deduction,Maaş Yapısı Kesintisi
 DocType: Salary Structure Deduction,Salary Structure Deduction,Maaş Yapısı Kesintisi
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,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/stock/doctype/item/item.py +344,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,İhraç Öğeler Maliyeti
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Miktar fazla olmamalıdır {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Yaş (Gün)
 DocType: Quotation Item,Quotation Item,Teklif Ürünü
 DocType: Account,Account Name,Hesap adı
 DocType: Account,Account Name,Hesap adı
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Tarihten itibaren tarihe kadardan ileride olamaz
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,Tarihten itibaren tarihe kadardan ileride olamaz
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Seri No {0} miktar {1} kesir olamaz
 apps/erpnext/erpnext/config/buying.py +59,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 +92,Conversion rate cannot be 0 or 1,Dönüşüm oranı 0 veya 1 olamaz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Dönüşüm oranı 0 veya 1 olamaz
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Satın alma makbuzu {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Satın alma makbuzu {0} teslim edilmedi
 DocType: Company,Default Payable Account,Standart Ödenecek Hesap
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% Faturalandırıldı
@@ -1593,10 +1602,11 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Benim Sorunlar
 DocType: BOM Item,BOM Item,BOM Ürün
 DocType: Appraisal,For Employee,Çalışanlara
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,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/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Satır {0}: Ödeme tutarı negatif olamaz
 DocType: Expense Claim,Total Amount Reimbursed,Toplam Tutar Geri ödenen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Tedarikçi karşı Fatura {0} tarihli {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Tedarikçi karşı Fatura {0} tarihli {1}
 DocType: Customer,Default Price List,Standart Fiyat Listesi
 DocType: Customer,Default Price List,Standart Fiyat Listesi
 DocType: Payment Reconciliation,Payments,Ödemeler
@@ -1605,6 +1615,7 @@
 DocType: Budget Detail,Budget Allocated,Ayrılan Bütçe
 DocType: Journal Entry,Entry Type,Girdi Türü
 ,Customer Credit Balance,Müşteri Kredi Bakiyesi
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Borç Hesapları Net Değişim
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,E-posta id doğrulayın
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount','Müşteri indirimi' için gereken müşteri
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Günlüklerle ödeme tarihlerini güncelle.
@@ -1627,7 +1638,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Alışveriş Sepeti etkinleştirin
 DocType: Employee,Permanent Address,Daimi Adres
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Ürün {0} Hizmet ürünü olmalıdır.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Genel Toplam den \ {0} {1} büyük olamaz karşı ödenen Peşin {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Ürün kodu seçiniz
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Ürün kodu seçiniz
@@ -1649,10 +1660,10 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Bir Ürünün tek birimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Günlük Seri {0} 'Teslim edilmelidir'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Günlük Seri {0} 'Teslim edilmelidir'
 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/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Satır No gerekli Depo {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Satır No gerekli Depo {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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
@@ -1661,8 +1672,9 @@
 DocType: Address,Postal,Posta
 DocType: Item,Weightage,Ağırlık
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Aynı adda bir Müşteri Grubu bulunmaktadır. Lütfen Müşteri Grubu ismini değiştirin.
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Önce {0} seçiniz
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Metin {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Önce {0} seçiniz
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},Metin {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Yeni bağlantı
 DocType: Territory,Parent Territory,Ana Bölge
 DocType: Quality Inspection Reading,Reading 2,2 Okuma
 DocType: Stock Entry,Material Receipt,Malzeme Alındısı
@@ -1671,7 +1683,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Parti Tipi ve Parti Alacak / Borç hesabı için gereklidir {0}
 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 +210,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 +213,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 +85,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ü
@@ -1692,16 +1704,16 @@
 DocType: Sales Invoice Item,Batch No,Parti No
 DocType: Sales Invoice Item,Batch No,Parti No
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Bir Müşterinin Satınalma Siparişi karşı birden Satış Siparişine izin ver
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Ana
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Ana
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varyant
 DocType: Naming Series,Set prefix for numbering series on your transactions,İşlemlerinizde seri numaralandırma için ön ek ayarlayın
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Durdurulan Sipariş iptal edilemez. İptali kaldırın
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,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 +366,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: Item,Variants,Varyantlar
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Satın Alma Emri verin
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,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 +129,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ı
@@ -1717,7 +1729,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Depo ve Referans
 DocType: Supplier,Statutory info and other general information about your Supplier,Tedarikçiniz hakkında yasal bilgiler ve diğer genel bilgiler
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresleri
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,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 +201,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
@@ -1727,11 +1739,12 @@
 DocType: GL Entry,Credit Amount in Account Currency,Hesap Para Birimi Kredi Tutarı
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Üretim için Time Kayıtlar.
 DocType: Item,Apply Warehouse-wise Reorder Level,Depo-bilge Yeniden Sipariş Seviyesi Uygula
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} teslim edilmelidir
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0} teslim edilmelidir
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Satır # {0}: Depo Reddedildi reddedilen Öğe karşı zorunludur {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Görevler için günlük.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Ücret
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Ücret
 DocType: Production Order Operation,Actual Time and Cost,Gerçek Zaman ve Maliyet
 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},Maksimum {0} Malzeme Talebi Malzeme {1} için Satış Emri {2} karşılığında yapılabilir
 DocType: Employee,Salutation,Hitap
@@ -1751,7 +1764,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Ortak
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,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
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Süresi Doldu
 DocType: Packing Slip,To Package No.,Ambalaj No.
 DocType: Warranty Claim,Issue Date,Veriliş tarihi
 DocType: Activity Cost,Activity Cost,Etkinlik Maliyeti
@@ -1794,7 +1806,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Bölge / Müşteri
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,örneğin 5
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,örneğin 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Satış faturasını kaydettiğinizde görünür olacaktır.
 DocType: Item,Is Sales Item,Satış Maddesi
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ürün Grubu Ağacı
@@ -1811,7 +1823,7 @@
 DocType: Delivery Note Item,Against Sales Order,Satış Emri Karşılığı
 ,Serial No Status,Seri No Durumu
 ,Serial No Status,Seri No Durumu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Ürün tablosu boş olamaz
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Ürün tablosu boş olamaz
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Satır {0}: ayarlamak için {1} dönemsellik, gelen ve tarih \
  arasındaki fark daha büyük ya da eşit olmalıdır {2}"
@@ -1823,7 +1835,7 @@
 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 +170,Duties and Taxes,Harç ve Vergiler
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Referrans tarihi girin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Referrans tarihi girin
 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} ödeme girişleri şu tarafından filtrelenemez {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Web Sitesi gösterilir Öğe için Tablo
 DocType: Purchase Order Item Supplied,Supplied Qty,Verilen Adet
@@ -1839,7 +1851,7 @@
 DocType: Installation Note,Installation Time,Kurulum Zaman
 DocType: Sales Invoice,Accounting Details,Muhasebe Detayları
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Bu şirket için bütün İşlemleri sil
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Satır # {0}: {1} Çalışma Üretimde mamul mal {2} qty tamamlanmış değil Sipariş # {3}. Zaman Kayıtlar üzerinden çalışma durumunu güncelleyin Lütfen
+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,Satır # {0}: {1} Çalışma Üretimde mamul mal {2} qty tamamlanmış değil Sipariş # {3}. Zaman Kayıtlar üzerinden çalışma durumunu güncelleyin Lütfen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Yatırımlar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Yatırımlar
 DocType: Issue,Resolution Details,Karar Detayları
@@ -1860,7 +1872,7 @@
 DocType: Features Setup,Brands,Markalar
 DocType: C-Form Invoice Detail,Invoice No,Fatura No
 DocType: C-Form Invoice Detail,Invoice No,Fatura No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Satın Alma Emrinden
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Satın Alma Emrinden
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Izin dengesi zaten carry iletilen gelecek izin tahsisi kayıtlarında olduğu gibi, daha önce {0} iptal / tatbik edilemez bırakın {1}"
 DocType: Activity Cost,Costing Rate,Maliyet Oranı
 ,Customer Addresses And Contacts,Müşteri Adresleri ve İletişim
@@ -1881,7 +1893,7 @@
 ,Maintenance Schedules,Bakım Programları
 ,Quotation Trends,Teklif Trendleri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,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 +307,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ı
 ,Pending Amount,Bekleyen Tutar
@@ -1901,13 +1913,13 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finansal Hesaplar Ağacı
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Hesap {0} Madde {1} Varlık Maddesi olmak üzere 'Sabit Varlık' türünde olmalıdır
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Hesap {0} Madde {1} Varlık Maddesi olmak üzere 'Sabit Varlık' türünde olmalıdır
 DocType: HR Settings,HR Settings,İK Ayarları
 DocType: HR Settings,HR Settings,İK Ayarları
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Gider Talebi onay bekliyor. Yalnızca Gider yetkilisi durumu güncelleyebilir.
 DocType: Purchase Invoice,Additional Discount Amount,Ek İndirim Tutarı
 DocType: Leave Block List Allow,Leave Block List Allow,İzin engel listesi müsaade eder
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Gerçek Toplam
@@ -1925,6 +1937,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Gider İddiaları
 DocType: Issue,Support,Destek
 DocType: Issue,Support,Destek
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Sepete Bak
 ,BOM Search,BOM Arama
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Kapanış (+ toplamları Açılış)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Şirket para belirtiniz
@@ -1937,13 +1950,14 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Gümrükleme tarihi {0} satırındaki kontrol tarihinden önce olamaz
 DocType: Salary Slip,Deduction,Kesinti
 DocType: Salary Slip,Deduction,Kesinti
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Ürün Fiyatı için katma {0} Fiyat Listesi {1}
 DocType: Address Template,Address Template,Adres Şablonu
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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ı
 DocType: Project,% Tasks Completed,% Görev Tamamlandı
 DocType: Project,Gross Margin,Brüt Marj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Önce Üretim Ürününü giriniz
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,Engelli kullanıcı
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Engelli kullanıcı
 DocType: Opportunity,Quotation,Fiyat Teklifi
 DocType: Salary Slip,Total Deduction,Toplam Kesinti
 DocType: Salary Slip,Total Deduction,Toplam Kesinti
@@ -1954,7 +1968,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Ürün {0} zaten iade edilmiş
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Mali Yılı ** Mali Yılı temsil eder. Tüm muhasebe kayıtları ve diğer önemli işlemler ** ** Mali Yılı karşı izlenir.
 DocType: Opportunity,Customer / Lead Address,Müşteri / Adres
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
 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
@@ -1966,13 +1980,13 @@
 DocType: Expense Claim,Approver,Onaylayan
 ,SO Qty,SO Adet
 ,SO Qty,SO Adet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stok girişleri ambarında mevcut {0}, dolayısıyla yeniden atamak ya da Depo değiştiremezsiniz"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stok girişleri ambarında mevcut {0}, dolayısıyla yeniden atamak ya da Depo değiştiremezsiniz"
 DocType: Appraisal,Calculate Total Score,Toplam Puan Hesapla
 DocType: Appraisal,Calculate Total Score,Toplam Puan Hesapla
 DocType: Supplier Quotation,Manufacturing Manager,Üretim Müdürü
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,İrsaliyeyi ambalajlara böl.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Gönderiler
+apps/erpnext/erpnext/hooks.py +69,Shipments,Gönderiler
 DocType: Purchase Order Item,To be delivered to customer,Müşteriye teslim edilmek üzere
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Günlük durumu Teslim Edildi olmalıdır.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Seri Hayır {0} herhangi Warehouse ait değil
@@ -1997,10 +2011,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +356,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
 DocType: Currency Exchange,From Currency,Para biriminden
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","En az bir satırda Tahsis Tutar, Fatura Türü ve Fatura Numarası seçiniz"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ürün {0}için Satış Sipariş  gerekli
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","En az bir satırda Tahsis Tutar, Fatura Türü ve Fatura Numarası seçiniz"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Ürün {0}için Satış Sipariş  gerekli
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Sistemde yer almamaktadır tutarlar
 DocType: Purchase Invoice Item,Rate (Company Currency),Oranı (Şirket para birimi)
 DocType: Purchase Invoice Item,Rate (Company Currency),Oranı (Şirket para birimi)
@@ -2020,7 +2034,7 @@
 DocType: Quality Inspection,In Process,Süreci
 DocType: Authorization Rule,Itemwise Discount,Ürün İndirimi
 DocType: Purchase Order Item,Reference Document Type,Referans Belge Türü
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} Satış Siparişine karşı {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} Satış Siparişine karşı {1}
 DocType: Account,Fixed Asset,Sabit Varlık
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serileştirilmiş Envanteri
 DocType: Activity Type,Default Billing Rate,Varsayılan Fatura Oranı
@@ -2031,7 +2045,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Ödeme Satış Sipariş
 DocType: Expense Claim Detail,Expense Claim Detail,Gideri Talebi Detayı
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Zaman Günlükleri oluşturuldu:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Doğru hesabı seçin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Doğru hesabı seçin
 DocType: Item,Weight UOM,Ağırlık Ölçü Birimi
 DocType: Employee,Blood Group,Kan grubu
 DocType: Employee,Blood Group,Kan grubu
@@ -2067,11 +2081,11 @@
 DocType: Time Log,To Time,Zamana
 DocType: Authorization Rule,Approving Role (above authorized value),(Yetkili değerin üstünde) Rolü onaylanması
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",Alt devreler 'node' eklemek için tüm devreye bakarak eklemek istediğiniz alana tıklayın
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,BOM recursion: {0} cannot be parent or child of {2},BOM özyineleme: {0} ebeveyn veya çocuk olamaz {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,BOM recursion: {0} cannot be parent or child of {2},BOM özyineleme: {0} ebeveyn veya çocuk olamaz {2}
 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 +116,"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"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"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"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
 DocType: Manufacturing Settings,Allow Overtime,Mesai izin ver
@@ -2081,8 +2095,9 @@
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Siparişler veya Faturalar karşı Ödeme Girişleri oluşturun.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Yeni adres
 DocType: Quality Inspection,Sample Size,Numune Boyu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,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"
 DocType: Project,External,Harici
@@ -2151,7 +2166,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Güncelleme Maliyeti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Güncelleme Maliyeti
 DocType: Item Reorder,Item Reorder,Ürün Yeniden Sipariş
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Malzemesi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transfer Malzemesi
 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."
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
@@ -2161,6 +2176,7 @@
 DocType: Installation Note,Installation Note,Kurulum Not
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Vergi Ekle
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Vergi Ekle
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Finansman Nakit Akışı
 ,Financial Analytics,Mali Analitik
 DocType: Quality Inspection,Verified By,Onaylayan Kişi
 DocType: Address,Subsidiary,Yardımcı
@@ -2172,13 +2188,13 @@
 DocType: Process Payroll,Create Salary Slip,Maaş Makbuzu Oluştur
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Banka başına beklendiği gibi denge
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fon kaynakları (Yükümlülükler)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Satır {0} ({1}) deki miktar üretilen miktar {2} ile aynı olmalıdır
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Satır {0} ({1}) deki miktar üretilen miktar {2} ile aynı olmalıdır
 DocType: Appraisal,Employee,Çalışan
 DocType: Appraisal,Employee,Çalışan
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Gönderen İthalat E-
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Kullanıcı olarak davet
 DocType: Features Setup,After Sale Installations,Satış Sonrası Montaj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} tam fatura edilir
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} tam fatura edilir
 DocType: Workstation Working Hour,End Time,Bitiş Zamanı
 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ı.
@@ -2186,7 +2202,7 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Gerekli Açık
 DocType: Sales Invoice,Mass Mailing,Toplu Posta
 DocType: Rename Tool,File to Rename,Rename Dosya
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Ürün {0} için Sipariş numarası gerekli
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Ürün {0} için Sipariş numarası gerekli
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Göster Ödemeleri
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Bakım Programı {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
@@ -2198,6 +2214,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Müşteri Oluştur
 DocType: Purchase Invoice,Credit To,Kredi için
 DocType: Purchase Invoice,Credit To,Kredi için
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktif İlanlar / Müşteriler
 DocType: Employee Education,Post Graduate,Lisans Üstü
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Bakım Programı Detayı
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Bakım Programı Detayı
@@ -2211,6 +2228,7 @@
 DocType: Payment Tool,Payment Account,Ödeme Hesabı
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Devam etmek için Firma belirtin
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Alacak Hesapları Net Değişim
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Telafi İzni
 DocType: Quality Inspection Reading,Accepted,Onaylanmış
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,Eğer gerçekten bu şirket için tüm işlemleri silmek istediğinizden emin olun. Olduğu gibi sizin ana veriler kalacaktır. Bu işlem geri alınamaz.
@@ -2218,19 +2236,19 @@
 DocType: Payment Tool,Total Payment Amount,Toplam Ödeme Tutarı
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"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 +207,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
 DocType: Newsletter,Test,Test
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Mevcut stok işlemleri size değerlerini değiştiremezsiniz \ Bu öğe, orada olduğundan &#39;Seri No Has&#39;, &#39;Toplu Has Hayır&#39;, &#39;Stok Öğe mı&#39; ve &#39;Değerleme Metodu&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Hızlı Kayıt Girdisi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hızlı Kayıt Girdisi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Herhangi bir Ürünye karşo BOM belirtildiyse oran değiştiremezsiniz.
 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 +157,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 +211,{0} {1} is not submitted,{0} {1} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} teslim edilmedi
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Şartlar ve Koşullar 1
@@ -2243,7 +2261,7 @@
 DocType: Authorization Rule,Authorized Value,Yetkili Değer
 DocType: Contact,Enter department to which this Contact belongs,Bu irtibatın ait olduğu departmanı girin
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Toplam Yok
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Satır {0} daki Ürün veya Depo Ürün isteğini karşılamıyor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Satır {0} daki Ürün veya Depo Ürün isteğini karşılamıyor
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Ölçü Birimi
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Ölçü Birimi
 DocType: Fiscal Year,Year End Date,Yıl Bitiş Tarihi
@@ -2277,7 +2295,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Sözleşme Bitiş tarihi Katılma tarihinden büyük olmalı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.
 DocType: Customer Group,Has Child Node,Çocuk Kısmı Var
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} Satınalma siparişine karşı{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} Satınalma siparişine karşı{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Buraya statik url parametreleri girin (Örn. gönderen = ERPNext, kullanıcı adı = ERPNext, Şifre = 1234 vb)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} değil herhangi bir aktif Mali Yılı içinde. Daha fazla bilgi kontrol ediniz {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Bu ERPNextten otomatik olarak üretilmiş bir örnek web sitedir.
@@ -2325,7 +2343,7 @@
  10. Ekle veya Düşebilme: eklemek veya vergi kesintisi etmek isteyin."
 DocType: Purchase Receipt Item,Recd Quantity,Alınan Miktar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Satış Sipariş Miktarı {1} den fazla Ürün {0} üretilemez
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stok Giriş {0} teslim edilmez
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Stok Giriş {0} teslim edilmez
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 DocType: Tax Rule,Billing City,Fatura Şehir
@@ -2368,6 +2386,7 @@
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 üzerinde
 DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
 DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Yukarıda seçilen kritere VEYA maaş kayma yok çalışanın zaten oluşturulmuş
 DocType: Notification Control,Sales Order Message,Satış Sipariş Mesajı
 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"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Ödeme Şekli
@@ -2409,7 +2428,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Kilit Sorumluluk Alanı
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Satır {0}: Ölçü Birimi Dönüşüm Faktörü zorunludur
+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/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Maliyet Merkezi
@@ -2439,7 +2458,7 @@
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Tüm adresler.
 DocType: Company,Stock Settings,Stok Ayarları
 DocType: Company,Stock Settings,Stok Ayarları
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Aşağıdaki özelliklerin her ikisi, kayıtlarında aynı ise birleştirme mümkündür. Grup, Kök tipi, Şirket"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Aşağıdaki özelliklerin her ikisi, kayıtlarında aynı ise birleştirme mümkündür. Grup, Kök tipi, Şirket"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Müşteri Grupbu Ağacını Yönetin.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Yeni Maliyet Merkezi Adı
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Yeni Maliyet Merkezi Adı
@@ -2462,9 +2481,9 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Ödeme Aracı Detayı
 ,Sales Browser,Satış Tarayıcı
 DocType: Journal Entry,Total Credit,Toplam Kredi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Uyarı: Başka {0} # {1} stok girişi karşı var {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Yerel
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Yerel
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Uyarı: Başka {0} # {1} stok girişi karşı var {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Yerel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,Yerel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Krediler ve avanslar (Varlıklar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Krediler ve avanslar (Varlıklar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Borçlular
@@ -2487,7 +2506,7 @@
 ,S.O. No.,SO No
 ,S.O. No.,SO No
 DocType: Production Order Operation,Make Time Log,Zaman Giriş Yap
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Yeniden sipariş miktarını ayarlamak Lütfen
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Yeniden sipariş miktarını ayarlamak Lütfen
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Lütfen alan {0}'dan Müşteri oluşturunuz
 DocType: Price List,Applicable for Countries,Ülkeler için geçerlidir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Bilgisayarlar
@@ -2550,10 +2569,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Hiçbir Açıklamalar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Hiçbir Açıklamalar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Vadesi geçmiş
 DocType: Account,Stock Received But Not Billed,Alınmış ancak faturalanmamış stok
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Kök Hesabı bir grup olmalı
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Kök Hesabı bir grup olmalı
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Büt Ücret + geciken Tutar + Nakit Çekim Tutarı - Toplam Kesinti
 DocType: Monthly Distribution,Distribution Name,Dağıtım Adı
 DocType: Monthly Distribution,Distribution Name,Dağıtım Adı
@@ -2570,6 +2589,7 @@
 DocType: Journal Entry Account,Party Balance,Parti Dengesi
 DocType: Sales Invoice Item,Time Log Batch,Günlük Seri
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,İndirim Açık Uygula seçiniz
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Maaş Kayma düzenlendi
 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: Stock Entry,Material Transfer for Manufacture,Üretim için Materyal Transfer
@@ -2577,10 +2597,10 @@
 DocType: Purchase Invoice,Half-yearly,Yarı Yıllık
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Mali Yılı {0} bulunamadı.
 DocType: Bank Reconciliation,Get Relevant Entries,İlgili girdileri alın
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Stokta Muhasebe Giriş
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Stokta Muhasebe Giriş
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Ürün {0} yoktur
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Ürün {0} yoktur
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
 DocType: Purchase Invoice,Apply Additional Discount On,Ek İndirim On Uygula
@@ -2592,11 +2612,11 @@
 DocType: Item Group,Show this slideshow at the top of the page,Sayfanın üstünde bu slayt gösterisini göster
 DocType: BOM,Item UOM,Ürün Ölçü Birimi
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),İndirim Tutarı sonra Vergi Tutarı (Şirket Para)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Satır {0} için hedef depo zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Satır {0} için hedef depo zorunludur
 DocType: Quality Inspection,Quality Inspection,Kalite Kontrol
 DocType: Quality Inspection,Quality Inspection,Kalite Kontrol
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,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 +546,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 +191,Account {0} is frozen,Hesap {0} dondurulmuş
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,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ı.
@@ -2604,7 +2624,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL veya BS
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL veya BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Sadece karşı ödeme yapabilirsiniz faturalanmamış {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Sadece karşı ödeme yapabilirsiniz faturalanmamış {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Komisyon oranı 100'den fazla olamaz
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Asgari Stok Seviyesi
 DocType: Stock Entry,Subcontract,Alt sözleşme
@@ -2652,8 +2672,8 @@
 DocType: Purchase Order Item,Returned Qty,İade edilen Adet
 DocType: Employee,Exit,Çıkış
 DocType: Employee,Exit,Çıkış
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Kök Tipi zorunludur
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Kök Tipi zorunludur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Kök Tipi zorunludur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Kök Tipi zorunludur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Seri No {0} oluşturuldu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Seri No {0} oluşturuldu
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Müşterilerinin rahatlığı için, bu kodlar faturalarda ve irsaliyelerde olduğu gibi basılı formatta kullanılabilir."
@@ -2662,8 +2682,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Deneme süresi
 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 +110,Row {0}: Advance against Customer must be credit,Satır {0}: Müşteriye karşı Advance kredi olmalı
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Tedarik edilen satın alma makbuzu ürünü
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Ödeme
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Ödeme
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,DateTime için
 DocType: SMS Settings,SMS Gateway URL,SMS Anageçit Adresi
 DocType: SMS Settings,SMS Gateway URL,SMS Anageçit Adresi
@@ -2683,7 +2704,7 @@
 DocType: Attendance,Attendance Date,Katılım Tarihi
 DocType: Attendance,Attendance Date,Katılım Tarihi
 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 +110,Account with child nodes cannot be converted to ledger,Alt hesapları bulunan hesaplar muhasebe defterine dönüştürülemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Alt hesapları bulunan hesaplar muhasebe defterine dönüştürülemez.
 DocType: Address,Preferred Shipping Address,Tercih edilen Teslimat Adresi
 DocType: Purchase Receipt Item,Accepted Warehouse,Kabul edilen depo
 DocType: Bank Reconciliation Detail,Posting Date,Gönderme Tarihi
@@ -2711,7 +2732,7 @@
 DocType: Pricing Rule,Discount Percentage,İndirim Yüzdesi
 DocType: Payment Reconciliation Invoice,Invoice Number,Fatura Numarası
 DocType: Payment Reconciliation Invoice,Invoice Number,Fatura Numarası
-apps/erpnext/erpnext/hooks.py +54,Orders,Siparişler
+apps/erpnext/erpnext/hooks.py +55,Orders,Siparişler
 DocType: Leave Control Panel,Employee Type,Çalışan Tipi
 DocType: Leave Control Panel,Employee Type,Çalışan Tipi
 DocType: Employee Leave Approver,Leave Approver,İzin Onaylayan
@@ -2724,8 +2745,8 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% malzemenin faturası bu Satış Emri karşılığında oluşturuldu
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Dönem Kapanış Girişi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortisman
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortisman
+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)
 DocType: Customer,Credit Limit,Kredi Limiti
 DocType: Customer,Credit Limit,Kredi Limiti
@@ -2754,12 +2775,13 @@
 DocType: Material Request,Requested For,Için talep
 DocType: Quotation Item,Against Doctype,Belge Tipi Karşılığı
 DocType: Delivery Note,Track this Delivery Note against any Project,Bu irsaliyeyi bütün Projelere karşı takip et
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Kök hesabı silinemez
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Yatırım Kaynaklanan Net Nakit
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Kök hesabı silinemez
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Göster Stok Girişler
 ,Is Primary Address,Birincil Adres mı
 DocType: Production Order,Work-in-Progress Warehouse,Devam eden depo işi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referans # {0} tarihli {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referans # {0} tarihli {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referans # {0} tarihli {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Referans # {0} tarihli {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Adresleri yönetin
 DocType: Pricing Rule,Item Code,Ürün Kodu
 DocType: Pricing Rule,Item Code,Ürün Kodu
@@ -2769,8 +2791,8 @@
 DocType: Journal Entry,User Remark,Kullanıcı Açıklaması
 DocType: Lead,Market Segment,Pazar Segmenti
 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 +223,Closing (Dr),Kapanış (Dr)
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Kapanış (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Kapanış (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Kapanış (Dr)
 DocType: Contact,Passive,Pasif
 DocType: Contact,Passive,Pasif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Seri No {0} stokta değil
@@ -2788,7 +2810,7 @@
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Uzlaşma
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Uzlaşma
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Güncellemeler Alın
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Malzeme Talebi {0} iptal edilmiş veya durdurulmuştur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Malzeme Talebi {0} iptal edilmiş veya durdurulmuştur
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Birkaç örnek kayıtları ekle
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Yönetim bırakın
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Hesap Grubu
@@ -2799,7 +2821,7 @@
 DocType: Payment Tool,Against Vouchers,Fişler karşı
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hızlı Yardım
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hızlı Yardım
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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_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
 DocType: Features Setup,Sales Extras,Satış Ekstralar
 DocType: Features Setup,Sales Extras,Satış Ekstralar
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Maliyet Merkezi {2}'ye karşı {1} hesabı için {0} bütçesi {3} ile aşılmıştır.
@@ -2807,7 +2829,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
 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
 ,Stock Projected Qty,Öngörülen Stok Miktarı
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
 DocType: Sales Order,Customer's Purchase Order,Müşterinin Sipariş
 DocType: Warranty Claim,From Company,Şirketten
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Değer veya Miktar
@@ -2819,16 +2841,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Giriş yapmak için kullanılacak
 DocType: Sales Partner,Retailer,Perakendeci
 DocType: Sales Partner,Retailer,Perakendeci
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Hesabın için Kredi bir bilanço hesabı olmalıdır
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Bütün Tedarikçi Tipleri
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +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/selling/doctype/sales_order/sales_order.py +93,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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Maaş Makbuzu Oluştur
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Araştır BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,BOM Araştır
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Teminatlı Krediler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Teminatlı Krediler
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Başarılı Ürünler
@@ -2871,7 +2893,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Paketin brüt ağırlığı. Genellikle net ağırlığı + ambalaj Ürünü ağırlığı. (Baskı için)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Bu role sahip kullanıcıların dondurulmuş hesapları ayarlama ve dondurulmuş hesaplara karşı muhasebe girdileri oluşturma/düzenleme yetkileri vardır
 DocType: Serial No,Is Cancelled,İptal edilmiş
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Benim Gönderiler
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Benim Gönderiler
 DocType: Journal Entry,Bill Date,Fatura tarihi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Eğer yüksek öncelikli birden çok Fiyatlandırma Kuralı varsa, şu iç öncelikler geçerli olacaktır."
 DocType: Supplier,Supplier Details,Tedarikçi Ayrıntıları
@@ -2897,11 +2919,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Aramalar
 DocType: Project,Total Costing Amount (via Time Logs),Toplam Maliyet Tutarı (Zaman Kayıtlar üzerinden)
 DocType: Purchase Order Item Supplied,Stock UOM,Stok Ölçü Birimi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Satınalma Siparişi {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Satınalma Siparişi {0} teslim edilmedi
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Öngörülen
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Öngörülen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Seri No {0} Depo  {1} e ait değil
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Not: Miktar 0 olduğundan ötürü sistem Ürün {0} için teslimat ve ayırma kontrolü yapmayacaktır
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Not: Miktar 0 olduğundan ötürü sistem Ürün {0} için teslimat ve ayırma kontrolü yapmayacaktır
 DocType: Notification Control,Quotation Message,Teklif Mesajı
 DocType: Issue,Opening Date,Açılış Tarihi
 DocType: Issue,Opening Date,Açılış Tarihi
@@ -2915,10 +2937,9 @@
 DocType: Time Log,Batched for Billing,Faturalanmak için partiler haline getirilmiş
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Tedarikçiler tarafından artırılan faturalar
 DocType: POS Profile,Write Off Account,Hesabı Kapat
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,İndirim Tutarı
-apps/erpnext/erpnext/public/js/pos/pos.html +28,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/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Faaliyetlerden Kaynaklanan Net Nakit
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,Örneğin KDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Madde 4
 DocType: Journal Entry Account,Journal Entry Account,Kayıt Girdisi Hesabı
@@ -2966,7 +2987,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Emeklilik Tarihi katılım tarihinden büyük olmalıdır
 DocType: Sales Invoice,Against Income Account,Gelir Hesabı Karşılığı
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Teslim Edildi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Bölge Hedefleri
 DocType: Territory,Territory Targets,Bölge Hedefleri
@@ -2997,10 +3018,10 @@
 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/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Bu bir kök satış kişisidir ve düzenlenemez.
 ,Stock Ledger,Stok defteri
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Puan: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Puan: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Bordro Dahili Kesinti
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,İlk grup düğümünü seçin.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Amaç şunlardan biri olmalıdır: {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Amaç şunlardan biri olmalıdır: {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Formu doldurun ve kaydedin
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,En son stok durumu ile bütün ham maddeleri içeren bir rapor indir
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum
@@ -3042,7 +3063,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Satış Emri iptal edilmeden önce İrsaliyeler {0} iptal edilmelidir
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,Ödenen miktar + Borç İptali  Toplamdan fazla olamaz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Paid amount + Write Off Amount can not be greater than Grand Total,Ödenen miktar + Borç İptali  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 +126,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/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Not: Ödeme herhangi bir referansa karşı yapılmış değilse, elle Kayıt Girdisi yap."
@@ -3062,14 +3083,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gönderilmesi işlemlere Kişiler otomatik e-postalar gönderin.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Satır {0}: Adet depo avalable değil {1} üzerinde {2} {3}.
  Mevcut Adet: {4}, Miktar Transferi: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Madde 3
 DocType: Purchase Order,Customer Contact Email,Müşteri İletişim E-mail
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,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/accounts/doctype/sales_invoice/sales_invoice.py +468,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Sorumluluklar
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Şablon
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Şablon
@@ -3082,7 +3103,7 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Uzlaşma önce
 apps/erpnext/erpnext/support/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 +374,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 +383,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ı
 DocType: Item,Default BOM,Standart BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Re-tipi şirket ismi onaylamak için lütfen
@@ -3090,7 +3111,7 @@
 DocType: Time Log Batch,Total Hours,Toplam Saat
 DocType: Time Log Batch,Total Hours,Toplam Saat
 DocType: Journal Entry,Printing Settings,Baskı Ayarları
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},"Toplam Borç Toplam Krediye eşit olmalıdırr. Aradaki fark, {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},"Toplam Borç Toplam Krediye eşit olmalıdırr. Aradaki fark, {0}"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotiv
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotiv
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,İrsaliyeden
@@ -3099,7 +3120,7 @@
 DocType: Notification Control,Custom Message,Özel Mesaj
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Yatırım Bankacılığı
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Yatırım Bankacılığı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Kasa veya Banka Hesabı ödeme girişi yapmak için zorunludur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Kasa veya Banka Hesabı ödeme girişi yapmak için zorunludur
 DocType: Purchase Invoice,Price List Exchange Rate,Fiyat Listesi Döviz Kuru
 DocType: Purchase Invoice Item,Rate,Br.Fiyat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stajyer
@@ -3123,11 +3144,12 @@
 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 +580,Issue Material,Sayı Malzeme
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Sayı Malzeme
 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
 DocType: Hub Settings,Access Token,Erişim Anahtarı
 DocType: Sales Invoice Item,Serial No,Seri No
 DocType: Sales Invoice Item,Serial No,Seri No
@@ -3145,11 +3167,13 @@
 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ı
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimum Fatura Tutarı
 DocType: Purchase Invoice Item,Image View,Resim Görüntüle
 DocType: Purchase Invoice Item,Image View,Resim Görüntüle
 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 +553,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
 DocType: Purchase Taxes and Charges,Valuation and Total,Değerleme ve Toplam
@@ -3158,6 +3182,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Bu Öğe {0} (Şablon) bir Variant olduğunu. 'Hayır Kopyala' ayarlanmadığı sürece Öznitelikler şablon üzerinden kopyalanır
 DocType: Account,Purchase User,Satınalma Kullanıcı
 DocType: Notification Control,Customize the Notification,Bildirim özelleştirin
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Faaliyetlerden Nakit Akışı
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Varsayılan Adres Şablon silinemez
 DocType: Sales Invoice,Shipping Rule,Kargo Kuralı
 DocType: Journal Entry,Print Heading,Baskı Başlığı
@@ -3171,7 +3196,7 @@
 DocType: Leave Application,Follow via Email,E-posta ile takip
 DocType: Leave Application,Follow via Email,E-posta ile takip
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,İndirim Tutarından sonraki vergi miktarı
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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 +452,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 +335,Please select Posting Date first,İlk Gönderme Tarihi seçiniz
@@ -3192,6 +3217,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seri Ürün{0} için Seri numaraları gereklidir
 DocType: Journal Entry,Bank Entry,Banka Girişi
 DocType: Authorization Rule,Applicable To (Designation),(Görev) için uygulanabilir
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Sepete ekle
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Sepete ekle
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grup tarafından
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ Para birimlerini etkinleştir/devre dışı bırak.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Posta Giderleri
@@ -3202,19 +3229,19 @@
 DocType: Purchase Order,The date on which recurring order will be stop,yinelenen sipariş durdurmak hangi tarih
 DocType: Quality Inspection,Item Serial No,Ürün Seri No
 DocType: Quality Inspection,Item Serial No,Ürün Seri No
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} değeri {1} oranında azaltılmalıdır veya tolerans durumu artırılmalıdır
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} değeri {1} oranında azaltılmalıdır veya tolerans durumu artırılmalıdır
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Toplam Mevcut
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Saat
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Saat
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serileştirilmiş Öğe {0} Stok Uzlaşma kullanarak \
  güncellenmiş olamaz"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Tedarikçi Malzeme Transferi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Tedarikçi Malzeme Transferi
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Teklif oluşturma
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Blok Tarihlerde yaprakları onaylama yetkiniz yok
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} tarafından onaylanmış
 DocType: Shipping Rule,Shipping Rule Conditions,Kargo Kural Koşulları
 DocType: BOM Replace Tool,The new BOM after replacement,Değiştirilmesinden sonra yeni BOM
@@ -3222,14 +3249,13 @@
 DocType: Account,Tax,Vergi
 DocType: Account,Tax,Vergi
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Satır {0}: {1} geçerli değil {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Ürün Bundle Gönderen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Ürün Bundle Gönderen
 DocType: Production Planning Tool,Production Planning Tool,Üretim Planlama Aracı
 DocType: Production Planning Tool,Production Planning Tool,Üretim Planlama Aracı
 DocType: Quality Inspection,Report Date,Rapor Tarihi
 DocType: Quality Inspection,Report Date,Rapor Tarihi
 DocType: C-Form,Invoices,Faturalar
 DocType: Job Opening,Job Title,İş Unvanı
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Alıcılar
 DocType: Features Setup,Item Groups in Details,Ayrıntılı Ürün Grupları
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Üretim Miktar 0&#39;dan büyük olmalıdır.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Başlangıç Point-of-Sale (POS)
@@ -3238,8 +3264,9 @@
 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: Pricing Rule,Customer Group,Müşteri Grubu
 DocType: Pricing Rule,Customer Group,Müşteri Grubu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Ürün {0} için gider hesabı zorunludur
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Ürün {0} için gider hesabı zorunludur
 DocType: Item,Website Description,Web Sitesi Açıklaması
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Özkaynak Net Değişim
 DocType: Serial No,AMC Expiry Date,AMC Bitiş Tarihi
 ,Sales Register,Satış Kayıt
 ,Sales Register,Satış Kayıt
@@ -3250,12 +3277,12 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Bu ay ve bekleyen aktiviteler için Özet
 DocType: Customer Group,Customer Group Name,Müşteri Grup Adı
 DocType: Customer Group,Customer Group Name,Müşteri Grup Adı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Nitelikler
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Ürünleri alın
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Borç Silme Hesabı Girin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Ürünleri alın
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Borç Silme Hesabı Girin
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Son Sipariş Tarihi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Tüketim faturası yapın
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Hesap {0} yapan şirkete ait değil {1}
@@ -3273,8 +3300,8 @@
 DocType: Project,Expected End Date,Beklenen Bitiş Tarihi
 DocType: Project,Expected End Date,Beklenen Bitiş Tarihi
 DocType: Appraisal Template,Appraisal Template Title,Değerlendirme Şablonu Başlığı
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Ticari
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Ticari
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Ticari
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Ticari
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Veli Öğe {0} Stok Öğe olmamalıdır
 DocType: Cost Center,Distribution Id,Dağıtım Kimliği
 DocType: Cost Center,Distribution Id,Dağıtım Kimliği
@@ -3290,7 +3317,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} Attribute değer aralığında olmalıdır {1} {2} artışlarla {3}
 DocType: Tax Rule,Sales,Satışlar
 DocType: Stock Entry Detail,Basic Amount,Temel Tutar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
 DocType: Leave Allocation,Unused leaves,Kullanılmayan yapraklar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Alacak Hesapları Standart
@@ -3304,18 +3331,17 @@
 DocType: Journal Entry,Pay To / Recd From,Gönderen/Alınan
 DocType: Naming Series,Setup Series,Kurulum Serisi
 DocType: Naming Series,Setup Series,Kurulum Serisi
+DocType: Payment Reconciliation,To Invoice Date,Tarihi Faturaya
 DocType: Supplier,Contact HTML,İletişim HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Satınalma Makbuzlar
-DocType: Payment Reconciliation,Maximum Amount,Maksimum Tutar
-DocType: Payment Reconciliation,Maximum Amount,Maksimum Tutar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Fiyatlandırma Kuralı Nasıl Uygulanır?
 DocType: Quality Inspection,Delivery Note No,İrsaliye No
 DocType: Company,Retail,Perakende
 DocType: Company,Retail,Perakende
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Müşteri {0} yok
 DocType: Attendance,Absent,Eksik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Ürün Paketi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Satır {0}: Geçersiz başvuru {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Ürün Paketi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Satır {0}: Geçersiz başvuru {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vergiler ve Harçlar Şablon Satınalma
 DocType: Upload Attendance,Download Template,Şablonu İndir
 DocType: GL Entry,Remarks,Açıklamalar
@@ -3348,7 +3374,7 @@
 ,Monthly Attendance Sheet,Aylık Katılım Cetveli
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Kayıt bulunamAdı
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},Ürün{2} için {0} {1}: Maliyert Merkezi zorunludur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Ürün Bundle Öğeleri alın
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Ürün Bundle Öğeleri alın
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Hesap {0} etkin değil
 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
@@ -3358,9 +3384,12 @@
 DocType: Features Setup,Sales Discounts,Satış İndirimleri
 DocType: Features Setup,Sales Discounts,Satış İndirimleri
 DocType: Hub Settings,Seller Country,Satıcı Ülke
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Web sitesinde Ürünleri yayınlayın
 DocType: Authorization Rule,Authorization Rule,Yetki Kuralı
 DocType: Sales Invoice,Terms and Conditions Details,Şartlar ve Koşullar Detayları
 DocType: Sales Invoice,Terms and Conditions Details,Şartlar ve Koşullar Detayları
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Özellikler
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Özellikler
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Satış Vergi ve Harçlar Şablon
 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
@@ -3386,7 +3415,7 @@
 DocType: Time Log,Billing Amount,Fatura Tutarı
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ürün {0} için geçersiz miktar belirtildi. Miktar 0 dan fazla olmalıdır
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,İzin başvuruları.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,İşlem görmüş hesaplar silinemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,İşlem görmüş hesaplar silinemez.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Yasal Giderler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Yasal Giderler
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Otomatik sipariş 05, 28 vb gibi oluşturulur hangi ayın günü"
@@ -3409,12 +3438,12 @@
 DocType: Maintenance Visit,Breakdown,Arıza
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Hesap: {0} para ile: {1} seçilemez
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Tarih
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Hesap {0}: Ana hesap {1} şirkete ait değil: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Hesap {0}: Ana hesap {1} şirkete ait değil: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Başarıyla bu şirket ile ilgili tüm işlemleri silindi!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Tarihinde gibi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Standart Depo stok Ürünleri için zorunludur.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Standart Depo stok Ürünleri için zorunludur.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Ay {0} ve yıl {1} için maaş ödemesi
 DocType: Stock Settings,Auto insert Price List rate if missing,Otomatik ekleme Fiyat Listesi oranı eksik ise
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Toplam Ödenen Tutar
@@ -3427,6 +3456,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Toplam Fatura Tutarı (Zaman Kayıtlar üzerinden)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Bu ürünü satıyoruz
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Tedarikçi Kimliği
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Miktar 0&#39;dan büyük olmalıdır
 DocType: Journal Entry,Cash Entry,Nakit Girişi
 DocType: Sales Partner,Contact Desc,İrtibat Desc
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Normal, hastalık vb izin tipleri"
@@ -3436,8 +3466,8 @@
 DocType: Buying Settings,Default Supplier Type,Standart Tedarikçii Türü
 DocType: Production Order,Total Operating Cost,Toplam İşletme Maliyeti
 DocType: Production Order,Total Operating Cost,Toplam İşletme Maliyeti
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tüm Kişiler.
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tüm Kişiler.
 DocType: Newsletter,Test Email Id,Test E-posta Kimliği
@@ -3464,7 +3494,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Bütün Müşteri Grupları
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,Vergi Şablon zorunludur.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Hesap {0}: Ana hesap {1} yok
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,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)
 DocType: Account,Temporary,Geçici
@@ -3485,8 +3515,8 @@
 ,Item-wise Price List Rate,Ürün bilgisi Fiyat Listesi Oranı
 DocType: Purchase Order Item,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/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} durduruldu
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} durduruldu
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
 DocType: Lead,Add to calendar on this date,Bu tarihe Takvime ekle
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Nakliye maliyetleri ekleme  Kuralları.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Yaklaşan Etkinlikler
@@ -3512,17 +3542,17 @@
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Üretim için verilen emirler.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Mali Yıl Seçin ...
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Mali Yıl Seçin ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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 +455,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
 DocType: Hub Settings,Name Token,İsim Jetonu
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standart Satış
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standart Satış
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,En az bir depo zorunludur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,En az bir depo zorunludur
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Selling,Standart Satış
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Selling,Standart Satış
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,En az bir depo zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,En az bir depo zorunludur
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: BOM Replace Tool,Replace,Değiştir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} Satış Faturasına karşı {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Lütfen Varsayılan Ölçü birimini girin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} Satış Faturasına karşı {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Lütfen Varsayılan Ölçü birimini girin
 DocType: Purchase Invoice Item,Project Name,Proje Adı
 DocType: Purchase Invoice Item,Project Name,Proje Adı
 DocType: Supplier,Mention if non-standard receivable account,Mansiyon standart dışı alacak hesabı varsa
@@ -3530,11 +3560,11 @@
 DocType: Features Setup,Item Batch Nos,Ürün Parti Numaraları
 DocType: Stock Ledger Entry,Stock Value Difference,Stok Değer Farkı
 DocType: Stock Ledger Entry,Stock Value Difference,Stok Değer Farkı
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,İnsan Kaynakları
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Vergi Varlıkları
 DocType: BOM Item,BOM No,BOM numarası
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Hareketli Ortalama
 DocType: Item,Moving Average,Hareketli Ortalama
 DocType: BOM Replace Tool,The BOM which will be replaced,Değiştirilecek BOM
@@ -3583,7 +3613,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Mali Yıl Bitiş Tarihi
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Mali Yıl Bitiş Tarihi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Dekont, olarak gruplandırıldı ise Makbuz numarasına dayalı filtreleme yapamaz"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
 DocType: Quality Inspection,Incoming,Alınan
 DocType: BOM,Materials Required (Exploded),Gerekli Malzemeler (patlamış)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Ücretsiz İzin (Üİ) için Kazancı azalt
@@ -3591,8 +3621,8 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,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/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Mazeret İzni
 DocType: Batch,Batch ID,Seri Kimliği
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Not: {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Not: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Not: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Not: {0}
 ,Delivery Note Trends,İrsaliye Eğilimleri;
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Bu Haftanın Özeti
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} satır {1} de Alınan veya Taşerona verilen bir Ürün olmalıdır.
@@ -3608,6 +3638,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ort. Alış Oranı
 DocType: Task,Actual Time (in Hours),(Saati) Gerçek Zaman
 DocType: Employee,History In Company,Şirketteki Geçmişi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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} istenen miktardan daha fazla olamaz {2} Öğe için {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Haber Bültenleri
 DocType: Address,Shipping,Nakliye
 DocType: Address,Shipping,Nakliye
@@ -3630,7 +3661,6 @@
 DocType: Purchase Order,End date of current order's period,Cari Siparişin dönemi bitiş tarihi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Teklif Mektubu Yap
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Dönüş
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Variant için Ölçü Varsayılan Birim Şablon aynı olmalıdır
 DocType: Production Order Operation,Production Order Operation,Üretim Sipariş Operasyonu
 DocType: Pricing Rule,Disable,Devre Dışı Bırak
 DocType: Project Task,Pending Review,Bekleyen İnceleme
@@ -3638,7 +3668,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Müşteri Kimliği
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Zaman Zaman itibaren daha büyük olmalıdır için
 DocType: Journal Entry Account,Exchange Rate,Döviz Kuru
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Depo {0}: Ana hesap {1} Şirket {2} ye ait değildir
 DocType: BOM,Last Purchase Rate,Son Satış Fiyatı
 DocType: Account,Asset,Varlık
@@ -3663,7 +3693,7 @@
 ,Available Stock for Packing Items,Ambalajlama Ürünleri için mevcut stok
 DocType: Item Variant,Item Variant,Öğe Varyant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Bu adres şablonunu varsayılan olarak kaydedin, başka varsayılan bulunmamaktadır"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Kalite Yönetimi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kalite Yönetimi
 DocType: Production Planning Tool,Filter based on customer,Müşteriye dayalı filtre
@@ -3684,6 +3714,7 @@
 DocType: Employee,Employment Type,İstihdam Tipi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Duran Varlıklar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Duran Varlıklar
+,Cash Flow,Nakit Akışı
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Uygulama süresi iki alocation kayıtları arasında olamaz
 DocType: Item Group,Default Expense Account,Standart Gider Hesabı
 DocType: Employee,Notice (days),Bildirimi (gün)
@@ -3722,15 +3753,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Baskı ve Kırtasiye
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Baskı ve Kırtasiye
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Grup Düğüm
-DocType: Payment Reconciliation,Minimum Amount,Minimum Tutar
-DocType: Payment Reconciliation,Minimum Amount,Minimum Tutar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Mamülleri Güncelle
 DocType: Workstation,per hour,saat başına
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Depo hesabı (Devamlı Envanter) bu hesap altında oluşturulacaktır.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Bu depo için defter girdisi mevcutken depo silinemez.
 DocType: Company,Distribution,Dağıtım
 DocType: Company,Distribution,Dağıtım
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Ödenen Tutar;
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Ödenen Tutar;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Sevk
@@ -3764,7 +3793,7 @@
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Şirket depolarda eksik {0}
 DocType: POS Profile,Terms and Conditions,Şartlar ve Koşullar
 DocType: POS Profile,Terms and Conditions,Şartlar ve Koşullar
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Tarih Mali Yıl içinde olmalıdır. Tarih = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Tarih Mali Yıl içinde olmalıdır. Tarih = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Burada boy, kilo, alerji, tıbbi endişeler vb  muhafaza edebilirsiniz"
 DocType: Leave Block List,Applies to Company,Şirket için geçerli
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Sunulan Stok Giriş {0} varolduğundan iptal edilemiyor
@@ -3780,12 +3809,12 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Satınalma Makbuzlar giriniz
 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 +425,Transaction not allowed against stopped Production Order {0},Durdurulmuş Üretim Emrine {0} karşı işleme izin verilmez
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Destek e-mail kimliği için gelen sunucu kurulumu (örneğin:support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Yetersizlik adeti
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,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 +577,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
 DocType: Salary Slip,Salary Slip,Bordro
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tarihine Kadar' gereklidir
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Paketleri teslim edilmek üzere fişleri ambalaj oluşturun. Paket numarası, paket içeriğini ve ağırlığını bildirmek için kullanılır."
@@ -3889,7 +3918,7 @@
 DocType: HR Settings,Payroll Settings,Bordro Ayarları
 DocType: HR Settings,Payroll Settings,Bordro Ayarları
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Bağlantısız Faturaları ve Ödemeleri eşleştirin.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Sipariş
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Sipariş
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Kökün ana maliyet merkezi olamaz
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Marka Seçiniz ...
 DocType: Sales Invoice,C-Form Applicable,Uygulanabilir C-Formu
@@ -3906,7 +3935,7 @@
 DocType: Appraisal,Start Date,Başlangıç Tarihi
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Bir dönemlik tahsis izni.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Doğrulamak için buraya tıklayın
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Hesap {0}: Kendisini bir ana hesap olarak atayamazsınız
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Hesap {0}: Kendisini bir ana hesap olarak atayamazsınız
 DocType: Purchase Invoice Item,Price List Rate,Fiyat Listesi Oranı
 DocType: Purchase Invoice Item,Price List Rate,Fiyat Listesi Oranı
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Depodaki mevcut stok durumuna göre ""Stokta"" veya ""Stokta değil"" olarak göster"
@@ -3917,17 +3946,17 @@
 DocType: Project,Expected Start Date,Beklenen BaşlangıçTarihi
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Ücretleri bu öğeye geçerli değilse öğeyi çıkar
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Örn. msgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Alma
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Alma
 DocType: Maintenance Visit,Fully Completed,Tamamen Tamamlanmış
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Tamamlandı
 DocType: Employee,Educational Qualification,Eğitim Yeterliliği
 DocType: Workstation,Operating Costs,İşletim Maliyetleri
 DocType: Employee Leave Approver,Employee Leave Approver,Çalışan izin Onayı
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} başarıyla Haber listesine eklendi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,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/stock/doctype/item/item.py +433,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 +67,"Cannot declare as lost, because Quotation has been made.","Kayıp olarak Kotasyon yapılmış çünkü, ilan edemez."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Satınalma Usta Müdürü
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Üretim Siparişi {0} verilmelidir
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Üretim Siparişi {0} verilmelidir
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Ürün {0} için Başlangıç ve Bitiş tarihi seçiniz
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Ana Raporlar
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Ana Raporlar
@@ -3951,8 +3980,8 @@
 DocType: Industry Type,Industry Type,Sanayi Tipi
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Bir şeyler yanlış gitti!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Uyarı: İzin uygulamasında aşağıdaki engel tarihleri bulunmaktadır
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Bitiş Tarihi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Bitiş Tarihi
 DocType: Purchase Invoice Item,Amount (Company Currency),Tutar (Şirket Para Birimi)
@@ -3975,10 +4004,10 @@
 ,Serial No Service Contract Expiry,Seri No Hizmet Sözleşmesi Vadesi
 DocType: Item,Unit of Measure Conversion,Ölçü Dönüşüm Birimi
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Çalışan değiştirilemez
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Aynı hesabı aynı anda kredilendirip borçlandıramazsınız
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Aynı hesabı aynı anda kredilendirip borçlandıramazsınız
 DocType: Naming Series,Help HTML,Yardım HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,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/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},{1} den fazla Ürün için {0} üzerinde ödenek
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},{1} den fazla Ürün için {0} üzerinde ödenek
 DocType: Address,Name of person or organization that this address belongs to.,Bu adresin ait olduğu kişi veya kurumun adı.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Tedarikçileriniz
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Tedarikçileriniz
@@ -3994,25 +4023,25 @@
 DocType: Employee,Date of Issue,Veriliş tarihi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Tarafından {0} {1} için
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Satır # {0}: öğe için Set Tedarikçi {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,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 +114,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Bilgisayar
 DocType: Item,List this Item in multiple groups on the website.,Bu Ürünü web sitesinde gruplar halinde listeleyin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Diğer para ile hesap izin Çoklu Para Birimi seçeneğini kontrol edin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Diğer para ile hesap izin Çoklu Para Birimi seçeneğini kontrol edin
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Ürün: {0} sistemde mevcut değil
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Donmuş değer ayarlama yetkiniz yok
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Donmuş değer ayarlama yetkiniz yok
 DocType: Payment Reconciliation,Get Unreconciled Entries,Mutabık olmayan girdileri alın
+DocType: Payment Reconciliation,From Invoice Date,Fatura Tarihinden İtibaren
 DocType: Cost Center,Budgets,Bütçeler
-DocType: Employee,Emergency Contact Details,Acil Durum İrtibat Kişisi Bilgileri
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Ne yapar?
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Ne yapar?
 DocType: Delivery Note,To Warehouse,Depoya
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Hesap {0} bir mali yıl içerisinde birden fazla girildi {1}
 ,Average Commission Rate,Ortalama Komisyon Oranı
 ,Average Commission Rate,Ortalama Komisyon Oranı
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'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 +356,'Has Serial No' can not be 'Yes' for non-stock item,Stokta olmayan ürünün 'Seri Nosu Var' 'Evet' olamaz
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,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
 DocType: Purchase Taxes and Charges,Account Head,Hesap Başlığı
@@ -4021,7 +4050,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
 DocType: Stock Entry,Total Value Difference (Out - In),Toplam Değer Farkı (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Satır {0}: Döviz Kuru zorunludur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Satır {0}: Döviz Kuru zorunludur
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Çalışan {0} için kullanıcı kimliği ayarlanmamış
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Garanti İstem itibaren
 DocType: Stock Entry,Default Source Warehouse,Varsayılan Kaynak Deposu
@@ -4030,7 +4059,7 @@
 DocType: Item,Customer Code,Müşteri Kodu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Için Doğum Günü Hatırlatıcı {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.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 +300,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 +304,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Hazır Varlıklar
@@ -4047,7 +4076,7 @@
 DocType: Authorization Rule,Based On,Göre
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Öğe {0} devre dışı
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Öğe {0} devre dışı
 DocType: Stock Settings,Stock Frozen Upto,Stok Dondurulmuş
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Kimden ve Dönemi yinelenen için zorunlu tarihler için Dönem {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Proje faaliyeti / görev.
@@ -4055,7 +4084,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Tutar Off yazın (Şirket Para)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
 DocType: Landed Cost Voucher,Landed Cost Voucher,Indi Maliyet Çeki
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Lütfen {0} ayarlayınız
 DocType: Purchase Invoice,Repeat on Day of Month,Ayın gününde tekrarlayın
@@ -4091,12 +4120,12 @@
 DocType: Upload Attendance,Upload Attendance,Devamlılığı Güncelle
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ve İmalat Miktarı gereklidir
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Yaşlanma Aralığı 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Tutar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Tutar
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM yerine
 ,Sales Analytics,Satış Analizleri
 DocType: Manufacturing Settings,Manufacturing Settings,Üretim Ayarları
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,E-posta kurma
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Lütfen Şirket Alanına varsayılan para birimini girin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Günlük Hatırlatmalar
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Vergi Kural Çatışmalar {0}
@@ -4128,7 +4157,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Mühendis
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Mühendis
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Arama Alt Kurullar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},{0} Numaralı satırda Ürün Kodu gereklidir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},{0} Numaralı satırda Ürün Kodu gereklidir
 DocType: Sales Partner,Partner Type,Ortak Türü
 DocType: Sales Partner,Partner Type,Ortak Türü
 DocType: Purchase Taxes and Charges,Actual,Gerçek
@@ -4137,8 +4166,8 @@
 DocType: Purchase Invoice,Against Expense Account,Gider Hesabı Karşılığı
 DocType: Production Order,Production Order,Üretim Siparişi
 DocType: Production Order,Production Order,Üretim Siparişi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
 DocType: Quotation Item,Against Docname,Belge adı karşılığı
 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
@@ -4154,8 +4183,8 @@
 DocType: Employee,Cheque,Çek
 DocType: Employee,Cheque,Çek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serisi Güncellendi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapor Tipi zorunludur
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapor Tipi zorunludur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Rapor Tipi zorunludur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Rapor Tipi zorunludur
 DocType: Item,Serial Number Series,Seri Numarası Serisi
 DocType: Item,Serial Number Series,Seri Numarası Serisi
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Satır {1} de stok Ürünü {0} için depo zorunludur
@@ -4165,8 +4194,8 @@
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Çoklu gruplarda Ürün Cross İlanı
 apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,İlk Kullanıcı: Sen
 apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,İlk Kullanıcı: Sen
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Başarıyla Uzlaştırıldı
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Başarıyla Uzlaştırıldı
 DocType: Production Order,Planned End Date,Planlanan Bitiş Tarihi
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ürünlerin saklandığı yer
 DocType: Tax Rule,Validity,Geçerlilik
@@ -4175,7 +4204,7 @@
 DocType: Attendance,Attendance,Katılım
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Gönderme tarihi ve gönderme zamanı zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Gönderme tarihi ve gönderme zamanı zorunludur
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Alım işlemleri için vergi şablonu.
 ,Item Prices,Ürün Fiyatları
 ,Item Prices,Ürün Fiyatları
@@ -4185,17 +4214,17 @@
 DocType: Task,Review Date,İnceleme tarihi
 DocType: Purchase Invoice,Advance Payments,Peşin Ödeme
 DocType: Purchase Taxes and Charges,On Net Total,Net toplam
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Satır {0} daki hedef depo Üretim Emrindekiyle aynı olmalıdır
+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
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Hiçbir izin Ödeme Aracı kullanmak için
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,Yinelenen %s için 'Bildirim E-posta Adresleri' belirtilmemmiş.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Hesap Off Yuvarlak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Yönetim Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Yönetim Giderleri
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Danışmanlık
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Danışmanlık
 DocType: Customer Group,Parent Customer Group,Ana Müşteri Grubu
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Değişiklik
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Değişiklik
 DocType: Purchase Invoice,Contact Email,İletişim E-Posta
 DocType: Appraisal Goal,Score Earned,Kazanılan Puan
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","Örneğin ""Benim Şirketim LLC """
@@ -4206,13 +4235,13 @@
 DocType: Email Digest,Receivables / Payables,Alacaklar / Borçlar
 DocType: Email Digest,Receivables / Payables,Alacaklar / Borçlar
 DocType: Delivery Note Item,Against Sales Invoice,Satış Faturası Karşılığı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Kredi hesabı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Kredi hesabı
 DocType: Landed Cost Item,Landed Cost Item,İnen Maliyet Kalemi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Sıfır değerleri göster
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Üretimden sonra elde edilen Ürün miktarı/ ham maddelerin belli miktarlarında yeniden ambalajlama
 DocType: Payment Reconciliation,Receivable / Payable Account,Alacak / Borç Hesap
 DocType: Delivery Note Item,Against Sales Order Item,Satış Sipariş Ürün Karşı
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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
 DocType: Task,Actual End Date (via Time Logs),Gerçek Bitiş Tarihi (Saat Kayıtlar üzerinden)
@@ -4255,33 +4284,34 @@
 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/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} zaten Gönderildi
 ,Items To Be Requested,İstenecek Ürünler
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Son Alım Br.Fİyatını alın
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Etkinlik Türü dayalı Fatura Oranı (saatte)
 DocType: Company,Company Info,Şirket Bilgisi
 DocType: Company,Company Info,Şirket Bilgisi
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Şirket e-posta kimliği bulunamadı, mail gönderilemedi"
 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
 DocType: Production Planning Tool,Filter based on item,Ürüne dayalı filtre
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Borç Hesabı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Borç Hesabı
 DocType: Fiscal Year,Year Start Date,Yıl Başlangıç Tarihi
 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)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Hesap Türü seçili olduğundan Grup gizli olamaz.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,Hesap Türü seçili olduğundan Grup gizli olamaz.
 DocType: Purchase Common,Purchase Common,Ortak Satın Alma
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fırsattan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Çalışanlara Sağlanan Faydalar
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} mevcut değil
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Müşterilere artırılan faturalar
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proje Kimliği
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} aboneler eklendi
 DocType: Maintenance Schedule,Schedule,Program
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Bu Maliyet Merkezi için Bütçe tanımlayın. Bütçe eylemi ayarlamak için, bkz: &quot;Şirket Listesi&quot;"
@@ -4290,7 +4320,7 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Föy Türü
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil
 DocType: Expense Claim,Approved,Onaylandı
 DocType: Pricing Rule,Price,Fiyat
 DocType: Pricing Rule,Price,Fiyat
@@ -4307,7 +4337,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Muhasebe günlük girişleri.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Depo itibaren Boş Adet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Vergi Hesabı oluşturmak için
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Vergi Hesabı oluşturmak için
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Gider Hesabı girin
@@ -4322,7 +4352,7 @@
 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
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Yukarıdaki kriterlere dayalı olarak (teslimat bekleyen) satış emirlerini çek
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Tedarikçi fiyat teklifinden
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Tedarikçi fiyat teklifinden
 DocType: Deduction Type,Deduction Type,Kesinti Türü
 DocType: Deduction Type,Deduction Type,Kesinti Türü
 DocType: Attendance,Half Day,Yarım Gün
@@ -4334,7 +4364,7 @@
 DocType: Production Plan Item,Planned Qty,Planlanan Miktar
 DocType: Production Plan Item,Planned Qty,Planlanan Miktar
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Toplam Vergi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Miktar (Adet Üretilen) zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Miktar (Adet Üretilen) zorunludur
 DocType: Stock Entry,Default Target Warehouse,Standart Hedef Depo
 DocType: Purchase Invoice,Net Total (Company Currency),Net Toplam (ޞirket para birimi)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabına karşı geçerlidir
@@ -4394,10 +4424,10 @@
 DocType: Customer,Commission Rate,Komisyon Oranı
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Variant olun
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Departman tarafından blok aralığı uygulamaları.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Sepet Boş
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Sepet Boş
 DocType: Production Order,Actual Operating Cost,Gerçek İşletme Maliyeti
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Kök düzenlenemez.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Kök düzenlenemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Kök düzenlenemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Kök düzenlenemez.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Tahsis edilen miktar ayarlanmamış miktardan fazla olamaz
 DocType: Manufacturing Settings,Allow Production on Holidays,Holidays Üretim izin ver
 DocType: Sales Order,Customer's Purchase Order Date,Müşterinin Sipariş Tarihi
@@ -4410,11 +4440,11 @@
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Şartlar ve Koşullar Şablon
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Şartlar ve Koşullar Şablon
 DocType: Serial No,Delivery Details,Teslim Bilgileri
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Satır {0} da Vergiler Tablosunda tip {1} için Maliyet Merkezi gereklidir
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Satır {0} da Vergiler Tablosunda tip {1} için Maliyet Merkezi gereklidir
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Miktar, bu seviyenin altına düşerse otomatik olarak Malzeme İsteği oluşturmak"
 ,Item-wise Purchase Register,Ürün bilgisi Alım Kaydı
 DocType: Batch,Expiry Date,Son kullanma tarihi
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Yeniden sipariş düzeyini ayarlamak için, öğenin bir Satınalma Ürün ve Üretim Öğe olmalı"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Yeniden sipariş düzeyini ayarlamak için, öğenin bir Satınalma Ürün ve Üretim Öğe olmalı"
 ,Supplier Addresses and Contacts,Tedarikçi Adresler ve İletişim
 ,Supplier Addresses and Contacts,Tedarikçi Adresler ve İletişim
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,İlk Kategori seçiniz
@@ -4424,7 +4454,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Yarım Gün)
 DocType: Supplier,Credit Days,Kredi Günleri
 DocType: Leave Type,Is Carry Forward,İleri taşınmış
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM dan Ürünleri alın
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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,Talep Yaratma Gün Saati
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Malzeme Listesi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabı için gerekli olan {1}
@@ -4433,8 +4463,8 @@
 DocType: Employee,Reason for Leaving,Ayrılma Nedeni
 DocType: Expense Claim Detail,Sanctioned Amount,tasdik edilmiş tutar
 DocType: GL Entry,Is Opening,Açılır
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Satır {0}: Banka giriş ile bağlantılı edilemez bir {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Hesap {0} yok
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Satır {0}: Banka giriş ile bağlantılı edilemez bir {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Hesap {0} yok
 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 f82c8f9..d14869d 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Споживацькі товари
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Будь ласка, виберіть партії першого типу"
 DocType: Item,Customer Items,Предмети з клієнтами
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Рахунок {0}: Батьки рахунку {1} не може бути книга
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Рахунок {0}: Батьки рахунку {1} не може бути книга
 DocType: Item,Publish Item to hub.erpnext.com,Опублікувати пункт в hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Повідомлення по електронній пошті
 DocType: Item,Default Unit of Measure,За замовчуванням Одиниця виміру
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,Контакти з клієнтами
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,З матеріалів Запит
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,З матеріалів Запит
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дерево
 DocType: Job Applicant,Job Applicant,Робота Заявник
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Немає більше результатів.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Для підтримки клієнтської мудрий код пункт і зробити їх пошуку на основі їх використання коду цю опцію
 DocType: Mode of Payment Account,Mode of Payment Account,Режим розрахунковий рахунок
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Показати варіанти
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Кількість
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Кількість
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредити (зобов&#39;язання)
 DocType: Employee Education,Year of Passing,Рік Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В наявності
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Охорона здоров&#39;я
 DocType: Purchase Invoice,Monthly,Щомісяця
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Затримка в оплаті (дні)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Рахунок-фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Рахунок-фактура
 DocType: Maintenance Schedule Item,Periodicity,Періодичність
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Адреса електронної пошти
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,Фінансовий рік {0} вимагається
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Захист
 DocType: Company,Abbr,Абревіатура
 DocType: Appraisal Goal,Score (0-5),Рахунок (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не відповідає {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не відповідає {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Ряд # {0}:
 DocType: Delivery Note,Vehicle No,Автомобіль Немає
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Будь ласка, виберіть Прайс-лист"
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,"Будь ласка, виберіть Прайс-лист"
 DocType: Production Order Operation,Work In Progress,В роботі
 DocType: Employee,Holiday List,Список свят
 DocType: Time Log,Time Log,Час входу
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Те ж компанія увійшла більш ніж один раз
 DocType: Employee,Married,Одружений
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не допускається для {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Фото не можуть бути оновлені проти накладної {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Фото не можуть бути оновлені проти накладної {0}
 DocType: Payment Reconciliation,Reconcile,Узгодити
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Продуктовий
 DocType: Quality Inspection Reading,Reading 1,Читання 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Зробити запис банку
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсійні фонди
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Склад є обов&#39;язковим, якщо тип рахунку Склад"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,"Склад є обов&#39;язковим, якщо тип рахунку Склад"
 DocType: SMS Center,All Sales Person,Всі Продажі Особа
 DocType: Lead,Person Name,Ім&#39;я особи
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Перевірте, якщо повторювані порядок, зніміть, щоб зупинити повторюваних або поставити правильне Дата закінчення"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Зацікавлений
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Рахунок за матеріали
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Відкриття
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},З {0} до {1}
+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,Відкриття запис
 DocType: Stock Entry,Additional Costs,Додаткові витрати
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Рахунок з існуючою транзакції не можуть бути перетворені в групі.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Рахунок з існуючою транзакції не можуть бути перетворені в групі.
 DocType: Lead,Product Enquiry,Запит про продукт
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Будь ласка, введіть компанія вперше"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,Цільова На
+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 +9,Activity Log:,Журнал активності:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,"Пункт {0} не існує в системі, або закінчився"
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Пункт {0} повинен бути Купівля товару
 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 +444,Item {0} is not active or end of life has been reached,Пункт {0} не є активним або кінець життя був досягнутий
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,Пункт {0} не є активним або кінець життя був досягнутий
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Буде оновлюватися після Рахунок продажів представлений.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,Налаштування модуля HR для
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Детальна інформація про виконані операції.
 DocType: Serial No,Maintenance Status,Технічне обслуговування Статус
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Товари та ціни
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},З дати повинні бути протягом фінансового року. Припускаючи З дати = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},З дати повинні бути протягом фінансового року. Припускаючи З дати = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Виберіть Employee, для якого ви створюєте оцінка."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},МВЗ {0} не належать компанії {1}
 DocType: Customer,Individual,Індивідуальний
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,Чисті грошові кошти від фінансової
 DocType: Lead,Address & Contact,Адреса &amp; Контактна
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додати невикористовувані листя від попередніх асигнувань
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Наступна Періодичні {0} буде створений на {1}
@@ -221,6 +222,7 @@
 ,Contact Name,Контактна особа
 DocType: Production Plan Item,SO Pending Qty,ТАК В очікуванні Кількість
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Створює зарплати ковзання для згаданих вище критеріїв.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Не введене опис
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Запит на покупку.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Тільки вибраний Залишити затверджує може представити цей Залишити заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,"Звільнення Дата повинна бути більше, ніж дата вступу"
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Специфікація
 DocType: Payment Tool,Reference No,Посилання Немає
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Залишити Заблоковані
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Річний
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Фото Примирення товару
 DocType: Stock Entry,Sales Invoice No,Видаткова накладна Немає
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,Постачальник Тип
 DocType: Item,Publish in Hub,Опублікувати в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Пункт {0} скасовується
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Пункт {0} скасовується
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Матеріал Запит
 DocType: Bank Reconciliation,Update Clearance Date,Оновлення оформлення Дата
 DocType: Item,Purchase Details,Купівля Деталі
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} знайдений в &quot;давальницька сировина&quot; таблиці в Замовленні {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} знайдений в &quot;давальницька сировина&quot; таблиці в Замовленні {1}
 DocType: Employee,Relation,Ставлення
 DocType: Shipping Rule,Worldwide Shipping,Доставка по всьому світу
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Підтверджені замовлення від клієнтів.
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,Пропозиції
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Set Group мудрий бюджети товару на цій території. Ви також можете включити сезонність, встановивши розподіл."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Будь ласка, введіть батьківську групу рахунки для складу {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата з {0} {1} не може бути більше, ніж суми заборгованості {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,Створити розклад
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Останній
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Макс 5 знаків
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Залишити затверджує в списку буде встановлено стандартним Залишити який стверджує
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Навчитися
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Діяльність Вартість одного працівника
 DocType: Accounts Settings,Settings for Accounts,Налаштування для рахунків
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Управління менеджера з продажу дерево.
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,Мульти валют
 DocType: Payment Reconciliation Invoice,Invoice Type,Рахунок Тип
 DocType: Sales Invoice Item,Delivery Note,Накладна
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Налаштування Податки
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Налаштування Податки
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запис була змінена після витягнув його. Ласка, витягнути його знову."
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} введений двічі на п податку
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} введений двічі на п податку
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Резюме на цьому тижні і в очікуванні діяльності
 DocType: Workstation,Rent Cost,Вартість оренди
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Ласка, виберіть місяць та рік"
@@ -307,10 +310,10 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Доступний в специфікації, накладної, рахунку-фактурі, замовлення продукції, покупки замовлення, покупка отриманні, накладна, замовлення клієнта, Фото в&#39;їзду, розкладі"
 DocType: Item Tax,Tax Rate,Ставка податку
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,Вибрати пункт
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Вибрати пункт
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Стан: {0} вдалося порційно, не можуть бути узгоджені з допомогою \ зі примирення, а не використовувати зі запис"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Купівля Рахунок {0} вже представили
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Купівля Рахунок {0} вже представили
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетне Немає повинно бути таким же, як {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Перетворити в негрупповой
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Купівля Надходження повинні бути представлені
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медична
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина втрати
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,Одиночний
 DocType: Issue,Attachment,Прихильність
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Бюджет не може бути встановлений для групи МВЗ
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,Майстер відпочинку.
 DocType: Material Request Item,Required Date,Потрібно Дата
 DocType: Delivery Note,Billing Address,Платіжний адреса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Будь ласка, введіть код предмета."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Будь ласка, введіть код предмета."
 DocType: BOM,Costing,Калькуляція
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Якщо встановлено, то сума податку буде вважатися вже включені у пресі / швидкість друку Сума"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Всього Кількість
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
 DocType: Shipping Rule,Net Weight,Вага нетто
 DocType: Employee,Emergency Phone,Аварійний телефон
 ,Serial No Warranty Expiry,Серійний Немає Гарантія Термін
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Приріст не може бути 0
 DocType: Production Planning Tool,Material Requirement,Вимога Матеріал
 DocType: Company,Delete Company Transactions,Видалити скоєнні Товариством угод
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Пункт {0} Купівля товару
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Пункт {0} Купівля товару
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} є неприпустимим адресу електронної пошти в &quot;Повідомлення \ адресу електронної пошти&quot;
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Всього рахунків у цьому році:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додати / редагувати податки і збори
 DocType: Purchase Invoice,Supplier Invoice No,Постачальник Рахунок Немає
 DocType: Territory,For reference,Для довідки
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не вдається видалити Серійний номер {0}, так як він використовується в угодах з акціями"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Закриття (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Закриття (Cr)
 DocType: Serial No,Warranty Period (Days),Гарантійний термін (днів)
 DocType: Installation Note Item,Installation Note Item,Установка Примітка Пункт
 ,Pending Qty,В очікуванні Кількість
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Щомісячна поширення ** допомагає розподілити свій бюджет по місяців, якщо у вас є сезонність у вашому бізнесі. Щоб розподілити бюджет за допомогою цього розподілу, встановіть цей ** ** щомісячний розподіл в ** ** МВЗ"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Записи не знайдені в таблиці рахунків
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Записи не знайдені в таблиці рахунків
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Будь ласка, виберіть компаній і партії першого типу"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Фінансова / звітний рік.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","На жаль, послідовний пп не можуть бути об&#39;єднані"
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,Проект Завдання
 ,Lead Id,Ведучий Id
 DocType: C-Form Invoice Detail,Grand Total,Загальний підсумок
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,"Фінансовий рік Дата початку не повинна бути більше, ніж фінансовий рік Дата закінчення"
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,"Фінансовий рік Дата початку не повинна бути більше, ніж фінансовий рік Дата закінчення"
 DocType: Warranty Claim,Resolution,Дозвіл
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Поставляється: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Поставляється: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Оплачується аккаунт
 DocType: Sales Order,Billing and Delivery Status,Біллінг і доставка Статус
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постійних клієнтів
@@ -486,7 +489,7 @@
 DocType: Quotation,Quotation To,Цитата Для
 DocType: Lead,Middle Income,Середній дохід
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Відкриття (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Позначена сума не може бути негативним
 DocType: Purchase Order Item,Billed Amt,Оголошений Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логічний склад, на якому акції записів зроблені."
@@ -513,16 +516,17 @@
 DocType: Activity Type,Default Costing Rate,За замовчуванням Калькуляція Оцінити
 DocType: Maintenance Schedule,Maintenance Schedule,Графік регламентних робіт
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тоді ціноутворення Правила фільтруються на основі Замовника, Група покупців, краю, постачальник, Тип постачальник, кампанії, і т.д. Sales Partner"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Чиста зміна в інвентаризації
 DocType: Employee,Passport Number,Номер паспорта
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Менеджер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Від покупки отриманні
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Такий же деталь був введений кілька разів.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Від покупки отриманні
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Такий же деталь був введений кілька разів.
 DocType: SMS Settings,Receiver Parameter,Приймач Параметр
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Ґрунтуючись на &#39;і&#39; Group By&quot; не може бути таким же
 DocType: Sales Person,Sales Person Targets,Продавець Цілі
 DocType: Production Order Operation,In minutes,У хвилини
 DocType: Issue,Resolution Date,Дозвіл Дата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
 DocType: Selling Settings,Customer Naming By,Неймінг клієнтів по
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Перетворити в групі
 DocType: Activity Cost,Activity Type,Тип діяльності
@@ -533,7 +537,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}: {1} не найден в рахунку-фактурі таблиці
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Обслуговування Відвідати {0} має бути скасований до скасування цього замовлення клієнта
 DocType: Material Request,Material Transfer,Матеріал Передача
@@ -555,13 +559,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Щоб відстежувати пункт продажів і покупки документів на основі їх заводським номером. Це також може використовуватися для відстеження гарантійні деталі продукту.
 DocType: Purchase Receipt Item Supplied,Current Stock,Наявність на складі
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Відхилено Склад є обов&#39;язковим проти відкинуті пункту
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Всього рахунків у цьому році
 DocType: Account,Expenses Included In Valuation,"Витрат, що включаються в оцінці"
 DocType: Employee,Provide email id registered in company,Забезпечити електронний ідентифікатор зареєстрованого в компанії
 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 +533,Item has variants.,Пункт має варіанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дерево Тип
@@ -579,18 +583,18 @@
 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 +92,{0} is not a stock Item,{0} не є акціонерним товару
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} не є акціонерним товару
 DocType: Mode of Payment Account,Default Account,За замовчуванням обліковий запис
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Ведучий повинен бути встановлений, якщо Можливість зроблений зі свинцю"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Будь ласка, виберіть вихідний день на тиждень"
 DocType: Production Order Operation,Planned End Time,Плановані Час закінчення
 ,Sales Person Target Variance Item Group-Wise,Людина обсяг продажів Різниця Пункт Група Мудрий
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Рахунок з існуючою транзакції не можуть бути перетворені в бухгалтерській книзі
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Рахунок з існуючою транзакції не можуть бути перетворені в бухгалтерській книзі
 DocType: Delivery Note,Customer's Purchase Order No,Клієнтам Замовлення Немає
 DocType: Employee,Cell Number,Кількість стільникових
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,"Запити Авто матеріал, отриманий"
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Втрачений
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ви не можете ввести поточний ваучер в «Проти Запис у журналі &#39;колонці
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Ви не можете ввести поточний ваучер в «Проти Запис у журналі &#39;колонці
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергія
 DocType: Opportunity,Opportunity From,Можливість Від
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Щомісячна виписка зарплата.
@@ -599,9 +603,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: З {0} типу {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Бухгалтерські записи можна з листовими вузлами. Записи проти груп не допускається.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати специфікації, як вона пов&#39;язана з іншими специфікаціями"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати специфікації, як вона пов&#39;язана з іншими специфікаціями"
 DocType: Opportunity,Maintenance,Технічне обслуговування
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Купівля Надходження номер потрібно для пункту {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Купівля Надходження номер потрібно для пункту {0}
 DocType: Item Attribute Value,Item Attribute Value,Стан Значення атрибуту
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Кампанії з продажу.
 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.
@@ -640,7 +644,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ціни не обраний
 DocType: Employee,Family Background,Сімейні обставини
 DocType: Process Payroll,Send Email,Відправити лист
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Увага: Невірний Додаток {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Увага: Невірний Додаток {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Немає доступу
 DocType: Company,Default Bank Account,За замовчуванням Банківський рахунок
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Щоб відфільтрувати на основі партії, виберіть партія першого типу"
@@ -648,7 +652,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Пп
 DocType: Item,Items with higher weightage will be shown higher,"Елементи з більш високою weightage буде показано вище,"
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банк примирення Подробиці
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Мої Рахунки
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Мої Рахунки
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Жоден працівник не знайдено
 DocType: Purchase Order,Stopped,Зупинився
 DocType: Item,If subcontracted to a vendor,Якщо по субпідряду постачальника
@@ -658,6 +662,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Відправити зараз
 ,Support Analytics,Підтримка аналітика
 DocType: Item,Website Warehouse,Сайт Склад
+DocType: Payment Reconciliation,Minimum Invoice Amount,Мінімальна Сума рахунку
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","День місяця, в який автоматично рахунок-фактура буде створений, наприклад, 05, 28 і т.д."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Оцінка повинна бути менше або дорівнює 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,С-Form записи
@@ -667,7 +672,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Щоб включити &quot;Точки продажу&quot; Особливості
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Оберіть товари
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} проти Білла {1} від {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} проти Білла {1} від {2}
 DocType: Maintenance Visit,Completion Status,Статус завершення
 DocType: Sales Invoice Item,Target Warehouse,Цільова Склад
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволити доставку по квитанції або Шифрування до цього відсотка
@@ -679,7 +684,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматично написати повідомлення за поданням угод.
 DocType: Production Order,Item To Manufacture,Елемент Виробництво
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Замовлення на Оплата
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Замовлення на Оплата
 DocType: Sales Order Item,Projected Qty,Прогнозований Кількість
 DocType: Sales Invoice,Payment Due Date,Дата платежу
 DocType: Newsletter,Newsletter Manager,Розсилка менеджер
@@ -703,7 +708,7 @@
 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 +304,Point-of-Sale,Касовий термінал
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс рахунку вже в кредит, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;дебет&quot;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс рахунку вже в кредит, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;дебет&quot;"
 DocType: Account,Balance must be,Баланс повинен бути
 DocType: Hub Settings,Publish Pricing,Опублікувати Ціни
 DocType: Notification Control,Expense Claim Rejected Message,Витрати Заявити Відхилено повідомлення
@@ -726,7 +731,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Валютний курс майстер.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,Специфікація {0} повинен бути активним
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,Специфікація {0} повинен бути активним
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Будь ласка, виберіть тип документа в першу чергу"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Скасування матеріалів переглядів {0} до скасування цього обслуговування візит
 DocType: Salary Slip,Leave Encashment Amount,Залишити інкасації Кількість
@@ -744,17 +749,17 @@
 DocType: Supplier,Default Payable Accounts,За замовчуванням заборгованість Кредиторська
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Співробітник {0} не є активним або не існує
 DocType: Features Setup,Item Barcode,Пункт Штрих
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Пункт Варіанти {0} оновлюються
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Пункт Варіанти {0} оновлюються
 DocType: Quality Inspection Reading,Reading 6,Читання 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Рахунок покупки Advance
 DocType: Address,Shop,Магазин
 DocType: Hub Settings,Sync Now,Синхронізувати зараз
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитна запис не може бути пов&#39;язаний з {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитна запис не може бути пов&#39;язаний з {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Обліковий запис за замовчуванням банк / Ксерокопіювання буде автоматично оновлюватися в POS фактурі коли обрано цей режим.
 DocType: Employee,Permanent Address Is,Постійна адреса Є
 DocType: Production Order Operation,Operation completed for how many finished goods?,"Операція виконана для багатьох, як готової продукції?"
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Бренд
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Посібник для пере- {0} схрещеними Пункт {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Посібник для пере- {0} схрещеними Пункт {1}.
 DocType: Employee,Exit Interview Details,Вихід Інтерв&#39;ю Подробиці
 DocType: Item,Is Purchase Item,Хіба Купівля товару
 DocType: Journal Entry Account,Purchase Invoice,Купівля Рахунок
@@ -766,7 +771,7 @@
 DocType: Salary Slip,Total in words,Всього в словах
 DocType: Material Request Item,Lead Time Date,Час Дата
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,"є обов&#39;язковим. Може бути, Обмін валюти запис не створена для"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Будь ласка, сформулюйте Серійний номер, вказаний в п {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Будь ласка, сформулюйте Серійний номер, вказаний в п {1}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Для елементів &quot;продукту&quot; Bundle, склад, серійний номер і серія № буде розглядатися з &quot;пакувальний лист &#39;таблиці. Якщо Склад і пакетна Немає є однаковими для всіх пакувальних компонентів для будь &quot;продукту&quot; Bundle пункту, ці значення можуть бути введені в основній таблиці Item значення будуть скопійовані в &quot;список упаковки&quot; таблицю."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Поставки клієнтам.
 DocType: Purchase Invoice Item,Purchase Order Item,Замовлення на пункт
@@ -775,14 +780,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Дисперсія
 ,Company Name,Назва компанії
 DocType: SMS Center,Total Message(s),Всього повідомлень (їй)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Вибрати пункт трансферу
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,"Вибір рахунка керівник банку, в якому перевірка була зберігання."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Дозволити користувачеві редагувати прайс-лист в угодах Оцінити
 DocType: Pricing Rule,Max Qty,Макс Кількість
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,Хімічна
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Всі деталі вже були передані для цього виробничого замовлення.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Всі деталі вже були передані для цього виробничого замовлення.
 DocType: Process Payroll,Select Payroll Year and Month,Виберіть Payroll рік і місяць
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Перейти до відповідної групи (зазвичай використання коштів&gt; Поточні активи&gt; Банківські рахунки і створити новий акаунт (натиснувши на Додати Дитину) типу &quot;банк&quot;
 DocType: Workstation,Electricity Cost,Вартість електроенергії
@@ -796,10 +802,10 @@
 DocType: SMS Center,All Lead (Open),Всі Свинець (відкрито)
 DocType: Purchase Invoice,Get Advances Paid,"Отримати Аванси, видані"
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Прикріпіть свою фотографію
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Зробити
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Зробити
 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 +3,My Cart,Мій кошик
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Мій кошик
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,Відкриття Кількість
@@ -818,10 +824,10 @@
 DocType: POS Profile,Cash/Bank Account,Готівковий / Банківський рахунок
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Вилучені пункти без зміни в кількості або вартості.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
 DocType: Production Planning Tool,Get Sales Orders,Отримати замовлень клієнта
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може бути негативним
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Знижка
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Знижка
 DocType: Features Setup,Purchase Discounts,Купівля Знижки
 DocType: Workstation,Wages,Заробітна плата
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Буде оновлюватися тільки якщо час входу є &quot;Платіжні&quot;
@@ -846,7 +852,7 @@
 DocType: Tax Rule,Shipping State,Державний Доставка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Товар повинен бути додані за допомогою &quot;Отримати товари від покупки розписок&quot; кнопки
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Продажі Витрати
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Стандартний Купівля
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Стандартний Купівля
 DocType: GL Entry,Against,Проти
 DocType: Item,Default Selling Cost Center,За замовчуванням Продаж МВЗ
 DocType: Sales Partner,Implementation Partner,Реалізація Партнер
@@ -888,6 +894,7 @@
 DocType: Sales Partner,Distributor,Дистриб&#39;ютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Кошик Правило Доставка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Виробничий замовлення {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',"Будь ласка, встановіть &quot;Застосувати Додаткова Знижка On &#39;"
 ,Ordered Items To Be Billed,Замовлені товари To Be Оголошений
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"С Діапазон повинен бути менше, ніж діапазон"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Виберіть час і журнали Розмістити створити нову рахунок-фактуру.
@@ -897,13 +904,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ця партія Час Ввійти був виставлений.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Створити Opportunity
 DocType: Salary Slip,Leave Without Pay,Відпустка без збереження заробітної
-DocType: Supplier,Communications,Комунікації
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Планування потужностей Помилка
 ,Trial Balance for Party,Пробний баланс для партії
 DocType: Lead,Consultant,Консультант
 DocType: Salary Slip,Earnings,Заробіток
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Готові товару {0} має бути введений для вступу типу Виробництво
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Відкриття бухгалтерський баланс
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Готові товару {0} має бути введений для вступу типу Виробництво
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Відкриття бухгалтерський баланс
 DocType: Sales Invoice Advance,Sales Invoice Advance,Видаткова накладна Попередня
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Нічого не просити
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"&quot;Фактичний початок Дата&quot; не може бути більше, ніж «Фактичне Дата закінчення &#39;"
@@ -945,7 +951,7 @@
 DocType: Global Defaults,Current Fiscal Year,Поточний фінансовий рік
 DocType: Global Defaults,Disable Rounded Total,Відключити Rounded Всього
 DocType: Lead,Call,Виклик
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&quot;Записи&quot; не може бути порожнім
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,&quot;Записи&quot; не може бути порожнім
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дублікат ряд {0} з такою ж {1}
 ,Trial Balance,Пробний баланс
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Налаштування Співробітники
@@ -957,9 +963,9 @@
 DocType: Contact,User ID,ідентифікатор користувача
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Подивитися Леджер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Найперша
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Група існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я пункту або перейменувати групу товарів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +444,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Група існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я пункту або перейменувати групу товарів"
 DocType: Production Order,Manufacture against Sales Order,Виробництво проти замовлення клієнта
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Решта світу
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,Повна Платне
@@ -989,7 +995,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Чи не дозволено редагувати заморожений рахунок {0}
 DocType: Journal Entry,Get Outstanding Invoices,Отримати неоплачених рахунків
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продажі Замовити {0} не є допустимим
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1002,13 +1008,13 @@
 DocType: Employee,Place of Issue,Місце видачі
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Контракт
 DocType: Email Digest,Add Quote,Додати Цитата
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Одиниця виміру фактором Coversion потрібно для UOM: {0} в пункті: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Одиниця виміру фактором Coversion потрібно для UOM: {0} в пункті: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Непрямі витрати
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ряд {0}: Кількість обов&#39;язково
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сільське господарство
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,Ваші продукти або послуги
 DocType: Mode of Payment,Mode of Payment,Спосіб платежу
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,Сайт зображення повинно бути суспільне файл або адресу веб-сайту
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Сайт зображення повинно бути суспільне файл або адресу веб-сайту
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Це кореневий елемент групи і не можуть бути змінені.
 DocType: Journal Entry Account,Purchase Order,Замовлення на придбання
 DocType: Warehouse,Warehouse Contact Info,Склад Контактна інформація
@@ -1017,8 +1023,8 @@
 DocType: Email Digest,Annual Income,Річний дохід
 DocType: Serial No,Serial No Details,Серійний номер деталі
 DocType: Purchase Invoice Item,Item Tax Rate,Пункт Податкова ставка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов&#39;язані з іншою дебету"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Доставка Примітка {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов&#39;язані з іншою дебету"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Доставка Примітка {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Пункт {0} повинен бути субпідрядником товару
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капітальні обладнання
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ціни Правило спочатку вибирається на основі &quot;Застосувати На&quot; поле, яке може бути Пункт, Пункт Група або Марка."
@@ -1028,7 +1034,7 @@
 DocType: Appraisal Goal,Goal,Мета
 DocType: Sales Invoice Item,Edit Description,Редагувати опис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Очікувана дата поставки менше, ніж Запланована дата початку."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Для Постачальника
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Для Постачальника
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Установка Тип аккаунта допомагає у виборі цього рахунок в угодах.
 DocType: Purchase Invoice,Grand Total (Company Currency),Загальний підсумок (Компанія валют)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Всього Вихідні
@@ -1041,7 +1047,7 @@
 DocType: Journal Entry,Journal Entry,Запис в журналі
 DocType: Workstation,Workstation Name,Ім&#39;я робочої станції
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Електронна пошта Дайджест:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},Специфікація {0} не належить до пункту {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,Це номер останнього створеного операції з цим префіксом
@@ -1073,7 +1079,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Розсилка контактам, веде."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,"Операції, що не може бути порожнім."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,"Операції, що не може бути порожнім."
 ,Delivered Items To Be Billed,"Поставляється пунктів, які будуть Оголошений"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не може бути змінений для серійним номером
 DocType: Authorization Rule,Average Discount,Середня Знижка
@@ -1088,7 +1094,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},З {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Операція Опис
 DocType: Item,Will also apply to variants,Буде також застосовуватися до варіантів
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Неможливо змінити фінансовий рік Дата початку і фінансовий рік Дата закінчення колись фінансовий рік зберігається.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Неможливо змінити фінансовий рік Дата початку і фінансовий рік Дата закінчення колись фінансовий рік зберігається.
 DocType: Quotation,Shopping Cart,Магазинний візок
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Середнє Щодня Вихідні
 DocType: Pricing Rule,Campaign,Кампанія
@@ -1099,7 +1105,8 @@
 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 +211,Stock Entries already created for Production Order ,Сток Записи вже створені для виробничого замовлення
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Сток Записи вже створені для виробничого замовлення
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Чиста зміна в основних фондів
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Залиште порожнім, якщо вважати всіх позначень"
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,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 +182,Max: {0},Макс: {0}
@@ -1111,7 +1118,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,План рахунків
 DocType: Material Request,Terms and Conditions Content,Умови Вміст
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,не може бути більше ніж 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Пункт {0} не є акціонерним товару
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,Пункт {0} не є акціонерним товару
 DocType: Maintenance Visit,Unscheduled,Позапланові
 DocType: Employee,Owned,Бувший
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Залежить у відпустці без
@@ -1148,7 +1155,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Sub Асамблей
 DocType: Shipping Rule Condition,To Value,Оцінювати
 DocType: Supplier,Stock Manager,Фото менеджер
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Джерело склад є обов&#39;язковим для ряду {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Джерело склад є обов&#39;язковим для ряду {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Пакувальний лист
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Оренда площі для офісу
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Настройки шлюзу Налаштування SMS
@@ -1156,10 +1163,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Немає адреса ще не додавали.
 DocType: Workstation Working Hour,Workstation Working Hour,Робоча станція Робоча годину
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Аналітик
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Рядок {0}: виділеної суми {1} повинен бути менше або дорівнює кількості СП {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Рядок {0}: виділеної суми {1} повинен бути менше або дорівнює кількості СП {2}
 DocType: Item,Inventory,Інвентаризація
 DocType: Features Setup,"To enable ""Point of Sale"" view",Щоб включити &quot;Точка зору&quot; Продаж
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Оплата не може бути зроблено для порожньої кошик
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Оплата не може бути зроблено для порожньої кошик
 DocType: Item,Sales Details,Продажі Детальніше
 DocType: Opportunity,With Items,З пунктами
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,У К
@@ -1174,10 +1181,11 @@
 DocType: Cost Center,Parent Cost Center,Батько Центр Вартість
 DocType: Sales Invoice,Source,Джерело
 DocType: Leave Type,Is Leave Without Pay,Є відпустці без
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Записи не знайдені в таблиці Оплата
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Записи не знайдені в таблиці Оплата
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Фінансовий рік Дата початку
 DocType: Employee External Work History,Total Experience,Загальний досвід
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Упаковка ковзання (и) скасовується
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Упаковка ковзання (и) скасовується
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Потік грошових коштів від інвестиційної
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Вантажні та експедиторські Збори
 DocType: Material Request Item,Sales Order No,Продажі Замовити Немає
 DocType: Item Group,Item Group Name,Назва товару Група
@@ -1185,12 +1193,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Передача матеріалів для виробництва
 DocType: Pricing Rule,For Price List,Для Прайс-лист
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Курс покупки по пункту: {0} не знайдений, який необхідний для ведення бухгалтерського обліку запис (рахунок). Будь ласка, вкажіть ціна товару проти цінової покупка списку."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Курс покупки по пункту: {0} не знайдений, який необхідний для ведення бухгалтерського обліку запис (рахунок). Будь ласка, вкажіть ціна товару проти цінової покупка списку."
 DocType: Maintenance Schedule,Schedules,Розклади
 DocType: Purchase Invoice Item,Net Amount,Чиста сума
 DocType: Purchase Order Item Supplied,BOM Detail No,Специфікація Деталь Немає
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Додаткова знижка Сума (валюта компанії)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Помилка: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Помилка: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Будь ласка, створіть новий обліковий запис з Планом рахунків бухгалтерського обліку."
 DocType: Maintenance Visit,Maintenance Visit,Обслуговування відвідування
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Замовник&gt; Група клієнтів&gt; Територія
@@ -1216,7 +1224,7 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Цільова
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Облік Вхід для {0} можуть бути зроблені тільки у валюті: {1}
 DocType: Pricing Rule,Pricing Rule,Ціни Правило
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Матеріал Запит Замовлення на
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Матеріал Запит Замовлення на
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ряд # {0}: повернутий деталь {1} не існує в {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банківські рахунки
 ,Bank Reconciliation Statement,Банк примирення собі
@@ -1224,11 +1232,11 @@
 ,POS,POS-
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Відкриття акції Залишок
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} повинен з&#39;явитися тільки один раз
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Чи не дозволяється Tranfer більш {0}, ніж {1} проти Замовлення {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},Листя номером Успішно для {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,"Немає нічого, щоб упакувати"
 DocType: Shipping Rule Condition,From Value,Від вартості
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Виробництво Кількість є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Виробництво Кількість є обов&#39;язковим
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Суми не відбивається у банку
 DocType: Quality Inspection Reading,Reading 4,Читання 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Претензії рахунок компанії.
@@ -1240,33 +1248,34 @@
 ,Material Requests for which Supplier Quotations are not created,"Матеріал запити, для яких Постачальник Котирування не створюються"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Наступного дня (с), на якій ви подаєте заяву на відпустку свята. Вам не потрібно звернутися за дозволом."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Щоб відстежувати предмети, використовуючи штрих-код. Ви зможете ввести деталі в накладній та рахунки-фактури з продажу сканування штрих-кодів пункту."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Відзначити як при поставці
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Відзначити як при поставці
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Зробіть цитати
 DocType: Dependent Task,Dependent Task,Залежить Завдання
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,Стоп народження Нагадування
 DocType: SMS Center,Receiver List,Приймач Список
 DocType: Payment Tool Detail,Payment Amount,Сума оплати
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Споживана Сума
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,Перегляд {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,Перегляд {0}
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Чиста зміна грошових коштів
 DocType: Salary Structure Deduction,Salary Structure Deduction,Зарплата Структура Відрахування
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {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 +185,Quantity must not be more than {0},"Кількість не повинна бути більше, ніж {0}"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Вік (днів)
 DocType: Quotation Item,Quotation Item,Цитата товару
 DocType: Account,Account Name,Ім&#39;я рахунку
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,"Від Дата не може бути більше, ніж до дати"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,"Від Дата не може бути більше, ніж до дати"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Серійний номер {0} кількість {1} не може бути частка
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Постачальник Тип майстром.
 DocType: Purchase Order Item,Supplier Part Number,Постачальник Номер деталі
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Коефіцієнт конверсії не може бути 0 або 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Коефіцієнт конверсії не може бути 0 або 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,Купівля Отримання {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Купівля Отримання {0} не представлено
 DocType: Company,Default Payable Account,За замовчуванням оплачується аккаунт
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Налаштування для онлайн Корзину, такі як правилами перевезень, прайс-лист і т.д."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Оголошений
@@ -1278,15 +1287,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Мої запитання
 DocType: BOM Item,BOM Item,Специфікація товару
 DocType: Appraisal,For Employee,Для працівника
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Ряд {0}: Попередня проти Постачальника повинні бути дебет
 DocType: Company,Default Values,Значення за замовчуванням
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Ряд {0}: Сума платежу не може бути негативним
 DocType: Expense Claim,Total Amount Reimbursed,Загальна сума відшкодовуються
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},На Постачальником рахунку-фактури {0} від {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},На Постачальником рахунку-фактури {0} від {1}
 DocType: Customer,Default Price List,За замовчуванням Ціни
 DocType: Payment Reconciliation,Payments,Платежі
 DocType: Budget Detail,Budget Allocated,Бюджету виділено
 DocType: Journal Entry,Entry Type,Тип запису
 ,Customer Credit Balance,Замовник Кредитний Баланс
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Чиста зміна кредиторської заборгованості
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Будь ласка, перевірте ваш електронний ідентифікатор"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Замовник вимагає для &#39;&#39; Customerwise Знижка
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Оновлення банківські платіжні дати з журналів.
@@ -1307,7 +1318,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Включити Кошик
 DocType: Employee,Permanent Address,Постійна адреса
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Пункт {0} повинен бути служба товару.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","Advance платний проти {0} {1} не може бути більше \, ніж загальний підсумок {2}"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Будь ласка, виберіть пункт код"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Скорочення вирахування для відпустки без збереження (LWP)
@@ -1324,18 +1335,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"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/config/support.py +43,Single unit of an Item.,Одномісний блок елемента.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Час входу Пакетне {0} повинен бути «Передано»
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Час входу Пакетне {0} повинен бути «Передано»
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Зробіть обліку запис для кожного руху запасів
 DocType: Leave Allocation,Total Leaves Allocated,Всього Листя номером
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Склад требуется в рядку Немає {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Склад требуется в рядку Немає {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Будь ласка, введіть дійсний фінансовий рік дати початку і закінчення"
 DocType: Employee,Date Of Retirement,Дата вибуття
 DocType: Upload Attendance,Get Template,Отримати шаблон
 DocType: Address,Postal,Поштовий
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"А Група клієнтів існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я клієнта або перейменувати групу клієнтів"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Будь ласка, виберіть {0} перший."
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Текст {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,"Будь ласка, виберіть {0} перший."
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},Текст {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Новий контакт
 DocType: Territory,Parent Territory,Батько Територія
 DocType: Quality Inspection Reading,Reading 2,Читання 2
 DocType: Stock Entry,Material Receipt,Матеріал Надходження
@@ -1343,7 +1355,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Партія Тип і партія необхідна для / дебіторська заборгованість рахунок {0}
 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 +210,Quantity required for Item {0} in row {1},Кількість для Пункт {0} в рядку {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},Кількість для Пункт {0} в рядку {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,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 адреса
@@ -1360,15 +1372,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Забагато стовбців. Експорт звіту і роздрукувати його за допомогою програми електронної таблиці.
 DocType: Sales 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 +152,Main,Головна
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Головна
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Варіант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Встановіть префікс нумерації серії на ваших угод
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Зупинився замовлення не може бути скасований. Відкорковувати, щоб скасувати."
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,За замовчуванням BOM ({0}) повинен бути активним для даного елемента або в шаблоні
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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,Можливість поле Від обов&#39;язкове
 DocType: Item,Variants,Варіанти
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Зробити замовлення на
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Зробити замовлення на
 DocType: SMS Center,Send To,Відправити
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Існує не вистачає відпустку баланс Залиште Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Асигнувати сума
@@ -1381,7 +1393,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Склад і довідники
 DocType: Supplier,Statutory info and other general information about your Supplier,Статутний інформація і інша загальна інформація про вашу Постачальника
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адреси
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,"Проти журналі запис {0} не має ніякого неперевершену {1}, запис"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,"Проти журналі запис {0} не має ніякого неперевершену {1}, запис"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Повторювані Серійний номер вводиться для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Умовою для правила судноплавства
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Деталь не дозволяється мати виробничого замовлення.
@@ -1390,10 +1402,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,Сума кредиту у валюті рахунку
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Журнали Час для виготовлення.
 DocType: Item,Apply Warehouse-wise Reorder Level,Застосувати Склад-мудрий Reorder рівень
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,Специфікація {0} повинен бути представлений
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,Специфікація {0} повинен бути представлений
 DocType: Authorization Control,Authorization Control,Контроль Авторизація
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Відхилено Склад є обов&#39;язковим відносно відхилив Пункт {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Час входу для завдань.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Оплата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Оплата
 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},Матеріал Запит максимуму {0} можуть бути зроблені для Пункт {1} проти замовлення клієнта {2}
 DocType: Employee,Salutation,Привітання
@@ -1410,7 +1423,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Асоціювати
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Пункт {0} серіалізовані товару
 DocType: SMS Center,Create Receiver List,Створити приймач список
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Закінчився
 DocType: Packing Slip,To Package No.,Для пакету №
 DocType: Warranty Claim,Issue Date,Дата випуску
 DocType: Activity Cost,Activity Cost,Вартість активність
@@ -1448,7 +1460,7 @@
 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 +65,Territory / Customer,Територія / клієнтів
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,"наприклад, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,Є продаж товару
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Пункт Група Дерево
@@ -1460,7 +1472,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} створена
 DocType: Delivery Note Item,Against Sales Order,На замовлення клієнта
 ,Serial No Status,Серійний номер Статус
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Пункт таблиця не може бути порожнім
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Пункт таблиця не може бути порожнім
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Рядок {0}: Для установки {1} періодичності, різниця між від і до теперішнього часу \ повинно бути більше, ніж або дорівнює {2}"
 DocType: Pricing Rule,Selling,Продаж
@@ -1469,7 +1481,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Мита і податки
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Будь ласка, введіть дату Reference"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,"Будь ласка, введіть дату Reference"
 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,Поставляється Кількість
@@ -1484,7 +1496,7 @@
 DocType: Installation Note,Installation Time,Установка часу
 DocType: Sales Invoice,Accounting Details,Облік Детальніше
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Видалити всі транзакції цієї компанії
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Ряд # {0}: Операція {1} не завершені {2} Кількість готової продукції у виробництві Наказ № {3}. Будь ласка, поновіть статус роботи за допомогою журналів Time"
+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,"Ряд # {0}: Операція {1} не завершені {2} Кількість готової продукції у виробництві Наказ № {3}. Будь ласка, поновіть статус роботи за допомогою журналів Time"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Інвестиції
 DocType: Issue,Resolution Details,Дозвіл Подробиці
 DocType: Quality Inspection Reading,Acceptance Criteria,Критерії приймання
@@ -1500,7 +1512,7 @@
 DocType: Holiday List,Clear Table,Ясно Таблиця
 DocType: Features Setup,Brands,Бренди
 DocType: C-Form Invoice Detail,Invoice No,Рахунок Немає
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Від Замовлення
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Від Замовлення
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,Калькуляція Оцінити
 ,Customer Addresses And Contacts,Адреси та контакти з клієнтами
@@ -1517,7 +1529,7 @@
 ,Maintenance Schedules,Режими технічного обслуговування
 ,Quotation Trends,Котирування Тенденції
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Пункт Група не згадується у майстри пункт за пунктом {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
 ,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Коефіцієнт перетворення
@@ -1534,12 +1546,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дерево finanial рахунків.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Залиште порожнім, якщо розглядати для всіх типів працівників"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Розподілити плату на основі
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Рахунок {0} повинен бути типу &quot;основний актив&quot;, як товару {1} є активом товару"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Рахунок {0} повинен бути типу &quot;основний актив&quot;, як товару {1} є активом товару"
 DocType: HR Settings,HR Settings,Налаштування HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Витрати Заявити очікує схвалення. Тільки за рахунок затверджує можете оновити статус.
 DocType: Purchase Invoice,Additional Discount Amount,Додаткова знижка Сума
 DocType: Leave Block List Allow,Leave Block List Allow,Залишити Чорний список Дозволити
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Абревіатура не може бути порожнім або простір
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Абревіатура не може бути порожнім або простір
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортивний
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Загальний фактичний
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Блок
@@ -1551,6 +1563,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} тепер за замовчуванням фінансовий рік. Будь ласка, поновіть ваш браузер для зміни вступили в силу."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Витратні Претензії
 DocType: Issue,Support,Підтримка
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Кошик
 ,BOM Search,Специфікація Пошук
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Закриття (відкриття + Итоги)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Будь ласка, сформулюйте валюту в Компанії"
@@ -1562,13 +1575,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Коефіцієнт перетворення Одиниця виміру потрібно в рядку {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Дата просвіт не може бути до дати реєстрації в рядку {0}
 DocType: Salary Slip,Deduction,Відрахування
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Ціна товару додається для {0} в Прейскуранті {1}
 DocType: Address Template,Address Template,Адреса шаблону
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,"Будь ласка, введіть Employee Id цього менеджера з продажу"
 DocType: Territory,Classification of Customers by region,Класифікація клієнтів по регіонах
 DocType: Project,% Tasks Completed,"Завдання, які вирішуються%"
 DocType: Project,Gross Margin,Валовий дохід
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Будь ласка, введіть Продукція перший пункт"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,відключений користувач
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,відключений користувач
 DocType: Opportunity,Quotation,Цитата
 DocType: Salary Slip,Total Deduction,Всього Відрахування
 DocType: Quotation,Maintenance User,Технічне обслуговування Користувач
@@ -1577,7 +1591,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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,Відняти
@@ -1587,12 +1601,12 @@
 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,ТАК Кількість
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток записи існують щодо складу {0}, отже, ви не зможете повторно призначити або змінити Склад"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток записи існують щодо складу {0}, отже, ви не зможете повторно призначити або змінити Склад"
 DocType: Appraisal,Calculate Total Score,Розрахувати загальну кількість балів
 DocType: Supplier Quotation,Manufacturing Manager,Виробництво менеджер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серійний номер {0} знаходиться на гарантії Шифрування до {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Спліт накладної в пакети.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Поставки
+apps/erpnext/erpnext/hooks.py +69,Shipments,Поставки
 DocType: Purchase Order Item,To be delivered to customer,Для поставлятися замовнику
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Час Статус журналу повинні бути представлені.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серійний номер {0} не належить ні до однієї Склад
@@ -1612,10 +1626,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Виберіть компанію ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Залиште порожнім, якщо розглядати для всіх відділів"
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Види зайнятості (постійна, за контрактом, стажист і т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0} є обов&#39;язковим для пп {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} є обов&#39;язковим для пп {1}
 DocType: Currency Exchange,From Currency,Від Валюта
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Будь ласка, виберіть Виділена сума, рахунок-фактура Тип і номер рахунку-фактури в принаймні один ряд"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Продажі Замовити потрібно для пункту {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Будь ласка, виберіть Виділена сума, рахунок-фактура Тип і номер рахунку-фактури в принаймні один ряд"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Продажі Замовити потрібно для пункту {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Суми не відображається в системі
 DocType: Purchase Invoice Item,Rate (Company Currency),Оцінити (Компанія валют)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Інші
@@ -1631,7 +1645,7 @@
 DocType: Quality Inspection,In Process,В процесі
 DocType: Authorization Rule,Itemwise Discount,Itemwise Знижка
 DocType: Purchase Order Item,Reference Document Type,Посилання Тип документа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} проти замовлення клієнта {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} проти замовлення клієнта {1}
 DocType: Account,Fixed Asset,Основних засобів
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Серійний Інвентар
 DocType: Activity Type,Default Billing Rate,За замовчуванням Платіжна Оцінити
@@ -1641,7 +1655,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продажі Наказ Оплата
 DocType: Expense Claim Detail,Expense Claim Detail,Витрати Заявити Подробиці
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Журнали Час створення:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,"Будь ласка, виберіть правильний рахунок"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,"Будь ласка, виберіть правильний рахунок"
 DocType: Item,Weight UOM,Вага Одиниця виміру
 DocType: Employee,Blood Group,Група крові
 DocType: Purchase Invoice Item,Page Break,Розрив сторінки
@@ -1672,10 +1686,10 @@
 DocType: Time Log,To Time,Часу
 DocType: Authorization Rule,Approving Role (above authorized value),Затвердження роль (вище статутного вартості)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Щоб додати дочірні вузли, досліджувати дерево і натисніть на вузол, в який хочете додати більше вузлів."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на рахунку повинен бути оплачується рахунок
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},Специфікація рекурсії: {0} не може бути батько або дитина {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Кредит на рахунку повинен бути оплачується рахунок
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,BOM recursion: {0} cannot be parent or child of {2},Специфікація рекурсії: {0} не може бути батько або дитина {2}
 DocType: Production Order Operation,Completed Qty,Завершений Кількість
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, тільки дебетові рахунки можуть бути пов&#39;язані з іншою кредитною вступу"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, тільки дебетові рахунки можуть бути пов&#39;язані з іншою кредитною вступу"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ціни {0} відключена
 DocType: Manufacturing Settings,Allow Overtime,Дозволити Овертайм
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} Серійні номери, необхідні для Пункт {1}. Ви надали {2}."
@@ -1683,8 +1697,9 @@
 DocType: Item,Customer Item Codes,Замовник Предмет коди
 DocType: Opportunity,Lost Reason,Забули Причина
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Створити Записи оплати по замовленнях або рахунків-фактур.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Обсяг вибірки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Всі деталі вже виставлений
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,"Подальші МВЗ можуть бути зроблені під угруповань, але дані можуть бути зроблені у відношенні не-груп"
 DocType: Project,External,Зовнішній
@@ -1740,13 +1755,14 @@
 DocType: Rename Tool,Rename Tool,Перейменувати інструмент
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Оновлення Вартість
 DocType: Item Reorder,Item Reorder,Пункт Змінити порядок
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Передача матеріалів
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Передача матеріалів
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Вкажіть операцій, операційні витрати та дають унікальну операцію не в Ваших операцій."
 DocType: Purchase Invoice,Price List Currency,Ціни валют
 DocType: Naming Series,User must always select,Користувач завжди повинен вибрати
 DocType: Stock Settings,Allow Negative Stock,Дозволити негативний складі
 DocType: Installation Note,Installation Note,Установка Примітка
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Додати Податки
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Потік грошових коштів від фінансової
 ,Financial Analytics,Фінансова аналітика
 DocType: Quality Inspection,Verified By,Перевірено
 DocType: Address,Subsidiary,Дочірня компанія
@@ -1756,19 +1772,19 @@
 DocType: Process Payroll,Create Salary Slip,Створити зарплата Сліп
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Очікуване сальдо за платіжними
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Джерело фінансування (зобов&#39;язання)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Кількість в рядку {0} ({1}) повинен бути такий же, як кількість виготовленої {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Кількість в рядку {0} ({1}) повинен бути такий же, як кількість виготовленої {2}"
 DocType: Appraisal,Employee,Співробітник
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Імпортувати пошту з
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Запросити у користувача
 DocType: Features Setup,After Sale Installations,Після продажу установок
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} повністю виставлений рахунок
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} повністю виставлений рахунок
 DocType: Workstation Working Hour,End Time,Час закінчення
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартні умови договору для продажу або покупки.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Група по Ваучер
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обов&#39;язково На
 DocType: Sales Invoice,Mass Mailing,Розсилок
 DocType: Rename Tool,File to Rename,Файл Перейменувати
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Номер замовлення необхідний для Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Номер замовлення необхідний для Пункт {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Показати платежі
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Зазначено специфікації {0} не існує для п {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Технічне обслуговування Розклад {0} має бути скасований до скасування цього замовлення клієнта
@@ -1778,6 +1794,7 @@
 DocType: Selling Settings,Sales Order Required,Продажі Замовити Обов&#39;язкові
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Створити клієнта
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,Графік проведення технічного обслуговування Деталь
 DocType: Quality Inspection Reading,Reading 9,Читання 9
@@ -1789,6 +1806,7 @@
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Оплата рахунку
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Чисте зміна дебіторської заборгованості
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсаційні Викл
 DocType: Quality Inspection Reading,Accepted,Прийняті
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,"Будь ласка, переконайтеся, що ви дійсно хочете видалити всі транзакції для компанії. Ваші основні дані залишиться, як є. Ця дія не може бути скасовано."
@@ -1796,17 +1814,17 @@
 DocType: Payment Tool,Total Payment Amount,Загальна сума оплати
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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 +204,Raw Materials cannot be blank.,Сировина не може бути порожнім.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запас, рахунок-фактура містить падіння пункт доставки."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,Сировина не може бути порожнім.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запас, рахунок-фактура містить падіння пункт доставки."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Як є існуючі біржові операції по цьому пункту, \ ви не можете змінити значення &#39;Має серійний номер &quot;,&quot; Має Batch Ні »,« Чи є зі Пункт &quot;і&quot; Оцінка Метод &quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Швидкий журнал запис
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Швидкий журнал запис
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Ви не можете змінити ставку, якщо специфікації згадується agianst будь-якого елементу"
 DocType: Employee,Previous Work Experience,Попередній досвід роботи
 DocType: Stock Entry,For Quantity,Для Кількість
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Будь ласка, введіть плановий Кількість для Пункт {0} в рядку {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} не буде поданий
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} не буде поданий
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Запити для елементів.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Окрема виробничий замовлення буде створено для кожного готового виробу пункту.
 DocType: Purchase Invoice,Terms and Conditions1,Умови та условія1
@@ -1819,7 +1837,7 @@
 DocType: Authorization Rule,Authorized Value,Статутний Значення
 DocType: Contact,Enter department to which this Contact belongs,"Введіть відділ, до якого належить ця Зв&#39;язатися"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Всього Відсутня
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Елемент або Склад ряду {0} не відповідає матеріалів Запит
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Елемент або Склад ряду {0} не відповідає матеріалів Запит
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Одиниця виміру
 DocType: Fiscal Year,Year End Date,Рік Дата закінчення
 DocType: Task Depends On,Task Depends On,Завдання залежить від
@@ -1845,7 +1863,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Договір Кінцева дата повинна бути більше, ніж дата вступу"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Третя сторона дистриб&#39;ютор / дилер / комісіонер / Партнери /, який продає продукти компаній на комісію."
 DocType: Customer Group,Has Child Node,Має дочірній вузол
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} проти Замовлення {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} проти Замовлення {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Введіть статичних параметрів URL тут (Напр., Відправник = ERPNext, ім&#39;я користувача = ERPNext, пароль = один тисяча двісті тридцять чотири і т.д.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1}, не в якій-небудь активної фінансовий рік. Для більш детальної інформації перевірити {2}."
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Це приклад сайту генерується автоматично з ERPNext
@@ -1873,7 +1891,7 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Стандартний шаблон податок, який може бути застосований до всіх операцій купівлі. Цей шаблон може містити перелік податкових керівників, а також інших витрат керівників як &quot;Доставка&quot;, &quot;Insurance&quot;, &quot;Звернення&quot; і т.д. #### Примітка податкової ставки ви визначаєте тут буде стандартна ставка податку на прибуток для всіх ** Елементи * *. Якщо є ** ** товари, які мають різні ціни, вони повинні бути додані в ** Item податку ** стіл в ** ** Item майстра. #### Опис колонок 1. Розрахунок Тип: - Це може бути від ** ** Загальна Чистий (тобто сума основної суми). - ** На попередньому рядку Total / сума ** (за сукупністю податків або зборів). Якщо ви оберете цю опцію, податок буде застосовуватися, як у відсотках від попереднього ряду (у податковому таблиці) суми або загальної. - ** ** Фактичний (як уже згадувалося). 2. Рахунок Керівник: Рахунок книга, під яким цей податок будуть заброньовані 3. Вартість центр: Якщо податок / плата є доходом (як перевезення вантажу) або витрат це повинно бути заброньовано проти МВЗ. 4. Опис: Опис податку (які будуть надруковані в рахунках-фактурах / цитати). 5. Оцінити: Податкова ставка. 6. Сума: Сума податку. 7. Разом: Сумарне до цієї точки. 8. Введіть рядок: Якщо на базі &quot;Попередня рядок Усього&quot; ви можете вибрати номер рядка, який буде прийнято в якості основи для розрахунку цього (за замовчуванням це попереднє рядок). 9. Розглянемо податку або збору для: У цьому розділі ви можете поставити, якщо податок / плата тільки за оцінки (не частина всього) або тільки для загальної (не додати цінність пункту) або для обох. 10. Додати або відняти: Якщо ви хочете, щоб додати або відняти податок."
 DocType: Purchase Receipt Item,Recd Quantity,Кількість RECD
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете виробляти більше Пункт {0}, ніж кількість продажів Замовити {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Фото запис {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Фото запис {0} не представлено
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / грошовий рахунок
 DocType: Tax Rule,Billing City,Біллінг Місто
 DocType: Global Defaults,Hide Currency Symbol,Приховати символ валюти
@@ -1905,6 +1923,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Комунальні витрати
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Над
 DocType: Buying Settings,Default Buying Price List,За замовчуванням Купівля Прайс-лист
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.","Встановити значення за замовчуванням, як компанія, валюта, поточний фінансовий рік і т.д."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Тип оплати
@@ -1940,7 +1959,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Див &quot;Оцінити матеріалів на основі&quot; в розділі калькуляції
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Відповідальність Площа
 DocType: Item Reorder,Material Request Type,Матеріал Тип запиту
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення Одиниця виміру є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення Одиниця виміру є обов&#39;язковим
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Посилання
 DocType: Cost Center,Cost Center,Центр витрат
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
@@ -1962,7 +1981,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Всі адреси.
 DocType: Company,Stock Settings,Сток Налаштування
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Об&#39;єднання можливе тільки, якщо такі властивості однакові в обох звітах. Є група, кореневої тип, компанія"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Об&#39;єднання можливе тільки, якщо такі властивості однакові в обох звітах. Є група, кореневої тип, компанія"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управління груповою клієнтів дерево.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Новий Центр Вартість Ім&#39;я
 DocType: Leave Control Panel,Leave Control Panel,Залишити Панель управління
@@ -1982,8 +2001,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,"Подробиці платіжний інструмент,"
 ,Sales Browser,Браузер з продажу
 DocType: Journal Entry,Total Credit,Всього Кредитна
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Увага: Ще {0} # {1} існує проти вступу фондовій {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Місцевий
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Увага: Ще {0} # {1} існує проти вступу фондовій {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,Боржники
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Великий
@@ -2002,7 +2021,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Всі Продажі Угоди можуть бути помічені проти кількох ** ** продажів осіб, так що ви можете встановити і контролювати цілі."
 ,S.O. No.,КО №
 DocType: Production Order Operation,Make Time Log,Зробити часу Вхід
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,"Будь ласка, встановіть кількість тональний"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,"Будь ласка, встановіть кількість тональний"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Будь ласка, створіть клієнт зі свинцю {0}"
 DocType: Price List,Applicable for Countries,Стосується для країн
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Комп&#39;ютери
@@ -2050,10 +2069,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Принаймні один елемент повинен бути введений з негативним кількістю у зворотному документа
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,Немає Зауваження
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Немає Зауваження
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Прострочені
 DocType: Account,Stock Received But Not Billed,"Фото отриманий, але не Оголошений"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Корінь аккаунт має бути група
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Корінь аккаунт має бути група
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Повна Платне + недоїмки сума + Інкасація Сума - Загальна Відрахування
 DocType: Monthly Distribution,Distribution Name,Розподіл Ім&#39;я
 DocType: Features Setup,Sales and Purchase,Купівлі-продажу
@@ -2067,6 +2086,7 @@
 DocType: Journal Entry Account,Party Balance,Баланс партія
 DocType: Sales Invoice Item,Time Log Batch,Час входу Пакетне
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Будь ласка, виберіть Застосувати знижки на"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Зарплата ковзання Створено
 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,Матеріал для виробництва передачі
@@ -2074,9 +2094,9 @@
 DocType: Purchase Invoice,Half-yearly,Піврічний
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Фінансовий рік {0} знайдений.
 DocType: Bank Reconciliation,Get Relevant Entries,Одержати відповідні записи
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Облік Вхід для запасі
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Облік Вхід для запасі
 DocType: Sales Invoice,Sales Team1,Команда1 продажів
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Пункт {0} не існує
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Пункт {0} не існує
 DocType: Sales Invoice,Customer Address,Замовник Адреса
 DocType: Purchase Invoice,Apply Additional Discount On,Застосувати Додаткова знижка на
 DocType: Account,Root Type,Корінь Тип
@@ -2085,15 +2105,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Показати цю слайд-шоу на початок сторінки
 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 +149,Target warehouse is mandatory for row {0},Цільова склад є обов&#39;язковим для ряду {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Цільова склад є обов&#39;язковим для ряду {0}
 DocType: Quality Inspection,Quality Inspection,Контроль якості
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Дуже невеликий
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,"Увага: Матеріал Запитувана Кількість менше, ніж мінімальне замовлення Кількість"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,"Увага: Матеріал Запитувана Кількість менше, ніж мінімальне замовлення Кількість"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Рахунок {0} заморожені
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридична особа / Допоміжний з окремим Плану рахунків, що належать Організації."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Продукти харчування, напої і тютюн"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL або BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Можу тільки здійснити платіж проти нефактурірованних {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Можу тільки здійснити платіж проти нефактурірованних {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Швидкість Комісія не може бути більше, ніж 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Мінімальний рівень запасів
 DocType: Stock Entry,Subcontract,Субпідряд
@@ -2131,7 +2151,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Вхідний контроль якості.
 DocType: Purchase Order Item,Returned Qty,Повернувся Кількість
 DocType: Employee,Exit,Вихід
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Корінь Тип обов&#39;язково
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Корінь Тип обов&#39;язково
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Серійний номер {0} створена
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Для зручності клієнтів, ці коди можуть бути використані в друкованих форматів, таких як рахунки-фактури і доставки Нотатки"
 DocType: Employee,You can enter any date manually,Ви можете ввести дату вручну будь
@@ -2139,8 +2159,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Випробувальний термін
 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 +110,Row {0}: Advance against Customer must be credit,Ряд {0}: Попередня відношенні Клієнта повинен бути кредит
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Купівля Надходження товару Поставляється
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Платити
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Платити
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Для DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Журнали для підтримки статус доставки смс
@@ -2157,7 +2178,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Змінити порядок Рівень
 DocType: Attendance,Attendance Date,Відвідуваність Дата
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Зарплата розпаду на основі Заробіток і дедукції.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,"Рахунок з дочірніх вузлів, не можуть бути перетворені в бухгалтерській книзі"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,"Рахунок з дочірніх вузлів, не можуть бути перетворені в бухгалтерській книзі"
 DocType: Address,Preferred Shipping Address,Перевага Адреса доставки
 DocType: Purchase Receipt Item,Accepted Warehouse,Прийнято Склад
 DocType: Bank Reconciliation Detail,Posting Date,Дата розміщення
@@ -2175,7 +2196,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Серійний номер {0} не існує
 DocType: Pricing Rule,Discount Percentage,Знижка у відсотках
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер накладної
-apps/erpnext/erpnext/hooks.py +54,Orders,Замовлення
+apps/erpnext/erpnext/hooks.py +55,Orders,Замовлення
 DocType: Leave Control Panel,Employee Type,Співробітник Тип
 DocType: Employee Leave Approver,Leave Approver,Залишити який стверджує
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Матеріал, переданий для виробництва"
@@ -2187,7 +2208,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Матеріалів виставлено проти цього замовлення клієнта
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Період закриття входу
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,"Центр Вартість з існуючими операцій, не може бути перетворений в групі"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизація
+DocType: Account,Depreciation,Амортизація
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Постачальник (и)
 DocType: Customer,Credit Limit,Кредитний ліміт
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Виберіть тип угоди
@@ -2212,11 +2233,12 @@
 DocType: Material Request,Requested For,Запитувана Для
 DocType: Quotation Item,Against Doctype,На DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Підписка на накладну проти будь-якого проекту
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Корінь рахунок не може бути видалений
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Чисті грошові кошти від інвестиційної
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Корінь рахунок не може бути видалений
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Показати фонду Записи
 ,Is Primary Address,Є первинним Адреса
 DocType: Production Order,Work-in-Progress Warehouse,Робота-в-Прогрес Склад
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Посилання # {0} від {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Посилання # {0} від {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управління адрес
 DocType: Pricing Rule,Item Code,Код товару
 DocType: Production Planning Tool,Create Production Orders,Створити виробничі замовлення
@@ -2224,7 +2246,7 @@
 DocType: Journal Entry,User Remark,Зауваження Користувач
 DocType: Lead,Market Segment,Сегмент ринку
 DocType: Employee Internal Work History,Employee Internal Work History,Співробітник внутрішньої історії роботи
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Закриття (д-р)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Закриття (д-р)
 DocType: Contact,Passive,Пасивний
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Серійний номер {0} не в наявності
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Податковий шаблон для продажу угод.
@@ -2240,7 +2262,7 @@
 ,Billed Amount,Оголошений Сума
 DocType: Bank Reconciliation,Bank Reconciliation,Банк примирення
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Отримати оновлення
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Матеріал Запит {0} ануляції або зупинився
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Матеріал Запит {0} ануляції або зупинився
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Додати кілька пробних записів
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Залишити управління
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Група по рахунок
@@ -2249,14 +2271,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Рахунок глава під відповідальності, в якому прибуток / збиток будуть заброньовані"
 DocType: Payment Tool,Against Vouchers,На ваучери
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Швидка допомога
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Джерело і мета склад не може бути таким же для рядка {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Джерело і мета склад не може бути таким же для рядка {0}
 DocType: Features Setup,Sales Extras,Продажі Додатково
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет за рахунок {1} проти МВЗ {2} буде перевищувати {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',&quot;З дати&quot; повинно бути після &quot;Для Дата&quot;
 ,Stock Projected Qty,Фото Прогнозований Кількість
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
 DocType: Sales Order,Customer's Purchase Order,Замовлення клієнта
 DocType: Warranty Claim,From Company,Від компанії
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Значення або Кількість
@@ -2266,9 +2288,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Залишити Чорний список тварин
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,"Ви будете використовувати його, щоб Вхід"
 DocType: Sales Partner,Retailer,Роздрібний торговець
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на рахунку повинен бути баланс рахунку
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Кредит на рахунку повинен бути баланс рахунку
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Всі типи Постачальник
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код товару є обов&#39;язковим, оскільки товар не автоматично нумеруються"
+apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Код товару є обов&#39;язковим, оскільки товар не автоматично нумеруються"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Цитата {0} типу {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Технічне обслуговування Розклад товару
 DocType: Sales Order,%  Delivered,Поставляється%
@@ -2312,7 +2334,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Вага брутто упаковки. Зазвичай вага нетто + пакувальний матеріал вагу. (для друку)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Користувачі з цією роллю можуть встановлювати заморожені рахунки і створювати / змінювати записи бухгалтерського обліку стосовно заморожених рахунків
 DocType: Serial No,Is Cancelled,Скасовується
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Мої замовлення
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Мої замовлення
 DocType: Journal Entry,Bill Date,Білл Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Навіть якщо є кілька правил ціноутворення з найвищим пріоритетом, то наступні внутрішні пріоритети застосовуються:"
 DocType: Supplier,Supplier Details,Постачальник Подробиці
@@ -2333,10 +2355,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Дзвінки
 DocType: Project,Total Costing Amount (via Time Logs),Всього Калькуляція Сума (за допомогою журналів Time)
 DocType: Purchase Order Item Supplied,Stock UOM,Фото Одиниця виміру
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Замовлення на {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Замовлення на {0} не представлено
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Прогнозований
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серійний номер {0} не належить Склад {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Примітка: Система не перевірятиме по-доставки і більш-бронювання для Пункт {0}, як кількість або сума 0"
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,Дата розкриття
 DocType: Journal Entry,Remark,Зауваження
@@ -2349,9 +2371,9 @@
 DocType: Time Log,Batched for Billing,Рулонірованние для рахунків
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Законопроекти, підняті постачальників."
 DocType: POS Profile,Write Off Account,Списання аккаунт
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Сума знижки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повернутися в рахунку-фактурі проти
 DocType: Item,Warranty Period (in days),Гарантійний термін (в днях)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Чисті грошові кошти від операційної
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,"наприклад, ПДВ"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Пункт 4
 DocType: Journal Entry Account,Journal Entry Account,Запис у щоденнику аккаунт
@@ -2392,7 +2414,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"Дата виходу на пенсію повинен бути більше, ніж дата вступу"
 DocType: Sales Invoice,Against Income Account,На рахунок доходів
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Поставляється
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,Транспортер інформація
@@ -2420,10 +2442,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Серійний номер є обов&#39;язковим для пп {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Це корінь продавець і не можуть бути змінені.
 ,Stock Ledger,Книга обліку акцій
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Оцінити: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Оцінити: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Зарплата ковзання Відрахування
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Виберіть вузол групи в першу чергу.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Мета повинна бути одним з {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Мета повинна бути одним з {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Заповніть форму і зберегти його
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Завантажити звіт, що містить всю сировину з їх останньої інвентаризації статус"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форум
@@ -2461,7 +2483,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компанії (не клієнтів або постачальників) господар.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Будь ласка, введіть &quot;Очікувана дата доставки&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Примітки {0} має бути скасований до скасування цього замовлення клієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,"Платні сума + Списання Сума не може бути більше, ніж загальний підсумок"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},Примітка: Існує не достатньо відпустку баланс Залиште Тип {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Примітка: Якщо оплата не буде зроблена відносно будь-якого посилання, щоб запис журналу вручну."
@@ -2481,7 +2503,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Пункт 3
 DocType: Purchase Order,Customer Contact Email,Контакти з клієнтами E-mail
 DocType: Sales Team,Contribution (%),Внесок (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примітка: Оплата запис не буде створена, так як &quot;Готівкою або банківський рахунок&quot; не було зазначено"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примітка: Оплата запис не буде створена, так як &quot;Готівкою або банківський рахунок&quot; не було зазначено"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Обов&#39;язки
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажі Особа Ім&#39;я
@@ -2492,20 +2514,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Перед примирення
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Податковий ряд {0} повинен мати обліковий запис типу податку або доходів або витрат або платно
 DocType: Sales Order,Partly Billed,Невелика Оголошений
 DocType: Item,Default BOM,За замовчуванням BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Будь ласка, повторіть введення назва компанії, щоб підтвердити"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Загальна сума заборгованості з Amt
 DocType: Time Log Batch,Total Hours,Загальна кількість годин
 DocType: Journal Entry,Printing Settings,Налаштування друку
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},"Всього Дебет повинна дорівнювати загальній виробленні. Різниця в тому, {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},"Всього Дебет повинна дорівнювати загальній виробленні. Різниця в тому, {0}"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобільний
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,З накладної
 DocType: Time Log,From Time,Від часу
 DocType: Notification Control,Custom Message,Текст повідомлення
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Інвестиційний банкінг
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Готівкою або банківський рахунок є обов&#39;язковим для внесення запису оплата
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Готівкою або банківський рахунок є обов&#39;язковим для внесення запису оплата
 DocType: Purchase Invoice,Price List Exchange Rate,Ціни обмінний курс
 DocType: Purchase Invoice Item,Rate,Ставка
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Інтерн
@@ -2523,9 +2545,10 @@
 			conflict by assigning priority. Price Rules: {0}","Кілька Ціна Правило існує з тими ж критеріями ,, будь ласка, вирішити \ конфлікту віддаючи пріоритет. Ціна Правила: {0}"
 DocType: Account,Bank,Банк
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авіакомпанія
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Матеріал Випуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Матеріал Випуск
 DocType: Material Request Item,For Warehouse,Для складу
 DocType: Employee,Offer Date,Пропозиція Дата
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитати
 DocType: Hub Settings,Access Token,Маркер доступу
 DocType: Sales Invoice Item,Serial No,Серійний номер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Будь ласка, введіть Maintaince докладніше Ім&#39;я"
@@ -2539,10 +2562,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,"Є більше свят, ніж робочих днів у цьому місяці."
 DocType: Product Bundle Item,Product Bundle Item,Продукт Зв&#39;язка товару
 DocType: Sales Partner,Sales Partner Name,Партнер по продажах Ім&#39;я
+DocType: Payment Reconciliation,Maximum Invoice Amount,Максимальна Сума рахунку
 DocType: Purchase Invoice Item,Image View,Перегляд зображення
 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 +553,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За замовчуванням Одиниця виміру для варіанту &#39;{0}&#39; має бути такою ж, як в шаблоні &quot;{1} &#39;"
 DocType: Shipping Rule,Calculate Based On,"Розрахувати, засновані на"
 DocType: Delivery Note Item,From Warehouse,Від Склад
 DocType: Purchase Taxes and Charges,Valuation and Total,Оцінка і Загальна
@@ -2550,6 +2575,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Цей пункт є Варіант {0} (шаблон). Атрибути будуть скопійовані з шаблону, якщо &quot;Ні Копіювати&quot; не встановлений"
 DocType: Account,Purchase User,Купівля користувача
 DocType: Notification Control,Customize the Notification,Налаштувати повідомлення
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Потік грошових коштів від операцій
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,За замовчуванням Адреса Шаблон не може бути видалений
 DocType: Sales Invoice,Shipping Rule,Правило Доставка
 DocType: Journal Entry,Print Heading,Роздрукувати товарної позиції
@@ -2560,7 +2586,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Сирий матеріал
 DocType: Leave Application,Follow via Email,Дотримуйтесь по електронній пошті
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сума податку після скидки Сума
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Дитячий рахунок існує для цього облікового запису. Ви не можете видалити цей аккаунт.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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,Або мета або ціль Кількість Сума є обов&#39;язковим
 apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Немає за замовчуванням специфікації не існує для п {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Будь ласка, виберіть проводки Дата першого"
@@ -2578,6 +2604,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Серійний пп Обов&#39;язково для серіалізовані елемент {0}
 DocType: Journal Entry,Bank Entry,Банк Стажер
 DocType: Authorization Rule,Applicable To (Designation),Застосовується до (Позначення)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Додати в кошик
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Група За
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Включити / відключити валюти.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Поштові витрати
@@ -2589,24 +2616,23 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Година
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Серійний товару {0} не може бути оновлена \ на примирення зі
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Провести Матеріал Постачальнику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Провести Матеріал Постачальнику
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Створити цитати
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Ви не уповноважений стверджувати листя на Блок Терміни
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Всі ці предмети вже виставлений
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Всі ці предмети вже виставлений
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Може бути схвалене {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Доставка Умови правил
 DocType: BOM Replace Tool,The new BOM after replacement,Новий специфікації після заміни
 DocType: Features Setup,Point of Sale,Касовий термінал
 DocType: Account,Tax,Податок
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},"Ряд {0}: {1}, не є допустимим {2}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Від Bundle продукту
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Від Bundle продукту
 DocType: Production Planning Tool,Production Planning Tool,Планування виробництва інструменту
 DocType: Quality Inspection,Report Date,Дата звіту
 DocType: C-Form,Invoices,Рахунки
 DocType: Job Opening,Job Title,Професія
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Одержувачі
 DocType: Features Setup,Item Groups in Details,Групи товарів в деталі
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Кількість, Виготовлення повинні бути більше, ніж 0."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Початкова точка-оф-продажу (POS)
@@ -2614,8 +2640,9 @@
 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: Pricing Rule,Customer Group,Група клієнтів
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Витрати рахунку є обов&#39;язковим для пункту {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Витрати рахунку є обов&#39;язковим для пункту {0}
 DocType: Item,Website Description,Сайт Опис
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Чиста зміна в капіталі
 DocType: Serial No,AMC Expiry Date,КУА Дата закінчення терміну дії
 ,Sales Register,Продажі Реєстрація
 DocType: Quotation,Quotation Lost Reason,Цитата Втрати Причина
@@ -2623,12 +2650,12 @@
 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 +108,Summary for this month and pending activities,Резюме для цього місяця і в очікуванні діяльності
 DocType: Customer Group,Customer Group Name,Група Ім&#39;я клієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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: Item,Attributes,Атрибути
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Отримати товари
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Будь ласка, введіть Списання аккаунт"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Отримати товари
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Будь ласка, введіть Списання аккаунт"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Остання дата замовлення
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Зробити акцизний Рахунок
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Рахунок {0} не належить компанії {1}
@@ -2644,7 +2671,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Дані проекту мудрий не доступні для цитати
 DocType: Project,Expected End Date,Очікувана Дата закінчення
 DocType: Appraisal Template,Appraisal Template Title,Оцінка шаблону Назва
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Комерційна
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Комерційна
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Батько товару {0} не повинні бути зі пункт
 DocType: Cost Center,Distribution Id,Розподіл Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Високий Послуги
@@ -2657,7 +2684,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Відповідність атрибутів {0} має бути в межах {1} до {2} в збільшень {3}
 DocType: Tax Rule,Sales,Продажів
 DocType: Stock Entry Detail,Basic Amount,Основна кількість
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Склад необхідний для складі Пункт {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Склад необхідний для складі Пункт {0}
 DocType: Leave Allocation,Unused leaves,Невикористані листя
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,За замовчуванням заборгованість Дебіторська
@@ -2669,16 +2696,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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,Зв&#39;язатися з HTML-
 DocType: Landed Cost Voucher,Purchase Receipts,Купівля Надходження
-DocType: Payment Reconciliation,Maximum Amount,Максимальна сума
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Як правило Ціни застосовується?
 DocType: Quality Inspection,Delivery Note No,Доставка Примітка Немає
 DocType: Company,Retail,Роздрібна торгівля
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Замовник {0} не існує
 DocType: Attendance,Absent,Відсутнім
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Зв&#39;язка товарів
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ряд {0}: Неприпустима посилання {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Зв&#39;язка товарів
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Ряд {0}: Неприпустима посилання {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купити податки і збори шаблон
 DocType: Upload Attendance,Download Template,Завантажити Шаблон
 DocType: GL Entry,Remarks,Зауваження
@@ -2705,7 +2732,7 @@
 ,Monthly Attendance Sheet,Щомісячна відвідуваність лист
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,"Чи не запис, не знайдено"
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Вартість Центр є обов&#39;язковим для пп {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Отримати елементів з комплекту продукту
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Отримати елементів з комплекту продукту
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Рахунок {0} не діє
 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,Відвідуваність З Дата і відвідуваність Дата є обов&#39;язковим
@@ -2714,8 +2741,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Прибуток і збитки&quot; тип рахунку {0} не допускаються в вхідний отвір
 DocType: Features Setup,Sales Discounts,Продажі Знижки
 DocType: Hub Settings,Seller Country,Продавець Країна
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Опублікувати товари на сайті
 DocType: Authorization Rule,Authorization Rule,Авторизація Правило
 DocType: Sales Invoice,Terms and Conditions Details,Правила та умови подробиці
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Специфікації
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажі Податки і збори шаблону
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Одяг та аксесуари
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Кількість ордена
@@ -2737,7 +2766,7 @@
 DocType: Time Log,Billing Amount,Сума рахунків
 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 +18,Applications for leave.,Заявки на відпустку.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Рахунок з існуючою транзакції не можуть бути вилучені
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Рахунок з існуючою транзакції не можуть бути вилучені
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Судові витрати
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","День місяця, в який автоматично замовлення буде генеруватися, наприклад, 05, 28 і т.д."
 DocType: Sales Invoice,Posting Time,Проводка Час
@@ -2753,11 +2782,11 @@
 DocType: Maintenance Visit,Breakdown,Зламатися
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Рахунок: {0} з валютою: {1} не може бути обраний
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Рахунок {0}: Батьки рахунку {1} не належить компанії: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Рахунок {0}: Батьки рахунку {1} не належить компанії: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Успішно видалений всі угоди, пов&#39;язані з цією компанією!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Станом на Дата
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Випробувальний термін
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,За замовчуванням Склад є обов&#39;язковим для фондового Пункт.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,За замовчуванням Склад є обов&#39;язковим для фондового Пункт.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Виплата заробітної плати за місяць {0} і рік {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Швидкість Ціни, якщо не вистачає"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Всього сплачена сума
@@ -2769,6 +2798,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Всього рахунків Сума (за допомогою журналів Time)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Ми продаємо цей пункт
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Постачальник Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,"Кількість повинна бути більше, ніж 0"
 DocType: Journal Entry,Cash Entry,Грошові запис
 DocType: Sales Partner,Contact Desc,Зв&#39;язатися Опис вироби
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Тип листя, як випадкові, хворих і т.д."
@@ -2777,7 +2807,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Додати рядки, щоб встановити щорічні бюджети на рахунках."
 DocType: Buying Settings,Default Supplier Type,За замовчуванням Тип Постачальник
 DocType: Production Order,Total Operating Cost,Загальна експлуатаційна вартість
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Примітка: Пункт {0} введений кілька разів
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Примітка: Пункт {0} введений кілька разів
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Всі контакти.
 DocType: Newsletter,Test Email Id,Тест Email ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Абревіатура Компанія
@@ -2802,7 +2832,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Всі групи покупців
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов&#39;язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Податковий шаблону є обов&#39;язковим.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Рахунок {0}: Батько не існує обліковий запис {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,Рахунок {0}: Батько не існує обліковий запис {1}
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ціни Оцінити (Компанія валют)
 DocType: Account,Temporary,Тимчасовий
 DocType: Address,Preferred Billing Address,Перевага платіжний адреса
@@ -2820,7 +2850,7 @@
 ,Item-wise Price List Rate,Пункт мудрий Ціни Оцінити
 DocType: Purchase Order Item,Supplier Quotation,Постачальник цитати
 DocType: Quotation,In Words will be visible once you save the Quotation.,"За словами будуть видні, як тільки ви збережете цитати."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} зупинений
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} зупинений
 DocType: Lead,Add to calendar on this date,Додати в календар в цей день
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила для додавання транспортні витрати.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Майбутні події
@@ -2840,24 +2870,24 @@
 DocType: Customer,From Lead,Зі свинцю
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Замовлення випущений у виробництво.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Виберіть фінансовий рік ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,"POS-профілю потрібно, щоб зробити запис POS"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,"POS-профілю потрібно, щоб зробити запис POS"
 DocType: Hub Settings,Name Token,Ім&#39;я маркера
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Стандартний Продаж
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Принаймні одне склад є обов&#39;язковим
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Selling,Стандартний Продаж
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Принаймні одне склад є обов&#39;язковим
 DocType: Serial No,Out of Warranty,З гарантії
 DocType: BOM Replace Tool,Replace,Замінювати
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} проти накладна {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Будь ласка, введіть замовчуванням Одиниця виміру"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} проти накладна {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,"Будь ласка, введіть замовчуванням Одиниця виміру"
 DocType: Purchase Invoice Item,Project Name,Назва проекту
 DocType: Supplier,Mention if non-standard receivable account,Згадка якщо нестандартна заборгованість рахунок
 DocType: Journal Entry Account,If Income or Expense,Якщо доходи або витрати
 DocType: Features Setup,Item Batch Nos,Пункт Пакетне пп
 DocType: Stock Ledger Entry,Stock Value Difference,Фото Значення Різниця
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Людський ресурс
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,Людський ресурс
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Оплата Примирення Оплата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Податкові активи
 DocType: BOM Item,BOM No,Специфікація Немає
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,Запис у щоденнику {0} не має облікового запису {1} або вже порівнюється з іншою ваучер
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,"Специфікації, які будуть замінені"
 DocType: Account,Debit,Дебет
@@ -2894,7 +2924,7 @@
 DocType: Stock Entry Detail,Additional Cost,Додаткова вартість
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Фінансовий рік Дата закінчення
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фільтрувати на основі Сертифікати Ні, якщо згруповані по Ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Зробити постачальників цитати
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Зробити постачальників цитати
 DocType: Quality Inspection,Incoming,Вхідний
 DocType: BOM,Materials Required (Exploded),"Матеріалів, необхідних (в розібраному)"
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Скорочення Заробіток для відпустки без збереження (LWP)
@@ -2902,7 +2932,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серійний номер {1}, не відповідає {2} {3}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Повсякденне Залишити
 DocType: Batch,Batch ID,Пакетна ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Примітка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Примітка: {0}
 ,Delivery Note Trends,Накладний Тенденції
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Резюме цього тижня
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} повинен бути куплені або субпідрядником товару в рядку {1}
@@ -2917,6 +2947,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,СР Купівля Оцінити
 DocType: Task,Actual Time (in Hours),Фактичний час (в годинах)
 DocType: Employee,History In Company,Історія У Компанії
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,Розсилка
 DocType: Address,Shipping,Доставка
 DocType: Stock Ledger Entry,Stock Ledger Entry,Фото Ledger Entry
@@ -2936,7 +2967,6 @@
 DocType: Purchase Order,End date of current order's period,Дата закінчення періоду поточного замовлення
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Зробити пропозицію лист
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Повернення
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,"За замовчуванням Одиниця виміру для варіанту повинні бути такими ж, як шаблон"
 DocType: Production Order Operation,Production Order Operation,Виробництво Порядок роботи
 DocType: Pricing Rule,Disable,Відключити
 DocType: Project Task,Pending Review,В очікуванні відгук
@@ -2944,7 +2974,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Ідентифікатор клієнта
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"Часу повинен бути більше, ніж від часу"
 DocType: Journal Entry Account,Exchange Rate,Курс валюти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Продажі Замовити {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Продажі Замовити {0} не представлено
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Склад {0}: Батьки рахунку {1} НЕ Bolong компанії {2}
 DocType: BOM,Last Purchase Rate,Остання Купівля Оцінити
 DocType: Account,Asset,Актив
@@ -2964,7 +2994,7 @@
 ,Available Stock for Packing Items,Доступно для Упаковка зі Items
 DocType: Item Variant,Item Variant,Пункт Варіант
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Установка цього Адреса шаблон за замовчуванням, оскільки немає ніякого іншого замовчуванням"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс рахунку в дебет вже, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;Кредит»"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,Управління якістю
 DocType: Production Planning Tool,Filter based on customer,Фільтр на основі клієнта
 DocType: Payment Tool Detail,Against Voucher No,На Сертифікати Немає
@@ -2981,6 +3011,7 @@
 DocType: Opportunity,Next Contact,Наступна Контактні
 DocType: Employee,Employment Type,Вид зайнятості
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Основні активи
+,Cash Flow,Грошовий потік
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Термін подачі заяв не може бути з двох alocation записів
 DocType: Item Group,Default Expense Account,За замовчуванням Витрати аккаунт
 DocType: Employee,Notice (days),Примітка (днів)
@@ -3012,13 +3043,12 @@
 DocType: Production Order,Warehouses,Склади
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Друк та стаціонарні
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Вузол Група
-DocType: Payment Reconciliation,Minimum Amount,Мінімальна сума
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Оновлення готової продукції
 DocType: Workstation,per hour,в годину
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Рахунок для складу (Perpetual Inventory) буде створена під цим обліковим записом.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Склад не може бути видалений, поки існує запис складі книга для цього складу."
 DocType: Company,Distribution,Розподіл
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Виплачувана сума
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Виплачувана сума
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Керівник проекту
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Відправка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс знижка дозволило пункту: {0} {1}%
@@ -3042,7 +3072,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Підтримка Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компанія на складах не вистачає {0}
 DocType: POS Profile,Terms and Conditions,Правила та умови
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Для Дата повинна бути в межах фінансового року. Припускаючи Дата = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Для Дата повинна бути в межах фінансового року. Припускаючи Дата = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Тут ви можете зберегти зріст, вага, алергії, медичні проблеми і т.д."
 DocType: Leave Block List,Applies to Company,Відноситься до Компанії
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Не можна скасувати, тому що представив зі входу {0} існує"
@@ -3056,11 +3086,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Будь ласка, введіть Купівля розписок"
 DocType: Sales Invoice,Get Advances Received,Отримати аванси отримані
 DocType: Email Digest,Add/Remove Recipients,Додати / Видалити Одержувачів
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},Угода не має проти зупинив виробництво Замовити {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),"Налаштування сервера вхідної в підтримку електронний ідентифікатор. (наприклад, support@example.com)"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Брак Кількість
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Стан варіант {0} існує з тими ж атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Стан варіант {0} існує з тими ж атрибутами
 DocType: Salary Slip,Salary Slip,Зарплата ковзання
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Для Дата&quot; потрібно
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Створення пакувальні листи для упаковки повинні бути доставлені. Використовується для повідомлення номер пакету, вміст пакету і його вага."
@@ -3138,7 +3168,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Співробітник записів.
 DocType: HR Settings,Payroll Settings,Налаштування заробітної плати
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Підходимо незв&#39;язані Рахунки та платежі.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Зробити замовлення
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Зробити замовлення
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Корінь не може бути батько МВЗ
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Виберіть бренд ...
 DocType: Sales Invoice,C-Form Applicable,"С-формі, застосовної"
@@ -3153,7 +3183,7 @@
 DocType: Appraisal,Start Date,Дата початку
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Виділяють листя протягом.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Натисніть тут, щоб перевірити,"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Рахунок {0}: Ви не можете призначити себе як батька рахунок
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Рахунок {0}: Ви не можете призначити себе як батька рахунок
 DocType: Purchase Invoice Item,Price List Rate,Ціни Оцінити
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Показати &quot;На складі&quot; або &quot;немає на складі&quot;, заснований на складі наявної у цьому склад."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),"Білл матеріалів (BOM),"
@@ -3162,17 +3192,17 @@
 DocType: Project,Expected Start Date,Очікувана дата початку
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Видалити елемент, якщо звинувачення не застосовується до цього пункту"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,"Напр., smsgateway.com/api/send_sms.cgi"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Отримати
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Отримати
 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: Employee Leave Approver,Employee Leave Approver,Співробітник Залишити затверджує
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} був успішно доданий в нашу розсилку.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Змінити порядок вступу вже існує для цього складу {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Змінити порядок вступу вже існує для цього складу {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не можете оголосити як втрачений, бо цитати був зроблений."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купівля Майстер-менеджер
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Виробничий замовлення {0} повинен бути представлений
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Виробничий замовлення {0} повинен бути представлений
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Будь ласка, виберіть дату початку та дату закінчення Пункт {0}"
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Основні доповіді
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сьогоднішній день не може бути раніше від дати
@@ -3190,7 +3220,7 @@
 DocType: Industry Type,Industry Type,Промисловість Тип
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Щось пішло не так!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Увага: Залиште додаток містить наступні дати блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Видаткова накладна {0} вже були представлені
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Видаткова накладна {0} вже були представлені
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Дата Виконання
 DocType: Purchase Invoice Item,Amount (Company Currency),Сума (Компанія валют)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Організація блок (департамент) господар.
@@ -3209,10 +3239,10 @@
 ,Serial No Service Contract Expiry,Серійний номер Сервіс контракт Термін
 DocType: Item,Unit of Measure Conversion,Одиниця виміру конверсії
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Співробітник не може бути змінений
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ви не можете кредитні та дебетові ж обліковий запис в той же час
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Ви не можете кредитні та дебетові ж обліковий запис в той же час
 DocType: Naming Series,Help HTML,Допомога HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всього weightage призначений повинна бути 100%. Це {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Посібник для пере- {0} схрещеними Пункт {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Посібник для пере- {0} схрещеними Пункт {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Назва особі або організації, що ця адреса належить."
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Ваші Постачальники
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Неможливо встановити, як втратив у продажу замовлення провадиться."
@@ -3225,35 +3255,35 @@
 DocType: Employee,Date of Issue,Дата випуску
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: З {0} для {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Ряд # {0}: Встановити Постачальник по пункту {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,Сайт зображення {0} прикріплений до пункту {1} не може бути знайдений
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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.,Список цей пункт в декількох групах на сайті.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Будь ласка, перевірте мультивалютний варіант, що дозволяє рахунки іншій валюті"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,"Будь ласка, перевірте мультивалютний варіант, що дозволяє рахунки іншій валюті"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Пункт: {0} не існує в системі
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,"Ви не авторизовані, щоб встановити значення Frozen"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,"Ви не авторизовані, щоб встановити значення Frozen"
 DocType: Payment Reconciliation,Get Unreconciled Entries,Отримати Неузгоджені Записи
+DocType: Payment Reconciliation,From Invoice Date,Від Накладна Дата
 DocType: Cost Center,Budgets,Бюджети
-DocType: Employee,Emergency Contact Details,Аварійний Контактні дані
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Що це робить?
 DocType: Delivery Note,To Warehouse,На склад
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Рахунок {0} був введений більш ніж один раз для фінансового року {1}
 ,Average Commission Rate,Середня ставка комісії
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Має серійний номер &#39;не може бути&#39; Так &#39;для не-фондовій пункту
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Має серійний номер &#39;не може бути&#39; Так &#39;для не-фондовій пункту
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Відвідуваність не можуть бути відзначені для майбутніх дат
 DocType: Pricing Rule,Pricing Rule Help,Ціни Правило Допомога
 DocType: Purchase Taxes and Charges,Account Head,Рахунок Керівник
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Оновлення додаткових витрат для розрахунку приземлився вартість товарів
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Електричний
 DocType: Stock Entry,Total Value Difference (Out - In),Загальна вартість Різниця (з - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс є обов&#39;язковим
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс є обов&#39;язковим
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Ідентифікатор користувача не встановлений Employee {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Від гарантії Претензії
 DocType: Stock Entry,Default Source Warehouse,Джерело за замовчуванням Склад
 DocType: Item,Customer Code,Код клієнта
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Нагадування про день народження для {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Дні з останнього ордена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
 DocType: Buying Settings,Naming Series,Іменування серії
 DocType: Leave Block List,Leave Block List Name,Залиште Ім&#39;я Чорний список
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Активи фонду
@@ -3265,7 +3295,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Закриття рахунку {0} повинен бути типу відповідальністю / власний капітал
 DocType: Authorization Rule,Based On,Грунтуючись на
 DocType: Sales Order Item,Ordered Qty,Замовив Кількість
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Пункт {0} відключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Пункт {0} відключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Заморожені Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Період з Період і датам обов&#39;язкових для повторюваних {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектна діяльність / завдання.
@@ -3273,7 +3303,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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"
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списання Сума (Компанія валют)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість тональний"
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість тональний"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Приземлився Вартість ваучера
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Будь ласка, встановіть {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторіть день місяця
@@ -3302,12 +3332,12 @@
 DocType: Upload Attendance,Upload Attendance,Завантажити Відвідуваність
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Специфікація і виробництво Кількість потрібні
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старіння Діапазон 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Кількість
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Кількість
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Специфікація замінити
 ,Sales Analytics,Продажі Аналітика
 DocType: Manufacturing Settings,Manufacturing Settings,Налаштування Виробництво
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Налаштування e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,"Будь ласка, введіть валюту за замовчуванням в компанії Master"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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 +101,Daily Reminders,Щоденні нагадування
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Податковий Правило конфлікти з {0}
@@ -3333,13 +3363,13 @@
 DocType: Sales Order Item,Produced Quantity,Здобуте кількість
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Інженер
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Пошук Sub Асамблей
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Код товара потрібно в рядку Немає {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Код товара потрібно в рядку Немає {0}
 DocType: Sales Partner,Partner Type,Тип Партнер
 DocType: Purchase Taxes and Charges,Actual,Фактичний
 DocType: Authorization Rule,Customerwise Discount,Customerwise Знижка
 DocType: Purchase Invoice,Against Expense Account,На рахунки витрат
 DocType: Production Order,Production Order,Виробничий замовлення
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Установка Примітка {0} вже були представлені
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Установка Примітка {0} вже були представлені
 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,Дивитися зараз
@@ -3351,15 +3381,15 @@
 DocType: Employee,Applicable Holiday List,Стосується Список відпочинку
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серія Оновлене
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Тип звіту є обов&#39;язковим
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,Тип звіту є обов&#39;язковим
 DocType: Item,Serial Number Series,Серійний номер серії
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад є обов&#39;язковим для фондового Пункт {0} в рядку {1}
 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/public/js/setup_wizard.js +101,The First User: You,Перший користувача: Ви
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фінансовий рік Дата початку і фінансовий рік Дата закінчення вже встановлені у фінансовий рік {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успішно Примирення
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фінансовий рік Дата початку і фінансовий рік Дата закінчення вже встановлені у фінансовий рік {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Успішно Примирення
 DocType: Production Order,Planned End Date,Планована Дата закінчення
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Де елементи зберігаються.
 DocType: Tax Rule,Validity,Термін дії
@@ -3367,7 +3397,7 @@
 DocType: Attendance,Attendance,Відвідуваність
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Дата публікації і розміщення час є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Дата публікації і розміщення час є обов&#39;язковим
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Податковий шаблон для покупки угод.
 ,Item Prices,Предмет Ціни
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"За словами будуть видні, як тільки ви збережете замовлення."
@@ -3376,15 +3406,15 @@
 DocType: Task,Review Date,Огляд Дата
 DocType: Purchase Invoice,Advance Payments,Авансові платежі
 DocType: Purchase Taxes and Charges,On Net Total,На Net Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,"Цільова склад у рядку {0} повинен бути такий же, як виробничого замовлення"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,"Цільова склад у рядку {0} повинен бути такий же, як виробничого замовлення"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Немає дозволу на використання платіжного інструмента
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"&quot;Повідомлення Адреси електронної пошти&quot;, не зазначені для повторюваних% S"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,"Валюта не може бути змінена після внесення запису, використовуючи інший валюти"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,"Валюта не може бути змінена після внесення запису, використовуючи інший валюти"
 DocType: Company,Round Off Account,Округлення аккаунт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Адміністративні витрати
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Батько Група клієнтів
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Зміна
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Зміна
 DocType: Purchase Invoice,Contact Email,Контактний Email
 DocType: Appraisal Goal,Score Earned,Оцінка Зароблені
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","наприклад, &quot;Моя компанія ТОВ&quot;"
@@ -3394,13 +3424,13 @@
 DocType: Packing Slip,Gross Weight UOM,Вага брутто Одиниця виміру
 DocType: Email Digest,Receivables / Payables,Дебіторська заборгованість Кредиторська заборгованість /
 DocType: Delivery Note Item,Against Sales Invoice,На рахунок продажу
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Рахунок з кредитовим сальдо
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Рахунок з кредитовим сальдо
 DocType: Landed Cost Item,Landed Cost Item,Приземлився Вартість товару
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Показати нульові значення
 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,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
 DocType: Item,Default Warehouse,За замовчуванням Склад
 DocType: Task,Actual End Date (via Time Logs),Фактична Дата закінчення (через журнали Time)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Бюджет не може бути призначений на обліковий запис групи {0}
@@ -3436,29 +3466,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планувати час журнали за межами робочої станції робочих годин.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} вже були представлені
 ,Items To Be Requested,Товари слід замовляти
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Отримати останню покупку Оцінити
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Платіжна Оцінити на основі виду діяльності (за годину)
 DocType: Company,Company Info,Інформація про компанію
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Компанія Email ID не знайдений, отже, пошта не відправлено"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Застосування засобів (активів)
 DocType: Production Planning Tool,Filter based on item,Фільтр на основі пункту
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Дебетовий рахунок
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Дебетовий рахунок
 DocType: Fiscal Year,Year Start Date,Рік Дата початку
 DocType: Attendance,Employee Name,Ім&#39;я співробітника
 DocType: Sales Invoice,Rounded Total (Company Currency),Округлі Всього (Компанія валют)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Не можете приховані в групу, тому що обрано тип рахунку."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,"Не можете приховані в групу, тому що обрано тип рахунку."
 DocType: Purchase Common,Purchase Common,Купівля Загальні
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,Від можливостей
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Виплати працівникам
 DocType: Sales Invoice,Is POS,Це POS-
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
 DocType: Production Order,Manufactured Qty,Виробник Кількість
 DocType: Purchase Receipt Item,Accepted Quantity,Прийнято Кількість
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} існує не
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,"Законопроекти, підняті клієнтам."
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Немає {0}: Сума не може бути більше, ніж очікуванні Сума проти Витрата претензії {1}. В очікуванні сума {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Немає {0}: Сума не може бути більше, ніж очікуванні Сума проти Витрата претензії {1}. В очікуванні сума {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} додав абоненти
 DocType: Maintenance Schedule,Schedule,Графік
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",Визначити бюджет для цього МВЗ. Щоб встановити бюджету дію см &quot;Список компанії&quot;
@@ -3466,7 +3497,7 @@
 DocType: Quality Inspection Reading,Reading 3,Читання 3
 ,Hub,Концентратор
 DocType: GL Entry,Voucher Type,Ваучер Тип
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ціни не знайдений або відключений
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Ціни не знайдений або відключений
 DocType: Expense Claim,Approved,Затверджений
 DocType: Pricing Rule,Price,Ціна
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як &quot;ліві&quot;
@@ -3480,7 +3511,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Бухгалтерських журналів.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кількість на зі складу
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партія / рахунку не відповідає {1} / {2} в {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Щоб створити податковий облік
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
 DocType: Account,Stock,Фондовий
@@ -3491,7 +3522,7 @@
 DocType: Employee,Contract End Date,Дата закінчення контракту
 DocType: Sales Order,Track this Sales Order against any Project,Підписка на замовлення клієнта проти будь-якого проекту
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Замовлення на продаж Витягніть (до пологів) на основі вищеперелічених критеріїв
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Від постачальника цитати
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Від постачальника цитати
 DocType: Deduction Type,Deduction Type,Відрахування Тип
 DocType: Attendance,Half Day,Половина дня
 DocType: Pricing Rule,Min Qty,Мінімальна Кількість
@@ -3499,7 +3530,7 @@
 DocType: GL Entry,Transaction Date,Угода Дата
 DocType: Production Plan Item,Planned Qty,Плановані Кількість
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Загальні податкові
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Для Кількість (Виробник Кількість) є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Для Кількість (Виробник Кількість) є обов&#39;язковим
 DocType: Stock Entry,Default Target Warehouse,Мета за замовчуванням Склад
 DocType: Purchase Invoice,Net Total (Company Currency),Чистий Всього (Компанія валют)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ряд {0}: Партія Тип і партія застосовується лише щодо / дебіторська заборгованість рахунок
@@ -3553,9 +3584,9 @@
 DocType: Customer,Commission Rate,Ставка комісії
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Зробити Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Блок відпустки додатки по кафедрі.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Кошик Пусто
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Кошик Пусто
 DocType: Production Order,Actual Operating Cost,Фактична Операційна Вартість
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Корінь не може бути змінений.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Корінь не може бути змінений.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Позначена сума не може перевищувати суму unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Дозволити виробництво на канікули
 DocType: Sales Order,Customer's Purchase Order Date,Клієнтам Замовлення Дата
@@ -3566,11 +3597,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Умови шаблону
 DocType: Serial No,Delivery Details,Деталі Доставка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Вартість Центр потрібно в рядку {0} в таблиці податків для типу {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Вартість Центр потрібно в рядку {0} в таблиці податків для типу {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматичне створення матеріалів запит, якщо кількість падає нижче цього рівня,"
 ,Item-wise Purchase Register,Пункт мудрий Купівля Реєстрація
 DocType: Batch,Expiry Date,Термін придатності
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Щоб встановити рівень повторного замовлення, деталь повинна бути Купівля товару або товару Виробництво"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Щоб встановити рівень повторного замовлення, деталь повинна бути Купівля товару або товару Виробництво"
 ,Supplier Addresses and Contacts,Постачальник Адреси та контакти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Ласка, виберіть категорію в першу чергу"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Майстер проекту.
@@ -3578,7 +3609,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Половина дня)
 DocType: Supplier,Credit Days,Кредитні Дні
 DocType: Leave Type,Is Carry Forward,Є переносити
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Отримати елементів із специфікації
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,Відомість матеріалів
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партія Тип і партія необхідна для / дебіторська заборгованість увагу {1}
@@ -3586,7 +3617,7 @@
 DocType: Employee,Reason for Leaving,Причина виїзду
 DocType: Expense Claim Detail,Sanctioned Amount,Санкціонований Сума
 DocType: GL Entry,Is Opening,Відкриває
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запис не може бути пов&#39;язаний з {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Рахунок {0} не існує
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запис не може бути пов&#39;язаний з {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Рахунок {0} не існує
 DocType: Account,Cash,Грошові кошти
 DocType: Employee,Short biography for website and other publications.,Коротка біографія для веб-сайту та інших публікацій.
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index 8d24ec1..fb0b064 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Sản phẩm tiêu dùng
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vui lòng chọn Đảng Loại đầu tiên
 DocType: Item,Customer Items,Mục hàng
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Tài khoản {0}: Cha mẹ tài khoản {1} không thể là một sổ cái
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,Tài khoản {0}: Cha mẹ tài khoản {1} không thể là một sổ cái
 DocType: Item,Publish Item to hub.erpnext.com,Publish khoản để hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Thông báo email
 DocType: Item,Default Unit of Measure,Đơn vị đo mặc định
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Tiền tệ là cần thiết cho Danh sách Price {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sẽ được tính toán trong các giao dịch.
 DocType: Purchase Order,Customer Contact,Khách hàng Liên hệ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Từ vật liệu Yêu cầu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,Từ vật liệu Yêu cầu
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Nộp đơn công việc
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Không có thêm kết quả.
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 Để duy trì khách hàng mã hàng khôn ngoan và để làm cho họ tìm kiếm dựa trên mã sử dụng tùy chọn này
 DocType: Mode of Payment Account,Mode of Payment Account,Phương thức thanh toán Tài khoản
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Hiện biến thể
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Số lượng
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Số lượng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Các khoản vay (Nợ phải trả)
 DocType: Employee Education,Year of Passing,Năm Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Sản phẩm trong kho
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Chăm sóc sức khỏe
 DocType: Purchase Invoice,Monthly,Hàng tháng
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Chậm trễ trong thanh toán (Ngày)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Hóa đơn
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,Hóa đơn
 DocType: Maintenance Schedule Item,Periodicity,Tính tuần hoàn
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Địa chỉ Email
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,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
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Điểm số (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} không phù hợp với {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} không phù hợp với {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Không có xe
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vui lòng chọn Bảng giá
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Vui lòng chọn Bảng giá
 DocType: Production Order Operation,Work In Progress,Làm việc dở dang
 DocType: Employee,Holiday List,Danh sách kỳ nghỉ
 DocType: Time Log,Time Log,Giờ
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Cùng Công ty được nhập nhiều hơn một lần
 DocType: Employee,Married,Kết hôn
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Không được phép cho {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},Chứng khoán không thể được cập nhật với giao hàng Lưu ý {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},Chứng khoán không thể được cập nhật với giao hàng Lưu ý {0}
 DocType: Payment Reconciliation,Reconcile,Hòa giải
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Cửa hàng tạp hóa
 DocType: Quality Inspection Reading,Reading 1,Đọc 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Hãy nhập Ngân hàng
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Quỹ lương hưu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Kho là bắt buộc nếu loại tài khoản là kho
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,Kho là bắt buộc nếu loại tài khoản là kho
 DocType: SMS Center,All Sales Person,Tất cả các doanh Người
 DocType: Lead,Person Name,Tên người
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kiểm tra nếu để tái diễn, bỏ chọn để ngăn chặn tái phát hoặc đặt đúng End ngày"
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,Quan tâm
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Mở ra
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Từ {0} đến {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Từ {0} đến {1}
 DocType: Item,Copy From Item Group,Sao chép Từ mục Nhóm
 DocType: Journal Entry,Opening Entry,Mở nhập
 DocType: Stock Entry,Additional Costs,Chi phí bổ sung
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Tài khoản với giao dịch hiện có không thể chuyển đổi sang nhóm.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,Tài khoản với giao dịch hiện có không thể chuyển đổi sang nhóm.
 DocType: Lead,Product Enquiry,Đặt hàng sản phẩm
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Vui lòng nhập công ty đầu tiên
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vui lòng chọn Công ty đầu tiên
 DocType: Employee Education,Under Graduate,Dưới đại học
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Mục tiêu trên
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Mục tiêu trên
 DocType: BOM,Total Cost,Tổng chi phí
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Lần đăng nhập:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,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
@@ -165,7 +165,7 @@
 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ải Template, đ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 được chọn sẽ đến trong bản mẫu, hồ sơ tham dự với hiện tại"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Sẽ được cập nhật sau khi bán hàng hóa đơn được Gửi.
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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, thuế hàng {1} cũng phải được bao gồm"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Cài đặt cho nhân sự Mô-đun
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,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ì
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Items Vật giá
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Từ ngày phải được trong năm tài chính. Giả sử Từ ngày = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},Từ ngày phải được trong năm tài chính. Giả sử Từ ngày = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Chọn nhân viên cho người mà bạn đang tạo ra thẩm định.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Chi phí Trung tâm {0} không thuộc về Công ty {1}
 DocType: Customer,Individual,Individual
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Vui lòng nhập Công ty
 DocType: Delivery Note Item,Against Sales Invoice Item,Chống bán hóa đơn hàng
 ,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 +37,Net Cash from Financing,Tiền thuần từ tài chính
 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
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Tiếp theo định kỳ {0} sẽ được tạo ra trên {1}
@@ -222,6 +223,7 @@
 ,Contact Name,Tên liên lạc
 DocType: Production Plan Item,SO Pending Qty,SO chờ Số lượng
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Tạo phiếu lương cho các tiêu chí nêu trên.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Không có mô tả cho
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Yêu cầu để mua hàng.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +114,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
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,Mục Trang Thông số kỹ thuật
 DocType: Payment Tool,Reference No,Reference No
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Lại bị chặn
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +585,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/accounts/utils.py +341,Annual,Hàng năm
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Cổ hòa giải hàng
 DocType: Stock Entry,Sales Invoice No,Hóa đơn bán hàng không
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,Loại nhà cung cấp
 DocType: Item,Publish in Hub,Xuất bản trong Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Mục {0} bị hủy bỏ
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,Mục {0} bị hủy bỏ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Yêu cầu tài 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,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: Employee,Relation,Mối quan hệ
 DocType: Shipping Rule,Worldwide Shipping,Vận chuyển trên toàn thế giới
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Đơn đặt hàng xác nhận từ khách hàng.
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,Đề xuất
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Thiết lập mục Nhóm-khôn ngoan ngân sách trên lãnh thổ này. Bạn cũng có thể bao gồm thời vụ bằng cách thiết lập phân phối.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Vui lòng nhập nhóm tài khoản phụ huynh cho kho {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Thanh toán khỏi {0} {1} không thể lớn hơn xuất sắc Số tiền {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Thanh toán khỏi {0} {1} không thể lớn hơn xuất sắc Số tiền {2}
 DocType: Supplier,Address HTML,Địa chỉ HTML
 DocType: Lead,Mobile No.,Điện thoại di động số
 DocType: Maintenance Schedule,Generate Schedule,Tạo Lịch
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Mới nhất
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Tối đa 5 ký tự
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Người phê duyệt Để lại đầu tiên trong danh sách sẽ được thiết lập mặc định Để lại phê duyệt
+apps/erpnext/erpnext/config/desktop.py +73,Learn,Học
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Hoạt động Chi phí cho mỗi nhân viên
 DocType: Accounts Settings,Settings for Accounts,Cài đặt cho tài khoản
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Quản lý bán hàng người Tree.
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,Đa ngoại tệ
 DocType: Payment Reconciliation Invoice,Invoice Type,Loại hóa đơn
 DocType: Sales Invoice Item,Delivery Note,Giao hàng Ghi
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Thiết lập Thuế
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Thiết lập Thuế
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Nhập thanh toán đã được sửa đổi sau khi bạn kéo nó. Hãy kéo nó một lần nữa.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0} vào hai lần tại khoản thuế
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} Nhập hai lần vào Mục Thuế
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,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: Workstation,Rent Cost,Chi phí thuê
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vui lòng chọn tháng và năm
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Có sẵn trong HĐQT, Giao hàng tận nơi Lưu ý, mua hóa đơn, sản xuất hàng, Mua hàng, mua hóa đơn, hóa đơn bán hàng, bán hàng đặt hàng, chứng khoán nhập cảnh, timesheet"
 DocType: Item Tax,Tax Rate,Tỷ lệ thuế
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} đã được phân bổ cho Employee {1} cho kỳ {2} {3} để
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Chọn nhiều Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,Chọn nhiều Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} được quản lý theo từng đợt, không thể hòa giải được sử dụng \
  Cổ hòa giải, thay vì sử dụng cổ nhập"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Không phải giống như {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Chuyển đổi sang non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Mua hóa đơn phải được gửi
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Y khoa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Lý do mất
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation được đóng cửa vào các ngày sau đây theo Danh sách khách sạn Holiday: {0}
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Cơ hội
 DocType: Employee,Single,Một lần
 DocType: Issue,Attachment,File đính kèm
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Ngân sách không thể được đặt cho Trung tâm chi phí Nhóm
@@ -372,7 +376,7 @@
 DocType: Account,Is Group,Is Nhóm
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Tự động Đặt nối tiếp Nos dựa trên FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kiểm tra nhà cung cấp hóa đơn Số độc đáo
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"'Để Trường hợp số' không thể nhỏ hơn ""Từ trường hợp số '"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Đến trường hợp số' không thể nhỏ hơn 'Từ trường hợp số'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Không lợi nhuận
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Chưa Bắt Đầu
 DocType: Lead,Channel Partner,Đối tác
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Cài đặt chung cho tất cả các quá trình sản xuất.
 DocType: Accounts Settings,Accounts Frozen Upto,"Chiếm đông lạnh HCM,"
 DocType: SMS Log,Sent On,Gửi On
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,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 +563,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 +140,Holiday master.,Chủ lễ.
 DocType: Material Request Item,Required Date,Ngày yêu cầu
 DocType: Delivery Note,Billing Address,Địa chỉ thanh toán
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Vui lòng nhập Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Vui lòng nhập Item Code.
 DocType: BOM,Costing,Chi phí
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Nếu được chọn, số tiền thuế sẽ được coi là đã có trong tiền lệ In / In"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Tổng số Số lượng
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Mỹ phẩm
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,"To merge, following properties must be same for both items","Sáp nhập, tài sản sau đây là giống nhau cho cả hai mục"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items","Sáp nhập, tài sản sau đây là giống nhau cho cả hai mục"
 DocType: Shipping Rule,Net Weight,Trọng lượng
 DocType: Employee,Emergency Phone,Điện thoại khẩn cấp
 ,Serial No Warranty Expiry,Nối tiếp Không có bảo hành hết hạn
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Tăng không thể là 0
 DocType: Production Planning Tool,Material Requirement,Yêu cầu tài liệu
 DocType: Company,Delete Company Transactions,Xóa Giao dịch Công ty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Mục {0} không được mua hàng
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Mục {0} không được mua hàng
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} là một địa chỉ email hợp lệ trong '\
  Notification Địa chỉ Email'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Tổng Thanh toán Năm nay:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Thêm / Sửa Thuế và lệ phí
 DocType: Purchase Invoice,Supplier Invoice No,Nhà cung cấp hóa đơn Không
 DocType: Territory,For reference,Để tham khảo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Không thể xóa tiếp Serial No {0}, vì nó được sử dụng trong các giao dịch chứng khoán"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Đóng cửa (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),Đóng cửa (Cr)
 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
 ,Pending Qty,Pending Qty
@@ -466,7 +469,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Phân phối hàng tháng ** giúp bạn phân phối ngân sách của bạn trên tháng nếu bạn có tính thời vụ trong kinh doanh của bạn.
 
  Để phân phối một ngân sách bằng cách sử dụng phân phối này, thiết lập phân phối hàng tháng ** ** này trong ** Trung tâm chi phí **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Không có hồ sơ được tìm thấy trong bảng hóa đơn
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Không có hồ sơ được tìm thấy trong bảng hóa đơn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,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 +84,Financial / accounting year.,Năm tài chính / kế toán.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Xin lỗi, Serial Nos không thể được sáp nhập"
@@ -474,9 +477,9 @@
 DocType: Project Task,Project Task,Dự án công tác
 ,Lead Id,Id dẫn
 DocType: C-Form Invoice Detail,Grand Total,Tổng cộng
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Năm tài chính bắt đầu ngày không nên lớn hơn tài chính năm Ngày kết thúc
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Năm tài chính bắt đầu ngày không nên lớn hơn tài chính năm Ngày kết thúc
 DocType: Warranty Claim,Resolution,Phân giải
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Delivered: {0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},Delivered: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Tài khoản phải trả
 DocType: Sales Order,Billing and Delivery Status,Thanh toán và giao hàng Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Khách hàng lặp lại
@@ -491,7 +494,7 @@
 DocType: Quotation,Quotation To,Để báo giá
 DocType: Lead,Middle Income,Thu nhập trung bình
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Mở (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,Số lượng phân bổ không thể phủ định
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Một kho hợp lý chống lại các entry chứng khoán được thực hiện.
@@ -500,7 +503,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Sản xuất theo thứ tự là bắt buộc
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Đề nghị Viết
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Một người bán hàng {0} tồn tại với cùng id viên
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Tiêu cực Cổ Lỗi ({6}) cho mục {0} trong kho {1} trên {2} {3} trong {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Tiêu cực Cổ Lỗi ({6}) cho mục {0} trong kho {1} trên {2} {3} trong {4} {5}
 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
 DocType: Time Log,Billed,Một cái gì đó đã đi sai!
@@ -519,16 +522,17 @@
 DocType: Activity Type,Default Costing Rate,Mặc định Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Lịch trình bảo trì
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sau đó biết giá quy được lọc ra dựa trên khách hàng, Nhóm khách hàng, lãnh thổ, Nhà cung cấp, Loại Nhà cung cấp, vận động, đối tác kinh doanh, vv"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Thay đổi ròng trong kho
 DocType: Employee,Passport Number,Số hộ chiếu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Chi cục trưởng
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Từ mua hóa đơn
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Cùng mục đã được nhập nhiều lần.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Từ mua hóa đơn
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,Cùng mục đã được nhập nhiều lần.
 DocType: SMS Settings,Receiver Parameter,Nhận thông số
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Dựa trên"" và ""Nhóm bởi"" không thể giống nhau"
 DocType: Sales Person,Sales Person Targets,Mục tiêu người bán hàng
 DocType: Production Order Operation,In minutes,Trong phút
 DocType: Issue,Resolution Date,Độ phân giải ngày
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,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 +663,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}
 DocType: Selling Settings,Customer Naming By,Khách hàng đặt tên By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Chuyển đổi cho Tập đoàn
 DocType: Activity Cost,Activity Type,Loại hoạt động
@@ -539,7 +543,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Xuất bản
 DocType: Activity Cost,Projects User,Dự án tài
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Tiêu thụ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} không tìm thấy trong bảng hóa đơn chi tiết
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}: {1} không tìm thấy trong bảng hóa đơn chi tiết
 DocType: Company,Round Off Cost Center,Vòng Tắt Center Chi phí
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bảo trì đăng nhập {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 DocType: Material Request,Material Transfer,Chuyển tài liệu
@@ -561,13 +565,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Để theo dõi mục trong bán hàng và giấy tờ mua bán dựa trên nos nối tiếp của họ. Này cũng có thể được sử dụng để theo dõi các chi tiết bảo hành của sản phẩm.
 DocType: Purchase Receipt Item Supplied,Current Stock,Cổ hiện tại
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Kho từ chối là bắt buộc đối với mục regected
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,Tổng số thanh toán trong năm nay
 DocType: Account,Expenses Included In Valuation,Chi phí bao gồm trong định giá
 DocType: Employee,Provide email id registered in company,Cung cấp email id đăng ký tại công ty
 DocType: Hub Settings,Seller City,Người bán Thành phố
 DocType: Email Digest,Next email will be sent on:,Email tiếp theo sẽ được gửi về:
 DocType: Offer Letter Term,Offer Letter Term,Cung cấp văn Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +533,Item has variants.,Mục có các biến thể.
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,Item has variants.,Mục có các biến thể.
 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ị cổ phiếu
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Loại cây
@@ -585,18 +589,18 @@
 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, tháng, hóa đơn tiếp theo sẽ được tạo ra. Nó được tạo ra trên trình."
 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 +92,{0} is not a stock Item,{0} không phải là một cổ phiếu hàng
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} không phải là một cổ phiếu hàng
 DocType: Mode of Payment Account,Default Account,Tài khoản mặc định
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Dẫn phải được thiết lập nếu Cơ hội được làm từ chì
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Vui lòng chọn ngày nghỉ hàng tuần
 DocType: Production Order Operation,Planned End Time,Planned End Time
 ,Sales Person Target Variance Item Group-Wise,Người bán hàng mục tiêu phương sai mục Nhóm-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Tài khoản với giao dịch hiện tại không thể được chuyển đổi sang sổ cái
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,Tài khoản với giao dịch hiện tại không thể được chuyển đổi sang sổ cái
 DocType: Delivery Note,Customer's Purchase Order No,Của khách hàng Mua hàng Không
 DocType: Employee,Cell Number,Số di động
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Các yêu cầu tự động Chất liệu Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Thua
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Bạn không thể nhập chứng từ hiện tại 'Against Journal nhập' cột
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Bạn không thể nhập chứng từ hiện tại 'Against Journal nhập' cột
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Năng lượng
 DocType: Opportunity,Opportunity From,Từ cơ hội
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Báo cáo tiền lương hàng tháng.
@@ -605,9 +609,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Từ {0} của loại {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Hàng {0}: Chuyển đổi Factor là bắt buộc
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Kế toán Entries có thể được thực hiện đối với các nút lá. Entries chống lại nhóm không được phép.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,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 +359,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ì
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Số mua hóa đơn cần thiết cho mục {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Số mua hóa đơn cần thiết cho mục {0}
 DocType: Item Attribute Value,Item Attribute Value,Mục Attribute Value
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Các chiến dịch bán hàng.
 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.
@@ -665,15 +669,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Danh sách giá không được chọn
 DocType: Employee,Family Background,Gia đình nền
 DocType: Process Payroll,Send Email,Gởi thư
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm không hợp lệ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm không hợp lệ {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Không phép
 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 +47,"To filter based on Party, select Party Type first","Để lọc dựa vào Đảng, Đảng chọn Gõ đầu tiên"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;Update Cổ&#39; không thể được kiểm tra vì mục này không được cung cấp thông qua {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Cập nhật kho' không thể kiểm tra được vì mục này không được giao qua {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,lớp
 DocType: Item,Items with higher weightage will be shown higher,Mục weightage cao sẽ được hiển thị cao hơn
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Ngân hàng hòa giải chi tiết
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,Hoá đơn của tôi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,Hoá đơn của tôi
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Không có nhân viên tìm thấy
 DocType: Purchase Order,Stopped,Đã ngưng
 DocType: Item,If subcontracted to a vendor,Nếu hợp đồng phụ với một nhà cung cấp
@@ -683,6 +687,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Bây giờ gửi
 ,Support Analytics,Hỗ trợ Analytics
 DocType: Item,Website Warehouse,Trang web kho
+DocType: Payment Reconciliation,Minimum Invoice Amount,Số tiền Hoá đơn tối thiểu
 DocType: Sales 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à tự động hóa đơn sẽ được tạo ra ví dụ như 05, 28 vv"
 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
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Hồ sơ C-Mẫu
@@ -692,7 +697,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Để kích hoạt tính năng &quot;Point of Sale&quot; tính năng
 DocType: Bin,Moving Average Rate,Tỷ lệ trung bình di chuyển
 DocType: Production Planning Tool,Select Items,Chọn mục
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} với Bill {1} {2} ngày
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0} với Bill {1} {2} ngày
 DocType: Maintenance Visit,Completion Status,Tình trạng hoàn thành
 DocType: Sales Invoice Item,Target Warehouse,Mục tiêu kho
 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
@@ -704,12 +709,12 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Tự động soạn tin nhắn trên trình giao dịch.
 DocType: Production Order,Item To Manufacture,Để mục Sản xuất
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} tình trạng là {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Mua hàng để thanh toán
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Mua hàng để thanh toán
 DocType: Sales Order Item,Projected Qty,Số lượng dự kiến
 DocType: Sales Invoice,Payment Due Date,Thanh toán Due Date
 DocType: Newsletter,Newsletter Manager,Bản tin Quản lý
 apps/erpnext/erpnext/stock/doctype/item/item.js +246,Item Variant {0} already exists with same attributes,Mục Variant {0} đã tồn tại với cùng một thuộc tính
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Mở&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Đang mở'
 DocType: Notification Control,Delivery Note Message,Giao hàng tận nơi Lưu ý tin nhắn
 DocType: Expense Claim,Expenses,Chi phí
 DocType: Item Variant Attribute,Item Variant Attribute,Mục Variant Attribute
@@ -728,7 +733,7 @@
 DocType: Sales Invoice Item,Stock Details,Chi tiết chứng khoán
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Giá trị dự án
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Điểm bán hàng
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Số dư tài khoản đã có trong tín dụng, bạn không được phép để thiết lập 'cân Must Be' là 'Nợ'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Số dư tài khoản đã có trong tín dụng, bạn không được phép để thiết lập 'cân Must Be' là 'Nợ'"
 DocType: Account,Balance must be,Cân bằng phải
 DocType: Hub Settings,Publish Pricing,Xuất bản Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Thông báo yêu cầu bồi thường chi phí từ chối
@@ -751,7 +756,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Tổng tỷ giá hối đoái.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Không thể tìm Time Khe cắm trong {0} ngày tới cho Chiến {1}
 DocType: Production Order,Plan material for sub-assemblies,Tài liệu kế hoạch cho các cụm chi tiết
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} phải được hoạt động
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0} phải được hoạt động
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Hãy chọn các loại tài liệu đầu tiên
 apps/erpnext/erpnext/support/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
 DocType: Salary Slip,Leave Encashment Amount,Để lại séc Số tiền
@@ -769,17 +774,17 @@
 DocType: Supplier,Default Payable Accounts,Mặc định Accounts Payable
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,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: Features Setup,Item Barcode,Mục mã vạch
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,Các biến thể mục {0} cập nhật
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,Các biến thể mục {0} cập nhật
 DocType: Quality Inspection Reading,Reading 6,Đọc 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Mua hóa đơn trước
 DocType: Address,Shop,Cửa hàng
 DocType: Hub Settings,Sync Now,Bây giờ Sync
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {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/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Row {0}: lối vào tín dụng không thể được liên kết với một {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Mặc định tài khoản ngân hàng / tiền mặt sẽ được tự động cập nhật trong POS hóa đơn khi chế độ này được chọn.
 DocType: Employee,Permanent Address Is,Địa chỉ thường trú là
 DocType: Production Order Operation,Operation completed for how many finished goods?,Hoạt động hoàn thành cho bao nhiêu thành phẩm?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Các thương hiệu
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,Trợ cấp cho quá {0} vượt qua cho mục {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Trợ cấp cho quá {0} vượt qua cho mục {1}.
 DocType: Employee,Exit Interview Details,Chi tiết thoát Phỏng vấn
 DocType: Item,Is Purchase Item,Là mua hàng
 DocType: Journal Entry Account,Purchase Invoice,Mua hóa đơn
@@ -790,8 +795,8 @@
 DocType: Payment Tool,Paid,Paid
 DocType: Salary Slip,Total in words,Tổng số nói cách
 DocType: Material Request Item,Lead Time Date,Chì Thời gian ngày
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,là bắt buộc. Có thể đổi tiền ghi không được tạo ra cho
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Hàng # {0}: Hãy xác định Serial No cho mục {1}
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,là bắt buộc. Có bản ghi Tỷ Giá không được tạo ra cho
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Hàng # {0}: Hãy xác định Serial No cho mục {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Đối với những mặt &#39;gói sản phẩm&#39;, Warehouse, Serial No và hàng loạt No sẽ được xem xét từ &#39;Packing List&#39; bảng. Nếu kho và hàng loạt Không là giống nhau cho tất cả các mặt hàng đóng gói cho các mặt hàng bất kỳ &#39;gói sản phẩm&#39;, những giá trị có thể được nhập vào mục bảng chính, giá trị này sẽ được sao chép vào &#39;Packing List&#39; bảng."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Lô hàng cho khách hàng.
 DocType: Purchase Invoice Item,Purchase Order Item,Mua hàng mục
@@ -800,14 +805,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variance
 ,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 +626,Select Item for Transfer,Chọn mục Chuyển giao
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Cho phép người dùng chỉnh sửa Giá liệt kê Tỷ giá giao dịch
 DocType: Pricing Rule,Max Qty,Số lượng tối đa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Thanh toán chống Bán hàng / Mua hàng nên luôn luôn được đánh dấu là trước
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Mối nguy hóa học
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Tất cả các mặt hàng đã được chuyển giao cho đặt hàng sản xuất này.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,Tất cả các mặt hàng đã được chuyển giao cho đặt hàng sản xuất này.
 DocType: Process Payroll,Select Payroll Year and Month,Chọn Payroll Năm và Tháng
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Tới các nhóm thích hợp (thường là ứng dụng của Quỹ&gt; Tài sản ngắn hạn&gt; Tài khoản ngân hàng và tạo một tài khoản mới (bằng cách nhấn vào Add Child) của loại &quot;Ngân hàng&quot;
 DocType: Workstation,Electricity Cost,Chi phí điện
@@ -821,10 +827,10 @@
 DocType: SMS Center,All Lead (Open),Tất cả chì (Open)
 DocType: Purchase Invoice,Get Advances Paid,Được trả tiền trước
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Hình ảnh đính kèm của bạn
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Làm
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,Làm
 DocType: Journal Entry,Total Amount in Words,Tổng số tiền trong từ
 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. Một lý do có thể xảy ra có thể là bạn đã không được lưu dưới dạng. Vui lòng liên hệ support@erpnext.com nếu vấn đề vẫn tồn tại.
-apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Giỏ hàng
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Giỏ hàng
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Loại thứ tự phải là một trong {0}
 DocType: Lead,Next Contact Date,Tiếp theo Liên lạc ngày
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Mở Số lượng
@@ -843,10 +849,10 @@
 DocType: POS Profile,Cash/Bank Account,Tài khoản tiền mặt / Ngân hàng
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +550,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
 DocType: Production Planning Tool,Get Sales Orders,Nhận hàng đơn đặt hàng
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} không bị âm
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Giảm giá
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} không thể bị âm
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Giảm giá
 DocType: Features Setup,Purchase Discounts,Giảm giá mua
 DocType: Workstation,Wages,Tiền lương
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Sẽ chỉ được cập nhật nếu Giờ là &#39;thể lập hóa đơn &quot;
@@ -871,7 +877,7 @@
 DocType: Tax Rule,Shipping State,Vận Chuyển Nhà nước
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item phải được bổ sung bằng cách sử dụng 'Nhận Items từ Mua Tiền thu' nút
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Chi phí bán hàng
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Tiêu chuẩn mua
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,Tiêu chuẩn mua
 DocType: GL Entry,Against,Chống lại
 DocType: Item,Default Selling Cost Center,Trung tâm Chi phí bán hàng mặc định
 DocType: Sales Partner,Implementation Partner,Đối tác thực hiện
@@ -901,7 +907,7 @@
 DocType: Upload Attendance,Attendance From Date,Từ ngày tham gia
 DocType: Appraisal Template Goal,Key Performance Area,Hiệu suất chủ chốt trong khu vực
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Vận chuyển
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,và năm:
 DocType: Email Digest,Annual Expense,Chi phí hàng năm
 DocType: SMS Center,Total Characters,Tổng số nhân vật
 apps/erpnext/erpnext/controllers/buying_controller.py +130,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}
@@ -913,6 +919,7 @@
 DocType: Sales Partner,Distributor,Nhà phân phối
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shopping Cart Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Đặt hàng sản xuất {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',Xin hãy đặt &#39;Áp dụng giảm giá bổ sung On&#39;
 ,Ordered Items To Be Billed,Ra lệnh tiêu được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Từ Phạm vi có thể ít hơn Để Phạm vi
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Chọn Thời gian Logs và Submit để tạo ra một hóa đơn bán hàng mới.
@@ -922,16 +929,15 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Hàng loạt Giờ này đã được lập hoá đơn.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Tạo cơ hội
 DocType: Salary Slip,Leave Without Pay,Nếu không phải trả tiền lại
-DocType: Supplier,Communications,Sự giao tiếp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Công suất Lỗi Kế hoạch
 ,Trial Balance for Party,Trial Balance cho Đảng
 DocType: Lead,Consultant,Tư vấn
 DocType: Salary Slip,Earnings,Thu nhập
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,Hoàn thành mục {0} phải được nhập cho loại Sản xuất nhập cảnh
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Mở cân đối kế toán
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,Hoàn thành mục {0} phải được nhập cho loại Sản xuất nhập cảnh
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Mở cân đối kế toán
 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 +398,Nothing to request,Không có gì để yêu cầu
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Ngày bắt đầu thực tế' không thể lớn hơn 'thực tế Ngày kết thúc'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Ngày bắt đầu' không thể sau 'Ngày kết thúc'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Quản lý
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Loại hoạt động cho Thời gian Sheets
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Hoặc thẻ ghi nợ hoặc tín dụng số tiền được yêu cầu cho {0}
@@ -970,7 +976,7 @@
 DocType: Global Defaults,Current Fiscal Year,Năm tài chính hiện tại
 DocType: Global Defaults,Disable Rounded Total,Vô hiệu hóa Tròn Tổng số
 DocType: Lead,Call,Cuộc gọi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Entries' không thể để trống
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,'Entries' không thể để trống
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Hàng trùng lặp {0} với cùng {1}
 ,Trial Balance,Xét xử dư
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Thiết lập Nhân viên
@@ -982,9 +988,9 @@
 DocType: Contact,User ID,ID người dùng
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Xem Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Sớm nhất
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"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"
 DocType: Production Order,Manufacture against Sales Order,Sản xuất với bán hàng đặt hàng
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Phần còn lại của Thế giới
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,Item {0} không thể có hàng loạt
 ,Budget Variance Report,Báo cáo ngân sách phương sai
 DocType: Salary Slip,Gross Pay,Tổng phải trả tiền
@@ -1014,7 +1020,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Không được phép chỉnh sửa tài khoản đông lạnh {0}
 DocType: Journal Entry,Get Outstanding Invoices,Được nổi bật Hoá đơn
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Bán hàng đặt hàng {0} không hợp lệ
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1027,13 +1033,13 @@
 DocType: Employee,Place of Issue,Nơi cấp
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,hợp đồng
 DocType: Email Digest,Add Quote,Thêm Quote
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Yếu tố cần thiết cho coversion UOM UOM: {0} trong Item: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},Yếu tố cần thiết cho coversion UOM UOM: {0} trong Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Chi phí gián tiếp
 apps/erpnext/erpnext/controllers/selling_controller.py +163,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/public/js/setup_wizard.js +365,Your Products or Services,Sản phẩm hoặc dịch vụ của bạn
 DocType: Mode of Payment,Mode of Payment,Hình thức thanh toán
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,Hình ảnh trang web phải là một tập tin nào hoặc URL của trang web
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Hình ảnh trang web phải là một tập tin nào hoặc URL của trang web
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,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.
 DocType: Journal Entry Account,Purchase Order,Mua hàng
 DocType: Warehouse,Warehouse Contact Info,Kho Thông tin liên lạc
@@ -1042,8 +1048,8 @@
 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,Mục Thuế suất
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"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/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Thiết bị vốn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Giá Rule là lần đầu tiên được lựa chọn dựa trên 'Áp dụng trên' lĩnh vực, có thể được Item, mục Nhóm hoặc thương hiệu."
@@ -1053,7 +1059,7 @@
 DocType: Appraisal Goal,Goal,Mục tiêu
 DocType: Sales Invoice Item,Edit Description,Chỉnh sửa Mô tả
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Dự kiến giao hàng ngày là ít hơn so với Planned Ngày bắt đầu.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Cho Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,Cho Nhà cung cấp
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Loại Cài đặt Tài khoản giúp trong việc lựa chọn tài khoản này trong các giao dịch.
 DocType: Purchase Invoice,Grand Total (Company Currency),Tổng cộng (Công ty tiền tệ)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Tổng số Outgoing
@@ -1066,7 +1072,7 @@
 DocType: Journal Entry,Journal Entry,Tạp chí nhập
 DocType: Workstation,Workstation Name,Tên máy trạm
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},{0} BOM không thuộc khoản {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} does not belong to Item {1},{0} BOM không thuộc khoản {1}
 DocType: Sales Partner,Target Distribution,Phân phối 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
@@ -1098,7 +1104,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Các bản tin để liên lạc, dẫn."
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Hoạt động không thể được bỏ trống.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,Hoạt động không thể được bỏ trống.
 ,Delivered Items To Be Billed,Chỉ tiêu giao được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Kho không thể thay đổi cho Serial số
 DocType: Authorization Rule,Average Discount,Giảm giá trung bình
@@ -1113,18 +1119,19 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Từ {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Mô tả hoạt động
 DocType: Item,Will also apply to variants,Cũng sẽ áp dụng cho các biến thể
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Không thể thay đổi năm tài chính bắt đầu ngày và năm tài chính kết thúc ngày khi năm tài chính được lưu.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Không thể thay đổi năm tài chính bắt đầu ngày và năm tài chính kết thúc ngày khi năm tài chính được lưu.
 DocType: Quotation,Shopping Cart,"<a href=""#Sales Browser/Territory""> Add / Edit </ a>"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Outgoing
 DocType: Pricing Rule,Campaign,Chiến dịch
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,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: Purchase Invoice,Contact Person,Người liên hệ
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Ngày bắt đầu dự kiến' không thể lớn hơn 'dự kiến ngày kết thúc'
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Ngày dự kiến bắt đầu' không thể sau 'Ngày dự kiến kết thúc'
 DocType: Holiday List,Holidays,Ngày lễ
 DocType: Sales Order Item,Planned Quantity,Số lượng dự kiến
 DocType: Purchase Invoice Item,Item Tax Amount,Số tiền hàng Thuế
 DocType: Item,Maintain Stock,Duy trì Cổ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Cổ Entries đã tạo ra cho sản xuất theo thứ tự
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Cổ Entries đã tạo ra cho sản xuất theo thứ tự
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Thay đổi ròng 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 +517,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 +182,Max: {0},Max: {0}
@@ -1136,7 +1143,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,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 +471,cannot be greater than 100,không có thể lớn hơn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,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 +596,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 Slip Deduction,Depends on Leave Without Pay,Phụ thuộc vào Leave Nếu không phải trả tiền
@@ -1174,7 +1181,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,Phụ hội
 DocType: Shipping Rule Condition,To Value,Để giá trị gia tăng
 DocType: Supplier,Stock Manager,Cổ Quản lý
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kho nguồn là bắt buộc đối với hàng {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Kho nguồn là bắt buộc đối với hàng {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Đóng gói trượt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Thuê văn phòng
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Cài đặt thiết lập cổng SMS
@@ -1182,10 +1189,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Không có địa chỉ nào được bổ sung.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Giờ làm việc
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Chuyên viên phân tích
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng số tiền JV {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng số tiền JV {2}
 DocType: Item,Inventory,Hàng tồn kho
 DocType: Features Setup,"To enable ""Point of Sale"" view",Để kích hoạt tính năng &quot;Point of Sale&quot; view
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Thanh toán không thể được thực hiện cho hàng trống
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Thanh toán không thể được thực hiện cho hàng trống
 DocType: Item,Sales Details,Thông tin chi tiết bán hàng
 DocType: Opportunity,With Items,Với mục
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Số lượng trong
@@ -1200,10 +1207,11 @@
 DocType: Cost Center,Parent Cost Center,Trung tâm Chi phí cha mẹ
 DocType: Sales Invoice,Source,Nguồn
 DocType: Leave Type,Is Leave Without Pay,Nếu không có được Leave Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Không có hồ sơ được tìm thấy trong bảng thanh toán
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Không có hồ sơ được tìm thấy trong bảng thanh toán
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Năm tài chính bắt đầu ngày
 DocType: Employee External Work History,Total Experience,Tổng số kinh nghiệm
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Đóng gói trượt (s) bị hủy bỏ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Đóng gói trượt (s) bị hủy bỏ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Lưu chuyển tiền tệ từ đầu tư
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Vận tải hàng hóa và chuyển tiếp phí
 DocType: Material Request Item,Sales Order No,Không bán hàng đặt hàng
 DocType: Item Group,Item Group Name,Mục Group Name
@@ -1211,12 +1219,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Chuyển Vật liệu cho sản xuất
 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/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Mua suất cho mặt hàng: {0} không tìm thấy, đó là cần thiết để đặt mục chiếm (chi phí). Xin đề cập đến giá mục với một danh sách giá mua."
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Mua suất cho mặt hàng: {0} không tìm thấy, đó là cần thiết để đặt mục chiếm (chi phí). Xin đề cập đến giá mục với một danh sách giá mua."
 DocType: Maintenance Schedule,Schedules,Lịch
 DocType: Purchase Invoice Item,Net Amount,Số tiền Net
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM chi tiết Không
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Thêm GIẢM Số tiền (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Lỗi: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Lỗi: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Xin vui lòng tạo tài khoản mới từ mục tài khoản.
 DocType: Maintenance Visit,Maintenance Visit,Bảo trì đăng nhập
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Khách hàng> Nhóm khách hàng> Lãnh thổ
@@ -1242,7 +1250,7 @@
 DocType: Sales Partner,Sales Partner Target,Đối tác bán hàng mục tiêu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Nhập kế toán cho {0} chỉ có thể được thực hiện bằng tiền tệ: {1}
 DocType: Pricing Rule,Pricing Rule,Quy tắc định giá
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Yêu cầu vật chất để mua hàng
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Yêu cầu vật chất để mua hàng
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: trả lại hàng {1} không tồn tại trong {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Tài khoản ngân hàng
 ,Bank Reconciliation Statement,Trữ ngân hàng hòa giải
@@ -1250,11 +1258,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Mở Balance Cổ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} phải chỉ xuất hiện một lần
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Không được phép để tuyền hơn {0} {1} hơn so với mua hàng {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Không được phép để tuyề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 +62,Leaves Allocated Successfully for {0},Lá đượ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ục để đó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 +550,Manufacturing Quantity is mandatory,Số lượng sản xuất là bắt buộc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,Số lượng sản xuất là bắt buộc
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Số đã không được phản ánh trong ngân hàng
 DocType: Quality Inspection Reading,Reading 4,Đọc 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Tuyên bố cho chi phí công ty.
@@ -1266,33 +1274,34 @@
 ,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
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Để theo dõi các mục sử dụng mã vạch. Bạn sẽ có thể nhập vào các mục trong giao hàng và hóa đơn bán hàng Lưu ý bằng cách quét mã vạch của sản phẩm.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Đánh dấu như Delivered
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Đánh dấu như Delivered
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Hãy báo giá
 DocType: Dependent Task,Dependent Task,Nhiệm vụ phụ thuộc
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,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 +349,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 +157,Leave of type {0} cannot be longer than {1},Nghỉ phép 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 sinh Nhắc nhở
 DocType: SMS Center,Receiver List,Danh sách người nhận
 DocType: Payment Tool Detail,Payment Amount,Số tiền thanh toán
 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/public/js/pos/pos.js +491,{0} View,{0} Xem
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Xem
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Thay đổi ròng trong Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Cơ cấu tiền lương trích
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo {0} đã được nhập vào nhiều hơn một lần trong chuyển đổi yếu tố Bảng
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo {0} đã được nhập vào nhiều hơn một lần trong chuyển đổi yếu tố Bảng
 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
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Số lượng không phải lớn hơn {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Tuổi (Ngày)
 DocType: Quotation Item,Quotation Item,Báo giá hàng
 DocType: Account,Account Name,Tên tài khoản
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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/accounts/report/trial_balance/trial_balance.py +36,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 +194,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 +59,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ố
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Tỷ lệ chuyển đổi không thể là 0 hoặc 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Tỷ lệ chuyển đổi không thể là 0 hoặc 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} được huỷ bỏ hoặc dừng lại
 DocType: Accounts Settings,Credit Controller,Bộ điều khiển tín dụng
 DocType: Delivery Note,Vehicle Dispatch Date,Xe công văn ngày
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,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 +203,Purchase Receipt {0} is not submitted,Mua hóa đơn {0} không nộp
 DocType: Company,Default Payable Account,Mặc định Account Payable
 apps/erpnext/erpnext/config/website.py +13,"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 +65,{0}% Billed,{0}% Được xem
@@ -1304,15 +1313,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Các vấn đề của tôi
 DocType: BOM Item,BOM Item,BOM mục
 DocType: Appraisal,For Employee,Cho nhân viên
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,Row {0}: Advance chống Nhà cung cấp phải được ghi nợ
 DocType: Company,Default Values,Giá trị mặc định
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Số tiền thanh toán không thể phủ định
 DocType: Expense Claim,Total Amount Reimbursed,Tổng số tiền bồi hoàn
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Chống lại Nhà cung cấp hóa đơn {0} ngày {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Chống lại Nhà cung cấp hóa đơn {0} ngày {1}
 DocType: Customer,Default Price List,Mặc định Giá liệt kê
 DocType: Payment Reconciliation,Payments,Thanh toán
 DocType: Budget Detail,Budget Allocated,Phân bổ ngân sách
 DocType: Journal Entry,Entry Type,Loại mục
 ,Customer Credit Balance,Balance tín dụng của khách hàng
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Thay đổi ròng trong Accounts Payable
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Vui lòng kiểm tra id email của bạn
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Khách hàng cần thiết cho 'Customerwise Giảm giá'
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Cập nhật ngày thanh toán ngân hàng với các tạp chí.
@@ -1333,7 +1344,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Kích hoạt Giỏ hàng
 DocType: Employee,Permanent Address,Địa chỉ thường trú
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Mục {0} phải là một dịch vụ Item.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Advance thanh toán đối với {0} {1} không thể lớn \ hơn Tổng cộng {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vui lòng chọn mã hàng
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Giảm Trích Để lại Nếu không phải trả tiền (LWP)
@@ -1350,18 +1361,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Trọng lượng được đề cập, \n Xin đề cập đến ""Weight Ươm"" quá"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Yêu cầu vật liệu sử dụng để làm cho nhập chứng khoán này
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Đơn vị duy nhất của một Item.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',Giờ hàng loạt {0} phải được 'Gửi'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Giờ hàng loạt {0} phải được 'Gửi'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Làm kế toán nhập Đối với tất cả phong trào Cổ
 DocType: Leave Allocation,Total Leaves Allocated,Tổng Lá Phân bổ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},Kho yêu cầu tại Row Không {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},Kho yêu cầu tại Row Không {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,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,Trong ngày hưu trí
 DocType: Upload Attendance,Get Template,Nhận Mẫu
 DocType: Address,Postal,Bưu chính
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Một Nhóm khách hàng tồn tại với cùng một tên xin thay đổi tên khách hàng hoặc đổi tên nhóm khách hàng
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vui lòng chọn {0} đầu tiên.
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Vui lòng chọn {0} đầu tiên.
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},text {0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Liên
 DocType: Territory,Parent Territory,Lãnh thổ cha mẹ
 DocType: Quality Inspection Reading,Reading 2,Đọc 2
 DocType: Stock Entry,Material Receipt,Tiếp nhận tài liệu
@@ -1369,7 +1381,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Đảng Loại và Đảng là cần thiết cho thu / tài khoản phải trả {0}
 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ể, sau đó nó có thể không được lựa chọn trong các đơn đặt hàng bán hàng vv"
 DocType: Lead,Next Contact By,Tiếp theo Liên By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +213,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 +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Kho {0} không thể bị xóa như số lượng tồn tại cho mục {1}
 DocType: Quotation,Order Type,Loại thứ tự
 DocType: Purchase Invoice,Notification Email Address,Thông báo Địa chỉ Email
@@ -1386,15 +1398,15 @@
 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: Sales Invoice Item,Batch No,Không có hàng loạt
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Cho phép nhiều đơn đặt hàng bán hàng chống Purchase Order của khách hàng
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Chính
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Chính
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Để dừng lại không thể bị hủy bỏ. Tháo nút để hủy bỏ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,Mặc định BOM ({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 +366,Default BOM ({0}) must be active for this item or its template,Mặc định BOM ({0}) phải được hoạt động cho mục này hoặc mẫu của mình
 DocType: Employee,Leave Encashed?,Để lại Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Cơ hội Từ trường là bắt buộc
 DocType: Item,Variants,Biến thể
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Từ mua hóa đơn
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Từ mua hóa đơn
 DocType: SMS Center,Send To,Để gửi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Không có đủ số dư để lại cho Rời Loại {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Số lượng phân bổ
@@ -1407,7 +1419,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,Kho và tham khảo
 DocType: Supplier,Statutory info and other general information about your Supplier,Thông tin theo luật định và các thông tin chung khác về nhà cung cấp của bạn
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Địa chỉ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,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/accounts/doctype/journal_entry/journal_entry.py +143,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/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Trùng lặp Serial No nhập cho hàng {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Một điều kiện cho một Rule Vận Chuyển
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item không được phép có thứ tự sản xuất.
@@ -1416,10 +1428,11 @@
 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/config/manufacturing.py +24,Time Logs for manufacturing.,Thời gian Logs cho sản xuất.
 DocType: Item,Apply Warehouse-wise Reorder Level,Áp dụng kho-khôn ngoan Reorder Cấp
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} phải được đệ trình
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,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/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Bị từ chối Warehouse là bắt buộc chống lại từ chối khoản {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Giờ cho các nhiệm vụ.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Thanh toán
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Thanh toán
 DocType: Production Order Operation,Actual Time and Cost,Thời gian và chi phí thực tế
 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},Yêu cầu vật chất của tối đa {0} có thể được thực hiện cho mục {1} đối với bán hàng đặt hàng {2}
 DocType: Employee,Salutation,Sự chào
@@ -1436,7 +1449,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Liên kết
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,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
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Hết hạn
 DocType: Packing Slip,To Package No.,Để Gói số
 DocType: Warranty Claim,Issue Date,Ngày phát hành
 DocType: Activity Cost,Activity Cost,Hoạt động Chi phí
@@ -1474,7 +1486,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Đạt được
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Lãnh thổ / khách hàng
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,ví dụ như 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng cho hóa đơn số tiền còn nợ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng cho hóa đơn số tiền còn nợ {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Trong từ sẽ được hiển thị khi bạn lưu các hóa đơn bán hàng.
 DocType: Item,Is Sales Item,Là bán hàng
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Nhóm mục Tree
@@ -1483,10 +1495,10 @@
 ,Amount to Deliver,Số tiền để Cung cấp
 apps/erpnext/erpnext/public/js/setup_wizard.js +374,A Product or Service,Một sản phẩm hoặc dịch vụ
 DocType: Naming Series,Current Value,Giá trị hiện tại
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} tạo
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} được tạo
 DocType: Delivery Note Item,Against Sales Order,So với bán hàng đặt hàng
 ,Serial No Status,Serial No Tình trạng
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Mục bảng không thể để trống
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,Mục bảng không thể để trống
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: Để thiết lập {1} chu kỳ, sự khác biệt giữa các từ và đến ngày \
  phải lớn hơn hoặc bằng {2}"
@@ -1496,7 +1508,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Do ngày không thể trước khi viết bài ngày
 DocType: Website Item Group,Website Item Group,Trang web mục Nhóm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Nhiệm vụ và thuế
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Vui lòng nhập ngày tham khảo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,Please enter Reference date,Vui lòng nhập ngày tham khảo
 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} mục thanh toán không thể được lọc bởi {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Bảng cho khoản đó sẽ được hiển thị trong trang Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Đã cung cấp Số lượng
@@ -1511,7 +1523,7 @@
 DocType: Installation Note,Installation Time,Thời gian cài đặt
 DocType: Sales Invoice,Accounting Details,Chi tiết kế toán
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Xóa tất cả các giao dịch cho công ty này
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} không được hoàn thành cho {2} qty thành phẩm trong sản xuất theo thứ tự # {3}. Vui lòng cập nhật trạng thái hoạt động thông qua Time Logs
+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,Row # {0}: Operation {1} không được hoàn thành cho {2} qty thành phẩm trong sản xuất theo thứ tự # {3}. Vui lòng cập nhật trạng thái hoạt động thông qua Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Các khoản đầu tư
 DocType: Issue,Resolution Details,Độ phân giải chi tiết
 DocType: Quality Inspection Reading,Acceptance Criteria,Các tiêu chí chấp nhận
@@ -1527,7 +1539,7 @@
 DocType: Holiday List,Clear Table,Rõ ràng bảng
 DocType: Features Setup,Brands,Thương hiệu
 DocType: C-Form Invoice Detail,Invoice No,Không hóa đơn
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Từ Mua hàng
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Từ Mua hàng
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Để lại không thể áp dụng / hủy bỏ trước khi {0}, như cân bằng nghỉ phép đã được carry-chuyển tiếp trong hồ sơ giao đất nghỉ tương lai {1}"
 DocType: Activity Cost,Costing Rate,Chi phí Rate
 ,Customer Addresses And Contacts,Địa chỉ khách hàng và Liên hệ
@@ -1544,7 +1556,7 @@
 ,Maintenance Schedules,Lịch bảo trì
 ,Quotation Trends,Xu hướng báo giá
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +303,Debit To account must be a Receivable account,Để ghi nợ tài khoản phải có một tài khoản phải thu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,Để ghi nợ tài khoản phải có một tài khoản phải thu
 DocType: Shipping Rule Condition,Shipping Amount,Số tiền vận chuyển
 ,Pending Amount,Số tiền cấp phát
 DocType: Purchase Invoice Item,Conversion Factor,Yếu tố chuyển đổi
@@ -1561,12 +1573,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Cây tài khoản finanial.
 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/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Tài khoản {0} phải là loại 'tài sản cố định ""như mục {1} là một khoản tài sản"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Tài khoản {0} phải là loại 'tài sản cố định ""như mục {1} là một khoản tài sản"
 DocType: HR Settings,HR Settings,Thiết lập nhân sự
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Chi phí bồi thường đang chờ phê duyệt. Chỉ phê duyệt chi phí có thể cập nhật trạng thái.
 DocType: Purchase Invoice,Additional Discount Amount,Thêm GIẢM Số tiền
 DocType: Leave Block List Allow,Leave Block List Allow,Để lại Block List phép
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr không thể để trống hoặc không gian
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,Abbr không thể để trống hoặc không gian
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Thể thao
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Tổng số thực tế
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,Đơn vị
@@ -1578,6 +1590,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} bây giờ là mặc định năm tài chí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/project/project.js +47,Expense Claims,Claims Expense
 DocType: Issue,Support,Hỗ trợ
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,Xem giỏ hàng
 ,BOM Search,BOM Tìm kiếm
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Đóng cửa (mở cửa + Các tổng số)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Hãy xác định tiền tệ của Công ty
@@ -1589,13 +1602,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Ngày giải phóng mặt bằng không có thể trước ngày kiểm tra trong hàng {0}
 DocType: Salary Slip,Deduction,Khấu trừ
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},Item Giá tăng cho {0} trong Giá liệt {1}
 DocType: Address Template,Address Template,Địa chỉ Template
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,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
 DocType: Project,% Tasks Completed,Nhiệm vụ đã hoàn thành%
 DocType: Project,Gross Margin,Margin Gross
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Vui lòng nhập sản xuất hàng đầu tiên
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,sử dụng người khuyết tật
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,sử dụng người khuyết tật
 DocType: Opportunity,Quotation,Báo giá
 DocType: Salary Slip,Total Deduction,Tổng số trích
 DocType: Quotation,Maintenance User,Bảo trì tài khoản
@@ -1604,7 +1618,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 và giao dịch lớn khác đang theo dõi chống lại năm tài chính ** **.
 DocType: Opportunity,Customer / Lead Address,Khách hàng / Chì Địa chỉ
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Warning: Invalid SSL certificate on attachment {0},Cảnh báo: Giấy chứng nhận SSL không hợp lệ vào luyến {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Cảnh báo: Giấy chứng nhận SSL không hợp lệ vào luyến {0}
 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
@@ -1614,12 +1628,12 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Giữ Theo dõi của Sales Chiến dịch. Theo dõi các Leads, Báo giá, bán hàng đặt hàng vv từ Chiến dịch để đánh giá lợi nhuận trên đầu tư."
 DocType: Expense Claim,Approver,Người Xét Duyệt
 ,SO Qty,Số lượng SO
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Mục chứng khoán tồn tại đối với kho {0}, do đó bạn có thể không giao lại hoặc sửa đổi kho"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Mục chứng khoán tồn tại đối với kho {0}, do đó bạn có thể không giao lại hoặc sửa đổi kho"
 DocType: Appraisal,Calculate Total Score,Tổng số điểm tính toán
 DocType: Supplier Quotation,Manufacturing Manager,Sản xuất Quản lý
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Giao hàng tận nơi chia Lưu ý thành các gói.
-apps/erpnext/erpnext/hooks.py +68,Shipments,Lô hàng
+apps/erpnext/erpnext/hooks.py +69,Shipments,Lô hàng
 DocType: Purchase Order Item,To be delivered to customer,Sẽ được chuyển giao cho khách hàng
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Giờ trạng phải Đăng.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,{0} nối tiếp Không không thuộc về bất kỳ kho
@@ -1639,10 +1653,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +356,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
 DocType: Currency Exchange,From Currency,Từ tệ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vui lòng chọn Số tiền phân bổ, Loại hóa đơn và hóa đơn số trong ít nhất một hàng"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Đặt hàng bán hàng cần thiết cho mục {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vui lòng chọn Số tiền phân bổ, Loại hóa đơn và hóa đơn số trong ít nhất một hàng"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Đặt hàng bán hàng cần thiết cho mục {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Số đã không được phản ánh trong hệ thống
 DocType: Purchase Invoice Item,Rate (Company Currency),Tỷ lệ (Công ty tiền tệ)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Các thông tin khác
@@ -1658,7 +1672,7 @@
 DocType: Quality Inspection,In Process,Trong quá trình
 DocType: Authorization Rule,Itemwise Discount,Itemwise Giảm giá
 DocType: Purchase Order Item,Reference Document Type,Tài liệu tham chiếu Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} với Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0} với Sales Order {1}
 DocType: Account,Fixed Asset,Tài sản cố định
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Hàng tồn kho được tuần tự
 DocType: Activity Type,Default Billing Rate,Mặc định Thanh toán Rate
@@ -1668,7 +1682,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Đặt hàng bán hàng để thanh toán
 DocType: Expense Claim Detail,Expense Claim Detail,Chi phí bồi thường chi tiết
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Thời gian Logs tạo:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,Vui lòng chọn đúng tài khoản
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,Vui lòng chọn đúng tài khoản
 DocType: Item,Weight UOM,Trọng lượng UOM
 DocType: Employee,Blood Group,Nhóm máu
 DocType: Purchase Invoice Item,Page Break,Page Break
@@ -1699,10 +1713,10 @@
 DocType: Time Log,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/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Để thêm các nút con, khám phá cây và bấm vào nút dưới mà bạn muốn thêm các nút hơn."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,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 +228,BOM recursion: {0} cannot be parent or child of {2},"BOM đệ quy: {0} không thể là cha mẹ, con của {2}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,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 +231,BOM recursion: {0} cannot be parent or child of {2},"BOM đệ quy: {0} không thể là cha mẹ, con của {2}"
 DocType: Production Order Operation,Completed Qty,Số lượng hoàn thành
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"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 chống lại mục tín dụng khác"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"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 chống lại mục tín dụng khác"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Danh sách giá {0} bị vô hiệu hóa
 DocType: Manufacturing Settings,Allow Overtime,Cho phép làm việc ngoài giờ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} số Serial yêu cầu cho khoản {1}. Bạn đã cung cấp {2}.
@@ -1710,8 +1724,9 @@
 DocType: Item,Customer Item Codes,Khách hàng mục Codes
 DocType: Opportunity,Lost Reason,Lý do bị mất
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Tạo Entries thanh toán đối với đơn đặt hàng hoặc hoá đơn.
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Địa chỉ mới
 DocType: Quality Inspection,Sample Size,Kích thước mẫu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Tất cả các mục đã được lập hoá đơn
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,Trung tâm chi phí có thể tiếp tục được thực hiện theo nhóm nhưng mục có thể được thực hiện đối với phi Groups
 DocType: Project,External,Bên ngoài
@@ -1744,7 +1759,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Không hợp lệ {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Số tiền ứng trước
 DocType: Manufacturing Settings,Capacity Planning,Kế hoạch công suất
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Từ ngày"" là cần thiết"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,Phải điền mục 'Từ ngày'
 DocType: Journal Entry,Reference Number,Số tài 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
@@ -1767,13 +1782,14 @@
 DocType: Rename Tool,Rename Tool,Công cụ đổi tên
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Cập nhật giá
 DocType: Item Reorder,Item Reorder,Mục Sắp xếp lại
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Vật liệu chuyển
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Vật liệu chuyể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à cung cấp cho một hoạt động độc đáo không để các hoạt động của bạn."
 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 Cổ âm
 DocType: Installation Note,Installation Note,Lưu ý cài đặt
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Thêm Thuế
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Lưu chuyển tiền tệ từ tài chính
 ,Financial Analytics,Analytics tài chính
 DocType: Quality Inspection,Verified By,Xác nhận bởi
 DocType: Address,Subsidiary,Công ty con
@@ -1783,19 +1799,19 @@
 DocType: Process Payroll,Create Salary Slip,Tạo Mức lương trượt
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Cán cân dự kiến theo ngân hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Nguồn vốn (nợ)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Số lượng trong hàng {0} ({1}) phải được giống như số lượng sản xuất {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Số lượng trong hàng {0} ({1}) phải được giống như số lượng sản xuất {2}
 DocType: Appraisal,Employee,Nhân viên
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Nhập Email Từ
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Mời như tài
 DocType: Features Setup,After Sale Installations,Sau khi gia lắp đặt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} được quảng cáo đầy đủ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1} được quảng cáo đầy đủ
 DocType: Workstation Working Hour,End Time,End Time
 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 +75,Group by Voucher,Nhóm theo Phiếu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Required On
 DocType: Sales Invoice,Mass Mailing,Gửi thư hàng loạt
 DocType: Rename Tool,File to Rename,File để Đổi tên
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Số thứ tự Purchse cần thiết cho mục {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Số thứ tự Purchse cần thiết cho mục {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Hiện Thanh toán
 apps/erpnext/erpnext/controllers/buying_controller.py +236,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 +197,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
@@ -1805,6 +1821,7 @@
 DocType: Selling Settings,Sales Order Required,Bán hàng đặt hàng yêu cầu
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Tạo ra khách hàng
 DocType: Purchase Invoice,Credit To,Để tín dụng
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Chào Active / 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: Quality Inspection Reading,Reading 9,Đọc 9
@@ -1816,6 +1833,7 @@
 DocType: Warranty Claim,Raised By,Nâng By
 DocType: Payment Tool,Payment Account,Tài khoản thanh toán
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Vui lòng ghi rõ Công ty để tiến hành
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Thay đổi ròng trong tài khoản phải thu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Đền bù Tắt
 DocType: Quality Inspection Reading,Accepted,Chấp nhận
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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 sẽ vẫn như nó được. Hành động này không thể được hoàn tác.
@@ -1823,17 +1841,17 @@
 DocType: Payment Tool,Total Payment Amount,Tổng số tiền thanh toán
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) không được lớn hơn quanitity kế hoạch ({2}) trong sản xuất tự {3}
 DocType: Shipping Rule,Shipping Rule Label,Quy tắc vận chuyển Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,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 +418,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật cổ phiếu, hóa đơn chứa chi tiết vận chuyển thả."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,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 +422,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật cổ phiếu, hóa đơn chứa chi tiết vận chuyển thả."
 DocType: Newsletter,Test,K.tra
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Như có những giao dịch chứng khoán hiện có cho mặt hàng này, \ bạn không thể thay đổi các giá trị của &#39;Có tiếp Serial No&#39;, &#39;Có hàng loạt No&#39;, &#39;Liệu Cổ Mã&#39; và &#39;Phương pháp định giá&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,Tạp chí nhanh chóng nhập
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Tạp chí nhanh chóng nhập
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Bạn không thể thay đổi tỷ lệ nếu HĐQT đã đề cập agianst bất kỳ mục nào
 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 +157,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 +211,{0} {1} is not submitted,{0} {1} không nộp
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} không nộp
 apps/erpnext/erpnext/config/stock.py +18,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.
 DocType: Purchase Invoice,Terms and Conditions1,Điều khoản và Conditions1
@@ -1846,7 +1864,7 @@
 DocType: Authorization Rule,Authorized Value,Giá trị được ủy quyền
 DocType: Contact,Enter department to which this Contact belongs,Nhập bộ phận mà mối liên lạc này thuộc về
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Tổng số Vắng
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Mục hoặc Kho cho hàng {0} không phù hợp với liệu Yêu cầu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,Mục hoặc Kho cho hàng {0} không phù hợp với liệu Yêu cầu
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Đơn vị đo
 DocType: Fiscal Year,Year End Date,Ngày kết thúc năm
 DocType: Task Depends On,Task Depends On,Nhiệm vụ Phụ thuộc On
@@ -1872,7 +1890,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Ngày kết thúc hợp đồng phải lớn hơn ngày của Tham gia
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Một nhà phân phối của bên thứ ba / đại lý / hoa hồng đại lý / chi nhánh / đại lý bán lẻ chuyên bán các sản phẩm công ty cho một hoa hồng.
 DocType: Customer Group,Has Child Node,Có Node trẻ em
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} chống Mua hàng {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0} chống Mua hàng {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Nhập các thông số url tĩnh ở đây (Ví dụ người gửi = ERPNext, tên người dùng = ERPNext, mật khẩu = 1234, vv)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} không có trong bất kỳ năm tài chính đang hoạt động. Để biết thêm chi tiết kiểm tra {2}.
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Đây là một trang web ví dụ tự động tạo ra từ ERPNext
@@ -1920,7 +1938,7 @@
  10. Thêm hoặc trích lại: Cho dù bạn muốn thêm hoặc khấu trừ thuế."
 DocType: Purchase Receipt Item,Recd Quantity,Recd Số lượng
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Không thể sản xuất nhiều hàng {0} là số lượng bán hàng đặt hàng {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Cổ nhập {0} không được đệ trình
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,Cổ nhập {0} không được đệ trình
 DocType: Payment Reconciliation,Bank / Cash Account,Tài khoản ngân hàng Tiền mặt /
 DocType: Tax Rule,Billing City,Thanh toán Thành phố
 DocType: Global Defaults,Hide Currency Symbol,Ẩn tệ Ký hiệu
@@ -1947,11 +1965,12 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Địa chỉ của tôi
 DocType: Stock Ledger Entry,Outgoing Rate,Tỷ Outgoing
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Chủ chi nhánh tổ chức.
-apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,hoặc là
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,hoặc
 DocType: Sales Order,Billing Status,Tình trạng thanh toán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Chi phí tiện ích
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Trên
 DocType: Buying Settings,Default Buying Price List,Mặc định mua Bảng giá
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Không một nhân viên cho các tiêu chí lựa chọn ở trên OR phiếu lương đã tạo
 DocType: Notification Control,Sales Order Message,Thông báo bán hàng đặ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"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Loại thanh toán
@@ -1987,7 +2006,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Xem ""Tỷ lệ Of Vật liệu Dựa trên"" trong mục Chi phí"
 DocType: Appraisal Goal,Key Responsibility Area,Diện tích Trách nhiệm chính
 DocType: Item Reorder,Material Request Type,Tài liệu theo yêu cầu Loại
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Ươm Conversion Factor là bắt buộc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Ươm Conversion Factor là bắt buộc
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Tài liệu tham khảo
 DocType: Cost Center,Cost Center,Trung tâm chi phí
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Chứng từ #
@@ -2010,7 +2029,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vui lòng chọn một giá trị cho {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Tất cả các địa chỉ.
 DocType: Company,Stock Settings,Thiết lập chứng khoán
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sáp nhập là chỉ có thể nếu tính sau là như nhau trong cả hai hồ sơ. Là Group, Loại Root, Công ty"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sáp nhập là chỉ có thể nếu tính sau là như nhau trong cả hai hồ sơ. Là Group, Loại Root, Công ty"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Quản lý Nhóm khách hàng Tree.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Tên mới Trung tâm Chi phí
 DocType: Leave Control Panel,Leave Control Panel,Để lại Control Panel
@@ -2030,8 +2049,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,Công cụ thanh toán chi tiết
 ,Sales Browser,Doanh số bán hàng của trình duyệt
 DocType: Journal Entry,Total Credit,Tổng số tín dụng
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Cảnh báo: {0} # Một {1} tồn tại với mục cổ phiếu {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,địa phương
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},Cảnh báo: {0} # Một {1} tồn tại với mục cổ phiếu {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,Local,địa phương
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Cho vay trước (tài sản)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Con nợ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Lớn
@@ -2050,7 +2069,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Tất cả mọi giao dịch bán hàng có thể được gắn với nhiều ** ** Người bán hàng để bạn có thể thiết lập và giám sát các mục tiêu.
 ,S.O. No.,SO số
 DocType: Production Order Operation,Make Time Log,Hãy Giờ
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,Hãy thiết lập số lượng đặt hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,Hãy thiết lập số lượng đặt hàng
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Hãy tạo khách hàng từ chì {0}
 DocType: Price List,Applicable for Countries,Áp dụng đối với các nước
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Máy tính
@@ -2110,10 +2129,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {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 +66,No Remarks,Không có Bình luận
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Không có Bình luận
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Quá hạn
 DocType: Account,Stock Received But Not Billed,Chứng khoán nhận Nhưng Không Được quảng cáo
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Tài khoản gốc phải là một nhóm
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,Tài khoản gốc phải là một nhóm
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Tổng phải trả tiền + tiền còn thiếu Số tiền + séc Số tiền - Tổng số trích
 DocType: Monthly Distribution,Distribution Name,Tên phân phối
 DocType: Features Setup,Sales and Purchase,Bán hàng và mua hàng
@@ -2127,6 +2146,7 @@
 DocType: Journal Entry Account,Party Balance,Balance Đảng
 DocType: Sales Invoice Item,Time Log Batch,Giờ hàng loạt
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Vui lòng chọn Apply Giảm Ngày
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Mức lương Phiếu tạo
 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: Stock Entry,Material Transfer for Manufacture,Dẫn truyền Vật liệu cho sản xuất
@@ -2134,9 +2154,9 @@
 DocType: Purchase Invoice,Half-yearly,Nửa năm
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Năm tài chính {0} không tìm thấy.
 DocType: Bank Reconciliation,Get Relevant Entries,Được viết liên quan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,Nhập kế toán cho Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,Nhập kế toán cho Stock
 DocType: Sales Invoice,Sales Team1,Team1 bán hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,Mục {0} không tồn tại
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,Mục {0} không tồn tại
 DocType: Sales Invoice,Customer Address,Địa chỉ khách hàng
 DocType: Purchase Invoice,Apply Additional Discount On,Áp dụng khác Giảm Ngày
 DocType: Account,Root Type,Loại gốc
@@ -2145,15 +2165,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,Hiển thị slideshow này ở trên cùng của trang
 DocType: BOM,Item UOM,Mục UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Số tiền thuế Sau GIẢM Số tiền (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Kho mục tiêu là bắt buộc đối với hàng {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Kho mục tiêu là bắt buộc đối với hàng {0}
 DocType: Quality Inspection,Quality Inspection,Kiểm tra chất lượng
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Tắm nhỏ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Cảnh báo: Chất liệu được yêu cầu Số lượng ít hơn hàng tối thiểu Số lượng
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Cảnh báo: Chất liệu được yêu cầu Số lượng ít hơn hàng tối thiểu Số lượng
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Tài khoản {0} được đông lạnh
 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.
 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/page/financial_analytics/financial_analytics.js +20,PL or BS,PL hoặc BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Chỉ có thể thực hiện thanh toán đối với unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},Chỉ có thể thực hiện thanh toán đối với unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Tỷ lệ hoa hồng không có thể lớn hơn 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Tối thiểu hàng tồn kho Cấp
 DocType: Stock Entry,Subcontract,Cho thầu lại
@@ -2191,7 +2211,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Kiểm tra chất lượng đầu vào.
 DocType: Purchase Order Item,Returned Qty,Số lượng trả lại
 DocType: Employee,Exit,Thoát
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Loại rễ là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,Loại rễ là bắt buộc
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Không nối tiếp {0} tạo
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Để thuận tiện cho khách hàng, các mã có thể được sử dụng trong các định dạng như in hóa đơn và giao hàng Ghi chú"
 DocType: Employee,You can enter any date manually,Bạn có thể nhập bất kỳ ngày nào tay
@@ -2199,8 +2219,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Thời gian thử việc
 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 +110,Row {0}: Advance against Customer must be credit,Row {0}: Advance chống lại khách hàng phải có tín dụng
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Mua hóa đơn hàng Cung cấp
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Trả
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Trả
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Để Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs cho việc duy trì tình trạng giao hàng sms
@@ -2217,7 +2238,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: Attendance,Attendance Date,Tham gia
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lương chia tay dựa trên Lợi nhuận và khấu trừ.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Tài khoản với các nút con không thể được chuyển đổi sang sổ cái
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,Tài khoản với các nút con không thể được chuyển đổi sang sổ cái
 DocType: Address,Preferred Shipping Address,Ưa thích Vận chuyển Địa chỉ
 DocType: Purchase Receipt Item,Accepted Warehouse,Chấp nhận kho
 DocType: Bank Reconciliation Detail,Posting Date,Báo cáo công đoàn
@@ -2235,7 +2256,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Không nối tiếp {0} không tồn tại
 DocType: Pricing Rule,Discount Percentage,Tỷ lệ phần trăm giảm giá
 DocType: Payment Reconciliation Invoice,Invoice Number,Số hóa đơn
-apps/erpnext/erpnext/hooks.py +54,Orders,Đơn đặt hàng
+apps/erpnext/erpnext/hooks.py +55,Orders,Đơn đặt hàng
 DocType: Leave Control Panel,Employee Type,Loại nhân viên
 DocType: Employee Leave Approver,Leave Approver,Để phê duyệt
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Chất liệu được chuyển giao cho sản xuất
@@ -2247,7 +2268,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Nguyên vật liệu được lập hoá đơn đối với hàng bán hàng này
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Thời gian đóng cửa nhập
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Trung tâm chi phí với các giao dịch hiện có không thể chuyển đổi sang nhóm
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Khấu hao
+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: Customer,Credit Limit,Hạn chế tín dụng
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Chọn loại giao dịch
@@ -2272,11 +2293,12 @@
 DocType: Material Request,Requested For,Đối với yêu cầu
 DocType: Quotation Item,Against Doctype,Chống lại DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Giao hàng tận nơi theo dõi này Lưu ý đối với bất kỳ dự án
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Tài khoản gốc không thể bị xóa
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Tiền thuần từ đầu tư
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,Tài khoản gốc không thể bị xóa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Hiện Cổ Entries
 ,Is Primary Address,Là Tiểu học Địa chỉ
 DocType: Production Order,Work-in-Progress Warehouse,Làm việc-trong-Tiến kho
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Tài liệu tham khảo # {0} ngày {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},Tài liệu tham khảo # {0} ngày {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Quản lý địa chỉ
 DocType: Pricing Rule,Item Code,Mã hàng
 DocType: Production Planning Tool,Create Production Orders,Tạo đơn đặt hàng sản xuất
@@ -2284,7 +2306,7 @@
 DocType: Journal Entry,User Remark,Người sử dụng Ghi chú
 DocType: Lead,Market Segment,Phân khúc thị trường
 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 +223,Closing (Dr),Đóng cửa (Tiến sĩ)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),Đóng cửa (Tiến sĩ)
 DocType: Contact,Passive,Thụ động
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Không nối tiếp {0} không có trong kho
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Mẫu thuế cho các giao dịch bán.
@@ -2300,7 +2322,7 @@
 ,Billed Amount,Số tiền hóa đơn
 DocType: Bank Reconciliation,Bank Reconciliation,Ngân hàng hòa giải
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Nhận thông tin cập nhật
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Yêu cầu tài liệu {0} được huỷ bỏ hoặc dừng lại
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Yêu cầu tài liệu {0} được huỷ bỏ hoặc dừng lại
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,Thêm một vài biên bản lấy mẫu
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Để quản lý
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Nhóm bởi tài khoản
@@ -2309,14 +2331,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Người đứng đầu tài khoản dưới trách nhiệm pháp lý, trong đó lợi nhuận / lỗ sẽ được ghi nhận"
 DocType: Payment Tool,Against Vouchers,Chống lại chứng từ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Trợ giúp nhanh
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Nguồn và kho mục tiêu không thể giống nhau cho hàng {0}
+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 mục tiêu không thể giống nhau cho hàng {0}
 DocType: Features Setup,Sales Extras,Extras bán hàng
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ngân sách cho tài khoản {1} chống lại Trung tâm Chi phí {2} sẽ vượt quá bởi {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
-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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Từ ngày' phải trước 'Đến ngày'
 ,Stock Projected Qty,Dự kiến cổ phiếu Số lượng
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
 DocType: Sales Order,Customer's Purchase Order,Mua hàng của khách hàng
 DocType: Warranty Claim,From Company,Từ Công ty
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Giá trị hoặc lượng
@@ -2326,9 +2348,9 @@
 DocType: Leave Block List,Leave Block List Allowed,Để lại Block List phép
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Bạn sẽ sử dụng nó để đăng nhập
 DocType: Sales Partner,Retailer,Cửa hàng bán lẻ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,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/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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 +128,All Supplier Types,Nhà cung cấp tất cả các loại
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +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/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Báo giá {0} không loại {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Lịch trình bảo trì hàng
 DocType: Sales Order,%  Delivered,% Giao
@@ -2372,7 +2394,7 @@
 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 net trọng lượng đóng gói + trọng lượng vật liệu. (Đối với in)
 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ả
 DocType: Serial No,Is Cancelled,Được hủy bỏ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Lô hàng của tôi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,Lô hàng của tôi
 DocType: Journal Entry,Bill Date,Hóa đơn ngày
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Ngay cả khi có nhiều quy giá với ưu tiên cao nhất, ưu tiên nội bộ sau đó sau được áp dụng:"
 DocType: Supplier,Supplier Details,Thông tin chi tiết nhà cung cấp
@@ -2393,10 +2415,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Cuộc gọi
 DocType: Project,Total Costing Amount (via Time Logs),Tổng số tiền Chi phí (thông qua Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Chứng khoán UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Mua hàng {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Mua hàng {0} không nộp
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Dự kiến
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Không nối tiếp {0} không thuộc về kho {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Lưu ý: Hệ thống sẽ không kiểm tra trên giao và quá đặt phòng cho hàng {0} như số lượng hoặc số lượng là 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Lưu ý: Hệ thống sẽ không kiểm tra trên giao và quá đặt phòng cho hàng {0} như số lượng hoặc số lượng là 0
 DocType: Notification Control,Quotation Message,Báo giá tin nhắn
 DocType: Issue,Opening Date,Mở ngày
 DocType: Journal Entry,Remark,Nhận xét
@@ -2409,9 +2431,9 @@
 DocType: Time Log,Batched for Billing,Trộn cho Thanh toán
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Hóa đơn đưa ra bởi nhà cung cấp.
 DocType: POS Profile,Write Off Account,Viết Tắt tài khoản
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Số tiền giảm giá
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against Mua hóa đơn
 DocType: Item,Warranty Period (in days),Thời gian bảo hành (trong ngày)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Tiền thuần từ hoạt động
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,ví dụ như thuế GTGT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Khoản 4
 DocType: Journal Entry Account,Journal Entry Account,Tài khoản nhập Journal
@@ -2452,7 +2474,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Trong ngày hưu trí phải lớn hơn ngày của Tham gia
 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 +69,{0}% Delivered,{0}% Phân phối
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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
 DocType: Territory,Territory Targets,Mục tiêu lãnh thổ
 DocType: Delivery Note,Transporter Info,Thông tin vận chuyển
@@ -2480,10 +2502,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch số là bắt buộc đối với hàng {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Đây là một người bán hàng gốc và không thể được chỉnh sửa.
 ,Stock Ledger,Chứng khoán Ledger
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Rate: {0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},Rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Lương trượt trích
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Chọn một nút nhóm đầu tiên.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Mục đích phải là một trong {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},Mục đích phải là một trong {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Điền vào mẫu và lưu nó
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Tải về một bản báo cáo có chứa tất cả các nguyên liệu với tình trạng hàng tồn kho mới nhất của họ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Cộng đồng Diễn đàn
@@ -2521,7 +2543,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Công ty (không khách hàng hoặc nhà cung cấp) làm chủ.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Vui lòng nhập 'dự kiến giao hàng ngày'
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Ghi chú 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/accounts/doctype/sales_invoice/sales_invoice.py +374,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} không phải là một số hợp lệ cho hàng loạt mục {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Lưu ý: Không có đủ số dư để lại cho Rời Loại {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Lưu ý: Nếu thanh toán không được thực hiện đối với bất kỳ tài liệu tham khảo, làm Journal nhập bằng tay."
@@ -2538,13 +2560,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gửi email tự động đến hệ về giao dịch Trình.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Số lượng không avalable trong kho {1} {2} vào {3}.
  Sẵn Số lượng: {4}, Chuyển Số lượng: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Khoản 3
 DocType: Purchase Order,Customer Contact Email,Khách hàng Liên hệ Email
 DocType: Sales Team,Contribution (%),Đóng góp (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Lưu ý: Hiệu 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 quy định rõ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Lưu ý: Hiệu 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 quy định rõ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Trách nhiệm
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Mẫu
 DocType: Sales Person,Sales Person Name,Người bán hàng Tên
@@ -2555,20 +2577,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Trước khi hòa giải
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Để {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Thuế và lệ phí nhập (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +374,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Mục thuế Row {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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Mục thuế Row {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
 DocType: Item,Default BOM,Mặc định HĐQT
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Hãy gõ lại tên công ty để xác nhận
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Tổng số nợ Amt
 DocType: Time Log Batch,Total Hours,Tổng số giờ
 DocType: Journal Entry,Printing Settings,In ấn Cài đặt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Tổng Nợ phải bằng Tổng số tín dụng. Sự khác biệt là {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Tổng Nợ phải bằng Tổng số tín dụng. Sự khác biệt là {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Ô tô
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Giao hàng tận nơi từ Lưu ý
 DocType: Time Log,From Time,Thời gian từ
 DocType: Notification Control,Custom Message,Tùy chỉnh tin nhắn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Ngân hàng đầu tư
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,Tiền mặt hoặc tài khoản ngân hàng là bắt buộc đối với việc nhập cảnh thanh toán
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,Tiền mặt hoặc tài khoản ngân hàng là bắt buộc đối với việc nhập cảnh thanh toán
 DocType: Purchase Invoice,Price List Exchange Rate,Danh sách giá Tỷ giá
 DocType: Purchase Invoice Item,Rate,Đánh giá
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Tập
@@ -2587,9 +2609,10 @@
  ưu tiên. Quy định giá: {0}"
 DocType: Account,Bank,Tài khoản
 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 +580,Issue Material,Vấn đề liệu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Vấn đề liệu
 DocType: Material Request Item,For Warehouse,Cho kho
 DocType: Employee,Offer Date,Phục vụ ngày
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Báo giá
 DocType: Hub Settings,Access Token,Truy cập Mã
 DocType: Sales Invoice Item,Serial No,Không nối tiếp
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Thông tin chi tiết vui lòng nhập Maintaince đầu tiên
@@ -2603,10 +2626,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Có 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,Đối tác bán hàng Tên
+DocType: Payment Reconciliation,Maximum Invoice Amount,Số tiền Hoá đơn tối đa
 DocType: Purchase Invoice Item,Image View,Xem hình ảnh
 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,From và To ngày cần
 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 +553,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,Dựa trên tính toán
 DocType: Delivery Note Item,From Warehouse,Từ kho
 DocType: Purchase Taxes and Charges,Valuation and Total,Định giá và Tổng
@@ -2614,17 +2639,18 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Mục này là một biến thể của {0} (Template). Các thuộc tính sẽ được sao chép từ các mẫu trừ 'Không Copy' được thiết lập
 DocType: Account,Purchase User,Mua tài khoản
 DocType: Notification Control,Customize the Notification,Tùy chỉnh thông báo
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Lưu chuyển tiền tệ từ hoạt động
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Địa chỉ mặc định mẫu không thể bị xóa
 DocType: Sales Invoice,Shipping Rule,Này ! Đi trước và thêm một địa chỉ
 DocType: Journal Entry,Print Heading,In nhóm
 DocType: Quotation,Maintenance Manager,Quản lý bảo trì
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Tổng số không có thể được không
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Kể từ ngày Last Order"" phải lớn hơn hoặc bằng số không"
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Kể từ ngày mua hàng trước"" phải lớn hơn hoặc bằng số không"
 DocType: C-Form,Amended From,Sửa đổi Từ
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,Nguyên liệu
 DocType: Leave Application,Follow via Email,Theo qua email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Số tiền thuế Sau khi giảm giá tiền
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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/accounts/doctype/account/account.py +183,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,Hoặc mục tiêu SL hoặc số lượng mục tiêu là bắt buộc
 apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Không có Hội đồng quản trị mặc định tồn tại cho mục {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Vui lòng chọn ngày đầu tiên viết bài
@@ -2642,6 +2668,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Nối tiếp Nos Yêu cầu cho In nhiều mục {0}
 DocType: Journal Entry,Bank Entry,Ngân hàng nhập
 DocType: Authorization Rule,Applicable To (Designation),Để áp dụng (Chỉ)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Thêm vào giỏ hàng
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Nhóm By
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Cho phép / vô hiệu hóa tiền tệ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Chi phí bưu điện
@@ -2649,30 +2676,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Giải trí & Giải trí
 DocType: Purchase Order,The date on which recurring order will be stop,"Ngày, tháng, để định kỳ sẽ được dừng lại"
 DocType: Quality Inspection,Item Serial No,Mục Serial No
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} phải được giảm {1} hoặc bạn nên tăng khả năng chịu tràn
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} phải được giảm {1} hoặc bạn nên tăng khả năng chịu tràn
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Tổng số hiện tại
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Giờ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Mục đăng {0} không thể được cập nhật bằng cách sử dụng \
  Cổ hòa giải"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Chuyển Vật liệu để Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,Chuyển Vật liệu để Nhà cung cấp
 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,Mới Serial No không thể có Warehouse. Kho phải được thiết lập bởi Cổ nhập hoặc mua hóa đơn
 DocType: Lead,Lead Type,Loại chì
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Tạo báo giá
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Bạn không được uỷ quyền phê duyệt lá trên Khối Ngày
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Tất cả các mặt hàng này đã được lập hoá đơn
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,Tất cả các mặt hàng này đã được lập hoá đơn
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Có thể được chấp thuận bởi {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Điều kiện vận chuyển Rule
 DocType: BOM Replace Tool,The new BOM after replacement,Hội đồng quản trị mới sau khi thay thế
 DocType: Features Setup,Point of Sale,Điểm bán hàng
 DocType: Account,Tax,Thuế
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} không phải là một giá trị {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Từ Bundle sản phẩm
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Từ Bundle sản phẩm
 DocType: Production Planning Tool,Production Planning Tool,Công cụ sản xuất Kế hoạch
 DocType: Quality Inspection,Report Date,Báo cáo ngày
 DocType: C-Form,Invoices,Hoá đơn
 DocType: Job Opening,Job Title,Chức vụ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} người nhận
 DocType: Features Setup,Item Groups in Details,Nhóm mục trong chi tiết
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,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/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Bắt đầu Point-of-Sale (POS)
@@ -2680,8 +2706,9 @@
 DocType: Stock Entry,Update Rate and Availability,Tốc độ cập nhật và sẵn 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: Pricing Rule,Customer Group,Nhóm khách hàng
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Tài khoản chi phí là bắt buộc đối với mục {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,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: Item,Website Description,Website Description
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Thay đổi ròng trong vốn chủ sở hữu
 DocType: Serial No,AMC Expiry Date,AMC hết hạn ngày
 ,Sales Register,Đăng ký bán hàng
 DocType: Quotation,Quotation Lost Reason,Báo giá Lost Lý do
@@ -2689,12 +2716,12 @@
 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 là.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,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
 DocType: Customer Group,Customer Group Name,Nhóm khách hàng Tên
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,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 +415,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: Item,Attributes,Thuộc tính
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Được mục
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Vui lòng nhập Viết Tắt tài khoản
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Được mục
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Vui lòng nhập Viết Tắt tài khoản
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order ngày
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Làm cho tiêu thụ đặc biệt Hóa đơn
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Tài khoản của {0} không thuộc về công ty {1}
@@ -2710,7 +2737,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dữ liệu dự án khôn ngoan là không có sẵn cho báo giá
 DocType: Project,Expected End Date,Dự kiến kết thúc ngày
 DocType: Appraisal Template,Appraisal Template Title,Thẩm định Mẫu Tiêu đề
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Thương mại
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,Thương mại
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Chánh mục {0} không phải là Cổ Mã
 DocType: Cost Center,Distribution Id,Id phân phối
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Dịch vụ tuyệt vời
@@ -2723,7 +2750,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Giá trị {0} Thuộc tính phải nằm trong phạm vi của {1} để {2} trong gia số của {3}
 DocType: Tax Rule,Sales,Bán hàng
 DocType: Stock Entry Detail,Basic Amount,Số tiền cơ bản
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Kho cần thiết cho chứng khoán hàng {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},Kho cần thiết cho chứng khoán hàng {0}
 DocType: Leave Allocation,Unused leaves,Lá chưa sử dụng
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Mặc định thu khoản
@@ -2735,16 +2762,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Tăng cho Attribute {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,Để hóa đơn ngày
 DocType: Supplier,Contact HTML,Liên hệ với HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Hóa đơn mua hàng
-DocType: Payment Reconciliation,Maximum Amount,Số tiền tối đa
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Làm thế nào giá Quy tắc được áp dụng?
 DocType: Quality Inspection,Delivery Note No,Giao hàng tận nơi Lưu ý Không
 DocType: Company,Retail,Lĩnh vực bán lẻ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Khách hàng {0} không tồn tại
 DocType: Attendance,Absent,Vắng mặt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle sản phẩm
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: tham chiếu không hợp lệ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle sản phẩm
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},Row {0}: tham chiếu không hợp lệ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Mua Thuế và phí Template
 DocType: Upload Attendance,Download Template,Tải mẫu
 DocType: GL Entry,Remarks,Ghi chú
@@ -2771,17 +2798,19 @@
 ,Monthly Attendance Sheet,Hàng tháng tham dự liệu
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Rohit ERPNext Phần mở rộng (thường)
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Trung tâm chi phí là bắt buộc đối với hàng {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Nhận Items từ Bundle sản phẩm
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Nhận Items từ Bundle sản phẩm
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Tài khoản {0} không hoạt động
 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,Từ ngày tham gia và tham dự Đến ngày là bắt buộc
 apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Vui lòng nhập 'là hợp đồng phụ ""là Có hoặc Không"
 DocType: Sales Team,Contact No.,Liên hệ với số
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Lợi nhuận và mất 'loại tài khoản {0} không được phép vào khai nhập"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Kiểu tài khoản 'Lãi và Lỗ' {0} không được phép trong Mục đang mở
 DocType: Features Setup,Sales Discounts,Giảm giá bán hàng
 DocType: Hub Settings,Seller Country,Người bán Country
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Xuất bản mục trên Website
 DocType: Authorization Rule,Authorization Rule,Quy tắc ủy quyền
 DocType: Sales Invoice,Terms and Conditions Details,Điều khoản và Điều kiện chi tiết
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,Thông số kỹ thuật
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Thuế doanh thu và lệ phí mẫu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,May mặc và phụ kiện
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Số thứ tự
@@ -2803,7 +2832,7 @@
 DocType: Time Log,Billing Amount,Số tiền thanh toán
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Số lượng không hợp lệ quy định cho mặt hàng {0}. Số lượng phải lớn hơn 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ứng dụng cho nghỉ.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Tài khoản với giao dịch hiện có không thể bị xóa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,Tài khoản với giao dịch hiện có không thể bị xóa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Chi phí pháp lý
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Các ngày trong tháng mà trên đó để tự động sẽ được tạo ra ví dụ như 05, 28 vv"
 DocType: Sales Invoice,Posting Time,Thời gian gửi bài
@@ -2819,11 +2848,11 @@
 DocType: Maintenance Visit,Breakdown,Hỏng
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Tài khoản: {0} với tệ: {1} có thể không được lựa chọn
 DocType: Bank Reconciliation Detail,Cheque Date,Séc ngày
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Tài khoản {0}: Cha mẹ tài khoản {1} không thuộc về công ty: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},Tài khoản {0}: Cha mẹ tài khoản {1} không thuộc về công ty: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Xóa thành công tất cả các giao dịch liên quan đến công ty này!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Như trên ngày
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Quản chế
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,Kho mặc định là bắt buộc đối với cổ phiếu Item.
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,Kho mặc định là bắt buộc đối với cổ phiếu Item.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Thanh toán tiền lương trong tháng {0} và năm {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto chèn tỷ Bảng giá nếu mất tích
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Tổng số tiền trả
@@ -2835,6 +2864,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Tổng số tiền Thanh toán (thông qua Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,Chúng tôi bán sản phẩm này
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Nhà cung cấp Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,Số lượng phải lớn hơn 0
 DocType: Journal Entry,Cash Entry,Cash nhập
 DocType: Sales Partner,Contact Desc,Liên hệ với quyết định
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Loại lá như bình thường, bệnh vv"
@@ -2843,7 +2873,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Thêm hàng để thiết lập ngân sách hàng năm trên tài khoản.
 DocType: Buying Settings,Default Supplier Type,Loại mặc định Nhà cung cấp
 DocType: Production Order,Total Operating Cost,Tổng chi phí hoạt động kinh doanh
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Lưu ý: Item {0} nhập nhiều lần
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,Lưu ý: Item {0} nhập nhiều lần
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tất cả các hệ.
 DocType: Newsletter,Test Email Id,Kiểm tra Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Công ty viết tắt
@@ -2868,7 +2898,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tất cả các nhóm khách hàng
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} là bắt buộc. Có thể đổi tiền kỷ lục không được tạo ra cho {1} đến {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template thuế là bắt buộc.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Tài khoản {0}: Cha mẹ tài khoản {1} không tồn tại
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,Tài khoản {0}: Cha mẹ tài khoản {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: Account,Temporary,Tạm thời
 DocType: Address,Preferred Billing Address,Địa chỉ ưa thích Thanh toán
@@ -2886,8 +2916,8 @@
 ,Item-wise Price List Rate,Item-khôn ngoan Giá liệt kê Tỷ giá
 DocType: Purchase Order Item,Supplier Quotation,Nhà cung cấp báo giá
 DocType: Quotation,In Words will be visible once you save the Quotation.,Trong từ sẽ được hiển thị khi bạn lưu các báo giá.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} là dừng lại
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1} là dừng lại
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
 DocType: Lead,Add to calendar on this date,Thêm vào lịch trong ngày này
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Quy tắc để thêm chi phí vận chuyển.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,sự kiện sắp tới
@@ -2908,24 +2938,24 @@
 DocType: Customer,From Lead,Từ chì
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Đơn đặt hàng phát hành để sản xuất.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Chọn năm tài chính ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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 +455,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
 DocType: Hub Settings,Name Token,Tên Mã
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Tiêu chuẩn bán hàng
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Ít nhất một kho là bắt buộc
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Selling,Tiêu chuẩn bán hàng
+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
 DocType: Serial No,Out of Warranty,Ra khỏi bảo hành
 DocType: BOM Replace Tool,Replace,Thay thế
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} với Sales Invoice {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Vui lòng nhập mặc định Đơn vị đo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0} với Sales Invoice {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,Vui lòng nhập mặc định Đơn vị đo
 DocType: Purchase Invoice Item,Project Name,Tên dự án
 DocType: Supplier,Mention if non-standard receivable account,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn
 DocType: Journal Entry Account,If Income or Expense,Nếu thu nhập hoặc chi phí
 DocType: Features Setup,Item Batch Nos,Mục hàng loạt Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Giá trị cổ phiếu khác biệt
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Nguồn Nhân Lực
+apps/erpnext/erpnext/config/learn.py +239,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 +36,Tax Assets,Tài sản thuế
 DocType: BOM Item,BOM No,BOM Không
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,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
 DocType: Item,Moving Average,Di chuyển trung bình
 DocType: BOM Replace Tool,The BOM which will be replaced,Hội đồng quản trị sẽ được thay thế
 DocType: Account,Debit,Thẻ ghi nợ
@@ -2962,7 +2992,7 @@
 DocType: Stock Entry Detail,Additional Cost,Chi phí bổ sung
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Năm tài chính kết thúc ngày
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Không thể lọc dựa trên Voucher Không, nếu nhóm theo Phiếu"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Nhà cung cấp báo giá thực hiện
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Nhà cung cấp báo giá thực hiện
 DocType: Quality Inspection,Incoming,Đến
 DocType: BOM,Materials Required (Exploded),Vật liệu bắt buộc (phát nổ)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Giảm Thu cho nghỉ việc không phải trả tiền (LWP)
@@ -2970,7 +3000,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} không phù hợp với {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Để lại bình thường
 DocType: Batch,Batch ID,ID hàng loạt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Lưu ý: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},Lưu ý: {0}
 ,Delivery Note Trends,Giao hàng Ghi Xu hướng
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Tóm tắt tuần này
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} phải là một mục Mua hoặc Chi ký hợp đồng trong hàng {1}
@@ -2985,6 +3015,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Tỷ giá mua
 DocType: Task,Actual Time (in Hours),Thời gian thực tế (trong giờ)
 DocType: Employee,History In Company,Trong lịch sử Công ty
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Số lượng tổng Issue / Chuyển {0} trong Material Request {1} không thể lớn hơn số lượng yêu cầu {2} cho khoản {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Bản tin
 DocType: Address,Shipping,Vận chuyển
 DocType: Stock Ledger Entry,Stock Ledger Entry,Chứng khoán Ledger nhập
@@ -3004,7 +3035,6 @@
 DocType: Purchase Order,End date of current order's period,Ngày kết thúc của thời kỳ hiện tại của trật tự
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Hãy Letter Offer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Trở về
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Mặc định Đơn vị đo lường cho Variant phải được giống như Template
 DocType: Production Order Operation,Production Order Operation,Sản xuất tự Operation
 DocType: Pricing Rule,Disable,Vô hiệu hóa
 DocType: Project Task,Pending Review,Đang chờ xem xét
@@ -3012,7 +3042,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id của khách hàng
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Giờ phải lớn hơn From Time
 DocType: Journal Entry Account,Exchange Rate,Tỷ giá
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,Bán hàng đặt hàng {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,Bán hàng đặt hàng {0} không nộp
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Kho {0}: Cha mẹ tài khoản {1} không Bolong cho công ty {2}
 DocType: BOM,Last Purchase Rate,Cuối cùng Rate
 DocType: Account,Asset,Tài sản
@@ -3032,7 +3062,7 @@
 ,Available Stock for Packing Items,Có sẵn cổ phiếu cho mục đóng gói
 DocType: Item Variant,Item Variant,Mục Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Địa chỉ thiết lập mẫu này như mặc định là không có mặc định khác
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Số dư tài khoản đã được ghi nợ, bạn không được phép để thiết lập 'cân Must Be' là 'tín dụng'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Số dư tài khoản đã được ghi nợ, bạn không được phép để thiết lập 'cân Must Be' là 'tín dụng'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quản lý chất lượng
 DocType: Production Planning Tool,Filter based on customer,Bộ lọc dựa trên khách hàng
 DocType: Payment Tool Detail,Against Voucher No,Chống Voucher Không
@@ -3049,6 +3079,7 @@
 DocType: Opportunity,Next Contact,Tiếp theo Liên lạc
 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 +40,Fixed Assets,Tài sản cố định
+,Cash Flow,Dòng tiền
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Kỳ ứng dụng không thể được qua hai hồ sơ alocation
 DocType: Item Group,Default Expense Account,Tài khoản mặc định chi phí
 DocType: Employee,Notice (days),Thông báo (ngày)
@@ -3080,13 +3111,12 @@
 DocType: Production Order,Warehouses,Kho
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,In và Văn phòng phẩm
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Nhóm Node
-DocType: Payment Reconciliation,Minimum Amount,Số tiền tối thiểu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Cập nhật hoàn thành Hàng
 DocType: Workstation,per hour,mỗi giờ
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Tài khoản cho các kho (vĩnh viễn tồn kho) sẽ được tạo ra trong Tài khoản này.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Kho không thể bị xóa sổ cái như nhập chứng khoán tồn tại cho kho này.
 DocType: Company,Distribution,Gửi đến:
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Số tiền trả
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Số tiền trả
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Giám đốc dự án
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Công văn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Tối đa cho phép giảm giá cho mặt hàng: {0} {1}%
@@ -3110,7 +3140,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Hỗ trợ Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Công ty là mất tích trong kho {0}
 DocType: POS Profile,Terms and Conditions,Điều khoản/Điều kiện thi hành
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Đến ngày phải được trong năm tài chính. Giả sử Đến ngày = {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Đến ngày phải được trong năm tài chính. Giả sử Đến ngày = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ở đây bạn có thể duy trì chiều cao, cân nặng, dị ứng, mối quan tâm y tế vv"
 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 +175,Cannot cancel because submitted Stock Entry {0} exists,Không thể hủy bỏ vì nộp chứng khoán nhập {0} tồn tại
@@ -3124,13 +3154,13 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Vui lòng nhập Mua Tiền thu
 DocType: Sales Invoice,Get Advances Received,Được nhận trước
 DocType: Email Digest,Add/Remove Recipients,Add / Remove người nhận
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},Giao dịch không được phép chống lại dừng lại tự sản xuất {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,Transaction not allowed against stopped Production Order {0},Giao dịch không được phép chống lại dừng lại tự sản xuấ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'","Thiết lập năm tài chính này như mặc định, nhấp vào 'Set as Default'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Thiết lập máy chủ cho đến hỗ trợ email id. (Ví dụ như support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Thiếu Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Mục biến {0} tồn tại với cùng một thuộc tính
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,Mục biến {0} tồn tại với cùng một thuộc tính
 DocType: Salary Slip,Salary Slip,Lương trượt
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Đến ngày"" là cần thiết"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,Phải điền mục 'Đến ngày'
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Tạo phiếu đóng gói các gói sẽ được chuyển giao. Được sử dụng để thông báo cho số gói phần mềm, nội dung gói và trọng lượng của nó."
 DocType: Sales Invoice Item,Sales Order Item,Bán hàng đặt hàng
 DocType: Salary Slip,Payment Days,Ngày thanh toán
@@ -3217,7 +3247,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Hồ sơ nhân viên.
 DocType: HR Settings,Payroll Settings,Thiết lập bảng lương
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Phù hợp với hoá đơn không liên kết và Thanh toán.
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Đặt hàng
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Đặt hàng
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Gốc không thể có một trung tâm chi phí cha mẹ
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Chọn thương hiệu ...
 DocType: Sales Invoice,C-Form Applicable,C-Mẫu áp dụng
@@ -3232,7 +3262,7 @@
 DocType: Appraisal,Start Date,Ngày bắt đầu
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Phân bổ lá trong một thời gian.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Nhấn vào đây để xác minh
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Tài khoản {0}: Bạn không thể chỉ định chính nó như là tài khoản phụ huynh
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,Tài khoản {0}: Bạn không thể chỉ định chính nó như là tài khoản phụ huynh
 DocType: Purchase Invoice Item,Price List Rate,Danh sách giá Tỷ giá
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Hiển thị ""hàng"" hoặc ""Không trong kho"" dựa trên cổ phiếu có sẵn trong kho này."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill Vật liệu (BOM)
@@ -3241,17 +3271,17 @@
 DocType: Project,Expected Start Date,Dự kiến sẽ bắt đầu ngày
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Xóa item này nếu chi phí là không áp dụng đối với mặt hàng đó
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ví dụ. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Nhận
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,Nhận
 DocType: Maintenance Visit,Fully Completed,Hoàn thành đầy đủ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 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: Employee Leave Approver,Employee Leave Approver,Nhân viên Để lại phê duyệt
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} đã được thêm thành công vào danh sách tin của chúng tôi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Một mục Sắp xếp lại đã tồn tại cho nhà kho này {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},Row {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 +67,"Cannot declare as lost, because Quotation has been made.","Không thể khai báo như bị mất, bởi vì báo giá đã được thực hiện."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Thạc sĩ Quản lý mua hàng
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,Đặt hàng sản xuất {0} phải được gửi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,Đặt hàng sản xuất {0} phải được gửi
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +136,Main Reports,Báo cáo chính
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Cho đến nay không có thể trước khi từ ngày
@@ -3269,7 +3299,7 @@
 DocType: Industry Type,Industry Type,Loại công nghiệp
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Một cái gì đó đã đi sai!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,Cảnh báo: Để lại ứng dụng có chứa khối ngày sau
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Hóa đơn bán hàng {0} đã được gửi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Hóa đơn bán hàng {0} đã được gửi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ngày kết thúc
 DocType: Purchase Invoice Item,Amount (Company Currency),Số tiền (Công ty tiền tệ)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Đơn vị tổ chức (bộ phận) làm chủ.
@@ -3288,10 +3318,10 @@
 ,Serial No Service Contract Expiry,Không nối tiếp Hợp đồng dịch vụ hết hạn
 DocType: Item,Unit of Measure Conversion,Đơn vị chuyển đổi đo lường
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Nhân viên không thể thay đổi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Bạn không thể tín dụng và ghi nợ cùng một tài khoản cùng một lúc
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,Bạn không thể tín dụng và ghi nợ cùng một tài khoản cùng một lúc
 DocType: Naming Series,Help HTML,Giúp đỡ HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Tổng số weightage giao nên được 100%. Nó là {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Trợ cấp cho quá {0} vượt qua cho mục {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Trợ cấp cho quá {0} vượt qua cho mục {1}
 DocType: Address,Name of person or organization that this address belongs to.,Tên của người hoặc tổ chức địa chỉ này thuộc về.
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,Các nhà cung cấp của bạn
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Không thể thiết lập như Lost như bán hàng đặt hàng được thực hiện.
@@ -3304,35 +3334,35 @@
 DocType: Employee,Date of Issue,Ngày phát hành
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Từ {0} cho {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Thiết lập Nhà cung cấp cho mặt hàng {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,Hình ảnh trang web {0} đính kèm vào khoản {1} không thể được tìm thấy
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Hình ảnh trang web {0} đính kèm vào khoản {1} không thể được 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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Vui lòng kiểm tra chọn ngoại tệ nhiều để cho phép các tài khoản với loại tiền tệ khác
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,Vui lòng kiểm tra chọn ngoại tệ nhiều để cho phép các tài khoản với loại tiền tệ khác
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} không tồn tại trong hệ thống
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Bạn không được phép để thiết lập giá trị đông lạnh
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,Bạn không được phép để thiết lập giá trị đông lạnh
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nhận Unreconciled Entries
+DocType: Payment Reconciliation,From Invoice Date,Từ Invoice ngày
 DocType: Cost Center,Budgets,Ngân sách
-DocType: Employee,Emergency Contact Details,Chi tiết liên lạc khẩn cấp
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Nó làm gì?
 DocType: Delivery Note,To Warehouse,Để kho
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Tài khoản {0} đã được nhập vào nhiều hơn một lần cho năm tài chính {1}
 ,Average Commission Rate,Ủy ban trung bình Tỷ giá
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,'Có Serial No' không thể 'Có' cho mục chứng khoán không
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,'Có số serial' không thể 'Có' cho hàng hóa không nhập kho
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Tham dự không thể được đánh dấu cho những ngày tương lai
 DocType: Pricing Rule,Pricing Rule Help,Quy tắc định giá giúp
 DocType: Purchase Taxes and Charges,Account Head,Trưởng tài khoản
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Cập nhật chi phí bổ sung để tính toán chi phí hạ cánh của các mặt hàng
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Hệ thống điện
 DocType: Stock Entry,Total Value Difference (Out - In),Tổng giá trị khác biệt (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate là bắt buộc
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID người dùng không thiết lập cho nhân viên {0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Từ Bảo hành yêu cầu bồi thường
 DocType: Stock Entry,Default Source Warehouse,Mặc định Nguồn Kho
 DocType: Item,Customer Code,Mã số khách hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder cho {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Kể từ ngày thứ tự cuối
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Nợ Để tài khoản phải có một tài khoản Cân đối kế toán
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,Debit To account must be a Balance Sheet account,Nợ Để tài khoản phải có một tài khoản Cân đối kế toán
 DocType: Buying Settings,Naming Series,Đặt tên dòng
 DocType: Leave Block List,Leave Block List Name,Để lại Block List Tên
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Tài sản chứng khoán
@@ -3345,7 +3375,7 @@
 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
 DocType: Authorization Rule,Based On,Dựa trên
 DocType: Sales Order Item,Ordered Qty,Số lượng đặt hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Mục {0} bị vô hiệu hóa
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,Mục {0} bị vô hiệu hóa
 DocType: Stock Settings,Stock Frozen Upto,"Cổ đông lạnh HCM,"
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Từ giai đoạn và thời gian Để ngày bắt buộc cho kỳ {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Hoạt động dự án / nhiệm vụ.
@@ -3353,7 +3383,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Mua phải được kiểm tra, nếu áp dụng Đối với được 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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Viết Tắt Số tiền (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,Row # {0}: Hãy thiết lập số lượng đặt hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,Row # {0}: Hãy thiết lập số lượng đặt hàng
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Chi phí hạ cánh
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,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
@@ -3383,12 +3413,12 @@
 DocType: Upload Attendance,Upload Attendance,Tải lên tham dự
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM và Sản xuất Số lượng được yêu cầu
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing đun 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +446,Amount,Giá trị
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Giá trị
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,HĐQT thay thế
 ,Sales Analytics,Bán hàng Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Cài đặt sản xuất
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Thiết lập Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,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ĩ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,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,Cổ phiếu nhập chi tiết
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Nhắc nhở hàng ngày
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Rule thuế Xung đột với {0}
@@ -3414,13 +3444,13 @@
 DocType: Sales Order Item,Produced Quantity,Số lượng sản xuất
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Kỹ sư
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Assemblies Tìm kiếm Sub
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},Mã mục bắt buộc khi Row Không có {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},Mã mục bắt buộc khi Row Không có {0}
 DocType: Sales Partner,Partner Type,Loại đối tác
 DocType: Purchase Taxes and Charges,Actual,Thực tế
 DocType: Authorization Rule,Customerwise Discount,Customerwise Giảm giá
 DocType: Purchase Invoice,Against Expense Account,Đối với tài khoản chi phí
 DocType: Production Order,Production Order,Đặt hàng sản xuất
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Lưu ý cài đặt {0} đã được gửi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Lưu ý cài đặt {0} đã được gửi
 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,Bây giờ xem
@@ -3432,15 +3462,15 @@
 DocType: Employee,Applicable Holiday List,Áp dụng lễ Danh sách
 DocType: Employee,Cheque,Séc
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Cập nhật hàng loạt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Loại Báo cáo là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,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/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Kho là bắt buộc đối với cổ phiếu hàng {0} trong hàng {1}
 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/public/js/setup_wizard.js +101,The First User: You,Những thành viên đầu tiên: Bạn
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Năm tài chính Ngày bắt đầu và tài chính cuối năm ngày đã được thiết lập trong năm tài chính {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Hòa giải thành công
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Năm tài chính Ngày bắt đầu và tài chính cuối năm ngày đã được thiết lập trong năm tài chính {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Hòa giải thành công
 DocType: Production Order,Planned End Date,Kế hoạch End ngày
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Nơi các mặt hàng được lưu trữ.
 DocType: Tax Rule,Validity,Hiệu lực
@@ -3448,7 +3478,7 @@
 DocType: Attendance,Attendance,Tham gia
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Ngày đăng và gửi bài thời gian là bắt buộc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,Ngày đăng và gửi bài thời gian là bắt buộc
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Mẫu thuế đối với giao dịch mua.
 ,Item Prices,Giá mục
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Trong từ sẽ được hiển thị khi bạn lưu các Mua hàng.
@@ -3457,15 +3487,15 @@
 DocType: Task,Review Date,Ngày đánh giá
 DocType: Purchase Invoice,Advance Payments,Thanh toán trước
 DocType: Purchase Taxes and Charges,On Net Total,Trên Net Tổng số
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,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ự
+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ự
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Không được phép sử dụng công cụ thanh toán
-apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Thông báo địa chỉ email không định kỳ cho% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,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
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Địa chỉ Email thông báo' không chỉ rõ cho kỳ hạn %s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,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: Company,Round Off Account,Vòng Tắt tài khoản
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Chi phí hành chính
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Tư vấn
 DocType: Customer Group,Parent Customer Group,Cha mẹ Nhóm khách hàng
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Thay đổi
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Thay đổi
 DocType: Purchase Invoice,Contact Email,Liên hệ Email
 DocType: Appraisal Goal,Score Earned,Điểm số kiếm được
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","ví dụ như ""Công ty của tôi LLC """
@@ -3475,13 +3505,13 @@
 DocType: Packing Slip,Gross Weight UOM,Tổng trọng lượng UOM
 DocType: Email Digest,Receivables / Payables,Các khoản phải thu / phải trả
 DocType: Delivery Note Item,Against Sales Invoice,Chống bán hóa đơn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,Tài khoản tín dụng
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Tài khoản tín dụng
 DocType: Landed Cost Item,Landed Cost Item,Chi phí hạ cánh hàng
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Hiện không có giá trị
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Số lượng mặt hàng thu được sau khi sản xuất / đóng gói lại từ số lượng nhất định của nguyên liệu
 DocType: Payment Reconciliation,Receivable / Payable Account,Thu / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,Chống bán hàng đặt hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,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 +572,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
 DocType: Task,Actual End Date (via Time Logs),Thực tế End Date (qua Thời gian Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,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}
@@ -3517,29 +3547,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Kế hoạch thời gian bản ghi ngoài giờ làm việc Workstation.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} đã được gửi
 ,Items To Be Requested,Mục To Be yêu cầu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,Nhận cuối Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Tỷ lệ thanh toán dựa trên Loại hoạt động (mỗi giờ)
 DocType: Company,Company Info,Thông tin công ty
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Công ty Email ID không tìm thấy, do đó thư không gửi"
 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)
 DocType: Production Planning Tool,Filter based on item,Lọc dựa trên mục
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,Nợ TK
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,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: Sales Invoice,Rounded Total (Company Currency),Tổng số tròn (Công ty tiền tệ)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,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/accounts/doctype/account/account.py +124,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.
 DocType: Purchase Common,Purchase Common,Mua chung
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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 ứng dụng Để lại vào những ngày sau.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Cơ hội từ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Lợi ích của nhân viên
 DocType: Sales Invoice,Is POS,Là POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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
 DocType: Purchase Receipt Item,Accepted Quantity,Số lượng chấp nhận
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} không tồn tại
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Hóa đơn tăng cho khách hàng.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id dự án
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Không {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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Không {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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} thuê bao thêm
 DocType: Maintenance Schedule,Schedule,Lập lịch quét
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Xác định ngân sách cho Trung tâm chi phí này. Để thiết lập hành động ngân sách, xem &quot;Công ty List&quot;"
@@ -3547,7 +3578,7 @@
 DocType: Quality Inspection Reading,Reading 3,Đọc 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Loại chứng từ
-apps/erpnext/erpnext/public/js/pos/pos.js +91,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/public/js/pos/pos.js +96,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: Expense Claim,Approved,Đã được phê duyệt
 DocType: Pricing Rule,Price,Giá
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,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'
@@ -3561,7 +3592,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Sổ nhật ký kế toán.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Số lượng có sẵn tại Từ kho
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Vui lòng chọn nhân viên ghi đầu tiên.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Đảng / tài khoản không khớp với {1} / {2} trong {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Đảng / tài khoản không khớp với {1} / {2} trong {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Để tạo ra một tài khoản thuế
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Vui lòng nhập tài khoản chi phí
 DocType: Account,Stock,Kho
@@ -3572,7 +3603,7 @@
 DocType: Employee,Contract End Date,Ngày kết thúc hợp đồng
 DocType: Sales Order,Track this Sales Order against any Project,Theo dõi đơn hàng bán hàng này chống lại bất kỳ dự án
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Kéo đơn bán hàng (đang chờ để cung cấp) dựa trên các tiêu chí trên
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Nhà cung cấp báo giá từ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,Nhà cung cấp báo giá từ
 DocType: Deduction Type,Deduction Type,Loại trừ
 DocType: Attendance,Half Day,Nửa ngày
 DocType: Pricing Rule,Min Qty,Min Số lượng
@@ -3580,7 +3611,7 @@
 DocType: GL Entry,Transaction Date,Giao dịch ngày
 DocType: Production Plan Item,Planned Qty,Số lượng dự kiến
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Tổng số thuế
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,Đối với lượng (Sản xuất Qty) là bắt buộc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Đối với lượng (Sản xuất Qty) là bắt buộc
 DocType: Stock Entry,Default Target Warehouse,Mặc định mục tiêu kho
 DocType: Purchase Invoice,Net Total (Company Currency),Net Tổng số (Công ty tiền tệ)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Đảng Type và Đảng là chỉ áp dụng đối với thu / tài khoản phải trả
@@ -3634,9 +3665,9 @@
 DocType: Customer,Commission Rate,Tỷ lệ hoa hồng
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,Hãy Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Ngăn chặn các ứng dụng của bộ phận nghỉ.
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Giỏ hàng rỗng
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Giỏ hàng rỗng
 DocType: Production Order,Actual Operating Cost,Thực tế Chi phí điều hành
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Gốc không thể được chỉnh sửa.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,Gốc không thể được chỉnh sửa.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Số lượng phân bổ có thể không lớn hơn số tiền unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Cho phép sản xuất vào ngày lễ
 DocType: Sales Order,Customer's Purchase Order Date,Của khách hàng Mua hàng ngày
@@ -3647,11 +3678,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Nhà thiết kế
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Điều khoản và Điều kiện Template
 DocType: Serial No,Delivery Details,Chi tiết giao hàng
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Trung tâm chi phí là cần thiết trong hàng {0} trong bảng Thuế cho loại {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},Trung tâm chi phí là cần thiết trong hàng {0} trong bảng Thuế cho loại {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Tự động tạo Material Request nếu số lượng giảm xuống dưới mức này
 ,Item-wise Purchase Register,Item-khôn ngoan mua Đăng ký
 DocType: Batch,Expiry Date,Ngày hết hiệu lực
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Để thiết lập mức độ sắp xếp lại, mục phải là một khoản mua hoặc sản xuất hàng"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Để thiết lập mức độ sắp xếp lại, mục phải là một khoản mua hoặc sản xuất hàng"
 ,Supplier Addresses and Contacts,Địa chỉ nhà cung cấp và hệ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vui lòng chọn mục đầu tiên
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Chủ dự án.
@@ -3659,7 +3690,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Nửa ngày)
 DocType: Supplier,Credit Days,Ngày tín dụng
 DocType: Leave Type,Is Carry Forward,Được Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Được mục từ BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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,Thời gian dẫn ngày
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Hóa đơn nguyên vật liệu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Đảng Type và Đảng là cần thiết cho thu / tài khoản phải trả {1}
@@ -3667,7 +3698,7 @@
 DocType: Employee,Reason for Leaving,Lý do Rời
 DocType: Expense Claim Detail,Sanctioned Amount,Số tiền xử phạt
 DocType: GL Entry,Is Opening,Được mở cửa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Nợ mục không thể được liên kết với một {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Tài khoản {0} không tồn tại
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},Row {0}: Nợ mục không thể được liên kết với một {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,Tài khoản {0} không tồn tại
 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-cn.csv b/erpnext/translations/zh-cn.csv
index 1968c9d..a86d443 100644
--- a/erpnext/translations/zh-cn.csv
+++ b/erpnext/translations/zh-cn.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,消费类产品
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,请选择党第一型
 DocType: Item,Customer Items,客户项目
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,科目{0}的上级科目{1}不能是分类账
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,科目{0}的上级科目{1}不能是分类账
 DocType: Item,Publish Item to hub.erpnext.com,发布项目hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,邮件通知
 DocType: Item,Default Unit of Measure,默认计量单位
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,客户联系
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,来自物料申请
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,来自物料申请
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} 树
 DocType: Job Applicant,Job Applicant,求职者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,没有更多结果。
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1。为了保持客户明智的项目代码,并使其搜索根据自己的代码中使用这个选项
 DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,显示变体
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,数量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款(负债)
 DocType: Employee Education,Year of Passing,按年排序
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,库存
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,医疗保健
 DocType: Purchase Invoice,Monthly,每月
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),延迟支付(天)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,发票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,发票
 DocType: Maintenance Schedule Item,Periodicity,周期性
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,邮件提醒
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,会计年度{0}是必需的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defense
 DocType: Company,Abbr,缩写
 DocType: Appraisal Goal,Score (0-5),得分(0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}:{1} {2}不相匹配{3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},行{0}:{1} {2}不相匹配{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,行#{0}:
 DocType: Delivery Note,Vehicle No,车辆编号
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,请选择价格表
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,请选择价格表
 DocType: Production Order Operation,Work In Progress,在制品
 DocType: Employee,Holiday List,假期列表
 DocType: Time Log,Time Log,时间日志
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司进入不止一次
 DocType: Employee,Married,已婚
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允许{0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
-DocType: Payment Reconciliation,Reconcile,调和
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+DocType: Payment Reconciliation,Reconcile,对账
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,杂货
 DocType: Quality Inspection Reading,Reading 1,阅读1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,创建银行分录
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,养老基金
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,类型为仓库的账户必须指定仓库
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,类型为仓库的账户必须指定仓库
 DocType: SMS Center,All Sales Person,所有的销售人员
 DocType: Lead,Person Name,人姓名
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",如果是周期性订单的话请勾选,不是周期性或有结束日期的订单请取消选择。
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,有兴趣
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,物料清单
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,开盘
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},从{0}至 {1}
+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,开放报名
 DocType: Stock Entry,Additional Costs,额外费用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,有交易的科目不能被转换为组。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,有交易的科目不能被转换为组。
 DocType: Lead,Product Enquiry,产品查询
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,请先输入公司
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,目标类型
+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 +9,Activity Log:,活动日志:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,品目{0}不存在于系统中或已过期
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,品目{0}必须是采购品目
 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 +444,Item {0} is not active or end of life has been reached,品目{0}处于非活动或寿命终止状态
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,品目{0}处于非活动或寿命终止状态
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,销售发票提交后将会更新。
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,人力资源模块的设置
@@ -180,7 +180,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,生产操作详情。
 DocType: Serial No,Maintenance Status,维护状态
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,项目和定价
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},起始日期应该在财年之内。财年起始日是{0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},起始日期应该在财年之内。财年起始日是{0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,选择该评估的雇员对象。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},成本中心{0}不属于公司{1}
 DocType: Customer,Individual,个人
@@ -214,6 +214,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,从融资净现金
 DocType: Lead,Address & Contact,地址及联系方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的叶子从以前的分配
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
@@ -221,6 +222,7 @@
 ,Contact Name,联系人姓名
 DocType: Production Plan Item,SO Pending Qty,销售订单待定数量
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,依上述条件创建工资单
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,未提供描述
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,请求您的报价。
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
@@ -232,7 +234,7 @@
 DocType: Item Website Specification,Item Website Specification,品目网站规格
 DocType: Payment Tool,Reference No,参考编号
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
 DocType: Stock Entry,Sales Invoice No,销售发票编号
@@ -244,11 +246,11 @@
 DocType: Pricing Rule,Supplier Type,供应商类型
 DocType: Item,Publish in Hub,在发布中心
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,品目{0}已取消
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,品目{0}已取消
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
 DocType: Item,Purchase Details,购买详情
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},项目{0}未发现“原材料提供&#39;表中的采购订单{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},项目{0}未发现“原材料提供&#39;表中的采购订单{1}
 DocType: Employee,Relation,关系
 DocType: Shipping Rule,Worldwide Shipping,全球航运
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,确认客户订单。
@@ -260,7 +262,7 @@
 DocType: Lead,Suggestions,建议
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,为此区域设置品目群组特定的预算。你还可以设置“分布”,为预算启动季节性。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},请输入父帐户组仓库{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对支付{0} {1}不能大于未偿还{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,生成时间表
@@ -269,6 +271,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,最新
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,最多5个字符
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,假期审批人列表的第一个将被设为默认审批人
+apps/erpnext/erpnext/config/desktop.py +73,Learn,学习
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每个员工活动费用
 DocType: Accounts Settings,Settings for Accounts,帐户设置
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,管理销售人员。
@@ -288,9 +291,9 @@
 DocType: Journal Entry,Multi Currency,多币种
 DocType: Payment Reconciliation Invoice,Invoice Type,发票类型
 DocType: Sales Invoice Item,Delivery Note,送货单
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,建立税
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,建立税
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改,你把它之后。请重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0}输入两次税项
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0}输入两次税项
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,本周和待活动总结
 DocType: Workstation,Rent Cost,租金成本
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,请选择年份和月份
@@ -303,14 +306,14 @@
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,总订货考虑
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",雇员指派(例如总裁,总监等) 。
 apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,请输入“重复上月的一天'字段值
-DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,速率客户货币转换成客户的基础货币
+DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,客户货币转换为客户的基础货币后的单价
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",可在物料清单,送货单,采购发票,生产订单,采购订单,采购收据,销售发票,销售订单,仓储记录,时间表里面找到
 DocType: Item Tax,Tax Rate,税率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,选择项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,选择项目
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",品目{0}通过批次管理,不能通过库存盘点进行盘点,请使用库存登记
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行#{0}:批号必须与{1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,转换为非集团
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,购买收据必须提交
@@ -351,6 +354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,医药
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,原因丢失
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,单身
 DocType: Issue,Attachment,附件
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,预算不能为集团成本中心成立
@@ -380,13 +384,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,假期大师
 DocType: Material Request Item,Required Date,所需时间
 DocType: Delivery Note,Billing Address,帐单地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,请输入产品编号。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,请输入产品编号。
 DocType: BOM,Costing,成本核算
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果勾选,税金将被当成已包括在打印税率/打印总额内。
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,总数量
@@ -419,7 +423,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items",若要合并,以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items",若要合并,以下属性必须为这两个项目是相同的
 DocType: Shipping Rule,Net Weight,净重
 DocType: Employee,Emergency Phone,紧急电话
 ,Serial No Warranty Expiry,序列号/保修到期
@@ -429,7 +433,7 @@
 DocType: Account,Profit and Loss,损益
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,管理转包
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,factory furniture and fixtures
-DocType: Quotation,Rate at which Price list currency is converted to company's base currency,速率价目表货币转换为公司的基础货币
+DocType: Quotation,Rate at which Price list currency is converted to company's base currency,价目表货币转换为公司的基础货币后的单价
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},科目{0}不属于公司:{1}
 DocType: Selling Settings,Default Customer Group,默认客户群组
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用,“舍入总计”字段将不在交易中显示
@@ -438,15 +442,14 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,增量不能为0
 DocType: Production Planning Tool,Material Requirement,物料需求
 DocType: Company,Delete Company Transactions,删除公司事务
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,品目{0}不是采购品目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,品目{0}不是采购品目
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",“通知电子邮件地址”的{0}不是有效的电子邮件地址
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,总计费今年:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加/编辑税金及费用
 DocType: Purchase Invoice,Supplier Invoice No,供应商发票编号
 DocType: Territory,For reference,供参考
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",无法删除序列号{0},因为它采用的是现货交易
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),结算(信用)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),结算(信用)
 DocType: Serial No,Warranty Period (Days),保修期限(天数)
 DocType: Installation Note Item,Installation Note Item,安装单品目
 ,Pending Qty,待定数量
@@ -461,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",如果你有季节性的业务,**月度分配**将帮助你按月分配预算。要使用这种分配方式,请在**成本中心**内设置**月度分配**。
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,没有在发票表中找到记录
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,没有在发票表中找到记录
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,请选择公司和党的第一型
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,财务/会计年度。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",抱歉,序列号无法合并
@@ -469,9 +472,9 @@
 DocType: Project Task,Project Task,项目任务
 ,Lead Id,线索ID
 DocType: C-Form Invoice Detail,Grand Total,总计
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,财年开始日期应不大于结束日期
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,财年开始日期应不大于结束日期
 DocType: Warranty Claim,Resolution,决议
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},交货:{0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},交货:{0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,应付帐款
 DocType: Sales Order,Billing and Delivery Status,结算和交货状态
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回头客
@@ -486,16 +489,16 @@
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),开幕(CR )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,调配数量不能为负
 DocType: Purchase Order Item,Billed Amt,已开票金额
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,创建库存记录所依赖的逻辑仓库。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},参考号与参考日期须为{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},{0}需要参考编号与参考日期
 DocType: Sales Invoice,Customer's Vendor,客户的供应商
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,生产订单是强制性
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,提案写作
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外销售人员{0}存在具有相同员工ID
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},负库存错误({6})。品目{0},仓库{1},提交时间{2}{3},凭证类型{4},凭证编号{5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},负库存错误({6})。品目{0},仓库{1},提交时间{2}{3},凭证类型{4},凭证编号{5}
 DocType: Fiscal Year Company,Fiscal Year Company,公司财政年度
 DocType: Packing Slip Item,DN Detail,送货单详情
 DocType: Time Log,Billed,已开票
@@ -514,16 +517,17 @@
 DocType: Activity Type,Default Costing Rate,默认成本核算率
 DocType: Maintenance Schedule,Maintenance Schedule,维护计划
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然后定价规则将基于客户,客户组,地区,供应商,供应商类型,活动,销售合作伙伴等条件过滤。
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,在库存净变动
 DocType: Employee,Passport Number,护照号码
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,经理
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,来自采购收据
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,相同的品目已输入多次
-DocType: SMS Settings,Receiver Parameter,接收机参数
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,来自采购收据
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,相同的品目已输入多次
+DocType: SMS Settings,Receiver Parameter,接收人参数
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根据”和“分组依据”不能相同
 DocType: Sales Person,Sales Person Targets,销售人员目标
 DocType: Production Order Operation,In minutes,已分钟为单位
 DocType: Issue,Resolution Date,决议日期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
 DocType: Selling Settings,Customer Naming By,客户命名方式
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,转换为组
 DocType: Activity Cost,Activity Type,活动类型
@@ -534,7 +538,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}:{1}在发票明细表中无法找到
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
 DocType: Material Request,Material Transfer,物料转移
@@ -556,13 +560,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,市场营销
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,在基于其序列号的销售和采购文件跟踪的项目。这也可以用来跟踪商品的保修细节。
 DocType: Purchase Receipt Item Supplied,Current Stock,当前库存
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,拒绝仓库是必须反对regected项目
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,今年的总账单
 DocType: Account,Expenses Included In Valuation,开支计入估值
 DocType: Employee,Provide email id registered in company,提供的电子邮件ID在公司注册
 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 +533,Item has variants.,项目已变种。
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,树类型
@@ -580,18 +584,18 @@
 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 +92,{0} is not a stock Item,{0}不是一个库存品目
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0}不是一个库存品目
 DocType: Mode of Payment Account,Default Account,默认帐户
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话,必须指定线索
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,请选择每周休息日
 DocType: Production Order Operation,Planned End Time,计划结束时间
 ,Sales Person Target Variance Item Group-Wise,品目组特定的销售人员目标差异
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,有交易的科目不能被转换为分类账
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,有交易的科目不能被转换为分类账
 DocType: Delivery Note,Customer's Purchase Order No,客户的采购订单号
 DocType: Employee,Cell Number,手机号码
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,汽车材料的要求生成
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丧失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,从机会
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月度工资结算
@@ -600,9 +604,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}:申请者{0} 假期类型{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,行{0}:转换系数是强制性的
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,会计分录可对叶节点。对组参赛作品是不允许的。
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM,因为它被其他BOM引用。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM,因为它被其他BOM引用。
 DocType: Opportunity,Maintenance,维护
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
 DocType: Item Attribute Value,Item Attribute Value,品目属性值
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,销售活动。
 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.
@@ -638,7 +642,7 @@
 9. 基本税率是否包含此税费?:勾选此项则意味着此税项不会显示在品目表下,但会出现在品目主表的标注费率内。如果你需要向客户提供一个统一售价(即包含所有税费),这个选项会很有用。"
 DocType: Employee,Bank A/C No.,银行账号
 DocType: Expense Claim,Project,项目
-DocType: Quality Inspection Reading,Reading 7,7阅读
+DocType: Quality Inspection Reading,Reading 7,阅读7
 DocType: Address,Personal,个人
 DocType: Expense Claim Detail,Expense Claim Type,报销类型
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,购物车的默认设置
@@ -652,7 +656,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,价格列表没有选择
 DocType: Employee,Family Background,家庭背景
 DocType: Process Payroll,Send Email,发送电子邮件
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},警告:无效的附件{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},警告:无效的附件{0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,无此权限
 DocType: Company,Default Bank Account,默认银行账户
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",要根据党的筛选,选择党第一类型
@@ -660,7 +664,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,具有较高权重的项目将显示更高的可
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐详细
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,我的发票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,我的发票
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,未找到任何雇员
 DocType: Purchase Order,Stopped,已停止
 DocType: Item,If subcontracted to a vendor,如果分包给供应商
@@ -670,6 +674,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,立即发送
 ,Support Analytics,客户支持分析
 DocType: Item,Website Warehouse,网站仓库
+DocType: Payment Reconciliation,Minimum Invoice Amount,最小发票金额
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",每月自动生成发票的日期,例如5号,28号等
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必须小于或等于5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-表记录
@@ -679,7 +684,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",为了使“销售点”的特点
 DocType: Bin,Moving Average Rate,移动平均价格
 DocType: Production Planning Tool,Select Items,选择品目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
 DocType: Maintenance Visit,Completion Status,完成状态
 DocType: Sales Invoice Item,Target Warehouse,目标仓库
 DocType: Item,Allow over delivery or receipt upto this percent,允许在交付或接收高达百分之这
@@ -691,7 +696,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,在提交交易时自动编写信息。
 DocType: Production Order,Item To Manufacture,要生产的品目
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}的状态为{2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,采购订单到付款
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,采购订单到付款
 DocType: Sales Order Item,Projected Qty,预计数量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通讯经理
@@ -705,7 +710,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,研究与发展
 ,Amount to Bill,帐单数额
 DocType: Company,Registration Details,报名详情
-DocType: Item,Re-Order Qty,重新排序数量
+DocType: Item,Re-Order Qty,再次订货数量
 DocType: Leave Block List Date,Leave Block List Date,禁离日日期
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},计划发送到{0}
 DocType: Pricing Rule,Price or Discount,价格或折扣
@@ -715,7 +720,7 @@
 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 +304,Point-of-Sale,销售点
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",账户余额已设置为'贷方',不能设置为'借方'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",账户余额已设置为'贷方',不能设置为'借方'
 DocType: Account,Balance must be,余额必须是
 DocType: Hub Settings,Publish Pricing,发布定价
 DocType: Notification Control,Expense Claim Rejected Message,报销拒绝消息
@@ -733,12 +738,12 @@
 DocType: Item Attribute,Item Attribute Values,品目属性值
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,查看订阅
 DocType: Purchase Invoice Item,Purchase Receipt,外购入库单
-,Received Items To Be Billed,收到的项目要被收取
+,Received Items To Be Billed,要支付的已收项目
 DocType: Employee,Ms,女士
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,货币汇率大师
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM{0}处于非活动状态
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM{0}处于非活动状态
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,请选择文档类型第一
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消此上门保养之前请先取消物料访问{0}
 DocType: Salary Slip,Leave Encashment Amount,假期已使用量
@@ -756,17 +761,17 @@
 DocType: Supplier,Default Payable Accounts,默认应付账户(多个)
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
 DocType: Features Setup,Item Barcode,品目条码
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,品目变种{0}已更新
-DocType: Quality Inspection Reading,Reading 6,6阅读
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,品目变种{0}已更新
+DocType: Quality Inspection Reading,Reading 6,阅读6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
 DocType: Address,Shop,商店
 DocType: Hub Settings,Sync Now,立即同步
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},行{0}:信用记录无法被链接的{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},行{0}:信用记录无法被链接的{1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,选择此模式时POS发票的银行/现金账户将会被自动更新。
 DocType: Employee,Permanent Address Is,永久地址
 DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,你的品牌
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,品目{1}已经超过允许的超额{0}。
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,品目{1}已经超过允许的超额{0}。
 DocType: Employee,Exit Interview Details,退出面试细节
 DocType: Item,Is Purchase Item,是否采购品目
 DocType: Journal Entry Account,Purchase Invoice,购买发票
@@ -778,7 +783,7 @@
 DocType: Salary Slip,Total in words,总字
 DocType: Material Request Item,Lead Time Date,交货时间日期
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,是强制性的。也许外币兑换记录没有创建
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},行#{0}:请注明序号为项目{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},行#{0}:请注明序号为项目{1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.",对于“产品包”的物品,仓库,序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品,这些值可以在主项表中输入,值将被复制到“装箱单”表。
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,向客户发货。
 DocType: Purchase Invoice Item,Purchase Order Item,采购订单项目
@@ -787,14 +792,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,方差
 ,Company Name,公司名称
 DocType: SMS Center,Total Message(s),总信息(s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,请选择支票存入的银行账户头。
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允许用户编辑交易中的价目表率。
 DocType: Pricing Rule,Max Qty,最大数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,化学品
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
 DocType: Process Payroll,Select Payroll Year and Month,选择薪资年和月
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",转到相应的组(通常资金运用&gt;流动资产&gt;银行帐户,并创建一个新帐户(通过点击添加类型的儿童),“银行”
 DocType: Workstation,Electricity Cost,电力成本
@@ -808,10 +814,10 @@
 DocType: SMS Center,All Lead (Open),所有潜在客户(开放)
 DocType: Purchase Invoice,Get Advances Paid,获取已付预付款
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,附上你的照片
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,使
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,使
 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 +3,My Cart,我的购物车
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,我的购物车
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,开放数量
@@ -830,10 +836,10 @@
 DocType: POS Profile,Cash/Bank Account,现金/银行账户
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,属性表是强制性的
 DocType: Production Planning Tool,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能为负
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,折扣
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,折扣
 DocType: Features Setup,Purchase Discounts,购买折扣
 DocType: Workstation,Wages,薪金
 DocType: Time Log,Will be updated only if Time Log is 'Billable',如果时间日志是“计费”将只更新
@@ -858,7 +864,7 @@
 DocType: Tax Rule,Shipping State,运输状态
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,品目必须要由“从采购收据获取品目”添加
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,销售费用
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,标准采购
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,标准采购
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
@@ -900,6 +906,7 @@
 DocType: Sales Partner,Distributor,经销商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
 ,Ordered Items To Be Billed,订购物品被标榜
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,从范围必须小于要范围
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,选择时间记录然后提交来创建一个新的销售发票。
@@ -909,13 +916,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,此时日志批量一直标榜。
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,创建机会
 DocType: Salary Slip,Leave Without Pay,无薪假期
-DocType: Supplier,Communications,通讯
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,容量规划错误
 ,Trial Balance for Party,试算表的派对
 DocType: Lead,Consultant,顾问
 DocType: Salary Slip,Earnings,盈余
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,完成项目{0}必须为制造类条目进入
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,打开会计平衡
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,完成项目{0}必须为制造类条目进入
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,打开会计平衡
 DocType: Sales Invoice Advance,Sales Invoice Advance,销售发票预付款
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,没有申请内容
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',“实际开始日期”不能大于“实际结束日期'
@@ -957,7 +963,7 @@
 DocType: Global Defaults,Current Fiscal Year,当前财年
 DocType: Global Defaults,Disable Rounded Total,禁用总计化整
 DocType: Lead,Call,通话
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,“分录”不能为空
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,“分录”不能为空
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重复的行{0}同{1}
 ,Trial Balance,试算表
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,建立职工
@@ -969,9 +975,9 @@
 DocType: Contact,User ID,用户ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,查看总帐
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在,请修改品目名或群组名
 DocType: Production Order,Manufacture against Sales Order,按销售订单生产
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,世界其他地区
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,工资总额
@@ -1001,7 +1007,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
 DocType: Journal Entry,Get Outstanding Invoices,获取未清发票
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,销售订单{0}无效
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",抱歉,公司不能合并
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged",抱歉,公司不能合并
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}开始
@@ -1014,13 +1020,13 @@
 DocType: Employee,Place of Issue,签发地点
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,合同
 DocType: Email Digest,Add Quote,添加报价
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,间接支出
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,行{0}:数量是强制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,农业
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,您的产品或服务
 DocType: Mode of Payment,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,请先输入项目
 DocType: Journal Entry Account,Purchase Order,采购订单
 DocType: Warehouse,Warehouse Contact Info,仓库联系方式
@@ -1029,8 +1035,8 @@
 DocType: Email Digest,Annual Income,年收入
 DocType: Serial No,Serial No Details,序列号详情
 DocType: Purchase Invoice Item,Item Tax Rate,品目税率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",对于{0},贷方分录只能选择贷方账户
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry",对于{0},贷方分录只能选择贷方账户
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,送货单{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,品目{0}必须是外包品目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,资本设备
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段,可以是项目,项目组或品牌。
@@ -1040,7 +1046,7 @@
 DocType: Appraisal Goal,Goal,目标
 DocType: Sales Invoice Item,Edit Description,编辑说明
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,预计交付日期比计划开始日期较小。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,对供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,对供应商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,设置帐户类型有助于在交易中选择该帐户。
 DocType: Purchase Invoice,Grand Total (Company Currency),总计(公司货币)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,即将离任的总
@@ -1053,7 +1059,7 @@
 DocType: Journal Entry,Journal Entry,日记帐分录
 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 +427,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,这就是以这个前缀的最后一个创建的事务数
@@ -1085,7 +1091,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",发给联系人和潜在客户的通讯
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,操作不能留空。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,操作不能留空。
 ,Delivered Items To Be Billed,无开账单的已交付品目
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,仓库不能为序列号变更
 DocType: Authorization Rule,Average Discount,平均折扣
@@ -1100,7 +1106,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},来自{0} | {1} {2}
 DocType: BOM Operation,Operation Description,操作说明
 DocType: Item,Will also apply to variants,会同时应用于变体
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,财年保存后便不能更改财年开始日期和结束日期
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,财年保存后便不能更改财年开始日期和结束日期
 DocType: Quotation,Shopping Cart,购物车
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,平均每日出货
 DocType: Pricing Rule,Campaign,活动
@@ -1111,7 +1117,8 @@
 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 +211,Stock Entries already created for Production Order ,生产订单已创建Stock条目
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,生产订单已创建Stock条目
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,在固定资产净变动
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大值:{0}
@@ -1123,7 +1130,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,条款和条件内容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,品目{0}不是库存品目
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,品目{0}不是库存品目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,依赖于无薪休假
@@ -1160,7 +1167,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,半成品
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Supplier,Stock Manager,库存管理
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
+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 +581,Packing Slip,装箱单
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,办公室租金
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,短信网关的设置
@@ -1168,10 +1175,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,未添加地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作时间
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,分析员
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}:分配量{1}必须小于或等于合资量{2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}:分配量{1}必须小于或等于合资量{2}
 DocType: Item,Inventory,库存
 DocType: Features Setup,"To enable ""Point of Sale"" view",为了让观“销售点”
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,付款方式不能为空购物车制造
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,付款方式不能为空购物车制造
 DocType: Item,Sales Details,销售详情
 DocType: Opportunity,With Items,随着项目
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,在数量
@@ -1186,10 +1193,11 @@
 DocType: Cost Center,Parent Cost Center,父成本中心
 DocType: Sales Invoice,Source,源
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,没有在支付表中找到记录
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,没有在支付表中找到记录
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,财政年度开始日期
 DocType: Employee External Work History,Total Experience,总经验
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,装箱单( S)取消
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,装箱单( S)取消
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,从投资现金流
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,货运及转运费
 DocType: Material Request Item,Sales Order No,销售订单编号
 DocType: Item Group,Item Group Name,品目群组名称
@@ -1197,12 +1205,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,转移制造材料
 DocType: Pricing Rule,For Price List,对价格表
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,猎头
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",购买率的项目:{0}没有找到,这是需要预订会计分录(费用)。请注明项目价格对买入价格表。
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",购买率的项目:{0}没有找到,这是需要预订会计分录(费用)。请注明项目价格对买入价格表。
 DocType: Maintenance Schedule,Schedules,计划任务
 DocType: Purchase Invoice Item,Net Amount,净额
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM详情编号
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),额外的优惠金额(公司货币)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},错误: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},错误: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,请从科目表创建新帐户。
 DocType: Maintenance Visit,Maintenance Visit,维护访问
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,客户>客户群组>地区
@@ -1223,12 +1231,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Box,箱
 apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,本组织设置
 DocType: Monthly Distribution,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,接收人列表为空。请创建接收人列表
 DocType: Production Plan Sales Order,Production Plan Sales Order,生产计划销售订单
 DocType: Sales Partner,Sales Partner Target,销售合作伙伴目标
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},会计分录为{0}只能在货币进行:{1}
 DocType: Pricing Rule,Pricing Rule,定价规则
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,材料要求采购订单
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,材料要求采购订单
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},行#{0}:返回的项目{1}不存在{2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,银行账户
 ,Bank Reconciliation Statement,银行对帐表
@@ -1236,13 +1244,13 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,期初存货余额
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0}只能出现一次
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允许转院更多{0}不是{1}对采购订单{2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},已成功为{0}调配假期
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,未选择品目
 DocType: Shipping Rule Condition,From Value,起始值
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,生产数量为必须项
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,生产数量为必须项
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,银行无记录的数额
-DocType: Quality Inspection Reading,Reading 4,4阅读
+DocType: Quality Inspection Reading,Reading 4,阅读4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,公司开支报销
 DocType: Company,Default Holiday List,默认假期列表
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,库存负债
@@ -1252,33 +1260,34 @@
 ,Material Requests for which Supplier Quotations are not created,无供应商报价的物料申请
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,这一天(S)对你所申请休假的假期。你不需要申请许可。
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,要使用条形码跟踪项目。您将能够通过扫描物品条码,进入交货单和销售发票的项目。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,标记为交付
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,标记为交付
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,请报价
 DocType: Dependent Task,Dependent Task,相关任务
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,停止生日提醒
-DocType: SMS Center,Receiver List,接收器列表
+DocType: SMS Center,Receiver List,接收人列表
 DocType: Payment Tool Detail,Payment Amount,付款金额
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}查看
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0}查看
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,现金净变动
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬结构扣款
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{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 +185,Quantity must not be more than {0},数量不能超过{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),时间(天)
 DocType: Quotation Item,Quotation Item,报价品目
 DocType: Account,Account Name,帐户名称
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,起始日期不能大于结束日期
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,起始日期不能大于结束日期
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,序列号{0}的数量{1}不能是分数
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,主要的供应商类型。
 DocType: Purchase Order Item,Supplier Part Number,供应商零件编号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,汇率不能为0或1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,汇率不能为0或1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,外购入库单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,外购入库单{0}未提交
 DocType: Company,Default Payable Account,默认应付账户
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车,如配送规则,价格表等的设置
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}%帐单
@@ -1290,15 +1299,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,我的问题
 DocType: BOM Item,BOM Item,BOM品目
 DocType: Appraisal,For Employee,对员工
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,行{0}:提前对供应商必须扣除
 DocType: Company,Default Values,默认值
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,行{0}:付款金额不能为负
 DocType: Expense Claim,Total Amount Reimbursed,报销金额合计
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
 DocType: Customer,Default Price List,默认价格表
 DocType: Payment Reconciliation,Payments,付款
 DocType: Budget Detail,Budget Allocated,已分配预算
 DocType: Journal Entry,Entry Type,条目类型
 ,Customer Credit Balance,客户贷方余额
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,应付账款净额变化
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,请验证您的电子邮件ID
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',”客户折扣“需要指定客户
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,用日记账更新银行付款时间
@@ -1319,10 +1330,10 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,启用购物车
 DocType: Employee,Permanent Address,永久地址
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,品目{0}必须是服务品目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推动打击{0} {1}不能大于付出\超过总计{2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,请选择商品代码
-DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),减少扣除停薪留职(LWP)
+DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),减少停薪留职扣款(LWP)
 DocType: Territory,Territory Manager,区域经理
 DocType: Delivery Note Item,To Warehouse (Optional),仓库(可选)
 DocType: Sales Invoice,Paid Amount (Company Currency),支付的金额(公司货币)
@@ -1336,18 +1347,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及,\n请注明“重量计量单位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,创建此库存记录的物料申请
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,此品目的一件。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',时间日志批量{0}必须是'提交'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',时间日志批量{0}必须是'提交'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,为每个库存变动创建会计分录
 DocType: Leave Allocation,Total Leaves Allocated,分配的总叶
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},在行无需仓库{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},在行无需仓库{0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,请输入有效的财政年度开始和结束日期
 DocType: Employee,Date Of Retirement,退休日期
 DocType: Upload Attendance,Get Template,获取模板
 DocType: Address,Postal,邮政
 DocType: Item,Weightage,权重
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户组已经存在,请更改客户姓名或重命名该客户组
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,请选择{0}第一。
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},文字{0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,请选择{0}第一。
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},文字{0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,新建联系人
 DocType: Territory,Parent Territory,家长领地
 DocType: Quality Inspection Reading,Reading 2,阅读2
 DocType: Stock Entry,Material Receipt,物料收据
@@ -1355,7 +1367,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},党的类型和党的需要应收/应付帐户{0}
 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 +210,Quantity required for Item {0} in row {1},行{1}中的品目{0}必须指定数量
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},行{1}中的品目{0}必须指定数量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},仓库{0}无法删除,因为物件{1}有库存量
 DocType: Quotation,Order Type,订单类型
 DocType: Purchase Invoice,Notification Email Address,通知邮件地址
@@ -1368,19 +1380,19 @@
 DocType: Job Applicant,Applicant for a Job,求职申请
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,暂无生产订单
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +153,Salary Slip of employee {0} already created for this month,雇员的本月工资单{0}已经创建过
-DocType: Stock Reconciliation,Reconciliation JSON,JSON对账
+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: Sales 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 +152,Main,主
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,主
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,变体
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,已停止的订单无法取消,请先点击“重新开始”
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,默认BOM({0})必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,创建采购订单
 DocType: SMS Center,Send To,发送到
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
@@ -1393,7 +1405,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,仓库及参考
 DocType: Supplier,Statutory info and other general information about your Supplier,供应商的注册信息和其他一般信息
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,地址
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,发货规则的一个条件
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,项目是不允许有生产订单。
@@ -1402,10 +1414,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,在账户币金额
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,时间日志制造。
 DocType: Item,Apply Warehouse-wise Reorder Level,使用仓库的再订购水平
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM{0}未提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM{0}未提交
 DocType: Authorization Control,Authorization Control,授权控制
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行#{0}:拒绝仓库是强制性的反对否决项{1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,时间日志中的任务。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,付款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,付款
 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}
 DocType: Employee,Salutation,称呼
@@ -1422,7 +1435,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,协理
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,品目{0}不是一个序列品目
 DocType: SMS Center,Create Receiver List,创建接收人列表
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,已过期
 DocType: Packing Slip,To Package No.,以包号
 DocType: Warranty Claim,Issue Date,问题日期
 DocType: Activity Cost,Activity Cost,活动费用
@@ -1451,7 +1463,7 @@
 DocType: Monthly Distribution,Name of the Monthly Distribution,月度分布名称
 DocType: Sales Person,Parent Sales Person,母公司销售人员
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,请在公司主及全球默认指定默认货币
-DocType: Purchase Invoice,Recurring Invoice,经常性发票
+DocType: Purchase Invoice,Recurring Invoice,常用发票
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,项目管理
 DocType: Supplier,Supplier of Goods or Services.,提供商品或服务的供应商。
 DocType: Budget Detail,Fiscal Year,财政年度
@@ -1460,7 +1472,7 @@
 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 +65,Territory / Customer,区域/客户
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,例如5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,是否销售品目
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,品目群组树
@@ -1472,7 +1484,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0}已创建
 DocType: Delivery Note Item,Against Sales Order,对销售订单
 ,Serial No Status,序列号状态
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,品目表不能为空
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,品目表不能为空
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","行{0}:设置{1}的周期性,从和到日期\
 之间差必须大于或等于{2}"
@@ -1482,7 +1494,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,关税与税项
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,参考日期请输入
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,附送数量
@@ -1497,7 +1509,7 @@
 DocType: Installation Note,Installation Time,安装时间
 DocType: Sales Invoice,Accounting Details,会计细节
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,删除所有交易本公司
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行#{0}:操作{1}未完成的成品{2}在生产数量订单{3}。请通过时间日志更新运行状态
+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,行#{0}:操作{1}未完成的成品{2}在生产数量订单{3}。请通过时间日志更新运行状态
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投资
 DocType: Issue,Resolution Details,详细解析
 DocType: Quality Inspection Reading,Acceptance Criteria,验收标准
@@ -1513,7 +1525,7 @@
 DocType: Holiday List,Clear Table,清除表格
 DocType: Features Setup,Brands,品牌
 DocType: C-Form Invoice Detail,Invoice No,发票号码
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,来自采购订单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,来自采购订单
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,成本率
 ,Customer Addresses And Contacts,客户的地址和联系方式
@@ -1530,7 +1542,7 @@
 ,Maintenance Schedules,维护计划
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},品目{0}的品目群组没有设置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,入借帐户必须是应收账科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,入借帐户必须是应收账科目
 DocType: Shipping Rule Condition,Shipping Amount,发货数量
 ,Pending Amount,待审核金额
 DocType: Purchase Invoice Item,Conversion Factor,转换系数
@@ -1547,12 +1559,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,会计科目树
 DocType: Leave Control Panel,Leave blank if considered for all employee types,如果针对所有雇员类型请留空
 DocType: Landed Cost Voucher,Distribute Charges Based On,费用分配基于
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,因为账项{1}是一个资产条目,所以科目{0}的类型必须为“固定资产”
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,因为账项{1}是一个资产条目,所以科目{0}的类型必须为“固定资产”
 DocType: HR Settings,HR Settings,人力资源设置
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
 DocType: Leave Block List Allow,Leave Block List Allow,例外用户
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,缩写不能为空或空格
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,缩写不能为空或空格
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,体育
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,实际总
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,单位
@@ -1564,6 +1576,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,默认财政年度已经更新为{0}。请刷新您的浏览器以使更改生效。
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,报销
 DocType: Issue,Support,支持
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,查看购物车
 ,BOM Search,BOM搜索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),截止(开标+总计)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,请公司指定的货币
@@ -1575,13 +1588,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},行{0}计量单位换算系数是必须项
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},行{0}中清拆日期不能在支票日期前
 DocType: Salary Slip,Deduction,扣款
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
 DocType: Address Template,Address Template,地址模板
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,请输入这个销售人员的员工标识
 DocType: Territory,Classification of Customers by region,客户按区域分类
 DocType: Project,% Tasks Completed,%任务已完成
 DocType: Project,Gross Margin,毛利
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,请先输入生产项目
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,已禁用用户
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,已禁用用户
 DocType: Opportunity,Quotation,报价
 DocType: Salary Slip,Total Deduction,扣除总额
 DocType: Quotation,Maintenance User,维护用户
@@ -1590,7 +1604,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},警告:附件无效的SSL证书{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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,扣款
@@ -1600,12 +1614,12 @@
 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,销售订单数量
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",此库存记录已经出现在仓库{0}中,所以你不能重新指定或更改仓库
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",此库存记录已经出现在仓库{0}中,所以你不能重新指定或更改仓库
 DocType: Appraisal,Calculate Total Score,计算总分
 DocType: Supplier Quotation,Manufacturing Manager,生产经理
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,分裂送货单成包。
-apps/erpnext/erpnext/hooks.py +68,Shipments,发货
+apps/erpnext/erpnext/hooks.py +69,Shipments,发货
 DocType: Purchase Order Item,To be delivered to customer,要传送给客户
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,时间日志状态必须被提交。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
@@ -1625,12 +1639,12 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,选择公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",就业(永久,合同,实习生等)的类型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},品目{1}必须有{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},品目{1}必须有{0}
 DocType: Currency Exchange,From Currency,源货币
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额,发票类型和发票号码
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},销售订单为品目{0}的必须项
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额,发票类型和发票号码
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},销售订单为品目{0}的必须项
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,系统无记录的数额
-DocType: Purchase Invoice Item,Rate (Company Currency),率(公司货币)
+DocType: Purchase Invoice Item,Rate (Company Currency),单价(公司货币)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,他人
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,无法找到匹配的项目。请选择其他值{0}。
 DocType: POS Profile,Taxes and Charges,税项和收费
@@ -1644,7 +1658,7 @@
 DocType: Quality Inspection,In Process,进行中
 DocType: Authorization Rule,Itemwise Discount,品目特定的折扣
 DocType: Purchase Order Item,Reference Document Type,参考文档类型
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0}不允许销售订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0}不允许销售订单{1}
 DocType: Account,Fixed Asset,固定资产
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,序列化库存
 DocType: Activity Type,Default Billing Rate,默认计费率
@@ -1654,7 +1668,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,销售订单到付款
 DocType: Expense Claim Detail,Expense Claim Detail,报销详情
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,时间日志创建:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,请选择正确的帐户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,请选择正确的帐户
 DocType: Item,Weight UOM,重量计量单位
 DocType: Employee,Blood Group,血型
 DocType: Purchase Invoice Item,Page Break,分页符
@@ -1668,7 +1682,7 @@
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,来自保养计划
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,全职
 DocType: Purchase Invoice,Contact Details,联系人详情
-DocType: C-Form,Received Date,收稿日期
+DocType: C-Form,Received Date,收到日期
 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 +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,请指定一个国家的这种运输规则或检查全世界运输
 DocType: Stock Entry,Total Incoming Value,总传入值
@@ -1685,10 +1699,10 @@
 DocType: Time Log,To Time,要时间
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色(上述授权值)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",要添加子节点,探索树,然后单击要在其中添加更多节点的节点上。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,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 +116,"For {0}, only debit accounts can be linked against another credit entry",对于{0},借方分录只能选择借方账户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry",对于{0},借方分录只能选择借方账户
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,价格表{0}被禁用
 DocType: Manufacturing Settings,Allow Overtime,允许加班
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,品目{1}需要{0}的序列号。您已提供{2}。
@@ -1696,8 +1710,9 @@
 DocType: Item,Customer Item Codes,客户项目代码
 DocType: Opportunity,Lost Reason,丧失原因
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,创建订单或发票的支付分录。
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新地址
 DocType: Quality Inspection,Sample Size,样本大小
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,所有品目已开具发票
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行,但项可以对非组进行
 DocType: Project,External,外部
@@ -1753,13 +1768,14 @@
 DocType: Rename Tool,Rename Tool,重命名工具
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,品目重新排序
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,转印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,转印材料
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程,操作成本及向流程指定唯一的流程编号
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
 DocType: Stock Settings,Allow Negative Stock,允许负库存
 DocType: Installation Note,Installation Note,安装注意事项
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,添加税款
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,从融资现金流
 ,Financial Analytics,财务分析
 DocType: Quality Inspection,Verified By,认证机构
 DocType: Address,Subsidiary,子机构
@@ -1769,19 +1785,19 @@
 DocType: Process Payroll,Create Salary Slip,建立工资单
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,银行预期结余
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),资金来源(负债)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行{0}中的数量({1})必须等于生产数量{2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行{0}中的数量({1})必须等于生产数量{2}
 DocType: Appraisal,Employee,雇员
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,导入电子邮件发件人
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,邀请成为用户
 DocType: Features Setup,After Sale Installations,售后安装
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1}已完全开票
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1}已完全开票
 DocType: Workstation Working Hour,End Time,结束时间
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,销售或采购的标准合同条款。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,基于凭证分组
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,要求在
 DocType: Sales Invoice,Mass Mailing,邮件群发
 DocType: Rename Tool,File to Rename,文件重命名
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,显示支付
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
@@ -1791,9 +1807,10 @@
 DocType: Selling Settings,Sales Order Required,销售订单为必须项
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,创建客户
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,维护计划细节
-DocType: Quality Inspection Reading,Reading 9,9阅读
+DocType: Quality Inspection Reading,Reading 9,阅读9
 DocType: Supplier,Is Frozen,被冻结
 DocType: Buying Settings,Buying Settings,采购设置
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,成品品目的BOM编号
@@ -1802,6 +1819,7 @@
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Tool,Payment Account,付款帐号
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,请注明公司进行
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,应收账款净额变化
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,补假
 DocType: Quality Inspection Reading,Accepted,已接受
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,请确保你真的要删除这家公司的所有交易。主数据将保持原样。这个动作不能撤消。
@@ -1809,17 +1827,17 @@
 DocType: Payment Tool,Total Payment Amount,总付款金额
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,原材料不能为空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.",无法更新库存,发票包含下降航运项目。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,原材料不能为空。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.",无法更新库存,发票包含下降航运项目。
 DocType: Newsletter,Test,测试
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",由于有存量交易为这个项目,\你不能改变的值&#39;有序列号&#39;,&#39;有批号&#39;,&#39;是股票项目“和”评估方法“
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,快速日记帐分录
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,快速日记帐分录
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM,你不能更改其税率
 DocType: Employee,Previous Work Experience,以前的工作经验
 DocType: Stock Entry,For Quantity,对于数量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1}未提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1}未提交
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,请求的项目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,独立的生产订单将每个成品项目被创建。
 DocType: Purchase Invoice,Terms and Conditions1,条款和条件1
@@ -1832,7 +1850,7 @@
 DocType: Authorization Rule,Authorized Value,授权值
 DocType: Contact,Enter department to which this Contact belongs,输入此联系人所属的部门
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,共缺席
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,行{0}中的品目或仓库与物料申请不符合
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,行{0}中的品目或仓库与物料申请不符合
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,计量单位
 DocType: Fiscal Year,Year End Date,年度结束日期
 DocType: Task Depends On,Task Depends On,任务取决于
@@ -1858,7 +1876,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,合同结束日期必须大于加入的日期
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,授权销售公司产品的第三方分销商/经销商/授权代理商/分支机构/转销商
 DocType: Customer Group,Has Child Node,有子节点
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0}不允许采购订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0}不允许采购订单{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","请输入静态的URL参数(例如 sender=ERPNext, username=ERPNext, password=1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}不存在于任何活动的会计年度中。详情查看{2}。
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,这是一个示例网站从ERPNext自动生成
@@ -1896,9 +1914,9 @@
 8. 输入行: 如果选择了“基于前一行的总计/金额”,你可以选择此税项基于的行数(默认为前一行)。
 9. 税费应用于:你可以在这个部分指定此税费仅应用于评估(即不影响总计), 或者仅应用于总计(即不会应用到单个品目),或者两者。
 10. 添加或扣除: 添加还是扣除此税费。"
-DocType: Purchase Receipt Item,Recd Quantity,RECD数量
+DocType: Purchase Receipt Item,Recd Quantity,记录数量
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,股票输入{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,股票输入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
 DocType: Tax Rule,Billing City,结算城市
 DocType: Global Defaults,Hide Currency Symbol,隐藏货币符号
@@ -1930,6 +1948,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,基础设施费用
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
 DocType: Buying Settings,Default Buying Price List,默认采购价格表
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.",设置例如公司,货币,当前财政年度等的默认值
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,针对选择您要分配款项的发票。
@@ -1965,7 +1984,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",参见成本部分的“材料价格基于”
 DocType: Appraisal Goal,Key Responsibility Area,关键责任区
 DocType: Item Reorder,Material Request Type,物料申请类型
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,行{0}:计量单位转换系数是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,行{0}:计量单位转换系数是必需的
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,参考
 DocType: Cost Center,Cost Center,成本中心
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,凭证 #
@@ -1988,7 +2007,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,所有地址。
 DocType: Company,Stock Settings,库存设置
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的,如果以下属性中均有记载相同。是集团,根型,公司
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的,如果以下属性中均有记载相同。是集团,根型,公司
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,管理客户群组
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,新建成本中心名称
 DocType: Leave Control Panel,Leave Control Panel,假期控制面板
@@ -2008,8 +2027,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,支付工具的详细信息
 ,Sales Browser,销售列表
 DocType: Journal Entry,Total Credit,总积分
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},警告:另一个{0}#{1}存在对股票入门{2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,当地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},警告:另一个{0}#{1}存在对股票入门{2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,债务人
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,大
@@ -2028,7 +2047,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的销售交易都可以标记多个**销售人员**,方便你设置和监控目标。
 ,S.O. No.,销售订单号
 DocType: Production Order Operation,Make Time Log,创建时间日志
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,请设置再订购数量
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,请设置再订购数量
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},请牵头建立客户{0}
 DocType: Price List,Applicable for Countries,适用于国家
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,电脑
@@ -2076,16 +2095,16 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,ATLEAST一个项目应该负数量回报文档中输入
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,暂无说明
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,暂无说明
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,过期的
 DocType: Account,Stock Received But Not Billed,已收货未开单的库存
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,根帐户必须是一组
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,根帐户必须是一组
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,工资总额+欠费金额+兑现金额-总扣款金额
 DocType: Monthly Distribution,Distribution Name,分配名称
 DocType: Features Setup,Sales and Purchase,销售及采购
 DocType: Supplier Quotation Item,Material Request No,物料申请编号
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},品目{0}要求质量检验
-DocType: Quotation,Rate at which customer's currency is converted to company's base currency,速率客户的货币转换为公司的基础货币
+DocType: Quotation,Rate at which customer's currency is converted to company's base currency,客户的货币转换为公司的基础货币后的单价
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0}已经从这个清单退订成功!
 DocType: Purchase Invoice Item,Net Rate (Company Currency),净利率(公司货币)
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,管理区域
@@ -2093,6 +2112,7 @@
 DocType: Journal Entry Account,Party Balance,党平衡
 DocType: Sales Invoice Item,Time Log Batch,时间日志批
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,请选择适用的折扣
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,工资单创建
 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,用于生产的物料转移
@@ -2100,9 +2120,9 @@
 DocType: Purchase Invoice,Half-yearly,半年一次
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,财年{0}未找到。
 DocType: Bank Reconciliation,Get Relevant Entries,获取相关条目
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,库存的会计分录
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,库存的会计分录
 DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,品目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,品目{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
 DocType: Purchase Invoice,Apply Additional Discount On,收取额外折扣
 DocType: Account,Root Type,根类型
@@ -2111,15 +2131,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,在页面顶部显示此幻灯片
 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 +149,Target warehouse is mandatory for row {0},行{0}必须指定目标仓库
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},行{0}必须指定目标仓库
 DocType: Quality Inspection,Quality Inspection,质量检验
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,超小
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料请求的数量低于最低起订量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料请求的数量低于最低起订量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,科目{0}已冻结
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的,带独立科目表的法人/附属机构。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品,饮料与烟草
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL或BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},只能使支付对未付款的{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},只能使支付对未付款的{0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,佣金率不能大于100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最低库存水平
 DocType: Stock Entry,Subcontract,外包
@@ -2157,7 +2177,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,来料质量检验。
 DocType: Purchase Order Item,Returned Qty,返回的数量
 DocType: Employee,Exit,退出
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,根类型是强制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,根类型是强制性的
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,序列号{0}已创建
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",为方便客户,这些代码可以在打印格式(如发票和送货单)中使用
 DocType: Employee,You can enter any date manually,您可以手动输入日期
@@ -2165,8 +2185,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,试用期
 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 +110,Row {0}: Advance against Customer must be credit,行{0}:提前对客户必须是信用
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,采购入库项目提供
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,付
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,付
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,以日期时间
 DocType: SMS Settings,SMS Gateway URL,短信网关的URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,日志维护短信发送状态
@@ -2183,7 +2204,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序级别
 DocType: Attendance,Attendance Date,考勤日期
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,基于收入和扣款的工资明细。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,科目与子节点不能转换为分类账
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,科目与子节点不能转换为分类账
 DocType: Address,Preferred Shipping Address,首选送货地址
 DocType: Purchase Receipt Item,Accepted Warehouse,已接收的仓库
 DocType: Bank Reconciliation Detail,Posting Date,发布日期
@@ -2201,7 +2222,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,序列号{0}不存在
 DocType: Pricing Rule,Discount Percentage,折扣百分比
 DocType: Payment Reconciliation Invoice,Invoice Number,发票号码
-apps/erpnext/erpnext/hooks.py +54,Orders,订单
+apps/erpnext/erpnext/hooks.py +55,Orders,订单
 DocType: Leave Control Panel,Employee Type,雇员类型
 DocType: Employee Leave Approver,Leave Approver,假期审批人
 DocType: Manufacturing Settings,Material Transferred for Manufacture,材料移送制造
@@ -2213,7 +2234,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,此销售订单%的材料已记账。
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,期末进入
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,有交易的成本中心不能转化为组
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,折旧
+DocType: Account,Depreciation,折旧
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供应商
 DocType: Customer,Credit Limit,信用额度
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,选择交易类型
@@ -2238,11 +2259,12 @@
 DocType: Material Request,Requested For,对于要求
 DocType: Quotation Item,Against Doctype,对文档类型
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送货单反对任何项目
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,root帐号不能被删除
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,从投资净现金
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,root帐号不能被删除
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,显示库存记录
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在制品仓库
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},参考# {0}于{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},参考# {0}记载日期为{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,管理地址
 DocType: Pricing Rule,Item Code,品目编号
 DocType: Production Planning Tool,Create Production Orders,创建生产订单
@@ -2250,7 +2272,7 @@
 DocType: Journal Entry,User Remark,用户备注
 DocType: Lead,Market Segment,市场分类
 DocType: Employee Internal Work History,Employee Internal Work History,雇员内部就职经历
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),结算(借记)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),结算(借记)
 DocType: Contact,Passive,被动
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列号{0}无库存
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,销售业务的税务模板。
@@ -2266,7 +2288,7 @@
 ,Billed Amount,已开票金额
 DocType: Bank Reconciliation,Bank Reconciliation,银行对帐
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,获取更新
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,添加了一些样本记录
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,离开管理
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,基于账户分组
@@ -2275,14 +2297,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",负债类型的账户头(益损)
 DocType: Payment Tool,Against Vouchers,对凭证
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,快速帮助
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},行{0}中的源和目标仓库不能相同
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},行{0}中的源和目标仓库不能相同
 DocType: Features Setup,Sales Extras,销售额外选项
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} 成本中心{2}账户{1}的预算将超过{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',“起始日期”必须早于'终止日期'
 ,Stock Projected Qty,预计库存量
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
 DocType: Sales Order,Customer's Purchase Order,客户采购订单
 DocType: Warranty Claim,From Company,源公司
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,价值或数量
@@ -2292,9 +2314,9 @@
 DocType: Leave Block List,Leave Block List Allowed,禁离日例外用户
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,你将使用它来进行登录
 DocType: Sales Partner,Retailer,零售商
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供应商类型
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,品目编号是必须项,因为品目没有自动编号
+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 +93,Quotation {0} not of type {1},报价{0} 不属于{1}类型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,维护计划品目
 DocType: Sales Order,%  Delivered,%已交付
@@ -2317,7 +2339,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,从该电子邮件摘要退订
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,消息已发送
 DocType: Production Plan Sales Order,SO Date,销售订单日期
-DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,速率价目表货币转换成客户的基础货币
+DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,价目表货币转换成客户的基础货币后的单价
 DocType: Purchase Invoice Item,Net Amount (Company Currency),净金额(公司货币)
 DocType: BOM Operation,Hour Rate,时薪
 DocType: Stock Settings,Item Naming By,品目命名方式
@@ -2338,7 +2360,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包的总重量,通常是净重+包装材料的重量。 (用于打印)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,拥有此角色的用户可以设置冻结账户和创建/修改冻结账户的会计分录
 DocType: Serial No,Is Cancelled,是否注销
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,我的出货量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,我的出货量
 DocType: Journal Entry,Bill Date,账单日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",有多个最高优先级定价规则时使用以下的内部优先级:
 DocType: Supplier,Supplier Details,供应商详情
@@ -2348,7 +2370,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,电汇
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,请选择银行帐户
 DocType: Newsletter,Create and Send Newsletters,创建和发送新闻邮件
-DocType: Sales Order,Recurring Order,经常订购
+DocType: Sales Order,Recurring Order,周期性订单
 DocType: Company,Default Income Account,默认收益账户
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客户群组/客户
 DocType: Item Group,Check this if you want to show in website,要显示在网站上,请勾选此项。
@@ -2359,14 +2381,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,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 +198,Purchase Order {0} is not submitted,采购订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,采购订单{0}未提交
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,预计
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列号{0}不属于仓库{1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意:系统将不会为品目{0}检查超额发货或超额预订,因为其数量或金额为0
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,开幕日期
 DocType: Journal Entry,Remark,备注
-DocType: Purchase Receipt Item,Rate and Amount,率及金额
+DocType: Purchase Receipt Item,Rate and Amount,单价及小计
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,来自销售订单
 DocType: Sales Order,Not Billed,未开票
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,两个仓库必须属于同一公司
@@ -2375,9 +2397,9 @@
 DocType: Time Log,Batched for Billing,已为账单批次化
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,供应商开出的账单
 DocType: POS Profile,Write Off Account,核销帐户
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,折扣金额
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到对采购发票
 DocType: Item,Warranty Period (in days),保修期限(天数)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,从运营的净现金
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,例如增值税
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,项目4
 DocType: Journal Entry Account,Journal Entry Account,日记帐分录帐号
@@ -2418,7 +2440,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,退休日期必须大于入职日期
 DocType: Sales Invoice,Against Income Account,对收益账目
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}%交付
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,转运信息
@@ -2432,7 +2454,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM税率
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,请送货单拉项目
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,日记帐分录{0}没有关联
-apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",类型电子邮件,电话,聊天,访问等所有通信记录
+apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",包含电子邮件,电话,聊天,访问等所有通信记录
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,请提及公司舍入成本中心
 DocType: Purchase Invoice,Terms,条款
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +251,Create New,创建新的
@@ -2446,10 +2468,10 @@
 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 +14,This is a root sales person and cannot be edited.,您可以通过选择备份频率启动和\
 ,Stock Ledger,库存总帐
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},价格:{0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},价格:{0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,工资单扣款
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,请先选择一个组节点。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},目的必须是一个{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},目的必须是一个{0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,填写表格并保存
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下载一个包含所有原材料及其库存状态的报告
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社区论坛
@@ -2457,7 +2479,7 @@
 DocType: SMS Center,Send SMS,发送短信
 DocType: Company,Default Letter Head,默认信头
 DocType: Time Log,Billable,可开票
-DocType: Account,Rate at which this tax is applied,速率此税适用
+DocType: Account,Rate at which this tax is applied,应用此税率的单价
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,再订购数量
 DocType: Company,Stock Adjustment Account,库存调整账户
 DocType: Journal Entry,Write Off,抹杀
@@ -2487,7 +2509,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',请输入“预产期”
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},注意:假期类型{0}的余量不足
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",注意:如果付款没有任何参考,请手动创建一个日记账分录。
@@ -2504,13 +2526,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0}“{1}”被禁用
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,设置为打开
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,交易提交时自动向联系人发送电子邮件。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","行{0}:数量不是在仓库avalable {1} {2} {3}。
 可用数量:{4},转让数量:{5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,项目3
 DocType: Purchase Order,Customer Contact Email,客户联系电子邮件
 DocType: Sales Team,Contribution (%),贡献(%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意:付款分录不会创建,因为“现金或银行账户”没有指定
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意:付款分录不会创建,因为“现金或银行账户”没有指定
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,职责
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,模板
 DocType: Sales Person,Sales Person Name,销售人员姓名
@@ -2521,22 +2543,22 @@
 DocType: Stock Reconciliation Item,Before reconciliation,在对账前
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,品目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
 DocType: Sales Order,Partly Billed,天色帐单
 DocType: Item,Default BOM,默认的BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,请确认重新输入公司名称
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,总街货量金额
 DocType: Time Log Batch,Total Hours,总时数
 DocType: Journal Entry,Printing Settings,打印设置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,汽车
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,来自送货单
 DocType: Time Log,From Time,起始时间
 DocType: Notification Control,Custom Message,自定义消息
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投资银行业务
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
 DocType: Purchase Invoice,Price List Exchange Rate,价目表汇率
-DocType: Purchase Invoice Item,Rate,率
+DocType: Purchase Invoice Item,Rate,单价
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,实习生
 DocType: Newsletter,A Lead with this email id should exist,与此电子邮件关联的潜在客户不存在
 DocType: Stock Entry,From BOM,从BOM
@@ -2545,16 +2567,17 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',请点击“生成表”
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,日期应该是一样的起始日期为半天假
 apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m",如公斤,单元,号数,米
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,参考编号是强制性的,如果你输入的参考日期
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,如果输入参考日期,参考编号是强制输入的
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,入职日期必须大于出生日期
 DocType: Salary Structure,Salary Structure,薪酬结构
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}",存在多个符合条件的价格列表,请指定优先级来解决冲突。价格列表{0}
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,发料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,发料
 DocType: Material Request Item,For Warehouse,对仓库
 DocType: Employee,Offer Date,报价有效期
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,语录
 DocType: Hub Settings,Access Token,访问令牌
 DocType: Sales Invoice Item,Serial No,序列号
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,请输入您的详细维护性第一
@@ -2568,10 +2591,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,这个月的假期比工作日多。
 DocType: Product Bundle Item,Product Bundle Item,产品包项目
 DocType: Sales Partner,Sales Partner Name,销售合作伙伴名称
+DocType: Payment Reconciliation,Maximum Invoice Amount,最大发票额
 DocType: Purchase Invoice Item,Image View,图像查看
 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 +553,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,从仓库
 DocType: Purchase Taxes and Charges,Valuation and Total,估值与总计
@@ -2579,6 +2604,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,该项目是{0}(模板)的变体。属性将被复制的模板,除非“不复制”设置
 DocType: Account,Purchase User,购买用户
 DocType: Notification Control,Customize the Notification,自定义通知
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,运营现金流
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,默认地址模板不能删除
 DocType: Sales Invoice,Shipping Rule,配送规则
 DocType: Journal Entry,Print Heading,打印标题
@@ -2589,7 +2615,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,原料
 DocType: Leave Application,Follow via Email,通过电子邮件关注
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,税额折后金额
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,此科目有子科目,无法删除。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},品目{0}没有默认的BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,请选择发布日期第一
@@ -2607,6 +2633,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},序列化的品目{0}必须指定序列号
 DocType: Journal Entry,Bank Entry,银行记录
 DocType: Authorization Rule,Applicable To (Designation),适用于(指定)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,加入购物车
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,分组基于
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,启用/禁用货币。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,邮政费用
@@ -2614,29 +2641,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娱乐休闲
 DocType: Purchase Order,The date on which recurring order will be stop,经常性发票终止日期
 DocType: Quality Inspection,Item Serial No,品目序列号
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必须通过{1}会减少或应增加溢出宽容
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必须通过{1}会减少或应增加溢出宽容
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,总现
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,小时
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",序列化的品目{0}不能被“库存盘点”更新
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,转印材料供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,转印材料供应商
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,创建报价
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,您无权批准叶子座日期
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,这些品目都已开具发票
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,这些品目都已开具发票
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以被{0}的批准
 DocType: Shipping Rule,Shipping Rule Conditions,配送规则条件
 DocType: BOM Replace Tool,The new BOM after replacement,更换后的物料清单
 DocType: Features Setup,Point of Sale,销售点
 DocType: Account,Tax,税项
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},行{0}:{1}不是有效的{2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,从产品包
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,从产品包
 DocType: Production Planning Tool,Production Planning Tool,生产规划工具
 DocType: Quality Inspection,Report Date,报告日期
 DocType: C-Form,Invoices,发票
 DocType: Job Opening,Job Title,职位
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0}个收件人
 DocType: Features Setup,Item Groups in Details,详细品目群组
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),起点的销售终端(POS)
@@ -2644,8 +2670,9 @@
 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: Pricing Rule,Customer Group,客户群组
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},品目{0}必须指定开支账户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},品目{0}必须指定开支账户
 DocType: Item,Website Description,网站简介
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,在净资产收益变化
 DocType: Serial No,AMC Expiry Date,AMC到期时间
 ,Sales Register,销售记录
 DocType: Quotation,Quotation Lost Reason,报价丧失原因
@@ -2653,12 +2680,12 @@
 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 +108,Summary for this month and pending activities,本月和待活动总结
 DocType: Customer Group,Customer Group Name,客户群组名称
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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,属性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,获取品目
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,请输入核销帐户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,获取品目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,请输入核销帐户
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,最后订购日期
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,创建消费发票
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
@@ -2674,20 +2701,20 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
 DocType: Project,Expected End Date,预计结束日期
 DocType: Appraisal Template,Appraisal Template Title,评估模板标题
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,广告
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,广告
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
 DocType: Cost Center,Distribution Id,分配标识
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,优质服务
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,所有的产品或服务。
 DocType: Purchase Invoice,Supplier Address,供应商地址
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,输出数量
-apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,规则来计算销售运输量
+apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,用来计算销售运输量的规则
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,系列是必须项
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服务
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},为属性{0}值必须的范围内{1}到{2}中的增量{3}
 DocType: Tax Rule,Sales,销售
 DocType: Stock Entry Detail,Basic Amount,基本金额
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},物件{0}需要指定仓库
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},物件{0}需要指定仓库
 DocType: Leave Allocation,Unused leaves,未使用的叶子
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,信用
 DocType: Customer,Default Receivable Accounts,默认应收账户(多个)
@@ -2699,16 +2726,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,购买收据
-DocType: Payment Reconciliation,Maximum Amount,最高金额
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,定价规则如何被应用?
 DocType: Quality Inspection,Delivery Note No,送货单编号
 DocType: Company,Retail,零售
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,客户{0}不存在
 DocType: Attendance,Absent,缺席
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,产品包
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}:无效参考{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,产品包
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},行{0}:无效参考{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,购置税和费模板
 DocType: Upload Attendance,Download Template,下载模板
 DocType: GL Entry,Remarks,备注
@@ -2735,7 +2762,7 @@
 ,Monthly Attendance Sheet,每月考勤表
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,未找到记录
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}:成本中心是品目{2}的必须项
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,获取从产品捆绑项目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,获取从产品捆绑项目
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,科目{0}已停用
 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,必须指定考勤起始日期和结束日期
@@ -2744,8 +2771,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,期初分录中不允许有“损益”类型的账户{0}
 DocType: Features Setup,Sales Discounts,销售折扣
 DocType: Hub Settings,Seller Country,卖家国家
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,公布于网页上的项目
 DocType: Authorization Rule,Authorization Rule,授权规则
 DocType: Sales Invoice,Terms and Conditions Details,条款和条件详情
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,产品规格
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,营业税金及费用模板
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,服装及配饰
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,订购次数
@@ -2767,7 +2796,7 @@
 DocType: Time Log,Billing Amount,开票金额
 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 +18,Applications for leave.,假期申请。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,有交易的科目不能被删除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,有交易的科目不能被删除
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,法律费用
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",每月自动生成发票的日期,例如5号,28号等
 DocType: Sales Invoice,Posting Time,发布时间
@@ -2783,11 +2812,11 @@
 DocType: Maintenance Visit,Breakdown,细目
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,帐号:{0}币种:{1}不能选择
 DocType: Bank Reconciliation Detail,Cheque Date,支票日期
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,随着对日
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,缓刑
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,库存品目必须指定默认仓库。
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,库存品目必须指定默认仓库。
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},支付工资的月{0}和年{1}
 DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率,如果丢失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,总支付金额
@@ -2799,6 +2828,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),总结算金额(通过时间日志)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,我们卖这些物件
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,供应商编号
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,量应大于0
 DocType: Journal Entry,Cash Entry,现金分录
 DocType: Sales Partner,Contact Desc,联系人倒序
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.",叶似漫不经心,生病等类型
@@ -2807,13 +2837,13 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,添加新行为科目设定年度预算。
 DocType: Buying Settings,Default Supplier Type,默认供应商类别
 DocType: Production Order,Total Operating Cost,总营运成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,注意:品目{0}已多次输入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,注意:品目{0}已多次输入
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,所有联系人。
 DocType: Newsletter,Test Email Id,测试电子邮件Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,公司缩写
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,如果你使用质量检验的话。将启动采购收据内的“品目需要检验”和“QA编号”。
 DocType: GL Entry,Party Type,党的类型
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,原料不能同主项
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,原料不能和主项相同
 DocType: Item Attribute Value,Abbreviation,缩写
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允许,因为{0}超出范围
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,薪资模板大师。
@@ -2832,7 +2862,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客户群组
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,税务模板是强制性的。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格列表费率(公司货币)
 DocType: Account,Temporary,临时
 DocType: Address,Preferred Billing Address,首选帐单地址
@@ -2850,8 +2880,8 @@
 ,Item-wise Price List Rate,品目特定的价目表率
 DocType: Purchase Order Item,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}已停止
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1}已停止
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
 DocType: Lead,Add to calendar on this date,将此日期添加至日历
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,规则增加运输成本。
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,即将举行的活动
@@ -2871,24 +2901,24 @@
 DocType: Customer,From Lead,来自潜在客户
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,发布生产订单。
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,选择财政年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,需要POS资料,使POS进入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,需要POS资料,使POS进入
 DocType: Hub Settings,Name Token,名称令牌
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,标准销售
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,必须选择至少一个仓库
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,更换
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0}不允许销售发票{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,请输入缺省的计量单位
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0}不允许销售发票{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,请输入缺省的计量单位
 DocType: Purchase Invoice Item,Project Name,项目名称
 DocType: Supplier,Mention if non-standard receivable account,提到如果不规范应收账款
 DocType: Journal Entry Account,If Income or Expense,收入或支出
 DocType: Features Setup,Item Batch Nos,品目批号
 DocType: Stock Ledger Entry,Stock Value Difference,库存值差异
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,人力资源
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,人力资源
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款对账
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,所得税资产
 DocType: BOM Item,BOM No,BOM编号
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,日记帐分录{0}没有科目{1}或已经匹配其他凭证
 DocType: Item,Moving Average,移动平均
 DocType: BOM Replace Tool,The BOM which will be replaced,此物料清单将被替换
 DocType: Account,Debit,借方
@@ -2925,15 +2955,15 @@
 DocType: Stock Entry Detail,Additional Cost,额外费用
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,财政年度结束日期
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,创建供应商报价
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,创建供应商报价
 DocType: Quality Inspection,Incoming,接收
 DocType: BOM,Materials Required (Exploded),所需物料(正展开)
-DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低盈利停薪留职(LWP)
+DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低停薪留职的收入(LWP)
 apps/erpnext/erpnext/public/js/setup_wizard.js +274,"Add users to your organization, other than yourself",将用户添加到您的组织,除了自己
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},行#{0}:序列号{1}不相匹配{2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,事假
 DocType: Batch,Batch ID,批次ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},注: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},注: {0}
 ,Delivery Note Trends,送货单趋势
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,本周的总结
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},行{1}中的{0}必须是“采购”或“转包”类型的品目
@@ -2948,6 +2978,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均买入价
 DocType: Task,Actual Time (in Hours),实际时间(小时)
 DocType: Employee,History In Company,公司内历史
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,简讯
 DocType: Address,Shipping,送货
 DocType: Stock Ledger Entry,Stock Ledger Entry,存库分类帐分录
@@ -2967,7 +2998,6 @@
 DocType: Purchase Order,End date of current order's period,当前订单周期的结束日期
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,使录取通知书
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,回报
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,测度变异的默认单位必须与模板
 DocType: Production Order Operation,Production Order Operation,生产订单操作
 DocType: Pricing Rule,Disable,禁用
 DocType: Project Task,Pending Review,待审核
@@ -2975,7 +3005,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,客户ID
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,到时间必须大于从时间
 DocType: Journal Entry Account,Exchange Rate,汇率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,销售订单{0}未提交
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},仓库{0}的上级账户{1}不属于公司{2}
 DocType: BOM,Last Purchase Rate,最后采购价格
 DocType: Account,Asset,资产
@@ -2995,7 +3025,7 @@
 ,Available Stock for Packing Items,库存可用打包品目
 DocType: Item Variant,Item Variant,品目变体
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,将此地址模板设置为默认,因为没有其他的默认项
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方',不能设置为'贷方'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,质量管理
 DocType: Production Planning Tool,Filter based on customer,根据客户筛选
 DocType: Payment Tool Detail,Against Voucher No,对凭证号码
@@ -3007,11 +3037,12 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,成本中心
 apps/erpnext/erpnext/config/stock.py +110,Warehouses.,仓库。
-DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,速率供应商的货币转换为公司的基础货币
+DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,供应商的货币转换为公司的基础货币后的单价
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行#{0}:与排时序冲突{1}
 DocType: Opportunity,Next Contact,下一页联系
 DocType: Employee,Employment Type,就职类型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定资产
+,Cash Flow,现金周转
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,申请期间不能跨两个alocation记录
 DocType: Item Group,Default Expense Account,默认支出账户
 DocType: Employee,Notice (days),通告(天)
@@ -3043,13 +3074,12 @@
 DocType: Production Order,Warehouses,仓库
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,印刷和文具
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,组节点
-DocType: Payment Reconciliation,Minimum Amount,最低金额
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,更新成品
 DocType: Workstation,per hour,每小时
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,仓库(永续盘存)的账户将在该帐户下创建。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除,因为此仓库有库存分类账分录。
 DocType: Company,Distribution,分配
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,已支付的款项
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,已支付的款项
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,项目经理
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,调度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,品目{0}的最大折扣为 {1}%
@@ -3069,11 +3099,11 @@
 DocType: Naming Series,Select Transaction,选择交易
 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,率材料的基础上
+DocType: BOM,Rate Of Materials Based On,基于以下的物料单价
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,客户支持分析
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},仓库{0}缺少公司
 DocType: POS Profile,Terms and Conditions,条款和条件
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},日期应该是在财政年度内。假设终止日期= {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},日期应该是在财政年度内。假设终止日期= {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在这里,你可以保持身高,体重,过敏,医疗问题等
 DocType: Leave Block List,Applies to Company,适用于公司
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,不能取消,因为提交的仓储记录{0}已经存在
@@ -3087,11 +3117,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,请输入购买收据
 DocType: Sales Invoice,Get Advances Received,获取已收预付款
 DocType: Email Digest,Add/Remove Recipients,添加/删除收件人
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},交易不反对停止生产订单允许{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),设置接收支持的电子邮件地址。 (例如support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
 DocType: Salary Slip,Salary Slip,工资单
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.",生成要发货品目的装箱单,包括包号,内容和重量。
@@ -3107,7 +3137,7 @@
 DocType: Account,Account,账户
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,序列号{0}已收到过
 ,Requested Items To Be Transferred,要求要传输的项目
-DocType: Purchase Invoice,Recurring Id,经常性标识
+DocType: Purchase Invoice,Recurring Id,经常性ID
 DocType: Customer,Sales Team Details,销售团队详情
 DocType: Expense Claim,Total Claimed Amount,总索赔额
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,销售的潜在机会
@@ -3127,8 +3157,8 @@
 DocType: Company,Warn,警告
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言论,值得一提的努力,应该在记录中。
 DocType: BOM,Manufacturing User,生产用户
-DocType: Purchase Order,Raw Materials Supplied,提供原料
-DocType: Purchase Invoice,Recurring Print Format,经常打印格式
+DocType: Purchase Order,Raw Materials Supplied,供应的原料
+DocType: Purchase Invoice,Recurring Print Format,常用打印格式
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,预计交货日期不能早于采购订单日期
 DocType: Appraisal,Appraisal Template,评估模板
 DocType: Item Group,Item Classification,品目分类
@@ -3180,7 +3210,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,雇员记录。
 DocType: HR Settings,Payroll Settings,薪资设置
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,匹配无链接的发票和付款。
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,下订单
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,下订单
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,根本不能有一个父成本中心
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,选择品牌...
 DocType: Sales Invoice,C-Form Applicable,C-表格适用
@@ -3195,7 +3225,7 @@
 DocType: Appraisal,Start Date,开始日期
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,调配一段时间假期。
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,点击这里核实
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
 DocType: Purchase Invoice Item,Price List Rate,价格列表费率
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",根据此仓库显示“有库存”或“无库存”状态。
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),材料清单(BOM)
@@ -3204,17 +3234,17 @@
 DocType: Project,Expected Start Date,预计开始日期
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,删除项目,如果收费并不适用于该项目
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如:smsgateway.com/API/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,接受
 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: Employee Leave Approver,Employee Leave Approver,雇员假期审批者
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0}已成功添加到我们的新闻列表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:一个重新排序条目已存在这个仓库{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失,因为已有报价。
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,采购经理大师
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,生产订单{0}必须提交
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,生产订单{0}必须提交
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,主报告
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,无效的主名称
@@ -3232,7 +3262,7 @@
 DocType: Industry Type,Industry Type,行业类型
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,发现错误!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,警告:申请的假期含有以下的禁离日
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完成日期
 DocType: Purchase Invoice Item,Amount (Company Currency),金额(公司货币)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,组织单位(部门)的主人。
@@ -3251,10 +3281,10 @@
 ,Serial No Service Contract Expiry,序列号/年度保养合同过期
 DocType: Item,Unit of Measure Conversion,转换度量单位
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,雇员不能更改
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,你不能同时将一个账户设为借方和贷方。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,你不能同时将一个账户设为借方和贷方。
 DocType: Naming Series,Help HTML,HTML帮助
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 % 。这是{0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},品目{1}已经超过允许的超额{0}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},品目{1}已经超过允许的超额{0}
 DocType: Address,Name of person or organization that this address belongs to.,此地址所属的人或组织的名称
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,您的供应商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失,因为已有销售订单。
@@ -3267,35 +3297,35 @@
 DocType: Employee,Date of Issue,签发日期
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}:申请者{0} 金额{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},行#{0}:设置供应商项目{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项,允许帐户与其他货币
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项,允许帐户与其他货币
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,品目{0}不存在
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,您没有权限设定冻结值
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,您没有权限设定冻结值
 DocType: Payment Reconciliation,Get Unreconciled Entries,获取未调节分录
+DocType: Payment Reconciliation,From Invoice Date,从发票日期
 DocType: Cost Center,Budgets,预算
-DocType: Employee,Emergency Contact Details,紧急联系方式
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,贵公司的标语
 DocType: Delivery Note,To Warehouse,到仓库
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},财年{1}中已多次输入科目{0}
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,考勤不能标记为未来的日期
 DocType: Pricing Rule,Pricing Rule Help,定价规则说明
 DocType: Purchase Taxes and Charges,Account Head,账户头
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,更新额外费用以计算到岸成本
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,电气
 DocType: Stock Entry,Total Value Difference (Out - In),总价值差(输出 - )
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,行{0}:汇率是必须的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,行{0}:汇率是必须的
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},员工设置{0}为设置用户ID
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,来自保修申请
 DocType: Stock Entry,Default Source Warehouse,默认源仓库
 DocType: Item,Customer Code,客户代码
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},{0}的生日提醒
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,自上次订购天数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,库存资产
@@ -3308,7 +3338,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,关闭帐户{0}的类型必须是负债/权益
 DocType: Authorization Rule,Based On,基于
 DocType: Sales Order Item,Ordered Qty,订购数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,项目{0}无效
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,项目活动/任务。
@@ -3316,7 +3346,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核销金额(公司货币)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,行#{0}:请设置再订购数量
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,行#{0}:请设置再订购数量
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本凭证
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},请设置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,重复上月的日
@@ -3331,7 +3361,7 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0}个品目已同步
 DocType: Sales Order,Partly Delivered,部分交付
 DocType: Sales Invoice,Existing Customer,现有客户
-DocType: Email Digest,Receivables,应收账款
+DocType: Email Digest,Receivables,应收款
 DocType: Customer,Additional information regarding the customer.,对于客户的其他信息。
 DocType: Quality Inspection Reading,Reading 5,阅读5
 DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date",请输入邮件地址列表,用英文逗号分割。订单在特定的日期会被自动发送。
@@ -3346,17 +3376,17 @@
 DocType: Upload Attendance,Upload Attendance,上传考勤记录
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,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/accounts/doctype/journal_entry/journal_entry.js +446,Amount,量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,量
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM已替换
 ,Sales Analytics,销售分析
 DocType: Manufacturing Settings,Manufacturing Settings,生产设置
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,设置电子邮件
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,请在公司主输入默认货币
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,请在公司主输入默认货币
 DocType: Stock Entry Detail,Stock Entry Detail,库存记录详情
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,每日提醒
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},税收规范冲突{0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,New Account Name,新建账户名称
-DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原料提供成本
+DocType: Purchase Invoice Item,Raw Materials Supplied Cost,供应的原料成本
 DocType: Selling Settings,Settings for Selling Module,销售模块的设置
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,顾客服务
 DocType: Item,Thumbnail,缩略图
@@ -3377,33 +3407,33 @@
 DocType: Sales Order Item,Produced Quantity,生产的产品数量
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,工程师
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子组件
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},行{0}中的品目编号是必须项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},行{0}中的品目编号是必须项
 DocType: Sales Partner,Partner Type,合作伙伴类型
 DocType: Purchase Taxes and Charges,Actual,实际
 DocType: Authorization Rule,Customerwise Discount,客户折扣
 DocType: Purchase Invoice,Against Expense Account,对开支账目
 DocType: Production Order,Production Order,生产订单
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,安装单{0}已经提交过
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,安装单{0}已经提交过
 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,Re-Order Level,重新排序级别
+DocType: Item,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/setup/setup_wizard/install_fixtures.py +57,Part-time,兼任
 DocType: Employee,Applicable Holiday List,可申请假期列表
 DocType: Employee,Cheque,支票
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,系列已更新
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,报告类型是强制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,报告类型是强制性的
 DocType: Item,Serial Number Series,序列号系列
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},行{1}中的物件{0}必须指定仓库
 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/public/js/setup_wizard.js +101,The First User: You,第一个用户:您
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},财政年度开始日期和结束日期已经在财年{0}中设置
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,对账/盘点成功
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},财政年度开始日期和结束日期已经在财年{0}中设置
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,对账/盘点成功
 DocType: Production Order,Planned End Date,计划的结束日期
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,物件的存储位置。
 DocType: Tax Rule,Validity,有效性
@@ -3411,7 +3441,7 @@
 DocType: Attendance,Attendance,考勤
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,发布日期和发布时间是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,发布日期和发布时间是必需的
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,采购业务的税项模板。
 ,Item Prices,品目价格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,大写金额将在采购订单保存后显示。
@@ -3420,15 +3450,15 @@
 DocType: Task,Review Date,评论日期
 DocType: Purchase Invoice,Advance Payments,预付款
 DocType: Purchase Taxes and Charges,On Net Total,基于净总计
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,行{0}的目标仓库必须与生产订单的仓库相同
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,行{0}的目标仓库必须与生产订单的仓库相同
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,没有使用付款工具的权限
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,循环%s中未指定“通知电子邮件地址”
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,货币不能使用其他货币进行输入后更改
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,货币不能使用其他货币进行输入后更改
 DocType: Company,Round Off Account,四舍五入账户
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,行政开支
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,咨询
 DocType: Customer Group,Parent Customer Group,母公司集团客户
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,变化
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,变化
 DocType: Purchase Invoice,Contact Email,联络人电邮
 DocType: Appraisal Goal,Score Earned,已得分数
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",例如“XX有限责任公司”
@@ -3438,13 +3468,13 @@
 DocType: Packing Slip,Gross Weight UOM,毛重计量单位
 DocType: Email Digest,Receivables / Payables,应收/应付账款
 DocType: Delivery Note Item,Against Sales Invoice,对销售发票
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,信用账户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,信用账户
 DocType: Landed Cost Item,Landed Cost Item,到岸成本品目
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,显示零值
 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 +562,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item,Default Warehouse,默认仓库
 DocType: Task,Actual End Date (via Time Logs),实际结束日期(通过时间日志)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
@@ -3480,29 +3510,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,规划工作站工作时间以外的时间日志。
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}已经提交过
 ,Items To Be Requested,要申请的品目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,获取最新的采购税率
 DocType: Time Log,Billing Rate based on Activity Type (per hour),根据活动类型计费率(每小时)
 DocType: Company,Company Info,公司简介
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent",公司电子邮件ID没有找到,因此邮件无法发送
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),资金(资产)申请
 DocType: Production Planning Tool,Filter based on item,根据项目筛选
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,借方科目
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,借方科目
 DocType: Fiscal Year,Year Start Date,今年开始日期
 DocType: Attendance,Employee Name,雇员姓名
 DocType: Sales Invoice,Rounded Total (Company Currency),圆润的总计(公司货币)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,不能转换到组,因为你选择的是帐户类型。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,不能转换到组,因为你选择的是帐户类型。
 DocType: Purchase Common,Purchase Common,购买普通
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,来自机会
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,员工福利
 DocType: Sales Invoice,Is POS,是否POS机
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
 DocType: Production Order,Manufactured Qty,已生产数量
 DocType: Purchase Receipt Item,Accepted Quantity,已接收数量
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}:{1}不存在
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,对客户开出的账单。
 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 +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}:金额不能大于金额之前对报销{1}。待审核金额为{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}:金额不能大于金额之前对报销{1}。待审核金额为{2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}新增用户
 DocType: Maintenance Schedule,Schedule,计划任务
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",定义预算这个成本中心。要设置预算的行动,请参阅“企业名录”
@@ -3510,7 +3541,7 @@
 DocType: Quality Inspection Reading,Reading 3,阅读3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,凭证类型
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,价格表未找到或禁用
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,价格表未找到或禁用
 DocType: Expense Claim,Approved,已批准
 DocType: Pricing Rule,Price,价格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',{0}的假期批准后,雇员的状态必须设置为“离开”
@@ -3524,7 +3555,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,会计记账分录。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,请选择员工记录第一。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}:甲方/客户不与匹配{1} / {2} {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,要创建一个纳税帐户
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,请输入您的费用帐户
 DocType: Account,Stock,库存
@@ -3535,7 +3566,7 @@
 DocType: Employee,Contract End Date,合同结束日期
 DocType: Sales Order,Track this Sales Order against any Project,跟踪对任何项目这个销售订单
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,基于上述标准拉销售订单(待定提供)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,来自供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,来自供应商报价
 DocType: Deduction Type,Deduction Type,扣款类型
 DocType: Attendance,Half Day,半天
 DocType: Pricing Rule,Min Qty,最小数量
@@ -3543,14 +3574,14 @@
 DocType: GL Entry,Transaction Date,交易日期
 DocType: Production Plan Item,Planned Qty,计划数量
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,总税收
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,对于数量(制造数量)是强制性的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,对于数量(制造数量)是强制性的
 DocType: Stock Entry,Default Target Warehouse,默认目标仓库
 DocType: Purchase Invoice,Net Total (Company Currency),总净金额(公司货币)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}:党的类型和党的只适用对应收/应付帐户
 DocType: Notification Control,Purchase Receipt Message,外购入库单信息
 DocType: Production Order,Actual Start Date,实际开始日期
 DocType: Sales Order,% of materials delivered against this Sales Order,此销售订单%的材料已交货。
-apps/erpnext/erpnext/config/stock.py +23,Record item movement.,记录项目的运动。
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,移动记录项。
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,通讯订户名单
 DocType: Hub Settings,Hub Settings,Hub设置
 DocType: Project,Gross Margin %,毛利率%
@@ -3597,9 +3628,9 @@
 DocType: Customer,Commission Rate,佣金率
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,按部门禁止假期申请。
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,车是空的
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,车是空的
 DocType: Production Order,Actual Operating Cost,实际运行成本
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,根不能被编辑。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,根不能被编辑。
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,调配的数量不能超过未调配数量
 DocType: Manufacturing Settings,Allow Production on Holidays,允许在假日生产
 DocType: Sales Order,Customer's Purchase Order Date,客户的采购订单日期
@@ -3610,11 +3641,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,设计师
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,条款和条件模板
 DocType: Serial No,Delivery Details,交货细节
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
 DocType: Item,Automatically create Material Request if quantity falls below this level,自动创建材料,如果申请数量低于这个水平
 ,Item-wise Purchase Register,品目特定的采购记录
 DocType: Batch,Expiry Date,到期时间
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平,项目必须购买项目或生产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平,项目必须购买项目或生产项目
 ,Supplier Addresses and Contacts,供应商的地址和联系方式
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,属性是相同的两个记录。
 apps/erpnext/erpnext/config/projects.py +18,Project master.,项目主。
@@ -3622,7 +3653,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(半天)
 DocType: Supplier,Credit Days,信用期
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,从物料清单获取品目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,材料清单
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}:党的类型和党的需要应收/应付帐户{1}
@@ -3630,7 +3661,7 @@
 DocType: Employee,Reason for Leaving,离职原因
 DocType: Expense Claim Detail,Sanctioned Amount,已批准金额
 DocType: GL Entry,Is Opening,是否起始
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},行{0}:借记条目不能与连接的{1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,科目{0}不存在
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},行{0}:借记条目不能与连接的{1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,科目{0}不存在
 DocType: Account,Cash,现金
 DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介。
diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
index 78c9759..7ed99c8 100644
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv
@@ -8,7 +8,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,消費類產品
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,請選擇黨第一型
 DocType: Item,Customer Items,客戶項目
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,帳戶{0}:父帳戶{1}不能是總帳
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} can not be a ledger,帳戶{0}:父帳戶{1}不能是總帳
 DocType: Item,Publish Item to hub.erpnext.com,發布項目hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,電子郵件通知
 DocType: Item,Default Unit of Measure,預設的計量單位
@@ -21,7 +21,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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,客戶聯繫
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,從物料需求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,From Material Request,從物料需求
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0}樹
 DocType: Job Applicant,Job Applicant,求職者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,沒有更多的結果。
@@ -52,7 +52,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1。使用這個選項來維護客戶的項目代碼,並可根據客戶的項目代碼做搜索。
 DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,顯示變體
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,數量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,數量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款(負債)
 DocType: Employee Education,Year of Passing,路過的一年
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,庫存
@@ -63,16 +63,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,保健
 DocType: Purchase Invoice,Monthly,每月一次
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),延遲支付(天)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,發票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +609,Invoice,發票
 DocType: Maintenance Schedule Item,Periodicity,週期性
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,電子郵件地址
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +20,Fiscal Year {0} is required,會計年度{0}是必需的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防禦
 DocType: Company,Abbr,縮寫
 DocType: Appraisal Goal,Score (0-5),得分(0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}:{1} {2}不相匹配{3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},行{0}:{1} {2}不相匹配{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,行#{0}:
 DocType: Delivery Note,Vehicle No,車輛無
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,請選擇價格表
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,請選擇價格表
 DocType: Production Order Operation,Work In Progress,在製品
 DocType: Employee,Holiday List,假日列表
 DocType: Time Log,Time Log,時間日誌
@@ -99,13 +99,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司進入不止一次
 DocType: Employee,Married,已婚
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允許{0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Stock cannot be updated against Delivery Note {0},股票不能對送貨單更新的{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Stock cannot be updated against Delivery Note {0},股票不能對送貨單更新的{0}
 DocType: Payment Reconciliation,Reconcile,調和
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,雜貨
 DocType: Quality Inspection Reading,Reading 1,閱讀1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,使銀行進入
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,養老基金
-apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,如果帳戶類型是倉庫,其倉庫項目是強制要設定的,
+apps/erpnext/erpnext/accounts/doctype/account/account.py +151,Warehouse is mandatory if account type is Warehouse,如果帳戶類型是倉庫,其倉庫項目是強制要設定的,
 DocType: SMS Center,All Sales Person,所有的銷售人員
 DocType: Lead,Person Name,人姓名
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",檢查經常性秩序,取消,停止經常性或將適當的結束日期
@@ -126,16 +126,16 @@
 DocType: Lead,Interested,有興趣
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,物料清單
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,開盤
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},從{0} {1}
+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,開放報名
 DocType: Stock Entry,Additional Costs,額外費用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
 DocType: Lead,Product Enquiry,產品查詢
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,請先輸入公司
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,目標在
+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 +9,Activity Log:,活動日誌:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
@@ -165,7 +165,7 @@
 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 +444,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +447,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,之後銷售發票已提交將被更新。
 apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,設定人力資源模塊
@@ -181,7 +181,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,進行的作業細節。
 DocType: Serial No,Maintenance Status,維修狀態
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,項目和定價
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},從日期應該是在財政年度內。假設起始日期={0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},從日期應該是在財政年度內。假設起始日期={0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,選擇要為其創建的考核員工。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},成本中心{0}不屬於公司{1}
 DocType: Customer,Individual,個人
@@ -215,6 +215,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,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 +37,Net Cash from Financing,從融資淨現金
 DocType: Lead,Address & Contact,地址及聯繫方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的葉子從以前的分配
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
@@ -222,6 +223,7 @@
 ,Contact Name,聯繫人姓名
 DocType: Production Plan Item,SO Pending Qty,SO待定數量
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,建立工資單上面提到的標準。
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,未提供描述
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,請求您的報價。
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
@@ -233,7 +235,7 @@
 DocType: Item Website Specification,Item Website Specification,項目網站規格
 DocType: Payment Tool,Reference No,參考編號
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,庫存調整項目
 DocType: Stock Entry,Sales Invoice No,銷售發票號碼
@@ -245,11 +247,11 @@
 DocType: Pricing Rule,Supplier Type,供應商類型
 DocType: Item,Publish in Hub,在發布中心
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,項{0}將被取消
+apps/erpnext/erpnext/stock/doctype/item/item.py +605,Item {0} is cancelled,項{0}將被取消
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,物料需求
 DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
 DocType: Item,Purchase Details,採購詳情
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供&#39;表中的採購訂單{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +324,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供&#39;表中的採購訂單{1}
 DocType: Employee,Relation,關係
 DocType: Shipping Rule,Worldwide Shipping,全球航運
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,確認客戶的訂單。
@@ -261,7 +263,7 @@
 DocType: Lead,Suggestions,建議
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,在此地域設定跨群組項目間的預算。您還可以通過設定分配來包含季節性。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},請輸入父帳戶組倉庫{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},對支付{0} {1}不能大於未償還{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,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,生成時間表
@@ -270,6 +272,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,最新
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,最多5個字符
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,該列表中的第一個請假審核將被設定為預設請假審核
+apps/erpnext/erpnext/config/desktop.py +73,Learn,學習
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每個員工活動費用
 DocType: Accounts Settings,Settings for Accounts,設置帳戶
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,管理銷售人員樹。
@@ -289,9 +292,9 @@
 DocType: Journal Entry,Multi Currency,多幣種
 DocType: Payment Reconciliation Invoice,Invoice Type,發票類型
 DocType: Sales Invoice Item,Delivery Note,送貨單
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,建立稅
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,建立稅
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改,你把它之後。請重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,{0} entered twice in Item Tax,{0}輸入兩次項目稅
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0}輸入兩次項目稅
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,本週和待活動總結
 DocType: Workstation,Rent Cost,租金成本
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,請選擇年份和月份
@@ -308,11 +311,11 @@
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",存在於物料清單,送貨單,採購發票,生產訂單,採購訂單,採購入庫單,銷售發票,銷售訂單,股票,時間表
 DocType: Item Tax,Tax Rate,稅率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +628,Select Item,選擇項目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Select Item,選擇項目
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","項目:{0}管理分批,不能使用\
 庫存調整,而是使用庫存分錄。"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +264,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行#{0}:批號必須與{1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,轉換為非集團
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,購買收據必須提交
@@ -353,6 +356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,醫療
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,原因丟失
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: Employee,Single,單
 DocType: Issue,Attachment,附件
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,預算不能為集團成本中心成立
@@ -382,13 +386,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +553,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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 +140,Holiday master.,假日高手。
 DocType: Material Request Item,Required Date,所需時間
 DocType: Delivery Note,Billing Address,帳單地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,請輸入產品編號。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,請輸入產品編號。
 DocType: BOM,Costing,成本核算
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果選中,稅額將被視為已包含在列印速率/列印數量
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,總數量
@@ -421,7 +425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,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 +458,"To merge, following properties must be same for both items",若要合併,以下屬性必須為這兩個項目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"To merge, following properties must be same for both items",若要合併,以下屬性必須為這兩個項目是相同的
 DocType: Shipping Rule,Net Weight,淨重
 DocType: Employee,Emergency Phone,緊急電話
 ,Serial No Warranty Expiry,序列號保修到期
@@ -440,16 +444,15 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,增量不能為0
 DocType: Production Planning Tool,Material Requirement,物料需求
 DocType: Company,Delete Company Transactions,刪除公司事務
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,項目{0}不購買產品
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,項目{0}不購買產品
 apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0}在“通知\
 電子郵件地址”中是無效的電子郵件地址"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,本年總計費:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,新增/編輯稅金及費用
 DocType: Purchase Invoice,Supplier Invoice No,供應商發票號碼
 DocType: Territory,For reference,供參考
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",無法刪除序列號{0},因為它採用的是現貨交易
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),關閉(Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,Closing (Cr),關閉(Cr)
 DocType: Serial No,Warranty Period (Days),保修期限(天數)
 DocType: Installation Note Item,Installation Note Item,安裝注意項
 ,Pending Qty,待定數量
@@ -466,7 +469,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**月**分佈幫助你分配你整個月的預算,如果你有季節性的業務。
 
 要使用這種分佈分配預算,在**成本中心**設置這個**月**分佈"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,沒有在發票表中找到記錄
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,沒有在發票表中找到記錄
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,請選擇公司和黨的第一型
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,財務/會計年度。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",對不起,序列號無法合併
@@ -474,9 +477,9 @@
 DocType: Project Task,Project Task,項目任務
 ,Lead Id,潛在客戶標識
 DocType: C-Form Invoice Detail,Grand Total,累計
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,會計年度開始日期應不大於財政年度結束日期
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,會計年度開始日期應不大於財政年度結束日期
 DocType: Warranty Claim,Resolution,決議
-apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},交貨:{0}
+apps/erpnext/erpnext/templates/pages/order.html +57,Delivered: {0},交貨:{0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,應付帳款
 DocType: Sales Order,Billing and Delivery Status,結算和交貨狀態
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回頭客
@@ -491,7 +494,7 @@
 DocType: Quotation,Quotation To,報價到
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),開啟(Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,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 +711,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 +195,Allocated amount can not be negative,分配金額不能為負
 DocType: Purchase Order Item,Billed Amt,已結算額
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,對這些庫存分錄帳進行的邏輯倉庫。
@@ -500,7 +503,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,生產訂單是強制性
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,提案寫作
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外銷售人員{0}存在具有相同員工ID
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},負庫存錯誤( {6})的項目{0}在倉庫{1}在{2} {3} {4} {5}
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},負庫存錯誤( {6})的項目{0}在倉庫{1}在{2} {3} {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,會計年度公司
 DocType: Packing Slip Item,DN Detail,DN詳細
 DocType: Time Log,Billed,計費
@@ -519,16 +522,17 @@
 DocType: Activity Type,Default Costing Rate,默認成本核算率
 DocType: Maintenance Schedule,Maintenance Schedule,維護計劃
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然後定價規則將被過濾掉基於客戶,客戶群組,領地,供應商,供應商類型,活動,銷售合作夥伴等。
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,在庫存淨變動
 DocType: Employee,Passport Number,護照號碼
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,經理
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,從採購入庫單
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,相同的項目已被輸入多次。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,從採購入庫單
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Same item has been entered multiple times.,相同的項目已被輸入多次。
 DocType: SMS Settings,Receiver Parameter,收受方參數
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根據”和“分組依據”不能相同
 DocType: Sales Person,Sales Person Targets,銷售人員目標
 DocType: Production Order Operation,In minutes,在幾分鐘內
 DocType: Issue,Resolution Date,決議日期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +644,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +663,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
 DocType: Selling Settings,Customer Naming By,客戶命名由
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,轉換為集團
 DocType: Activity Cost,Activity Type,活動類型
@@ -539,7 +543,7 @@
 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 +145,{0}: {1} not found in Invoice Details table,{0}:在發票明細表中找不到{1}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{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 +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
 DocType: Material Request,Material Transfer,物料轉倉
@@ -561,13 +565,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,市場營銷
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,在基於其序列號的銷售和採購文件跟踪的項目。這也可以用來跟踪商品的保修細節。
 DocType: Purchase Receipt Item Supplied,Current Stock,當前庫存
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,拒絕倉庫是必須反對regected項目
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total billing this year,今年的總賬單
 DocType: Account,Expenses Included In Valuation,支出計入估值
 DocType: Employee,Provide email id registered in company,提供的電子郵件ID在公司註冊
 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 +533,Item has variants.,項目已變種。
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,樹類型
@@ -585,18 +589,18 @@
 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 +92,{0} is not a stock Item,{0}不是庫存項目
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0}不是庫存項目
 DocType: Mode of Payment Account,Default Account,預設帳戶
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,如果機會是由鉛製成鉛必須設置
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,請選擇每週休息日
 DocType: Production Order Operation,Planned End Time,計劃結束時間
 ,Sales Person Target Variance Item Group-Wise,銷售人員跨項目群組間的目標差異
-apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
+apps/erpnext/erpnext/accounts/doctype/account/account.py +114,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
 DocType: Delivery Note,Customer's Purchase Order No,客戶的採購訂單編號
 DocType: Employee,Cell Number,手機號碼
 apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,汽車材料的要求生成
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丟失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,機會從
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月薪聲明。
@@ -605,9 +609,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}:從{0}類型{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,列#{0}:轉換係數是強制性的
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,會計分錄可針對葉節點。不允許針對組的分錄。
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM,因為它是與其他材料明細表鏈接
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +359,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM,因為它是與其他材料明細表鏈接
 DocType: Opportunity,Maintenance,維護
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
 DocType: Item Attribute Value,Item Attribute Value,項目屬性值
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,銷售活動。
 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.
@@ -665,7 +669,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,未選擇價格列表
 DocType: Employee,Family Background,家庭背景
 DocType: Process Payroll,Send Email,發送電子郵件
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Warning: Invalid Attachment {0},警告:無效的附件{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},警告:無效的附件{0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,無權限
 DocType: Company,Default Bank Account,預設銀行帳戶
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",要根據黨的篩選,選擇黨第一類型
@@ -673,7 +677,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Nos,NOS
 DocType: Item,Items with higher weightage will be shown higher,具有較高權重的項目將顯示更高的可
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行對帳詳細
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +636,My Invoices,我的發票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +655,My Invoices,我的發票
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,無發現任何員工
 DocType: Purchase Order,Stopped,停止
 DocType: Item,If subcontracted to a vendor,如果分包給供應商
@@ -683,6 +687,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,立即發送
 ,Support Analytics,支援分析
 DocType: Item,Website Warehouse,網站倉庫
+DocType: Payment Reconciliation,Minimum Invoice Amount,最小發票金額
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",該月的一天,在這汽車的發票將產生如05,28等
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必須小於或等於5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-往績紀錄
@@ -692,7 +697,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",為了使“銷售點”的特點
 DocType: Bin,Moving Average Rate,移動平均房價
 DocType: Production Planning Tool,Select Items,選擇項目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +338,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
 DocType: Maintenance Visit,Completion Status,完成狀態
 DocType: Sales Invoice Item,Target Warehouse,目標倉庫
 DocType: Item,Allow over delivery or receipt upto this percent,允許在交付或接收高達百分之這
@@ -704,7 +709,7 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,自動編寫郵件在提交交易。
 DocType: Production Order,Item To Manufacture,產品製造
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}的狀態為{2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,採購訂單到付款
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,採購訂單到付款
 DocType: Sales Order Item,Projected Qty,預計數量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通訊經理
@@ -728,7 +733,7 @@
 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 +304,Point-of-Sale,銷售點
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶,不允許設為借記帳戶
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶,不允許設為借記帳戶
 DocType: Account,Balance must be,餘額必須
 DocType: Hub Settings,Publish Pricing,發布定價
 DocType: Notification Control,Expense Claim Rejected Message,報銷回絕訊息
@@ -751,7 +756,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,貨幣匯率的主人。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0}必須是積極的
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be active,BOM {0}必須是積極的
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,請先選擇文檔類型
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消取消此保養訪問之前,材質訪問{0}
 DocType: Salary Slip,Leave Encashment Amount,假期兌現金額
@@ -769,17 +774,17 @@
 DocType: Supplier,Default Payable Accounts,預設應付帳款
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
 DocType: Features Setup,Item Barcode,商品條碼
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item Variants {0} updated,項目變種{0}更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Item Variants {0} updated,項目變種{0}更新
 DocType: Quality Inspection Reading,Reading 6,6閱讀
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,購買發票提前
 DocType: Address,Shop,店
 DocType: Hub Settings,Sync Now,立即同步
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},行{0}:信用記錄無法被鏈接的{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},行{0}:信用記錄無法被鏈接的{1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,預設銀行/現金帳戶將被在POS機開發票,且選擇此模式時自動更新。
 DocType: Employee,Permanent Address Is,永久地址
 DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品?
 apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,品牌
-apps/erpnext/erpnext/controllers/status_updater.py +164,Allowance for over-{0} crossed for Item {1}.,備抵過{0}越過為項目{1}。
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,備抵過{0}越過為項目{1}。
 DocType: Employee,Exit Interview Details,退出面試細節
 DocType: Item,Is Purchase Item,是購買項目
 DocType: Journal Entry Account,Purchase Invoice,採購發票
@@ -791,7 +796,7 @@
 DocType: Salary Slip,Total in words,總計大寫
 DocType: Material Request Item,Lead Time Date,交貨時間日期
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,是強制性的。也許外幣兌換記錄沒有創建
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},列#{0}:請為項目{1}指定序號
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},列#{0}:請為項目{1}指定序號
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.",對於“產品包”的物品,倉庫,序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品,這些值可以在主項表中輸入,值將被複製到“裝箱單”表。
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,發貨給客戶。
 DocType: Purchase Invoice Item,Purchase Order Item,採購訂單項目
@@ -800,14 +805,15 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,方差
 ,Company Name,公司名稱
 DocType: SMS Center,Total Message(s),訊息總和(s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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.,選取支票存入該銀行帳戶的頭。
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允許用戶編輯價目表率的交易
 DocType: Pricing Rule,Max Qty,最大數量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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,化學藥品
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +682,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
 DocType: Process Payroll,Select Payroll Year and Month,選擇薪資年和月
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",轉到相應的群組(通常資金運用>流動資產>銀行帳戶,並新增一個新帳戶(通過點擊添加類型的兒童),“銀行”
 DocType: Workstation,Electricity Cost,電力成本
@@ -821,10 +827,10 @@
 DocType: SMS Center,All Lead (Open),所有鉛(開放)
 DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,附上你的照片
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,使
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +631,Make ,使
 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 +3,My Cart,我的購物車
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,我的購物車
 apps/erpnext/erpnext/controllers/selling_controller.py +150,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 +35,Opening Qty,開放數量
@@ -843,10 +849,10 @@
 DocType: POS Profile,Cash/Bank Account,現金/銀行帳戶
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
 DocType: Delivery Note,Delivery To,交貨給
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,屬性表是強制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +560,Attribute table is mandatory,屬性表是強制性的
 DocType: Production Planning Tool,Get Sales Orders,獲取銷售訂單
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能為負數
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,折扣
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,折扣
 DocType: Features Setup,Purchase Discounts,採購折扣
 DocType: Workstation,Wages,工資
 DocType: Time Log,Will be updated only if Time Log is 'Billable',如果時間日誌是“計費”將只更新
@@ -871,7 +877,7 @@
 DocType: Tax Rule,Shipping State,運輸狀態
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行添加
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,銷售費用
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,標準採購
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,Standard Buying,標準採購
 DocType: GL Entry,Against,針對
 DocType: Item,Default Selling Cost Center,預設銷售成本中心
 DocType: Sales Partner,Implementation Partner,實施合作夥伴
@@ -913,6 +919,7 @@
 DocType: Sales Partner,Distributor,經銷商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,購物車運輸規則
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
 ,Ordered Items To Be Billed,預付款的訂購物品
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,從範圍必須小於要範圍
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,選擇時間日誌並提交以創建一個新的銷售發票。
@@ -922,13 +929,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,此時日誌批量一直標榜。
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,創造機會
 DocType: Salary Slip,Leave Without Pay,無薪假
-DocType: Supplier,Communications,通訊
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,容量規劃錯誤
 ,Trial Balance for Party,試算表的派對
 DocType: Lead,Consultant,顧問
 DocType: Salary Slip,Earnings,收益
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,Finished Item {0} must be entered for Manufacture type entry,完成項目{0}必須為製造類條目進入
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,打開會計平衡
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +358,Finished Item {0} must be entered for Manufacture type entry,完成項目{0}必須為製造類條目進入
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,打開會計平衡
 DocType: Sales Invoice Advance,Sales Invoice Advance,銷售發票提前
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,無需求
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',“實際開始日期”不能大於“實際結束日期'
@@ -970,7 +976,7 @@
 DocType: Global Defaults,Current Fiscal Year,當前會計年度
 DocType: Global Defaults,Disable Rounded Total,禁用圓角總
 DocType: Lead,Call,通話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,“分錄”不能是空的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,'Entries' cannot be empty,“分錄”不能是空的
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重複的行{0}同{1}
 ,Trial Balance,試算表
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,建立職工
@@ -982,9 +988,9 @@
 DocType: Contact,User ID,使用者 ID
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,查看總帳
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +435,"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 +444,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在,請更改項目名稱或重新命名該項目群組
 DocType: Production Order,Manufacture against Sales Order,對製造銷售訂單
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,世界其他地區
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +444,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,工資總額
@@ -1014,7 +1020,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},無權修改凍結帳戶{0}
 DocType: Journal Entry,Get Outstanding Invoices,獲取未付發票
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,銷售訂單{0}無效
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",對不起,企業不能合併
+apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged",對不起,企業不能合併
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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}
@@ -1027,13 +1033,13 @@
 DocType: Employee,Place of Issue,簽發地點
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,合同
 DocType: Email Digest,Add Quote,添加報價
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位:丁文因素:{0}項:{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位:丁文因素:{0}項:{1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,間接費用
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,列#{0}:數量是強制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,您的產品或服務
 DocType: Mode of Payment,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,請先輸入項目
 DocType: Journal Entry Account,Purchase Order,採購訂單
 DocType: Warehouse,Warehouse Contact Info,倉庫聯繫方式
@@ -1042,8 +1048,8 @@
 DocType: Email Digest,Annual Income,年收入
 DocType: Serial No,Serial No Details,序列號詳細資訊
 DocType: Purchase Invoice Item,Item Tax Rate,項目稅率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0},只有貸方帳戶可以連接另一個借方分錄
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +477,Delivery Note {0} is not submitted,送貨單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry",{0},只有貸方帳戶可以連接另一個借方分錄
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Delivery Note {0} is not submitted,送貨單{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",基於“適用於”欄位是「項目」,「項目群組」或「品牌」,而選擇定價規則。
@@ -1053,7 +1059,7 @@
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,編輯說明
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,預計交貨日期比計劃開始日期較早。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,對供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +693,For Supplier,對供應商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,設置帳戶類型有助於在交易中選擇該帳戶。
 DocType: Purchase Invoice,Grand Total (Company Currency),總計(公司貨幣)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,出貨總計
@@ -1066,7 +1072,7 @@
 DocType: Journal Entry,Journal Entry,日記帳分錄
 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 +427,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,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,這就是以這個前綴的最後一個創建的事務數
@@ -1098,7 +1104,7 @@
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",通訊,聯繫人,線索。
 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}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,作業不能留空。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +363,Operations cannot be left blank.,作業不能留空。
 ,Delivered Items To Be Billed,交付項目要被收取
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,倉庫不能改變序列號
 DocType: Authorization Rule,Average Discount,平均折扣
@@ -1113,7 +1119,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},從{0} | {1} {2}
 DocType: BOM Operation,Operation Description,操作說明
 DocType: Item,Will also apply to variants,也將適用於變種
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,不能更改財政年度開始日期和財政年度結束日期,一旦會計年度被保存。
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,不能更改財政年度開始日期和財政年度結束日期,一旦會計年度被保存。
 DocType: Quotation,Shopping Cart,購物車
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,平均每日傳出
 DocType: Pricing Rule,Campaign,競賽
@@ -1124,7 +1130,8 @@
 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 +211,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,在固定資產淨變動
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開,如果考慮所有指定空白
 apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費,不能被包含在項目單價
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大數量:{0}
@@ -1136,7 +1143,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,條款及細則內容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,項{0}不是缺貨登記
+apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,依賴於無薪休假
@@ -1173,7 +1180,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sub Assemblies,子組件
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Supplier,Stock Manager,庫存管理
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
+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 +581,Packing Slip,包裝單
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,辦公室租金
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,設置短信閘道設置
@@ -1181,10 +1188,10 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,尚未新增地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作時間
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,分析人士
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}:分配量{1}必須小於或等於合資量{2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}:分配量{1}必須小於或等於合資量{2}
 DocType: Item,Inventory,庫存
 DocType: Features Setup,"To enable ""Point of Sale"" view",為了讓觀“銷售點”
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,無法由空的購物車產生款項
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,無法由空的購物車產生款項
 DocType: Item,Sales Details,銷售詳細資訊
 DocType: Opportunity,With Items,隨著項目
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,在數量
@@ -1199,10 +1206,11 @@
 DocType: Cost Center,Parent Cost Center,父成本中心
 DocType: Sales Invoice,Source,源
 DocType: Leave Type,Is Leave Without Pay,是無薪休假
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,沒有在支付表中找到記錄
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,沒有在支付表中找到記錄
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,財政年度開始日期
 DocType: Employee External Work History,Total Experience,總經驗
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,包裝單( S)已取消
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,包裝單( S)已取消
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,從投資現金流
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,貨運代理費
 DocType: Material Request Item,Sales Order No,銷售訂單號
 DocType: Item Group,Item Group Name,項目群組名稱
@@ -1210,12 +1218,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,轉移製造材料
 DocType: Pricing Rule,For Price List,對於價格表
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,獵頭
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",購買率的項目:{0}沒有找到,這是需要預訂會計分錄(費用)。請註明項目價格對買入價格表。
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",購買率的項目:{0}沒有找到,這是需要預訂會計分錄(費用)。請註明項目價格對買入價格表。
 DocType: Maintenance Schedule,Schedules,時間表
 DocType: Purchase Invoice Item,Net Amount,淨額
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM表詳細編號
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),額外的優惠金額(公司貨幣)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},錯誤: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},錯誤: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,請從科目表建立新帳戶。
 DocType: Maintenance Visit,Maintenance Visit,維護訪問
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,客戶>客戶群組>領地
@@ -1241,7 +1249,7 @@
 DocType: Sales Partner,Sales Partner Target,銷售合作夥伴目標
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},會計分錄為{0}只能在貨幣進行:{1}
 DocType: Pricing Rule,Pricing Rule,定價規則
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,材料要求採購訂單
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,材料要求採購訂單
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},行#{0}:返回的項目{1}不存在{2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,銀行帳戶
 ,Bank Reconciliation Statement,銀行對帳表
@@ -1249,11 +1257,11 @@
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,期初存貨餘額
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0}必須只出現一次
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +332,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允許轉院更多{0}不是{1}對採購訂單{2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +335,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 +62,Leaves Allocated Successfully for {0},{0}的排假成功
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,無項目包裝
 DocType: Shipping Rule Condition,From Value,從價值
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,生產數量是必填的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +541,Manufacturing Quantity is mandatory,生產數量是必填的
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,數額沒有反映在銀行
 DocType: Quality Inspection Reading,Reading 4,4閱讀
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,索賠費用由公司負責。
@@ -1265,33 +1273,34 @@
 ,Material Requests for which Supplier Quotations are not created,對該供應商報價的材料需求尚未建立
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天(S)對你所申請休假的假期。你不需要申請許可。
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,要使用條形碼跟踪項目。您將能夠通過掃描物品條碼,進入交貨單和銷售發票的項目。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,標記為交付
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,標記為交付
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,請報價
 DocType: Dependent Task,Dependent Task,相關任務
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +157,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,停止生日提醒
 DocType: SMS Center,Receiver List,收受方列表
 DocType: Payment Tool Detail,Payment Amount,付款金額
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}查看
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0}查看
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,現金淨變動
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬結構演繹
-apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{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 +185,Quantity must not be more than {0},數量必須不超過{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),時間(天)
 DocType: Quotation Item,Quotation Item,產品報價
 DocType: Account,Account Name,帳戶名稱
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,起始日期不能大於結束日期
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,起始日期不能大於結束日期
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,序列號{0}的數量量{1}不能是分數
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,供應商類型高手。
 DocType: Purchase Order Item,Supplier Part Number,供應商零件編號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,轉化率不能為0或1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,轉化率不能為0或1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{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 +202,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
 DocType: Company,Default Payable Account,預設應付賬款
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",設置網上購物車,如航運規則,價格表等
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}%已開立帳單
@@ -1303,15 +1312,17 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,我的問題
 DocType: BOM Item,BOM Item,BOM項目
 DocType: Appraisal,For Employee,對於員工
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,行{0}:提前對供應商必須扣除
 DocType: Company,Default Values,默認值
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,行{0}:付款金額不能為負
 DocType: Expense Claim,Total Amount Reimbursed,報銷金額合計
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
 DocType: Customer,Default Price List,預設價格表
 DocType: Payment Reconciliation,Payments,付款
 DocType: Budget Detail,Budget Allocated,預算分配
 DocType: Journal Entry,Entry Type,條目類型
 ,Customer Credit Balance,客戶信用平衡
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,應付賬款淨額變化
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,請驗證您的電子郵件ID
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',需要' Customerwise折扣“客戶
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,更新與日記帳之銀行付款日期。
@@ -1332,7 +1343,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,讓購物車
 DocType: Employee,Permanent Address,永久地址
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,項{0}必須是一個服務項目。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推動打擊{0} {1}不能大於付出\超過總計{2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,請選擇商品代碼
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),減少扣除停薪留職(LWP)
@@ -1349,18 +1360,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及,請同時註明“重量計量單位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,做此存貨分錄所需之物料需求
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,該產品的一個單元。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',時間日誌批量{0}必須是'提交'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',時間日誌批量{0}必須是'提交'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,為每股份轉移做會計分錄
 DocType: Leave Allocation,Total Leaves Allocated,已安排的休假總計
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Warehouse required at Row No {0},在第{0}行需要倉庫
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Warehouse required at Row No {0},在第{0}行需要倉庫
 apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
 DocType: Employee,Date Of Retirement,退休日
 DocType: Upload Attendance,Get Template,獲取模板
 DocType: Address,Postal,郵政
 DocType: Item,Weightage,權重
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,客戶群組存在相同名稱,請更改客戶名稱或重新命名客戶群組
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,請先選擇{0}。
-apps/erpnext/erpnext/templates/pages/order.html +56,text {0},文字{0}
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,請先選擇{0}。
+apps/erpnext/erpnext/templates/pages/order.html +62,text {0},文字{0}
+apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,新建聯繫人
 DocType: Territory,Parent Territory,家長領地
 DocType: Quality Inspection Reading,Reading 2,閱讀2
 DocType: Stock Entry,Material Receipt,收料
@@ -1368,7 +1380,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},黨的類型和黨的需要應收/應付帳戶{0}
 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 +210,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +213,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},倉庫{0} 不能被刪除因為項目{1}還有庫存
 DocType: Quotation,Order Type,訂單類型
 DocType: Purchase Invoice,Notification Email Address,通知電子郵件地址
@@ -1385,15 +1397,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,過多的列數。請導出報表,並使用試算表程式進行列印。
 DocType: Sales 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 +152,Main,主頁
+apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,主頁
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,變種
 DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,已停止訂單無法取消。 撤銷停止再取消。
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be active for this item or its template,預設BOM({0})必須是活動的這個項目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,製作採購訂單
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,製作採購訂單
 DocType: SMS Center,Send To,發送到
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
@@ -1406,7 +1418,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,倉庫及參考
 DocType: Supplier,Statutory info and other general information about your Supplier,供應商的法定資訊和其他一般資料
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,地址
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,為航運規則的條件
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,項目是不允許有生產訂單。
@@ -1415,10 +1427,11 @@
 DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,時間日誌製造。
 DocType: Item,Apply Warehouse-wise Reorder Level,適用於倉庫明智的重新排序水平
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0}必須提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be submitted,BOM {0}必須提交
 DocType: Authorization Control,Authorization Control,授權控制
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行#{0}:拒絕倉庫是強制性的反對否決項{1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,時間日誌中的任務。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,付款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,付款
 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} 被完成。
 DocType: Employee,Salutation,招呼
@@ -1435,7 +1448,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,關聯
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,項{0}不是一個序列化的項目
 DocType: SMS Center,Create Receiver List,創建接收器列表
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,過期
 DocType: Packing Slip,To Package No.,以包號
 DocType: Warranty Claim,Issue Date,發行日期
 DocType: Activity Cost,Activity Cost,活動費用
@@ -1473,7 +1485,7 @@
 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 +65,Territory / Customer,區域/客戶
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,e.g. 5,例如5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,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 +150,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: Item,Is Sales Item,是銷售項目
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,由於生產訂單可以為這個項目, \作
@@ -1485,7 +1497,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0}已新增
 DocType: Delivery Note Item,Against Sales Order,對銷售訂單
 ,Serial No Status,序列號狀態
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,項目表不能為空
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +447,Item table can not be blank,項目表不能為空
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","行{0}:設置{1}的週期性,從和到日期\
 之間差必須大於或等於{2}"
@@ -1495,7 +1507,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,關稅和稅款
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,參考日期請輸入
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +322,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,附送數量
@@ -1510,7 +1522,7 @@
 DocType: Installation Note,Installation Time,安裝時間
 DocType: Sales Invoice,Accounting Details,會計細節
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,刪除所有交易本公司
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行#{0}:操作{1}未完成的成品{2}在生產數量訂單{3}。請通過時間日誌更新運行狀態
+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,行#{0}:操作{1}未完成的成品{2}在生產數量訂單{3}。請通過時間日誌更新運行狀態
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投資
 DocType: Issue,Resolution Details,詳細解析
 DocType: Quality Inspection Reading,Acceptance Criteria,驗收標準
@@ -1526,7 +1538,7 @@
 DocType: Holiday List,Clear Table,清除表格
 DocType: Features Setup,Brands,品牌
 DocType: C-Form Invoice Detail,Invoice No,發票號碼
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,從採購訂單
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,從採購訂單
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,成本率
 ,Customer Addresses And Contacts,客戶的地址和聯繫方式
@@ -1543,7 +1555,7 @@
 ,Maintenance Schedules,保養時間表
 ,Quotation Trends,報價趨勢
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To account must be a Receivable account,借記帳戶必須是應收賬款
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Receivable account,借記帳戶必須是應收賬款
 DocType: Shipping Rule Condition,Shipping Amount,航運量
 ,Pending Amount,待審核金額
 DocType: Purchase Invoice Item,Conversion Factor,轉換因子
@@ -1560,12 +1572,12 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,樹finanial帳戶。
 DocType: Leave Control Panel,Leave blank if considered for all employee types,保持空白如果考慮到所有的員工類型
 DocType: Landed Cost Voucher,Distribute Charges Based On,分銷費基於
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +313,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,帳戶{0}的類型必須為“固定資產”作為項目{1}是一個資產項目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +317,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,帳戶{0}的類型必須為“固定資產”作為項目{1}是一個資產項目
 DocType: HR Settings,HR Settings,人力資源設置
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,使項目所需的質量保證和質量保證在沒有採購入庫單
 DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
 DocType: Leave Block List Allow,Leave Block List Allow,休假區塊清單准許
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,縮寫不能為空或空間
+apps/erpnext/erpnext/setup/doctype/company/company.py +225,Abbr can not be blank or space,縮寫不能為空或空間
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,體育
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,實際總計
 apps/erpnext/erpnext/public/js/setup_wizard.js +380,Unit,單位
@@ -1577,6 +1589,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}是現在預設的會計年度。請重新載入您的瀏覽器,以使更改生效。
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,報銷
 DocType: Issue,Support,支持
+apps/erpnext/erpnext/templates/generators/item.html +84,View Cart,查看購物車
 ,BOM Search,BOM搜索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),截止(開標+總計)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,請公司指定的貨幣
@@ -1588,13 +1601,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},計量單位換算係數是必需的行{0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},清拆日期不能行檢查日期前{0}
 DocType: Salary Slip,Deduction,扣除
+apps/erpnext/erpnext/stock/get_item_details.py +249,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
 DocType: Address Template,Address Template,地址模板
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
 DocType: Territory,Classification of Customers by region,客戶按區域分類
 DocType: Project,% Tasks Completed,% 任務已完成
 DocType: Project,Gross Margin,毛利
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,請先輸入生產項目
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,禁用的用戶
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,禁用的用戶
 DocType: Opportunity,Quotation,報價
 DocType: Salary Slip,Total Deduction,扣除總額
 DocType: Quotation,Maintenance User,維護用戶
@@ -1603,7 +1617,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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 +142,Warning: Invalid SSL certificate on attachment {0},警告:附件無效的SSL證書{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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,扣除
@@ -1613,12 +1627,12 @@
 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,SO數量
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",Stock條目對倉庫存在{0},因此你不能重新分配或修改倉庫
+apps/erpnext/erpnext/accounts/doctype/account/account.py +164,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",Stock條目對倉庫存在{0},因此你不能重新分配或修改倉庫
 DocType: Appraisal,Calculate Total Score,計算總分
 DocType: Supplier Quotation,Manufacturing Manager,生產經理
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列號{0}在保修期內直到{1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,分裂送貨單成包。
-apps/erpnext/erpnext/hooks.py +68,Shipments,發貨
+apps/erpnext/erpnext/hooks.py +69,Shipments,發貨
 DocType: Purchase Order Item,To be delivered to customer,要傳送給客戶
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,時間日誌狀態必須被提交。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列號{0}不屬於任何倉庫
@@ -1638,10 +1652,10 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,選擇公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,保持空白如果考慮到全部部門
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",就業(永久,合同,實習生等)的類型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,{0} is mandatory for Item {1},{0}是強制性的項目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +360,{0} is mandatory for Item {1},{0}是強制性的項目{1}
 DocType: Currency Exchange,From Currency,從貨幣
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額,發票類型和發票號碼
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},所需的{0}項目銷售訂單
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額,發票類型和發票號碼
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},所需的{0}項目銷售訂單
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,量以不反映在系統
 DocType: Purchase Invoice Item,Rate (Company Currency),率(公司貨幣)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,他人
@@ -1657,7 +1671,7 @@
 DocType: Quality Inspection,In Process,在過程
 DocType: Authorization Rule,Itemwise Discount,Itemwise折扣
 DocType: Purchase Order Item,Reference Document Type,參考文檔類型
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0}針對銷售訂單{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Order {1},{0}針對銷售訂單{1}
 DocType: Account,Fixed Asset,固定資產
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,序列化庫存
 DocType: Activity Type,Default Billing Rate,默認計費率
@@ -1667,7 +1681,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,銷售訂單到付款
 DocType: Expense Claim Detail,Expense Claim Detail,報銷詳情
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,時間日誌創建:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +761,Please select correct account,請選擇正確的帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +771,Please select correct account,請選擇正確的帳戶
 DocType: Item,Weight UOM,重量計量單位
 DocType: Employee,Blood Group,血型
 DocType: Purchase Invoice Item,Page Break,分頁符
@@ -1698,10 +1712,10 @@
 DocType: Time Log,To Time,要時間
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色(上述授權值)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",要添加子節點,探索樹,然後單擊要在其中添加更多節點的節點上。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,信用帳戶必須是應付賬款
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸: {0}不能父母或兒童{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,信用帳戶必須是應付賬款
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +231,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 +116,"For {0}, only debit accounts can be linked against another credit entry",{0},只有借方帳戶可以連接另一個貸方分錄
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry",{0},只有借方帳戶可以連接另一個貸方分錄
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,價格表{0}被禁用
 DocType: Manufacturing Settings,Allow Overtime,允許加班
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}產品{1}需要的序號。您已提供{2}。
@@ -1709,8 +1723,9 @@
 DocType: Item,Customer Item Codes,客戶項目代碼
 DocType: Opportunity,Lost Reason,失落的原因
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,對訂單或發票建立付款分錄。
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新地址
 DocType: Quality Inspection,Sample Size,樣本大小
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,所有項目已開具發票
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +498,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/accounts/page/accounts_browser/accounts_browser.js +304,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行,但項可以對非組進行
 DocType: Project,External,外部
@@ -1766,13 +1781,14 @@
 DocType: Rename Tool,Rename Tool,重命名工具
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,項目重新排序
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,轉印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,轉印材料
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
 DocType: Purchase Invoice,Price List Currency,價格表貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
 DocType: Stock Settings,Allow Negative Stock,允許負庫存
 DocType: Installation Note,Installation Note,安裝注意事項
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,添加稅賦
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,從融資現金流
 ,Financial Analytics,財務分析
 DocType: Quality Inspection,Verified By,認證機構
 DocType: Address,Subsidiary,副
@@ -1782,19 +1798,19 @@
 DocType: Process Payroll,Create Salary Slip,建立工資單
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,預計結餘按銀行
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),資金來源(負債)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +345,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量({1})必須與生產量{2}相同
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量({1})必須與生產量{2}相同
 DocType: Appraisal,Employee,僱員
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,導入電子郵件發件人
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,邀請成為用戶
 DocType: Features Setup,After Sale Installations,銷售後安裝
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1}}已開票
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is fully billed,{0} {1}}已開票
 DocType: Workstation Working Hour,End Time,結束時間
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,銷售或採購的標準合同條款。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,集團透過券
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,要求在
 DocType: Sales Invoice,Mass Mailing,郵件群發
 DocType: Rename Tool,File to Rename,文件重命名
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},項目{0}需要採購訂單號
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},項目{0}需要採購訂單號
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,顯示支付
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
@@ -1804,6 +1820,7 @@
 DocType: Selling Settings,Sales Order Required,銷售訂單需求
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,建立客戶
 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: Maintenance Schedule Detail,Maintenance Schedule Detail,維護計劃細節
 DocType: Quality Inspection Reading,Reading 9,9閱讀
@@ -1815,6 +1832,7 @@
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Tool,Payment Account,付款帳號
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,請註明公司以處理
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,應收賬款淨額變化
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,補假
 DocType: Quality Inspection Reading,Accepted,接受的
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,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.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
@@ -1822,17 +1840,17 @@
 DocType: Payment Tool,Total Payment Amount,總付款金額
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{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/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,原材料不能為空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,"Could not update stock, invoice contains drop shipping item.",無法更新庫存,發票包含下降航運項目。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +207,Raw Materials cannot be blank.,原材料不能為空。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,"Could not update stock, invoice contains drop shipping item.",無法更新庫存,發票包含下降航運項目。
 DocType: Newsletter,Test,測試
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",由於有存量交易為這個項目,\你不能改變的值&#39;有序列號&#39;,&#39;有批號&#39;,&#39;是股票項目“和”評估方法“
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +444,Quick Journal Entry,快速日記帳分錄
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,快速日記帳分錄
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,你不能改變速度,如果BOM中提到反對的任何項目
 DocType: Employee,Previous Work Experience,以前的工作經驗
 DocType: Stock Entry,For Quantity,對於數量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1}未提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1}未提交
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,需求的項目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,將對每個成品項目創建獨立的生產訂單。
 DocType: Purchase Invoice,Terms and Conditions1,條款及條件1
@@ -1845,7 +1863,7 @@
 DocType: Authorization Rule,Authorized Value,授權值
 DocType: Contact,Enter department to which this Contact belongs,輸入聯繫屬於的部門
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,共缺席
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +735,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,計量單位
 DocType: Fiscal Year,Year End Date,年結日
 DocType: Task Depends On,Task Depends On,任務取決於
@@ -1871,7 +1889,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,第三方分銷商/經銷商/代理商/分支機構/分銷商誰銷售公司產品的佣金。
 DocType: Customer Group,Has Child Node,有子節點
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0}針對採購訂單{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Purchase Order {1},{0}針對採購訂單{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",在這裡輸入靜態URL參數(如稱發件人= ERPNext,用戶名= ERPNext,密碼= 1234等)
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}不在任何現有的會計年度。詳情查看{2}。
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,這是一個示例網站從ERPNext自動生成
@@ -1919,7 +1937,7 @@
  10。添加或扣除:無論你是想增加或扣除的稅。"
 DocType: Purchase Receipt Item,Recd Quantity,RECD數量
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,股票輸入{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +487,Stock Entry {0} is not submitted,股票輸入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金帳戶
 DocType: Tax Rule,Billing City,結算城市
 DocType: Global Defaults,Hide Currency Symbol,隱藏貨幣符號
@@ -1951,6 +1969,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,公用事業費用
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
 DocType: Buying Settings,Default Buying Price List,預設採購價格表
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,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.",設定預設值如公司,貨幣,當前財政年度等
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,付款類型
@@ -1986,7 +2005,7 @@
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",請見“材料成本基於”在成本核算章節
 DocType: Appraisal Goal,Key Responsibility Area,關鍵責任區
 DocType: Item Reorder,Material Request Type,材料需求類型
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,行{0}:計量單位轉換係數是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,行{0}:計量單位轉換係數是必需的
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,參考
 DocType: Cost Center,Cost Center,成本中心
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,憑證#
@@ -2009,7 +2028,7 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,所有地址。
 DocType: Company,Stock Settings,庫存設定
-apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的,如果以下屬性中均有記載相同。是集團,根型,公司
+apps/erpnext/erpnext/accounts/doctype/account/account.py +203,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的,如果以下屬性中均有記載相同。是集團,根型,公司
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,管理客戶群組樹。
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,新的成本中心名稱
 DocType: Leave Control Panel,Leave Control Panel,休假控制面板
@@ -2029,8 +2048,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,支付工具的詳細資訊
 ,Sales Browser,銷售瀏覽器
 DocType: Journal Entry,Total Credit,貸方總額
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},警告:另一個{0}#{1}存在對股票入門{2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,當地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +490,Warning: Another {0} # {1} exists against stock entry {2},警告:另一個{0}#{1}存在對股票入門{2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +386,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 +12,Debtors,債務人
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,大
@@ -2049,7 +2068,7 @@
 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號
 DocType: Production Order Operation,Make Time Log,讓時間日誌
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Please set reorder quantity,請設置再訂購數量
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Please set reorder quantity,請設置再訂購數量
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},請牽頭建立客戶{0}
 DocType: Price List,Applicable for Countries,適用於國家
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,電腦
@@ -2109,10 +2128,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,ATLEAST一個項目應該負數量回報文檔中輸入
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"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 +66,No Remarks,暫無產品說明
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,暫無產品說明
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,過期的
 DocType: Account,Stock Received But Not Billed,庫存接收,但不付款
-apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,根帳戶必須是一組
+apps/erpnext/erpnext/accounts/doctype/account/account.py +82,Root Account must be a group,根帳戶必須是一組
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,工資總額+欠費金額+兌現金額 - 扣除項目金額
 DocType: Monthly Distribution,Distribution Name,分配名稱
 DocType: Features Setup,Sales and Purchase,買賣
@@ -2126,6 +2145,7 @@
 DocType: Journal Entry Account,Party Balance,黨平衡
 DocType: Sales Invoice Item,Time Log Batch,時間日誌批
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,請選擇適用的折扣
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,工資單創建
 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,物料轉倉用於製造
@@ -2133,9 +2153,9 @@
 DocType: Purchase Invoice,Half-yearly,每半年一次
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,會計年度{0}未找到。
 DocType: Bank Reconciliation,Get Relevant Entries,獲取相關條目
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +405,Accounting Entry for Stock,存貨的會計分錄
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +408,Accounting Entry for Stock,存貨的會計分錄
 DocType: Sales Invoice,Sales Team1,銷售團隊1
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Item {0} does not exist,項目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +462,Item {0} does not exist,項目{0}不存在
 DocType: Sales Invoice,Customer Address,客戶地址
 DocType: Purchase Invoice,Apply Additional Discount On,收取額外折扣
 DocType: Account,Root Type,root類型
@@ -2144,15 +2164,15 @@
 DocType: Item Group,Show this slideshow at the top of the page,這顯示在幻燈片頁面頂部
 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 +149,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
 DocType: Quality Inspection,Quality Inspection,品質檢驗
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,超小
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料需求的數量低於最少訂購量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料需求的數量低於最少訂購量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,帳戶{0}被凍結
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料&煙草
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL或BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},只能使支付對未付款的{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Can only make payment against unbilled {0},只能使支付對未付款的{0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,佣金率不能大於100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最低庫存水平
 DocType: Stock Entry,Subcontract,轉包
@@ -2190,7 +2210,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,來料質量檢驗。
 DocType: Purchase Order Item,Returned Qty,返回的數量
 DocType: Employee,Exit,出口
-apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,root類型是強制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Root Type is mandatory,root類型是強制性的
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,序列號{0}創建
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",為方便客戶,這些代碼可以在列印格式,如發票和送貨單使用
 DocType: Employee,You can enter any date manually,您可以手動輸入任何日期
@@ -2198,8 +2218,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,試用期
 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 +110,Row {0}: Advance against Customer must be credit,行{0}:提前對客戶必須是信用
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,採購入庫項目供應商
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,付
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,付
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,以日期時間
 DocType: SMS Settings,SMS Gateway URL,短信閘道的URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,日誌維護短信發送狀態
@@ -2216,7 +2237,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序級別
 DocType: Attendance,Attendance Date,考勤日期
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,工資分手基於盈利和演繹。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
 DocType: Address,Preferred Shipping Address,偏好的送貨地址
 DocType: Purchase Receipt Item,Accepted Warehouse,收料倉庫
 DocType: Bank Reconciliation Detail,Posting Date,發布日期
@@ -2234,7 +2255,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,序列號{0}不存在
 DocType: Pricing Rule,Discount Percentage,折扣百分比
 DocType: Payment Reconciliation Invoice,Invoice Number,發票號碼
-apps/erpnext/erpnext/hooks.py +54,Orders,訂單
+apps/erpnext/erpnext/hooks.py +55,Orders,訂單
 DocType: Leave Control Panel,Employee Type,員工類型
 DocType: Employee Leave Approver,Leave Approver,休假審批人
 DocType: Manufacturing Settings,Material Transferred for Manufacture,材料移送製造
@@ -2246,7 +2267,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,針對這張銷售訂單的已開立帳單的百分比(%)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,期末進入
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,與現有的交易成本中心,不能轉化為組
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,折舊
+DocType: Account,Depreciation,折舊
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供應商(S)
 DocType: Customer,Credit Limit,信用額度
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,交易的選擇類型
@@ -2271,11 +2292,12 @@
 DocType: Material Request,Requested For,要求
 DocType: Quotation Item,Against Doctype,針對文檔類型
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送貨單反對任何項目
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,root帳號不能被刪除
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,從投資淨現金
+apps/erpnext/erpnext/accounts/doctype/account/account.py +178,Root account can not be deleted,root帳號不能被刪除
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,顯示Stock條目
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在製品倉庫
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},參考# {0}於{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,Reference #{0} dated {1},參考# {0}於{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,管理地址
 DocType: Pricing Rule,Item Code,產品編號
 DocType: Production Planning Tool,Create Production Orders,建立生產訂單
@@ -2283,7 +2305,7 @@
 DocType: Journal Entry,User Remark,用戶備註
 DocType: Lead,Market Segment,市場分類
 DocType: Employee Internal Work History,Employee Internal Work History,員工內部工作經歷
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),關閉(Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Closing (Dr),關閉(Dr)
 DocType: Contact,Passive,被動
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列號{0}無貨
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,稅務模板賣出的交易。
@@ -2299,7 +2321,7 @@
 ,Billed Amount,帳單金額
 DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,獲取更新
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
 apps/erpnext/erpnext/public/js/setup_wizard.js +395,Add a few sample records,添加了一些樣本記錄
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,離開管理
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,以帳戶分群組
@@ -2308,14 +2330,14 @@
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",根據責任帳號頭,其中利潤/虧損將被黃牌警告
 DocType: Payment Tool,Against Vouchers,對優惠券
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,快速幫助
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
 DocType: Features Setup,Sales Extras,額外銷售
 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0}預算帳戶{1}對成本中心{2}將超過{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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 +141,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',“起始日期”必須經過'終止日期'
 ,Stock Projected Qty,存貨預計數量
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +141,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
 DocType: Sales Order,Customer's Purchase Order,客戶採購訂單
 DocType: Warranty Claim,From Company,從公司
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,價值或數量
@@ -2325,9 +2347,9 @@
 DocType: Leave Block List,Leave Block List Allowed,准許的休假區塊清單
 apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,你會用它來登入
 DocType: Sales Partner,Retailer,零售商
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供應商類型
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的,因為項目沒有自動編號
+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 +93,Quotation {0} not of type {1},報價{0}非為{1}類型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,維護計劃項目
 DocType: Sales Order,%  Delivered,%交付
@@ -2371,7 +2393,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包裹的總重量。通常為淨重+包裝材料的重量。 (用於列印)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,具有此角色的用戶可以設置凍結帳戶,並新增/修改對凍結帳戶的會計分錄
 DocType: Serial No,Is Cancelled,被註銷
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,我的出貨量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +332,My Shipments,我的出貨量
 DocType: Journal Entry,Bill Date,帳單日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",即使有更高優先級的多個定價規則,然後按照內部優先級應用:
 DocType: Supplier,Supplier Details,供應商詳細資訊
@@ -2392,10 +2414,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,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 +198,Purchase Order {0} is not submitted,採購訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,採購訂單{0}未提交
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,預計
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列號{0}不屬於倉庫{1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注:系統將不檢查過交付和超額預訂的項目{0}的數量或金額為0
+apps/erpnext/erpnext/controllers/status_updater.py +139,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: Issue,Opening Date,開幕日期
 DocType: Journal Entry,Remark,備註
@@ -2408,9 +2430,9 @@
 DocType: Time Log,Batched for Billing,批量計費
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,由供應商提出的帳單。
 DocType: POS Profile,Write Off Account,核銷帳戶
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,折扣金額
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到對採購發票
 DocType: Item,Warranty Period (in days),保修期限(天數)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,從運營的淨現金
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,例如增值稅
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,項目4
 DocType: Journal Entry Account,Journal Entry Account,日記帳分錄帳號
@@ -2451,7 +2473,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
 DocType: Sales Invoice,Against Income Account,對收入帳戶
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}%交付
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +79,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,轉運資訊
@@ -2479,10 +2501,10 @@
 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 +14,This is a root sales person and cannot be edited.,您可以通過選擇備份頻率啟動和\
 ,Stock Ledger,庫存總帳
-apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},價格:{0}
+apps/erpnext/erpnext/templates/pages/order.html +64,Rate: {0},價格:{0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,工資單上扣除
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,首先選擇一組節點。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},目的必須是一個{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},目的必須是一個{0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,填寫表格,並將其保存
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下載一個包含所有原料一份報告,他們最新的庫存狀態
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社區論壇
@@ -2520,7 +2542,7 @@
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,公司(不是客戶或供應商)的主人。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',請輸入「預定交付日」
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 +126,Note: There is not enough leave balance for Leave Type {0},注:沒有足夠的休假餘額請假類型{0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",注:如果付款不反對任何參考製作,手工製作日記條目。
@@ -2537,13 +2559,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0}“{1}”被禁用
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,設置為打開
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,發送電子郵件的自動對提交的交易聯繫。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","行{0}:數量不是在倉庫avalable {1} {2} {3}。
 可用數量:{4},轉讓數量:{5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,項目3
 DocType: Purchase Order,Customer Contact Email,客戶聯繫電子郵件
 DocType: Sales Team,Contribution (%),貢獻(%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注:付款項將不會被創建因為“現金或銀行帳戶”未指定
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注:付款項將不會被創建因為“現金或銀行帳戶”未指定
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,職責
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,模板
 DocType: Sales Person,Sales Person Name,銷售人員的姓名
@@ -2554,20 +2576,20 @@
 DocType: Stock Reconciliation Item,Before reconciliation,調整前
 apps/erpnext/erpnext/support/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 +374,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 +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
 DocType: Sales Order,Partly Billed,天色帳單
 DocType: Item,Default BOM,預設的BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,請確認重新輸入公司名稱
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,總街貨量金額
 DocType: Time Log Batch,Total Hours,總時數
 DocType: Journal Entry,Printing Settings,打印設置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,汽車
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,從送貨單
 DocType: Time Log,From Time,從時間
 DocType: Notification Control,Custom Message,自定義訊息
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投資銀行業務
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時,現金或銀行帳戶是強制性輸入的欄位。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +374,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時,現金或銀行帳戶是強制性輸入的欄位。
 DocType: Purchase Invoice,Price List Exchange Rate,價目表匯率
 DocType: Purchase Invoice Item,Rate,單價
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,實習生
@@ -2586,9 +2608,10 @@
 通過分配優先級。價格規則:{0}"
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,發行材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,發行材料
 DocType: Material Request Item,For Warehouse,對於倉庫
 DocType: Employee,Offer Date,到職日期
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,語錄
 DocType: Hub Settings,Access Token,存取 Token
 DocType: Sales Invoice Item,Serial No,序列號
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,請先輸入維護細節
@@ -2602,10 +2625,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
 DocType: Product Bundle Item,Product Bundle Item,產品包項目
 DocType: Sales Partner,Sales Partner Name,銷售合作夥伴名稱
+DocType: Payment Reconciliation,Maximum Invoice Amount,最大發票額
 DocType: Purchase Invoice Item,Image View,圖像查看
 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 +553,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,從倉庫
 DocType: Purchase Taxes and Charges,Valuation and Total,估值與總計
@@ -2613,6 +2638,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,該項目是{0}(模板)的變體。屬性將被複製的模板,除非“不複製”設置
 DocType: Account,Purchase User,購買用戶
 DocType: Notification Control,Customize the Notification,自定義通知
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,運營現金流
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,預設地址模板不能被刪除
 DocType: Sales Invoice,Shipping Rule,送貨規則
 DocType: Journal Entry,Print Heading,列印標題
@@ -2623,7 +2649,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +377,Raw Material,原料
 DocType: Leave Application,Follow via Email,通過電子郵件跟隨
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
-apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +183,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 +452,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,請選擇發布日期第一
@@ -2641,6 +2667,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},序列號為必填項序列為{0}
 DocType: Journal Entry,Bank Entry,銀行分錄
 DocType: Authorization Rule,Applicable To (Designation),適用於(指定)
+apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,添加到購物車
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,集團通過
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,啟用/禁用的貨幣。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,郵政費用
@@ -2648,30 +2675,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娛樂休閒
 DocType: Purchase Order,The date on which recurring order will be stop,上反复出現的訂單將被終止日期
 DocType: Quality Inspection,Item Serial No,產品序列號
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必須減少{1}或應增加超量容許度
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必須減少{1}或應增加超量容許度
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,總現
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,小時
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","系列化項目{0}不能被更新\
 使用庫存調整"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,轉印材料供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Transfer Material to Supplier,轉印材料供應商
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,建立報價
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,您無權批准葉子座日期
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,所有這些項目已開具發票
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +357,All these items have already been invoiced,所有這些項目已開具發票
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以通過{0}的批准
 DocType: Shipping Rule,Shipping Rule Conditions,送貨規則條件
 DocType: BOM Replace Tool,The new BOM after replacement,更換後的新物料清單
 DocType: Features Setup,Point of Sale,銷售點
 DocType: Account,Tax,稅
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},行{0}:{1}不是有效的{2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,從產品包
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,從產品包
 DocType: Production Planning Tool,Production Planning Tool,生產規劃工具
 DocType: Quality Inspection,Report Date,報告日期
 DocType: C-Form,Invoices,發票
 DocType: Job Opening,Job Title,職位
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0}收件人
 DocType: Features Setup,Item Groups in Details,產品群組之詳細資訊
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),起點的銷售終端(POS)
@@ -2679,8 +2705,9 @@
 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: Pricing Rule,Customer Group,客戶群組
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},交際費是強制性的項目{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},交際費是強制性的項目{0}
 DocType: Item,Website Description,網站簡介
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,在淨資產收益變化
 DocType: Serial No,AMC Expiry Date,AMC到期時間
 ,Sales Register,銷售登記
 DocType: Quotation,Quotation Lost Reason,報價遺失原因
@@ -2688,12 +2715,12 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,對於如1美元= 100美分
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,本月和待活動總結
 DocType: Customer Group,Customer Group Name,客戶群組名稱
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,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,屬性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,找項目
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,請輸入核銷帳戶
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,找項目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,請輸入核銷帳戶
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,最後訂購日期
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,使消費稅發票
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
@@ -2709,7 +2736,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
 DocType: Project,Expected End Date,預計結束日期
 DocType: Appraisal Template,Appraisal Template Title,評估模板標題
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,商業
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Commercial,商業
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
 DocType: Cost Center,Distribution Id,分配標識
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,真棒服務
@@ -2722,7 +2749,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},為屬性{0}值必須的範圍內{1}到{2}中的增量{3}
 DocType: Tax Rule,Sales,銷售
 DocType: Stock Entry Detail,Basic Amount,基本金額
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +169,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
 DocType: Leave Allocation,Unused leaves,未使用的葉子
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,鉻
 DocType: Customer,Default Receivable Accounts,預設應收帳款
@@ -2734,16 +2761,16 @@
 apps/erpnext/erpnext/controllers/item_variant.py +51,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
 DocType: Landed Cost Voucher,Purchase Receipts,採購入庫
-DocType: Payment Reconciliation,Maximum Amount,最高金額
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,定價規則被如何應用?
 DocType: Quality Inspection,Delivery Note No,送貨單號
 DocType: Company,Retail,零售
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,客戶{0}不存在
 DocType: Attendance,Absent,缺席
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,產品包
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}:無效參考{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,產品包
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},行{0}:無效參考{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購置稅和費模板
 DocType: Upload Attendance,Download Template,下載模板
 DocType: GL Entry,Remarks,備註
@@ -2770,7 +2797,7 @@
 ,Monthly Attendance Sheet,每月考勤表
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,沒有資料
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}:成本中心是強制性的項目{2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,獲取從產品捆綁項目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,獲取從產品捆綁項目
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,帳戶{0}為未啟用
 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,考勤起始日期和出席的日期,是強制性的
@@ -2779,8 +2806,10 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,“損益”帳戶類型{0}不開放允許入境
 DocType: Features Setup,Sales Discounts,銷售折扣
 DocType: Hub Settings,Seller Country,賣家國家
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,公佈於網頁上的項目
 DocType: Authorization Rule,Authorization Rule,授權規則
 DocType: Sales Invoice,Terms and Conditions Details,條款及細則詳情
+apps/erpnext/erpnext/templates/generators/item.html +94,Specifications,產品規格
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,營業稅金及費用套版
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,服裝及配飾
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,訂購數量
@@ -2802,7 +2831,7 @@
 DocType: Time Log,Billing Amount,開票金額
 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 +18,Applications for leave.,申請許可。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,法律費用
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",該月的一天,在這汽車的訂單將產生如05,28等
 DocType: Sales Invoice,Posting Time,登錄時間
@@ -2818,11 +2847,11 @@
 DocType: Maintenance Visit,Breakdown,展開
 apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,帳號:{0}幣種:{1}不能選擇
 DocType: Bank Reconciliation Detail,Cheque Date,支票日期
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}:父帳戶{1}不屬於公司:{2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}:父帳戶{1}不屬於公司:{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,隨著對日
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,緩刑
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Default Warehouse is mandatory for stock Item.,預設倉庫對庫存項目是強制性的。
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,Default Warehouse is mandatory for stock Item.,預設倉庫對庫存項目是強制性的。
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},{1}年{0}月的薪資支付
 DocType: Stock Settings,Auto insert Price List rate if missing,自動插入價目表率,如果丟失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,總支付金額
@@ -2834,6 +2863,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),總結算金額(通過時間日誌)
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,We sell this Item,我們賣這種產品
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,供應商編號
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Quantity should be greater than 0,量應大於0
 DocType: Journal Entry,Cash Entry,現金分錄
 DocType: Sales Partner,Contact Desc,聯繫倒序
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.",葉似漫不經心,生病等類型
@@ -2842,7 +2872,7 @@
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,在帳戶的年度預算中加入新一列。
 DocType: Buying Settings,Default Supplier Type,預設的供應商類別
 DocType: Production Order,Total Operating Cost,總營運成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,注:項目{0}多次輸入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +154,Note: Item {0} entered multiple times,注:項目{0}多次輸入
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,所有聯繫人。
 DocType: Newsletter,Test Email Id,測試電子郵件Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,公司縮寫
@@ -2867,7 +2897,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客戶群組
 apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,稅務模板是強制性的。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,帳戶{0}:父帳戶{1}不存在
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not exist,帳戶{0}:父帳戶{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率(公司貨幣)
 DocType: Account,Temporary,臨時
 DocType: Address,Preferred Billing Address,偏好的帳單地址
@@ -2885,8 +2915,8 @@
 ,Item-wise Price List Rate,全部項目的價格表
 DocType: Purchase Order Item,Supplier Quotation,供應商報價
 DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存,就會顯示出來。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}已停止
-apps/erpnext/erpnext/stock/doctype/item/item.py +386,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,{0} {1} is stopped,{0} {1}已停止
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
 DocType: Lead,Add to calendar on this date,在此日期加到日曆
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,增加運輸成本的規則。
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,活動預告
@@ -2907,24 +2937,24 @@
 DocType: Customer,From Lead,從鉛
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,發布生產訂單。
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,選擇會計年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,POS Profile required to make POS Entry,所需的POS資料,使POS進入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,POS Profile required to make POS Entry,所需的POS資料,使POS進入
 DocType: Hub Settings,Name Token,名令牌
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,標準銷售
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,至少要有一間倉庫
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +128,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 Replace Tool,Replace,更換
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0}針對銷售發票{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,請輸入預設的計量單位
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Sales Invoice {1},{0}針對銷售發票{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +58,Please enter default Unit of Measure,請輸入預設的計量單位
 DocType: Purchase Invoice Item,Project Name,專案名稱
 DocType: Supplier,Mention if non-standard receivable account,提到如果不規範應收賬款
 DocType: Journal Entry Account,If Income or Expense,如果收入或支出
 DocType: Features Setup,Item Batch Nos,項目批NOS
 DocType: Stock Ledger Entry,Stock Value Difference,庫存價值差異
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,人力資源
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,人力資源
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款對賬
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,所得稅資產
 DocType: BOM Item,BOM No,BOM No.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 +134,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
 DocType: Item,Moving Average,移動平均線
 DocType: BOM Replace Tool,The BOM which will be replaced,這將被替換的物料清單
 DocType: Account,Debit,借方
@@ -2961,7 +2991,7 @@
 DocType: Stock Entry Detail,Additional Cost,額外費用
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,財政年度年結日
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務,你需要角色
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,讓供應商報價
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,讓供應商報價
 DocType: Quality Inspection,Incoming,來
 DocType: BOM,Materials Required (Exploded),所需材料(分解)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低盈利停薪留職(LWP)
@@ -2969,7 +2999,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},行#{0}:序列號{1}不相匹配{2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,事假
 DocType: Batch,Batch ID,批次ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},注: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Note: {0},注: {0}
 ,Delivery Note Trends,送貨單趨勢
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,本週的總結
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0}必須是購買或分包項目中列{1}
@@ -2984,6 +3014,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均。買入價
 DocType: Task,Actual Time (in Hours),實際時間(小時)
 DocType: Employee,History In Company,公司歷史
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,簡訊
 DocType: Address,Shipping,航運
 DocType: Stock Ledger Entry,Stock Ledger Entry,庫存總帳條目
@@ -3003,7 +3034,6 @@
 DocType: Purchase Order,End date of current order's period,當前訂單的週期的最後一天
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,使錄取通知書
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,退貨
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,測度變異的默認單位必須與模板
 DocType: Production Order Operation,Production Order Operation,生產訂單操作
 DocType: Pricing Rule,Disable,關閉
 DocType: Project Task,Pending Review,待審核
@@ -3011,7 +3041,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,客戶ID
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,到時間必須大於從時間
 DocType: Journal Entry Account,Exchange Rate,匯率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Sales Order {0} is not submitted,銷售訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Sales Order {0} is not submitted,銷售訂單{0}未提交
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}:父帳戶{1}不屬於該公司{2}
 DocType: BOM,Last Purchase Rate,最後預訂價
 DocType: Account,Asset,財富
@@ -3031,7 +3061,7 @@
 ,Available Stock for Packing Items,可用庫存包裝項目
 DocType: Item Variant,Item Variant,項目變
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,設置此地址模板為預設當沒有其它的預設值
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借記帳戶,不允許設為信用帳戶
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"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 +76,Quality Management,品質管理
 DocType: Production Planning Tool,Filter based on customer,過濾器可根據客戶
 DocType: Payment Tool Detail,Against Voucher No,針對券無
@@ -3048,6 +3078,7 @@
 DocType: Opportunity,Next Contact,下一頁聯繫
 DocType: Employee,Employment Type,就業類型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定資產
+,Cash Flow,現金周轉
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,申請期間不能跨兩個alocation記錄
 DocType: Item Group,Default Expense Account,預設費用帳戶
 DocType: Employee,Notice (days),通告(天)
@@ -3079,13 +3110,12 @@
 DocType: Production Order,Warehouses,倉庫
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,印刷和文具
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,組節點
-DocType: Payment Reconciliation,Minimum Amount,最低金額
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,更新成品
 DocType: Workstation,per hour,每小時
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,帳戶倉庫(永續盤存)將在該帳戶下新增。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除,因為庫存分錄帳尚存在。
 DocType: Company,Distribution,分配
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,已支付的款項
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,已支付的款項
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,專案經理
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,調度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣:{1}%
@@ -3109,7 +3139,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,支援分析
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},公司在倉庫缺少{0}
 DocType: POS Profile,Terms and Conditions,條款和條件
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},日期應該是在財政年度內。假設終止日期= {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},日期應該是在財政年度內。假設終止日期= {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在這裡,你可以保持身高,體重,過敏,醫療問題等
 DocType: Leave Block List,Applies to Company,適用於公司
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,不能取消,因為提交股票輸入{0}存在
@@ -3123,11 +3153,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,請輸入採購入庫單
 DocType: Sales Invoice,Get Advances Received,取得進展收稿
 DocType: Email Digest,Add/Remove Recipients,添加/刪除收件人
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction not allowed against stopped Production Order {0},交易不反對停止生產訂單允許{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),設置接收郵件服務器支持電子郵件ID 。 (例如support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,短缺數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
 DocType: Salary Slip,Salary Slip,工資單
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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.",產生交貨的包裝單。用於通知箱號,內容及重量。
@@ -3216,7 +3246,7 @@
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,員工記錄。
 DocType: HR Settings,Payroll Settings,薪資設置
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,核對非關聯的發票和付款。
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,下單
+apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,下單
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,root不能有一個父成本中心
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,選擇品牌...
 DocType: Sales Invoice,C-Form Applicable,C-表格適用
@@ -3231,7 +3261,7 @@
 DocType: Appraisal,Start Date,開始日期
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,離開一段時間。
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,點擊這裡核實
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,帳戶{0}:你不能指定自己為父帳戶
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: You can not assign itself as parent account,帳戶{0}:你不能指定自己為父帳戶
 DocType: Purchase Invoice Item,Price List Rate,價格列表費率
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",基於倉庫內存貨的狀態顯示「有或」或「無貨」。
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),材料清單(BOM)
@@ -3240,17 +3270,17 @@
 DocType: Project,Expected Start Date,預計開始日期
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,刪除項目,如果收費並不適用於該項目
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如:。 smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Receive,接受
 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: Employee Leave Approver,Employee Leave Approver,員工請假審批
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0}已成功添加到我們的新聞列表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:一個重新排序條目已存在這個倉庫{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +433,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:一個重新排序條目已存在這個倉庫{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失,因為報價已經取得進展。
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,採購主檔經理
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +422,Production Order {0} must be submitted,生產訂單{0}必須提交
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Production Order {0} must be submitted,生產訂單{0}必須提交
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,主報告
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,無效的主名稱
@@ -3268,7 +3298,7 @@
 DocType: Industry Type,Industry Type,行業類型
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,出事了!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,Warning: Leave application contains following block dates,警告:離開包含以下日期區塊的應用程式
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完成日期
 DocType: Purchase Invoice Item,Amount (Company Currency),金額(公司貨幣)
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,組織單位(部門)的主人。
@@ -3287,10 +3317,10 @@
 ,Serial No Service Contract Expiry,序號服務合同到期
 DocType: Item,Unit of Measure Conversion,轉換度量單位
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,僱員不能改變
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +271,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
 DocType: Naming Series,Help HTML,HTML幫助
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},分配的總權重應為100 % 。這是{0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},備抵過{0}越過為項目{1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},備抵過{0}越過為項目{1}
 DocType: Address,Name of person or organization that this address belongs to.,此地址所屬的人或組織的名稱。
 apps/erpnext/erpnext/public/js/setup_wizard.js +343,Your Suppliers,您的供應商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
@@ -3303,35 +3333,35 @@
 DocType: Employee,Date of Issue,發行日期
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}:從{0}給 {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},行#{0}:設置供應商項目{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,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/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項,允許帳戶與其他貨幣
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +295,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項,允許帳戶與其他貨幣
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,項:{0}不存在於系統中
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,您無權設定值凍結
+apps/erpnext/erpnext/accounts/doctype/account/account.py +90,You are not authorized to set Frozen value,您無權設定值凍結
 DocType: Payment Reconciliation,Get Unreconciled Entries,獲取未調節項
+DocType: Payment Reconciliation,From Invoice Date,從發票日期
 DocType: Cost Center,Budgets,預算
-DocType: Employee,Emergency Contact Details,緊急聯繫方式
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,它有什麼作用?
 DocType: Delivery Note,To Warehouse,到倉庫
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},帳戶{0}已多次輸入會計年度{1}
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +347,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,考勤不能標記為未來的日期
 DocType: Pricing Rule,Pricing Rule Help,定價規則說明
 DocType: Purchase Taxes and Charges,Account Head,帳戶頭
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,更新的額外成本來計算項目的到岸成本
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,電子的
 DocType: Stock Entry,Total Value Difference (Out - In),總價值差(輸出 - )
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,行{0}:匯率是必須的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,Row {0}: Exchange Rate is mandatory,行{0}:匯率是必須的
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},用戶ID不為員工設置{0}
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,從保修索賠
 DocType: Stock Entry,Default Source Warehouse,預設來源倉庫
 DocType: Item,Customer Code,客戶代碼
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},生日提醒{0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,天自上次訂購
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,借記帳戶必須是資產負債表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,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,庫存資產
@@ -3344,7 +3374,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,關閉帳戶{0}的類型必須是負債/權益
 DocType: Authorization Rule,Based On,基於
 DocType: Sales Order Item,Ordered Qty,訂購數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,項目{0}無效
+apps/erpnext/erpnext/stock/doctype/item/item.py +589,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,專案活動/任務。
@@ -3352,7 +3382,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核銷金額(公司貨幣)
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,Row #{0}: Please set reorder quantity,行#{0}:請設置再訂購數量
+apps/erpnext/erpnext/stock/doctype/item/item.py +424,Row #{0}: Please set reorder quantity,行#{0}:請設置再訂購數量
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本憑證
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},請設置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,在月內的一天重複
@@ -3382,12 +3412,12 @@
 DocType: Upload Attendance,Upload Attendance,上傳考勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,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/accounts/doctype/journal_entry/journal_entry.js +446,Amount,量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,量
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM取代
 ,Sales Analytics,銷售分析
 DocType: Manufacturing Settings,Manufacturing Settings,製造設定
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,設置電子郵件
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,請在公司主檔輸入預設貨幣
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,請在公司主檔輸入預設貨幣
 DocType: Stock Entry Detail,Stock Entry Detail,存貨分錄明細
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,每日提醒
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},稅收規範衝突{0}
@@ -3413,13 +3443,13 @@
 DocType: Sales Order Item,Produced Quantity,生產的產品數量
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,工程師
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子組件
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,Item Code required at Row No {0},於列{0}需要產品編號
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Item Code required at Row No {0},於列{0}需要產品編號
 DocType: Sales Partner,Partner Type,合作夥伴類型
 DocType: Purchase Taxes and Charges,Actual,實際
 DocType: Authorization Rule,Customerwise Discount,Customerwise折扣
 DocType: Purchase Invoice,Against Expense Account,對費用帳戶
 DocType: Production Order,Production Order,生產訂單
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,安裝注意{0}已提交
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,安裝注意{0}已提交
 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,立即觀看
@@ -3431,15 +3461,15 @@
 DocType: Employee,Applicable Holiday List,適用假期表
 DocType: Employee,Cheque,支票
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,系列更新
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,報告類型是強制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +143,Report Type is mandatory,報告類型是強制性的
 DocType: Item,Serial Number Series,序列號系列
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},倉庫是強制性的股票項目{0}行{1}
 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/public/js/setup_wizard.js +101,The First User: You,第一個用戶:您
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},會計年度開始日期和財政年度結束日期已經在財政年度設置{0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,不甘心成功
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},會計年度開始日期和財政年度結束日期已經在財政年度設置{0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,不甘心成功
 DocType: Production Order,Planned End Date,計劃的結束日期
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,項目的存儲位置。
 DocType: Tax Rule,Validity,有效性
@@ -3447,7 +3477,7 @@
 DocType: Attendance,Attendance,出勤
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +509,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,稅務模板購買交易。
 ,Item Prices,產品價格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,採購訂單一被儲存,就會顯示出來。
@@ -3456,15 +3486,15 @@
 DocType: Task,Review Date,評論日期
 DocType: Purchase Invoice,Advance Payments,預付款
 DocType: Purchase Taxes and Charges,On Net Total,在總淨
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,行目標倉庫{0}必須與生產訂單
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,行目標倉庫{0}必須與生產訂單
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,沒有權限使用支付工具
 apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,為重複%不是指定的“通知電子郵件地址”
-apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
 DocType: Company,Round Off Account,四捨五入賬戶
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,行政開支
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,諮詢
 DocType: Customer Group,Parent Customer Group,母客戶群組
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,更改
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,更改
 DocType: Purchase Invoice,Contact Email,聯絡電郵
 DocType: Appraisal Goal,Score Earned,獲得得分
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",例如“我的公司有限責任公司”
@@ -3474,13 +3504,13 @@
 DocType: Packing Slip,Gross Weight UOM,毛重計量單位
 DocType: Email Digest,Receivables / Payables,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Invoice,對銷售發票
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Credit Account,信用賬戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,信用賬戶
 DocType: Landed Cost Item,Landed Cost Item,到岸成本項目
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,顯示零值
 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 +562,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
 DocType: Item,Default Warehouse,預設倉庫
 DocType: Task,Actual End Date (via Time Logs),實際結束日期(通過時間日誌)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
@@ -3516,29 +3546,30 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,規劃工作站工作時間以外的時間日誌。
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}已提交
 ,Items To Be Requested,項目要請求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +593,Get Last Purchase Rate,獲取最新預訂價
 DocType: Time Log,Billing Rate based on Activity Type (per hour),根據活動類型計費率(每小時)
 DocType: Company,Company Info,公司資訊
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent",公司電子郵件ID沒有找到,因此郵件無法發送
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),基金中的應用(資產)
 DocType: Production Planning Tool,Filter based on item,根據項目篩選
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +447,Debit Account,借方科目
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,借方科目
 DocType: Fiscal Year,Year Start Date,今年開始日期
 DocType: Attendance,Employee Name,員工姓名
 DocType: Sales Invoice,Rounded Total (Company Currency),整數總計(公司貨幣)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,不能隱蔽到組,因為帳戶類型選擇的。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Cannot covert to Group because Account Type is selected.,不能隱蔽到組,因為帳戶類型選擇的。
 DocType: Purchase Common,Purchase Common,採購普通
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,從機會
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,員工福利
 DocType: Sales Invoice,Is POS,是POS機
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
 DocType: Production Order,Manufactured Qty,生產數量
 DocType: Purchase Receipt Item,Accepted Quantity,允收數量
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}:{1}不存在
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,客戶提出的賬單。
 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 +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}:金額不能大於金額之前對報銷{1}。待審核金額為{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +482,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}:金額不能大於金額之前對報銷{1}。待審核金額為{2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}用戶已新增
 DocType: Maintenance Schedule,Schedule,時間表
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",定義預算這個成本中心。要設置預算的行動,請參閱“企業名錄”
@@ -3546,7 +3577,7 @@
 DocType: Quality Inspection Reading,Reading 3,閱讀3
 ,Hub,樞紐
 DocType: GL Entry,Voucher Type,憑證類型
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,價格表未找到或禁用
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,價格表未找到或禁用
 DocType: Expense Claim,Approved,批准
 DocType: Pricing Rule,Price,價格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
@@ -3560,7 +3591,7 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,會計日記帳分錄。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用數量從倉庫
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,請選擇員工記錄第一。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}:甲方/客戶不與匹配{1} / {2} {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,要創建一個納稅帳戶
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,請輸入您的費用帳戶
 DocType: Account,Stock,庫存
@@ -3571,7 +3602,7 @@
 DocType: Employee,Contract End Date,合同結束日期
 DocType: Sales Order,Track this Sales Order against any Project,跟踪對任何項目這個銷售訂單
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,基於上述標準拉銷售訂單(待定提供)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,從供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +679,From Supplier Quotation,從供應商報價
 DocType: Deduction Type,Deduction Type,扣類型
 DocType: Attendance,Half Day,半天
 DocType: Pricing Rule,Min Qty,最小數量
@@ -3579,7 +3610,7 @@
 DocType: GL Entry,Transaction Date,交易日期
 DocType: Production Plan Item,Planned Qty,計劃數量
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,總稅收
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,對於數量(製造數量)是強制性的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,對於數量(製造數量)是強制性的
 DocType: Stock Entry,Default Target Warehouse,預設目標倉庫
 DocType: Purchase Invoice,Net Total (Company Currency),總淨值(公司貨幣)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}:黨的類型和黨的只適用對應收/應付帳戶
@@ -3633,9 +3664,9 @@
 DocType: Customer,Commission Rate,佣金率
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,按部門封鎖請假申請。
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,車是空的
+apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,車是空的
 DocType: Production Order,Actual Operating Cost,實際運行成本
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,root不能被編輯。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Root cannot be edited.,root不能被編輯。
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,分配的金額不能超過未調整金額
 DocType: Manufacturing Settings,Allow Production on Holidays,允許生產的假日
 DocType: Sales Order,Customer's Purchase Order Date,客戶的採購訂單日期
@@ -3646,11 +3677,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,設計師
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,條款及細則範本
 DocType: Serial No,Delivery Details,交貨細節
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +390,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,自動創建材料,如果申請數量低於這個水平
 ,Item-wise Purchase Register,項目明智的購買登記
 DocType: Batch,Expiry Date,到期時間
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要設置訂貨點水平,項目必須購買項目或生產項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要設置訂貨點水平,項目必須購買項目或生產項目
 ,Supplier Addresses and Contacts,供應商的地址和聯繫方式
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,請先選擇分類
 apps/erpnext/erpnext/config/projects.py +18,Project master.,專案主持。
@@ -3658,7 +3689,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(半天)
 DocType: Supplier,Credit Days,信貸天
 DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,從物料清單獲取項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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/config/manufacturing.py +120,Bill of Materials,材料清單
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}:黨的類型和黨的需要應收/應付帳戶{1}
@@ -3666,7 +3697,7 @@
 DocType: Employee,Reason for Leaving,離職原因
 DocType: Expense Claim Detail,Sanctioned Amount,制裁金額
 DocType: GL Entry,Is Opening,是開幕
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},行{0}:借記條目不能與連接的{1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,帳戶{0}不存在
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Debit entry can not be linked with a {1},行{0}:借記條目不能與連接的{1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Account {0} does not exist,帳戶{0}不存在
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,網站和其他出版物的短的傳記。
diff --git a/setup.py b/setup.py
index 6c091db..46abdb1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.13.1"
+version = "6.17.0"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(